From nobody Sat Nov 25 21:55:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla 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 00:25:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sd8dg3Rwtz51w4d; Sun, 26 Nov 2023 00:25: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 4Sd8dg3017z3Gm8; Sun, 26 Nov 2023 00:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700958359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Ypl5CyrC6FhcZw9Jb05C9Ixg7l3YYa3SKG7qpvWHQ8=; b=Dk7sxJpH54BzmNG9MThvfEB0xc4zQ/Ep2Auqkyb6poq8G+eBHRNLZS7BWWgfXMntvGpP3p Bd0NFE0Ufak41xsctoy3SsARkBxS00QXxh1lJ2bdcRyocDU+Dw3KpZrvS8YyIKI90ZwSlp 066woMVktroxvCYsKbKWNfVUogB4tJ/wh7xRGb6W3nwgzpshL4O9iAbu2eS+sc/mlVesM4 EHJo66/rqQs3OVCHgkDvT0IW0dZscChHj9Pte7i9OW5oHeSIVcwbDKL4BYy5AWsdLT3QE1 w5uWNQJXTFNB6648B48E8ylWguPQm8qvsJXWjO84dJq50ajWV09mvIMK6seTHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700958359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Ypl5CyrC6FhcZw9Jb05C9Ixg7l3YYa3SKG7qpvWHQ8=; b=vTXzI8m9N96lMoZ8jhx46dT/8Zs1QDeBqGIqvAbJiAaEQ70S/yppwMPo88xkj0Sv0MCbfi ACFv7hqdBSTZrWB3CNWeiGpVVdvwlh/W8TLvABqHiFJZ3mE9e4VboP5IpgxA/S0e9SQWTS ljs6ZDHXWk+cw83ipe47DYtUsFwLH7DNQfy3ZMRMA8TBwyhnn6cAHrf/kip/YBEaQEDCAN 54fZ/xVePEqwi4cnkE0kmWP3PeumFJOtxRRFZRVQsZQBayqF6vez17Yh/Nwvue3TaP3Q9y PCRrxLDs446heX1ZpnaLFgGkxoBEgEAgeL3duoezY5ZzQa4D0DReixNwv3Nt/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700958359; a=rsa-sha256; cv=none; b=cVMIxb31XD889uJ7dwiHuj1yL/Mpgk5U4yrElywFOw8dVdg8bUNF+dHLdCXQl8p13/bMDu pkKMkcp8cl2X4GLk3fGJ8ZH+2Ms+XZpz5MnjgobKK1NUi+ByaJ2OfrkB30jGYSYED8vYU/ 4ib+XGInGPDZiP/nFqe8K3xNEPOi2ttHZTi1kcyNjG7fvA6fiIaLjfTcVV88YVOhr/oBm8 d+IUBe/AxhCp41mp/B1Ttu+s9dyAKReyTI4Zl6diaUL03gkT2+YApuPRo3/JqTtSj0yp8I O5aR8/Q6COJTg+H+jeql0bn2EDFjIjzgjEhkV/HwmmXeqWXsRNYs1i42a5/eOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sd8dg254KzZcd; Sun, 26 Nov 2023 00:25: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 3AQ0Px9g057185; Sun, 26 Nov 2023 00:25:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ0Pxme057182; Sun, 26 Nov 2023 00:25:59 GMT (envelope-from git) Date: Sun, 26 Nov 2023 00:25:59 GMT Message-Id: <202311260025.3AQ0Pxme057182@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: a4d16707a81b - stable/14 - cat: fallback on EISDIR with copy_file_range(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a4d16707a81b13cb711a4a75843d5d24486de150 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=a4d16707a81b13cb711a4a75843d5d24486de150 commit a4d16707a81b13cb711a4a75843d5d24486de150 Author: Martin Matuska AuthorDate: 2023-11-19 01:09:34 +0000 Commit: Martin Matuska CommitDate: 2023-11-26 00:24:42 +0000 cat: fallback on EISDIR with copy_file_range(2) The filesystem may support reading directories directly when security.bsd.allow_read_dir is set. PR: 275099 (cherry picked from commit 3c773cad57064c23873f286fbec69f6f0305b889) --- bin/cat/cat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index ec14451acd0c..1468faf494a3 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -281,7 +281,8 @@ scanfiles(char *argv[], int cooked __unused) } else { #ifndef BOOTSTRAP_CAT if (in_kernel_copy(fd) == -1) { - if (errno == EINVAL || errno == EBADF) + if (errno == EINVAL || errno == EBADF || + errno == EISDIR) raw_cat(fd); else err(1, "stdout"); From nobody Sun Nov 26 00:38:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sd8wC2QPGz522GM; Sun, 26 Nov 2023 00: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 4Sd8wC20bkz3K7t; Sun, 26 Nov 2023 00: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=1700959115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eLsOcv/jADh1xJfIYPQK8/co2/+hbtCBCM4znoPRDYM=; b=LM5ZF71W45a5e5J+Wgi66RIWaAhBpQVMJJ8Ec2WJSlDnfXUyptfF3wCwvytJcaN7dRVGtQ XpQ1VuTmvewYAG1N0jCM/CjbcMMuJjEynlF3NEw78mTb0vMJe+xWqTmmFNl96LtT/NqslH 83w9rEuatXZM6ZBzKf4QapJ2m2shz0OclKiI2D5HkKYjb27I8qtanIrrhyerqoimQiO4fy ZG/hdWaKvAvW7zxG/XYcE4Lb0hWMm16m/hv7JTrjyYGisfxZpZYis8jozAqgAbXlgQVmI8 4KPp+oWzwvM8al5lXAEX7qlsaJnzsg1gwZQbCeUHIZjPPziSKVelkdlZui1PMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700959115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eLsOcv/jADh1xJfIYPQK8/co2/+hbtCBCM4znoPRDYM=; b=y4rd+3429lKztInUUpcCpYyZg9Xj/H84tyTjLDhI0zA0n3iJfBq/G4dIhVtbuxnsWGIOua syhN+wrByOj1mcGn9WDok/yGAh18whMAs7RMrEOst4R8sywMODkqpKS2tVqNCajfz3Fa1E iL7/L77Szbraf7DcgYTzBg3VgJs7nZL6wtSzcj8eKZMxrIl8umiD01FRoz0sy2iPq3dkzJ 9AQRGye/rf8xhi6ThKO+eurtmxaHhHNl6xgPYh0+/nm+lMJQ9DA/r2fgcQVdg6Exp1bWb7 EbBTFfHAHo0nwm26F6c80ArxquJFGpLQ4Du2Cqn0eZiQdWnTRngxzOqb2YWh8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700959115; a=rsa-sha256; cv=none; b=k7hFLhIPF/0goPPfQFyIbjSQ9zIhdma4x69WCveAsHtMe1MvxMZqV9BhSotwx7+0zZZK25 tM8xqskiDfHw0GEZGxYyeh3wP97OJrZvGPXU7jj4idldqcTk98NWd7t8SED+HxopiY62Bu V6BZgvKI4iYhv/PzA8hEuqU8Rby2+04kPE6as546c7Q5ONUd7wdO/JYrZnQpeXKvRxDjTX 6W/BIniPuIUYHv2u6URhBnGj7PvHb1RCMviMmALVVUoNT/EgtHK3FhUM4+wvgR2KWJWt4d dOSxGTv0flntUR7uBiYF9Hh9VTCfAx3KSVHBmUt1PVET2ceJRheep4fnxi/ARQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sd8wC14jtzZtD; Sun, 26 Nov 2023 00: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 3AQ0cZij074357; Sun, 26 Nov 2023 00:38:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ0cZJu074354; Sun, 26 Nov 2023 00:38:35 GMT (envelope-from git) Date: Sun, 26 Nov 2023 00:38:35 GMT Message-Id: <202311260038.3AQ0cZJu074354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: d0b589b23134 - stable/14 - re(4): Add support for 8168FP HW rev List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d0b589b231345f449af5fa4549bbc747d6530af3 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=d0b589b231345f449af5fa4549bbc747d6530af3 commit d0b589b231345f449af5fa4549bbc747d6530af3 Author: Brad Smith AuthorDate: 2023-11-23 20:13:00 +0000 Commit: Xin LI CommitDate: 2023-11-26 00:38:05 +0000 re(4): Add support for 8168FP HW rev (cherry picked from commit 88d2b69c719a20da9eb53f1c58adf6ecb005f8ce) Differential Revision: https://reviews.freebsd.org/D42671 --- sys/dev/re/if_re.c | 2 ++ sys/dev/rl/if_rlreg.h | 1 + 2 files changed, 3 insertions(+) diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index 83fd31fc4f0b..594ed9d60379 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -243,6 +243,7 @@ static const struct rl_hwrev re_hwrevs[] = { { RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL", RL_JUMBO_MTU_6K}, { RL_HWREV_8168EP, RL_8169, "8168EP/8111EP", RL_JUMBO_MTU_9K}, { RL_HWREV_8168F, RL_8169, "8168F/8111F", RL_JUMBO_MTU_9K}, + { RL_HWREV_8168FP, RL_8169, "8168FP/8111FP", RL_JUMBO_MTU_9K}, { RL_HWREV_8168G, RL_8169, "8168G/8111G", RL_JUMBO_MTU_9K}, { RL_HWREV_8168GU, RL_8169, "8168GU/8111GU", RL_JUMBO_MTU_9K}, { RL_HWREV_8168H, RL_8169, "8168H/8111H", RL_JUMBO_MTU_9K}, @@ -1495,6 +1496,7 @@ re_attach(device_t dev) RL_FLAG_CMDSTOP_WAIT_TXQ | RL_FLAG_WOL_MANLINK; break; case RL_HWREV_8168EP: + case RL_HWREV_8168FP: case RL_HWREV_8168G: case RL_HWREV_8411B: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | diff --git a/sys/dev/rl/if_rlreg.h b/sys/dev/rl/if_rlreg.h index 808d11e34346..7de7e2fcc585 100644 --- a/sys/dev/rl/if_rlreg.h +++ b/sys/dev/rl/if_rlreg.h @@ -194,6 +194,7 @@ #define RL_HWREV_8168EP 0x50000000 #define RL_HWREV_8168GU 0x50800000 #define RL_HWREV_8168H 0x54000000 +#define RL_HWREV_8168FP 0x54800000 #define RL_HWREV_8411B 0x5C800000 #define RL_HWREV_8139 0x60000000 #define RL_HWREV_8139A 0x70000000 From nobody Sun Nov 26 00:38:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sd8wc2yPrz522VV; Sun, 26 Nov 2023 00:38: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 4Sd8wc2Thfz3KTW; Sun, 26 Nov 2023 00:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700959136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gNpU9EuN8DrFxkGE+VKvHlLcg/Xr+ERurS3kUfuWqW8=; b=oVB+bvasZ0oA8XRK8N5Uqbi34hPUTuR8Ro52mMhJXForR3SIGypI0k5+xTqcwqBq6g9V8Z YvTJj5qwFBIIt2rHC5NMgKc69A5dFWMPLwv54pR2YOj4sz8+sMhXC0YHjGAPEJZj4X5SSI jfrYIKj7/gFYjpP6alkn+ZrRo40N7bpR4+xel2CQTH8lKmu7Rur0N3ZigQBcUKGn7DxpZq PimecW/kWN++eHG4EJSJJ3JbhiBNbwyVS+TdSzftn5dzyrrCECMOGQH3XtL1rFnBs0O4qD uYEjE9kqW8ocBx+5lDWI7srDiT3Aug6bgi7TuwwyoqGTojF9HeZ5hGsZ45u62Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700959136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gNpU9EuN8DrFxkGE+VKvHlLcg/Xr+ERurS3kUfuWqW8=; b=SoCxNnRlC7m6EI0YWy8q/4YYTkq/QQDO1tQtVnw9zy1MIW4wdjlvCiTYUlFy66gjWYw8t7 iqzNZyomusJWEYGuPO0rHX5J3pu+fvPtinNYTyDb34AKAYjvLl/H8Bd/sykYgY7enT0PDX cIovXtGaz+AJSycE9rdgY6SpOEDaaOJmgSH0J2AhuXN7pPZYG1suFt92K/FVdMvoYDNUIO YM4ljY59fQK4OmO0LEbgdt7JY/F/2BzemFPeDJrS5mLZvsxE5Hl+1lfBAtGNexvOLPsy8r 5hwthUjwniv5UqarA7iucoKLg7bZ79FdTxT4mt1XeBXFxZ1K0m6kDGA8WYdP/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700959136; a=rsa-sha256; cv=none; b=wow88oql/r/cy5qLo+yrSbotHUJS+ChN/63+qRGuZXWwf4IbG0Z5orn5cXRbOTTU8K1Fh/ lC7qotVxQdvr/DXU2/vj6j8lWvHJYt16PiTALRPvV91x8vWpUin31FJ48vnXxGlM2NCpuD DU/hM9r7V2sR3nfAt9gefgTdmv1JD+UhcqYH0U4wgTakgDK9gf9jWHoe23Ps/FqM3CMWsI TzOqOFgY6BPavPuLMvKmFoNH7c1rtPdYF1tHKMncuimpVE/PLBAyo70YvHzn50v/jWYLwa aDN/hszEzsA8NX9Er9IsZAuAf81p/AbRJW8RxunliED+GqOcLmdEJ77bURSJqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sd8wc1Y9NzZf8; Sun, 26 Nov 2023 00:38: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 3AQ0cuO5074528; Sun, 26 Nov 2023 00:38:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ0cupA074525; Sun, 26 Nov 2023 00:38:56 GMT (envelope-from git) Date: Sun, 26 Nov 2023 00:38:56 GMT Message-Id: <202311260038.3AQ0cupA074525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 78aec1cebfec - stable/13 - re(4): Add support for 8168FP HW rev List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 78aec1cebfece84f643983cb09e4555b11e748f1 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=78aec1cebfece84f643983cb09e4555b11e748f1 commit 78aec1cebfece84f643983cb09e4555b11e748f1 Author: Brad Smith AuthorDate: 2023-11-23 20:13:00 +0000 Commit: Xin LI CommitDate: 2023-11-26 00:38:46 +0000 re(4): Add support for 8168FP HW rev (cherry picked from commit 88d2b69c719a20da9eb53f1c58adf6ecb005f8ce) Differential Revision: https://reviews.freebsd.org/D42671 --- sys/dev/re/if_re.c | 2 ++ sys/dev/rl/if_rlreg.h | 1 + 2 files changed, 3 insertions(+) diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index 10ac98e3345f..0570f2574d37 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -243,6 +243,7 @@ static const struct rl_hwrev re_hwrevs[] = { { RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL", RL_JUMBO_MTU_6K}, { RL_HWREV_8168EP, RL_8169, "8168EP/8111EP", RL_JUMBO_MTU_9K}, { RL_HWREV_8168F, RL_8169, "8168F/8111F", RL_JUMBO_MTU_9K}, + { RL_HWREV_8168FP, RL_8169, "8168FP/8111FP", RL_JUMBO_MTU_9K}, { RL_HWREV_8168G, RL_8169, "8168G/8111G", RL_JUMBO_MTU_9K}, { RL_HWREV_8168GU, RL_8169, "8168GU/8111GU", RL_JUMBO_MTU_9K}, { RL_HWREV_8168H, RL_8169, "8168H/8111H", RL_JUMBO_MTU_9K}, @@ -1497,6 +1498,7 @@ re_attach(device_t dev) RL_FLAG_CMDSTOP_WAIT_TXQ | RL_FLAG_WOL_MANLINK; break; case RL_HWREV_8168EP: + case RL_HWREV_8168FP: case RL_HWREV_8168G: case RL_HWREV_8411B: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | diff --git a/sys/dev/rl/if_rlreg.h b/sys/dev/rl/if_rlreg.h index 2fba14475256..793c924d969b 100644 --- a/sys/dev/rl/if_rlreg.h +++ b/sys/dev/rl/if_rlreg.h @@ -194,6 +194,7 @@ #define RL_HWREV_8168EP 0x50000000 #define RL_HWREV_8168GU 0x50800000 #define RL_HWREV_8168H 0x54000000 +#define RL_HWREV_8168FP 0x54800000 #define RL_HWREV_8411B 0x5C800000 #define RL_HWREV_8139 0x60000000 #define RL_HWREV_8139A 0x70000000 From nobody Sun Nov 26 00:54:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sd9GH0jVHz52966 for ; Sun, 26 Nov 2023 00:54: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 4Sd9GH0JPTz3NnK; Sun, 26 Nov 2023 00:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700960055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0FlsyaXAyu7KkGuIqGN1mYBFKAgK3ReQv41hgeKRBvE=; b=M2R+u2dK0f3Edm3z9p3kzc+wufxfvCjkqwDl5by2sj36R90H5wXG+cYfOR9S1asTeSsFtG C3O0wyIyG4NqDZ4x3vzuPqOgKLWjueotdA9aYN1LxIruPMEzZ3e5Qa4NC0Q1nDT/NMJVas Qk1sXeNEgSx9+/KuJw1MOP6FZbNF1aahsFxZkrA5nxsNZtMsLAsGPd1FD81LDGS3wtIteM jdFrOahtCrjuqMhQvySWxWoxNi9IJrERwOlIHvOqqP0unmuMBX5J3EuiW2LzO6f1oMsGVi tGlOCrRvzrAjTE5iGpfwQSJs155Du9+LLHbuC/kusEangG13c8N6V1kkSXCZog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700960055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0FlsyaXAyu7KkGuIqGN1mYBFKAgK3ReQv41hgeKRBvE=; b=t09PzW9tvKV7bdcYa10c+B25aUTeJYzbmblP9uLC7aYtWqUWHuU6HcssaH4WUBHMx9cXWI BP2nbG1kor9ayUQN6L46orSvkLhwzgOw0KwZbpaF1fN6Mb3DNXSQ6nZw6hcbaG/dc4BWu1 S8nxahnypQXjgvf41b3HF3vFKwriNfqY7yJ+/DeGqa0uCuYFJQpdXM+wcGm6j97W6KXz9/ w8yi13Rq1ozV7/20l9x3qgnD2159za07BRxcUJYBUBipobikIU7J0aIm20zQSPaf6f2cGn oXjtXkUNXiyXz8rl95Nu4Aqk6W282qbv3SBqAH+K9p2W2WoeGlGVQXTfs30zyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700960055; a=rsa-sha256; cv=none; b=AVu9BT1PiDPvmx+5ycbePn+ySHGLCRNonF3WGL0wLxezarsaGbygp1mlyOsGh6IKMeef8R mlY31KpZsNLAoF4ZsjWteTZ4OiuRQ2thD5ufaGHSry281Y4xi1Urydey2Nc1gbonjgeOiK M1qx4b+tmiTOaH4Aq371aiAajXW+Z7IWnfSDOxcG8/ntdOGnWU/Im7Onco5B9kzEXfHTqr UEHsw/bj1+9jbBBJo/nBU/UNxZeedURzvLJcfkAYwK0NqwVFyhRII1wlGTb1wKtEMfLLmo Cz8KJbyyluZY1Fva8bQhzGk6yt6zU0DdKncHeMJELufrRuJZ1a79dV1bKZW4KA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sd9GG6C07zbQy; Sun, 26 Nov 2023 00:54: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 3AQ0sET4007398; Sun, 26 Nov 2023 00:54:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ0sE3b007397; Sun, 26 Nov 2023 00:54:14 GMT (envelope-from git) Date: Sun, 26 Nov 2023 00:54:14 GMT Message-Id: <202311260054.3AQ0sE3b007397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: 42df52d15694..039b23c9238c - vendor/xz - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/vendor/xz X-Git-Reftype: branch X-Git-Commit: 039b23c9238cdf8995ad978ae6342957c2f819fa X-Git-Oldrev: 42df52d1569483d9669f39caca7d0d875992c7d9 X-Git-Newrev: 039b23c9238cdf8995ad978ae6342957c2f819fa Auto-Submitted: auto-generated The branch vendor/xz has been updated by delphij: URL: https://cgit.FreeBSD.org/src/log/?id=42df52d15694..039b23c9238c 039b23c9238c Vendor import of xz 5.4.5 (trimmed) From nobody Sun Nov 26 00:54:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sd9Gg5hz9z5298h; Sun, 26 Nov 2023 00:54: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 4Sd9Gg5BPQz3P5R; Sun, 26 Nov 2023 00:54:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700960075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xKZZ6wlztjN1YESm9nOQ9BPFU4Ou41Qxs7xJnWGqgRc=; b=JsA1Z51NwkldMx/GRDbpKRa8G9Gd7RVjPh0cOhKPZ8pzQLRYPlekY0qDWDLk47H50gtXtx gDOpgj7HDJsegoHv0ldcmg8mT20KgzW2RgQkAnFKmX5svL4N3J4pVHJQkzEyROqtywPNO9 /BerlytfOeXo1dnT/AC0SbflQKkyU807gwv6O/0ebmQdzVyE9+6dTAtMwv4nUajEoO1JSU b5FC2gqYCCTbqewf3+y/kxwkOr9Ny23/5+B/kjJoXPwznCSqetrxhNWxZ9X33yFv5Hg6WA tmhki+mG7SBn2ErnmP69zaPz8zTgXdVGNm6C3m7BJXiv5IqSWCp9x/bO2edXjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700960075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xKZZ6wlztjN1YESm9nOQ9BPFU4Ou41Qxs7xJnWGqgRc=; b=WBjqwB4QqK/2GAbdi1M/DDwuyHuNYnWvOblkdzDpiBip+Ab/cbOt0BIGUc7+rx/3q0lgMl 73QEZx9xvRsSLd2b6v1HBw/hklwh8xl4uj3GBv4t0dxRTmongdruSNjtiKtzkI/NCQ4tp9 Wq1sx/CxpqiB+qkdRDJLEtnrtiSubwxpoqLHJV58KQx9eYYrSwv29gcKWLL/ZqQBurN67T be5vH/BDkR3N5EhNAQTiR+69rnfSzdbW23TxEvpM3gbVOctpf6FZPDp1Rc/a5PHgFRu0YJ p2WZ5028E/leVvtl9uzt7Cp7IFd2mUHLHHqKKq9CHoXCt7Cple8dVS8xvVZzrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700960075; a=rsa-sha256; cv=none; b=WDee5/9FrKs2sgt4cB3rlNq/RlM7BWuCjG/WP8rYWyWLTsVjA8uvOid6eb/HmET7ygd0v/ bZPBuO1Ds10k9THn9Che5GsNi8vT2sPVJJcEENNzIid3zyHNz0aAQWAtMgsxeLzqfHLjXs 9G4QioyA2tc/kx0I6auAATf/xNps7OvqxAhhXYKLRFIPyWP69xFPw5k6vCpTtbuoH4hbKn z1bNEE8CVTyKQuUMjplsglLB9bJsnxOHaQVE6PeISuChnIu2pDhhOyHc/R4yAiqjXzO8Wq CYak8KsJXvsheTXLxa29WxzxrIpAW92a35ulinilMhl6YhOVM+OoCHbSLE4e7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sd9Gg4DwVzbNb; Sun, 26 Nov 2023 00:54: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 3AQ0sZeZ007585; Sun, 26 Nov 2023 00:54:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ0sZjF007582; Sun, 26 Nov 2023 00:54:35 GMT (envelope-from git) Date: Sun, 26 Nov 2023 00:54:35 GMT Message-Id: <202311260054.3AQ0sZjF007582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: a7c25f0d0644 - stable/14 - nfsd: Fix NFS access to .zfs/snapshot snapshots List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a7c25f0d064425bc7a3b170aa441fecf0ae38600 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=a7c25f0d064425bc7a3b170aa441fecf0ae38600 commit a7c25f0d064425bc7a3b170aa441fecf0ae38600 Author: Rick Macklem AuthorDate: 2023-11-23 15:23:33 +0000 Commit: Rick Macklem CommitDate: 2023-11-26 00:53:29 +0000 nfsd: Fix NFS access to .zfs/snapshot snapshots When a process attempts to access a snapshot under //.zfs/snapshot, the snapshot is automounted. However, without this patch, the automount does not set mnt_exjail, which results in the snapshot not being accessible over NFS. This patch defines a new function called vfs_exjail_clone() which sets mnt_exjail from another mount point and then uses that function to set mnt_exjail in the snapshot automount. A separate patch that is currently a pull request for OpenZFS, calls this function to fix the problem. PR: 275200 (cherry picked from commit f5f277728adec4c5b3e840a1fb16bd16f8cc956d) --- sys/kern/vfs_mount.c | 35 +++++++++++++++++++++++++++++++++++ sys/sys/mount.h | 4 ++++ 2 files changed, 39 insertions(+) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 1a559bfd998e..1ba3b1559a69 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -3136,6 +3136,41 @@ suspend_all_fs(void) mtx_unlock(&mountlist_mtx); } +/* + * Clone the mnt_exjail field to a new mount point. + */ +void +vfs_exjail_clone(struct mount *inmp, struct mount *outmp) +{ + struct ucred *cr; + struct prison *pr; + + MNT_ILOCK(inmp); + cr = inmp->mnt_exjail; + if (cr != NULL) { + crhold(cr); + MNT_IUNLOCK(inmp); + pr = cr->cr_prison; + sx_slock(&allprison_lock); + if (!prison_isalive(pr)) { + sx_sunlock(&allprison_lock); + crfree(cr); + return; + } + MNT_ILOCK(outmp); + if (outmp->mnt_exjail == NULL) { + outmp->mnt_exjail = cr; + atomic_add_int(&pr->pr_exportcnt, 1); + cr = NULL; + } + MNT_IUNLOCK(outmp); + sx_sunlock(&allprison_lock); + if (cr != NULL) + crfree(cr); + } else + MNT_IUNLOCK(inmp); +} + void resume_all_fs(void) { diff --git a/sys/sys/mount.h b/sys/sys/mount.h index c4e1f83e9683..70f4bc2b834e 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -980,6 +980,9 @@ enum vfs_notify_upper_type { * exported vnode operations */ +/* Define this to indicate that vfs_exjail_clone() exists for ZFS to use. */ +#define VFS_SUPPORTS_EXJAIL_CLONE 1 + int dounmount(struct mount *, uint64_t, struct thread *); int kernel_mount(struct mntarg *ma, uint64_t flags); @@ -1016,6 +1019,7 @@ int vfs_setpublicfs /* set publicly exported fs */ (struct mount *, struct netexport *, struct export_args *); void vfs_periodic(struct mount *, int); int vfs_busy(struct mount *, int); +void vfs_exjail_clone(struct mount *, struct mount *); void vfs_exjail_delete(struct prison *); int vfs_export /* process mount export info */ (struct mount *, struct export_args *, bool); From nobody Sun Nov 26 00:54:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sd9Gm6pXyz529QR for ; Sun, 26 Nov 2023 00:54:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sd9Gm4cPCz3PbC; Sun, 26 Nov 2023 00:54:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700960080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jmIvWY/Bg1Td3udgLWrqPLO9rWUW08QfRoHbiFukSgY=; b=wSLUhBp0FE+o+5aYNuJwtLgfKccO3xyuV4hcVqEJpgi4atlwXflv0h1vGBeDgjJsQK9X11 7necvlgP/WvKvH6azzbF3i+1kCIN005dNbAd/nrUm3UnutFt6OOesixvfhPXdWjUyEfMSQ 1azR8eIzSzy083JwA6R/IjPBqN7Yg58QzwiPlyBkTs1BkJCeqbzbvhMj7BRLvIIAddMtWJ VPHS1YzfrRyXpFQMZZCHikAmdrdkJ5cDMLs3AZVLwVhJ6H0NtNlOzxTgDmAY9bCYXzYoap ECW75XoCG7NS6pxZhz5qirf08VdrgFu6BzJLP3RXFcJ8jTOfr4WtTz38H8TkWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700960080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jmIvWY/Bg1Td3udgLWrqPLO9rWUW08QfRoHbiFukSgY=; b=nuPl7HLN15ltPGghMEU6W3cBkcCA2eWQpYLfZm1UiDs4mWW3pu26Udh+5RpEoeha4UcbH0 1y1LchagamHOSNhs5hHTbZel1OKmIP5+wLGkE/cu/EXNiyke/AIUZkaMjhx2wwj3ta/1hl Bw7hJ23/5PzMJsxRRNMVXe70Uy4KJx2Tu3KHHPdva3b6cwBvK5k5hRb2IPdDpd+ZfLOYTJ iB9wXcUq1aOHVRbZfccKyjKMODFmREm3uYH6d5wrOpGAycisFNA6Hcz//Iz4ihTyDplQHI GFadLKBxDKQl7Z/DS0lOsn2PU6IB7RC1rAveywgLSQrXQK/iMHfYAnsvf/O/Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700960080; a=rsa-sha256; cv=none; b=su/0atBkovbIyvfaOs8GaxICMWWQmi5+BMb9AELiiDiM4w72b6bdU3Vc77MH9q3lZpwI3U 01ZwLlqCYmqOSexA11vt4flL1Uv5E63DtyDMP5u9s2QaI2Pu+nfSmsjBahCWLDgUQfaI5h YA0+ZC+l4Ln4EQKLcCamqFt/iV1NokTHNqtleOu+A2cJRoZBDIwH+FPfhZFgO8uaZwEBtV fot12YMweeXJDxt5SILKuBIDGucjORQK1Guze8j6jkTYQ/WxkVbL1WkSkPPVCnXjR4ixCb 15jREuTF9q9yk8vQ089Hald49KLqRfQIQZOQcKMbZGcYXUqbf4X4mHehvD4L+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 4Sd9Gm3RgHzZwC; Sun, 26 Nov 2023 00:54: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 3AQ0seS7007691; Sun, 26 Nov 2023 00:54:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ0sekU007690; Sun, 26 Nov 2023 00:54:40 GMT (envelope-from git) Date: Sun, 26 Nov 2023 00:54:40 GMT Message-Id: <202311260054.3AQ0sekU007690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: 61c095858c43 - Create tag vendor/xz/5.4.5 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/tags/vendor/xz/5.4.5 X-Git-Reftype: annotated tag X-Git-Commit: 61c095858c43d818843b505c964254c525036c71 Auto-Submitted: auto-generated The annotated tag vendor/xz/5.4.5 has been created by delphij: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/xz/5.4.5 tag vendor/xz/5.4.5 Tagger: Xin LI TaggerDate: 2023-11-26 00:54:30 +0000 Tag xz 5.4.5. commit 039b23c9238cdf8995ad978ae6342957c2f819fa Author: Xin LI AuthorDate: 2023-11-26 00:53:12 +0000 Commit: Xin LI CommitDate: 2023-11-26 00:53:12 +0000 Vendor import of xz 5.4.5 (trimmed) From nobody Sun Nov 26 01:03:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:07:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFYZ3Qrgz52kGm; Sun, 26 Nov 2023 04:07: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 4SdFYZ2zhlz3FLY; Sun, 26 Nov 2023 04:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qQbZ2eNLURhNhpYZNwT3knB9cf6iREAebv1kZGMNB04=; b=pQ41MNsBrHqjJtyCObp8sx/KyyNvxzyVzENzOQl/WM+ozrzwJufup0kM2iNc15oa7knCxO sxiwCLG4brNJxo0x8SP6SII+DIxXAC50Klg10H6iew2LH/DCI+Jg2hF0inEFA0fK8Z2dXI HOGu47khl4j7L1kyLramheTv5J6cFJsX00tUmCuGEwdkL16xgklBnfn2bXBLRMjQifFfxB 4NXYgqOnWSPzX7ybHW3inTKHf9Zqt0Rc9ddeHOC2vH126KwqW1Qrhyrpbw12hQRQHfrsLR RVkVU0Su1LcSYNsBDu/RZa5ek5vx2vsEwj3v137LDcYsSNb9x2e5/kK9HD26Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qQbZ2eNLURhNhpYZNwT3knB9cf6iREAebv1kZGMNB04=; b=cuM7dQFFna5zVCDHcK7VenJxbfs3RT31ejeSd8GgaGnlewup3p0PlAhOPYygFW0vVfB/XF x1TKdQyAYcAHMFGohimjh0OZ4qaKiIWWwapq+qZeWNW1Dd7uFDPWa9uBkZGZXHEUEk9O28 muTEGrV5BIvLjzZGZeKjcGDPpfvvLSuzhoadmr3sbtRJmtk/bjbHuU+w4DesttDRLYeSvz 92P54Qt4GDwGifjBx+dV8lCxmWfQsovIGuFf1mWJ5DNEy4zsgUITO9kMeY2YahPWx3XB0i JTlJD1CFO5CcxeO8zhANwSqPYv5cQ/6yGJDq2431c69MBU5KjtPR4/QEn7D69g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971666; a=rsa-sha256; cv=none; b=f8mBKwfLyyxBHBKiZaUzv21+cHU/Z4ArNldth8wRdzz7I5/pYpnj+u9ykmI8dvZaiQyJIz CNceAeS31Pe4EJ6l57fVKTe1pLRgSdd5aruICaqkuhbcpt2Ll2IrsVKrxrrunCgnuuRYqR l4dnKjmYlxqyXAKNL1BzD2r24F8++hxYvza774XCmrvUXHSIpUW9FhjELM9H2yjguhybCY J2pL6gXskNCmMZY4v/Pl+E3nmgPXz20/zw6qJKAgHGP4/PrwrebnSHoa/sBskw1KfB9pFk mp0p8B3BNo0C+BAz2GDKf9bvJZ/D4FWSJSUlCGnb2JSuCMVG+xoPxluUc0PeOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFYZ230xzgYK; Sun, 26 Nov 2023 04:07: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 3AQ47kVh028269; Sun, 26 Nov 2023 04:07:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ47kmt028266; Sun, 26 Nov 2023 04:07:46 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:07:46 GMT Message-Id: <202311260407.3AQ47kmt028266@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 1304190b593e - stable/14 - bectl: fix some `mandoc -Tlint` complaints List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1304190b593ef2081068ea1e108f54f2abd7ea89 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=1304190b593ef2081068ea1e108f54f2abd7ea89 commit 1304190b593ef2081068ea1e108f54f2abd7ea89 Author: Kyle Evans AuthorDate: 2023-10-05 02:26:55 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:07:11 +0000 bectl: fix some `mandoc -Tlint` complaints The EXAMPLES mis-comments caused an obnoxious amount of blank space above SEE ALSO when rendered by mandoc to a terminal. The missing termination of .Xo meant the description of -h ran together with the subcommand synopsis. The other changes were generally ignored tags due to context that simply don't need to be there. Provoked by: grahamperrin (cherry picked from commit 9b03a5de73d41f98b9b3c8e250a58f62f3e48d61) --- sbin/bectl/bectl.8 | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 718f4e2597ae..19cd867df56b 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -15,7 +15,7 @@ .\" .\" @(#)be.1 .\" -.Dd June 28, 2023 +.Dd October 5, 2023 .Dt BECTL 8 .Os .Sh NAME @@ -114,12 +114,12 @@ For instance, booting into the recovery media and manually importing a pool from one of the system's resident disks will require the .Fl r flag to work. -.Pp .Ss Supported Subcommands and Flags .Bl -tag -width activate .It Xo .Fl h | .Fl \&? +.Xc Print usage information. .It Xo .Cm activate @@ -396,7 +396,6 @@ will force the unmount if busy. .Pp Unmount will not remove the mount point. .El -.Pp .Ss Boot Environment Structures The traditional .Fx @@ -482,11 +481,11 @@ A future version of may default to handling both styles and deprecate the various .Fl r flags. -\" .Sh EXAMPLES -\" .Bl -bullet -\" .It -\" To fill in with jail upgrade example when behavior is firm. -\" .El +.\" .Sh EXAMPLES +.\" .Bl -bullet +.\" .It +.\" To fill in with jail upgrade example when behavior is firm. +.\" .El .Sh SEE ALSO .Xr libbe 3 , .Xr zfsprops 7 , From nobody Sun Nov 26 04:07:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFYb4ddDz52k69; Sun, 26 Nov 2023 04:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdFYb47X5z3FYr; Sun, 26 Nov 2023 04:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ouNOFMZlsagHaGhbz7HwJp5isK1v7qyOEU0Dt4Rb3R0=; b=SFFTo++5/sQ3xa9lytBCGKdR9TVvd/ynXgHR/lyKzwfYpw3XoPSPPxX379pVhE70lIuJS8 qKq6dSyX/0Z3d80ejG+v/8Fpv40hxOnRKX8dv8tsNFySz6nSq9iAOlEQleoNRhBf2EUnUm sWql0L/jxcEPj6o5Gx4+NfDOF3buKwtrzNYLB1xakeB0LG5vN+zZm/BbA/OAwT4JnPJVZw l46qUQMU/+Zm6OStKwwOA5QcssjueZ8N0CUY2fHqq6fiDa/QvtCE7HuVISWAjLAAp1vhlO 8odL734lgizfXZd5Acy1ORV2UvRCceipQS2Buqx0VoZlEmacuArpM8qZazGb1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ouNOFMZlsagHaGhbz7HwJp5isK1v7qyOEU0Dt4Rb3R0=; b=lqeJyCRGPXE2XfDZ8GjO9H5FY057L1PyzxElkOn+EkBJpgK/HDVlh/hQBTWW/BLWcHz0aQ wJwUiiPR9Aj3ATqB14TvTPvb5ptpYZ20uYK+8l4/VerahNMBXISA/1/1mju1nqpJlTNBlh 7ufM6XabktTNzAIhTI5kCB7ZS0Y63aUXCvhlPSe3ztoZj6ylSBZ6PejqdI6ZyskPQqHA+8 U10rT6jb44J64u+2VgvJaYRGwopkJ8CEKxwuiJZhn+DleL0yGyYuE1ryh6naFqz5Q74W8K CJCUlyOwMEjxxh6kBFbUmcAOaIu6upRuAFKgiEXA46oxrdOmJk/zxwSWGeNCUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971667; a=rsa-sha256; cv=none; b=jO7EDKQ4napWLFe5nn+u7No3sQKDK35d2uLdfdJ04dIBPCZ2PtiUwhuy6m4XPLUly4+A/N fzen6cJMYg83cHTVcm2C4ZozvOqCF1egoDn5ThdRqjQEhciW1rykvaxGJ7+wr6/5IaF38j wgTKV2tAzTpIit0Xp/WeInb+tP8ZYHUCJ9d9ibg1TeAPZY3C72oOhDfrLAz4zvHcsyY1u3 zyUGGuRWsetY0mkPvGVPSo7vtZovuKyoaGNYysvN6heUTprLRRYQULxObvIYWffl5g58QE hKXyKEiw2jLS4VC5z+4hTYWCX5gKS8dLoCUtbSVITSrsFKtCioO0avzfnTvhzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFYb2hZMzgsS; Sun, 26 Nov 2023 04:07: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 3AQ47lLG028323; Sun, 26 Nov 2023 04:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ47lVm028320; Sun, 26 Nov 2023 04:07:47 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:07:47 GMT Message-Id: <202311260407.3AQ47lVm028320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 93f1302dc633 - stable/14 - usb: add quirks for the Genesys GL3220 card reader List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 93f1302dc6339bbf7e7ed42664a3e848b76eafcf Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=93f1302dc6339bbf7e7ed42664a3e848b76eafcf commit 93f1302dc6339bbf7e7ed42664a3e848b76eafcf Author: Mazin Fadl AuthorDate: 2023-10-11 03:22:12 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:07:11 +0000 usb: add quirks for the Genesys GL3220 card reader Without these, card hotplugging does not work on the GL3220. PR: 263868 Fixes: 7520b88860d7a79 ("usb(4): Automagically apply all quirks [...]") (cherry picked from commit 94efe9f91be7f3aa501983716db5a4378282a734) --- sys/dev/usb/quirk/usb_quirk.c | 2 ++ sys/dev/usb/usbdevs | 1 + 2 files changed, 3 insertions(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 38016e6abc1b..84ad6398ffca 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -260,6 +260,8 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE), USB_QUIRK(GENESYS, GL641USB_2, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_WRONG_CSWSIG), + USB_QUIRK(GENESYS, GL3220, 0x0000, 0xffff, UQ_MSC_NO_INQUIRY, + UQ_MSC_NO_RS_CLEAR_UA), USB_QUIRK(HAGIWARA, FG, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(HAGIWARA, FGSM, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index da712c5a5954..72eb001d3508 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -2295,6 +2295,7 @@ product GENESYS GL3520_SS 0x0616 GL3520 4-Port USB 3.0 DataPath product GENESYS GL641USB 0x0700 GL641USB CompactFlash Card Reader product GENESYS GL641USB2IDE_2 0x0701 GL641USB USB-IDE Bridge No 2 product GENESYS GL641USB2IDE 0x0702 GL641USB USB-IDE Bridge +product GENESYS GL3220 0x0732 GL3220 USB 3.1 AiO Card Reader product GENESYS GL3233 0x0743 GL3233 USB 3.0 AiO Card Reader product GENESYS GL641USB_2 0x0760 GL641USB 6-in-1 Card Reader From nobody Sun Nov 26 04:07:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFYd0GNxz52k8C; Sun, 26 Nov 2023 04:07: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 4SdFYc4gLwz3FMQ; Sun, 26 Nov 2023 04:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EIlbwSCknvUAnPSgLbzusj8BVjBcNM9rjg9tQ0ooLQQ=; b=rfjq43bo2akvRJRtO8Zj15pL9zubEapkP+kQ16JXd54psF/bezSsN6ROLw5o+mvQH7atYA Nv1I0/PTylov77szgFZejZvkmn5R9TUVJMeeg/VCGXexnSWQplryLLsNDunoSgoL0OzhEa eN1DrEOe2+JQW/kSFvWo2TRACaGO+FIVEJYmURYmbh1+ZewKSp7LnT2jIpm1/7aK9K+dAl WnZEI2gLi/Atrow1+RtIFjZA8+oR7J+zqO1H1wXcu8czjiin4Z4X1FAct1PhCoNN/pbXMh zu92KowFIt2BAq3tF/HEaqs5tq2HQDDxAFc/f2wvhnelgyB4JWGf9fmDGPgG5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EIlbwSCknvUAnPSgLbzusj8BVjBcNM9rjg9tQ0ooLQQ=; b=e9jqep1o9zCKwW912w2EAlJGWJ5QYJI/P6ob9Y9wjtYQAzsmdG4BvlirHlVqGB5//wuife h8U+XzvCYr7/eTtXqElY8Flvo2dPTnnVY+QKUxXphhk8iLvnvCbuWNFzAZzlCRNSTPlVBx IO5xSsqlngLPk1qq5gww/PyuQ2lPcARdyuz9Su8a1FNygFzfyzmK2Ul3nRkxDjK73fyeHs IJo3bDt2Qt1LqZWIojpzvd9AVx5kjrvawhTsJ47XI+jLIpBQwtde0g4Pnj4PwuofUrZGXp Hwl8aoXdtC+lf0NZJrcmim3dNTIwRwpd4AzSdM2cwZDTkhtN4c8QS7d3BHlzBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971668; a=rsa-sha256; cv=none; b=NEJgNSVlb2v1MUj1Ps5wt3AzhaJnJV7kbUoz22FiAv7eXUQg4V86YUzL0o0ib3EmEV40wM P8iz0FhwROeZesZUbyX+Sujc8MGfb2FGyJj3ZqaSvKcBf/9CBxpdOx4VyyNdtERml9raU0 tKhv45eDC+TRaiEX2QRL5/8jGZ40BW0LWZ1qDaLSyWDY46PKvJ8fWPAirStq361FJ1jbt+ Zy+Ay1nJgUgn+s8+tavJPT5v1U8sdyvOjfrgNgkQLcZ8seYV+YbIqE6olvCDkLKbsYTf/a /u5lu2T79ZZH2EWaASn9jdC4O9QGrjzWg6p/d456a5Pdh4duIvlJu2H21ujGVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFYc3n8xzgYL; Sun, 26 Nov 2023 04:07: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 3AQ47m8L028383; Sun, 26 Nov 2023 04:07:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ47mt8028380; Sun, 26 Nov 2023 04:07:48 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:07:48 GMT Message-Id: <202311260407.3AQ47mt8028380@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6c22e9fa0c0f - stable/14 - usb: add necessary quirks for the NOREL Systems NS1081 SD reader List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6c22e9fa0c0f9f5b2052b493e4b64205695a0045 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6c22e9fa0c0f9f5b2052b493e4b64205695a0045 commit 6c22e9fa0c0f9f5b2052b493e4b64205695a0045 Author: Mazin Fadl AuthorDate: 2023-10-11 03:12:22 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:07:11 +0000 usb: add necessary quirks for the NOREL Systems NS1081 SD reader Without these, the Norelsys NS1081 is completely defunct. PR: 263868 Fixes: 7520b88860d7a79 ("usb(4): Automagically apply all quirks [...]") (cherry picked from commit b332adfa96218148dfbb936a9c09d00484c868e3) --- sys/dev/usb/quirk/usb_quirk.c | 2 ++ sys/dev/usb/usbdevs | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 84ad6398ffca..bf2de35a149e 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -357,6 +357,8 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(NETCHIP, POCKETBOOK, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(NIKON, D300, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), + USB_QUIRK(NORELSYS, NS1081, 0x0000, 0xffff, UQ_MSC_NO_RS_CLEAR_UA, + UQ_MSC_NO_INQUIRY), USB_QUIRK(OLYMPUS, C1, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_WRONG_CSWSIG), USB_QUIRK(OLYMPUS, C700, 0x0000, 0xffff, UQ_MSC_NO_GETMAXLUN), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 72eb001d3508..6543f0cbaa29 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -776,6 +776,7 @@ vendor ARDUINO 0x2341 Arduino SA vendor TPLINK 0x2357 TP-Link vendor WESTMOUNTAIN 0x2405 West Mountain Radio vendor TRIPPLITE 0x2478 Tripp-Lite +vendor NORELSYS 0x2537 NOREL Systems Ltd. vendor TENDA2 0x2604 Tenda vendor HIROSE 0x2631 Hirose Electric vendor NHJ 0x2770 NHJ @@ -3503,6 +3504,9 @@ product NOVATECH RTL8188CU 0x9071 RTL8188CU product NOKIA N958GB 0x0070 Nokia N95 8GBc product NOKIA2 CA42 0x1234 CA-42 cable +/* NOREL Systems Ltd. products */ +product NORELSYS NS1081 0x1081 NS1081 USB 3.0 Flash Card Reader + /* Novatel Wireless products */ product NOVATEL V640 0x1100 Merlin V620 product NOVATEL CDMA_MODEM 0x1110 Novatel Wireless Merlin CDMA From nobody Sun Nov 26 04:07:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFYd60GLz52k6D; Sun, 26 Nov 2023 04:07: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 4SdFYd5RV7z3Fd6; Sun, 26 Nov 2023 04:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RkmLjYMs4XpAXjTa4qYkSPJdqezpoz89Z9/N/fr1nOw=; b=vYKK3lexFjNjDZTC3CIP+pERXyrUULMDnUc2O2lBl3YKCr7G25uLkzSppuHr6942KyVLVy 5qNJhYg9FxHdBT2cvBpKPKfcphUZ3NMUfPxOzGbjCSOw0xwiY95iOTQW+0us0IylS04W4/ EMVjUK1j5wFH+pDluuMPBuM9GvIUTF5Uf14iZi3WoyZEnzKLv0Ed+sP7RjkNIP1kJUi62z Fja4NcOAJ6Njdy2mihAliDx8qYE3XxAy9iQikkZeUqm8DTduJyma6jO33U5vev3bywRVjn Unmie6cVuc6uM1XOlATsEI6oUrjh3hpimcpP6jOn+pMAuS1DhnQVaua9PUiPWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RkmLjYMs4XpAXjTa4qYkSPJdqezpoz89Z9/N/fr1nOw=; b=Zl8sBCx+Y33aL93Unw/WeOnR1A0YTTbch66gtHZyD8lsqLOmnjTXUQZrwLaRKF79tDpNvI AERsoQ+NV8qyXVLzQuohYzvQt7c1Lc2ZhgEgqzie8xKYRQiJGtSKNZ7ZuvW4Ckk+Dh8izc JCfkgzCxWqvOgGY2eZNukttKNuzslYT9CcqDQO/S4rLcDwWLDKGsvUpWcOiZMDusHSnxFx vaMRHRbxcH/sBKIxSKSxzquOpLvxn9FcoL3ScvT0Gfb2pCUUnbkeXoUKElv+fj6fwOW3pZ 2tpZAeisdUcJ/vPhm9uswC1euRS4VFd8wCosBlEtJg8cbrA5weKsd6CrFlZcCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971669; a=rsa-sha256; cv=none; b=Q6Ed2NbBSEFDufe83LPkxvV6Uzs9172gprt5yc6CixffekWRgDw/sLetUXECJJ7s3AOGML pLOOo1wVoSZarqkknCEXbEO2qgawok4LKKgwJHWs/wZxWiMPvYfXl0tUs00CUIJo8EeTFa 8jvKaNHPR5bNHOiCN6xfwPYKxMFJVcWlXkEzL3zraa1XK3BkK25TJEAGezY9TGZ4NWgLxV DkdWi8DqDbnufjDq2JejDwnbT+XsmtoSpX2Nnugh0mFgI1SbCRTZALWoh3enwRBpBtA9Tx 8D8W2Bk1WmL4kOeK7lPjdXD+AV1pe6iU8TGl0RU5hxy+JPzyth8a8xiLZFQtDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFYd4YB6zh42; Sun, 26 Nov 2023 04:07: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 3AQ47ngg028431; Sun, 26 Nov 2023 04:07:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ47nmH028428; Sun, 26 Nov 2023 04:07:49 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:07:49 GMT Message-Id: <202311260407.3AQ47nmH028428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: d416cca27a23 - stable/14 - install: handle -m +X more accurately List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d416cca27a23ac247fee77ebb38798fe404747c2 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d416cca27a23ac247fee77ebb38798fe404747c2 commit d416cca27a23ac247fee77ebb38798fe404747c2 Author: Kyle Evans AuthorDate: 2023-10-19 02:43:06 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:07:11 +0000 install: handle -m +X more accurately As described by chmod(1), +X in the mode may be used to optionally set the +x bit if the file is a directory if any of the execute/search bits are set in the original mode. The latter is not applicable because we assume -m is a fresh mask, but a functional +X could be useful in the former case if we're passing along a common INSTALL_MODE that's designed to install either 0644 or 0755 depending simply on whether it's a directory or not. Reviewed by: des Sponsored by: Klara, Inc. (cherry picked from commit 767c97c501ae72eb3d74bc23ddf5a1d570d8f841) --- usr.bin/xinstall/tests/install_test.sh | 16 ++++++++++++++++ usr.bin/xinstall/xinstall.c | 12 ++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/usr.bin/xinstall/tests/install_test.sh b/usr.bin/xinstall/tests/install_test.sh index b42bdfd0dc60..cbe95f0dfbf3 100755 --- a/usr.bin/xinstall/tests/install_test.sh +++ b/usr.bin/xinstall/tests/install_test.sh @@ -481,6 +481,21 @@ set_owner_group_mode_unpriv_body() { atf_check_equal "$u:$g:10$cM" "$(stat -f"%u:%g:%p" testc)" } +atf_test_case set_optional_exec +set_optional_exec_head() { + atf_set "require.user" "unprivileged" +} +set_optional_exec_body() +{ + echo "abc" > testfile.src + + atf_check install -d -m ug+rX testdir + atf_check test -x testdir + + atf_check install -m ug+rX testfile.src testfile + atf_check test ! -x testfile +} + atf_init_test_cases() { atf_add_test_case copy_to_nonexistent atf_add_test_case copy_to_nonexistent_safe @@ -523,4 +538,5 @@ atf_init_test_cases() { atf_add_test_case mkdir_simple atf_add_test_case set_owner_group_mode atf_add_test_case set_owner_group_mode_unpriv + atf_add_test_case set_optional_exec } diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index d19bacbe8c1b..1ab9cac76f2f 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -189,6 +189,7 @@ main(int argc, char *argv[]) fset = 0; iflags = 0; + set = NULL; group = owner = NULL; while ((ch = getopt(argc, argv, "B:bCcD:df:g:h:l:M:m:N:o:pSsT:Uv")) != -1) @@ -255,11 +256,10 @@ main(int argc, char *argv[]) break; case 'm': haveopt_m = 1; + free(set); if (!(set = setmode(optarg))) errx(EX_USAGE, "invalid file mode: %s", optarg); - mode = getmode(set, 0); - free(set); break; case 'N': if (!setup_getid(optarg)) @@ -301,6 +301,14 @@ main(int argc, char *argv[]) usage(); } + /* + * Default permissions based on whether we're a directory or not, since + * an +X may mean that we need to set the execute bit. + */ + if (set != NULL) + mode = getmode(set, dodir ? S_IFDIR : 0) & ~S_IFDIR; + free(set); + if (getenv("DONTSTRIP") != NULL) { warnx("DONTSTRIP set - will not strip installed binaries"); dostrip = 0; From nobody Sun Nov 26 04:07:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFYg0bTlz52kMg; Sun, 26 Nov 2023 04:07: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 4SdFYf6pYQz3Fpj; Sun, 26 Nov 2023 04:07:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tzaVbYpHgA+f+CDPCjhss3LqRIK7N2Fd2N9L+u2+xUk=; b=rOeWIsbAhU9b56zDYZawIRdqrexMa9OtLrbUtmPPJaP7BtVVHCy75gJ0MASaq9qfbv+7TB RePe8QdwaC0pI2iKvfqHkO1g3nzppzPphHzBICQez46uiHOaSvO1QoTVYrWqJSSo+UiPGM Zbwz7QiOFt3XdRBaz6fKwqdIRhMAxa0g50/S9jPlM2x1HAJcQ2Zwqu8w5ghem6bG1hFnvg 3wfCgjroag/wsxofesrWAly+57mvPACa6KzuTX/57VLRmEqXjSoIPo9bPiShi9rWzDlUAG 191rYqUvXjmjmqZmG66b/gV4s3pESZqCMAVOWmfKpYV4lH43dY8ApIWPgDWc0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tzaVbYpHgA+f+CDPCjhss3LqRIK7N2Fd2N9L+u2+xUk=; b=Y9ajt1bXQGUBZOCYDyn888BHTfsJhkRwDsJ9wkSJrzd2SVXEBk7RkaBw50cCKqfwfKf0wj 6sjv3+Z5UdiYdO++ojCo5G+UBAQYdrE3qsEMx18y6VLBKVWGPDipLsTKgH/OMPfJrpjdGu EseJX4uzeb7jBQ3AIy6aUaLDMcUNZZmNnlu+CDbbowt16OOiY9Ox1nxJsbY6+ZA2zmiUsq ZGd5gJLPwsgpXOzVeDjezYE/H0gg7jlyNqqRe6O5xmwuvgbgd70e5YXq+FfaLyOYV7qXz6 tdALXMjh6bVhbhM3+ZaR0CevDqZQ5bRoQww9QYVJgQSmGa7BsXECc0F31WYzww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971671; a=rsa-sha256; cv=none; b=uzcdfQBvklo5VuV6TZAWGqMQKoYqCJnZPZNo1EhJJ/ri2mVqO8bBEND99fJ7xFTEMRFL2u pKDZSKYzNZLQkf6iPcGG+4sO6kjbhF7c9qMkPf5yErkncFYvDbRWG55NWK24t3yIhWeMOZ tTqDHORWRny2NuMCf6d26lFrh06myvX4rZ+ZmJdniyjRn6ePbdqaTHUPtFRX9JSkao1irB juFbGhPtxPm0U/H0f7kKJBkEEtFcYl7+rb8456hPABHMph3TIvkNCLcoitO/yeTpJPVOHi U+9legk2ZX3fIHz/yn1yaoMcNHkrjNcAbMc3eI9Lv6RKNuruWkb29i4RDkL8vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFYf5p91zh43; Sun, 26 Nov 2023 04:07: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 3AQ47oTr028483; Sun, 26 Nov 2023 04:07:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ47oSl028480; Sun, 26 Nov 2023 04:07:50 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:07:50 GMT Message-Id: <202311260407.3AQ47oSl028480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 4ca702fdccf2 - stable/14 - grep: don't rely on implementation-defined malloc(0) behavior List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4ca702fdccf239c0a6de7da4a6261284dc08fee0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4ca702fdccf239c0a6de7da4a6261284dc08fee0 commit 4ca702fdccf239c0a6de7da4a6261284dc08fee0 Author: Kyle Evans AuthorDate: 2023-11-05 02:08:36 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:07:12 +0000 grep: don't rely on implementation-defined malloc(0) behavior The very few places that rely on malloc/calloc of a zero-size region won't attempt to dereference it, so just return NULL rather than rolling the dice with the underlying malloc implementation. Reported by: brooks, Shawn Webb (cherry picked from commit e116e040f3091eca914a06dcd0bdd9f1aea23add) --- usr.bin/grep/util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c index 1805cc74bfc6..936abc41b3ef 100644 --- a/usr.bin/grep/util.c +++ b/usr.bin/grep/util.c @@ -650,6 +650,8 @@ grep_malloc(size_t size) { void *ptr; + if (size == 0) + return (NULL); if ((ptr = malloc(size)) == NULL) err(2, "malloc"); return (ptr); @@ -663,6 +665,8 @@ grep_calloc(size_t nmemb, size_t size) { void *ptr; + if (nmemb == 0 || size == 0) + return (NULL); if ((ptr = calloc(nmemb, size)) == NULL) err(2, "calloc"); return (ptr); From nobody Sun Nov 26 04:07:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFYh1Q61z52kBC; Sun, 26 Nov 2023 04:07: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 4SdFYh0pdLz3Fqc; Sun, 26 Nov 2023 04:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yM7wOK9WrJ57RSdf91HebvuH5Vv4lDinIKGtuWezsHo=; b=gy6mUujRaAr1RXtz1rcQPKDmBkPncCuwCKUQ0j3v70RcsjQXZx/x5XlMfRlL+xfDtm7M8d IuBw90hAQVMWVl/at1+M/esY/wT30L5IsxSob4eeR0C3NYReZNTfcw5r0JshCiWXj6kEfr AhuL02RPxyeeJfNORSDPKHOLZl2W1C6wPRGkHsAjbSjKuR9Hpmxe4HpvBDFeAZfphZkLUM /guMEGZTk1iGdx/mAALROPd2aZxyl2PljSr3bxDypjXgLNFF7xiu0wD4B9dv4Dr7TIHCIM 48uy0nBGteC/WduYQQCjotmomsFCF11S+W3H9+8OnRxnmbeW1SBsA7gafh1fnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yM7wOK9WrJ57RSdf91HebvuH5Vv4lDinIKGtuWezsHo=; b=D4KR3EmTWT+6AL4DGvY3voD83MPzBe/F6P6K1QETwC05OQk4L1gSKEbhu8mH9kQwSBTkBq 5f6YMjlTLU1j4bvZrF5Q2DFpafslHzTTTa5rPQZxKEdjd1tk9B+MXuvEo7rgGO7lKGJIja Zo5Mp6eRYiOZdTGlL7wn9Yw6W+vLtdiV+pWOrHin/YGvKf8v/ixyxj0dxSnDGUvU7clWPM EovL4Z1f5QirezZ8kMP70cEXxtMI4sE2qkXGvppCp1WPKPhNSQ6WThMjeSIkTFec0pgqyn 8zGKF7wUj8+hAJ+HDjuIEQ+9bA2VPUk1A5xLUNfnVrXGHHU/3b0N48W+sNm0tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971672; a=rsa-sha256; cv=none; b=NqtmgnuuH+IBJFSMAFIGTsMJYa8jCmpahVCvYg1A0fbVMMLImx3tcDcfi9mthFsyIu+P6a dqZ6Hd7QLOo3A7Xpv42PYNR4QzOe+ugJCWmRq0oatK8MS6voxW3Aqoae6zfH5M+LuAE6qG YcZo4FdOXD0kPwnhF8OVT5z7a7TdzwlBgV0S8IwVN8f889ym06o2fEplQxxQ3cy2/T7XK3 V927oA5DqB70/rWzq4BeoAefo7LqTc2L+o6vnNjnGHmfqaHHs/PzKuKuLLmj2L/nWtlotV 1dca6XQfGPFcboo/V6QNshXpwWk3kFke0M+O1ArqqYT0nP4fp/xBAHWl9wB1SA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFYg6rngzh44; Sun, 26 Nov 2023 04:07: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 3AQ47pBJ028545; Sun, 26 Nov 2023 04:07:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ47p8F028542; Sun, 26 Nov 2023 04:07:51 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:07:51 GMT Message-Id: <202311260407.3AQ47p8F028542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: aaa3d65392f6 - stable/14 - crunchgen: fix "keep" for an ELF world, break it out List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aaa3d65392f6844b9c6ed0a9692c715aaec32adf Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=aaa3d65392f6844b9c6ed0a9692c715aaec32adf commit aaa3d65392f6844b9c6ed0a9692c715aaec32adf Author: Kyle Evans AuthorDate: 2023-11-10 04:33:58 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:07:12 +0000 crunchgen: fix "keep" for an ELF world, break it out "keep" currently adds a leading underscore, which hasn't been useful or accurate since a.out days. Preserve the symbol name as it's given rather than mangle it to match ELF-style symbol names. This was partially fixed back in 6cd35234a092d ("Assume ELF-style symbol names now.") for crunchgen, but the keeplist wasn't changed to match it. While we're here, break it out to bsd.crunchgen.mk for later use in bsdbox. Reviewed by: adrian, imp (cherry picked from commit 8f2848eafa682f1af629f8ee5e32fec607ab0ba1) --- share/mk/bsd.crunchgen.mk | 4 ++++ usr.sbin/crunch/crunchgen/crunchgen.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/share/mk/bsd.crunchgen.mk b/share/mk/bsd.crunchgen.mk index 182ca387fe2b..bdbb6c5a22b0 100644 --- a/share/mk/bsd.crunchgen.mk +++ b/share/mk/bsd.crunchgen.mk @@ -18,6 +18,7 @@ # CRUNCH_SRCDIR_${P}: base source directory for program ${P} # CRUNCH_BUILDOPTS_${P}: additional build options for ${P} # CRUNCH_ALIAS_${P}: additional names to be used for ${P} +# CRUNCH_KEEP_${P}: additional symbols to keep for ${P} # # By default, any name appearing in CRUNCH_PROGS or CRUNCH_ALIAS_${P} # will be used to generate a hard link to the resulting binary. @@ -101,6 +102,9 @@ ${CONF}: Makefile .ifdef CRUNCH_LIBS_${P} echo special ${P} lib ${CRUNCH_LIBS_${P}} >>${.TARGET} .endif +.ifdef CRUNCH_KEEP_${P} + echo special ${P} keep ${CRUNCH_KEEP_${P}} >>${.TARGET} +.endif .for A in ${CRUNCH_ALIAS_${P}} echo ln ${P} ${A} >>${.TARGET} .endfor diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c index dfde38ed0b70..7b5f892cffbe 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -1128,7 +1128,7 @@ prog_makefile_rules(FILE *outmk, prog_t *p) fprintf(outmk, "\n"); fprintf(outmk, "\tcrunchide -k _crunched_%s_stub ", p->ident); for (lst = p->keeplist; lst != NULL; lst = lst->next) - fprintf(outmk, "-k _%s ", lst->str); + fprintf(outmk, "-k %s ", lst->str); fprintf(outmk, "%s.lo\n", p->name); } From nobody Sun Nov 26 04:07:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFYm2SyDz52kSB; Sun, 26 Nov 2023 04:07: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 4SdFYm1pkRz3FtF; Sun, 26 Nov 2023 04:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HOqGU51J+YAdflg06pv8jMOd2+NpJ6QQsPDD5Xs8IRo=; b=dmvm/C7H9LtVDWrJk3BSyfymUhS5vEUv2HJQFRLRdKuYg6M1rwOab0ylA9KgvP+sXD+Qpp VkV2aUmJrip4vt0DK1F/mU3cd6pS5N72m1Ry4rjVUKpy9Nu8vYAsZL1PiCLqIrxATjsK+G b3uHtGIomj8nMZLq350rc8ygeJqX5XNptVb5rSgna5O4RBCTrKvgxvejwc12W6d7uAmMgU GjK6wGk6EDIzO0ztQh953bYfSC5AvXGBSFixK8n7RwFiixMufoIjyiNmnFju7mfSSKz4Qy H1WcObYaHHVhtypxAZrnjLJ/EysguyUAmkRAhiVmZ4GHef4fExyRJFlPdk5h8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HOqGU51J+YAdflg06pv8jMOd2+NpJ6QQsPDD5Xs8IRo=; b=X2/ieIDyXUSIQgBb6DS1t82tR4n/c+QhOZk66Q44T+D+A9V5vT82qPPkEQhvylamPsAAjS y2AYdzQMcCFWVPVPmFWb5IeqJ6hEfLxwH4mv9qaR5V2Bm5HOHUdIYyV6FV5ZUBjCH/rJdO D3XFRbXJ7yaKY086fgZsrPYw0PjeL+9xz1lLfyvvMi1jXuYKaJILko5dHSwvrQVKyp79Or MdXs3ohVWW0+Lwcm1GdaZNMptYkNJGRzDLNg+Jguq8zVrTAt8JfzJ1yzTN2W5lr994BA1b d9Xkob9tHv6O7h6LaX1kDDVkI+suFQvyWoA0cg3V97qaL8FxfaOWr7YDe5bLGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971676; a=rsa-sha256; cv=none; b=eK6vPfB3+yR5oj0AjR6QlB7KFrFFmFBfM8tuwezsNcphYH723VSWM9LFMe8rfnEWzzqktt sMa0b0R6SD/P3eG2DfBzh6d6+VEw3UQMCSNAMw92DTFwNmPcKeCB6zoDOMNwY85jgc4mv/ wkCrX2zpIFgs0tyi/792TFA4gjeSMObME/4lvePbQZkXd8yNEv37Q/4wHf/rE8qYqkd+rL Xsk1acyf15zcUhL/V+lGOONV8WQU8IjVxH894YzWePwwm+oIjg2aloIPO9AbWRC7HAfVjF FAXRPs5wzQrLt+r7gy1OpBjo3IpbEZW6jPLiu+D9GnYleMpFj2gUmpjPbbyKfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFYm0n91zgsV; Sun, 26 Nov 2023 04:07: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 3AQ47uHp028751; Sun, 26 Nov 2023 04:07:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ47uc4028748; Sun, 26 Nov 2023 04:07:56 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:07:56 GMT Message-Id: <202311260407.3AQ47uc4028748@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 5330fb235ae6 - stable/13 - usb: add quirks for the Genesys GL3220 card reader List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5330fb235ae6db376bc4ee09f8270f88c27256ca Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5330fb235ae6db376bc4ee09f8270f88c27256ca commit 5330fb235ae6db376bc4ee09f8270f88c27256ca Author: Mazin Fadl AuthorDate: 2023-10-11 03:22:12 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:07:16 +0000 usb: add quirks for the Genesys GL3220 card reader Without these, card hotplugging does not work on the GL3220. PR: 263868 Fixes: 7520b88860d7a79 ("usb(4): Automagically apply all quirks [...]") (cherry picked from commit 94efe9f91be7f3aa501983716db5a4378282a734) --- sys/dev/usb/quirk/usb_quirk.c | 2 ++ sys/dev/usb/usbdevs | 1 + 2 files changed, 3 insertions(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 5df08225dff3..42083d6d74bd 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -260,6 +260,8 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE), USB_QUIRK(GENESYS, GL641USB_2, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_WRONG_CSWSIG), + USB_QUIRK(GENESYS, GL3220, 0x0000, 0xffff, UQ_MSC_NO_INQUIRY, + UQ_MSC_NO_RS_CLEAR_UA), USB_QUIRK(HAGIWARA, FG, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(HAGIWARA, FGSM, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 8297d14233f2..3eda1dd71be1 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -2294,6 +2294,7 @@ product GENESYS GL3520_SS 0x0616 GL3520 4-Port USB 3.0 DataPath product GENESYS GL641USB 0x0700 GL641USB CompactFlash Card Reader product GENESYS GL641USB2IDE_2 0x0701 GL641USB USB-IDE Bridge No 2 product GENESYS GL641USB2IDE 0x0702 GL641USB USB-IDE Bridge +product GENESYS GL3220 0x0732 GL3220 USB 3.1 AiO Card Reader product GENESYS GL3233 0x0743 GL3233 USB 3.0 AiO Card Reader product GENESYS GL641USB_2 0x0760 GL641USB 6-in-1 Card Reader From nobody Sun Nov 26 04:07:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFYn35FVz52kQg; Sun, 26 Nov 2023 04:07: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 4SdFYn2gWKz3FxD; Sun, 26 Nov 2023 04:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ugfCjiEEvpeu0V1aP9lXegB1filKIdTFzZrBEjGg9K0=; b=Hs0A2k+vT0jrvhw2lHMK1xiFJm2HRaCrL6tMaZyt7hiblm8EbNcKwQMu+WYt+0hwiKFkGn 5rzIuj9igT3FBYVBAE3W1YfNhW50BSSKN2GDkLw8y9a2mf2svEdDvxxhgyEiJ9HDO/Sntd srtNWpaMrNv0f0man0bBPlOkk3qZYvDjbTaggG8EEZJvSd8AxhtkkJJnLDdQ3GFOh2aKvh /YBz/nZ9NhgOHdBY3v70dZx4D00RYVB3S+wUTn1qX9EU20j7nidTl++aDp+UEd2gYGK9HY q/mMu6ozG1afvB1viaFfMdiCpilogbzQLGwQwzVuzvgCuGfnF0kX/qyWUWL6uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ugfCjiEEvpeu0V1aP9lXegB1filKIdTFzZrBEjGg9K0=; b=I83kxarm4yeXKyzUKtFQWuV8iPL4MlVCIqPO2ebiObKwUpBXvEOPr/0Rd81itS7N5Oxsvh m0rUzez+U2Rgtwvj6o9HF4tjFbxz4ryoOLouaU/lVCraqytqXTojqmOGttR7qr49vH0DgM IPTiM6rdQXMEUwF7Mk9nr4EH1G3tjmmmC3YfplKS4SvWioLq24IA61BgFfujMr7EQ1Cm52 cfxonPnrMGgGoal9GaJXa5Bk8Lxhruse6/XzP8or4tR33GvDTM7oBhro5aJLyQSxgxUPY6 4BQwmy/Ui4Bjo+YPkOm/GO6kO95SoeocTHsAj3hPYORhuYCg0vDOc4eIKs4lLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971677; a=rsa-sha256; cv=none; b=TfoCE3Ku7iloOI07iAqYLb6BViJbqeI5uIAO1yf8QiuU3ii4yeWD+kGj/fzjeiPzG3Vymc d7mX8liJrULAA6AlW/pqgsU4Me+f9Q1ib0/pvZgs3g6vhoH0CKeRd+zrUqgZP+BPRBfnbt 7jT6uufcuQ/tuzFag9hqglPBUeaV79Iuon5+ySp975esMQ7/z4rXfcl5dmeJVgdiEuSjcs ERPEyHEIt1i+13noKm8TlPwgkNPMZBocxnwgfggwA62J5QjwP2z9Nth+oHcq+Bct/teVp8 FFMUQ4EXkP8mUb+HynrJCKz81CGozZeY8LgSMIJGd/V0FO20/lpHpwfw4b7FAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFYn1gHgzgYM; Sun, 26 Nov 2023 04:07: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 3AQ47vXY028811; Sun, 26 Nov 2023 04:07:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ47v3Y028808; Sun, 26 Nov 2023 04:07:57 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:07:57 GMT Message-Id: <202311260407.3AQ47v3Y028808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: d0e771e2fd23 - stable/13 - usb: add necessary quirks for the NOREL Systems NS1081 SD reader List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d0e771e2fd23ca65024ee3026584a020057c166b Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d0e771e2fd23ca65024ee3026584a020057c166b commit d0e771e2fd23ca65024ee3026584a020057c166b Author: Mazin Fadl AuthorDate: 2023-10-11 03:12:22 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:07:16 +0000 usb: add necessary quirks for the NOREL Systems NS1081 SD reader Without these, the Norelsys NS1081 is completely defunct. PR: 263868 Fixes: 7520b88860d7a79 ("usb(4): Automagically apply all quirks [...]") (cherry picked from commit b332adfa96218148dfbb936a9c09d00484c868e3) --- sys/dev/usb/quirk/usb_quirk.c | 2 ++ sys/dev/usb/usbdevs | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 42083d6d74bd..284f5add72c1 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -355,6 +355,8 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(NETCHIP, POCKETBOOK, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(NIKON, D300, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), + USB_QUIRK(NORELSYS, NS1081, 0x0000, 0xffff, UQ_MSC_NO_RS_CLEAR_UA, + UQ_MSC_NO_INQUIRY), USB_QUIRK(OLYMPUS, C1, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_WRONG_CSWSIG), USB_QUIRK(OLYMPUS, C700, 0x0000, 0xffff, UQ_MSC_NO_GETMAXLUN), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 3eda1dd71be1..0f817109367f 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -776,6 +776,7 @@ vendor ARDUINO 0x2341 Arduino SA vendor TPLINK 0x2357 TP-Link vendor WESTMOUNTAIN 0x2405 West Mountain Radio vendor TRIPPLITE 0x2478 Tripp-Lite +vendor NORELSYS 0x2537 NOREL Systems Ltd. vendor TENDA2 0x2604 Tenda vendor HIROSE 0x2631 Hirose Electric vendor NHJ 0x2770 NHJ @@ -3501,6 +3502,9 @@ product NOVATECH RTL8188CU 0x9071 RTL8188CU product NOKIA N958GB 0x0070 Nokia N95 8GBc product NOKIA2 CA42 0x1234 CA-42 cable +/* NOREL Systems Ltd. products */ +product NORELSYS NS1081 0x1081 NS1081 USB 3.0 Flash Card Reader + /* Novatel Wireless products */ product NOVATEL V640 0x1100 Merlin V620 product NOVATEL CDMA_MODEM 0x1110 Novatel Wireless Merlin CDMA From nobody Sun Nov 26 04:07:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFYp5jSpz52kKg; Sun, 26 Nov 2023 04:07: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 4SdFYp4Fvjz3G5w; Sun, 26 Nov 2023 04:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/vPKhCFvBaB97TZR2GDUY3QTl01WeSohg3pmYUuaAI4=; b=be1zoW/TApuO+mjNGVmNkzErgSKgEe1AjtiYHne/W1XPEe8ImP/ADqd/hBfTFOlVnE/+Fx vXspl+fOicm2NU5fmWLw277Rzc30xsE+SXFRsaW+rC/Yiy+fPyfI3f8IMTMpF0Gf5qGjU9 S2YGSP9DJsv0WxkRDx9pBYDbnjYtsaH0MCCSYlWGCEOHMIv2ooXrUgODY0fW1wkWMtrivb OFuemNEQEGrncT8uwrb0F9yLpvgDSScKTbGljVDtMpCVut8GplfJTINEErjvF4Hu4+PR89 b304HGBzcETKCZujWRUSpindhBRVvzyvGKZ1g/HrosswHKo8GGU9ffv77Btg9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/vPKhCFvBaB97TZR2GDUY3QTl01WeSohg3pmYUuaAI4=; b=Z/W5ErQY72yPnjiuXxEdUAwrCabEOMnIiT+zpco+5bU4sDmKYpLT9tnO3O58/mw8fUa9Y8 HpZJ6wzg9A7BbfwernaXGItnbnUMvnDekJtru9QHzPgTMuiruev6SvT14SZaIuU2kdg9m1 x9VrBUCczT5Vfokge5PNEm2jOf86rrvvP7TpSh817RN19SlgD01JAcwvf0g8ggYKDzU1Cp kgQEq2wlqewZGWvhhNnSaJ4jRQJwr3T1chtMz5b5S3NXLFCXAde/BZ3VprdtolzAh/HsJj ythTPkCxGb2bFW1u85djiZj6ny1j7jkPOAHm3iX4WkdbR82+ILBFzCjf0Vl9lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971678; a=rsa-sha256; cv=none; b=I5TznVeGy2PC3LRXdA68ms/b2zB0LUzs6MVXE0+N+A39pNkrYL9s4sVQ29+FtDPVoKdnxB St9aQRf/AsdVlhBbKWv/C9GwR5G+IjENH8MhsYaaLDOAWLUZhKGpi1Bjj1885aBjw8FIRs YbSWdK3gWU32qXSyWZR14l8niVEXH1LrdR7L78hhiejQuMCloZNOIj0zV5Mzc3rzsaf1Mh f/tmOm35h+/nJ8m5tbPb43LmbuJ/AJ0wqpnidMbQKPX/O6B6ApuyzRiWARo56Z9lmZ4oYn uz+RUs1XECF+vIuE59AM9PWOs7kU9X5O1ymlZnufr1GMXYn41RSALLZwgbZc5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFYp2hjVzgYN; Sun, 26 Nov 2023 04:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AQ47wgQ028856; Sun, 26 Nov 2023 04:07:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ47wtt028853; Sun, 26 Nov 2023 04:07:58 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:07:58 GMT Message-Id: <202311260407.3AQ47wtt028853@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 2c7e964254f0 - stable/13 - install: handle -m +X more accurately List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2c7e964254f0535e9f93e811383ff9b272d2ca29 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2c7e964254f0535e9f93e811383ff9b272d2ca29 commit 2c7e964254f0535e9f93e811383ff9b272d2ca29 Author: Kyle Evans AuthorDate: 2023-10-19 02:43:06 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:07:17 +0000 install: handle -m +X more accurately As described by chmod(1), +X in the mode may be used to optionally set the +x bit if the file is a directory if any of the execute/search bits are set in the original mode. The latter is not applicable because we assume -m is a fresh mask, but a functional +X could be useful in the former case if we're passing along a common INSTALL_MODE that's designed to install either 0644 or 0755 depending simply on whether it's a directory or not. Reviewed by: des Sponsored by: Klara, Inc. (cherry picked from commit 767c97c501ae72eb3d74bc23ddf5a1d570d8f841) --- usr.bin/xinstall/tests/install_test.sh | 16 ++++++++++++++++ usr.bin/xinstall/xinstall.c | 12 ++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/usr.bin/xinstall/tests/install_test.sh b/usr.bin/xinstall/tests/install_test.sh index b42bdfd0dc60..cbe95f0dfbf3 100755 --- a/usr.bin/xinstall/tests/install_test.sh +++ b/usr.bin/xinstall/tests/install_test.sh @@ -481,6 +481,21 @@ set_owner_group_mode_unpriv_body() { atf_check_equal "$u:$g:10$cM" "$(stat -f"%u:%g:%p" testc)" } +atf_test_case set_optional_exec +set_optional_exec_head() { + atf_set "require.user" "unprivileged" +} +set_optional_exec_body() +{ + echo "abc" > testfile.src + + atf_check install -d -m ug+rX testdir + atf_check test -x testdir + + atf_check install -m ug+rX testfile.src testfile + atf_check test ! -x testfile +} + atf_init_test_cases() { atf_add_test_case copy_to_nonexistent atf_add_test_case copy_to_nonexistent_safe @@ -523,4 +538,5 @@ atf_init_test_cases() { atf_add_test_case mkdir_simple atf_add_test_case set_owner_group_mode atf_add_test_case set_owner_group_mode_unpriv + atf_add_test_case set_optional_exec } diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 9148d9f67535..3bcc44d08b81 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -189,6 +189,7 @@ main(int argc, char *argv[]) fset = 0; iflags = 0; + set = NULL; group = owner = NULL; while ((ch = getopt(argc, argv, "B:bCcD:df:g:h:l:M:m:N:o:pSsT:Uv")) != -1) @@ -255,11 +256,10 @@ main(int argc, char *argv[]) break; case 'm': haveopt_m = 1; + free(set); if (!(set = setmode(optarg))) errx(EX_USAGE, "invalid file mode: %s", optarg); - mode = getmode(set, 0); - free(set); break; case 'N': if (!setup_getid(optarg)) @@ -301,6 +301,14 @@ main(int argc, char *argv[]) usage(); } + /* + * Default permissions based on whether we're a directory or not, since + * an +X may mean that we need to set the execute bit. + */ + if (set != NULL) + mode = getmode(set, dodir ? S_IFDIR : 0) & ~S_IFDIR; + free(set); + if (getenv("DONTSTRIP") != NULL) { warnx("DONTSTRIP set - will not strip installed binaries"); dostrip = 0; From nobody Sun Nov 26 04:07:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFYr0Lh8z52kF5; Sun, 26 Nov 2023 04:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdFYq55Bjz3Fxd; Sun, 26 Nov 2023 04:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+3dJXcvFNX37C2GUL/Pli/SvzE5U6+n//aCNToFaRrM=; b=NsKpT4hioBGzYeT67s4WMs8Qg5+gWupVPb9qerWhNphKN8in/wAamJaCcRx7OLGby0OEvH KMzgveKiZpbZUyH1nTR4MYXUWBAMaljk8zi36A5Yk9sxMhKP14uNM2RP3k5b2xP0+XvUgF jaLcEfVBDOzfEHZLDFwmE2nWXTFIqcqnwbnZ6fNf1S/9aBIOYhjpUsJg9eYONa50SSnzgs hXid+5+zTEh4FXIV6g8BmZAEPkcXjlqo0qsrgE+eNpx8X3/a+iZogzBJHkgGN1f6VYFZGU fx6leJHvz9wZFZPj1PJ32oleeMagV5NBKuUQ5HcquRuwS8JEYQbfS3pF5pjD/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+3dJXcvFNX37C2GUL/Pli/SvzE5U6+n//aCNToFaRrM=; b=KRzO4TS+1zZZtEx7l5vTqYubqyq3iqM60IyLctttKziyINyDbihbVeeKU8K8H/sI02lPLQ 3rmsCnIQJqdoWcFCL8Zedc27baZ1692Ga7+SPupx9YeJe7U+mSJ2CiW2TAXa566mGEHXFQ Gqy5AX3tTHjNURCWJ08A8+n9VxAf+EbpLkxYQM0zDe8CQDzUJcuLRX4Wh66aF+M1zb1SNC cyLsJRvkK9TGheMMyVlpbU3sXbPoIJp4hTB3zT41EYk7gCTvC9n0eAsixw5d4AF6MBHnTp TkYnyX0GreVDtsbDNH5fQAASq/Jmj/Qm6en+cRdprjL1vL/EV65mz44Ct0OiIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971679; a=rsa-sha256; cv=none; b=htAz0xXaPt8pPqFFOCP+uxZTe//b1V35UgH88/LJf6DKWG3iH+OHCVICpi3UZQAuLhHQzn SNrGyO1YcIPQ6Otd976QVv4W5TJZZ1w4zNiT8LRQ9gRZRRmjMHuOSO1okPHZLz7zqyTSBM DPvMfzk5Aci3nhQBsCcJEl5aM9XwFP/5GTc6yW9Ll/zOUaor1o73OaOwNpja/+1mo2oLzA 7yca33z+awKKVFODb/88/xd2HEeTx+VehSNS2NkyHvskPy5dv/ycj4XSXZ6p45Hn5TRGke x6L6SSeWnynWtKgcf7XKuXfGod4SLmzy1vuoEgQZkd0ykCKFEU/MIQV6xObXRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFYq3kd0zh28; Sun, 26 Nov 2023 04:07: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 3AQ47xSU028906; Sun, 26 Nov 2023 04:07:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ47xJO028903; Sun, 26 Nov 2023 04:07:59 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:07:59 GMT Message-Id: <202311260407.3AQ47xJO028903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 9c170b3d52bf - stable/13 - grep: don't rely on implementation-defined malloc(0) behavior List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9c170b3d52bf8e7ca3c14e6788330e79329fcf0b Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9c170b3d52bf8e7ca3c14e6788330e79329fcf0b commit 9c170b3d52bf8e7ca3c14e6788330e79329fcf0b Author: Kyle Evans AuthorDate: 2023-11-05 02:08:36 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:07:17 +0000 grep: don't rely on implementation-defined malloc(0) behavior The very few places that rely on malloc/calloc of a zero-size region won't attempt to dereference it, so just return NULL rather than rolling the dice with the underlying malloc implementation. Reported by: brooks, Shawn Webb (cherry picked from commit e116e040f3091eca914a06dcd0bdd9f1aea23add) --- usr.bin/grep/util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c index 68bfd504279e..e3cf6e3cb4d8 100644 --- a/usr.bin/grep/util.c +++ b/usr.bin/grep/util.c @@ -650,6 +650,8 @@ grep_malloc(size_t size) { void *ptr; + if (size == 0) + return (NULL); if ((ptr = malloc(size)) == NULL) err(2, "malloc"); return (ptr); @@ -663,6 +665,8 @@ grep_calloc(size_t nmemb, size_t size) { void *ptr; + if (nmemb == 0 || size == 0) + return (NULL); if ((ptr = calloc(nmemb, size)) == NULL) err(2, "calloc"); return (ptr); From nobody Sun Nov 26 04:08:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFYr6BXcz52kVL; Sun, 26 Nov 2023 04:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdFYr5Z3Cz3GMV; Sun, 26 Nov 2023 04:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c3l5EdLJ6o3ld7qvNkN4InLGlGXEI7SyArcT7R6Toyg=; b=gj1ogVUaQisEzwkCTkLul9AFSrr2A9LXvPKf7Z58neVhIrXpXEMF+o2gUUVP6Ffkhoe2gc 7hCa7FEO2gSm2WSx3VTTVziYSlQGhPG8nyMWzdSdw7ItLBNeFAuI+l//vp3RuXhYZ/xwlt r5niapMynlWK7uvivdjpo9/sJrvynu55yKkg+LIL8DPsLUhDZUgg/nYl12ALUub3af1ZDq X9ambOz6Ev7x0Q3HiaY2ME3woe/rfJJNxiQEs+iVmpvE4PNHtUKlAd0t8Dtb59q3cBNQuT mWxcPlIVoBG44IonoBWdU02G3DN3CwM7JadENov0sBTcLfA2uoBYJg7xAURptg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c3l5EdLJ6o3ld7qvNkN4InLGlGXEI7SyArcT7R6Toyg=; b=MjRslXwAk7sPk8tQmfV8okWcs5rWrGOW3/g52sakuo4Frw6Nz9JDxvtdLyj5kiXlhDYI8L zkM3gO43p92OBOD1F1YmWDFdmFq5gpd0UD38NEBu7YRVcJROd1YQ+J/zNtir26dcpPKc01 XosMxxb9emppnvBrKeDtoKiD85t/tgUKgc3v0QemsjSlG0Qx73v80zfZ4qmBr2Cf7fyZop ObuG7y6AbukBjowP/qDLXvJU1DIW5Wzn8Sxz1dOARGGf5gnqdjlIc/FlO2MWYPWkwH6hmr /RA8E8DEssYebeqk2Ur465JUEUUeUn6EiIWf0zNcPe6DTRHDWuok/2DhfrMxDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971680; a=rsa-sha256; cv=none; b=vGzR1zSP9xySoICCBDBy7oEg599x/wkUn+qQE6sptgXcW1hl8g5X1vU/YVHo8y1N8WDKcc kndprHDycmL0Nx1G1uTRs0RxjdHHFmBJysX1WMxIfSei32LXvu66AVja+VD3enVSDZOk62 CNsbQvK4y4R/qyRvTfzZJfxQVatyBICSfixjMbpcFjNv7Cf/j/sVE/zHLc3iFc5/OytTKw Qk9G7GKQsjp4m0+mauhal6/zn3pL5/T/s5jqK8iPn0rnOAcPdmjTJUzLjWR0qRP6CJ3VqY gHaQJ1lmcmv6BGU3++c845kTRU+0Gh81tIue+pPo0VnIpQ2r1qIlbyy4WCCw0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFYr4J1Pzh45; Sun, 26 Nov 2023 04:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AQ480F4028970; Sun, 26 Nov 2023 04:08:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ480tR028967; Sun, 26 Nov 2023 04:08:00 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:08:00 GMT Message-Id: <202311260408.3AQ480tR028967@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: faf527b73013 - stable/13 - crunchgen: fix "keep" for an ELF world, break it out List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: faf527b73013b6505144cba9d8fc1a64ff1f3e81 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=faf527b73013b6505144cba9d8fc1a64ff1f3e81 commit faf527b73013b6505144cba9d8fc1a64ff1f3e81 Author: Kyle Evans AuthorDate: 2023-11-10 04:33:58 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:07:17 +0000 crunchgen: fix "keep" for an ELF world, break it out "keep" currently adds a leading underscore, which hasn't been useful or accurate since a.out days. Preserve the symbol name as it's given rather than mangle it to match ELF-style symbol names. This was partially fixed back in 6cd35234a092d ("Assume ELF-style symbol names now.") for crunchgen, but the keeplist wasn't changed to match it. While we're here, break it out to bsd.crunchgen.mk for later use in bsdbox. Reviewed by: adrian, imp (cherry picked from commit 8f2848eafa682f1af629f8ee5e32fec607ab0ba1) --- share/mk/bsd.crunchgen.mk | 4 ++++ usr.sbin/crunch/crunchgen/crunchgen.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/share/mk/bsd.crunchgen.mk b/share/mk/bsd.crunchgen.mk index 182ca387fe2b..bdbb6c5a22b0 100644 --- a/share/mk/bsd.crunchgen.mk +++ b/share/mk/bsd.crunchgen.mk @@ -18,6 +18,7 @@ # CRUNCH_SRCDIR_${P}: base source directory for program ${P} # CRUNCH_BUILDOPTS_${P}: additional build options for ${P} # CRUNCH_ALIAS_${P}: additional names to be used for ${P} +# CRUNCH_KEEP_${P}: additional symbols to keep for ${P} # # By default, any name appearing in CRUNCH_PROGS or CRUNCH_ALIAS_${P} # will be used to generate a hard link to the resulting binary. @@ -101,6 +102,9 @@ ${CONF}: Makefile .ifdef CRUNCH_LIBS_${P} echo special ${P} lib ${CRUNCH_LIBS_${P}} >>${.TARGET} .endif +.ifdef CRUNCH_KEEP_${P} + echo special ${P} keep ${CRUNCH_KEEP_${P}} >>${.TARGET} +.endif .for A in ${CRUNCH_ALIAS_${P}} echo ln ${P} ${A} >>${.TARGET} .endfor diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c index 2065541b354c..2315b139b8b6 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -1142,7 +1142,7 @@ prog_makefile_rules(FILE *outmk, prog_t *p) fprintf(outmk, "\n"); fprintf(outmk, "\tcrunchide -k _crunched_%s_stub ", p->ident); for (lst = p->keeplist; lst != NULL; lst = lst->next) - fprintf(outmk, "-k _%s ", lst->str); + fprintf(outmk, "-k %s ", lst->str); fprintf(outmk, "%s.lo\n", p->name); } From nobody Sun Nov 26 04:10:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 07:53:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdLZW6Dbgz52NKF; Sun, 26 Nov 2023 07:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdLZW5m5Jz4k5F; Sun, 26 Nov 2023 07:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700985235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SF7vTukAZ8qA7XLMRDah7yjHBU3Q7Rh6TeJnAaPeEgI=; b=P4DRfOsY6c+dD28R6WxLJyHxMxT8oZxJBlykqM43nHB6WzOUxLGNo7WY6IDNnitLRiODT5 my/BLYcF6GACexZWwlR3U+d8W4M32Sl/zbQHAQLFYSBTaEXxQeFUMfHkC5sLGn9pMC5lnM psNvLff3Bx4IbCUt2iY94gZoUMI+9bandgvw71ABxKfRtrClNTyziy93TimOIb0m85+zbj C70wQdUNmNOH6yXoe9cw8lD2k8bgM1K18MfKJ/bnZeRCqOmx8SvlCWlkj6Tem3ZwcUoCKk D5m9r6YJOtvKfKSW7d0aHW9Lprv9Zng/hFL7EnscEIbvTNjPGS4nZCfzcxhpYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700985235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SF7vTukAZ8qA7XLMRDah7yjHBU3Q7Rh6TeJnAaPeEgI=; b=h++pSeweP5i9mPbGlPOYzAi19l14Ifs+nNDlzKUMgzXdQZRtR41Av+1C1+Y3Csx4RXVB/A Aq2RCq3cG80oxLD0xt24X7B4J1D2gPbpPhm+xlLdKI47Jsatpi4xCq0b/enm5jSnWGtNOC 22tIplvDfjlAoCaWAkaqpbl2Ac9N1AHyDwu6ezLW5WnujilnHPbhE9Z87v+188HVn/sdS2 NlytT6QypskYeZi969e6i1RiAmV8Z5i6rcmBq2/gq+Q3jd5PmqIMSA5QBD8c1UMD/TMf8c VydhipIzrYOebXw1Ui0zgAb8yhEBtFupoOkDkNGZBjbqGha0T+HXKNCvU1agpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700985235; a=rsa-sha256; cv=none; b=jnsy4Uv8aY1qikagjoyEbUFcivr9jA34GYdKI7mbDZjOVfLoHMVQgqsEpZZTCIqJdOO1Dk K2VwDNPu6dfnRfhA3nfLIpCJWkGNGUYrAQvItzWs500QIDba5siNow1x8H9I6cvzFriyC/ 9c5chQY00o7fi9FjwCqGh91YA6p98ECjR7znb5jncIzdrG8tHBpxwET6z5PJTAn3eGlvKQ 7YyxVRz5U9ESJ7LlxZ5D3IB3cQhYd+63E1kzjiY5M2wRKlQTLF53hjcyuFCgbQgbCXvYsE SaiVoyRixhwoj/h2QfFTsdfEzBgyTdP970mefVEnvx/hPg1On0kHqntYZrAjqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdLZW4q1cznQl; Sun, 26 Nov 2023 07:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AQ7rtwE010616; Sun, 26 Nov 2023 07:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ7rtnD010613; Sun, 26 Nov 2023 07:53:55 GMT (envelope-from git) Date: Sun, 26 Nov 2023 07:53:55 GMT Message-Id: <202311260753.3AQ7rtnD010613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 14dcb4cfe405 - stable/14 - libcasper: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 14dcb4cfe4052e36af7ec8588c1541cc3fedaf43 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=14dcb4cfe4052e36af7ec8588c1541cc3fedaf43 commit 14dcb4cfe4052e36af7ec8588c1541cc3fedaf43 Author: Gordon Bergling AuthorDate: 2023-11-23 08:58:15 +0000 Commit: Gordon Bergling CommitDate: 2023-11-26 07:53:30 +0000 libcasper: Fix a typo in a source code comment - s/mutiple/multiple/ (cherry picked from commit 637e4ef1a6bcd8677dabd8c08916df3091be5f64) --- lib/libcasper/libcasper/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcasper/libcasper/service.c b/lib/libcasper/libcasper/service.c index 478221a681da..103791676272 100644 --- a/lib/libcasper/libcasper/service.c +++ b/lib/libcasper/libcasper/service.c @@ -59,7 +59,7 @@ * The problem is that we may restrict/sandbox service instance according * to the limits provided. When new connection comes in with different * limits we won't be able to access requested resources. - * Not to mention one process will serve to mutiple mutually untrusted + * Not to mention one process will serve to multiple mutually untrusted * clients and compromise of this service instance by one of its clients * can lead to compromise of the other clients. */ From nobody Sun Nov 26 07:53:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdLZY0mg1z52NKJ; Sun, 26 Nov 2023 07:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdLZY03M8z4kPv; Sun, 26 Nov 2023 07:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700985237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EIw8fSatr7lUXN0Vz3f/q/OKlOk6xH/5JBUeBzJrO1w=; b=CwzcYWDVu+6rFIv0kuQtblzpcxFJ/wSTDGH3WYK/jX1tUpNwDO4RLmllkYNH1aK97Y7vD7 c9S9ELJCuJZjcQsJREBf3g5ezd/uStZYtEUAud7cFMJHREddcTYYsMQc7zwCOTV4fcTTN6 19OGsr7e4Ttk2qSh9nKJdIQiQBg+Cvh188ALzXR33oZhYIyY/ZBj4iDeg7vpZiZPsC6Ufs dBHs83WIPvKW8IxxpgkR6x/gUoZNIVi2Wm3cYdpNbD6htdrSYDFSBrhUK5WAvSNaAd6GAY gp+McU15Ehy3wo/HUqoDTkOgh5E6Bhb3ag5WbLwlyfJ8AsoAmYQhlGekmulaYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700985237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EIw8fSatr7lUXN0Vz3f/q/OKlOk6xH/5JBUeBzJrO1w=; b=Jo+5prfNmV8lAIViOLr/eComnG/OYS5pE5p0poFusU8oDqDjvaZDXMcQ98ygXeptsL+Kou NyGI9HDHIcJPCkZDu9Da1qGzluZ8EkPScynsYFS64r3HTLT9UiecMnGRqNN/A2zVP9iv4Y 7OfBDBewO7foGDrj9A2wFRxOBIVrO2aW4esc4pZwTXEDfmO9a3/cYQPUuDa/7RTFHN1a0g wV/sOA9rrI1Ef4Uepd2bmKOZUpk9+Ekt2s0Tx3iQdmmxJ8mf4oXjk2/aomACxM1rLhaom2 UgExZeB1soKi55MWQJdDwwowvyzP6r2lWFMdTuNYSggrZkG1/R+5enU9F4Oqcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700985237; a=rsa-sha256; cv=none; b=MZtUgxJHN4oPKGTQ9A54S8lqM899ovZK9WXhTr8UUNDOngL+fNu99zz8NeOtcbdR0SGVOk m2R1p9gKIELCqU96JaFMm2a+4r2QZ6HZ1R0lK9HU/7blaZ06cBzW0wc1vTzmc9m+oD4h/p ocganvank2OLCl0X87zz8kwms/j6dgV2PWKRVjHKHSmt0FxGdLgQ1Oz7cpfSRGmt1BrIDu RNXjOnG/xDqcJ7YwTslu7tRRPhSwaGtTp5rZZnhKOJJFXTPbEPOEyKl5ecx3+vhnHM1kZu L3XAAZEHCFk6Ud2xpRmfPIoZ9Sc7tb4bVbmGc45mNELAcrnQAlBZlfewmYEACg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdLZX67znznL2; Sun, 26 Nov 2023 07:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AQ7ruHL010675; Sun, 26 Nov 2023 07:53:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ7ruWl010672; Sun, 26 Nov 2023 07:53:56 GMT (envelope-from git) Date: Sun, 26 Nov 2023 07:53:56 GMT Message-Id: <202311260753.3AQ7ruWl010672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: ab3a178eb120 - stable/14 - ath(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ab3a178eb120c28a4a161e94499560c68f4d4479 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ab3a178eb120c28a4a161e94499560c68f4d4479 commit ab3a178eb120c28a4a161e94499560c68f4d4479 Author: Gordon Bergling AuthorDate: 2023-11-23 08:57:28 +0000 Commit: Gordon Bergling CommitDate: 2023-11-26 07:53:44 +0000 ath(4): Fix a typo in a source code comment - s/mutiple/multiple/ (cherry picked from commit 4e36d081f377ecfa8375e5fe3d0763099f4a780d) --- sys/dev/ath/if_ath_beacon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ath/if_ath_beacon.c b/sys/dev/ath/if_ath_beacon.c index f96f7691cf12..b08816f3d268 100644 --- a/sys/dev/ath/if_ath_beacon.c +++ b/sys/dev/ath/if_ath_beacon.c @@ -1014,7 +1014,7 @@ ath_beacon_config(struct ath_softc *sc, struct ieee80211vap *vap) * * The specification (802.11-2012 10.1.3.2 - Beacon Generation in * Infrastructure Networks) requires APs be beaconing at a - * mutiple of intval. So, if bintval=100, then we shouldn't + * multiple of intval. So, if bintval=100, then we shouldn't * get beacons at intervals other than around multiples of 100. */ if (nexttbtt == 0) /* e.g. for ap mode */ From nobody Sun Nov 26 07:54:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdLbf0wX6z52Nlx; Sun, 26 Nov 2023 07:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdLbf0W70z4l3J; Sun, 26 Nov 2023 07:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700985294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zn/h7ObeM0/UdN834JAXSonjkFxEAI4WgaPBfj099vo=; b=LrDgF4amRCjVH4MQG+PqQFxqydTzV1L4DujVHSdL2Lp/JGfCkmnJegw+v7ljLgZKD1SLYh 1MTG1I2gXuIvcqj3svh9sj9pczYS6t4GqbZ8odO6PfBDqJRlds7rnqAtS9jMvg0Ea3MOKP ItfnmtJeE6Zhp7vyCQC7LeqXGkbO/QMokJhAYHSsV6w7cXqXO3srntzEy4MUsMruKZ12/B h7PeC6nTLkLrHJwaDlfdHwMLVICHHqLsfS/tASTBzsZeh2yXGRJ3917fV5aVkGdSDY6A13 O2BOhfe6mKJg+6bL7/nab0qjkXURA5Rjs7IX4qv7Quq7eFr+7y6JWpIY39gkiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700985294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zn/h7ObeM0/UdN834JAXSonjkFxEAI4WgaPBfj099vo=; b=JhDd48mNZvmB9OotP3wIwLDu1Id3AwBsdHZpy5FSvyg9pc5sN+8MUfpG0ZPMyS1xX3G4Jb Qw6VdAtc6aQskmW33uXtclumPL0zAvxEbd6uQPRzEnAA4sRrWcG9pRjN+zoH56oP7evio4 RTu2SkTuvvgNpqJWV8Sj+kqhW96s1rZIESqbmk5Oop7uST+OpjuPAhPM/0cDo/gfftroNi KK80cxFQQF9plpAMkrlXaVe+Dnwf3fpfu4o5AuEZkfvD6xpExDMOrfs9XPp5Xar443NTnK h44COI3I26mWEbEjG8jl6sI/LXtWfjslN38sMxmuH9v+jir1TL4EwdKbr1+5TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700985294; a=rsa-sha256; cv=none; b=sMKa5M3K9fQ+PccyjwNA4Z3d4fZ1GjbQ1qW0NftuUY80j7BSg5l4mFaJCeWl9FHAjxPbgH mqkHcdP26uLxYZ54+yei4e3Q63JOsfJ8s4KIkexXdf/0U5Ump5cvWaUum3MuykXDgsdx++ Kl+jtg53G7VLL1OdEQD2+qpOYyTboJhVsaCxplTPNp/GQY7JvRXi+cmzTf0aBofzShKpx7 Y1zMrTSzId7jXq07d0KPwBtgEnRGNfza4DTFoVOL71oNXuc83kS8XlkkEjYYi8JkitOLd/ 8907PBYfDqxF3vJ3K9VQ4IuXiiwpW9cOtbY2iMjZb7XmrD5Yf/rt8D9fCZ9UbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdLbd6gmdznQm; Sun, 26 Nov 2023 07:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AQ7sr3X010948; Sun, 26 Nov 2023 07:54:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ7sr5q010945; Sun, 26 Nov 2023 07:54:53 GMT (envelope-from git) Date: Sun, 26 Nov 2023 07:54:53 GMT Message-Id: <202311260754.3AQ7sr5q010945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 0e9dc6603a78 - stable/13 - ath(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e9dc6603a7832f13e8f891e2d0a7ee0dd85a903 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0e9dc6603a7832f13e8f891e2d0a7ee0dd85a903 commit 0e9dc6603a7832f13e8f891e2d0a7ee0dd85a903 Author: Gordon Bergling AuthorDate: 2023-11-23 08:57:28 +0000 Commit: Gordon Bergling CommitDate: 2023-11-26 07:54:36 +0000 ath(4): Fix a typo in a source code comment - s/mutiple/multiple/ (cherry picked from commit 4e36d081f377ecfa8375e5fe3d0763099f4a780d) --- sys/dev/ath/if_ath_beacon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ath/if_ath_beacon.c b/sys/dev/ath/if_ath_beacon.c index 368c4c08e891..3030448e0f1d 100644 --- a/sys/dev/ath/if_ath_beacon.c +++ b/sys/dev/ath/if_ath_beacon.c @@ -994,7 +994,7 @@ ath_beacon_config(struct ath_softc *sc, struct ieee80211vap *vap) * * The specification (802.11-2012 10.1.3.2 - Beacon Generation in * Infrastructure Networks) requires APs be beaconing at a - * mutiple of intval. So, if bintval=100, then we shouldn't + * multiple of intval. So, if bintval=100, then we shouldn't * get beacons at intervals other than around multiples of 100. */ if (nexttbtt == 0) /* e.g. for ap mode */ From nobody Sun Nov 26 07:54:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdLbg6136z52Nm6; Sun, 26 Nov 2023 07:54: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 4SdLbg1MLPz4l1b; Sun, 26 Nov 2023 07:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700985295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rtgQ8KfQ5WpUvaMwXNqjc1JKtOMmoLRtIPv2SxKke5w=; b=yyBQ5H4mz/cyxHe6wkvV3fgrvUWUQzedC3uXOOFFeHk52AB2Op7uqC6Q4KgGBVsJQp4Xs7 5WSBcgUIExAiZIm1iTkpTa7opJhrOT94s7WR8rfOAchujRyjR/ysMGyUr/vW6TytJ237Wx 0HoQWmr9RZbwPZywouKVYSeWGTCW9cjd8dmjFDj/6g5WXIMBbOy1AX3JFVLN1g4l9aCL5S EYk0gm93ixxQrT9DzzwfPaW6G/haoNMglzqt40scvQDTTnRa/J1bP1BCov7t+mmmYENwWl QcJBPqLEseuLz9nGfh5RVYnE8QeAQc7oGA9fUa9IkLWvHFBt5N2lvXQ38BeOig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700985295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rtgQ8KfQ5WpUvaMwXNqjc1JKtOMmoLRtIPv2SxKke5w=; b=IwESvGaogCFxVKKTlYyjn+FDKL7NQV8Ki4lHCHXbEj1VJn7OhhKhIeQ2oTs1SHbBNP8QcZ MerDvFCn3gFuqQG+f7dgf3bivmN62NblNCHq+z8lmuhJGCyOv1mOQ7l/a9073ytJwlZigs k9/giHr2hXlwb6Jp9ksesA6i3pg7kVpRLGDzKDVreUqHXeG/USrMLnHdKSDfoGBXj25Xzf 2vXacuzOPAto3dbuA735vJaYVHRMdwwxJVDnNMxSl+EYVHCxUTVZD9DuFLjXj6+isFL3H3 D9qHZ0cgpk9Q6PU7EZI1OBeGVOhKwwRkEvkwwMzAn+9/3mjptY6FGe5sT22JWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700985295; a=rsa-sha256; cv=none; b=YRPiwbD+R0tztp8WT4VsVfKxkNk2N9osDKyU+Wr7WrRMir3fjbgIDQBPbPjdJaA9K6wJ1k CQbwowJSiRIir8r7AZEzaoUNbWMKdubtxcJNd/W6lSSMJbATtjO2/iLD6mi35ozT5IM4W7 pEAsP5wO86eYc6R8TKkJNFMAeV/roE2QEGe+pQcwWcwuOQSPpjLo0jx2pWhWhbq2e5Y5PG IIaOwamUXJeNDulZoMhzpIPuNoJm9WXt+I30EXEUkr/UDOzbPe2BZg2yWiHVwDUCFZOZgL fl9hu0fSXlBO4pouc9/plozGUm/KR1mWJ7fuQ/Sb/e8b9ObRG+lyMIXfnS5Y2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdLbg0FlzznNK; Sun, 26 Nov 2023 07:54: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 3AQ7ssUc011003; Sun, 26 Nov 2023 07:54:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ7ss25011000; Sun, 26 Nov 2023 07:54:54 GMT (envelope-from git) Date: Sun, 26 Nov 2023 07:54:54 GMT Message-Id: <202311260754.3AQ7ss25011000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 5fa896527447 - stable/13 - libcasper: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5fa896527447f601d111cf3131f34a7c8d7ff18a Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5fa896527447f601d111cf3131f34a7c8d7ff18a commit 5fa896527447f601d111cf3131f34a7c8d7ff18a Author: Gordon Bergling AuthorDate: 2023-11-23 08:58:15 +0000 Commit: Gordon Bergling CommitDate: 2023-11-26 07:54:45 +0000 libcasper: Fix a typo in a source code comment - s/mutiple/multiple/ (cherry picked from commit 637e4ef1a6bcd8677dabd8c08916df3091be5f64) --- lib/libcasper/libcasper/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcasper/libcasper/service.c b/lib/libcasper/libcasper/service.c index 478221a681da..103791676272 100644 --- a/lib/libcasper/libcasper/service.c +++ b/lib/libcasper/libcasper/service.c @@ -59,7 +59,7 @@ * The problem is that we may restrict/sandbox service instance according * to the limits provided. When new connection comes in with different * limits we won't be able to access requested resources. - * Not to mention one process will serve to mutiple mutually untrusted + * Not to mention one process will serve to multiple mutually untrusted * clients and compromise of this service instance by one of its clients * can lead to compromise of the other clients. */ From nobody Sun Nov 26 07:55:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdLc83qsWz52P8p; Sun, 26 Nov 2023 07:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdLc83Ns6z4ldW; Sun, 26 Nov 2023 07:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700985320; h=from:from:reply-to:subject:subject: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+ZahLcZhOUE4do0pYPcNCc5Qn4so1+lrpt9bFdSrc=; b=J+FqKEwUDIBvmAONNbnJE2YDSbKmNIU5hdF57/Nq16+gqB1SAIglx6zdVzjUXBSR+MXlTX OTYZh//1sf5H+kYsYJQbqqZngJTPNfDYSsjO/gOAyz8UsmeIyHvbebd/vGQdp++IW/C+qX KizH2eYnGNIqjfTTNI2IhTd3RyCVZ8HFrraCXsujXhKOWzni6iFPIqhJxQBQ0FNBhgxGnv 5you40y2seyn9GGF3SvS+mFJ/qtvfsOMPylYLzBNOK3/tMvNZlCFeGtZS9ULLbvOse8dxk KOFWOadw1SPwzLXUZ3Ehy6uH1jDD5CV5gNoV8OICW5KgsjYH12cOk/OlhtQQVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700985320; h=from:from:reply-to:subject:subject: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+ZahLcZhOUE4do0pYPcNCc5Qn4so1+lrpt9bFdSrc=; b=rMjKXFgyapdKDPsjBQuw3LIwfgCfiT+N96xaXzKagw86YUUBv3ZChm5j10SLbtP9gXF2Zw c6zyx7i+JEh5ygXT3yLwDrzwChYyBM9kZtnIq63bqjllStfFVkCqFnQIykOETZYAtwMY/p bx+iY64eGuIoA+k7qZbU6YnBw72DB5kE5GcmHqc00fk722NE7DPItHcHD9Zkki0WHwPYK/ JT4iUp5KJc4pTSDsv8GKFPvwLjebMwwx1FOhrFYTBo5bf5iyuyVqNjOq7XpKRbsQ9Ke0i0 DpGx0QULMuHa1dOv0gFWwwNnZUIrlkjtRse2rFFGq9fjF2t/1mrTxHKt382/CQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700985320; a=rsa-sha256; cv=none; b=UmQY295UzhmTJxnHOb3ryelRQs4+fAYVgvLK+4C5wmWKHjl+8tCdi7McV394e6yoMmgRMy sGnknNCP55+v1CWwGZkuaFPglSCXNR2Ef9UOg+/VJ8i1R5ORIkKVAafx5+V75lEG2TLImo HZw6z4cD23kl4AjNOA9LqLv8/R30WrHP9y5rAaGylyV8BOGVW9GW+3s/vxnlBdSUO+ZIeU lY57TPHfRdpL+LfzqccbzuCXkxyFrYCPjj+mnZZQaaQhyrsa03buZY4aWDH+PMVwnV4D7J ELvGLzNfS3QUCnx1O497tvGh0iJsOvA8lWHRq4KEV2KRYQz5CF93EO9BrQ5YYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdLc82V2vznCl; Sun, 26 Nov 2023 07:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AQ7tK1g011228; Sun, 26 Nov 2023 07:55:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ7tKP5011225; Sun, 26 Nov 2023 07:55:20 GMT (envelope-from git) Date: Sun, 26 Nov 2023 07:55:20 GMT Message-Id: <202311260755.3AQ7tKP5011225@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 3d5d348bb5ce - stable/12 - ath(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3d5d348bb5ceb4027bc46e11de4bc7f28b255074 Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3d5d348bb5ceb4027bc46e11de4bc7f28b255074 commit 3d5d348bb5ceb4027bc46e11de4bc7f28b255074 Author: Gordon Bergling AuthorDate: 2023-11-23 08:57:28 +0000 Commit: Gordon Bergling CommitDate: 2023-11-26 07:55:04 +0000 ath(4): Fix a typo in a source code comment - s/mutiple/multiple/ (cherry picked from commit 4e36d081f377ecfa8375e5fe3d0763099f4a780d) --- sys/dev/ath/if_ath_beacon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ath/if_ath_beacon.c b/sys/dev/ath/if_ath_beacon.c index ac1244c5f8e7..427dcdd579c2 100644 --- a/sys/dev/ath/if_ath_beacon.c +++ b/sys/dev/ath/if_ath_beacon.c @@ -996,7 +996,7 @@ ath_beacon_config(struct ath_softc *sc, struct ieee80211vap *vap) * * The specification (802.11-2012 10.1.3.2 - Beacon Generation in * Infrastructure Networks) requires APs be beaconing at a - * mutiple of intval. So, if bintval=100, then we shouldn't + * multiple of intval. So, if bintval=100, then we shouldn't * get beacons at intervals other than around multiples of 100. */ if (nexttbtt == 0) /* e.g. for ap mode */ From nobody Sun Nov 26 07:55:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdLc95TxXz52Nyc; Sun, 26 Nov 2023 07:55: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 4SdLc94j9Hz4lY7; Sun, 26 Nov 2023 07:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700985321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=udOn4Gxmd1SKmoyfRhZdF//eExXnQXisyB8Js7TSdLU=; b=Q8Aew3as3cOT3VqUXj0dBmzQJbwMSjLEay3AE2C7+bAPvvmSpNRfqfmK7Dt+Way/M6XPOK vRSVDFm/Sj3H6fEPNitlStMFPFy8W6HLCymOvU9Jwn1LtgtsjzJ36N7OkEB1qw2D7nM4bO aaF7Qx4kmeaTGzRj3SK/Wy6CH1gKGFfKp6HBka174D74+c1noKo1y68p9/drf8zQa7/BG8 gl90IeEU91ac/nhUlq/dbu30EDbLFjVF3A0uuxod9OeZNDfCCmeEDlJ63VrA88M8RAVMmG +Jq8w8uRKFhX1RcnXOinF8Lxof+M1n9KgSGO9jloZRwBtzXivArc/YnNUg8Psw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700985321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=udOn4Gxmd1SKmoyfRhZdF//eExXnQXisyB8Js7TSdLU=; b=nsxNv3CQbu554YNSacuASqrLEhRgicMT2prxQzrxexv1xI9RdTxeKri9MZ8nEbQ31Loc6N xhifWmWCqTvyLLOtyT1TrddNwm9nna4VFEOyBbvt60YEkcMACbInlp7qW2+u1rE3ULrA5a mlVux8YYhTzjZJP+ZJbp1GIj6XGU0ZBe3ug46ZLw9EkgSq6f1TTMxAr6fGhviOePsLW+70 PtLf/C4x+mT8z7LXpJovIQ55cQRSK1c5hgXnwqnqo2juP65ZbENTrbF4UIf+ysbnV5Es1j Nz/phBFhmqkkQDaVcBzu6YlVsAEpcEMlJmZ9XqGy4NFB2tZh3YIEh62/ZOjlsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700985321; a=rsa-sha256; cv=none; b=GgbkVXdYXUL6FaNfyReZtYobaY132hGBxojcJo9DqEg0l7NhGUrEGLcdhQT8Sd2Y3GQUus gYyRRGjirRfaDx+Lay8lIvmU00L7b1OVp4yQP42H/VSigJQYfZ4VObjGYwiOucbGnEZSY+ 65JP46zt4pVLA8f0ia0kUtH76LVxCeKSfBnAZOIVtPK77mtB7VUIB0V7LHufip27Ou3ctm TrriNGbSc7BNawyIAy57eG/HbZIFqgbRuceZtvV+BJ5cpLh+9zLYnQRj3nKAC3nhxukEwa OBsQcKG4HyjyUcJflLUXNU8GIGiSB9DLw9OQ45s7DqtKure0qSjkt/HfH2H+FA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdLc93Y18znNL; Sun, 26 Nov 2023 07:55: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 3AQ7tL12011285; Sun, 26 Nov 2023 07:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ7tLuW011282; Sun, 26 Nov 2023 07:55:21 GMT (envelope-from git) Date: Sun, 26 Nov 2023 07:55:21 GMT Message-Id: <202311260755.3AQ7tLuW011282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 92dff9984d12 - stable/12 - libcasper: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 92dff9984d12bab2fb49bf8302f9e59688c3cfe2 Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=92dff9984d12bab2fb49bf8302f9e59688c3cfe2 commit 92dff9984d12bab2fb49bf8302f9e59688c3cfe2 Author: Gordon Bergling AuthorDate: 2023-11-23 08:58:15 +0000 Commit: Gordon Bergling CommitDate: 2023-11-26 07:55:11 +0000 libcasper: Fix a typo in a source code comment - s/mutiple/multiple/ (cherry picked from commit 637e4ef1a6bcd8677dabd8c08916df3091be5f64) --- lib/libcasper/libcasper/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcasper/libcasper/service.c b/lib/libcasper/libcasper/service.c index e87d0640347c..e0f5f0b7d782 100644 --- a/lib/libcasper/libcasper/service.c +++ b/lib/libcasper/libcasper/service.c @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); * The problem is that we may restrict/sandbox service instance according * to the limits provided. When new connection comes in with different * limits we won't be able to access requested resources. - * Not to mention one process will serve to mutiple mutually untrusted + * Not to mention one process will serve to multiple mutually untrusted * clients and compromise of this service instance by one of its clients * can lead to compromise of the other clients. */ From nobody Sun Nov 26 18:26:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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 04:20:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sdsp42gwDz52GZ9; Mon, 27 Nov 2023 04:20: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 4Sdsp363fFz4Dsj; Mon, 27 Nov 2023 04:20:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701058843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sDMtcZKNL1s++Ky30TfS4N+dkdsCwbv5iQpkVHIaqys=; b=Jaipy/0jPJ/W+f+MLwR4COkq4hxv+SIzsohVPoZf7pABbAg7bY1OfG2O++/oKPv/0CYyXl jOjT56T91cJ9S1AI4ABLXLfxLvmXbwoE9Qy1zJ9JOVwx2+REwXbgbIDe+MB/N4FYhUSXY4 CgtviR8aPNMn6yQiuc15njeuWrdtVQpCTJ2jEH02tw/8wKgeO+VNENElZl5dyKN03fioce Q+1KTbfZ6RgZVBD8vSpw2dK+vSI1wCIry/qocZRtOpkv996dLwv0T/24Pe5K6NB9XopraT Wz4yJQeUDMFQcDZwNuC/o/pJUlhQkL9sFIc4gTO60uBjGp6bvMCjFNCLyxj4Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701058843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sDMtcZKNL1s++Ky30TfS4N+dkdsCwbv5iQpkVHIaqys=; b=aySs9PkpSS/RZaFeAQghlsV3pk6LoIIwCzONCRaq+XkeiuTxTMn9fzuwhmQqUQHTlph+/g BhUTwg6WQ6r2mwwQMU7FBW7W0EjlwHwc5SCN5kNwRMNMREK/06dqaYge9OEcuI5/mw9QDv sEnu3yzq7MV1cQV+g1YCjqX94/Evba6ZukZJinxgjIwXseRE+YXWx2gJOLsYZ/1SV7w6n3 qn+raTuEa7BK8CnqfJvnpjWNyIJS0MG/WOk1Vk3O2kiHrw12SrtiP2IMU/kqBru6FZwr+M 5hlGS5BualEG7ReajJMUK9D3UhA/Azji0Ij7DLTN/oynVaJRPjMCJyN9TeFc3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701058843; a=rsa-sha256; cv=none; b=fxHiJ6iuqtnCm4Wt+2qECVK1E36rFtRZ0uCR1wdBFhi4aeJrop/+DQK9yBSkVVfabgeWbw pAavzIHy9qo/24TPWeA/CbQ0s96lgA4/vIrC0sr2oYCzC32y0JEhbUA5q+1l6v0RKGPKFm P3fvOLgdVzXkhxL+u833xzNnpIXvr9rUK0ZCrsBMvo0o+6E5WBbW1+R0i80CJoeZ63aU83 k+cSj2xyAyVZJ871GZZYluAGUVUJrszE9pUFgvdB2+s0zNl2Eo0g7wi5fphIQqf/PpmSIQ EYoNoNqn8zOhopN2IDZKXK5y7Af7L4MF/Wyhdc3Lw4mO6fDdz127YnyZtcdbvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sdsp356Rfz8HB; Mon, 27 Nov 2023 04:20: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 3AR4Kh3q059339; Mon, 27 Nov 2023 04:20:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR4KhvM059337; Mon, 27 Nov 2023 04:20:43 GMT (envelope-from git) Date: Mon, 27 Nov 2023 04:20:43 GMT Message-Id: <202311270420.3AR4KhvM059337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 4025b5b527c8 - stable/14 - libc: Purge unneeded cdefs.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4025b5b527c870cf095ac9531764f4e4d3feaec2 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4025b5b527c870cf095ac9531764f4e4d3feaec2 commit 4025b5b527c870cf095ac9531764f4e4d3feaec2 Author: Warner Losh AuthorDate: 2023-11-01 22:43:37 +0000 Commit: Warner Losh CommitDate: 2023-11-27 04:20:09 +0000 libc: Purge unneeded cdefs.h These sys/cdefs.h are not needed. Purge them. They are mostly left-over from the $FreeBSD$ removal. A few in libc are still required for macros that cdefs.h defines. Keep those. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D42385 (cherry picked from commit 559a218c9b257775fb249b67945fe4a05b7a6b9f) --- lib/libc/aarch64/gen/flt_rounds.c | 1 - lib/libc/aarch64/gen/fpgetmask.c | 1 - lib/libc/aarch64/gen/fpsetmask.c | 1 - lib/libc/aarch64/gen/infinity.c | 1 - lib/libc/aarch64/gen/makecontext.c | 1 - lib/libc/aarch64/sys/__vdso_gettc.c | 1 - lib/libc/amd64/gen/flt_rounds.c | 1 - lib/libc/amd64/gen/infinity.c | 1 - lib/libc/amd64/gen/makecontext.c | 1 - lib/libc/amd64/gen/signalcontext.c | 1 - lib/libc/amd64/string/bcopy.c | 1 - lib/libc/amd64/string/bzero.c | 1 - lib/libc/amd64/string/strcpy.c | 1 - lib/libc/amd64/string/strnlen.c | 1 - lib/libc/amd64/sys/amd64_get_fsbase.c | 1 - lib/libc/amd64/sys/amd64_get_gsbase.c | 1 - lib/libc/amd64/sys/amd64_set_fsbase.c | 1 - lib/libc/amd64/sys/amd64_set_gsbase.c | 1 - lib/libc/arm/aeabi/aeabi_atexit.c | 1 - lib/libc/arm/aeabi/aeabi_double.c | 1 - lib/libc/arm/aeabi/aeabi_float.c | 1 - lib/libc/arm/aeabi/aeabi_unwind_cpp.c | 1 - lib/libc/arm/aeabi/aeabi_unwind_exidx.c | 1 - lib/libc/arm/gen/arm_drain_writebuf.c | 1 - lib/libc/arm/gen/arm_initfini.c | 1 - lib/libc/arm/gen/arm_sync_icache.c | 1 - lib/libc/arm/gen/fabs.c | 1 - lib/libc/arm/gen/flt_rounds.c | 1 - lib/libc/arm/gen/fpgetmask_vfp.c | 1 - lib/libc/arm/gen/fpgetround_vfp.c | 1 - lib/libc/arm/gen/fpgetsticky_vfp.c | 1 - lib/libc/arm/gen/fpsetmask_vfp.c | 1 - lib/libc/arm/gen/fpsetround_vfp.c | 1 - lib/libc/arm/gen/fpsetsticky_vfp.c | 1 - lib/libc/arm/gen/getcontextx.c | 1 - lib/libc/arm/gen/infinity.c | 1 - lib/libc/arm/gen/makecontext.c | 1 - lib/libc/arm/gen/signalcontext.c | 1 - lib/libc/arm/sys/__vdso_gettc.c | 1 - lib/libc/compat-43/creat.c | 1 - lib/libc/compat-43/gethostid.c | 1 - lib/libc/compat-43/getwd.c | 1 - lib/libc/compat-43/killpg.c | 1 - lib/libc/compat-43/sethostid.c | 1 - lib/libc/compat-43/setpgrp.c | 1 - lib/libc/compat-43/setrgid.c | 1 - lib/libc/compat-43/setruid.c | 1 - lib/libc/compat-43/sigcompat.c | 1 - lib/libc/csu/aarch64/reloc.c | 1 - lib/libc/csu/amd64/reloc.c | 1 - lib/libc/csu/i386/reloc.c | 1 - lib/libc/csu/powerpc64/reloc.c | 1 - lib/libc/db/btree/bt_close.c | 1 - lib/libc/db/btree/bt_conv.c | 1 - lib/libc/db/btree/bt_debug.c | 1 - lib/libc/db/btree/bt_delete.c | 1 - lib/libc/db/btree/bt_get.c | 1 - lib/libc/db/btree/bt_open.c | 1 - lib/libc/db/btree/bt_overflow.c | 1 - lib/libc/db/btree/bt_page.c | 1 - lib/libc/db/btree/bt_put.c | 1 - lib/libc/db/btree/bt_search.c | 1 - lib/libc/db/btree/bt_seq.c | 1 - lib/libc/db/btree/bt_split.c | 1 - lib/libc/db/btree/bt_utils.c | 1 - lib/libc/db/db/db.c | 1 - lib/libc/db/hash/hash.c | 1 - lib/libc/db/hash/hash_bigkey.c | 1 - lib/libc/db/hash/hash_buf.c | 1 - lib/libc/db/hash/hash_func.c | 1 - lib/libc/db/hash/hash_log2.c | 1 - lib/libc/db/hash/hash_page.c | 1 - lib/libc/db/hash/ndbm.c | 1 - lib/libc/db/mpool/mpool-compat.c | 1 - lib/libc/db/mpool/mpool.c | 1 - lib/libc/db/recno/rec_close.c | 1 - lib/libc/db/recno/rec_delete.c | 1 - lib/libc/db/recno/rec_get.c | 1 - lib/libc/db/recno/rec_open.c | 1 - lib/libc/db/recno/rec_put.c | 1 - lib/libc/db/recno/rec_search.c | 1 - lib/libc/db/recno/rec_utils.c | 1 - lib/libc/db/test/btree.tests/main.c | 1 - lib/libc/db/test/dbtest.c | 1 - lib/libc/db/test/hash.tests/driver2.c | 1 - lib/libc/db/test/hash.tests/tcreat3.c | 1 - lib/libc/db/test/hash.tests/tdel.c | 1 - lib/libc/db/test/hash.tests/thash4.c | 1 - lib/libc/db/test/hash.tests/tread2.c | 1 - lib/libc/db/test/hash.tests/tseq.c | 1 - lib/libc/db/test/hash.tests/tverify.c | 1 - lib/libc/gdtoa/_hdtoa.c | 1 - lib/libc/gdtoa/_hldtoa.c | 1 - lib/libc/gdtoa/_ldtoa.c | 1 - lib/libc/gdtoa/machdep_ldisQ.c | 1 - lib/libc/gdtoa/machdep_ldisd.c | 1 - lib/libc/gdtoa/machdep_ldisx.c | 1 - lib/libc/gen/__getosreldate.c | 1 - lib/libc/gen/__pthread_mutex_init_calloc_cb_stub.c | 1 - lib/libc/gen/__xuname.c | 1 - lib/libc/gen/_once_stub.c | 1 - lib/libc/gen/_pthread_stubs.c | 1 - lib/libc/gen/_rand48.c | 1 - lib/libc/gen/_spinlock_stub.c | 1 - lib/libc/gen/_thread_init.c | 1 - lib/libc/gen/arc4random-compat.c | 1 - lib/libc/gen/arc4random.c | 1 - lib/libc/gen/auxv.c | 1 - lib/libc/gen/basename.c | 1 - lib/libc/gen/basename_compat.c | 1 - lib/libc/gen/cap_sandboxed.c | 1 - lib/libc/gen/check_utility_compat.c | 1 - lib/libc/gen/clock_getcpuclockid.c | 1 - lib/libc/gen/ctermid.c | 1 - lib/libc/gen/devname-compat11.c | 1 - lib/libc/gen/dirfd.c | 1 - lib/libc/gen/dirname.c | 1 - lib/libc/gen/dirname_compat.c | 1 - lib/libc/gen/dlfcn.c | 1 - lib/libc/gen/drand48.c | 1 - lib/libc/gen/dup3.c | 1 - lib/libc/gen/erand48.c | 1 - lib/libc/gen/errno.c | 1 - lib/libc/gen/eventfd.c | 1 - lib/libc/gen/exect.c | 1 - lib/libc/gen/fdevname.c | 1 - lib/libc/gen/feature_present.c | 1 - lib/libc/gen/fmtcheck.c | 1 - lib/libc/gen/fmtmsg.c | 1 - lib/libc/gen/ftok.c | 1 - lib/libc/gen/fts-compat.c | 1 - lib/libc/gen/fts-compat11.c | 1 - lib/libc/gen/ftw-compat11.c | 1 - lib/libc/gen/ftw.c | 1 - lib/libc/gen/getbootfile.c | 1 - lib/libc/gen/getentropy.c | 1 - lib/libc/gen/getgrent.c | 1 - lib/libc/gen/getmntinfo-compat11.c | 1 - lib/libc/gen/getpagesizes.c | 1 - lib/libc/gen/getpeereid.c | 1 - lib/libc/gen/getprogname.c | 1 - lib/libc/gen/getpwent.c | 1 - lib/libc/gen/getutxent.c | 1 - lib/libc/gen/glob-compat11.c | 1 - lib/libc/gen/glob-compat11.h | 1 - lib/libc/gen/jrand48.c | 1 - lib/libc/gen/lcong48.c | 1 - lib/libc/gen/ldexp.c | 1 - lib/libc/gen/libc_dlopen.c | 1 - lib/libc/gen/lockf.c | 1 - lib/libc/gen/lrand48.c | 1 - lib/libc/gen/memalign.c | 1 - lib/libc/gen/modf.c | 1 - lib/libc/gen/mrand48.c | 1 - lib/libc/gen/nftw-compat11.c | 1 - lib/libc/gen/nftw.c | 1 - lib/libc/gen/nrand48.c | 1 - lib/libc/gen/pmadvise.c | 1 - lib/libc/gen/posix_spawn.c | 1 - lib/libc/gen/pututxline.c | 1 - lib/libc/gen/readdir-compat11.c | 1 - lib/libc/gen/readpassphrase.c | 1 - lib/libc/gen/recvmmsg.c | 1 - lib/libc/gen/scandir-compat11.c | 1 - lib/libc/gen/seed48.c | 1 - lib/libc/gen/semctl.c | 1 - lib/libc/gen/sendmmsg.c | 1 - lib/libc/gen/setproctitle.c | 1 - lib/libc/gen/setprogname.c | 1 - lib/libc/gen/statvfs.c | 1 - lib/libc/gen/sysctlbyname.c | 1 - lib/libc/gen/sysctlnametomib.c | 1 - lib/libc/gen/tls.c | 1 - lib/libc/gen/trivial-getcontextx.c | 1 - lib/libc/gen/utxdb.c | 1 - lib/libc/gen/waitid.c | 1 - lib/libc/gen/wordexp.c | 1 - lib/libc/gmon/gmon.c | 1 - lib/libc/gmon/mcount.c | 1 - lib/libc/i386/gen/flt_rounds.c | 1 - lib/libc/i386/gen/infinity.c | 1 - lib/libc/i386/gen/makecontext.c | 1 - lib/libc/i386/gen/signalcontext.c | 1 - lib/libc/i386/sys/i386_clr_watch.c | 1 - lib/libc/i386/sys/i386_get_fsbase.c | 1 - lib/libc/i386/sys/i386_get_gsbase.c | 1 - lib/libc/i386/sys/i386_get_ioperm.c | 1 - lib/libc/i386/sys/i386_get_ldt.c | 1 - lib/libc/i386/sys/i386_set_fsbase.c | 1 - lib/libc/i386/sys/i386_set_gsbase.c | 1 - lib/libc/i386/sys/i386_set_ioperm.c | 1 - lib/libc/i386/sys/i386_set_ldt.c | 1 - lib/libc/i386/sys/i386_set_watch.c | 1 - lib/libc/i386/sys/i386_vm86.c | 1 - lib/libc/iconv/bsd_iconv.c | 1 - lib/libc/iconv/citrus_bcs.c | 1 - lib/libc/iconv/citrus_bcs_strtol.c | 1 - lib/libc/iconv/citrus_bcs_strtoul.c | 1 - lib/libc/iconv/citrus_csmapper.c | 1 - lib/libc/iconv/citrus_db.c | 1 - lib/libc/iconv/citrus_db_factory.c | 1 - lib/libc/iconv/citrus_db_hash.c | 1 - lib/libc/iconv/citrus_esdb.c | 1 - lib/libc/iconv/citrus_hash.c | 1 - lib/libc/iconv/citrus_iconv.c | 1 - lib/libc/iconv/citrus_lookup.c | 1 - lib/libc/iconv/citrus_lookup_factory.c | 1 - lib/libc/iconv/citrus_mapper.c | 1 - lib/libc/iconv/citrus_memstream.c | 1 - lib/libc/iconv/citrus_mmap.c | 1 - lib/libc/iconv/citrus_module.c | 1 - lib/libc/iconv/citrus_none.c | 1 - lib/libc/iconv/citrus_pivot_factory.c | 1 - lib/libc/iconv/citrus_prop.c | 1 - lib/libc/iconv/citrus_stdenc.c | 1 - lib/libc/include/errlst.h | 1 - lib/libc/include/spinlock.h | 1 - lib/libc/inet/inet_addr.c | 1 - lib/libc/inet/inet_cidr_ntop.c | 1 - lib/libc/inet/inet_cidr_pton.c | 1 - lib/libc/inet/inet_lnaof.c | 1 - lib/libc/inet/inet_makeaddr.c | 1 - lib/libc/inet/inet_net_ntop.c | 1 - lib/libc/inet/inet_net_pton.c | 1 - lib/libc/inet/inet_neta.c | 1 - lib/libc/inet/inet_netof.c | 1 - lib/libc/inet/inet_network.c | 1 - lib/libc/inet/inet_ntoa.c | 1 - lib/libc/inet/inet_ntop.c | 1 - lib/libc/inet/inet_pton.c | 1 - lib/libc/inet/nsap_addr.c | 1 - lib/libc/isc/ev_streams.c | 1 - lib/libc/isc/ev_timers.c | 1 - lib/libc/locale/ascii.c | 1 - lib/libc/locale/big5.c | 1 - lib/libc/locale/btowc.c | 1 - lib/libc/locale/c16rtomb.c | 1 - lib/libc/locale/c32rtomb.c | 1 - lib/libc/locale/cXXrtomb_iconv.h | 1 - lib/libc/locale/collate.c | 1 - lib/libc/locale/collate.h | 1 - lib/libc/locale/collcmp.c | 1 - lib/libc/locale/fix_grouping.c | 1 - lib/libc/locale/gbk.c | 1 - lib/libc/locale/isctype.c | 1 - lib/libc/locale/iswctype.c | 1 - lib/libc/locale/ldpart.c | 1 - lib/libc/locale/lmessages.c | 1 - lib/libc/locale/lmonetary.c | 1 - lib/libc/locale/lnumeric.c | 1 - lib/libc/locale/localeconv.c | 1 - lib/libc/locale/mblen.c | 1 - lib/libc/locale/mbrlen.c | 1 - lib/libc/locale/mbrtoc16.c | 1 - lib/libc/locale/mbrtoc32.c | 1 - lib/libc/locale/mbrtocXX_iconv.h | 1 - lib/libc/locale/mbrtowc.c | 1 - lib/libc/locale/mbsinit.c | 1 - lib/libc/locale/mbsnrtowcs.c | 1 - lib/libc/locale/mbsrtowcs.c | 1 - lib/libc/locale/mbstowcs.c | 1 - lib/libc/locale/mbtowc.c | 1 - lib/libc/locale/mskanji.c | 1 - lib/libc/locale/nextwctype.c | 1 - lib/libc/locale/nl_langinfo.c | 1 - lib/libc/locale/nomacros.c | 1 - lib/libc/locale/none.c | 1 - lib/libc/locale/rpmatch.c | 1 - lib/libc/locale/rune.c | 1 - lib/libc/locale/runetype.c | 1 - lib/libc/locale/setlocale.c | 1 - lib/libc/locale/setrunelocale.c | 1 - lib/libc/locale/table.c | 1 - lib/libc/locale/tolower.c | 1 - lib/libc/locale/toupper.c | 1 - lib/libc/locale/wcrtomb.c | 1 - lib/libc/locale/wcsftime.c | 1 - lib/libc/locale/wcsnrtombs.c | 1 - lib/libc/locale/wcsrtombs.c | 1 - lib/libc/locale/wcstod.c | 1 - lib/libc/locale/wcstof.c | 1 - lib/libc/locale/wcstoimax.c | 1 - lib/libc/locale/wcstol.c | 1 - lib/libc/locale/wcstold.c | 1 - lib/libc/locale/wcstoll.c | 1 - lib/libc/locale/wcstombs.c | 1 - lib/libc/locale/wcstoul.c | 1 - lib/libc/locale/wcstoull.c | 1 - lib/libc/locale/wcstoumax.c | 1 - lib/libc/locale/wctob.c | 1 - lib/libc/locale/wctomb.c | 1 - lib/libc/locale/wctrans.c | 1 - lib/libc/locale/wctype.c | 1 - lib/libc/locale/wcwidth.c | 1 - lib/libc/nameser/ns_name.c | 1 - lib/libc/nameser/ns_netint.c | 1 - lib/libc/nameser/ns_parse.c | 1 - lib/libc/nameser/ns_print.c | 1 - lib/libc/nameser/ns_samedomain.c | 1 - lib/libc/nameser/ns_ttl.c | 1 - lib/libc/net/base64.c | 1 - lib/libc/net/ether_addr.c | 1 - lib/libc/net/eui64.c | 1 - lib/libc/net/gai_strerror.c | 1 - lib/libc/net/getaddrinfo.c | 1 - lib/libc/net/gethostbydns.c | 1 - lib/libc/net/gethostbyht.c | 1 - lib/libc/net/gethostbynis.c | 1 - lib/libc/net/gethostnamadr.c | 1 - lib/libc/net/getifaddrs.c | 1 - lib/libc/net/getifmaddrs.c | 1 - lib/libc/net/getnameinfo.c | 1 - lib/libc/net/getnetbydns.c | 1 - lib/libc/net/getnetbyht.c | 1 - lib/libc/net/getnetbynis.c | 1 - lib/libc/net/getnetnamadr.c | 1 - lib/libc/net/getproto.c | 1 - lib/libc/net/getprotoent.c | 1 - lib/libc/net/getprotoname.c | 1 - lib/libc/net/getservent.c | 1 - lib/libc/net/hesiod.c | 2 -- lib/libc/net/if_indextoname.c | 1 - lib/libc/net/if_nameindex.c | 1 - lib/libc/net/if_nametoindex.c | 1 - lib/libc/net/ip6opt.c | 1 - lib/libc/net/linkaddr.c | 1 - lib/libc/net/map_v4v6.c | 1 - lib/libc/net/name6.c | 1 - lib/libc/net/nscache.c | 1 - lib/libc/net/nscachedcli.c | 1 - lib/libc/net/nsdispatch.c | 1 - lib/libc/net/nsparser.y | 1 - lib/libc/net/nss_compat.c | 1 - lib/libc/net/ntoh.c | 1 - lib/libc/net/rcmd.c | 1 - lib/libc/net/rcmdsh.c | 1 - lib/libc/net/recv.c | 1 - lib/libc/net/rthdr.c | 1 - lib/libc/net/sctp_sys_calls.c | 1 - lib/libc/net/send.c | 1 - lib/libc/net/sourcefilter.c | 1 - lib/libc/net/vars.c | 1 - lib/libc/nls/msgcat.c | 1 - lib/libc/posix1e/acl_branding.c | 1 - lib/libc/posix1e/acl_calc_mask.c | 1 - lib/libc/posix1e/acl_cmp_np.c | 1 - lib/libc/posix1e/acl_compat.c | 1 - lib/libc/posix1e/acl_copy.c | 1 - lib/libc/posix1e/acl_delete.c | 1 - lib/libc/posix1e/acl_delete_entry.c | 1 - lib/libc/posix1e/acl_entry.c | 1 - lib/libc/posix1e/acl_equiv_mode_np.c | 1 - lib/libc/posix1e/acl_extended_file_np.c | 1 - lib/libc/posix1e/acl_flag.c | 1 - lib/libc/posix1e/acl_free.c | 1 - lib/libc/posix1e/acl_from_mode_np.c | 1 - lib/libc/posix1e/acl_from_text.c | 1 - lib/libc/posix1e/acl_from_text_nfs4.c | 1 - lib/libc/posix1e/acl_get.c | 1 - lib/libc/posix1e/acl_id_to_name.c | 1 - lib/libc/posix1e/acl_init.c | 1 - lib/libc/posix1e/acl_perm.c | 1 - lib/libc/posix1e/acl_set.c | 1 - lib/libc/posix1e/acl_strip.c | 1 - lib/libc/posix1e/acl_support.c | 1 - lib/libc/posix1e/acl_support_nfs4.c | 1 - lib/libc/posix1e/acl_to_text.c | 1 - lib/libc/posix1e/acl_to_text_nfs4.c | 1 - lib/libc/posix1e/acl_valid.c | 1 - lib/libc/posix1e/extattr.c | 1 - lib/libc/posix1e/mac.c | 1 - lib/libc/posix1e/mac_exec.c | 1 - lib/libc/posix1e/mac_get.c | 1 - lib/libc/posix1e/mac_set.c | 1 - lib/libc/powerpc/gen/flt_rounds.c | 1 - lib/libc/powerpc/gen/fpgetmask.c | 1 - lib/libc/powerpc/gen/fpgetround.c | 1 - lib/libc/powerpc/gen/fpgetsticky.c | 1 - lib/libc/powerpc/gen/fpsetmask.c | 1 - lib/libc/powerpc/gen/fpsetround.c | 1 - lib/libc/powerpc/gen/makecontext.c | 1 - lib/libc/powerpc/gen/signalcontext.c | 1 - lib/libc/powerpc/sys/__vdso_gettc.c | 1 - lib/libc/powerpc64/gen/flt_rounds.c | 1 - lib/libc/powerpc64/gen/fpgetmask.c | 1 - lib/libc/powerpc64/gen/fpgetround.c | 1 - lib/libc/powerpc64/gen/fpgetsticky.c | 1 - lib/libc/powerpc64/gen/fpsetmask.c | 1 - lib/libc/powerpc64/gen/fpsetround.c | 1 - lib/libc/powerpc64/gen/makecontext.c | 1 - lib/libc/powerpc64/gen/signalcontext.c | 1 - lib/libc/powerpc64/string/bcopy_resolver.c | 1 - lib/libc/powerpc64/string/strcpy.c | 1 - lib/libc/powerpc64/string/strcpy_resolver.c | 1 - lib/libc/powerpc64/string/strncpy.c | 1 - lib/libc/powerpc64/string/strncpy_resolver.c | 1 - lib/libc/powerpc64/sys/__vdso_gettc.c | 1 - lib/libc/powerpcspe/gen/flt_rounds.c | 1 - lib/libc/powerpcspe/gen/fpgetmask.c | 1 - lib/libc/powerpcspe/gen/fpgetround.c | 1 - lib/libc/powerpcspe/gen/fpgetsticky.c | 1 - lib/libc/powerpcspe/gen/fpsetmask.c | 1 - lib/libc/powerpcspe/gen/fpsetround.c | 1 - lib/libc/quad/TESTS/divrem.c | 1 - lib/libc/quad/TESTS/mul.c | 1 - lib/libc/quad/adddi3.c | 1 - lib/libc/quad/anddi3.c | 1 - lib/libc/quad/ashldi3.c | 1 - lib/libc/quad/ashrdi3.c | 1 - lib/libc/quad/cmpdi2.c | 1 - lib/libc/quad/divdi3.c | 1 - lib/libc/quad/fixdfdi.c | 1 - lib/libc/quad/fixsfdi.c | 1 - lib/libc/quad/fixunsdfdi.c | 1 - lib/libc/quad/fixunssfdi.c | 1 - lib/libc/quad/floatdidf.c | 1 - lib/libc/quad/floatdisf.c | 1 - lib/libc/quad/floatunsdidf.c | 1 - lib/libc/quad/iordi3.c | 1 - lib/libc/quad/lshldi3.c | 1 - lib/libc/quad/lshrdi3.c | 1 - lib/libc/quad/moddi3.c | 1 - lib/libc/quad/muldi3.c | 1 - lib/libc/quad/negdi2.c | 1 - lib/libc/quad/notdi2.c | 1 - lib/libc/quad/qdivrem.c | 1 - lib/libc/quad/subdi3.c | 1 - lib/libc/quad/ucmpdi2.c | 1 - lib/libc/quad/udivdi3.c | 1 - lib/libc/quad/umoddi3.c | 1 - lib/libc/quad/xordi3.c | 1 - lib/libc/regex/engine.c | 1 - lib/libc/regex/grot/debug.c | 1 - lib/libc/regex/grot/main.c | 1 - lib/libc/regex/grot/split.c | 1 - lib/libc/regex/regcomp.c | 1 - lib/libc/regex/regerror.c | 1 - lib/libc/regex/regexec.c | 1 - lib/libc/regex/regfree.c | 1 - lib/libc/resolv/herror.c | 1 - lib/libc/resolv/mtctxres.c | 1 - lib/libc/resolv/res_comp.c | 1 - lib/libc/resolv/res_data.c | 1 - lib/libc/resolv/res_debug.c | 1 - lib/libc/resolv/res_findzonecut.c | 1 - lib/libc/resolv/res_init.c | 1 - lib/libc/resolv/res_mkquery.c | 1 - lib/libc/resolv/res_mkupdate.c | 1 - lib/libc/resolv/res_query.c | 1 - lib/libc/resolv/res_send.c | 1 - lib/libc/resolv/res_update.c | 1 - lib/libc/riscv/gen/flt_rounds.c | 1 - lib/libc/riscv/gen/fpgetmask.c | 1 - lib/libc/riscv/gen/fpsetmask.c | 1 - lib/libc/riscv/gen/infinity.c | 1 - lib/libc/riscv/gen/makecontext.c | 1 - lib/libc/riscv/sys/__vdso_gettc.c | 1 - lib/libc/rpc/auth_des.c | 2 -- lib/libc/rpc/auth_none.c | 1 - lib/libc/rpc/auth_time.c | 1 - lib/libc/rpc/auth_unix.c | 1 - lib/libc/rpc/authdes_prot.c | 1 - lib/libc/rpc/authunix_prot.c | 1 - lib/libc/rpc/bindresvport.c | 1 - lib/libc/rpc/clnt_bcast.c | 1 - lib/libc/rpc/clnt_dg.c | 1 - lib/libc/rpc/clnt_generic.c | 1 - lib/libc/rpc/clnt_perror.c | 1 - lib/libc/rpc/clnt_raw.c | 1 - lib/libc/rpc/clnt_simple.c | 1 - lib/libc/rpc/clnt_vc.c | 1 - lib/libc/rpc/crypt_client.c | 1 - lib/libc/rpc/des_crypt.c | 1 - lib/libc/rpc/des_soft.c | 1 - lib/libc/rpc/getnetconfig.c | 1 - lib/libc/rpc/getnetpath.c | 1 - lib/libc/rpc/getpublickey.c | 1 - lib/libc/rpc/getrpcent.c | 1 - lib/libc/rpc/getrpcport.c | 1 - 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 | 1 - lib/libc/rpc/netnamer.c | 1 - lib/libc/rpc/pmap_clnt.c | 1 - lib/libc/rpc/pmap_getmaps.c | 1 - lib/libc/rpc/pmap_getport.c | 1 - lib/libc/rpc/pmap_prot.c | 1 - lib/libc/rpc/pmap_prot2.c | 1 - lib/libc/rpc/pmap_rmt.c | 1 - lib/libc/rpc/rpc_callmsg.c | 1 - lib/libc/rpc/rpc_com.h | 1 - lib/libc/rpc/rpc_commondata.c | 1 - lib/libc/rpc/rpc_dtablesize.c | 1 - lib/libc/rpc/rpc_generic.c | 1 - lib/libc/rpc/rpc_prot.c | 1 - lib/libc/rpc/rpc_soc.c | 1 - lib/libc/rpc/rpcb_clnt.c | 1 - lib/libc/rpc/rpcb_prot.c | 1 - lib/libc/rpc/rpcb_st_xdr.c | 1 - lib/libc/rpc/rpcdname.c | 1 - lib/libc/rpc/rtime.c | 1 - lib/libc/rpc/svc.c | 1 - lib/libc/rpc/svc_auth.c | 1 - lib/libc/rpc/svc_auth_des.c | 1 - lib/libc/rpc/svc_auth_unix.c | 1 - lib/libc/rpc/svc_dg.c | 1 - lib/libc/rpc/svc_generic.c | 1 - lib/libc/rpc/svc_raw.c | 1 - lib/libc/rpc/svc_run.c | 1 - lib/libc/rpc/svc_simple.c | 1 - lib/libc/rpc/svc_vc.c | 1 - lib/libc/secure/stack_protector.c | 1 - lib/libc/softfloat/bits32/softfloat.c | 1 - lib/libc/softfloat/bits64/softfloat.c | 1 - lib/libc/softfloat/eqdf2.c | 1 - lib/libc/softfloat/eqsf2.c | 1 - lib/libc/softfloat/eqtf2.c | 1 - lib/libc/softfloat/fpgetmask.c | 1 - lib/libc/softfloat/fpgetround.c | 1 - lib/libc/softfloat/fpgetsticky.c | 1 - lib/libc/softfloat/fpsetmask.c | 1 - lib/libc/softfloat/fpsetround.c | 1 - lib/libc/softfloat/fpsetsticky.c | 1 - lib/libc/softfloat/gedf2.c | 1 - lib/libc/softfloat/gesf2.c | 1 - lib/libc/softfloat/getf2.c | 1 - lib/libc/softfloat/gexf2.c | 1 - lib/libc/softfloat/gtdf2.c | 1 - lib/libc/softfloat/gtsf2.c | 1 - lib/libc/softfloat/gttf2.c | 1 - lib/libc/softfloat/gtxf2.c | 1 - lib/libc/softfloat/ledf2.c | 1 - lib/libc/softfloat/lesf2.c | 1 - lib/libc/softfloat/letf2.c | 1 - lib/libc/softfloat/ltdf2.c | 1 - lib/libc/softfloat/ltsf2.c | 1 - lib/libc/softfloat/lttf2.c | 1 - lib/libc/softfloat/nedf2.c | 1 - lib/libc/softfloat/negdf2.c | 1 - lib/libc/softfloat/negsf2.c | 1 - lib/libc/softfloat/negtf2.c | 1 - lib/libc/softfloat/negxf2.c | 1 - lib/libc/softfloat/nesf2.c | 1 - lib/libc/softfloat/netf2.c | 1 - lib/libc/softfloat/nexf2.c | 1 - lib/libc/softfloat/timesoftfloat.c | 1 - lib/libc/softfloat/unorddf2.c | 1 - lib/libc/softfloat/unordsf2.c | 1 - lib/libc/stdio/_flock_stub.c | 1 - lib/libc/stdio/asprintf.c | 1 - lib/libc/stdio/clrerr.c | 1 - lib/libc/stdio/dprintf.c | 1 - lib/libc/stdio/fclose.c | 1 - lib/libc/stdio/fcloseall.c | 1 - lib/libc/stdio/fdopen.c | 1 - lib/libc/stdio/feof.c | 1 - lib/libc/stdio/ferror.c | 1 - lib/libc/stdio/fflush.c | 1 - lib/libc/stdio/fgetc.c | 1 - lib/libc/stdio/fgetln.c | 1 - lib/libc/stdio/fgetpos.c | 1 - lib/libc/stdio/fgets.c | 1 - lib/libc/stdio/fgetwc.c | 1 - lib/libc/stdio/fgetwln.c | 1 - lib/libc/stdio/fgetws.c | 1 - lib/libc/stdio/fileno.c | 1 - lib/libc/stdio/findfp.c | 1 - lib/libc/stdio/flags.c | 1 - lib/libc/stdio/fmemopen.c | 1 - lib/libc/stdio/fopen.c | 1 - lib/libc/stdio/fopencookie.c | 1 - lib/libc/stdio/fprintf.c | 1 - lib/libc/stdio/fpurge.c | 1 - lib/libc/stdio/fputc.c | 1 - lib/libc/stdio/fputs.c | 1 - lib/libc/stdio/fputwc.c | 1 - lib/libc/stdio/fputws.c | 1 - lib/libc/stdio/fread.c | 1 - lib/libc/stdio/freopen.c | 1 - lib/libc/stdio/fscanf.c | 1 - lib/libc/stdio/fseek.c | 1 - lib/libc/stdio/fsetpos.c | 1 - lib/libc/stdio/ftell.c | 1 - lib/libc/stdio/funopen.c | 1 - lib/libc/stdio/fvwrite.c | 1 - lib/libc/stdio/fwalk.c | 1 - lib/libc/stdio/fwide.c | 1 - lib/libc/stdio/fwprintf.c | 1 - lib/libc/stdio/fwrite.c | 1 - lib/libc/stdio/fwscanf.c | 1 - lib/libc/stdio/getc.c | 1 - lib/libc/stdio/getchar.c | 1 - lib/libc/stdio/getdelim.c | 1 - lib/libc/stdio/getline.c | 1 - lib/libc/stdio/gets.c | 1 - lib/libc/stdio/gets_s.c | 1 - lib/libc/stdio/getw.c | 1 - lib/libc/stdio/getwc.c | 1 - lib/libc/stdio/getwchar.c | 1 - lib/libc/stdio/makebuf.c | 1 - lib/libc/stdio/mktemp.c | 1 - lib/libc/stdio/open_memstream.c | 1 - lib/libc/stdio/open_wmemstream.c | 1 - lib/libc/stdio/perror.c | 1 - lib/libc/stdio/printf-pos.c | 1 - lib/libc/stdio/printf.c | 1 - lib/libc/stdio/putc.c | 1 - lib/libc/stdio/putchar.c | 1 - lib/libc/stdio/puts.c | 1 - lib/libc/stdio/putw.c | 1 - lib/libc/stdio/putwc.c | 1 - lib/libc/stdio/putwchar.c | 1 - lib/libc/stdio/refill.c | 1 - lib/libc/stdio/remove.c | 1 - lib/libc/stdio/rewind.c | 1 - lib/libc/stdio/rget.c | 1 - lib/libc/stdio/scanf.c | 1 - lib/libc/stdio/setbuf.c | 1 - lib/libc/stdio/setbuffer.c | 1 - lib/libc/stdio/setvbuf.c | 1 - lib/libc/stdio/snprintf.c | 1 - lib/libc/stdio/sprintf.c | 1 - lib/libc/stdio/sscanf.c | 1 - lib/libc/stdio/stdio.c | 1 - lib/libc/stdio/swprintf.c | 1 - lib/libc/stdio/swscanf.c | 1 - lib/libc/stdio/tempnam.c | 1 - lib/libc/stdio/tmpfile.c | 1 - lib/libc/stdio/tmpnam.c | 1 - lib/libc/stdio/ungetc.c | 1 - lib/libc/stdio/ungetwc.c | 1 - lib/libc/stdio/vasprintf.c | 1 - lib/libc/stdio/vdprintf.c | 1 - lib/libc/stdio/vfprintf.c | 1 - lib/libc/stdio/vfscanf.c | 1 - lib/libc/stdio/vfwprintf.c | 1 - lib/libc/stdio/vfwscanf.c | 1 - lib/libc/stdio/vprintf.c | 1 - lib/libc/stdio/vscanf.c | 1 - lib/libc/stdio/vsnprintf.c | 1 - lib/libc/stdio/vsprintf.c | 1 - lib/libc/stdio/vsscanf.c | 1 - lib/libc/stdio/vswprintf.c | 1 - lib/libc/stdio/vswscanf.c | 1 - lib/libc/stdio/vwprintf.c | 1 - lib/libc/stdio/vwscanf.c | 1 - lib/libc/stdio/wbuf.c | 1 - lib/libc/stdio/wprintf.c | 1 - lib/libc/stdio/wscanf.c | 1 - lib/libc/stdio/wsetup.c | 1 - lib/libc/stdlib/abort.c | 1 - lib/libc/stdlib/abs.c | 1 - lib/libc/stdlib/atexit.c | 1 - lib/libc/stdlib/atof.c | 1 - lib/libc/stdlib/atoi.c | 1 - lib/libc/stdlib/atol.c | 1 - lib/libc/stdlib/atoll.c | 1 - lib/libc/stdlib/bsearch.c | 1 - lib/libc/stdlib/cxa_thread_atexit.c | 1 - lib/libc/stdlib/cxa_thread_atexit_impl.c | 1 - lib/libc/stdlib/div.c | 1 - lib/libc/stdlib/exit.c | 1 - lib/libc/stdlib/getenv.c | 1 - lib/libc/stdlib/getopt.c | 1 - lib/libc/stdlib/getopt_long.c | 1 - lib/libc/stdlib/getsubopt.c | 1 - lib/libc/stdlib/hcreate.c | 1 - lib/libc/stdlib/hcreate_r.c | 1 - lib/libc/stdlib/hdestroy_r.c | 1 - lib/libc/stdlib/heapsort.c | 1 - lib/libc/stdlib/hsearch_r.c | 1 - lib/libc/stdlib/imaxabs.c | 1 - lib/libc/stdlib/imaxdiv.c | 1 - lib/libc/stdlib/insque.c | 1 - lib/libc/stdlib/labs.c | 1 - lib/libc/stdlib/ldiv.c | 1 - lib/libc/stdlib/llabs.c | 1 - lib/libc/stdlib/lldiv.c | 1 - lib/libc/stdlib/lsearch.c | 1 - lib/libc/stdlib/merge.c | 1 - lib/libc/stdlib/ptsname.c | 1 - lib/libc/stdlib/qsort.c | 1 - lib/libc/stdlib/radixsort.c | 1 - lib/libc/stdlib/rand.c | 1 - lib/libc/stdlib/random.c | 1 - lib/libc/stdlib/reallocarray.c | 1 - lib/libc/stdlib/reallocf.c | 1 - lib/libc/stdlib/realpath.c | 1 - lib/libc/stdlib/remque.c | 1 - lib/libc/stdlib/set_constraint_handler_s.c | 1 - lib/libc/stdlib/strfmon.c | 1 - lib/libc/stdlib/strtoimax.c | 1 - lib/libc/stdlib/strtol.c | 1 - lib/libc/stdlib/strtold.c | 1 - lib/libc/stdlib/strtoll.c | 1 - lib/libc/stdlib/strtonum.c | 1 - lib/libc/stdlib/strtoq.c | 1 - lib/libc/stdlib/strtoul.c | 1 - lib/libc/stdlib/strtoull.c | 1 - lib/libc/stdlib/strtoumax.c | 1 - lib/libc/stdlib/strtouq.c | 1 - lib/libc/stdlib/system.c | 1 - lib/libc/stdlib/tdelete.c | 1 - lib/libc/stdlib/tsearch.c | 1 - lib/libc/stdtime/strftime.c | 1 - lib/libc/stdtime/time32.c | 1 - lib/libc/stdtime/timelocal.c | 1 - lib/libc/string/bcmp.c | 1 - lib/libc/string/bcopy.c | 1 - lib/libc/string/bzero.c | 1 - lib/libc/string/ffs.c | 1 - lib/libc/string/ffsl.c | 1 - lib/libc/string/ffsll.c | 1 - lib/libc/string/fls.c | 1 - lib/libc/string/flsl.c | 1 - lib/libc/string/flsll.c | 1 - lib/libc/string/memccpy.c | 1 - lib/libc/string/memchr.c | 1 - lib/libc/string/memcmp.c | 1 - lib/libc/string/memcpy.c | 1 - lib/libc/string/memmem.c | 1 - lib/libc/string/memmove.c | 1 - lib/libc/string/mempcpy.c | 1 - lib/libc/string/memset.c | 1 - lib/libc/string/memset_s.c | 1 - lib/libc/string/stpcpy.c | 1 - lib/libc/string/stpncpy.c | 1 - lib/libc/string/strcasecmp.c | 1 - lib/libc/string/strcasestr.c | 1 - lib/libc/string/strcat.c | 1 - lib/libc/string/strchr.c | 1 - lib/libc/string/strchrnul.c | 1 - lib/libc/string/strcmp.c | 1 - lib/libc/string/strcoll.c | 1 - lib/libc/string/strcpy.c | 1 - lib/libc/string/strcspn.c | 1 - lib/libc/string/strdup.c | 1 - lib/libc/string/strerror.c | 1 - lib/libc/string/strlcat.c | 1 - lib/libc/string/strlcpy.c | 1 - lib/libc/string/strlen.c | 1 - lib/libc/string/strmode.c | 1 - lib/libc/string/strncat.c | 1 - lib/libc/string/strncmp.c | 1 - lib/libc/string/strncpy.c | 1 - lib/libc/string/strndup.c | 1 - lib/libc/string/strnlen.c | 1 - lib/libc/string/strnstr.c | 1 - lib/libc/string/strpbrk.c | 1 - lib/libc/string/strrchr.c | 1 - lib/libc/string/strsep.c | 1 - lib/libc/string/strsignal.c | 1 - lib/libc/string/strspn.c | 1 - lib/libc/string/strstr.c | 1 - lib/libc/string/strtok.c | 1 - lib/libc/string/strxfrm.c | 1 - lib/libc/string/swab.c | 1 - lib/libc/string/timingsafe_bcmp.c | 1 - lib/libc/string/timingsafe_memcmp.c | 1 - lib/libc/string/wcpcpy.c | 1 - lib/libc/string/wcpncpy.c | 1 - lib/libc/string/wcscasecmp.c | 1 - lib/libc/string/wcschr.c | 1 - lib/libc/string/wcscoll.c | 1 - lib/libc/string/wcsdup.c | 1 - lib/libc/string/wcsncasecmp.c | 1 - lib/libc/string/wcsncpy.c | 1 - lib/libc/string/wcsnlen.c | 1 - lib/libc/string/wcsrchr.c | 1 - lib/libc/string/wcsstr.c | 1 - lib/libc/string/wcstok.c | 1 - lib/libc/string/wcswidth.c | 1 - lib/libc/string/wcsxfrm.c | 1 - lib/libc/string/wmempcpy.c | 1 - lib/libc/sys/POSIX2x_Fork.c | 1 - lib/libc/sys/__error.c | 1 - lib/libc/sys/__vdso_gettimeofday.c | 1 - lib/libc/sys/accept.c | 1 - lib/libc/sys/accept4.c | 1 - lib/libc/sys/aio_suspend.c | 1 - lib/libc/sys/brk.c | 1 - lib/libc/sys/clock_gettime.c | 1 - lib/libc/sys/clock_nanosleep.c | 1 - lib/libc/sys/close.c | 1 - lib/libc/sys/closefrom.c | 1 - lib/libc/sys/compat-stub.c | 1 - lib/libc/sys/connect.c | 1 - lib/libc/sys/fcntl.c | 1 - lib/libc/sys/fdatasync.c | 1 - lib/libc/sys/fork.c | 1 - lib/libc/sys/fsync.c | 1 - lib/libc/sys/getdents.c | 1 - lib/libc/sys/gettimeofday.c | 1 - lib/libc/sys/interposing_table.c | 1 - lib/libc/sys/kevent.c | 1 - lib/libc/sys/lstat.c | 1 - lib/libc/sys/mknod.c | 1 - lib/libc/sys/msync.c | 1 - lib/libc/sys/nanosleep.c | 1 - lib/libc/sys/open.c | 1 - lib/libc/sys/openat.c | 1 - lib/libc/sys/pdfork.c | 1 - lib/libc/sys/pipe.c | 1 - lib/libc/sys/poll.c | 1 - lib/libc/sys/ppoll.c | 1 - lib/libc/sys/pselect.c | 1 - lib/libc/sys/ptrace.c | 1 - lib/libc/sys/read.c | 1 - lib/libc/sys/readv.c | 1 - lib/libc/sys/recvfrom.c | 1 - lib/libc/sys/recvmsg.c | 1 - lib/libc/sys/select.c | 1 - lib/libc/sys/sendmsg.c | 1 - lib/libc/sys/sendto.c | 1 - lib/libc/sys/setcontext.c | 1 - lib/libc/sys/shm_open.c | 1 - lib/libc/sys/sigaction.c | 1 - lib/libc/sys/sigprocmask.c | 1 - lib/libc/sys/sigsuspend.c | 1 - lib/libc/sys/sigtimedwait.c | 1 - lib/libc/sys/sigwait.c | 1 - lib/libc/sys/sigwaitinfo.c | 1 - lib/libc/sys/stat.c | 1 - lib/libc/sys/swapcontext.c | 1 - lib/libc/sys/trivial-vdso_tc.c | 1 - lib/libc/sys/vadvise.c | 1 - lib/libc/sys/wait4.c | 1 - lib/libc/sys/wait6.c | 1 - lib/libc/sys/write.c | 1 - lib/libc/sys/writev.c | 1 - lib/libc/tests/gen/arc4random_test.c | 1 - lib/libc/tests/gen/dir2_test.c | 1 - lib/libc/tests/gen/dlopen_empty_test.c | 1 - lib/libc/tests/gen/fmtcheck_test.c | 1 - lib/libc/tests/gen/fmtmsg_test.c | 1 - lib/libc/tests/gen/fnmatch_test.c | 1 - lib/libc/tests/gen/fnmatch_testcases.h | 1 - lib/libc/tests/gen/ftw_test.c | 1 - lib/libc/tests/gen/getentropy_test.c | 1 - lib/libc/tests/gen/getmntinfo_test.c | 1 - lib/libc/tests/gen/glob2_test.c | 1 - lib/libc/tests/gen/makecontext_test.c | 1 - lib/libc/tests/gen/popen_test.c | 1 - lib/libc/tests/gen/posix_spawn_test.c | 1 - lib/libc/tests/gen/realpath2_test.c | 1 - lib/libc/tests/gen/sigsetops_test.c | 1 - lib/libc/tests/gen/test-fnmatch.c | 1 - lib/libc/tests/gen/wordexp_test.c | 1 - lib/libc/tests/iconv/iconvctl_test.c | 1 - lib/libc/tests/locale/btowc_test.c | 1 - lib/libc/tests/locale/c16rtomb_test.c | 1 - lib/libc/tests/locale/iswctype_test.c | 1 - lib/libc/tests/locale/mblen_test.c | 1 - lib/libc/tests/locale/mbrlen_test.c | 1 - lib/libc/tests/locale/mbrtoc16_test.c | 1 - lib/libc/tests/locale/mbrtowc_test.c | 1 - lib/libc/tests/locale/mbsnrtowcs_test.c | 1 - lib/libc/tests/locale/mbsrtowcs_test.c | 1 - lib/libc/tests/locale/mbstowcs_test.c | 1 - lib/libc/tests/locale/mbtowc_test.c | 1 - lib/libc/tests/locale/towctrans_test.c | 1 - lib/libc/tests/locale/wcrtomb_test.c | 1 - lib/libc/tests/locale/wcsnrtombs_test.c | 1 - lib/libc/tests/locale/wcsrtombs_test.c | 1 - lib/libc/tests/locale/wcstombs_test.c | 1 - lib/libc/tests/locale/wctomb_test.c | 1 - lib/libc/tests/nss/getaddrinfo_test.c | 1 - lib/libc/tests/nss/getgr_test.c | 1 - lib/libc/tests/nss/gethostby_test.c | 1 - lib/libc/tests/nss/getproto_test.c | 1 - lib/libc/tests/nss/getpw_test.c | 1 - lib/libc/tests/nss/getrpc_test.c | 1 - lib/libc/tests/nss/getserv_test.c | 1 - lib/libc/tests/nss/getusershell_test.c | 1 - lib/libc/tests/stdio/fdopen_test.c | 1 - lib/libc/tests/stdio/fmemopen2_test.c | 1 - lib/libc/tests/stdio/fopen_test.c | 1 - lib/libc/tests/stdio/freopen_test.c | 1 - lib/libc/tests/stdio/getdelim_test.c | 1 - lib/libc/tests/stdio/gets_s_test.c | 1 - lib/libc/tests/stdio/mkostemp_test.c | 1 - lib/libc/tests/stdio/open_memstream2_test.c | 1 - lib/libc/tests/stdio/open_wmemstream_test.c | 1 - lib/libc/tests/stdio/perror_test.c | 1 - lib/libc/tests/stdio/print_positional_test.c | 1 - lib/libc/tests/stdio/printbasic_test.c | 1 - lib/libc/tests/stdio/printfloat_test.c | 1 - lib/libc/tests/stdio/scanfloat_test.c | 1 - lib/libc/tests/stdlib/clearenv_test.c | 1 - lib/libc/tests/stdlib/cxa_thread_atexit_nothr_test.cc | 1 - lib/libc/tests/stdlib/cxa_thread_atexit_test.cc | 1 - lib/libc/tests/stdlib/dynthr_mod/dynthr_mod.c | 1 - lib/libc/tests/stdlib/dynthr_test.c | 1 - lib/libc/tests/stdlib/heapsort_test.c | 1 - lib/libc/tests/stdlib/mergesort_test.c | 1 - lib/libc/tests/stdlib/qsort_r_compat_test.c | 1 - lib/libc/tests/stdlib/qsort_r_test.c | 1 - lib/libc/tests/stdlib/qsort_s_test.c | 1 - lib/libc/tests/stdlib/qsort_test.c | 1 - lib/libc/tests/stdlib/set_constraint_handler_s_test.c | 1 - lib/libc/tests/stdlib/strfmon_test.c | 1 - lib/libc/tests/stdlib/tsearch_test.c | 1 - lib/libc/tests/string/ffs_test.c | 1 - lib/libc/tests/string/fls_test.c | 1 - lib/libc/tests/string/memcmp_test.c | 1 - lib/libc/tests/string/memset_s_test.c | 1 - lib/libc/tests/string/stpncpy_test.c | 1 - lib/libc/tests/string/strcspn_test.c | 1 - lib/libc/tests/string/strxfrm_test.c | 1 - lib/libc/tests/string/wcscasecmp_test.c | 1 - lib/libc/tests/string/wcscoll_test.c | 1 - lib/libc/tests/string/wcsnlen_test.c | 1 - lib/libc/tests/sys/brk_test.c | 1 - lib/libc/tests/sys/mlock_helper.c | 1 - lib/libc/tests/sys/queue_test.c | 1 - lib/libc/tests/sys/sendfile_test.c | 1 - lib/libc/uuid/uuid_stream.c | 1 - lib/libc/x86/gen/getcontextx.c | 1 - lib/libc/x86/sys/__vdso_gettc.c | 1 - lib/libc/x86/sys/pkru.c | 1 - lib/libc/xdr/xdr.c | 1 - lib/libc/xdr/xdr_array.c | 1 - lib/libc/xdr/xdr_float.c | 1 - lib/libc/xdr/xdr_mem.c | 1 - lib/libc/xdr/xdr_rec.c | 1 - lib/libc/xdr/xdr_reference.c | 1 - lib/libc/xdr/xdr_sizeof.c | 1 - lib/libc/xdr/xdr_stdio.c | 1 - lib/libc/yp/xdryp.c | 1 - lib/libc/yp/yplib.c | 1 - 931 files changed, 933 deletions(-) diff --git a/lib/libc/aarch64/gen/flt_rounds.c b/lib/libc/aarch64/gen/flt_rounds.c index 7d5259a1a3bc..b62536aafaf8 100644 --- a/lib/libc/aarch64/gen/flt_rounds.c +++ b/lib/libc/aarch64/gen/flt_rounds.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libc/aarch64/gen/fpgetmask.c b/lib/libc/aarch64/gen/fpgetmask.c index 7bc56a9d75be..b6f398d202f5 100644 --- a/lib/libc/aarch64/gen/fpgetmask.c +++ b/lib/libc/aarch64/gen/fpgetmask.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libc/aarch64/gen/fpsetmask.c b/lib/libc/aarch64/gen/fpsetmask.c index 1ad3f49d603d..4bc72913a8b9 100644 --- a/lib/libc/aarch64/gen/fpsetmask.c +++ b/lib/libc/aarch64/gen/fpsetmask.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include *** 11112 LINES SKIPPED *** From nobody Mon Nov 27 05:24:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:09:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sf8BP00tlz52gYg; Mon, 27 Nov 2023 15:09: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 4Sf8BN6gTWz4HDg; Mon, 27 Nov 2023 15:09:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701097756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VPGVULjMXI1tRXngmy8hMpC463uVPN5lDhz8BBE5THc=; b=g56toM5klZY/UwvVsja5DBK/ffgQilOTetoWKTYDmekPkPxUvT/pl1XXWyLCYlU7K3l2+N x6i5suRTzGPV+H/fOy+kYyPliczXRJADbP/t+jOMDo/sHvu3/JyMZNuEDYCck30cgXkkSP xlITNUq+xCGgkbu4jPDfUC/2pJ4u7mRTGlBRJlboaR1M2xwR/rpvSQR7lF4uzr/8avpZm8 db9PwC0g5lqLIKyPP2AOInU/+s3q3fEnG7Mev8owidTtYM/R58XukePAC9GWMovoiDmTJY S5egCBDApQwIl0TSOXQUL+NnK/jMj2sidseBIjR2d7U0CpI0w1KnfsdQmm3XMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701097756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VPGVULjMXI1tRXngmy8hMpC463uVPN5lDhz8BBE5THc=; b=OZEjmIO2/M3xy1ytCk+6KxGKrnhcqEzc3ZGIizB5JR4Nta0Lx/8/jEo0ReCV7mw9fYzMwv YTVLJ9a7jpfFDUDfWotE0jS2ZX8mJkOawJDh0UJIYHIHIoy+OR6V2/aNxTuaiJ0wFnEKlZ +Bty8AmaNLEFgJtgpDuGzrmW2EAA7pPIkOlU5yhR+YqHc3m/nK9l7Cg53KERoMrIVNMmnf 4N/afCJ9/bFdiUurFNzGyPSFXrQ+GMK7sgpCuZAec/3qDqa6Uwmzna77JFHv97eGkAoLAF KobKj692iTCijI2D9IUo4U3u652rQRtD4rAP0l67Wt0R0q8irsyyr5leLiO+rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701097756; a=rsa-sha256; cv=none; b=xpM91l8Jgu1cK8WWW0Tkg8wC1zd0m2XwYXrOwBnQGUItO3jA9VtEqjKs/PExpqlnRqS9Z6 Ro5TvXLPRMa/+OfCcdO4o7tULw2yJ/RjsMkeaulhw7NoSi3E78KdtzMey/7eaadpjpWa4H G4b9piBviP4y+ZPeiHHQdsM3tFTyT10a0D6F34oJ5JfZyuuEcey3TH1nPWpYij7FLq2HwD mYNW9u3z1fB+RxuZEbmtWw+hj/reUzE/FR9Qod1RcLXjCl8oRVwIt0Y/SJpNTg2VXXPMy5 5EjDf/6y5e8glQSO8twuy7gAGtDrfJsaZIiz3tT6IBgyLCRhGKotvckjTV1u8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sf8BN5l3Hzjxs; Mon, 27 Nov 2023 15:09: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 3ARF9GID063686; Mon, 27 Nov 2023 15:09:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARF9G5F063683; Mon, 27 Nov 2023 15:09:16 GMT (envelope-from git) Date: Mon, 27 Nov 2023 15:09:16 GMT Message-Id: <202311271509.3ARF9G5F063683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5a86ae15f071 - stable/14 - arm64: Initialize x18 for APs earlier during boot List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5a86ae15f0719fc7e057a943c85ce3a4069ba1b0 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5a86ae15f0719fc7e057a943c85ce3a4069ba1b0 commit 5a86ae15f0719fc7e057a943c85ce3a4069ba1b0 Author: Mark Johnston AuthorDate: 2023-11-13 15:44:45 +0000 Commit: Mark Johnston CommitDate: 2023-11-27 15:09:04 +0000 arm64: Initialize x18 for APs earlier during boot When KMSAN is configured, the instrumentation inserts calls to __msan_get_context_state() into all function prologues. The implementation dereferences curthread and thus assumes that x18 points to the PCPU area. This applies in particular to init_secondary(), which currently is responsible for initializing x18 for APs. Move initialization into locore to avoid this problem. No functional change intended. Reviewed by: kib, andrew MFC after: 2 weeks Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D42533 (cherry picked from commit b9c0003f0fa39ead4bb3953b9118ae6f08e560f8) --- sys/arm64/arm64/locore.S | 8 ++++++++ sys/arm64/arm64/mp_machdep.c | 14 +++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index d3dfbdf8a76f..0da7eea8d982 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -244,6 +244,14 @@ mp_virtdone: dsb sy isb + /* + * Initialize the per-CPU pointer before calling into C code, for the + * benefit of kernel sanitizers. + */ + adrp x18, bootpcpu + ldr x18, [x18, :lo12:bootpcpu] + msr tpidr_el1, x18 + b init_secondary END(mpentry) #endif diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index 1c9bea2349de..5d598b4189a9 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -134,6 +134,9 @@ void init_secondary(uint64_t); /* Synchronize AP startup. */ static struct mtx ap_boot_mtx; +/* Used to initialize the PCPU ahead of calling init_secondary(). */ +void *bootpcpu; + /* Stacks for AP initialization, discarded once idle threads are started. */ void *bootstack; static void *bootstacks[MAXCPU]; @@ -225,15 +228,6 @@ init_secondary(uint64_t cpu) panic("MPIDR for this CPU is not in pcpu table"); } - pcpup = cpuid_to_pcpu[cpu]; - /* - * Set the pcpu pointer with a backup in tpidr_el1 to be - * loaded when entering the kernel from userland. - */ - __asm __volatile( - "mov x18, %0 \n" - "msr tpidr_el1, %0" :: "r"(pcpup)); - /* * Identify current CPU. This is necessary to setup * affinity registers and to provide support for @@ -242,6 +236,7 @@ init_secondary(uint64_t cpu) * We need this before signalling the CPU is ready to * let the boot CPU use the results. */ + pcpup = cpuid_to_pcpu[cpu]; pcpup->pc_midr = get_midr(); identify_cpu(cpu); @@ -555,6 +550,7 @@ start_cpu(u_int cpuid, uint64_t target_cpu, int domain, vm_paddr_t release_addr) pmap_disable_promotion((vm_offset_t)pcpup, size); pcpu_init(pcpup, cpuid, sizeof(struct pcpu)); pcpup->pc_mpidr = target_cpu & CPU_AFF_MASK; + bootpcpu = pcpup; dpcpu[cpuid - 1] = (void *)(pcpup + 1); dpcpu_init(dpcpu[cpuid - 1], cpuid); From nobody Mon Nov 27 15:22:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sf8V00GPgz52pG0; Mon, 27 Nov 2023 15:22: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 4Sf8Tz6xpKz4Lc2; Mon, 27 Nov 2023 15:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701098568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68a2Dub1iYCWnifDqKKWaZg/UUYnqOHJJMPDCpFr63I=; b=npmMmvFFhBw7VUSOrJi1LTmvyc1a0HPXah0eThF7I9xU4jyodbkTLd/haji8P7sCcH1ZtX suYz5uPYDKKDEHlV4+iBMoK/bv2o6Y9/YHnQIF/AFTaGMoPyyTdGTR/Sav7N5K8HofAfgC MIYiBfF/3BzlX6uMn/zAlviqaRxa8ZGMzl3U2eRFjtGr2TetvwFnAtipfYjqOBPrUZBG5y HQgMPs7iy3HmnbhQmcY1OaHmor7u2Q8FskZY3B7cFZlXHI0wJ8xdDKLXl0Jfesd1Gxx1Nb BR/Kir7+BSq7gfwhXwlWIenUZcFtdsmlpVJGyx26a59ocWvWm3BEbaZzlx54LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701098568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68a2Dub1iYCWnifDqKKWaZg/UUYnqOHJJMPDCpFr63I=; b=GINae4x/vKrRJ+32ZCIAucDDcA5J628hT10W9ORC9Cawzf5r1E56EPno+e74mw5OVEN+EK afoKVuQITHJOCDOwWnA//Ffoc78Jl5e2erBjrfMD2Uob65OvmOMwNQ3My20Wsa4SacEVS/ DspNaflwFyuFka9frvmc9v1Va3ojV3Yz0nq43s3rV6dzWZmZzuKuqkY0VOTzkCS5SOfBos FuzIle98wWdh1N9n0JD51nhdrpJxKEzsjCnLThkhVe/rqSZcjnSsVbSq8sQeCSOBBNgc3v U73Kw8tHRDB16ZdFQndqV7Undl7YxhrhzB1lQod7EdMeDm9RBHUXY790ZoXwxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701098568; a=rsa-sha256; cv=none; b=Kyb8insW1+/HvwbJdZyOd7uuke0S5enGc9Y2LU3SDpi8pGQqTy/6djXfHwkGm3768ik9Y3 wklhyW6Q1VQm2KPCh6QvAPzoJ//a1Ai6f/5ALJo3TTj4EqYuQGoEEXMLyS1Sl2DepmlDDV DEeon+jNdiemGB+yP83Y+kXM7OkhrJ3f43eZOozPxxuqCaazmVmdWRZR7pR1M5sEO4jGwn UkJinKKrjdzNNinxrstJEohx89l2o9BcWueBUy6FRKDZIM037kdWd0m7xnviO5h2NQedE8 jDCcySQeJTfRmbiX1kS8pdNCXLRscSghclw8Ew+BLa2qBLzPgM4oUGTr1IcRdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sf8Tz62tXzkQw; Mon, 27 Nov 2023 15:22: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 3ARFMlPr096238; Mon, 27 Nov 2023 15:22:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARFMlHW096235; Mon, 27 Nov 2023 15:22:47 GMT (envelope-from git) Date: Mon, 27 Nov 2023 15:22:47 GMT Message-Id: <202311271522.3ARFMlHW096235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: dad62799f5bd - stable/14 - evdev: Sync event codes with Linux kernel 6.5 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dad62799f5bd44b14ae1ed704edfb60772ae524a Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=dad62799f5bd44b14ae1ed704edfb60772ae524a commit dad62799f5bd44b14ae1ed704edfb60772ae524a Author: Vladimir Kondratyev AuthorDate: 2023-11-02 06:20:20 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-11-27 15:19:55 +0000 evdev: Sync event codes with Linux kernel 6.5 (cherry picked from commit 87a53bef41fe769920f925e74fedddafd5187b93) --- sys/dev/evdev/input-event-codes.h | 43 ++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/sys/dev/evdev/input-event-codes.h b/sys/dev/evdev/input-event-codes.h index 4c4365d36611..59eb8e104c87 100644 --- a/sys/dev/evdev/input-event-codes.h +++ b/sys/dev/evdev/input-event-codes.h @@ -75,9 +75,9 @@ /* * Keys and buttons - */ - -/* + * + * Most of the keys/buttons are modeled after USB HUT 1.12 + * (see http://www.usb.org/developers/hidpage). * Abbreviations in the comments: * AC - Application Control * AL - Application Launch Button @@ -290,7 +290,8 @@ #define KEY_PAUSECD 201 #define KEY_PROG3 202 #define KEY_PROG4 203 -#define KEY_DASHBOARD 204 /* AL Dashboard */ +#define KEY_ALL_APPLICATIONS 204 /* AC Desktop Show All Applications */ +#define KEY_DASHBOARD KEY_ALL_APPLICATIONS #define KEY_SUSPEND 205 #define KEY_CLOSE 206 /* AC Close */ #define KEY_PLAY 207 @@ -527,6 +528,9 @@ #define KEY_10CHANNELSUP 0x1b8 /* 10 channels up (10+) */ #define KEY_10CHANNELSDOWN 0x1b9 /* 10 channels down (10-) */ #define KEY_IMAGES 0x1ba /* AL Image Browser */ +#define KEY_NOTIFICATION_CENTER 0x1bc /* Show/hide the notification center */ +#define KEY_PICKUP_PHONE 0x1bd /* Answer incoming call */ +#define KEY_HANGUP_PHONE 0x1be /* Decline incoming call */ #define KEY_DEL_EOL 0x1c0 #define KEY_DEL_EOS 0x1c1 @@ -554,6 +558,7 @@ #define KEY_FN_F 0x1e2 #define KEY_FN_S 0x1e3 #define KEY_FN_B 0x1e4 +#define KEY_FN_RIGHT_SHIFT 0x1e5 #define KEY_BRL_DOT1 0x1f1 #define KEY_BRL_DOT2 0x1f2 @@ -619,6 +624,11 @@ #define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */ #define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */ #define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */ +#define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */ +#define KEY_DICTATE 0x24a /* Start or Stop Voice Dictation Session (HUTRR99) */ +#define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */ +#define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */ +#define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */ #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ @@ -667,6 +677,27 @@ /* Select an area of screen to be copied */ #define KEY_SELECTIVE_SCREENSHOT 0x27a +/* Move the focus to the next or previous user controllable element within a UI container */ +#define KEY_NEXT_ELEMENT 0x27b +#define KEY_PREVIOUS_ELEMENT 0x27c + +/* Toggle Autopilot engagement */ +#define KEY_AUTOPILOT_ENGAGE_TOGGLE 0x27d + +/* Shortcut Keys */ +#define KEY_MARK_WAYPOINT 0x27e +#define KEY_SOS 0x27f +#define KEY_NAV_CHART 0x280 +#define KEY_FISHING_CHART 0x281 +#define KEY_SINGLE_RANGE_RADAR 0x282 +#define KEY_DUAL_RANGE_RADAR 0x283 +#define KEY_RADAR_OVERLAY 0x284 +#define KEY_TRADITIONAL_SONAR 0x285 +#define KEY_CLEARVU_SONAR 0x286 +#define KEY_SIDEVU_SONAR 0x287 +#define KEY_NAV_INFO 0x288 +#define KEY_BRIGHTNESS_MENU 0x289 + /* * Some keyboards have keys which do not have a defined meaning, these keys * are intended to be programmed / bound to macros by the user. For most @@ -846,6 +877,7 @@ #define ABS_TOOL_WIDTH 0x1c #define ABS_VOLUME 0x20 +#define ABS_PROFILE 0x21 #define ABS_MISC 0x28 @@ -899,7 +931,8 @@ #define SW_LINEIN_INSERT 0x0d /* set = inserted */ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_PEN_INSERTED 0x0f /* set = pen inserted */ -#define SW_MAX 0x0f +#define SW_MACHINE_COVER 0x10 /* set = cover closed */ +#define SW_MAX 0x10 #define SW_CNT (SW_MAX+1) /* From nobody Mon Nov 27 15:22:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sf8V11VnVz52pK3; Mon, 27 Nov 2023 15:22: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 4Sf8V10q4pz4Ls7; Mon, 27 Nov 2023 15:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701098569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X3sSvpiZtxpuvNtfeBjPTvy2QuA/TnV+eI99C3eHt6I=; b=ZmqbvK/OM0Z+0Vw0QjluF9vgAFHDvNSTI/pC/qq2ObGVKihn6HXLih6pb6IZ3JemoxJjd1 Q8BJQtJxVv0XdiL3r8xsBG9YPJlCbhsWGA/67nRUateiCs4Z9qwdW5ZWM83PaWmvbnUZNM COAVQ0DOkpDqgNTcG++VGnOoGbfCUtBm00yuMBfaxhqKVDw2D/qe2mzmk0+A7F3ok4nhUB KKy2evUuXJNxnqQO88mqRf1HBMXbv7J4sI+tTssTAqxkt/fvJvOVixYlCPgoMdBnewtTM0 Kln9wESNno0tZ4VX/J7mqyx0t1wdfT4oDOU47BLb8a3tVR6Tgsq0ilXIqkzNzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701098569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X3sSvpiZtxpuvNtfeBjPTvy2QuA/TnV+eI99C3eHt6I=; b=W5/WqDPouenF+gfcn2OpIJePRzRxgRYowZPN+MK4I9M0uCHU4I561agXmBBwCnFV+vlq8L djFMO+foQxFS6pJNfksczndQQmKWPqeFrKQPd47izYzOjScUw2kmrWAMyGOig+SvByDLVF WS1lAtim1WFuPOZ5nL3E3iTuBddLYefxF6L1N5rwM3YUJi2fdOj9kVGnsmY9d5d3vr0Kcj FQrVnvy46reubU5nNnwM6s79cFO89kmtH2BTNbD5tzKn5/S8ywm7vVZItvhrwqp1YxZJxi YVkwkLiwtRwbR4KBfLtv3GfsC4U5oNbk4rQSpPS3kTQoRS7aD53Tt8BOgroivg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701098569; a=rsa-sha256; cv=none; b=GapYaNGOd+Matx3XT/hx8G2hpl/qbKW+fYqKr5gH+M3RV+i6VWmt2DeGzLvQJ8LGbbf1kH ieOvtKnWus4/hDlkrMgcpbgQrU4gq+D23pqSDBsYZau2YNQA28960W2esLbE7OTlp8ZjH0 hhLMUXxCA7ta1iGO5FJHu+uG0DnokGC2MUghsmNdlFzrl2ZfzWc7tLiNVHNKdxmxEPXIct CKnFikLbYlMLIqxwmqPkPB1AiXd6GDVA03tZCcnw6JJecGiLajjpG3aMhrkEBOHnCHWQZu ltIB2b2aVXQDoU4LusAMGD/NPfCu/UEzRlgeqql4pSkc4K6sQD3VSXea7t1pVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sf8V06jM8zkNK; Mon, 27 Nov 2023 15:22: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 3ARFMmcX096309; Mon, 27 Nov 2023 15:22:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARFMmd9096306; Mon, 27 Nov 2023 15:22:48 GMT (envelope-from git) Date: Mon, 27 Nov 2023 15:22:48 GMT Message-Id: <202311271522.3ARFMmd9096306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 16a379ffde4b - stable/14 - hmt(4): Do not require input report HID usages to be a member of TLC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 16a379ffde4baadc5bc5bae23658b0bf2ff6ab2f Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=16a379ffde4baadc5bc5bae23658b0bf2ff6ab2f commit 16a379ffde4baadc5bc5bae23658b0bf2ff6ab2f Author: Vladimir Kondratyev AuthorDate: 2023-11-02 06:20:20 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-11-27 15:20:16 +0000 hmt(4): Do not require input report HID usages to be a member of TLC Some touchpads places button usages (in HID report descriptor) in to the 2-nd level collection rather than in to the top level one. That confuses current code. Remove collection level check in HID report descriptor parser to fix device detection. Reported by: Peter Much PR: 267094 (cherry picked from commit 1d46c8e5c2702c141c6be982b3ca44e74d1cb8f1) --- sys/dev/hid/hmt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/dev/hid/hmt.c b/sys/dev/hid/hmt.c index 199a6a2ff045..f6b593222317 100644 --- a/sys/dev/hid/hmt.c +++ b/sys/dev/hid/hmt.c @@ -744,14 +744,13 @@ hmt_hid_parse(struct hmt_softc *sc, const void *d_ptr, hid_size_t d_len, else break; - if (hi.collevel == 1 && left_btn == 2 && + if (left_btn == 2 && hi.usage == HID_USAGE2(HUP_BUTTON, 1)) { has_int_button = true; sc->int_btn_loc = hi.loc; break; } - if (hi.collevel == 1 && - hi.usage >= HID_USAGE2(HUP_BUTTON, left_btn) && + if (hi.usage >= HID_USAGE2(HUP_BUTTON, left_btn) && hi.usage <= HID_USAGE2(HUP_BUTTON, HMT_BTN_MAX)) { btn = (hi.usage & 0xFFFF) - left_btn; setbit(sc->buttons, btn); @@ -760,13 +759,13 @@ hmt_hid_parse(struct hmt_softc *sc, const void *d_ptr, hid_size_t d_len, sc->max_button = btn + 1; break; } - if (hi.collevel == 1 && hi.usage == + if (hi.usage == HID_USAGE2(HUP_DIGITIZERS, HUD_CONTACTCOUNT)) { cont_count_found = true; sc->cont_count_loc = hi.loc; break; } - if (hi.collevel == 1 && hi.usage == + if (hi.usage == HID_USAGE2(HUP_DIGITIZERS, HUD_SCAN_TIME)) { scan_time_found = true; sc->scan_time_loc = hi.loc; From nobody Mon Nov 27 15:23:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sf8VH5VjKz52pQD; Mon, 27 Nov 2023 15:23: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 4Sf8VH52xzz4MBP; Mon, 27 Nov 2023 15:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701098583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RdTby4Hsggf/czKE1IEmPYdgU+HNoWvIgcwZ2sA15EA=; b=euGa35JnXcY6o4JxBTUxk00KULqhsH+CCitXNoTzVbpLOnMSqEvt3+rK4MsjvfFs17qnm8 zkhVHjfdYqIiZ73+lul87wC5j6irw3k8MGGedlArIWJxHH42WFo7wLGBBe7AVfFw9Sx39+ j219tdSAIGc21G/k1Esr9v4DJz237x5N0Yg4w5TBjXDHFLcSwNB3wnRtAkbuLd0SMeLcn5 WUFw6kZODRNT9+m0z6lNCDrADZDG3JGinzH4DMscrXMh4g+OoTtOK3Zulkf/PfBvIRRD7G mnsgQpkyVuTTLIkv04pkB5vHTVC2qIfogYhF4fCYBUG19Vs05/EPJWGA6baD0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701098583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RdTby4Hsggf/czKE1IEmPYdgU+HNoWvIgcwZ2sA15EA=; b=jjDfE70P2Q66YR8Fzab829OS7oUwmkcdjsEUH0dNfoYLIii4qNrxU4yI57M3QKyGfdPfWQ icFRvt5lNGD1RkLhMoYx0TOeYv0fAvhCohUWCqrO8+GBxw0cnb3PfgyDRuVaaaADkn0naE P0HqnPiQRdzd/Z8pSYqrCrDnq0svL9Ct79vBRP2l3pFDFq+Va7apSAIVblkCnBvh8M5+NR ixTH+Ob7ppIJ68DDdXBbTN29pYb8WFV0HpqZ3XCWP7hwJg0csJm2pPmxS0oZrzlpwVRXQZ ZuBNs03MeQnD/tFLsFrv/t2qeHRMtWKAS9zRtUTJSTmBLtM0k2nb+HHTIEDfPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701098583; a=rsa-sha256; cv=none; b=rpAHU5Bc5e1u/hKpUKIdEwg5BZLTOnRgBVqM8xFKciWZrP5Dn+ga00qcHaF26h2Cruulhw //ARGV5X+00GdvW4vUTBGCrbWsJDmmIGNqvJBeAudYYK5vBUSbef8LZ1hn/V234b6YNym1 meG4PevbkpettLc86IVSj+XVsne6KzT2H2GY4f0JxXnXqWmhWBJMhT1Tr6bKPAXZiRrleV WRz3enIhAcqzLbLHYxDXm8OktuSqafMTIvmOSceGCbMXEj8RuLddTmHYKAHFDzkh9g3tdn 2GgokvnkmzDT/QEWuwiLPANPCBXpGamzJywT2zDSDWVTkNtFqwxQHsqghCMRrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sf8VH48rfzkQy; Mon, 27 Nov 2023 15:23: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 3ARFN3Tn096496; Mon, 27 Nov 2023 15:23:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARFN365096493; Mon, 27 Nov 2023 15:23:03 GMT (envelope-from git) Date: Mon, 27 Nov 2023 15:23:03 GMT Message-Id: <202311271523.3ARFN365096493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 71f65e2ac3e5 - stable/13 - evdev: Sync event codes with Linux kernel 6.5 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 71f65e2ac3e5660ce1228aaab91778f701a65f4c Auto-Submitted: auto-generated The branch stable/13 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=71f65e2ac3e5660ce1228aaab91778f701a65f4c commit 71f65e2ac3e5660ce1228aaab91778f701a65f4c Author: Vladimir Kondratyev AuthorDate: 2023-11-02 06:20:20 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-11-27 15:20:37 +0000 evdev: Sync event codes with Linux kernel 6.5 (cherry picked from commit 87a53bef41fe769920f925e74fedddafd5187b93) --- sys/dev/evdev/input-event-codes.h | 43 ++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/sys/dev/evdev/input-event-codes.h b/sys/dev/evdev/input-event-codes.h index 4c4365d36611..59eb8e104c87 100644 --- a/sys/dev/evdev/input-event-codes.h +++ b/sys/dev/evdev/input-event-codes.h @@ -75,9 +75,9 @@ /* * Keys and buttons - */ - -/* + * + * Most of the keys/buttons are modeled after USB HUT 1.12 + * (see http://www.usb.org/developers/hidpage). * Abbreviations in the comments: * AC - Application Control * AL - Application Launch Button @@ -290,7 +290,8 @@ #define KEY_PAUSECD 201 #define KEY_PROG3 202 #define KEY_PROG4 203 -#define KEY_DASHBOARD 204 /* AL Dashboard */ +#define KEY_ALL_APPLICATIONS 204 /* AC Desktop Show All Applications */ +#define KEY_DASHBOARD KEY_ALL_APPLICATIONS #define KEY_SUSPEND 205 #define KEY_CLOSE 206 /* AC Close */ #define KEY_PLAY 207 @@ -527,6 +528,9 @@ #define KEY_10CHANNELSUP 0x1b8 /* 10 channels up (10+) */ #define KEY_10CHANNELSDOWN 0x1b9 /* 10 channels down (10-) */ #define KEY_IMAGES 0x1ba /* AL Image Browser */ +#define KEY_NOTIFICATION_CENTER 0x1bc /* Show/hide the notification center */ +#define KEY_PICKUP_PHONE 0x1bd /* Answer incoming call */ +#define KEY_HANGUP_PHONE 0x1be /* Decline incoming call */ #define KEY_DEL_EOL 0x1c0 #define KEY_DEL_EOS 0x1c1 @@ -554,6 +558,7 @@ #define KEY_FN_F 0x1e2 #define KEY_FN_S 0x1e3 #define KEY_FN_B 0x1e4 +#define KEY_FN_RIGHT_SHIFT 0x1e5 #define KEY_BRL_DOT1 0x1f1 #define KEY_BRL_DOT2 0x1f2 @@ -619,6 +624,11 @@ #define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */ #define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */ #define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */ +#define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */ +#define KEY_DICTATE 0x24a /* Start or Stop Voice Dictation Session (HUTRR99) */ +#define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */ +#define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */ +#define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */ #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ @@ -667,6 +677,27 @@ /* Select an area of screen to be copied */ #define KEY_SELECTIVE_SCREENSHOT 0x27a +/* Move the focus to the next or previous user controllable element within a UI container */ +#define KEY_NEXT_ELEMENT 0x27b +#define KEY_PREVIOUS_ELEMENT 0x27c + +/* Toggle Autopilot engagement */ +#define KEY_AUTOPILOT_ENGAGE_TOGGLE 0x27d + +/* Shortcut Keys */ +#define KEY_MARK_WAYPOINT 0x27e +#define KEY_SOS 0x27f +#define KEY_NAV_CHART 0x280 +#define KEY_FISHING_CHART 0x281 +#define KEY_SINGLE_RANGE_RADAR 0x282 +#define KEY_DUAL_RANGE_RADAR 0x283 +#define KEY_RADAR_OVERLAY 0x284 +#define KEY_TRADITIONAL_SONAR 0x285 +#define KEY_CLEARVU_SONAR 0x286 +#define KEY_SIDEVU_SONAR 0x287 +#define KEY_NAV_INFO 0x288 +#define KEY_BRIGHTNESS_MENU 0x289 + /* * Some keyboards have keys which do not have a defined meaning, these keys * are intended to be programmed / bound to macros by the user. For most @@ -846,6 +877,7 @@ #define ABS_TOOL_WIDTH 0x1c #define ABS_VOLUME 0x20 +#define ABS_PROFILE 0x21 #define ABS_MISC 0x28 @@ -899,7 +931,8 @@ #define SW_LINEIN_INSERT 0x0d /* set = inserted */ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_PEN_INSERTED 0x0f /* set = pen inserted */ -#define SW_MAX 0x0f +#define SW_MACHINE_COVER 0x10 /* set = cover closed */ +#define SW_MAX 0x10 #define SW_CNT (SW_MAX+1) /* From nobody Mon Nov 27 15:23:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sf8VJ6t1nz52pX8; Mon, 27 Nov 2023 15:23: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 4Sf8VJ67Qkz4MF4; Mon, 27 Nov 2023 15:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701098584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2GfouWa9eZZcspeqel7lgUlIhJoAlYr3Ku3tGSi800=; b=GLovXV6ER0MZAApMTa9z2XeQVOrZqpft7KGSXh5++fv6hXy3aDQAsIgSYKK4sIWZ0P/TOl H28X9NlR1NgEtEBKwOln3HYrPZ+1KmVYiQZYNmnjdrkgd5GL+cy5lMvGAjaQ1kkdaGBqQt fU5BvXjGTr0vB5q6d8in2yKLCh7SKJjeqB1g8tciJYuansG3ytd92HWbu0N6rvt+KJuXsN /MehWZh+NFeeAJtHG2yjHTYXntv/ets11+549PnKPQ7asZg3mLMD0sQFRAOKs2DrHhVrQ8 lg5vrptbXmNoxVRB5FK/79yzEHvi5wmpFRcJB2ozDeD570bbvCXeEluINgI5WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701098584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2GfouWa9eZZcspeqel7lgUlIhJoAlYr3Ku3tGSi800=; b=b0XCzPDtrQl9ZDBt5xBTBH8ITXP+GaICbPDoRgYyO1Zboq6ePlimcHCfBMYHPJ6g1H8PrJ bB15+N90vmwU0l23ZTgDwtKHLLncZkqyz2z/BgNd5R74EGi6JTxsgYqLSgVXTISYq03ECn TkUukTD2CmFDDN3BwtGB+2GK8gQ0Ry1Lz13sLzT14WGWNlN9LeiMsf3GlRrlJlvXTuEwOs w8O75SRB/bVRyt1nBDeOrX/OYBmREuhu/lsjWc6V43a6e95P1SAqQhh9SfmfIbWudKp/Jy jajV7y/03edjrk6D/su7fpZS2yl0ZDp6uhjCBWFOB3P23J5UNuCrT0ZQP0Tw3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701098584; a=rsa-sha256; cv=none; b=K5j8HYk+FWBkfvHov4lGBlX4OQUfAxPQ6D/V9KZB7yO2qeInFlXbmUQudW3EJH4P1mVrwb ebuCLGL9nnkPpyAnTcfsnz1LWy+lpWi9Ea3HcRS6eoBDahW1BwCgDeE/THdYbJLrS8TbRW Tp8J54mYlglviuAn602r1lc8uFIMlzFey54ca2Fz91iMga56dKWZ/eUnMzU+F/oSm4+Dii ysMJr+aQYLG+CHRqnlHol8aZZzDVk+Re27r3QaPsxA3Qp7GzVEkLutqbcyBscF8mUNTRZ0 uDfXAsME8vcTdcbneHJVKd8RnxhOraMxGbDhVeaT20katQNi1hrG26QJv/aA9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sf8VJ5DFtzk35; Mon, 27 Nov 2023 15:23: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 3ARFN474096565; Mon, 27 Nov 2023 15:23:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARFN4rg096562; Mon, 27 Nov 2023 15:23:04 GMT (envelope-from git) Date: Mon, 27 Nov 2023 15:23:04 GMT Message-Id: <202311271523.3ARFN4rg096562@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 00b6fafcc1f1 - stable/13 - hmt(4): Do not require input report HID usages to be a member of TLC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 00b6fafcc1f174c7819bf3ff0d19e2244267ed76 Auto-Submitted: auto-generated The branch stable/13 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=00b6fafcc1f174c7819bf3ff0d19e2244267ed76 commit 00b6fafcc1f174c7819bf3ff0d19e2244267ed76 Author: Vladimir Kondratyev AuthorDate: 2023-11-02 06:20:20 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-11-27 15:20:49 +0000 hmt(4): Do not require input report HID usages to be a member of TLC Some touchpads places button usages (in HID report descriptor) in to the 2-nd level collection rather than in to the top level one. That confuses current code. Remove collection level check in HID report descriptor parser to fix device detection. Reported by: Peter Much PR: 267094 (cherry picked from commit 1d46c8e5c2702c141c6be982b3ca44e74d1cb8f1) --- sys/dev/hid/hmt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/dev/hid/hmt.c b/sys/dev/hid/hmt.c index 5cc4f1167237..e7adf8d0e7d1 100644 --- a/sys/dev/hid/hmt.c +++ b/sys/dev/hid/hmt.c @@ -744,14 +744,13 @@ hmt_hid_parse(struct hmt_softc *sc, const void *d_ptr, hid_size_t d_len, else break; - if (hi.collevel == 1 && left_btn == 2 && + if (left_btn == 2 && hi.usage == HID_USAGE2(HUP_BUTTON, 1)) { has_int_button = true; sc->int_btn_loc = hi.loc; break; } - if (hi.collevel == 1 && - hi.usage >= HID_USAGE2(HUP_BUTTON, left_btn) && + if (hi.usage >= HID_USAGE2(HUP_BUTTON, left_btn) && hi.usage <= HID_USAGE2(HUP_BUTTON, HMT_BTN_MAX)) { btn = (hi.usage & 0xFFFF) - left_btn; setbit(sc->buttons, btn); @@ -760,13 +759,13 @@ hmt_hid_parse(struct hmt_softc *sc, const void *d_ptr, hid_size_t d_len, sc->max_button = btn + 1; break; } - if (hi.collevel == 1 && hi.usage == + if (hi.usage == HID_USAGE2(HUP_DIGITIZERS, HUD_CONTACTCOUNT)) { cont_count_found = true; sc->cont_count_loc = hi.loc; break; } - if (hi.collevel == 1 && hi.usage == + if (hi.usage == HID_USAGE2(HUP_DIGITIZERS, HUD_SCAN_TIME)) { scan_time_found = true; sc->scan_time_loc = hi.loc; From nobody Mon Nov 27 15:26:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla 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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfD873zZ9z52LxY for ; Mon, 27 Nov 2023 18:07:35 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfD8661PMz4N0V 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-x531.google.com with SMTP id 4fb4d7f45d1cf-5441305cbd1so5982633a12.2 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=itw1hTH5vg/g4008vSebhVmJ6eStQrKNR84QLwe3tapCRAtOUBRpMgpiCBQUobUizN Rnse3urXtAdMS6RANvewbQElMAfORJHA4PoWjV0KzRY0KhHKFSDMG8TBtpaQztdTg19u InmWraxfg3n+DPz7rYmarUBJ15V4hkUiLrzNT90g9XOfoZVqw8wIcRkULRzxdJQ8ogH0 qKCWe78RFIv/+ACBxwGO8SzhxyJSTZH5D6bCRRfTaUPS/MhHeUj0UTROMz3Dj5usdnxz MVqhAMNaXo/bo9oX1ihvqhzILWSSJ5EOo1935tdDcEMQvGm6YH9XVO88aJglU9DYIOxJ kujg== X-Gm-Message-State: AOJu0YyZ9dm2caZip2+yFeDUsZl1Ru5LjHrablex0p+I+Zdbta8fIWG9 FJLUbW6/F6QiBWYWrc/FUg2Xpn+K7UfVXkd91tDrlw== 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <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: 4SfD8661PMz4N0V --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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfDFr1cqJz52Ph2 for ; Mon, 27 Nov 2023 18:12:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfDFr10hjz4WcX 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-x535.google.com with SMTP id 4fb4d7f45d1cf-54b0310f536so5685161a12.0 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=S4Qzh8cHOgb9C5V1XEqzQQFshXDyZoQuvMQyB6FSomdKhvKHaqvLXnXCc5iN5okk1L sErBGSq2x8o0081lsB3l0gMraSkV6fNMbWJiM0ugUNIUapiJ3F9Y7tCFm85Y8nS/rsVZ YgZ4qhN4uhiXQ1anr/LXnIIPVvY4b7GhnPEneQCu+nNCcwT7wcBIBBXHXXq3KeBSjsEy p+NL2T2EZao/PNONAiAiK3KPPNWJxymuE1Ml2/C+CuYJjNsEV2uwYss57SW/e3PiYSYQ XV7Thkmx/DK3oOH8GVrnsW9Y0OCeRDNANe3niG/3Kg4TKLdniGuM1eKX+UCa7Itn+QA+ rHow== X-Gm-Message-State: AOJu0YzLP4ESomrs0sC60pYWrj6RwTSudd2a3aMANqaELFfWnsUnzHvi 88P+0gxrNLE3MdSLo45Wx2Ubn3HYpsPhnozS2rV6Zg== 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <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: 4SfDFr10hjz4WcX --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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfDH91Hhrz52QBS for ; Mon, 27 Nov 2023 18:13:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) (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 4SfDH86W6hz4XP0 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-x129.google.com with SMTP id 2adb3069b0e04-5079f6efd64so6145124e87.2 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=FJdk5z9MzrVSxYWFfEE77Pn9pSpO+BBcg/CvJxl4NNCLF/PzuR1BgZJgliYjWNRd4u sjbRZj1v15heSCbZeuBhqd1qxFVMSMEzZKdD5Cv+flVhBmDqyaJthvuLsIsucVLvxDzD CqqeJ/XSHZ5Gvx9kbKog8u6PGPU8o/qVEexJX1Vm10k9/4Vp/wL+hPfGOLbaiYuXdJ+g LjmS4kDvdun6mKrlFF4w3QBeXQiXu46Yx4VF2LKIgYCGARAiS21LJoMBsrP4UIA9Grmc w1HavlGrzENW6NYUs0gLySNe3zzsNlYxFLoZZSXX9DjTsYpMnKOKelOadQWv3aGfGVCP n4gw== X-Gm-Message-State: AOJu0YxaWWUZ/svNJCcMP4UwKsAiLtj+pWNU751GaZavZapfsIEp/u2/ f8ndwzSbZoZx/lnraqhFyxtGQEMqT9Icwcwm5RRykA== 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <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: 4SfDH86W6hz4XP0 --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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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:46:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfGLp3ysMz52Gv3; Mon, 27 Nov 2023 19:46: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 4SfGLp3XRbz3XWj; Mon, 27 Nov 2023 19:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701114418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eWlHfSwaHTr2MfM7RDIhrmUamWUynA+TApTf7sCnLcs=; b=Kv0m3NxXYC3HbrsNgXDhe1tfw8kA/Gqg5gvSj+sq+vQoRBVRUEjrFN40pG4nFw7/jNK+nx mOFpzydKC54O+pVVjWAxXs9klk+mK/dYRjMPj2H3bnnm9VWASJza+uhj37mZF9XXis0Wxt D9FAuLh9DMGEH9GwQCKDZNm5B1v5LGIQO73Qh6QQ80kaR1wmHi+U3tf4wr41oXIejG1Xu3 LCRiDpCAQWSXD4v7r5xiwVvruKw30LmdLVG2GJ2xe2GmFKYg3oTyCl8cy4K/zXdeI0jQ88 Vtoo8Rwe676+29IBtmxDfPJHUWVjOHSLBp3AoGrZwi/zEP4MEbX/GSyOlM/63w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701114418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eWlHfSwaHTr2MfM7RDIhrmUamWUynA+TApTf7sCnLcs=; b=VhRbteAbght6XH4OI9JOg3cSvaI/0reDKB1vCifogIlaMO30WGVAp2/C7J3/8Ka/SEuntl nR5QwQQo3Y4cNGGNYx4KvtcFMSurmhgwh3THU9BBJ5SovMHZErFyKkiZmHLE3O+lw8BHn5 rK1LQmEsHD7mgIerQ89WrCvef9+4ETyiYXmRL3VEp+G7qrddzZIL2W1ulh1K1SQranj1yj RhiJ5NyGG8ZiFgwo4Y+czDJfxSr9Y4Au9x6ccDStADFyfky02DWJSb+vjtsLcLu4yA/YZP P6w3L/It0N+3pF87WhsA1M1T5l4cc76GtUFMEWVN5e7qitdRnPBbabmmFSlmBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701114418; a=rsa-sha256; cv=none; b=n1gmuoxwOO++GMJHcQ3DFSPWpnj+mnHvxryjUb6fgb29Cb1aaHTQ1Zg1IIboqQgw8ZPkvY 40T8KEee1aeuFGxJInmnaFeLBXIxSMFQ580lOkB411MoWzpXmmQe6dCCDcFiffoVj69ktJ ODgcGSBZ4lhtp+DjAmtrMQfXzCw3NQXceKG41fOMLAKojCaTx+8gckG/rBgvSwkLZwRRH2 72ag2cOd4spVYNeR8K6/7kWnUQixnpuil4RQQaBe1KN3wnwoGX74XrqTlFmSHwMO/+CvJr TPi2zCkYoA9QHCPS5PHobPspzXmWTcXP9hucsR/O4G68LeOJLei5VxLeCqoC4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfGLp2fJ7zryK; Mon, 27 Nov 2023 19:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ARJkw2F036661; Mon, 27 Nov 2023 19:46:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARJkwll036658; Mon, 27 Nov 2023 19:46:58 GMT (envelope-from git) Date: Mon, 27 Nov 2023 19:46:58 GMT Message-Id: <202311271946.3ARJkwll036658@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: acfc2a0500a3 - stable/14 - pf.conf.5: revise divert-to and divert-reply List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: acfc2a0500a30f65d190a3360b805aa3548bb157 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=acfc2a0500a30f65d190a3360b805aa3548bb157 commit acfc2a0500a30f65d190a3360b805aa3548bb157 Author: Igor Ostapenko AuthorDate: 2023-11-17 20:01:17 +0000 Commit: Kristof Provost CommitDate: 2023-11-27 19:45:49 +0000 pf.conf.5: revise divert-to and divert-reply (cherry picked from commit 7e1affa242ca83710eb64e2c6184263fbea3deb7) --- share/man/man5/pf.conf.5 | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index ce64df78ad62..8255a89587be 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -27,7 +27,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 27, 2023 +.Dd November 17, 2023 .Dt PF.CONF 5 .Os .Sh NAME @@ -2102,19 +2102,22 @@ Only effective before the route lookup happened, i.e. when filtering inbound. .It Xo Ar divert-to Aq Ar host .Ar port Aq Ar port .Xc -Used to redirect packets to a local socket bound to -.Ar host -and +Used to +.Xr divert 4 +packets to the given divert .Ar port . -The packets will not be modified, so -.Xr getsockname 2 -on the socket will return the original destination address of the packet. +Historically +.Ox pf has another meaning for this, and +.Fx pf uses +this syntax to support +.Xr divert 4 instead. Hence, +.Ar host +has no meaning and can be set to anything like 127.0.0.1. +If a packet is re-injected and does not change direction then it will not be +re-diverted. .It Ar divert-reply -Used to receive replies for sockets that are bound to addresses -which are not local to the machine. -See -.Xr setsockopt 2 -for information on how to bind these sockets. +It has no meaning in +.Fx pf . .It Ar probability Aq Ar number A probability attribute can be attached to a rule, with a value set between 0 and 1, bounds not included. From nobody Mon Nov 27 19:51:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:05:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfZlL1CrMz531PW; Tue, 28 Nov 2023 08:05: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 4SfZlL0nMpz4c1j; Tue, 28 Nov 2023 08:05:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701158750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YXuE4nyysWrAXCaYyNiW6R7l4jJdH8n3cfyrRSDMY0o=; b=IG9l7f7WF60Iehq8gOvwz0N6br+fAiqTCpGptjZ5qQZFtZQocoM4UgSOOps8xYTF0vQ5zQ ScrL/6UaL3LkdZcBD8+vsli0rOAfnLSu0D/rL/VU2fU/i2LWM3O4xzkyUpAfBGnT/NvGWz qsGmXqq2dGAm9vQy3VSDUTOC2gfLCmpCjCkXgvYY+TP53h+P4DtViByWvXfeW23nm6iUFw z1bxfjqW7v5tENQue8/6mqYgFo/mFrp8Fno0mb32ELJbYPrEgZJIjNuZh5UqnXJ1l7fDbS pr5a3RlYoezYLBNp6frie3FF/51GjpwyhbNkaZ33M0KbjjW5Eum9NHqn18h6JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701158750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YXuE4nyysWrAXCaYyNiW6R7l4jJdH8n3cfyrRSDMY0o=; b=oV3dKPR+SPOpz2gaTEOGanBaE+IhXw8FC2jDt8JGE1j2fQ1BufsTEytSuNH5y6OT2VBeSK /hufeoSyOWHIi0XhjO5VV/Ynf4R2ZWecJ4spEQBiaMqPtSPbl1J9W+Y8ygV8ftwHroEtri TcO6k0EVR9qy/qmR8cHmQ8Qrj1w5zWu8pEV+jhRQ7dCUjQluWfqeXUWZFy4JGEQnRW++Vv 40kXHRon6SHEl1M8sp6X2IXAWCDmMsVpiUDIz1ndPkZ6werpTfZvB4AkJQmE77bio2/y5o hXwbgE3bL01JPjwaIuRqvuBG67qWnR1QmfvNzObCro/PMB5wNSAsW8aR6cMKuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701158750; a=rsa-sha256; cv=none; b=kRt0OKBGhrSBiZuXcT1pdgmOJLVnXoU6V5eXNDhkBdlgMIqUcEZa6mzSMMqTfX4a6OD2Il mhAYq909dffmrqzJzBhx5bLFw8gmiN8drMR5ylK0N+UTtpLt3MeD4hcH3Vzvq8uaFu9D4P qRgIS8P7Rr5dQuXhuffsyA0wfzMlSX+ZqPOngqS3GdA4u0m/uOF2j2+bwE+I63f1Yk9+xo cVxMY7VZmGyhJucdnfJ5a9D+qB/aToaRlGWIGrDkllON4dvx/DJZAqiJP1lev7IC/YlyPB WuZ2s2InmjMM06ihMAlbD/vWRZdlkK05TTRsYnINjJD16bb/55IE4hZKsWqASA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfZlK6Xm6z1Cg6; Tue, 28 Nov 2023 08:05: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 3AS85n7B070601; Tue, 28 Nov 2023 08:05:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AS85naB070598; Tue, 28 Nov 2023 08:05:49 GMT (envelope-from git) Date: Tue, 28 Nov 2023 08:05:49 GMT Message-Id: <202311280805.3AS85naB070598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Yuri Pankov Subject: git: 5b4b93e6074c - stable/14 - msgdef: fix NO and SI locales List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5b4b93e6074c4a928c6a452790ed8a43e1c4a039 Auto-Submitted: auto-generated The branch stable/14 has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=5b4b93e6074c4a928c6a452790ed8a43e1c4a039 commit 5b4b93e6074c4a928c6a452790ed8a43e1c4a039 Author: Yuri Pankov AuthorDate: 2023-09-21 10:45:54 +0000 Commit: Yuri Pankov CommitDate: 2023-11-28 07:12:11 +0000 msgdef: fix NO and SI locales Fix circular symlinks by providing separate source for nn_NO.ISO8859-1, nn_NO.ISO8859-15, and sl_SI.ISO8859-2 (re)generated from CLDR. PR: 260841 Reviewed by: imp (previous version) Fixes: 0a36787e4c1f ("locales: separate unicode from other locales") Differential Revision: https://reviews.freebsd.org/D41899 (cherry picked from commit 159599c4a2bbd8fcc4bb7f845afe3e0ea232ab9e) --- share/msgdef/Makefile | 5 ++--- share/msgdef/nn_NO.ISO8859-15.src | 8 ++++++++ share/msgdef/sl_SI.ISO8859-2.src | 8 ++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile index cf268c72d783..e52e02e4adf9 100644 --- a/share/msgdef/Makefile +++ b/share/msgdef/Makefile @@ -1,4 +1,3 @@ - PACKAGE= locales LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_MESSAGES @@ -28,6 +27,7 @@ LOCALES+= ru_RU.CP866 LOCALES+= ru_RU.ISO8859-5 LOCALES+= ru_RU.KOI8-R LOCALES+= sk_SK.ISO8859-2 +LOCALES+= sl_SI.ISO8859-2 LOCALES+= sr_RS.ISO8859-5 LOCALES+= tr_TR.ISO8859-9 LOCALES+= uk_UA.CP1251 @@ -47,6 +47,7 @@ LOCALES+= fr_FR.ISO8859-15 LOCALES+= hu_HU.ISO8859-2 LOCALES+= ro_RO.ISO8859-2 LOCALES+= nb_NO.ISO8859-15 +LOCALES+= nn_NO.ISO8859-15 LOCALES+= lt_LT.ISO8859-13 LOCALES+= pl_PL.ISO8859-2 @@ -105,13 +106,11 @@ SAME+= fr_FR.ISO8859-15 fr_CA.ISO8859-15 SAME+= fr_FR.ISO8859-15 fr_CA.ISO8859-1 SAME+= fr_FR.ISO8859-15 fr_BE.ISO8859-15 SAME+= fr_FR.ISO8859-15 fr_BE.ISO8859-1 -SAME+= sr_RS.ISO8859-2 sl_SI.ISO8859-2 SAME+= is_IS.ISO8859-15 is_IS.ISO8859-1 SAME+= it_IT.ISO8859-15 it_IT.ISO8859-1 SAME+= it_IT.ISO8859-15 it_CH.ISO8859-15 SAME+= it_IT.ISO8859-15 it_CH.ISO8859-1 SAME+= nb_NO.ISO8859-15 nb_NO.ISO8859-1 -SAME+= nn_NO.ISO8859-15 nn_NO.ISO8859-15 SAME+= nn_NO.ISO8859-15 nn_NO.ISO8859-1 SAME+= pt_PT.ISO8859-15 pt_PT.ISO8859-1 SAME+= pt_PT.ISO8859-15 pt_BR.ISO8859-1 diff --git a/share/msgdef/nn_NO.ISO8859-15.src b/share/msgdef/nn_NO.ISO8859-15.src new file mode 100644 index 000000000000..4dd2bca424d6 --- /dev/null +++ b/share/msgdef/nn_NO.ISO8859-15.src @@ -0,0 +1,8 @@ +# yesexpr +^(([jJ]([aA])?)|([jJ])|([yY]([eE][sS])?)|([yY])) +# noexpr +^(([nN]([eE][iI])?)|([nN])|([nN]([oO])?)|([nN])) +# yesstr +ja:j:JA:J:yes:y:YES:Y +# nostr +nei:n:NEI:N:no:n:NO:N diff --git a/share/msgdef/sl_SI.ISO8859-2.src b/share/msgdef/sl_SI.ISO8859-2.src new file mode 100644 index 000000000000..a52851e8b8e4 --- /dev/null +++ b/share/msgdef/sl_SI.ISO8859-2.src @@ -0,0 +1,8 @@ +# yesexpr +^(([dD]([aA])?)|([dD])|([yY]([eE][sS])?)|([yY])) +# noexpr +^(([nN]([eE])?)|([nN])|([nN]([oO])?)|([nN])) +# yesstr +da:d:DA:D:yes:y:YES:Y +# nostr +ne:n:NE:N:no:n:NO:N From nobody Tue Nov 28 08:40:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-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 11:40:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfgWL6vdVz53149; Tue, 28 Nov 2023 11:40: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 4SfgWL6T7Dz3LNP; Tue, 28 Nov 2023 11:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tmjzcw7T1RESkBD9drXwA69mrGDdkKBy1fDnYkZDv/M=; b=NHq4JSNnmm3KxstyCE5I8aRY3qZoOQqr/KcNGbIx0edL4+XOV5lW2dFAgZUe7cQhRrcpui oQys9RbbUX/voaWbyQGWpmTmwwxZSz43LMz2eOlEY9l1io8yq+wGZIvOc2vneXywwiuTIM cvFSMY9s6/go4faYDJOCPFjQ7xlvKIBeMi7OVsLS5OXXkC6skUnGUNbaiNPTWPmpoB0sU3 hw6IXyFuPwghSDjXQvYc0Rc3Us8pK5zFW8Vv9wGCB1qWqsuLEY5HdN5S8bA78Bzx1Oxxxc 98zX200X0jxJxvYLwXGGTA/L4HKx3aGt199prjjIg4YqOVq1G84K+7hrFH52Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tmjzcw7T1RESkBD9drXwA69mrGDdkKBy1fDnYkZDv/M=; b=xXggATSzyCE/NVZ3rw3b70mzXvNkxtosHTSGMmu+G4nEqEQKeG8azsSZHnaASqmYDe3m39 awhlR2kYXQsJeE1xiGHc1SKC6kaMOU6znwitcopXYjj8YDhDgq1LO+6dlUYO0C6vu3ui6Y PfUi+JeAen/EGRtJVvexcDYIftV5CD+xTVkLBYpB6DCf5CsZFdTuh5U8BjamWdharnJzm3 tBhmol3rZB0InBQeBl/YFC8Jo/WtdmJKkdZo5dEk++rgPh7gukE4chYTJ4k82WKoQ9QfaV Iu1Ek5NmVEaDGLkXqyKsfABIhFqfSsqPA2tr2m6RxniKj7L9xcAAkQT6eH8waA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171646; a=rsa-sha256; cv=none; b=FszRclaiF8qEyTU8eRGzUXD2P2bZY7psLnX+JI9Jpe23Mpi4iONOZ3Zu8pftP6A2loYztI FLoequ+mZDXXGEnMypJAZGlAiuS+4JQrFFc1ltrHuOrKK1xaR8+RDZAyleItIkZiAS8COe in6MQ2vkX9gjRE8hF+A6Ygz0vhnAQLL/IQ1ixm4PqMXqJHQc5tMKE66khNi7x0mwYNN9yi zRNJ5ULquK/6cKbYBSfm5x66P8Yr5/DxO6uOj2pcElYpcX87U18qBeUgtLRbK9A1TJod9o gi7fHDZWfizxHBLZPRHWW7P72X3XonOrGKhZNomhX2oG0ayL7PJoQ4bkKL/q0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfgWL5Wz6z4hv; Tue, 28 Nov 2023 11:40: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 3ASBekce032974; Tue, 28 Nov 2023 11:40:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBekQA032971; Tue, 28 Nov 2023 11:40:46 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:40:46 GMT Message-Id: <202311281140.3ASBekQA032971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e056f6da6188 - stable/14 - sys/sysctl.h: FEATURE_ADD() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e056f6da61884ed4a1c8a06d1ddee846cc613a32 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e056f6da61884ed4a1c8a06d1ddee846cc613a32 commit e056f6da61884ed4a1c8a06d1ddee846cc613a32 Author: Konstantin Belousov AuthorDate: 2023-11-20 22:43:07 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:39:38 +0000 sys/sysctl.h: FEATURE_ADD() (cherry picked from commit 46f3a29ee144a7d2e74c8b3d6c5c7b28562c29e2) --- sys/sys/sysctl.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 9176d2c3efdd..bc7a2bc601a1 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -927,6 +927,12 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); #define FEATURE(name, desc) \ SYSCTL_INT_WITH_LABEL(_kern_features, OID_AUTO, name, \ CTLFLAG_RD | CTLFLAG_CAPRD, SYSCTL_NULL_INT_PTR, 1, desc, "feature") +/* Same for the dynamic registration. */ +#define FEATURE_ADD(name, desc) \ + sysctl_add_oid(NULL, SYSCTL_CHILDREN(&sysctl___kern_features), \ + OID_AUTO, name, \ + CTLFLAG_RD | CTLFLAG_CAPRD | CTLTYPE_INT | CTLFLAG_MPSAFE, \ + NULL, 1, sysctl_handle_int, "I", desc, "feature"); #endif /* _KERNEL */ From nobody Tue Nov 28 11:40:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfgWN0vtBz531JW; Tue, 28 Nov 2023 11:40: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 4SfgWN0LfVz3Lb1; Tue, 28 Nov 2023 11:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2txY6CDNzzAY3IwdxkWf34mfmRx4R5CwaykySzR3TKI=; b=AFxNa+CgTiiQWkKGHEW5sI5DdwCklr+8bWCmentG6Bz8UTpIT9jyyNK+1jCHm5lu/DRP8X rnFUqsa6Ob888LHMgyOaQAitz6/1FCY0OmkYXIfCBDNlhyCcCSfFl5PWLVjWJ3B57Ks+hd Tec0AAkXMdDoVodxexFDW7InvKNZguAqhIyWpkvq/Wx/rNSNkZc37/CRYBZQdSOUOCQpKE ejgq2yN7JMHpnMgLbUeFZNrNyHh91AlbsSL8Ub4ffjDW51HMKV+vtBcNRAMFymLyoDLDxe SMdHRYb1WKA8P3fdAuIe23sjL5QG1FBdKa/tpjRe8e8uHSasROUQsWLvUgMLyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2txY6CDNzzAY3IwdxkWf34mfmRx4R5CwaykySzR3TKI=; b=cI0liI26nep+NUUGaKXPjN4YQO6EmBurQgiPeqXqiLYad3AEs55yYvhAQSmIQNechFSMQV soy8puku32deqI/xQAhVt7rOifus8PDSfyYkUmdaNeBdASBmkxAz3Ie4OGW00FhDD7EVKz pzM2/0ESfM+9/Hu4ubj4SPKUBt73VBnBtedPKD4OtgZaRv/mZBU/VLwhU6usix7dOiJQNU kdWr7VMBfT1ifxy94P9jMIdCMkgydcy+igQD/mFzRxWLPct0bJ5FSGaqgpVaUwFKecPiA6 BxBUpaSGLqL0rbf+mlBxOMaefUDqlb9P9p2m96DGbU1wzhSnJovOniSZevzWBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171648; a=rsa-sha256; cv=none; b=HB00vhykQb1uPt4jpLQ7/Hb+M694F5kA3IDcVMUHseMNzOU02Webam/UsRwiSpjmtpFwXi O0XjnO78Zs0PZSBFlIz+qCNr9HuP4Fv9467yOHe3EoH3DSctSed5TZK7sRFQeAjCUZttsC /AV3jNPshFQ1/6FaP6PkxG9nacjAr01KmXDsbe7QMRTf5r0kKdiFq3Io1hWXy2ZVOTG1mQ AT5864xBYZ/1u9gb6rtEGVphtcxwd2khep5W/fVe5gbCzDmwjACu3RyM4LAgZkQ1NX+rLO XR4VlnWJ1bBBJHloD9ppy6ZnZ5x/8MZSJy32XSVkgs8LvIGNIIKPWWFm670kJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfgWM6XDhz52P; Tue, 28 Nov 2023 11:40: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 3ASBelFP033038; Tue, 28 Nov 2023 11:40:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBel9W033035; Tue, 28 Nov 2023 11:40:47 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:40:47 GMT Message-Id: <202311281140.3ASBel9W033035@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 608e56cfe934 - stable/14 - FEATURE compat_freebsd_32bit: only report on arm64 when support is present List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 608e56cfe93478ff4d6e544b99ef027b98066ae5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=608e56cfe93478ff4d6e544b99ef027b98066ae5 commit 608e56cfe93478ff4d6e544b99ef027b98066ae5 Author: Konstantin Belousov AuthorDate: 2023-11-16 21:06:36 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:39:38 +0000 FEATURE compat_freebsd_32bit: only report on arm64 when support is present (cherry picked from commit 5a2bbacea56f40e91c5371d5d6a210afd797fd3b) --- sys/arm64/arm64/elf32_machdep.c | 2 ++ sys/compat/freebsd32/freebsd32_misc.c | 13 ++++++++++++- sys/compat/freebsd32/freebsd32_util.h | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index 4acb68b09108..de0ee9607ad1 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -160,6 +160,8 @@ register_elf32_brand(void *arg) if (ID_AA64PFR0_EL0_VAL(READ_SPECIALREG(id_aa64pfr0_el1)) == ID_AA64PFR0_EL0_64_32) { elf32_insert_brand_entry(&freebsd32_brand_info); + } else { + compat_freebsd_32bit = 0; } } SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST, register_elf32_brand, NULL); diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index c26e7b97e717..d9266f57ac94 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -123,7 +123,18 @@ #include #include -FEATURE(compat_freebsd_32bit, "Compatible with 32-bit FreeBSD"); +int compat_freebsd_32bit = 1; + +static void +register_compat32_feature(void *arg) +{ + if (!compat_freebsd_32bit) + return; + + FEATURE_ADD("compat_freebsd_32bit", "Compatible with 32-bit FreeBSD"); +} +SYSINIT(freebsd32, SI_SUB_EXEC, SI_ORDER_ANY, register_compat32_feature, + NULL); struct ptrace_io_desc32 { int piod_op; diff --git a/sys/compat/freebsd32/freebsd32_util.h b/sys/compat/freebsd32/freebsd32_util.h index 67f0c099792a..c32c7a2ef4c1 100644 --- a/sys/compat/freebsd32/freebsd32_util.h +++ b/sys/compat/freebsd32/freebsd32_util.h @@ -122,4 +122,6 @@ struct image_args; int freebsd32_exec_copyin_args(struct image_args *args, const char *fname, enum uio_seg segflg, uint32_t *argv, uint32_t *envv); +extern int compat_freebsd_32bit; + #endif /* !_COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ */ From nobody Tue Nov 28 11:40:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfgWP305Jz5317M; Tue, 28 Nov 2023 11:40: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 4SfgWP1QXcz3Ldr; Tue, 28 Nov 2023 11:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ARfeg7Ljwih91cG8cV4npnKkNmb4KGbzBLEUhmR8p9w=; b=TxGqds+ITMaFaNnJvk6jmEE1RBIgT4OGO4qRFL3sCaiLR3w4yQhZyUNkrs+UHlF83M+8mv DZ4dPf4/r04KFQNYzUPdyOkJO70jgelQUWxlEsWoHwCPD5ncF9fU5yRGNMRtuLiOreLGbQ n0q/bbFiHXwjPS8gvfFQbVzEu030KcOpfSk39lyTbtTC/q4fJFNkOM3xGFWWSJEPFao/+n OpnXSX7m9DJxEvWP14pahIJ5oQsPArRik8DFoRNo8oubALLnMyuIcqRNl/kQQdQP9ReQuy ctrXFR3u53tLJcn3v6FzKRmrj0++SnoWZBtTVYaZ+SnO04Uob9WyOs2qa69TcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ARfeg7Ljwih91cG8cV4npnKkNmb4KGbzBLEUhmR8p9w=; b=xkiN1t2MUO34wJntgXMY4O/poAiiT6rpoLcd5m5JoiMdB02NI+rnZqc/gI/0BvfI+xEoix aeIIUVMufZkIQGKlj7uuLnGFgYH0fLr0ZuYkN42CZ3eYCOWKUBReeBUW/TNxkPvCPH+lmR 1SuW99plCYOGMBONFWYmUvzHDvBNR+biK2qs20dqs8Qm7+18u40vJPTE/z7SvgxYEWzz42 oWn07WjsAJRRQNAzvREXesW5P/4sb2tlB7Us1T79oBeLGr+QpQlfDI6MuXYiX4f3Xz2AHg ljlgdI83liAnfd4ZwS6uA9FQ47hrvcOIbzOBwu8rCXJVoL1A/wA82ySThX0F0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171649; a=rsa-sha256; cv=none; b=TzG5AE5tQwlJXjX7Vs8ZAx4MLm6bNyXWwRkBa8Omu05+iYje5/Biglal3iwDNWfMhpqcIq vdUs2uQN2Zh99wTERNp7LN3CdToWC4bk0tW6uc9id7SAG31X/scfLL/qaGiYO+vER+o5ih yTcrI4wbE4D3T8g3+ODCe1kJZPxFiiUpKDx8O4Y5wSIEEPHygzPOItCb/uAxtXZfFvvYRc 5mGlQuDmGXV1bUHQw2paATSgblHiVZ1tV7QNR78HUhu/+AJ5ux+kLirnYAsbt3moX1Kf4D 6qZR9F2Ap63ZfAAWp9zx/Vd0OMH00me3OO1fmkMYpV0xDluTont3LmINn/I/Yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfgWP0VPWz56v; Tue, 28 Nov 2023 11:40: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 3ASBemPw033080; Tue, 28 Nov 2023 11:40:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBemRX033077; Tue, 28 Nov 2023 11:40:48 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:40:48 GMT Message-Id: <202311281140.3ASBemRX033077@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c4a62edfe2a3 - stable/14 - sysctl kern.supported_archs: return correct value List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c4a62edfe2a333d8709efc69cb9921c1a1894bb8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c4a62edfe2a333d8709efc69cb9921c1a1894bb8 commit c4a62edfe2a333d8709efc69cb9921c1a1894bb8 Author: Konstantin Belousov AuthorDate: 2023-11-16 21:58:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:39:38 +0000 sysctl kern.supported_archs: return correct value (cherry picked from commit 26b36a64be410cacbec1a5cabec091bf7de2b251) --- sys/kern/kern_mib.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index 9094d09550ee..6c19deab1d25 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -316,16 +316,25 @@ SYSCTL_PROC(_hw, HW_MACHINE_ARCH, machine_arch, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_CAPRD | CTLFLAG_MPSAFE, NULL, 0, sysctl_hw_machine_arch, "A", "System architecture"); -#ifndef MACHINE_ARCHES #ifdef COMPAT_FREEBSD32 -#define MACHINE_ARCHES MACHINE_ARCH " " MACHINE_ARCH32 -#else -#define MACHINE_ARCHES MACHINE_ARCH -#endif +#include #endif -SYSCTL_STRING(_kern, OID_AUTO, supported_archs, CTLFLAG_RD | CTLFLAG_MPSAFE, - MACHINE_ARCHES, 0, "Supported architectures for binaries"); +static int +sysctl_kern_supported_archs(SYSCTL_HANDLER_ARGS) +{ + const char *supported_archs; + + supported_archs = +#ifdef COMPAT_FREEBSD32 + compat_freebsd_32bit ? MACHINE_ARCH " " MACHINE_ARCH32 : +#endif + MACHINE_ARCH; + return (SYSCTL_OUT(req, supported_archs, strlen(supported_archs) + 1)); +} +SYSCTL_PROC(_kern, OID_AUTO, supported_archs, CTLFLAG_RD | CTLFLAG_MPSAFE | + CTLFLAG_CAPRD | CTLTYPE_STRING, NULL, 0, sysctl_kern_supported_archs, "A", + "Supported architectures for binaries"); static int sysctl_hostname(SYSCTL_HANDLER_ARGS) From nobody Tue Nov 28 11:40:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfgWQ3KGxz5317R; Tue, 28 Nov 2023 11:40: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 4SfgWQ2GTsz3LWK; Tue, 28 Nov 2023 11:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u7rGAm3CTWXDsk1C2tIKSMpwjZ51kJ0YAkav8wE5sGE=; b=loFItQrNfXW6KAMepOmpiigJZ+5TJaE864tgx2A8eEk9oKgcNznkdtCE7fT11pOshOBWFs 0TG5V+VRbQftIGCINTLFZd5322f5QtIv7vIQG/W5sfR6at7rmDP63LEGosx9JvKi6SqpKE 6RActj1aHrc2MnH7lRkeLhxQgOR3Yvd7x15IdQbhGXHHChwZtKxijWeAl6CahEs5GkIpXE Ivf5Czk/zSmWQfoTY2bnhdi7fTxBcnJr0x9J+M6u6eDEMjmR85pWYbw4Ufhc+tNUiWbocK TSE53Q7uXNWpzz/bhpDtbUFwT6gdQMa+pD3IrmXWRk+S6pNgWeSiOkenuBooXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u7rGAm3CTWXDsk1C2tIKSMpwjZ51kJ0YAkav8wE5sGE=; b=hPIAuZmrAAZ7kSPqFgHFp3M4nUMv5XlQcRK0xdxbrntQasum3i4D6XM6UZJck6vXHQxVTz 5Uw6oMxz6u7lvVRS38fYfqFlBvBEHO35uUG4gux+VlkhSLg1ycy2oe0MFXZa62fsoq1lgs sMJ4sZAsrcvlKu3GqHQIUCtMk0RRrdaRsvqvhDLqwDmeShPKO5Q4lozL13N3ArmH5tZThN uA5Hy4qDmjsfd+3BgulufgGKZfTqpmyKD/Y6YonVPu1xD9++OLydM+jG1uRVb28ny3RxQ+ LG64AeLLA7NL+SGCMUi6tFgok+cZS+x4VueOfEm5T6LzZF8ywcj1x/iPbwoUtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171650; a=rsa-sha256; cv=none; b=I44ju0cVj70WOwTuOSLfHoEPUG8AePDGETT4BDSwTsVZa08VjoT000Qj0yLeCYDMK7C4WT 0uP8Wvo3qcbXHLbl0o6x0df+iG2oq1tPyF9qeWKwFKZkwMmxO7+pfIb+Evo4XXM2x/Q4Mf OJ1uhIS8EbK3a+tMWqJqOwpQwfdOXauQRHqf/KXKTTzEvfp4RMaB6mtr3mbq37hIqLuc7u VQYeCqaDthq7QglQSK3DlfO+jV7cOE0unZTshkMN/uhxfTVbUwFZu+OX4Pfm/6mYQiMOJN jllzMxd6faC+a9/gphTQoZLR7aZsmjTMpgb4UdE/43IvN3c9f5uey1FoLcmMsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfgWQ17Xxz54Q; Tue, 28 Nov 2023 11:40: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 3ASBeoWE033119; Tue, 28 Nov 2023 11:40:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBeoBU033116; Tue, 28 Nov 2023 11:40:50 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:40:50 GMT Message-Id: <202311281140.3ASBeoBU033116@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 28ddc16c7b1d - stable/14 - Tweak compat_freebsd32_bit feature name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 28ddc16c7b1dbb97e8a97a6a200f709840ea55c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=28ddc16c7b1dbb97e8a97a6a200f709840ea55c5 commit 28ddc16c7b1dbb97e8a97a6a200f709840ea55c5 Author: Konstantin Belousov AuthorDate: 2023-11-18 22:40:58 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:39:38 +0000 Tweak compat_freebsd32_bit feature name (cherry picked from commit bddc7a8a94ff50bc0eacad5b11f954353a7e8c30) --- sys/compat/freebsd32/freebsd32_misc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index d9266f57ac94..2f5cf95b4e4a 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -131,7 +131,9 @@ register_compat32_feature(void *arg) if (!compat_freebsd_32bit) return; - FEATURE_ADD("compat_freebsd_32bit", "Compatible with 32-bit FreeBSD"); + FEATURE_ADD("compat_freebsd32", "Compatible with 32-bit FreeBSD"); + FEATURE_ADD("compat_freebsd_32bit", + "Compatible with 32-bit FreeBSD (legacy feature name)"); } SYSINIT(freebsd32, SI_SUB_EXEC, SI_ORDER_ANY, register_compat32_feature, NULL); From nobody Tue Nov 28 11:40:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfgWR41KKz531Jh; Tue, 28 Nov 2023 11:40: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 4SfgWR2xLpz3Lfg; Tue, 28 Nov 2023 11:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mybpOyrnx8MQjyk4tY5Bu4cwgHIzzTXY4ht7jVJfuD4=; b=N0QIPsCHbGUYdKdKqibGZojjKRDSoFDB84Gz671NeN01/zxJKz/8AEH9kqVe1L3Ez7HiC1 eNfib9kZD8zXLiuTTuSW4yL+MW16Q6NgnulVRJyj4qhp4c72F/mDHR6e2AbS/QyQ9y7cNN XZrUOhOeASd5lM46JQPlRjr4KI+r43OR3FocBlbgYsXz4esIhp5Df2z+Fj7DMI+sCmBSY2 go/MnQy/bmFjPxnOYDf6qK+sOg5AKZuTA8WnEmdXdyf0a8GDTJ0SADQ6k3S/IuRjirjekn /PVQh2sGAD5CMwOh0+xOwv5GFg71h5MoXOEfwF6ilDpkNXOwUHuFZ5tP00uudQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mybpOyrnx8MQjyk4tY5Bu4cwgHIzzTXY4ht7jVJfuD4=; b=JQbe0GAP4ZF22KDvhBgP6ZVvDZ0KeEM9dF/GRxD+VRrGyxMslFrxQpWgulX1lAEriN5rtK bdTVUqTLw4CqvEKmY9yNMSBv/g2uaFQOIEXPAVKHjlRdCvXbtZqXXWbbFEWFjY2z36IE1v ntL4dFkUd5+XV8NIqE6uEvNEDqPiEBh/rZAiZbWjp/8Aet5bf90unKb4qftFm8w9Os+i0g FIQz6f1pJLWZxVRuhsYzBaXoUxPsKbujSRy+YXfGilCCrquTVYXUfCzDp5AMfamPqTu07p G2NEoIra+X7akeSRUvFhxpnSQCDEnKNrmr1kVnpDgGXeLenR7ha2NGsMncPF8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171651; a=rsa-sha256; cv=none; b=BjSEuIpDhGsT6RpQ3CP2bkPIXUzXLNJ3mxhD1fslmaWs+AxtRtYjPBxMgdbMB+ytp1HCAe PpZp9WM5kmCPJDvscGEDHxrRIM7ywBivnJHeJ70I0L8jsy8SogAxCTsz6QRV5eyq7OX8gc XQJGgEl5pHGRJrv58qzj+Ze4YXB1M4c35GGpgLqM7HjZ2g8hHfcgzj8wZ/QyXSZlzueIvu qM5y9bpDuHW72K+8mi2Sd1/c7oIZuWYDl7r/3ENGt994FfuUIUcqFvdAxedS6WyVsYupcq TYIeggC9VNnKFyaR4Ty2GWNJRHF6LmhrsuSHCOdYKlb1huw5VQrTz7f0j+8+dQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfgWR1z4Vz56y; Tue, 28 Nov 2023 11:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASBepdZ033167; Tue, 28 Nov 2023 11:40:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBepuD033164; Tue, 28 Nov 2023 11:40:51 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:40:51 GMT Message-Id: <202311281140.3ASBepuD033164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5dba91f557f0 - stable/14 - rc.d/ldconfig: Prepend rtld stdlib paths to ldconfig(32)_paths List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5dba91f557f0fb295977a07b2837b0351723b9c8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5dba91f557f0fb295977a07b2837b0351723b9c8 commit 5dba91f557f0fb295977a07b2837b0351723b9c8 Author: John W. O'Brien AuthorDate: 2023-11-12 22:45:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:39:39 +0000 rc.d/ldconfig: Prepend rtld stdlib paths to ldconfig(32)_paths PR: 275031 (cherry picked from commit 99132daf6f70cb0cc969c555d3612547fa3cf1db) --- libexec/rc/rc.d/ldconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/ldconfig b/libexec/rc/rc.d/ldconfig index 178a8a987be4..ecbbca210ea0 100755 --- a/libexec/rc/rc.d/ldconfig +++ b/libexec/rc/rc.d/ldconfig @@ -22,7 +22,7 @@ ldconfig_start() ldconfig=${ldconfig_command} checkyesno ldconfig_insecure && _ins="-i" if [ -x "${ldconfig_command}" ]; then - _LDC="/lib /usr/lib" + _LDC=$(/libexec/ld-elf.so.1 -v | sed -n -e '/^Default lib path /s///p' | tr : ' ') for i in ${ldconfig_local_dirs}; do if [ -d "${i}" ]; then _files=`find ${i} -type f` @@ -52,6 +52,9 @@ ldconfig_start() fi done _LDC="" + if [ -x /libexec/ld-elf32.so.1 ]; then + _LDC=$(/libexec/ld-elf32.so.1 -v | sed -n -e '/^Default lib path /s///p' | tr : ' ') + fi for i in ${ldconfig32_paths}; do if [ -r "${i}" ]; then _LDC="${_LDC} ${i}" From nobody Tue Nov 28 11:40:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfgWS4pwRz531T9; Tue, 28 Nov 2023 11:40:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfgWS3zDqz3Lm8; Tue, 28 Nov 2023 11:40:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QrY1jAx6J9ydollBDIbGPsY5DGkGQ5CCd86TI7aZl8o=; b=NsA/vgbSxeQn44zY52t5CRgF+F5w4O5yZDNVSybQAPNSCNBbXeUbPg8h2dE5szVFMTUXWr QGmjq0/xDY87y3eLYfWoXA7yXaRt1bVpdF268B2pNsMTuVeqEsrhSlLVDAh6iS4aH+nV+u luAMLD8nbRVyJn9u1s+n2PPil1pvHM1lUBRbtyezGuDK4eU+I91QGUPlmQTViXzfA5eYWI 0YAlpBh2xu0aTuT+E6PVBXX5FGj9w0dLq30RB0R4r5a0f0B4LX3N2+qaD34Q1QVhN0JgMi YIGA9rCWcG6tu/epJMDF9svnJbptghaPnuPl/kgzerboDECMMK2AG3auKauJ1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QrY1jAx6J9ydollBDIbGPsY5DGkGQ5CCd86TI7aZl8o=; b=D6nOXS8sBLXj4PQgcdyXQsSTXi8+ON7c78sG6iaHkw5s0FuqbRCko1gpOgYmGkh1XIv9H8 upbztIyVx2Sy2AwYECbpU0fVHXZWvkmKI/RLG2c5LOOamZ0rtRXLqzaEi/Um/2DhD+loBg SFPMHPDDFV3U8blpcYHCH/J2ImOj2+QBQ7jk8XFoSbpm0MEWVOKdzkQurlPrFbtaZteq6+ gdUQKaUmw/FIb/cKGCGtaHic9YwmAWS+Axh+49DYff1dRVmkQq347mpSejq61vrHIzKov7 wtJ/4Pq6rX6bfu9xvQgSYmJP/BEh215CaSl0maqJxhSowkFd+V+wW5KK82oPIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171652; a=rsa-sha256; cv=none; b=gxfbmF7rjduwZUcm6QEVJvneO64//Ug/XzvhxYQmZJwPno09BkVWDzqLUYTA6tYS+mlc/l qv88mX4j2idd3kHCNt5jpfvGY1Xr7RLWgHdk9rWLthTM6jPVGgIgjB0s4C5jKhHeeqzRwa VfmMg5/oEdnE20zEI1WtOESTtlU6lJgY45m5tYkT98STXeg7FHyztyKJQthtzQcQqr3A48 N/wEdLzyv1vwK89zce1+VpapdoOcUHTTv0T5+8B9rnbaR0E5ZyynEEVzN1k7I3cDNf6QyA XeLXRTqobHFk+lbFkv9/tBKOyGyEVWplNR9Z7YjgzDWpGrbThOnYu1eQdpAHzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfgWS321Jz52Q; Tue, 28 Nov 2023 11:40: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 3ASBeqVn033218; Tue, 28 Nov 2023 11:40:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBeqfv033215; Tue, 28 Nov 2023 11:40:52 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:40:52 GMT Message-Id: <202311281140.3ASBeqfv033215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 81a5b2389dcf - stable/14 - ldconfig: filter out non-existing directories from default path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 81a5b2389dcfeef12115e28a24ea68f71e5cc1f3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=81a5b2389dcfeef12115e28a24ea68f71e5cc1f3 commit 81a5b2389dcfeef12115e28a24ea68f71e5cc1f3 Author: Konstantin Belousov AuthorDate: 2023-11-16 05:38:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:39:39 +0000 ldconfig: filter out non-existing directories from default path (cherry picked from commit 806e4e3273bee2e3a12ffc2e74db5c912fbd7aa9) --- libexec/rc/rc.d/ldconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/ldconfig b/libexec/rc/rc.d/ldconfig index ecbbca210ea0..ed3484017d84 100755 --- a/libexec/rc/rc.d/ldconfig +++ b/libexec/rc/rc.d/ldconfig @@ -53,7 +53,11 @@ ldconfig_start() done _LDC="" if [ -x /libexec/ld-elf32.so.1 ]; then - _LDC=$(/libexec/ld-elf32.so.1 -v | sed -n -e '/^Default lib path /s///p' | tr : ' ') + for x in $(/libexec/ld-elf32.so.1 -v | sed -n -e '/^Default lib path /s///p' | tr : ' '); do + if [ -d "${x}" ]; then + _LDC="${_LDC} ${x}" + fi + done fi for i in ${ldconfig32_paths}; do if [ -r "${i}" ]; then From nobody Tue Nov 28 11:40:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfgWV2Hj9z531Jx; Tue, 28 Nov 2023 11:40: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 4SfgWT54f8z3LpZ; Tue, 28 Nov 2023 11:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z53zmCbIyBrnCSih7vGx8MsykkSv/CA4eWHgifCkN3Y=; b=lMaSY3gEHkdfLZ0Ggz635FD+uONOhqwS5pn0QQPZt+sOdQ5/aVjsMA81htOJtrgi/HgQsS VqtOg9gidfM5IG6WnJ8bgPanI2cihPx+3lX0lFvlj1Rw9PfKe9tpAbh7NlrnIeSe9NfTxz tWmihXDfQ0IzNJc0DiwaOuBiJjwija5bOzbn4meFWdK1qi2aisYc2AUpc6/598O3/EGvxz CPfg/r5NMbWQ8hMUlgMQ/P6Wpd2AC7qnMebsJ3izfJmG983fR8lljR+o6EgWhbFfw9r0XP RafOH9yusAtrPi3UeqCSjdkNS8OrFcvSBzZEUhn77hvZKbLvSvoXU+3yE60DNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z53zmCbIyBrnCSih7vGx8MsykkSv/CA4eWHgifCkN3Y=; b=Ydq9+J3mAicr6nLMDKu5kacyuwTdmey6XrzCgMtnaMzENHJMqyHigWlFtwWx19OZCNu5r/ 24eRVnd5SFfKkdEemfvugsmgie/CRkl5ckA75fHdXourOz/rZtZzgRzf80Qk351+7yRVO7 MjDkthymTUnZs2kj8yA/xVzqewxwrfUpDv97IMfyAk1JU7R3SbJjJTD+20pevMu4QiFcRt RwWXY9GudPFW2EIQL08kitfCJXS/A98fz8c6xzPPgo80RujBbbaJF9C14uM7btu20nEZBU B+O4RL3s+s7yhrs1VuNlwT7AOIzHEooJedeVPQKbENXGAzONCVkFqKpcbVhTbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171653; a=rsa-sha256; cv=none; b=OYnprCsb8k1DhLE0+JDUC8WGh3nZtFuw6xLL6q2++oU8K5W60sm4M15fzGvnhGg+HvDPZ4 PryTosCjgLzD6rEit/PVtXMrjVb+tYJ3miaRAqLt0mcPuyHRDOHXgDV84hAKg5HynHhxUz Z6x5g2KwPloPnfT2YZmv5GsieB0DgtChS7vtEYgoCjuwc8NKWef8rF7WpOQMPZh3fXG6t7 TGlD9XQ4mnaAlCCgtgcZJJylBKd/hH0TagI+V/emyHDzFO4UH6JWvrOUh1xIO8j3G+dq/M U11tLhkYZPM+D2sEegX1lUraSagHZBKXBIvG0HrMqiTdFWOcNaG1NCe53Mu61A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfgWT3xYtz571; Tue, 28 Nov 2023 11:40: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 3ASBerVi033275; Tue, 28 Nov 2023 11:40:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBerkH033272; Tue, 28 Nov 2023 11:40:53 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:40:53 GMT Message-Id: <202311281140.3ASBerkH033272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 98f8057eaac3 - stable/14 - ldconfig: only configure compat32 when kernel supports it List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 98f8057eaac39c56f049f1f6cebddf8c3860046b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=98f8057eaac39c56f049f1f6cebddf8c3860046b commit 98f8057eaac39c56f049f1f6cebddf8c3860046b Author: Konstantin Belousov AuthorDate: 2023-11-18 13:09:30 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:40:07 +0000 ldconfig: only configure compat32 when kernel supports it (cherry picked from commit 73902ed85ab73d455d4be8c77336c88a07512230) --- libexec/rc/rc.d/ldconfig | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libexec/rc/rc.d/ldconfig b/libexec/rc/rc.d/ldconfig index ed3484017d84..beb79ba95b84 100755 --- a/libexec/rc/rc.d/ldconfig +++ b/libexec/rc/rc.d/ldconfig @@ -39,10 +39,7 @@ ldconfig_start() startmsg 'ELF ldconfig path:' ${_LDC} ${ldconfig} -elf ${_ins} ${_LDC} - machine_arch=$(sysctl -n hw.machine_arch) - - case ${machine_arch} in - aarch64|amd64|powerpc64) + if check_kern_features compat_freebsd32; then for i in ${ldconfig_local32_dirs}; do if [ -d "${i}" ]; then _files=`find ${i} -type f` @@ -67,7 +64,7 @@ ldconfig_start() startmsg '32-bit compatibility ldconfig path:' ${_LDC} ${ldconfig} -32 ${_ins} ${_LDC} ;; - esac + fi fi } From nobody Tue Nov 28 11:40:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfgWV6zJkz531TM; Tue, 28 Nov 2023 11:40: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 4SfgWV5Dmmz3Lx3; Tue, 28 Nov 2023 11:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hLNv/PfZj2Z4ELPbqzBLis0olUQju/ql3PtTlsQs05Q=; b=P0mRtshSaF7o+3OnBvl2/By2iBhvfAG60CcUFAWggS/CvoTuziUzuZqUqyhZf33IdoTga4 VW0AdWuA4sKxI3KXoAPlYKlzHYJf3rPvTk7Ffjl8HdyTnrz/gE5rczaX+ehrSKjCDcyyO5 SkcP7buIVEGXPkdm7kYG3eFuUwxWn2+oMtJY5TI4dORYzyxjw0eOauLhrVq1I7fzxLzpbk Bs6KNBdUbUFxREjglvtivBktMEiEBT2aN12Rj3HxwsBWh030Sop6bxP18MfIL3UcFN+iLT XYs+zW4JX7ofjcK95qJB4eHGhj5/0qypc8zxayYlSlspKewovqDU8bY48gFIWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hLNv/PfZj2Z4ELPbqzBLis0olUQju/ql3PtTlsQs05Q=; b=VHucB/ym5rj4JWIRmahwKRBoed/fziDJ0W35ycEhmbkakKbx+FJXk4zSTSLwoZoMw/qCK6 YKP0mUrIUHnK/Yk9uF4cjcDLdxkLE1QcZBfVcrFJp9zzJ7Y7kXswchswEcnQPmjSe5uJie szO8iPearY9xjB9yNOy2fQcurfU16/jrfNI+VGBBN19ZAxrcYJ2XKB5qcNz00fiFrMC7UD GIrvMABoAQVolvKmggfNQhWAGrBD8cX+ChcWZqh4UT8uKCQxSTpVg+ueMPiRWIqPwHoT25 y3Yn1LY5zr2uL9qbCao/SGxXGLzAWgcUKCp+8/GJDBf8LLiqJvF41deutQ/j8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171654; a=rsa-sha256; cv=none; b=ML+4GgEgulOI5RGSX2HPSXzpi7dOYhZ68jH0lNmNv5iA6fqVTfybTAx6lDW3jspoTXwuwO yi/fPCHpvvV33ymWNga4fxMRTyTji/PD5N7TBwpvtiFzgTzKVSdUj+XWGEsjLA/ZwqpJWj 2rPlvr45O+ee78I/g3KjDgrWzB2eB1icV22sAEjc3yaXNS5zq6is6j6s3gdlbKPOmvx59Q irxndhydlv0G1Fw7d6Oo/y37k4SWNL+LJQ3JkBLTASmOxLShKEuE7GIJ+8HvXFgHRbZFd5 fGU5mmDAYZR3xsOA5s00wYFFI4gNu+2o7lJ2D93hM7BFj+na2g3Hoj96R0Vn+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfgWV4H8cz573; Tue, 28 Nov 2023 11:40: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 3ASBesWB033694; Tue, 28 Nov 2023 11:40:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBes68033680; Tue, 28 Nov 2023 11:40:54 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:40:54 GMT Message-Id: <202311281140.3ASBes68033680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3d845d94eac8 - stable/14 - rc.d/ldconfig: Remove stray ;; List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3d845d94eac817a93818e2e12c07eda678f88400 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3d845d94eac817a93818e2e12c07eda678f88400 commit 3d845d94eac817a93818e2e12c07eda678f88400 Author: Cy Schubert AuthorDate: 2023-11-24 20:11:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:40:07 +0000 rc.d/ldconfig: Remove stray ;; (cherry picked from commit ac910ad9951a52743389a47fa4a3feabe9021aaa) --- libexec/rc/rc.d/ldconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/libexec/rc/rc.d/ldconfig b/libexec/rc/rc.d/ldconfig index beb79ba95b84..5c404a823dbb 100755 --- a/libexec/rc/rc.d/ldconfig +++ b/libexec/rc/rc.d/ldconfig @@ -63,7 +63,6 @@ ldconfig_start() done startmsg '32-bit compatibility ldconfig path:' ${_LDC} ${ldconfig} -32 ${_ins} ${_LDC} - ;; fi fi From nobody Tue Nov 28 11:43:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfgZ20DyJz532TS; Tue, 28 Nov 2023 11:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfgZ13rGTz3Phn; Tue, 28 Nov 2023 11:43:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y+RNjsfnUBFviEAxZMjZ8BGFZ94rjYRw5/4W4OlKZX4=; b=rTGBG1DBe+9zTvx+EI47PQeJBZN7x304HkoOFE3kbJPM2SJJxnY8yMakAQ0hUoFHQ1N/Y1 2rCbH9+4hS9+4bTULLkPkFxTyG5H8N66PAijaxdJ4ASyvgfZOlOXYEpO8sOd57Kaiijt55 0XGB589oQk5fgVTC+D7KF6YqnB9ibnORpYBuhxSJEi+lmrw9KaHQjCzr1kh1CZqByLVcRg tavZ4/Q30ulmhtpDIR2q2dljBPfBeJlgRFwwY/DvT6knHYsIHUUR8qtNdKfrMtvi4Lhiv6 bjNacZzuParlfifh4bGoxIUJWauB5WxoNRZz6+nlVNIiw3D4O1i0bBZ7aSd0BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y+RNjsfnUBFviEAxZMjZ8BGFZ94rjYRw5/4W4OlKZX4=; b=xqjLQvZBAYKOQu9ANjU44ycytkKxpSAvnAMFSTDVX/kOut3gj64tHRj8bAzfoFnc7ACef8 qsICDbFlGOOXdh5SjH+wg1eTjb2eF6b68fbIT2bWTEqK3eqMx+GuI4kItxMsN7ThGSpKTW if7kJ4NB0V3cEo2wyRBVbC2kcW40pKFOfD9JQr7Qr6+k+9ud/BenvIX/ULkp4m11Lui8KF hMNa3Fd2cUYG0wJPzjRTFbrHgF0dPL/NQVVJPwo4T0kZuHIhhIIHNp2RPeBJKmnCAjB52B vqBiem2Kwn7Yr+0NZS4kR+6IQw3XtOGOv+E7Yb8j+Bthy0iy7IvhNugrjfuweQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171785; a=rsa-sha256; cv=none; b=wji5+vtcMpvcxPG1FXLMC8lEORTxwL2LXVAjkCatGSb6WcjpdcO8cBPqwn7il05uvJTlU/ Xem3N+xjGnwtgDmGNSPTTP78Wmslx/mnQ6OxNHLJMuHmU8IAtWzyvFRZTKgrjunI0e4eO8 rHvAOMbrcGlIJ1JQXn6r98cbXPAdtYPcUoegJ+UC7jXMhNCpg8sCY4e3P87DECWwGZaCMJ rUD2s6Mlsiyb3NujBCKTN4qlz0B5LsTojWJeepgNBRta868uz6xAgOrkbMnDo7aD/l3NlM cBvp/ckt4nE/lnpflYfbiklBQe7/9ZeITdVnLgRBTkdSRi1Fc+pP5dXlCgjwnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfgZ12vdWz4qx; Tue, 28 Nov 2023 11:43: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 3ASBh5B5039215; Tue, 28 Nov 2023 11:43:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBh5e2039212; Tue, 28 Nov 2023 11:43:05 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:43:05 GMT Message-Id: <202311281143.3ASBh5e2039212@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 481273492bbb - stable/13 - rc.d/ldconfig: Prepend rtld stdlib paths to ldconfig(32)_paths List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 481273492bbbab5ee1978a24e55b13c1f39bc560 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=481273492bbbab5ee1978a24e55b13c1f39bc560 commit 481273492bbbab5ee1978a24e55b13c1f39bc560 Author: John W. O'Brien AuthorDate: 2023-11-12 22:45:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:42:22 +0000 rc.d/ldconfig: Prepend rtld stdlib paths to ldconfig(32)_paths PR: 275031 (cherry picked from commit 99132daf6f70cb0cc969c555d3612547fa3cf1db) --- libexec/rc/rc.d/ldconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/ldconfig b/libexec/rc/rc.d/ldconfig index 92e3441b008f..ae25d59ad4ae 100755 --- a/libexec/rc/rc.d/ldconfig +++ b/libexec/rc/rc.d/ldconfig @@ -22,7 +22,7 @@ ldconfig_start() ldconfig=${ldconfig_command} checkyesno ldconfig_insecure && _ins="-i" if [ -x "${ldconfig_command}" ]; then - _LDC="/lib /usr/lib" + _LDC=$(/libexec/ld-elf.so.1 -v | sed -n -e '/^Default lib path /s///p' | tr : ' ') for i in ${ldconfig_local_dirs}; do if [ -d "${i}" ]; then _files=`find ${i} -type f` @@ -52,6 +52,9 @@ ldconfig_start() fi done _LDC="" + if [ -x /libexec/ld-elf32.so.1 ]; then + _LDC=$(/libexec/ld-elf32.so.1 -v | sed -n -e '/^Default lib path /s///p' | tr : ' ') + fi for i in ${ldconfig32_paths}; do if [ -r "${i}" ]; then _LDC="${_LDC} ${i}" From nobody Tue Nov 28 11:43:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfgZ274dZz532RZ; Tue, 28 Nov 2023 11:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfgZ24hXqz3Pl3; Tue, 28 Nov 2023 11:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SYLdLZ3TUIXR8G3iPy2j9XbZGWVhzt5x+gaZJWWJBGA=; b=kZTylJrYH/2lDljgdH5UuZQ23vTAKbEgXxSj+TB/1kjKBcyJMWZyzd31q9PeGsCz91JHGP du+1O9QHYScN3ve25lsPq9w1u06raeOy65Avc9nbeJbl0qa2Oz9vDs35vhCTn5h7cUZyoX E5qcgWxTHPZTG4mHydFwc3YNGmtTkapw/Wqifm3FOeKj4MFPhAjRWNN3CTZtBlXQoNTnK1 mgZH/9nzCvhltQDMWJZ0y7RdNs8Jt4ZO3ub0AlSWf5Cd0wQVAyeYubf0CazjDM8HxQ91aG ne1u4Vp26Gof2MMIXFQYdfKzh22JqkKKp2426c04X1w4gEjJMxSSJsItTJS5FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SYLdLZ3TUIXR8G3iPy2j9XbZGWVhzt5x+gaZJWWJBGA=; b=eiqUOgY6kDaBEiikKk3lezvhKjzif7olbiilNZdwjW7k6Ptd4rwXtJQ23SIyc3GCulQzb2 tVykoqltgIPX7sXuX6nyoLthyu5Z49ML5Za0wD87Vh7eXZt+JvVcTiMnK7YUtUBZWZ9byi Cmg4k1YLn5rQ+IE8MoMjVuAxQxuBgKKeSiWwiK4r3VuOTWioTOdDYZvl9NAFi/sPVDaYrP nKkMukXHtEX24+XaiPrGaiIe9ruQdM2t5PJj2Wq8yXMypVo+SA9fUZKt6q95RgNVWabmSi hFyNfWopUEejkXeoilxe/it3optS7wc8WJRkzqS/pxHNzK3I9g5cCuhLO5+eEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171786; a=rsa-sha256; cv=none; b=d5IYAZJIPljDuzQ2AkX22JmvavDfVqMvdFr0R8cYjzmjpIQO2f9+LL/BHtk0T1l1hy+oEC qsf+qohAkpQ9qt+VLa+JWoMNfya09WjT3qMv3sXsfEwW6bs6tbqvt+mxUKIZiTFewENPr7 Q7tuRuCmMugQ6NwFdUslLhu3l9rsE/asNIRefauiW9GQiPA9V+bAVrXhNqWhp3tkCymErN V+RQbPUc3S9aVy5LTPzg99h71ipMw1eHI6TbH2yyeBjjdMlS/EMDUcpDN+2ksylAv6HiBJ wWHnB7E7FlgY2EDYLvI2LBRU5XMZEjIRYzMov19AQLGNzLQqlBhv5WSjnPEykw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfgZ23mQ1z4qy; Tue, 28 Nov 2023 11:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASBh6U2039266; Tue, 28 Nov 2023 11:43:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBh6ux039263; Tue, 28 Nov 2023 11:43:06 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:43:06 GMT Message-Id: <202311281143.3ASBh6ux039263@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9026d9e6138a - stable/13 - ldconfig: filter out non-existing directories from default path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9026d9e6138ad6ea3b8b52f2d555d48aebd7f8fc Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9026d9e6138ad6ea3b8b52f2d555d48aebd7f8fc commit 9026d9e6138ad6ea3b8b52f2d555d48aebd7f8fc Author: Konstantin Belousov AuthorDate: 2023-11-16 05:38:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:42:22 +0000 ldconfig: filter out non-existing directories from default path (cherry picked from commit 806e4e3273bee2e3a12ffc2e74db5c912fbd7aa9) --- libexec/rc/rc.d/ldconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/ldconfig b/libexec/rc/rc.d/ldconfig index ae25d59ad4ae..388d4cd276a1 100755 --- a/libexec/rc/rc.d/ldconfig +++ b/libexec/rc/rc.d/ldconfig @@ -53,7 +53,11 @@ ldconfig_start() done _LDC="" if [ -x /libexec/ld-elf32.so.1 ]; then - _LDC=$(/libexec/ld-elf32.so.1 -v | sed -n -e '/^Default lib path /s///p' | tr : ' ') + for x in $(/libexec/ld-elf32.so.1 -v | sed -n -e '/^Default lib path /s///p' | tr : ' '); do + if [ -d "${x}" ]; then + _LDC="${_LDC} ${x}" + fi + done fi for i in ${ldconfig32_paths}; do if [ -r "${i}" ]; then From nobody Tue Nov 28 13:38:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(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 15:15:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmHD6jYVz53DWb; Tue, 28 Nov 2023 15:15: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 4SfmHD6VhKz3H0Z; Tue, 28 Nov 2023 15:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YVPahLiFW97qRWt5KvF+5yOb6hc8WC2XIOk982ZAl4I=; b=fxL4RoetBPcm3FUWfCaoeBO5WAzP+OaX98qbtOBww79MoDub+seWvG6+h03pQK0rqeh/9V 0gf6x8ftfoNc0fGEj2h6d6TCN1lWtFtXEN7gngG+XPy+UGd3rgeLwKlj7faAhi1D+WQyBK Q04k/MVd7LUbodbNH/EODQvLfFC/PsqFMGH/WvdIljxb00nbi9F3hDxYmaPx7SZU2uFc6/ 2oRUvg8AbUznBbbZ+DP6WgM6tErWiGIqmkcxKi4QlNbNucbVORSyYJC9VioPjOOfkktCF4 DFX5SZChutS8uh+3GXr4IF0AaV3I2tWp8Z5ujXDM+0l+s28N4HCU8PVdJKQXug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YVPahLiFW97qRWt5KvF+5yOb6hc8WC2XIOk982ZAl4I=; b=lFEC0ikPUmRxCWByjOTVIY4IOFDa8nz6LO1L1uLKxi5dnh1yaSesU952nCecTkKK3PvbFU 1K8P+r9pYFuoiurV0MB0deDcCzTXNneOYKiRgTrnRKprTv33r0QrM8Y9jHVp8Wj2+p8jjS Dg7D8aK/rH2UFtmGk6NR07QOsljb5Y/JUbY8GmuKSkmv83zoqxiMlnafygmCbDYMPwQe25 h8Uqex0avBMomJs8C4AO63z0T3bHJUgDW48TnVtJQATmpKq+J0arWuXQeXDbCnpelOMwnz l7hYRxSN7z9kuFWDFtQpfOQ196N7tCCfaT+EJmwiVCK1FF0SGNfedp4NDcwiUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184536; a=rsa-sha256; cv=none; b=aHiMgAsJbzNIXsx4xmeMYQpkjtARaFzsQPxf6wC+bGxqkShvXbKQ1oi/lk79gjwxz2Wfrp q4aKebUvTIdLyZ0Ofoa38HWtDh2rQ8CeZ0VG9zf05PyvtIuA8MVSiT+Aqk8CoAGsUIwC8+ 7tqitjqPHf+HkPGs3xgDRVtr9kxGM52np0IXv6ThtCcfl4L0VvX3nmLXnupwhGccKUOt23 2qz27iDH5FS6CBj06oSS34zkTIBDKwEY60szgBJ8i3NPLAG5aWt+ZjJogkRUCnXp5Fatfl 9LfwXAyEk/awJElOKcjvmLpQkt98DVhy4hQM7ySHfR4+/bXc75kmgNNk1nk3qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfmHD5XR1zBrc; Tue, 28 Nov 2023 15:15: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 3ASFFaau093916; Tue, 28 Nov 2023 15:15:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASFFax5093912; Tue, 28 Nov 2023 15:15:36 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:15:36 GMT Message-Id: <202311281515.3ASFFax5093912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 57483047820c - stable/14 - sqlite3: Vendor import of sqlite3 3.44.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 57483047820c01b5664a8bb53fc999cf64534500 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=57483047820c01b5664a8bb53fc999cf64534500 commit 57483047820c01b5664a8bb53fc999cf64534500 Author: Cy Schubert AuthorDate: 2023-11-13 16:50:36 +0000 Commit: Cy Schubert CommitDate: 2023-11-28 15:15:23 +0000 sqlite3: Vendor import of sqlite3 3.44.0 Release notes at https://www.sqlite.org/releaselog/3_44_0.html. Obtained from: https://www.sqlite.org/2023/sqlite-autoconf-3440000.tar.gz Merge commit '3a88fe13354325b9f56f07927e654de4f5398707' (cherry picked from commit 7963e4115453c0aa003023386cbbc635de242150) --- contrib/sqlite3/Makefile.msc | 14 +- contrib/sqlite3/configure | 20 +- contrib/sqlite3/configure.ac | 2 +- contrib/sqlite3/shell.c | 404 ++- contrib/sqlite3/sqlite3.c | 6485 ++++++++++++++++++++++++-------------- contrib/sqlite3/sqlite3.h | 199 +- contrib/sqlite3/sqlite3ext.h | 6 + contrib/sqlite3/sqlite3rc.h | 2 +- contrib/sqlite3/tea/configure | 20 +- contrib/sqlite3/tea/configure.ac | 2 +- 10 files changed, 4661 insertions(+), 2493 deletions(-) diff --git a/contrib/sqlite3/Makefile.msc b/contrib/sqlite3/Makefile.msc index 13663d877757..280bb95deb3e 100644 --- a/contrib/sqlite3/Makefile.msc +++ b/contrib/sqlite3/Makefile.msc @@ -52,8 +52,8 @@ MINIMAL_AMALGAMATION = 0 USE_STDCALL = 0 !ENDIF -# Set this non-0 to use structured exception handling (SEH) for WAL mode -# in the core library. +# Use the USE_SEH=0 option on the nmake command line to omit structured +# exception handling (SEH) support. SEH is on by default. # !IFNDEF USE_SEH USE_SEH = 1 @@ -296,6 +296,7 @@ SQLITE3EXEPDB = /pdb:sqlite3sh.pdb !IFNDEF OPT_FEATURE_FLAGS !IF $(MINIMAL_AMALGAMATION)==0 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS5=1 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_GEOPOLY=1 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1 @@ -325,10 +326,11 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RBU=1 !ENDIF # Should structured exception handling (SEH) be enabled for WAL mode in -# the core library? +# the core library? It is on by default. Only omit it if the +# USE_SEH=0 option is provided on the nmake command-line. # -!IF $(USE_SEH)!=0 -OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_USE_SEH=1 +!IF $(USE_SEH)==0 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_OMIT_SEH=1 !ENDIF # These are the "extended" SQLite compilation options used when compiling for @@ -986,6 +988,8 @@ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_DQS=0 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1 +SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION=1 +SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_STMT_SCANSTATUS=1 !ENDIF diff --git a/contrib/sqlite3/configure b/contrib/sqlite3/configure index 39694c06793b..251e5da23650 100755 --- a/contrib/sqlite3/configure +++ b/contrib/sqlite3/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sqlite 3.43.1. +# Generated by GNU Autoconf 2.71 for sqlite 3.44.0. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.43.1' -PACKAGE_STRING='sqlite 3.43.1' +PACKAGE_VERSION='3.44.0' +PACKAGE_STRING='sqlite 3.44.0' PACKAGE_BUGREPORT='http://www.sqlite.org' PACKAGE_URL='' @@ -1367,7 +1367,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.43.1 to adapt to many kinds of systems. +\`configure' configures sqlite 3.44.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1438,7 +1438,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.43.1:";; + short | recursive ) echo "Configuration of sqlite 3.44.0:";; esac cat <<\_ACEOF @@ -1563,7 +1563,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.43.1 +sqlite configure 3.44.0 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1833,7 +1833,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.43.1, which was +It was created by sqlite $as_me 3.44.0, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3106,7 +3106,7 @@ fi # Define the identity of the package. PACKAGE='sqlite' - VERSION='3.43.1' + VERSION='3.44.0' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -15314,7 +15314,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.43.1, which was +This file was extended by sqlite $as_me 3.44.0, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15373,7 +15373,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -sqlite config.status 3.43.1 +sqlite config.status 3.44.0 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/sqlite3/configure.ac b/contrib/sqlite3/configure.ac index 3d7da8b984c3..cf5fae5d060b 100644 --- a/contrib/sqlite3/configure.ac +++ b/contrib/sqlite3/configure.ac @@ -10,7 +10,7 @@ # AC_PREREQ(2.61) -AC_INIT(sqlite, 3.43.1, http://www.sqlite.org) +AC_INIT(sqlite, 3.44.0, http://www.sqlite.org) AC_CONFIG_SRCDIR([sqlite3.c]) AC_CONFIG_AUX_DIR([.]) diff --git a/contrib/sqlite3/shell.c b/contrib/sqlite3/shell.c index 6b2cdca83d6b..e357f9e9a5f7 100644 --- a/contrib/sqlite3/shell.c +++ b/contrib/sqlite3/shell.c @@ -467,20 +467,25 @@ static int bail_on_error = 0; */ static int stdin_is_interactive = 1; +/* +** If build is for non-RT Windows, without 3rd-party line editing, +** console input and output may be done in a UTF-8 compatible way, +** if the OS is capable of it and the --no-utf8 option is not seen. +*/ #if (defined(_WIN32) || defined(WIN32)) && SHELL_USE_LOCAL_GETLINE \ - && !defined(SHELL_OMIT_WIN_UTF8) + && !defined(SHELL_OMIT_WIN_UTF8) && !SQLITE_OS_WINRT # define SHELL_WIN_UTF8_OPT 1 +/* Record whether to do UTF-8 console I/O translation per stream. */ + static int console_utf8_in = 0; + static int console_utf8_out = 0; +/* Record whether can do UTF-8 or --no-utf8 seen in invocation. */ + static int mbcs_opted = 1; /* Assume cannot do until shown otherwise. */ #else +# define console_utf8_in 0 +# define console_utf8_out 0 # define SHELL_WIN_UTF8_OPT 0 #endif -#if SHELL_WIN_UTF8_OPT -/* -** Setup console for UTF-8 input/output when following variable true. -*/ -static int console_utf8 = 0; -#endif - /* ** On Windows systems we have to know if standard output is a console ** in order to translate UTF-8 into MBCS. The following variable is @@ -614,13 +619,13 @@ static char *dynamicContinuePrompt(void){ #endif /* !defined(SQLITE_OMIT_DYNAPROMPT) */ #if SHELL_WIN_UTF8_OPT -/* Following struct is used for -utf8 operation. */ +/* Following struct is used for UTF-8 console I/O. */ static struct ConsoleState { int stdinEof; /* EOF has been seen on console input */ int infsMode; /* Input file stream mode upon shell start */ UINT inCodePage; /* Input code page upon shell start */ UINT outCodePage; /* Output code page upon shell start */ - HANDLE hConsoleIn; /* Console input handle */ + HANDLE hConsole; /* Console input or output handle */ DWORD consoleMode; /* Console mode upon shell start */ } conState = { 0, 0, 0, 0, INVALID_HANDLE_VALUE, 0 }; @@ -629,50 +634,123 @@ static struct ConsoleState { #endif /* -** Prepare console, (if known to be a WIN32 console), for UTF-8 -** input (from either typing or suitable paste operations) and for -** UTF-8 rendering. This may "fail" with a message to stderr, where -** the preparation is not done and common "code page" issues occur. +** If given stream number is a console, return 1 and get some attributes, +** else return 0 and set the output attributes to invalid values. */ -static void console_prepare(void){ - HANDLE hCI = GetStdHandle(STD_INPUT_HANDLE); - DWORD consoleMode = 0; - if( isatty(0) && GetFileType(hCI)==FILE_TYPE_CHAR - && GetConsoleMode( hCI, &consoleMode) ){ - if( !IsValidCodePage(CP_UTF8) ){ - fprintf(stderr, "Cannot use UTF-8 code page.\n"); - console_utf8 = 0; - return; - } - conState.hConsoleIn = hCI; - conState.consoleMode = consoleMode; - conState.inCodePage = GetConsoleCP(); - conState.outCodePage = GetConsoleOutputCP(); - SetConsoleCP(CP_UTF8); +static short console_attrs(unsigned stnum, HANDLE *pH, DWORD *pConsMode){ + static int stid[3] = { STD_INPUT_HANDLE,STD_OUTPUT_HANDLE,STD_ERROR_HANDLE }; + HANDLE h; + *pH = INVALID_HANDLE_VALUE; + *pConsMode = 0; + if( stnum > 2 ) return 0; + h = GetStdHandle(stid[stnum]); + if( h!=*pH && GetFileType(h)==FILE_TYPE_CHAR && GetConsoleMode(h,pConsMode) ){ + *pH = h; + return 1; + } + return 0; +} + +/* +** Perform a runtime test of Windows console to determine if it can +** do char-stream I/O correctly when the code page is set to CP_UTF8. +** Returns are: 1 => yes it can, 0 => no it cannot +** +** The console's output code page is momentarily set, then restored. +** So this should only be run when the process is given use of the +** console for either input or output. +*/ +static short ConsoleDoesUTF8(void){ + UINT ocp = GetConsoleOutputCP(); + const char TrialUtf8[] = { '\xC8', '\xAB' }; /* "ȫ" or 2 MBCS characters */ + WCHAR aReadBack[1] = { 0 }; /* Read back as 0x022B when decoded as UTF-8. */ + CONSOLE_SCREEN_BUFFER_INFO csbInfo = {0}; + /* Create an inactive screen buffer with which to do the experiment. */ + HANDLE hCSB = CreateConsoleScreenBuffer(GENERIC_READ|GENERIC_WRITE, 0, 0, + CONSOLE_TEXTMODE_BUFFER, NULL); + if( hCSB!=INVALID_HANDLE_VALUE ){ + COORD cpos = {0,0}; + DWORD rbc; + SetConsoleCursorPosition(hCSB, cpos); SetConsoleOutputCP(CP_UTF8); - consoleMode |= ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT; - SetConsoleMode(conState.hConsoleIn, consoleMode); + /* Write 2 chars which are a single character in UTF-8 but more in MBCS. */ + WriteConsoleA(hCSB, TrialUtf8, sizeof(TrialUtf8), NULL, NULL); + ReadConsoleOutputCharacterW(hCSB, &aReadBack[0], 1, cpos, &rbc); + GetConsoleScreenBufferInfo(hCSB, &csbInfo); + SetConsoleOutputCP(ocp); + CloseHandle(hCSB); + } + /* Return 1 if cursor advanced by 1 position, else 0. */ + return (short)(csbInfo.dwCursorPosition.X == 1 && aReadBack[0] == 0x022B); +} + +static short in_console = 0; +static short out_console = 0; + +/* +** Determine whether either normal I/O stream is the console, +** and whether it can do UTF-8 translation, setting globals +** in_console, out_console and mbcs_opted accordingly. +*/ +static void probe_console(void){ + HANDLE h; + DWORD cMode; + in_console = console_attrs(0, &h, &cMode); + out_console = console_attrs(1, &h, &cMode); + if( in_console || out_console ) mbcs_opted = !ConsoleDoesUTF8(); +} + +/* +** If console is used for normal I/O, absent a --no-utf8 option, +** prepare console for UTF-8 input (from either typing or suitable +** paste operations) and/or for UTF-8 output rendering. +** +** The console state upon entry is preserved, in conState, so that +** console_restore() can later restore the same console state. +** +** The globals console_utf8_in and console_utf8_out are set, for +** later use in selecting UTF-8 or MBCS console I/O translations. +** This routine depends upon globals set by probe_console(). +*/ +static void console_prepare_utf8(void){ + struct ConsoleState csWork = { 0, 0, 0, 0, INVALID_HANDLE_VALUE, 0 }; + + console_utf8_in = console_utf8_out = 0; + if( (!in_console && !out_console) || mbcs_opted ) return; + console_attrs((in_console)? 0 : 1, &conState.hConsole, &conState.consoleMode); + conState.inCodePage = GetConsoleCP(); + conState.outCodePage = GetConsoleOutputCP(); + if( in_console ){ + SetConsoleCP(CP_UTF8); + DWORD newConsoleMode = conState.consoleMode + | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT; + SetConsoleMode(conState.hConsole, newConsoleMode); conState.infsMode = _setmode(_fileno(stdin), _O_U16TEXT); - console_utf8 = 1; - }else{ - console_utf8 = 0; + console_utf8_in = 1; + } + if( out_console ){ + SetConsoleOutputCP(CP_UTF8); + console_utf8_out = 1; } } /* -** Undo the effects of console_prepare(), if any. +** Undo the effects of console_prepare_utf8(), if any. */ static void SQLITE_CDECL console_restore(void){ - if( console_utf8 && conState.inCodePage!=0 - && conState.hConsoleIn!=INVALID_HANDLE_VALUE ){ - _setmode(_fileno(stdin), conState.infsMode); - SetConsoleCP(conState.inCodePage); - SetConsoleOutputCP(conState.outCodePage); - SetConsoleMode(conState.hConsoleIn, conState.consoleMode); + if( (console_utf8_in||console_utf8_out) + && conState.hConsole!=INVALID_HANDLE_VALUE ){ + if( console_utf8_in ){ + SetConsoleCP(conState.inCodePage); + _setmode(_fileno(stdin), conState.infsMode); + } + if( console_utf8_out ) SetConsoleOutputCP(conState.outCodePage); + SetConsoleMode(conState.hConsole, conState.consoleMode); /* Avoid multiple calls. */ - conState.hConsoleIn = INVALID_HANDLE_VALUE; + conState.hConsole = INVALID_HANDLE_VALUE; conState.consoleMode = 0; - console_utf8 = 0; + console_utf8_in = 0; + console_utf8_out = 0; } } @@ -680,11 +758,11 @@ static void SQLITE_CDECL console_restore(void){ ** Collect input like fgets(...) with special provisions for input ** from the Windows console to get around its strange coding issues. ** Defers to plain fgets() when input is not interactive or when the -** startup option, -utf8, has not been provided or taken effect. +** UTF-8 input is unavailable or opted out. */ static char* utf8_fgets(char *buf, int ncmax, FILE *fin){ if( fin==0 ) fin = stdin; - if( fin==stdin && stdin_is_interactive && console_utf8 ){ + if( fin==stdin && stdin_is_interactive && console_utf8_in ){ # define SQLITE_IALIM 150 wchar_t wbuf[SQLITE_IALIM]; int lend = 0; @@ -697,7 +775,7 @@ static char* utf8_fgets(char *buf, int ncmax, FILE *fin){ ? SQLITE_IALIM : (ncmax-1 - noc)/4; # undef SQLITE_IALIM DWORD nbr = 0; - BOOL bRC = ReadConsoleW(conState.hConsoleIn, wbuf, na, &nbr, 0); + BOOL bRC = ReadConsoleW(conState.hConsole, wbuf, na, &nbr, 0); if( !bRC || (noc==0 && nbr==0) ) return 0; if( nbr > 0 ){ int nmb = WideCharToMultiByte(CP_UTF8,WC_COMPOSITECHECK|WC_DEFAULTCHAR, @@ -743,20 +821,16 @@ static char* utf8_fgets(char *buf, int ncmax, FILE *fin){ /* ** Render output like fprintf(). Except, if the output is going to the -** console and if this is running on a Windows machine, and if the -utf8 -** option is unavailable or (available and inactive), translate the +** console and if this is running on a Windows machine, and if UTF-8 +** output unavailable (or available but opted out), translate the ** output from UTF-8 into MBCS for output through 8-bit stdout stream. -** (With -utf8 active, no translation is needed and must not be done.) +** (Without -no-utf8, no translation is needed and must not be done.) */ #if defined(_WIN32) || defined(WIN32) void utf8_printf(FILE *out, const char *zFormat, ...){ va_list ap; va_start(ap, zFormat); - if( stdout_is_console && (out==stdout || out==stderr) -# if SHELL_WIN_UTF8_OPT - && !console_utf8 -# endif - ){ + if( stdout_is_console && (out==stdout || out==stderr) && !console_utf8_out ){ char *z1 = sqlite3_vmprintf(zFormat, ap); char *z2 = sqlite3_win32_utf8_to_mbcs_v2(z1, 0); sqlite3_free(z1); @@ -967,14 +1041,10 @@ static char *local_getline(char *zLine, FILE *in){ } } #if defined(_WIN32) || defined(WIN32) - /* For interactive input on Windows systems, without -utf8, + /* For interactive input on Windows systems, with -no-utf8, ** translate the multi-byte characterset characters into UTF-8. - ** This is the translation that predates the -utf8 option. */ - if( stdin_is_interactive && in==stdin -# if SHELL_WIN_UTF8_OPT - && !console_utf8 -# endif /* SHELL_WIN_UTF8_OPT */ - ){ + ** This is the translation that predates console UTF-8 input. */ + if( stdin_is_interactive && in==stdin && !console_utf8_in ){ char *zTrans = sqlite3_win32_mbcs_to_utf8_v2(zLine, 0); if( zTrans ){ i64 nTrans = strlen(zTrans)+1; @@ -1260,7 +1330,7 @@ static void shellDtostr( char z[400]; if( n<1 ) n = 1; if( n>350 ) n = 350; - sprintf(z, "%#+.*e", n, r); + snprintf(z, sizeof(z)-1, "%#+.*e", n, r); sqlite3_result_text(pCtx, z, -1, SQLITE_TRANSIENT); } @@ -5372,7 +5442,8 @@ static sqlite3_module seriesModule = { 0, /* xSavepoint */ 0, /* xRelease */ 0, /* xRollbackTo */ - 0 /* xShadowName */ + 0, /* xShadowName */ + 0 /* xIntegrity */ }; #endif /* SQLITE_OMIT_VIRTUALTABLE */ @@ -7270,6 +7341,7 @@ static int fsdirRegister(sqlite3 *db){ 0, /* xRelease */ 0, /* xRollbackTo */ 0, /* xShadowName */ + 0 /* xIntegrity */ }; int rc = sqlite3_create_module(db, "fsdir", &fsdirModule, 0); @@ -7790,7 +7862,8 @@ static sqlite3_module completionModule = { 0, /* xSavepoint */ 0, /* xRelease */ 0, /* xRollbackTo */ - 0 /* xShadowName */ + 0, /* xShadowName */ + 0 /* xIntegrity */ }; #endif /* SQLITE_OMIT_VIRTUALTABLE */ @@ -8530,6 +8603,7 @@ SQLITE_EXTENSION_INIT1 #include #include #include +#include #include @@ -10701,7 +10775,8 @@ static int zipfileRegister(sqlite3 *db){ 0, /* xSavepoint */ 0, /* xRelease */ 0, /* xRollback */ - 0 /* xShadowName */ + 0, /* xShadowName */ + 0 /* xIntegrity */ }; int rc = sqlite3_create_module(db, "zipfile" , &zipfileModule, 0); @@ -11070,7 +11145,7 @@ void sqlite3_expert_destroy(sqlite3expert*); #endif /* !defined(SQLITE_AMALGAMATION) */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef SQLITE_OMIT_VIRTUALTABLE /* typedef sqlite3_int64 i64; */ /* typedef sqlite3_uint64 u64; */ @@ -11700,6 +11775,7 @@ static int idxRegisterVtab(sqlite3expert *p){ 0, /* xRelease */ 0, /* xRollbackTo */ 0, /* xShadowName */ + 0, /* xIntegrity */ }; return sqlite3_create_module(p->dbv, "expert", &expertModule, (void*)p); @@ -12856,6 +12932,88 @@ static int idxPopulateStat1(sqlite3expert *p, char **pzErr){ return rc; } +/* +** Define and possibly pretend to use a useless collation sequence. +** This pretense allows expert to accept SQL using custom collations. +*/ +int dummyCompare(void *up1, int up2, const void *up3, int up4, const void *up5){ + (void)up1; + (void)up2; + (void)up3; + (void)up4; + (void)up5; + assert(0); /* VDBE should never be run. */ + return 0; +} +/* And a callback to register above upon actual need */ +void useDummyCS(void *up1, sqlite3 *db, int etr, const char *zName){ + (void)up1; + sqlite3_create_collation_v2(db, zName, etr, 0, dummyCompare, 0); +} + +#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) \ + && !defined(SQLITE_OMIT_INTROSPECTION_PRAGMAS) +/* +** dummy functions for no-op implementation of UDFs during expert's work +*/ +void dummyUDF(sqlite3_context *up1, int up2, sqlite3_value **up3){ + (void)up1; + (void)up2; + (void)up3; + assert(0); /* VDBE should never be run. */ +} +void dummyUDFvalue(sqlite3_context *up1){ + (void)up1; + assert(0); /* VDBE should never be run. */ +} + +/* +** Register UDFs from user database with another. +*/ +int registerUDFs(sqlite3 *dbSrc, sqlite3 *dbDst){ + sqlite3_stmt *pStmt; + int rc = sqlite3_prepare_v2(dbSrc, + "SELECT name,type,enc,narg,flags " + "FROM pragma_function_list() " + "WHERE builtin==0", -1, &pStmt, 0); + if( rc==SQLITE_OK ){ + while( SQLITE_ROW==(rc = sqlite3_step(pStmt)) ){ + int nargs = sqlite3_column_int(pStmt,3); + int flags = sqlite3_column_int(pStmt,4); + const char *name = (char*)sqlite3_column_text(pStmt,0); + const char *type = (char*)sqlite3_column_text(pStmt,1); + const char *enc = (char*)sqlite3_column_text(pStmt,2); + if( name==0 || type==0 || enc==0 ){ + /* no-op. Only happens on OOM */ + }else{ + int ienc = SQLITE_UTF8; + int rcf = SQLITE_ERROR; + if( strcmp(enc,"utf16le")==0 ) ienc = SQLITE_UTF16LE; + else if( strcmp(enc,"utf16be")==0 ) ienc = SQLITE_UTF16BE; + ienc |= (flags & (SQLITE_DETERMINISTIC|SQLITE_DIRECTONLY)); + if( strcmp(type,"w")==0 ){ + rcf = sqlite3_create_window_function(dbDst,name,nargs,ienc,0, + dummyUDF,dummyUDFvalue,0,0,0); + }else if( strcmp(type,"a")==0 ){ + rcf = sqlite3_create_function(dbDst,name,nargs,ienc,0, + 0,dummyUDF,dummyUDFvalue); + }else if( strcmp(type,"s")==0 ){ + rcf = sqlite3_create_function(dbDst,name,nargs,ienc,0, + dummyUDF,0,0); + } + if( rcf!=SQLITE_OK ){ + rc = rcf; + break; + } + } + } + sqlite3_finalize(pStmt); + if( rc==SQLITE_DONE ) rc = SQLITE_OK; + } + return rc; +} +#endif + /* ** Allocate a new sqlite3expert object. */ @@ -12882,7 +13040,21 @@ sqlite3expert *sqlite3_expert_new(sqlite3 *db, char **pzErrmsg){ sqlite3_db_config(pNew->dbm, SQLITE_DBCONFIG_TRIGGER_EQP, 1, (int*)0); } } - + + /* Allow custom collations to be dealt with through prepare. */ + if( rc==SQLITE_OK ) rc = sqlite3_collation_needed(pNew->dbm,0,useDummyCS); + if( rc==SQLITE_OK ) rc = sqlite3_collation_needed(pNew->dbv,0,useDummyCS); + +#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) \ + && !defined(SQLITE_OMIT_INTROSPECTION_PRAGMAS) + /* Register UDFs from database [db] with [dbm] and [dbv]. */ + if( rc==SQLITE_OK ){ + rc = registerUDFs(pNew->db, pNew->dbm); + } + if( rc==SQLITE_OK ){ + rc = registerUDFs(pNew->db, pNew->dbv); + } +#endif /* Copy the entire schema of database [db] into [dbm]. */ if( rc==SQLITE_OK ){ @@ -12958,6 +13130,10 @@ int sqlite3_expert_sql( while( rc==SQLITE_OK && zStmt && zStmt[0] ){ sqlite3_stmt *pStmt = 0; + /* Ensure that the provided statement compiles against user's DB. */ + rc = idxPrepareStmt(p->db, &pStmt, pzErr, zStmt); + if( rc!=SQLITE_OK ) break; + sqlite3_finalize(pStmt); rc = sqlite3_prepare_v2(p->dbv, zStmt, -1, &pStmt, &zStmt); if( rc==SQLITE_OK ){ if( pStmt ){ @@ -14282,7 +14458,8 @@ static int sqlite3DbdataRegister(sqlite3 *db){ 0, /* xSavepoint */ 0, /* xRelease */ 0, /* xRollbackTo */ - 0 /* xShadowName */ + 0, /* xShadowName */ + 0 /* xIntegrity */ }; int rc = sqlite3_create_module(db, "sqlite_dbdata", &dbdata_module, 0); @@ -19154,7 +19331,7 @@ static void display_explain_scanstats( if( sqlite3_stmt_scanstatus_v2(p,ii,SQLITE_SCANSTAT_EXPLAIN,f,(void*)&z) ){ break; } - n = strlen(z) + scanStatsHeight(p, ii)*3; + n = (int)strlen(z) + scanStatsHeight(p, ii)*3; if( n>nWidth ) nWidth = n; } nWidth += 4; @@ -19166,12 +19343,12 @@ static void display_explain_scanstats( i64 nCycle = 0; int iId = 0; int iPid = 0; - const char *z = 0; + const char *zo = 0; const char *zName = 0; char *zText = 0; double rEst = 0.0; - if( sqlite3_stmt_scanstatus_v2(p,ii,SQLITE_SCANSTAT_EXPLAIN,f,(void*)&z) ){ + if( sqlite3_stmt_scanstatus_v2(p,ii,SQLITE_SCANSTAT_EXPLAIN,f,(void*)&zo) ){ break; } sqlite3_stmt_scanstatus_v2(p, ii, SQLITE_SCANSTAT_EST,f,(void*)&rEst); @@ -19182,7 +19359,7 @@ static void display_explain_scanstats( sqlite3_stmt_scanstatus_v2(p, ii, SQLITE_SCANSTAT_PARENTID,f,(void*)&iPid); sqlite3_stmt_scanstatus_v2(p, ii, SQLITE_SCANSTAT_NAME,f,(void*)&zName); - zText = sqlite3_mprintf("%s", z); + zText = sqlite3_mprintf("%s", zo); if( nCycle>=0 || nLoop>=0 || nRow>=0 ){ char *z = 0; if( nCycle>=0 && nTotal>0 ){ @@ -23830,7 +24007,6 @@ static int do_meta_command(char *zLine, ShellState *p){ azArg[nArg++] = &zLine[h]; while( zLine[h] && !IsSpace(zLine[h]) ){ h++; } if( zLine[h] ) zLine[h++] = 0; - resolve_backslashes(azArg[nArg-1]); } } azArg[nArg] = 0; @@ -24569,8 +24745,10 @@ static int do_meta_command(char *zLine, ShellState *p){ "SELECT rowid FROM sqlite_schema" " WHERE name GLOB 'sqlite_stat[134]'", -1, &pStmt, 0); - doStats = sqlite3_step(pStmt)==SQLITE_ROW; - sqlite3_finalize(pStmt); + if( rc==SQLITE_OK ){ + doStats = sqlite3_step(pStmt)==SQLITE_ROW; + sqlite3_finalize(pStmt); + } } if( doStats==0 ){ raw_printf(p->out, "/* No STAT tables available */\n"); @@ -24859,6 +25037,14 @@ static int do_meta_command(char *zLine, ShellState *p){ ** the remaining columns. */ if( p->mode==MODE_Ascii && (z==0 || z[0]==0) && i==0 ) break; + /* + ** For CSV mode, per RFC 4180, accept EOF in lieu of final + ** record terminator but only for last field of multi-field row. + ** (If there are too few fields, it's not valid CSV anyway.) + */ + if( z==0 && (xRead==csv_read_one_field) && i==nCol-1 && i>0 ){ + z = ""; + } sqlite3_bind_text(pStmt, i+1, z, -1, SQLITE_TRANSIENT); if( idb, opt); @@ -27720,6 +27908,9 @@ static const char zOptions[] = " -multiplex enable the multiplexor VFS\n" #endif " -newline SEP set output row separator. Default: '\\n'\n" +#if SHELL_WIN_UTF8_OPT + " -no-utf8 do not try to set up UTF-8 output (for legacy)\n" +#endif " -nofollow refuse to open symbolic links to database files\n" " -nonce STRING set the safe-mode escape nonce\n" " -nullvalue TEXT set text string for NULL values. Default ''\n" @@ -27736,7 +27927,7 @@ static const char zOptions[] = " -table set output mode to 'table'\n" " -tabs set output mode to 'tabs'\n" " -unsafe-testing allow unsafe commands and modes for testing\n" -#if SHELL_WIN_UTF8_OPT +#if SHELL_WIN_UTF8_OPT && 0 /* Option is accepted, but is now the default. */ " -utf8 setup interactive console code page for UTF-8\n" #endif " -version show SQLite version\n" @@ -27887,7 +28078,8 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ stdout_is_console = isatty(1); #endif #if SHELL_WIN_UTF8_OPT - atexit(console_restore); /* Needs revision for CLI as library call */ + probe_console(); /* Check for console I/O and UTF-8 capability. */ + if( !mbcs_opted ) atexit(console_restore); #endif atexit(sayAbnormalExit); #ifdef SQLITE_DEBUG @@ -27974,8 +28166,8 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ /* Do an initial pass through the command-line argument to locate ** the name of the database file, the name of the initialization file, - ** the size of the alternative malloc heap, - ** and the first command to execute. + ** the size of the alternative malloc heap, options affecting commands + ** or SQL run from the command line, and the first command to execute. */ #ifndef SQLITE_SHELL_FIDDLE verify_uninitialized(); @@ -28009,12 +28201,26 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ (void)cmdline_option_value(argc, argv, ++i); }else if( cli_strcmp(z,"-init")==0 ){ zInitFile = cmdline_option_value(argc, argv, ++i); + }else if( cli_strcmp(z,"-interactive")==0 ){ + /* Need to check for interactive override here to so that it can + ** affect console setup (for Windows only) and testing thereof. + */ + stdin_is_interactive = 1; }else if( cli_strcmp(z,"-batch")==0 ){ /* Need to check for batch mode here to so we can avoid printing ** informational messages (like from process_sqliterc) before ** we do the actual processing of arguments later in a second pass. */ stdin_is_interactive = 0; + }else if( cli_strcmp(z,"-utf8")==0 ){ +#if SHELL_WIN_UTF8_OPT + /* Option accepted, but is ignored except for this diagnostic. */ + if( mbcs_opted ) fprintf(stderr, "Cannot do UTF-8 at this console.\n"); +#endif /* SHELL_WIN_UTF8_OPT */ + }else if( cli_strcmp(z,"-no-utf8")==0 ){ +#if SHELL_WIN_UTF8_OPT + mbcs_opted = 1; +#endif /* SHELL_WIN_UTF8_OPT */ }else if( cli_strcmp(z,"-heap")==0 ){ #if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5) const char *zSize; @@ -28153,6 +28359,15 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ exit(1); } } +#if SHELL_WIN_UTF8_OPT + /* Get indicated Windows console setup done before running invocation commands. */ + if( in_console || out_console ){ + console_prepare_utf8(); + } + if( !in_console ){ + setBinaryMode(stdin, 0); + } +#endif if( data.pAuxDb->zDbFilename==0 ){ #ifndef SQLITE_OMIT_MEMORYDB @@ -28280,13 +28495,13 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ 8*(int)sizeof(char*)); return 0; }else if( cli_strcmp(z,"-interactive")==0 ){ - stdin_is_interactive = 1; + /* already handled */ }else if( cli_strcmp(z,"-batch")==0 ){ - stdin_is_interactive = 0; + /* already handled */ }else if( cli_strcmp(z,"-utf8")==0 ){ -#if SHELL_WIN_UTF8_OPT - console_utf8 = 1; -#endif /* SHELL_WIN_UTF8_OPT */ + /* already handled */ + }else if( cli_strcmp(z,"-no-utf8")==0 ){ + /* already handled */ }else if( cli_strcmp(z,"-heap")==0 ){ i++; }else if( cli_strcmp(z,"-pagecache")==0 ){ @@ -28368,14 +28583,6 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ } data.cMode = data.mode; } -#if SHELL_WIN_UTF8_OPT - if( console_utf8 && stdin_is_interactive ){ - console_prepare(); - }else{ - setBinaryMode(stdin, 0); - console_utf8 = 0; - } -#endif if( !readStdin ){ /* Run all arguments that do not begin with '-' as if they were separate @@ -28411,11 +28618,20 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ if( stdin_is_interactive ){ char *zHome; char *zHistory; + const char *zCharset = ""; int nHistory; +#if SHELL_WIN_UTF8_OPT + switch( console_utf8_in+2*console_utf8_out ){ + default: case 0: break; + case 1: zCharset = " (utf8 in)"; break; + case 2: zCharset = " (utf8 out)"; break; + case 3: zCharset = " (utf8 I/O)"; break; + } +#endif printf( - "SQLite version %s %.19s\n" /*extra-version-info*/ + "SQLite version %s %.19s%s\n" /*extra-version-info*/ "Enter \".help\" for usage hints.\n", - sqlite3_libversion(), sqlite3_sourceid() + sqlite3_libversion(), sqlite3_sourceid(), zCharset ); if( warnInmemoryDb ){ printf("Connected to a "); diff --git a/contrib/sqlite3/sqlite3.c b/contrib/sqlite3/sqlite3.c index 1884b0823969..8f9309a8ba7e 100644 --- a/contrib/sqlite3/sqlite3.c +++ b/contrib/sqlite3/sqlite3.c @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.43.1. By combining all the individual C code files into this +** version 3.44.0. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -18,7 +18,7 @@ ** separate file. This file contains only code for the core SQLite library. ** ** The content in this amalgamation comes from Fossil check-in -** d3a40c05c49e1a49264912b1a05bc2143ac. +** 17129ba1ff7f0daf37100ee82d507aef7827. */ #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 @@ -459,9 +459,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.43.1" -#define SQLITE_VERSION_NUMBER 3043001 -#define SQLITE_SOURCE_ID "2023-09-11 12:01:27 2d3a40c05c49e1a49264912b1a05bc2143ac0e7c3df588276ce80a4cbc9bd1b0" +#define SQLITE_VERSION "3.44.0" +#define SQLITE_VERSION_NUMBER 3044000 +#define SQLITE_SOURCE_ID "2023-11-01 11:23:50 17129ba1ff7f0daf37100ee82d507aef7827cf38de1866e2633096ae6ad81301" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -2440,7 +2440,7 @@ struct sqlite3_mem_methods { ** is stored in each sorted record and the required column values loaded ** from the database as records are returned in sorted order. The default ** value for this option is to never use this optimization. Specifying a -** negative value for this option restores the default behaviour. +** negative value for this option restores the default behavior. ** This option is only available if SQLite is compiled with the ** [SQLITE_ENABLE_SORTER_REFERENCES] compile-time option. ** @@ -2615,7 +2615,7 @@ struct sqlite3_mem_methods { ** database handle, SQLite checks if this will mean that there are now no ** connections at all to the database. If so, it performs a checkpoint ** operation before closing the connection. This option may be used to -** override this behaviour. The first parameter passed to this operation +** override this behavior. The first parameter passed to this operation ** is an integer - positive to disable checkpoints-on-close, or zero (the ** default) to enable them, and negative to leave the setting unchanged. ** The second parameter is a pointer to an integer @@ -4268,6 +4268,7 @@ SQLITE_API void sqlite3_free_filename(sqlite3_filename); ** ** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language ** text that describes the error, as either UTF-8 or UTF-16 respectively. +** (See how SQLite handles [invalid UTF] for exceptions to this rule.) ** ^(Memory to hold the error message string is managed internally. ** The application does not need to worry about freeing the result. ** However, the error string might be overwritten or deallocated by @@ -5638,6 +5639,7 @@ SQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt); */ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt); + /* ** CAPI3REF: Create Or Redefine SQL Functions ** KEYWORDS: {function creation routines} @@ -6192,32 +6194,32 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*); ** METHOD: sqlite3_context ** ** These functions may be used by (non-aggregate) SQL functions to -** associate metadata with argument values. If the same value is passed to -** multiple invocations of the same SQL function during query execution, under -** some circumstances the associated metadata may be preserved. An example -** of where this might be useful is in a regular-expression matching -** function. The compiled version of the regular expression can be stored as -** metadata associated with the pattern string. +** associate auxiliary data with argument values. If the same argument +** value is passed to multiple invocations of the same SQL function during +** query execution, under some circumstances the associated auxiliary data +** might be preserved. An example of where this might be useful is in a +** regular-expression matching function. The compiled version of the regular +** expression can be stored as auxiliary data associated with the pattern string. ** Then as long as the pattern string remains the same, ** the compiled regular expression can be reused on multiple ** invocations of the same function. ** -** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the metadata +** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the auxiliary data ** associated by the sqlite3_set_auxdata(C,N,P,X) function with the Nth argument ** value to the application-defined function. ^N is zero for the left-most -** function argument. ^If there is no metadata +** function argument. ^If there is no auxiliary data ** associated with the function argument, the sqlite3_get_auxdata(C,N) interface ** returns a NULL pointer. ** -** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as metadata for the N-th -** argument of the application-defined function. ^Subsequent +** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as auxiliary data for the +** N-th argument of the application-defined function. ^Subsequent *** 10434 LINES SKIPPED *** From nobody Tue Nov 28 15:15:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmHG27hkz53DNn; Tue, 28 Nov 2023 15:15: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 4SfmHG1BqVz3H17; Tue, 28 Nov 2023 15:15:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BzjrtekJfqFUWVgXEq4nT4BQb2tUyMRRk1EBgUY8mSo=; b=l2/OHwBDW8wE+umqAiGbrlYdXMVHWUx36IakQc3E5UQM8ImTR0yyS+AGQPYPaYiCE9X3uT OUk66+IRA0yyhIAQvYosG3VfORmr+HiKtqv768KJV1LCurzzoMH2BweaMoiGqtykIkmbdn WmP9nKe661KuYEm4FPIUnRvk0JS8xGnChL4ktatk4u++Zww5DpGTS2tusdZZ+GNAU76DD5 BE8/SlOi6qoFTE8K2Ug6PiliLrNklBjKYtmAnqPs/M/RDdHkxDY95u9q2dIcEzncZ3N7qM zuWRUaQhczJTRwHyDMqu7K2IT7Y64gflAOGKTzFyVNLGvz38KxkpiPoLn8Fz3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BzjrtekJfqFUWVgXEq4nT4BQb2tUyMRRk1EBgUY8mSo=; b=IXtf/+cCRPbCouWNRvFr9tF+ikK7a6OcHztDytZOHzz4fTGSvzd3KDSwwsfDFTrOSXQdc1 HMsKE52eJbl2xhj7ql1zPPgT9BeeQijC9+LGeH0eqItFiVh8wao+iqWQmiLhJ8P2WXJaAA s58sa4t29tsdLyQrTgSQ7ujitiQMzO8gT1KRToboXFHnw9lqpqoT8Y4Dzu5yQCb4yeGaTU WDQV4RxWNdyOhEbEPGqV75hKY+5I4GkSSgLIj150Lf8uBwszhCFFSuyvy3T9X8+Ifiyi3E RP4409RVSorw7es3rgahKR/3v76BdWZ2bgv+YqD4/oY2OuYtydGCNa6gZcUG4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184538; a=rsa-sha256; cv=none; b=iv2VxtdhxjfNIH4ckXQ9EM5qv95soxKARDHzN/6KDHZLN6jlpqzCUuws7nYj8HLFtiQHY1 OhBGT4lcQ+yrJlUF+bu6ELgJGqN/YSKxC+7UnECamt+X0eOs5xZYjhuGjP4rHnp0+V4Z+c smOh19tsPPoyTcb3R0EaeTeuCUK/v9AkzopfEsq7dxXgHHDREVJgs52jIktNzvhaNEkcV3 mhuht3OTEeSQ/u9m9VrsbIx5UcvH7wMcXxeULpfXSCLfnMxTyFhSJh96M2/tlWg44H618N sl+FBS21m8MCOalBh8WtZtLFtOHALR37lgYU+wqjmE6yTzBcrx+J3TFJlIqzQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfmHF72MTzBp4; Tue, 28 Nov 2023 15:15: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 3ASFFbni093955; Tue, 28 Nov 2023 15:15:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASFFbj6093952; Tue, 28 Nov 2023 15:15:37 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:15:37 GMT Message-Id: <202311281515.3ASFFbj6093952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 4631a5104763 - stable/14 - unbound: Vendor import 1.19.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4631a5104763c01123dad62546b1325cb16bf44c Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4631a5104763c01123dad62546b1325cb16bf44c commit 4631a5104763c01123dad62546b1325cb16bf44c Author: Cy Schubert AuthorDate: 2023-11-13 21:38:45 +0000 Commit: Cy Schubert CommitDate: 2023-11-28 15:15:24 +0000 unbound: Vendor import 1.19.0 Release notes at https://www.nlnetlabs.nl/news/2023/Aug/30/unbound-1.19.0-released/ Merge commit '16fd0b24910488e59ca1941387b9ac7fb646a837' into unbound (cherry picked from commit 103ba509e72e3949d22485666949e9705d4af8cd) --- contrib/unbound/.gitignore | 1 - contrib/unbound/Makefile.in | 4 +- contrib/unbound/README.md | 6 +- contrib/unbound/cachedb/cachedb.c | 11 +- contrib/unbound/cachedb/redis.c | 68 +- contrib/unbound/config.guess | 8 +- contrib/unbound/config.h.in~ | 1456 ++++++++++++++++++++ contrib/unbound/config.sub | 155 ++- contrib/unbound/configure | 632 +++------ contrib/unbound/configure.ac | 17 +- contrib/unbound/daemon/remote.c | 35 +- contrib/unbound/daemon/worker.c | 8 + contrib/unbound/dns64/dns64.c | 99 +- contrib/unbound/dnstap/dnstap.m4 | 2 +- contrib/unbound/dnstap/dtstream.c | 8 +- contrib/unbound/dnstap/unbound-dnstap-socket.c | 12 +- contrib/unbound/doc/Changelog | 154 ++- contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf.in | 11 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 32 +- contrib/unbound/dynlibmod/dynlibmod.c | 3 +- contrib/unbound/edns-subnet/subnetmod.c | 30 +- contrib/unbound/edns-subnet/subnetmod.h | 7 + contrib/unbound/ipset/ipset.c | 4 +- contrib/unbound/iterator/iter_priv.c | 26 +- contrib/unbound/iterator/iter_resptype.c | 25 +- contrib/unbound/iterator/iter_resptype.h | 4 +- contrib/unbound/iterator/iter_scrub.c | 67 +- contrib/unbound/iterator/iter_scrub.h | 5 +- contrib/unbound/iterator/iterator.c | 74 +- contrib/unbound/iterator/iterator.h | 7 + contrib/unbound/libunbound/libworker.c | 4 + contrib/unbound/services/authzone.c | 11 +- contrib/unbound/services/listen_dnsport.c | 8 +- contrib/unbound/services/mesh.c | 9 +- contrib/unbound/services/outside_network.c | 2 +- contrib/unbound/services/rpz.c | 10 +- contrib/unbound/sldns/str2wire.c | 21 +- contrib/unbound/sldns/wire2str.c | 82 ++ contrib/unbound/sldns/wire2str.h | 13 + contrib/unbound/smallapp/unbound-checkconf.c | 17 + .../cachedb_no_store.tdir/cachedb_no_store.conf | 29 + .../cachedb_no_store.tdir/cachedb_no_store.dsc | 16 + .../cachedb_no_store.tdir/cachedb_no_store.post | 20 + .../cachedb_no_store.tdir/cachedb_no_store.pre | 36 + .../cachedb_no_store.servfail.testns | 8 + .../cachedb_no_store.tdir/cachedb_no_store.test | 132 ++ .../cachedb_no_store.tdir/cachedb_no_store.testns | 9 + contrib/unbound/testdata/disable_edns_do.rpl | 164 +++ contrib/unbound/testdata/iter_ignore_empty.rpl | 50 + contrib/unbound/testdata/iter_scrub_rr_length.rpl | 298 ++++ .../testdata/root_zonemd.tdir/root_zonemd.conf | 34 + .../testdata/root_zonemd.tdir/root_zonemd.dsc | 16 + .../testdata/root_zonemd.tdir/root_zonemd.post | 14 + .../testdata/root_zonemd.tdir/root_zonemd.pre | 50 + .../testdata/root_zonemd.tdir/root_zonemd.test | 51 + .../testdata/root_zonemd.tdir/root_zonemd.testns | 9 + contrib/unbound/testdata/rpz_cached_cname.rpl | 122 ++ contrib/unbound/testdata/subnet_prezero.crpl | 155 +++ contrib/unbound/testdata/val_scrub_rr_length.rpl | 164 +++ contrib/unbound/util/config_file.c | 10 + contrib/unbound/util/config_file.h | 6 + contrib/unbound/util/configlexer.lex | 3 + contrib/unbound/util/configparser.y | 45 +- contrib/unbound/util/data/msgencode.c | 4 +- contrib/unbound/util/data/msgparse.c | 25 + contrib/unbound/util/data/msgparse.h | 18 + contrib/unbound/util/fptr_wlist.c | 2 + contrib/unbound/util/log.c | 2 +- contrib/unbound/util/module.c | 18 + contrib/unbound/util/module.h | 10 + contrib/unbound/util/net_help.c | 108 +- contrib/unbound/util/net_help.h | 18 + contrib/unbound/util/netevent.c | 102 +- contrib/unbound/util/proxy_protocol.c | 162 ++- contrib/unbound/util/proxy_protocol.h | 66 +- contrib/unbound/util/rfc_1982.c | 1 + contrib/unbound/util/siphash.c | 5 + contrib/unbound/validator/val_anchor.c | 21 + contrib/unbound/validator/val_anchor.h | 8 + contrib/unbound/validator/validator.c | 11 + 87 files changed, 4408 insertions(+), 780 deletions(-) diff --git a/contrib/unbound/.gitignore b/contrib/unbound/.gitignore deleted file mode 100644 index b25c15b81fae..000000000000 --- a/contrib/unbound/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/contrib/unbound/Makefile.in b/contrib/unbound/Makefile.in index 0a2e7f9b6f08..22fb75c123bd 100644 --- a/contrib/unbound/Makefile.in +++ b/contrib/unbound/Makefile.in @@ -738,7 +738,7 @@ msgencode.lo msgencode.o: $(srcdir)/util/data/msgencode.c config.h $(srcdir)/uti msgparse.lo msgparse.o: $(srcdir)/util/data/msgparse.c config.h $(srcdir)/util/data/msgparse.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h msgreply.lo msgreply.o: $(srcdir)/util/data/msgreply.c config.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h \ @@ -793,7 +793,7 @@ iter_priv.lo iter_priv.o: $(srcdir)/iterator/iter_priv.c config.h $(srcdir)/iter $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/sbuffer.h iter_resptype.lo iter_resptype.o: $(srcdir)/iterator/iter_resptype.c config.h \ - $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/util/log.h \ + $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iterator.h $(srcdir)/util/log.h \ $(srcdir)/services/cache/dns.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/net_help.h \ $(srcdir)/util/data/dname.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h diff --git a/contrib/unbound/README.md b/contrib/unbound/README.md index c220da030458..3bbd38b3b78b 100644 --- a/contrib/unbound/README.md +++ b/contrib/unbound/README.md @@ -17,7 +17,9 @@ You can learn more about Unbound by reading our ## Compiling Make sure you have the C toolchain, OpenSSL and its include files, and libexpat -installed. Unbound can be compiled and installed using: +installed. +If building from the repository source you also need flex and bison installed. +Unbound can be compiled and installed using: ``` ./configure && make && make install @@ -27,7 +29,7 @@ You can use libevent if you want. libevent is useful when using many (10000) outgoing ports. By default max 256 ports are opened at the same time and the builtin alternative is equally capable and a little faster. -Use the `--with-libevent=dir` configure option to compile Unbound with libevent +Use the `--with-libevent` configure option to compile Unbound with libevent support. ## Unbound configuration diff --git a/contrib/unbound/cachedb/cachedb.c b/contrib/unbound/cachedb/cachedb.c index 30645268ca23..b912be8ed54f 100644 --- a/contrib/unbound/cachedb/cachedb.c +++ b/contrib/unbound/cachedb/cachedb.c @@ -265,11 +265,11 @@ cachedb_init(struct module_env* env, int id) return 0; } cachedb_env->enabled = 1; - if(env->cfg->serve_expired_reply_ttl) + if(env->cfg->serve_expired && env->cfg->serve_expired_reply_ttl) log_warn( "cachedb: serve-expired-reply-ttl is set but not working for data " - "originating from the external cache; 0 TLL is used for those."); - if(env->cfg->serve_expired_client_timeout) + "originating from the external cache; 0 TTL is used for those."); + if(env->cfg->serve_expired && env->cfg->serve_expired_client_timeout) log_warn( "cachedb: serve-expired-client-timeout is set but not working for " "data originating from the external cache; expired data are used " @@ -815,6 +815,11 @@ cachedb_handle_response(struct module_qstate* qstate, qstate->ext_state[id] = module_finished; return; } + if(qstate->env->cfg->cachedb_no_store) { + /* do not store the item in the external cache */ + qstate->ext_state[id] = module_finished; + return; + } /* store the item into the backend cache */ cachedb_extcache_store(qstate, ie); diff --git a/contrib/unbound/cachedb/redis.c b/contrib/unbound/cachedb/redis.c index 93a575a4c6d2..6cc975901df2 100644 --- a/contrib/unbound/cachedb/redis.c +++ b/contrib/unbound/cachedb/redis.c @@ -59,11 +59,28 @@ struct redis_moddata { const char* server_path; /* server's unix path, or "", NULL if unused */ const char* server_password; /* server's AUTH password, or "", NULL if unused */ struct timeval timeout; /* timeout for connection setup and commands */ + int logical_db; /* the redis logical database to use */ }; static redisReply* redis_command(struct module_env*, struct cachedb_env*, const char*, const uint8_t*, size_t); +static void +moddata_clean(struct redis_moddata** moddata) { + if(!moddata || !*moddata) + return; + if((*moddata)->ctxs) { + int i; + for(i = 0; i < (*moddata)->numctxs; i++) { + if((*moddata)->ctxs[i]) + redisFree((*moddata)->ctxs[i]); + } + free((*moddata)->ctxs); + } + free(*moddata); + *moddata = NULL; +} + static redisContext* redis_connect(const struct redis_moddata* moddata) { @@ -97,10 +114,21 @@ redis_connect(const struct redis_moddata* moddata) } freeReplyObject(rep); } + if(moddata->logical_db > 0) { + redisReply* rep; + rep = redisCommand(ctx, "SELECT %d", moddata->logical_db); + if(!rep || rep->type == REDIS_REPLY_ERROR) { + log_err("failed to set logical database (%d)", + moddata->logical_db); + freeReplyObject(rep); + goto fail; + } + freeReplyObject(rep); + } verbose(VERB_OPS, "Connection to Redis established"); return ctx; - fail: +fail: if(ctx) redisFree(ctx); return NULL; @@ -117,14 +145,13 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) moddata = calloc(1, sizeof(struct redis_moddata)); if(!moddata) { log_err("out of memory"); - return 0; + goto fail; } moddata->numctxs = env->cfg->num_threads; moddata->ctxs = calloc(env->cfg->num_threads, sizeof(redisContext*)); if(!moddata->ctxs) { log_err("out of memory"); - free(moddata); - return 0; + goto fail; } /* note: server_host is a shallow reference to configured string. * we don't have to free it in this module. */ @@ -134,8 +161,15 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) moddata->server_password = env->cfg->redis_server_password; moddata->timeout.tv_sec = env->cfg->redis_timeout / 1000; moddata->timeout.tv_usec = (env->cfg->redis_timeout % 1000) * 1000; - for(i = 0; i < moddata->numctxs; i++) - moddata->ctxs[i] = redis_connect(moddata); + moddata->logical_db = env->cfg->redis_logical_db; + for(i = 0; i < moddata->numctxs; i++) { + redisContext* ctx = redis_connect(moddata); + if(!ctx) { + log_err("redis_init: failed to init redis"); + goto fail; + } + moddata->ctxs[i] = ctx; + } cachedb_env->backend_data = moddata; if(env->cfg->redis_expire_records) { redisReply* rep = NULL; @@ -148,7 +182,7 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) log_err("redis_init: failed to init redis, the " "redis-expire-records option requires the SETEX command " "(redis >= 2.0.0)"); - return 0; + goto fail; } redis_reply_type = rep->type; freeReplyObject(rep); @@ -160,11 +194,14 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) log_err("redis_init: failed to init redis, the " "redis-expire-records option requires the SETEX command " "(redis >= 2.0.0)"); - return 0; + goto fail; } } - return 1; + +fail: + moddata_clean(&moddata); + return 0; } static void @@ -175,18 +212,7 @@ redis_deinit(struct module_env* env, struct cachedb_env* cachedb_env) (void)env; verbose(VERB_OPS, "Redis deinitialization"); - - if(!moddata) - return; - if(moddata->ctxs) { - int i; - for(i = 0; i < moddata->numctxs; i++) { - if(moddata->ctxs[i]) - redisFree(moddata->ctxs[i]); - } - free(moddata->ctxs); - } - free(moddata); + moddata_clean(&moddata); } /* diff --git a/contrib/unbound/config.guess b/contrib/unbound/config.guess index b187213930f1..cdfc4392047c 100755 --- a/contrib/unbound/config.guess +++ b/contrib/unbound/config.guess @@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2023-07-20' +timestamp='2023-08-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -155,6 +155,9 @@ Linux|GNU|GNU/*) set_cc_for_build cat <<-EOF > "$dummy.c" + #if defined(__ANDROID__) + LIBC=android + #else #include #if defined(__UCLIBC__) LIBC=uclibc @@ -169,6 +172,7 @@ Linux|GNU|GNU/*) LIBC=musl #endif #endif + #endif EOF cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` eval "$cc_set_libc" @@ -904,7 +908,7 @@ EOF fi ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` + UNAME_PROCESSOR=`uname -p` case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; diff --git a/contrib/unbound/config.h.in~ b/contrib/unbound/config.h.in~ new file mode 100644 index 000000000000..f31354d01408 --- /dev/null +++ b/contrib/unbound/config.h.in~ @@ -0,0 +1,1456 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* apply the noreturn attribute to a function that exits the program */ +#undef ATTR_NORETURN + +/* apply the weak attribute to a symbol */ +#undef ATTR_WEAK + +/* Directory to chroot to */ +#undef CHROOT_DIR + +/* Define this to enable client subnet option. */ +#undef CLIENT_SUBNET + +/* Do sha512 definitions in config.h */ +#undef COMPAT_SHA512 + +/* Command line arguments used with configure */ +#undef CONFCMDLINE + +/* Pathname to the Unbound configuration file */ +#undef CONFIGFILE + +/* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work + */ +#undef DARWIN_BROKEN_SETREUID + +/* Whether daemon is deprecated */ +#undef DEPRECATED_DAEMON + +/* Deprecate RSA 1024 bit length, makes that an unsupported key */ +#undef DEPRECATE_RSA_1024 + +/* Define this to enable kernel based UDP source port randomization. */ +#undef DISABLE_EXPLICIT_PORT_RANDOMISATION + +/* default dnstap socket path */ +#undef DNSTAP_SOCKET_PATH + +/* Define if you want to use debug lock checking (slow). */ +#undef ENABLE_LOCK_CHECKS + +/* Define this if you enabled-allsymbols from libunbound to link binaries to + it for smaller install size, but the libunbound export table is polluted by + internal symbols */ +#undef EXPORT_ALL_SYMBOLS + +/* Define to 1 if you have the `accept4' function. */ +#undef HAVE_ACCEPT4 + +/* Define to 1 if you have the `arc4random' function. */ +#undef HAVE_ARC4RANDOM + +/* Define to 1 if you have the `arc4random_uniform' function. */ +#undef HAVE_ARC4RANDOM_UNIFORM + +/* Define to 1 if you have the header file. */ +#undef HAVE_ARPA_INET_H + +/* Whether the C compiler accepts the "format" attribute */ +#undef HAVE_ATTR_FORMAT + +/* Whether the C compiler accepts the "noreturn" attribute */ +#undef HAVE_ATTR_NORETURN + +/* Whether the C compiler accepts the "unused" attribute */ +#undef HAVE_ATTR_UNUSED + +/* Whether the C compiler accepts the "weak" attribute */ +#undef HAVE_ATTR_WEAK + +/* If we have be64toh */ +#undef HAVE_BE64TOH + +/* Define to 1 if you have the `BIO_set_callback_ex' function. */ +#undef HAVE_BIO_SET_CALLBACK_EX + +/* Define to 1 if you have the header file. */ +#undef HAVE_BSD_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_BSD_STRING_H + +/* Define to 1 if you have the `chown' function. */ +#undef HAVE_CHOWN + +/* Define to 1 if you have the `chroot' function. */ +#undef HAVE_CHROOT + +/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ +#undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA + +/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ +#undef HAVE_CRYPTO_THREADID_SET_CALLBACK + +/* Define to 1 if you have the `ctime_r' function. */ +#undef HAVE_CTIME_R + +/* Define to 1 if you have the `daemon' function. */ +#undef HAVE_DAEMON + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#undef HAVE_DECL_ARC4RANDOM + +/* Define to 1 if you have the declaration of `arc4random_uniform', and to 0 + if you don't. */ +#undef HAVE_DECL_ARC4RANDOM_UNIFORM + +/* Define to 1 if you have the declaration of `evsignal_assign', and to 0 if + you don't. */ +#undef HAVE_DECL_EVSIGNAL_ASSIGN + +/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you + don't. */ +#undef HAVE_DECL_INET_NTOP + +/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you + don't. */ +#undef HAVE_DECL_INET_PTON + +/* Define to 1 if you have the declaration of `nghttp2_session_server_new', + and to 0 if you don't. */ +#undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW + +/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you + don't. */ +#undef HAVE_DECL_NID_ED25519 + +/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you + don't. */ +#undef HAVE_DECL_NID_ED448 + +/* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you + don't. */ +#undef HAVE_DECL_NID_SECP384R1 + +/* Define to 1 if you have the declaration of `NID_X9_62_prime256v1', and to 0 + if you don't. */ +#undef HAVE_DECL_NID_X9_62_PRIME256V1 + +/* Define to 1 if you have the declaration of `reallocarray', and to 0 if you + don't. */ +#undef HAVE_DECL_REALLOCARRAY + +/* Define to 1 if you have the declaration of `redisConnect', and to 0 if you + don't. */ +#undef HAVE_DECL_REDISCONNECT + +/* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0 + if you don't. */ +#undef HAVE_DECL_SK_SSL_COMP_POP_FREE + +/* Define to 1 if you have the declaration of + `SSL_COMP_get_compression_methods', and to 0 if you don't. */ +#undef HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS + +/* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to + 0 if you don't. */ +#undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO + +/* Define to 1 if you have the declaration of `strlcat', and to 0 if you + don't. */ +#undef HAVE_DECL_STRLCAT + +/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you + don't. */ +#undef HAVE_DECL_STRLCPY + +/* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if + you don't. */ +#undef HAVE_DECL_XML_STOPPARSER + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the `DSA_SIG_set0' function. */ +#undef HAVE_DSA_SIG_SET0 + +/* Define to 1 if you have the header file. */ +#undef HAVE_ENDIAN_H + +/* Define to 1 if you have the `endprotoent' function. */ +#undef HAVE_ENDPROTOENT + +/* Define to 1 if you have the `endpwent' function. */ +#undef HAVE_ENDPWENT + +/* Define to 1 if you have the `endservent' function. */ +#undef HAVE_ENDSERVENT + +/* Define to 1 if you have the `ENGINE_cleanup' function. */ +#undef HAVE_ENGINE_CLEANUP + +/* Define to 1 if you have the `ERR_free_strings' function. */ +#undef HAVE_ERR_FREE_STRINGS + +/* Define to 1 if you have the `ERR_load_crypto_strings' function. */ +#undef HAVE_ERR_LOAD_CRYPTO_STRINGS + +/* Define to 1 if you have the `event_assign' function. */ +#undef HAVE_EVENT_ASSIGN + +/* Define to 1 if you have the `event_base_free' function. */ +#undef HAVE_EVENT_BASE_FREE + +/* Define to 1 if you have the `event_base_get_method' function. */ +#undef HAVE_EVENT_BASE_GET_METHOD + +/* Define to 1 if you have the `event_base_new' function. */ +#undef HAVE_EVENT_BASE_NEW + +/* Define to 1 if you have the `event_base_once' function. */ +#undef HAVE_EVENT_BASE_ONCE + +/* Define to 1 if you have the header file. */ +#undef HAVE_EVENT_H + +/* Define to 1 if you have the `EVP_aes_256_cbc' function. */ +#undef HAVE_EVP_AES_256_CBC + +/* Define to 1 if you have the `EVP_cleanup' function. */ +#undef HAVE_EVP_CLEANUP + +/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled' + function. */ +#undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED + +/* Define to 1 if you have the `EVP_DigestVerify' function. */ +#undef HAVE_EVP_DIGESTVERIFY + +/* Define to 1 if you have the `EVP_dss1' function. */ +#undef HAVE_EVP_DSS1 + +/* Define to 1 if you have the `EVP_EncryptInit_ex' function. */ +#undef HAVE_EVP_ENCRYPTINIT_EX + +/* Define to 1 if you have the `EVP_MAC_CTX_set_params' function. */ +#undef HAVE_EVP_MAC_CTX_SET_PARAMS + +/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ +#undef HAVE_EVP_MD_CTX_NEW + +/* Define to 1 if you have the `EVP_sha1' function. */ +#undef HAVE_EVP_SHA1 + +/* Define to 1 if you have the `EVP_sha256' function. */ +#undef HAVE_EVP_SHA256 + +/* Define to 1 if you have the `EVP_sha512' function. */ +#undef HAVE_EVP_SHA512 + +/* Define to 1 if you have the `ev_default_loop' function. */ +#undef HAVE_EV_DEFAULT_LOOP + +/* Define to 1 if you have the `ev_loop' function. */ +#undef HAVE_EV_LOOP + +/* Define to 1 if you have the header file. */ +#undef HAVE_EXPAT_H + +/* Define to 1 if you have the `explicit_bzero' function. */ +#undef HAVE_EXPLICIT_BZERO + +/* Define to 1 if you have the `fcntl' function. */ +#undef HAVE_FCNTL + +/* Define to 1 if you have the `FIPS_mode' function. */ +#undef HAVE_FIPS_MODE + +/* Define to 1 if you have the `fork' function. */ +#undef HAVE_FORK + +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#undef HAVE_FSEEKO + +/* Define to 1 if you have the `fsync' function. */ +#undef HAVE_FSYNC + +/* Whether getaddrinfo is available */ +#undef HAVE_GETADDRINFO + +/* Define to 1 if you have the `getauxval' function. */ +#undef HAVE_GETAUXVAL + +/* Define to 1 if you have the `getentropy' function. */ +#undef HAVE_GETENTROPY + +/* Define to 1 if you have the `getifaddrs' function. */ +#undef HAVE_GETIFADDRS + +/* Define to 1 if you have the header file. */ +#undef HAVE_GETOPT_H + +/* Define to 1 if you have the `getpwnam' function. */ +#undef HAVE_GETPWNAM + +/* Define to 1 if you have the `getrlimit' function. */ +#undef HAVE_GETRLIMIT + +/* Define to 1 if you have the `gettid' function. */ +#undef HAVE_GETTID + +/* Define to 1 if you have the `glob' function. */ +#undef HAVE_GLOB + +/* Define to 1 if you have the header file. */ +#undef HAVE_GLOB_H + +/* Define to 1 if you have the `gmtime_r' function. */ +#undef HAVE_GMTIME_R + +/* Define to 1 if you have the header file. */ +#undef HAVE_GRP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_HIREDIS_HIREDIS_H + +/* Define to 1 if you have the `HMAC_Init_ex' function. */ +#undef HAVE_HMAC_INIT_EX + +/* If we have htobe64 */ +#undef HAVE_HTOBE64 + +/* Define to 1 if you have the header file. */ +#undef HAVE_IFADDRS_H + +/* Define to 1 if you have the `if_nametoindex' function. */ +#undef HAVE_IF_NAMETOINDEX + +/* Define to 1 if you have the `inet_aton' function. */ +#undef HAVE_INET_ATON + +/* Define to 1 if you have the `inet_ntop' function. */ +#undef HAVE_INET_NTOP + +/* Define to 1 if you have the `inet_pton' function. */ +#undef HAVE_INET_PTON + +/* Define to 1 if you have the `initgroups' function. */ +#undef HAVE_INITGROUPS + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* if the function 'ioctlsocket' is available */ +#undef HAVE_IOCTLSOCKET + +/* Define to 1 if you have the header file. */ +#undef HAVE_IPHLPAPI_H + +/* Define to 1 if you have the `isblank' function. */ +#undef HAVE_ISBLANK + +/* Define to 1 if you have the `kill' function. */ +#undef HAVE_KILL + +/* Use portable libbsd functions */ +#undef HAVE_LIBBSD + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBKERN_OSBYTEORDER_H + +/* Define if we have LibreSSL */ +#undef HAVE_LIBRESSL + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_NET_TSTAMP_H + +/* Define to 1 if you have the `localtime_r' function. */ +#undef HAVE_LOCALTIME_R + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOGIN_CAP_H + +/* If have GNU libc compatible malloc */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the `memmove' function. */ +#undef HAVE_MEMMOVE + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETDB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_TCP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETIOAPI_H + +/* Use libnettle for crypto */ +#undef HAVE_NETTLE + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETTLE_DSA_COMPAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETTLE_EDDSA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_IF_H + +/* Define this to use nghttp2 client. */ +#undef HAVE_NGHTTP2 + +/* Define to 1 if you have the header file. */ +#undef HAVE_NGHTTP2_NGHTTP2_H + +/* Use libnss for crypto */ +#undef HAVE_NSS + +/* Define to 1 if you have the `OpenSSL_add_all_digests' function. */ +#undef HAVE_OPENSSL_ADD_ALL_DIGESTS + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_BN_H + +/* Define to 1 if you have the `OPENSSL_config' function. */ +#undef HAVE_OPENSSL_CONFIG + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_CONF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_CORE_NAMES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_DH_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_DSA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_ENGINE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_ERR_H + +/* Define to 1 if you have the `OPENSSL_init_crypto' function. */ +#undef HAVE_OPENSSL_INIT_CRYPTO + +/* Define to 1 if you have the `OPENSSL_init_ssl' function. */ +#undef HAVE_OPENSSL_INIT_SSL + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_PARAM_BUILD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_RAND_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_RSA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_SSL_H + +/* Define to 1 if you have the `OSSL_PARAM_BLD_new' function. */ +#undef HAVE_OSSL_PARAM_BLD_NEW + +/* Define to 1 if you have the `poll' function. */ +#undef HAVE_POLL + +/* Define to 1 if you have the header file. */ +#undef HAVE_POLL_H + +/* Define if you have POSIX threads libraries and header files. */ +#undef HAVE_PTHREAD + +/* Have PTHREAD_PRIO_INHERIT. */ +#undef HAVE_PTHREAD_PRIO_INHERIT + +/* Define to 1 if the system has the type `pthread_rwlock_t'. */ +#undef HAVE_PTHREAD_RWLOCK_T + +/* Define to 1 if the system has the type `pthread_spinlock_t'. */ +#undef HAVE_PTHREAD_SPINLOCK_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_PWD_H + +/* Define if you have Python libraries and header files. */ +#undef HAVE_PYTHON + +/* Define to 1 if you have the `random' function. */ +#undef HAVE_RANDOM + +/* Define to 1 if you have the `RAND_cleanup' function. */ +#undef HAVE_RAND_CLEANUP + +/* If we have reallocarray(3) */ +#undef HAVE_REALLOCARRAY + +/* Define to 1 if you have the `recvmsg' function. */ +#undef HAVE_RECVMSG + +/* Define to 1 if you have the `sendmsg' function. */ +#undef HAVE_SENDMSG + +/* Define to 1 if you have the `setregid' function. */ +#undef HAVE_SETREGID + +/* Define to 1 if you have the `setresgid' function. */ +#undef HAVE_SETRESGID + +/* Define to 1 if you have the `setresuid' function. */ +#undef HAVE_SETRESUID + +/* Define to 1 if you have the `setreuid' function. */ +#undef HAVE_SETREUID + +/* Define to 1 if you have the `setrlimit' function. */ +#undef HAVE_SETRLIMIT + +/* Define to 1 if you have the `setsid' function. */ +#undef HAVE_SETSID + +/* Define to 1 if you have the `setusercontext' function. */ +#undef HAVE_SETUSERCONTEXT + +/* Define to 1 if you have the `SHA512_Update' function. */ +#undef HAVE_SHA512_UPDATE + +/* Define to 1 if you have the `shmget' function. */ +#undef HAVE_SHMGET + +/* Define to 1 if you have the `sigprocmask' function. */ +#undef HAVE_SIGPROCMASK + +/* Define to 1 if you have the `sleep' function. */ +#undef HAVE_SLEEP + +/* Define to 1 if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF + +/* Define to 1 if you have the `socketpair' function. */ +#undef HAVE_SOCKETPAIR + +/* Using Solaris threads */ +#undef HAVE_SOLARIS_THREADS + +/* Define to 1 if you have the `srandom' function. */ +#undef HAVE_SRANDOM + +/* Define if you have the SSL libraries installed. */ +#undef HAVE_SSL + +/* Define to 1 if you have the `SSL_CTX_set_alpn_protos' function. */ +#undef HAVE_SSL_CTX_SET_ALPN_PROTOS + +/* Define to 1 if you have the `SSL_CTX_set_alpn_select_cb' function. */ +#undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB + +/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */ +#undef HAVE_SSL_CTX_SET_CIPHERSUITES + +/* Define to 1 if you have the `SSL_CTX_set_security_level' function. */ +#undef HAVE_SSL_CTX_SET_SECURITY_LEVEL + +/* Define to 1 if you have the `SSL_CTX_set_tlsext_ticket_key_evp_cb' + function. */ +#undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB + +/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ +#undef HAVE_SSL_GET0_ALPN_SELECTED + +/* Define to 1 if you have the `SSL_get0_peername' function. */ +#undef HAVE_SSL_GET0_PEERNAME + +/* Define to 1 if you have the `SSL_get1_peer_certificate' function. */ +#undef HAVE_SSL_GET1_PEER_CERTIFICATE + +/* Define to 1 if you have the `SSL_set1_host' function. */ +#undef HAVE_SSL_SET1_HOST + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDARG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDBOOL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strftime' function. */ +#undef HAVE_STRFTIME + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strlcat' function. */ +#undef HAVE_STRLCAT + +/* Define to 1 if you have the `strlcpy' function. */ +#undef HAVE_STRLCPY + +/* Define to 1 if you have the `strptime' function. */ +#undef HAVE_STRPTIME + +/* Define to 1 if you have the `strsep' function. */ *** 6599 LINES SKIPPED *** From nobody Tue Nov 28 15:15:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmHH2Mp8z53DR8; Tue, 28 Nov 2023 15:15: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 4SfmHH1TTxz3GP3; Tue, 28 Nov 2023 15:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qCoBnW1n1HVsXfvnS3tDxW0NxDSVGk3trvkW9pjo/kI=; b=nxRFfkUkv3nDb2avjS9bMVt3Wrx0DH92CicmqlDrELNXtSidLScPStd/f+bDqPMBkqhwo0 +hhX5ikIchjUM2laS30P2Hvg8PWGL+tlHW/nf3APTeJQALiYnFOYvsCU3+QeroG3xn5diV 4uIZO9z4C7H2evCBnU77EODxkx4xcMSH7b+BeNsGpP9D7nbvJQJCRPG621jltMQ98vicgh PhuZJ0lOknsbBov5OQxJLxpb+6gaqOdSTGU5C8aZDM2Jt6UA6bUT2Epl0u6n4BoI92+gzx gJv6PQSsyfLJAQQQ3nnZ3XTMYBKbH5nUsG2BU36Ln4RWACglcqEA7xiFjMR9Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qCoBnW1n1HVsXfvnS3tDxW0NxDSVGk3trvkW9pjo/kI=; b=vO6AohN1RwZoDHUGGb3Ey/n/RpzHDDEmJFmRNxPni53cIBHiBAP1jc7jAQ2o2ewEENheW3 EWarges4dabM1VhkZ6YLy/NleHfT49WNLYRGwfAjKhIfVG9sAgwODpkmT5iL3xxlAkJEkk XQAyeuiY2u1WoKi5NKV0DChrc4E7mj1Xub/LP3FdQqGKnPQynPUhSMR3/5mlXyusVzAeiK SfUQBWJsaH8ENpg8Kbdgn5B3cLARM9svsM+5P0OPcOXZ29g004qll3kT8g2xBW3k3hUjA+ /pBYF+s8mns+UyUbwbOQjqWKeWZ3gk6MavEIxSOOccEjqznuwKJrOGqk/DG9IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184539; a=rsa-sha256; cv=none; b=fFThZuQwevEP36nrWpoGgRE20EqXmDk9R3bc3q3O+HS+P8xtZqRJom4vNICyfqzc219uWc netMS2jX/lL8kVLwz8M8SKX+biVu8pc97xudxo4tOLO0EZrN4eSPzcMvr5c9hDD0odFm7J SS7K2Vly6CTL685PyUqHwDaHyVJMEHxdhBDKFTTdHrA2D+PpxfFfSZs3odgQdf2j7TY+Ar cFfm9dQsu/zk+8xPHAE4g42nyZGW3OBp/Fev22As5k2WV6Pm8g+PN8bxKvg+IK+kUtbCaa A0RPxKkxKlWFEwQ6HURHRkkF25qeh252Lwbj0hHGI2loYSVTRdaJh6GY8GLqBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfmHH0RrDzC8r; Tue, 28 Nov 2023 15:15: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 3ASFFdUS094006; Tue, 28 Nov 2023 15:15:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASFFdmq094003; Tue, 28 Nov 2023 15:15:39 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:15:39 GMT Message-Id: <202311281515.3ASFFdmq094003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: a118088ff374 - stable/14 - Unbound: Remove backup file brought in from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a118088ff3741023c24caeff1a4fff7b660817fd Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a118088ff3741023c24caeff1a4fff7b660817fd commit a118088ff3741023c24caeff1a4fff7b660817fd Author: Cy Schubert AuthorDate: 2023-11-14 00:36:24 +0000 Commit: Cy Schubert CommitDate: 2023-11-28 15:15:24 +0000 Unbound: Remove backup file brought in from upstream Upstream tarball included config.h~. This was previously manually removed from vendor where in fact it should not have been as it would have caused a merge conflict. Reported by: "Herbert J. Skuhra" (cherry picked from commit 5aab39b24ce7437265b94461ffdd9b12c0723658) --- contrib/unbound/config.h.in~ | 1456 ------------------------------------------ 1 file changed, 1456 deletions(-) diff --git a/contrib/unbound/config.h.in~ b/contrib/unbound/config.h.in~ deleted file mode 100644 index f31354d01408..000000000000 --- a/contrib/unbound/config.h.in~ +++ /dev/null @@ -1,1456 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* apply the noreturn attribute to a function that exits the program */ -#undef ATTR_NORETURN - -/* apply the weak attribute to a symbol */ -#undef ATTR_WEAK - -/* Directory to chroot to */ -#undef CHROOT_DIR - -/* Define this to enable client subnet option. */ -#undef CLIENT_SUBNET - -/* Do sha512 definitions in config.h */ -#undef COMPAT_SHA512 - -/* Command line arguments used with configure */ -#undef CONFCMDLINE - -/* Pathname to the Unbound configuration file */ -#undef CONFIGFILE - -/* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work - */ -#undef DARWIN_BROKEN_SETREUID - -/* Whether daemon is deprecated */ -#undef DEPRECATED_DAEMON - -/* Deprecate RSA 1024 bit length, makes that an unsupported key */ -#undef DEPRECATE_RSA_1024 - -/* Define this to enable kernel based UDP source port randomization. */ -#undef DISABLE_EXPLICIT_PORT_RANDOMISATION - -/* default dnstap socket path */ -#undef DNSTAP_SOCKET_PATH - -/* Define if you want to use debug lock checking (slow). */ -#undef ENABLE_LOCK_CHECKS - -/* Define this if you enabled-allsymbols from libunbound to link binaries to - it for smaller install size, but the libunbound export table is polluted by - internal symbols */ -#undef EXPORT_ALL_SYMBOLS - -/* Define to 1 if you have the `accept4' function. */ -#undef HAVE_ACCEPT4 - -/* Define to 1 if you have the `arc4random' function. */ -#undef HAVE_ARC4RANDOM - -/* Define to 1 if you have the `arc4random_uniform' function. */ -#undef HAVE_ARC4RANDOM_UNIFORM - -/* Define to 1 if you have the header file. */ -#undef HAVE_ARPA_INET_H - -/* Whether the C compiler accepts the "format" attribute */ -#undef HAVE_ATTR_FORMAT - -/* Whether the C compiler accepts the "noreturn" attribute */ -#undef HAVE_ATTR_NORETURN - -/* Whether the C compiler accepts the "unused" attribute */ -#undef HAVE_ATTR_UNUSED - -/* Whether the C compiler accepts the "weak" attribute */ -#undef HAVE_ATTR_WEAK - -/* If we have be64toh */ -#undef HAVE_BE64TOH - -/* Define to 1 if you have the `BIO_set_callback_ex' function. */ -#undef HAVE_BIO_SET_CALLBACK_EX - -/* Define to 1 if you have the header file. */ -#undef HAVE_BSD_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_BSD_STRING_H - -/* Define to 1 if you have the `chown' function. */ -#undef HAVE_CHOWN - -/* Define to 1 if you have the `chroot' function. */ -#undef HAVE_CHROOT - -/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ -#undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA - -/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ -#undef HAVE_CRYPTO_THREADID_SET_CALLBACK - -/* Define to 1 if you have the `ctime_r' function. */ -#undef HAVE_CTIME_R - -/* Define to 1 if you have the `daemon' function. */ -#undef HAVE_DAEMON - -/* Define to 1 if you have the declaration of `arc4random', and to 0 if you - don't. */ -#undef HAVE_DECL_ARC4RANDOM - -/* Define to 1 if you have the declaration of `arc4random_uniform', and to 0 - if you don't. */ -#undef HAVE_DECL_ARC4RANDOM_UNIFORM - -/* Define to 1 if you have the declaration of `evsignal_assign', and to 0 if - you don't. */ -#undef HAVE_DECL_EVSIGNAL_ASSIGN - -/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you - don't. */ -#undef HAVE_DECL_INET_NTOP - -/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you - don't. */ -#undef HAVE_DECL_INET_PTON - -/* Define to 1 if you have the declaration of `nghttp2_session_server_new', - and to 0 if you don't. */ -#undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW - -/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you - don't. */ -#undef HAVE_DECL_NID_ED25519 - -/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you - don't. */ -#undef HAVE_DECL_NID_ED448 - -/* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you - don't. */ -#undef HAVE_DECL_NID_SECP384R1 - -/* Define to 1 if you have the declaration of `NID_X9_62_prime256v1', and to 0 - if you don't. */ -#undef HAVE_DECL_NID_X9_62_PRIME256V1 - -/* Define to 1 if you have the declaration of `reallocarray', and to 0 if you - don't. */ -#undef HAVE_DECL_REALLOCARRAY - -/* Define to 1 if you have the declaration of `redisConnect', and to 0 if you - don't. */ -#undef HAVE_DECL_REDISCONNECT - -/* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0 - if you don't. */ -#undef HAVE_DECL_SK_SSL_COMP_POP_FREE - -/* Define to 1 if you have the declaration of - `SSL_COMP_get_compression_methods', and to 0 if you don't. */ -#undef HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS - -/* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to - 0 if you don't. */ -#undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO - -/* Define to 1 if you have the declaration of `strlcat', and to 0 if you - don't. */ -#undef HAVE_DECL_STRLCAT - -/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you - don't. */ -#undef HAVE_DECL_STRLCPY - -/* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if - you don't. */ -#undef HAVE_DECL_XML_STOPPARSER - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the `DSA_SIG_set0' function. */ -#undef HAVE_DSA_SIG_SET0 - -/* Define to 1 if you have the header file. */ -#undef HAVE_ENDIAN_H - -/* Define to 1 if you have the `endprotoent' function. */ -#undef HAVE_ENDPROTOENT - -/* Define to 1 if you have the `endpwent' function. */ -#undef HAVE_ENDPWENT - -/* Define to 1 if you have the `endservent' function. */ -#undef HAVE_ENDSERVENT - -/* Define to 1 if you have the `ENGINE_cleanup' function. */ -#undef HAVE_ENGINE_CLEANUP - -/* Define to 1 if you have the `ERR_free_strings' function. */ -#undef HAVE_ERR_FREE_STRINGS - -/* Define to 1 if you have the `ERR_load_crypto_strings' function. */ -#undef HAVE_ERR_LOAD_CRYPTO_STRINGS - -/* Define to 1 if you have the `event_assign' function. */ -#undef HAVE_EVENT_ASSIGN - -/* Define to 1 if you have the `event_base_free' function. */ -#undef HAVE_EVENT_BASE_FREE - -/* Define to 1 if you have the `event_base_get_method' function. */ -#undef HAVE_EVENT_BASE_GET_METHOD - -/* Define to 1 if you have the `event_base_new' function. */ -#undef HAVE_EVENT_BASE_NEW - -/* Define to 1 if you have the `event_base_once' function. */ -#undef HAVE_EVENT_BASE_ONCE - -/* Define to 1 if you have the header file. */ -#undef HAVE_EVENT_H - -/* Define to 1 if you have the `EVP_aes_256_cbc' function. */ -#undef HAVE_EVP_AES_256_CBC - -/* Define to 1 if you have the `EVP_cleanup' function. */ -#undef HAVE_EVP_CLEANUP - -/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled' - function. */ -#undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED - -/* Define to 1 if you have the `EVP_DigestVerify' function. */ -#undef HAVE_EVP_DIGESTVERIFY - -/* Define to 1 if you have the `EVP_dss1' function. */ -#undef HAVE_EVP_DSS1 - -/* Define to 1 if you have the `EVP_EncryptInit_ex' function. */ -#undef HAVE_EVP_ENCRYPTINIT_EX - -/* Define to 1 if you have the `EVP_MAC_CTX_set_params' function. */ -#undef HAVE_EVP_MAC_CTX_SET_PARAMS - -/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ -#undef HAVE_EVP_MD_CTX_NEW - -/* Define to 1 if you have the `EVP_sha1' function. */ -#undef HAVE_EVP_SHA1 - -/* Define to 1 if you have the `EVP_sha256' function. */ -#undef HAVE_EVP_SHA256 - -/* Define to 1 if you have the `EVP_sha512' function. */ -#undef HAVE_EVP_SHA512 - -/* Define to 1 if you have the `ev_default_loop' function. */ -#undef HAVE_EV_DEFAULT_LOOP - -/* Define to 1 if you have the `ev_loop' function. */ -#undef HAVE_EV_LOOP - -/* Define to 1 if you have the header file. */ -#undef HAVE_EXPAT_H - -/* Define to 1 if you have the `explicit_bzero' function. */ -#undef HAVE_EXPLICIT_BZERO - -/* Define to 1 if you have the `fcntl' function. */ -#undef HAVE_FCNTL - -/* Define to 1 if you have the `FIPS_mode' function. */ -#undef HAVE_FIPS_MODE - -/* Define to 1 if you have the `fork' function. */ -#undef HAVE_FORK - -/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -#undef HAVE_FSEEKO - -/* Define to 1 if you have the `fsync' function. */ -#undef HAVE_FSYNC - -/* Whether getaddrinfo is available */ -#undef HAVE_GETADDRINFO - -/* Define to 1 if you have the `getauxval' function. */ -#undef HAVE_GETAUXVAL - -/* Define to 1 if you have the `getentropy' function. */ -#undef HAVE_GETENTROPY - -/* Define to 1 if you have the `getifaddrs' function. */ -#undef HAVE_GETIFADDRS - -/* Define to 1 if you have the header file. */ -#undef HAVE_GETOPT_H - -/* Define to 1 if you have the `getpwnam' function. */ -#undef HAVE_GETPWNAM - -/* Define to 1 if you have the `getrlimit' function. */ -#undef HAVE_GETRLIMIT - -/* Define to 1 if you have the `gettid' function. */ -#undef HAVE_GETTID - -/* Define to 1 if you have the `glob' function. */ -#undef HAVE_GLOB - -/* Define to 1 if you have the header file. */ -#undef HAVE_GLOB_H - -/* Define to 1 if you have the `gmtime_r' function. */ -#undef HAVE_GMTIME_R - -/* Define to 1 if you have the header file. */ -#undef HAVE_GRP_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_HIREDIS_HIREDIS_H - -/* Define to 1 if you have the `HMAC_Init_ex' function. */ -#undef HAVE_HMAC_INIT_EX - -/* If we have htobe64 */ -#undef HAVE_HTOBE64 - -/* Define to 1 if you have the header file. */ -#undef HAVE_IFADDRS_H - -/* Define to 1 if you have the `if_nametoindex' function. */ -#undef HAVE_IF_NAMETOINDEX - -/* Define to 1 if you have the `inet_aton' function. */ -#undef HAVE_INET_ATON - -/* Define to 1 if you have the `inet_ntop' function. */ -#undef HAVE_INET_NTOP - -/* Define to 1 if you have the `inet_pton' function. */ -#undef HAVE_INET_PTON - -/* Define to 1 if you have the `initgroups' function. */ -#undef HAVE_INITGROUPS - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* if the function 'ioctlsocket' is available */ -#undef HAVE_IOCTLSOCKET - -/* Define to 1 if you have the header file. */ -#undef HAVE_IPHLPAPI_H - -/* Define to 1 if you have the `isblank' function. */ -#undef HAVE_ISBLANK - -/* Define to 1 if you have the `kill' function. */ -#undef HAVE_KILL - -/* Use portable libbsd functions */ -#undef HAVE_LIBBSD - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBKERN_OSBYTEORDER_H - -/* Define if we have LibreSSL */ -#undef HAVE_LIBRESSL - -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_NET_TSTAMP_H - -/* Define to 1 if you have the `localtime_r' function. */ -#undef HAVE_LOCALTIME_R - -/* Define to 1 if you have the header file. */ -#undef HAVE_LOGIN_CAP_H - -/* If have GNU libc compatible malloc */ -#undef HAVE_MALLOC - -/* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETDB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_IN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_TCP_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETIOAPI_H - -/* Use libnettle for crypto */ -#undef HAVE_NETTLE - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETTLE_DSA_COMPAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETTLE_EDDSA_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NET_IF_H - -/* Define this to use nghttp2 client. */ -#undef HAVE_NGHTTP2 - -/* Define to 1 if you have the header file. */ -#undef HAVE_NGHTTP2_NGHTTP2_H - -/* Use libnss for crypto */ -#undef HAVE_NSS - -/* Define to 1 if you have the `OpenSSL_add_all_digests' function. */ -#undef HAVE_OPENSSL_ADD_ALL_DIGESTS - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_BN_H - -/* Define to 1 if you have the `OPENSSL_config' function. */ -#undef HAVE_OPENSSL_CONFIG - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_CONF_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_CORE_NAMES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_DH_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_DSA_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_ENGINE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_ERR_H - -/* Define to 1 if you have the `OPENSSL_init_crypto' function. */ -#undef HAVE_OPENSSL_INIT_CRYPTO - -/* Define to 1 if you have the `OPENSSL_init_ssl' function. */ -#undef HAVE_OPENSSL_INIT_SSL - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_PARAM_BUILD_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_RAND_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_RSA_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_SSL_H - -/* Define to 1 if you have the `OSSL_PARAM_BLD_new' function. */ -#undef HAVE_OSSL_PARAM_BLD_NEW - -/* Define to 1 if you have the `poll' function. */ -#undef HAVE_POLL - -/* Define to 1 if you have the header file. */ -#undef HAVE_POLL_H - -/* Define if you have POSIX threads libraries and header files. */ -#undef HAVE_PTHREAD - -/* Have PTHREAD_PRIO_INHERIT. */ -#undef HAVE_PTHREAD_PRIO_INHERIT - -/* Define to 1 if the system has the type `pthread_rwlock_t'. */ -#undef HAVE_PTHREAD_RWLOCK_T - -/* Define to 1 if the system has the type `pthread_spinlock_t'. */ -#undef HAVE_PTHREAD_SPINLOCK_T - -/* Define to 1 if you have the header file. */ -#undef HAVE_PWD_H - -/* Define if you have Python libraries and header files. */ -#undef HAVE_PYTHON - -/* Define to 1 if you have the `random' function. */ -#undef HAVE_RANDOM - -/* Define to 1 if you have the `RAND_cleanup' function. */ -#undef HAVE_RAND_CLEANUP - -/* If we have reallocarray(3) */ -#undef HAVE_REALLOCARRAY - -/* Define to 1 if you have the `recvmsg' function. */ -#undef HAVE_RECVMSG - -/* Define to 1 if you have the `sendmsg' function. */ -#undef HAVE_SENDMSG - -/* Define to 1 if you have the `setregid' function. */ -#undef HAVE_SETREGID - -/* Define to 1 if you have the `setresgid' function. */ -#undef HAVE_SETRESGID - -/* Define to 1 if you have the `setresuid' function. */ -#undef HAVE_SETRESUID - -/* Define to 1 if you have the `setreuid' function. */ -#undef HAVE_SETREUID - -/* Define to 1 if you have the `setrlimit' function. */ -#undef HAVE_SETRLIMIT - -/* Define to 1 if you have the `setsid' function. */ -#undef HAVE_SETSID - -/* Define to 1 if you have the `setusercontext' function. */ -#undef HAVE_SETUSERCONTEXT - -/* Define to 1 if you have the `SHA512_Update' function. */ -#undef HAVE_SHA512_UPDATE - -/* Define to 1 if you have the `shmget' function. */ -#undef HAVE_SHMGET - -/* Define to 1 if you have the `sigprocmask' function. */ -#undef HAVE_SIGPROCMASK - -/* Define to 1 if you have the `sleep' function. */ -#undef HAVE_SLEEP - -/* Define to 1 if you have the `snprintf' function. */ -#undef HAVE_SNPRINTF - -/* Define to 1 if you have the `socketpair' function. */ -#undef HAVE_SOCKETPAIR - -/* Using Solaris threads */ -#undef HAVE_SOLARIS_THREADS - -/* Define to 1 if you have the `srandom' function. */ -#undef HAVE_SRANDOM - -/* Define if you have the SSL libraries installed. */ -#undef HAVE_SSL - -/* Define to 1 if you have the `SSL_CTX_set_alpn_protos' function. */ -#undef HAVE_SSL_CTX_SET_ALPN_PROTOS - -/* Define to 1 if you have the `SSL_CTX_set_alpn_select_cb' function. */ -#undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB - -/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */ -#undef HAVE_SSL_CTX_SET_CIPHERSUITES - -/* Define to 1 if you have the `SSL_CTX_set_security_level' function. */ -#undef HAVE_SSL_CTX_SET_SECURITY_LEVEL - -/* Define to 1 if you have the `SSL_CTX_set_tlsext_ticket_key_evp_cb' - function. */ -#undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB - -/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ -#undef HAVE_SSL_GET0_ALPN_SELECTED - -/* Define to 1 if you have the `SSL_get0_peername' function. */ -#undef HAVE_SSL_GET0_PEERNAME - -/* Define to 1 if you have the `SSL_get1_peer_certificate' function. */ -#undef HAVE_SSL_GET1_PEER_CERTIFICATE - -/* Define to 1 if you have the `SSL_set1_host' function. */ -#undef HAVE_SSL_SET1_HOST - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDARG_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDBOOL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strftime' function. */ -#undef HAVE_STRFTIME - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strlcat' function. */ -#undef HAVE_STRLCAT - -/* Define to 1 if you have the `strlcpy' function. */ -#undef HAVE_STRLCPY - -/* Define to 1 if you have the `strptime' function. */ -#undef HAVE_STRPTIME - -/* Define to 1 if you have the `strsep' function. */ -#undef HAVE_STRSEP - -/* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */ -#undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST - -/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */ -#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN - -/* Define if you have Swig libraries and header files. */ -#undef HAVE_SWIG - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYSLOG_H - -/* Define to 1 if systemd should be used */ -#undef HAVE_SYSTEMD - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_ENDIAN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_IPC_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_RESOURCE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SELECT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SHA2_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SHM_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SOCKET_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SYSCTL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_UIO_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_UN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_WAIT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_TARGETCONDITIONALS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_TIME_H - -/* Define to 1 if you have the `tzset' function. */ -#undef HAVE_TZSET - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `usleep' function. */ -#undef HAVE_USLEEP - -/* Define to 1 if you have the `vfork' function. */ -#undef HAVE_VFORK - -/* Define to 1 if you have the header file. */ -#undef HAVE_VFORK_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_WINDOWS_H - -/* Using Windows threads */ -#undef HAVE_WINDOWS_THREADS - -/* Define to 1 if you have the header file. */ -#undef HAVE_WINSOCK2_H - -/* Define to 1 if `fork' works. */ -#undef HAVE_WORKING_FORK - -/* Define to 1 if `vfork' works. */ -#undef HAVE_WORKING_VFORK - -/* Define to 1 if you have the `writev' function. */ -#undef HAVE_WRITEV - -/* Define to 1 if you have the header file. */ -#undef HAVE_WS2TCPIP_H - -/* Define to 1 if you have the `X509_VERIFY_PARAM_set1_host' function. */ -#undef HAVE_X509_VERIFY_PARAM_SET1_HOST - -/* Define to 1 if you have the `_beginthreadex' function. */ -#undef HAVE__BEGINTHREADEX - -/* If HMAC_Init_ex() returns void */ -#undef HMAC_INIT_EX_RETURNS_VOID - -/* if lex has yylex_destroy */ -#undef LEX_HAS_YYLEX_DESTROY - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#undef LT_OBJDIR - -/* Define to the maximum message length to pass to syslog. */ -#undef MAXSYSLOGMSGLEN - -/* Define if memcmp() does not compare unsigned bytes */ -#undef MEMCMP_IS_BROKEN - -/* Define if mkdir has one argument. */ -#undef MKDIR_HAS_ONE_ARG - -/* Define if the network stack does not fully support nonblocking io (causes - lower performance). */ -#undef NONBLOCKING_IS_BROKEN - -/* Put -D_ALL_SOURCE define in config.h */ -#undef OMITTED__D_ALL_SOURCE - -/* Put -D_BSD_SOURCE define in config.h */ -#undef OMITTED__D_BSD_SOURCE - -/* Put -D_DEFAULT_SOURCE define in config.h */ -#undef OMITTED__D_DEFAULT_SOURCE - -/* Put -D_GNU_SOURCE define in config.h */ -#undef OMITTED__D_GNU_SOURCE - -/* Put -D_LARGEFILE_SOURCE=1 define in config.h */ -#undef OMITTED__D_LARGEFILE_SOURCE_1 - -/* Put -D_POSIX_C_SOURCE=200112 define in config.h */ -#undef OMITTED__D_POSIX_C_SOURCE_200112 - -/* Put -D_XOPEN_SOURCE=600 define in config.h */ -#undef OMITTED__D_XOPEN_SOURCE_600 - -/* Put -D_XOPEN_SOURCE_EXTENDED=1 define in config.h */ -#undef OMITTED__D_XOPEN_SOURCE_EXTENDED_1 - -/* Put -D__EXTENSIONS__ define in config.h */ -#undef OMITTED__D__EXTENSIONS__ - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* default pidfile location */ -#undef PIDFILE - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -#undef PTHREAD_CREATE_JOINABLE - -/* Return type of signal handlers, but autoconf 2.70 says 'your code may - safely assume C89 semantics that RETSIGTYPE is void.' */ -#undef RETSIGTYPE - -/* if REUSEPORT is enabled by default */ -#undef REUSEPORT_DEFAULT - -/* default rootkey location */ -#undef ROOT_ANCHOR_FILE - -/* default rootcert location */ -#undef ROOT_CERT_FILE - -/* version number for resource files */ -#undef RSRC_PACKAGE_VERSION - -/* Directory to chdir to */ -#undef RUN_DIR - -/* Shared data */ -#undef SHARE_DIR - -/* The size of `pthread_t', as computed by sizeof. */ -#undef SIZEOF_PTHREAD_T - -/* The size of `size_t', as computed by sizeof. */ -#undef SIZEOF_SIZE_T - -/* The size of `time_t', as computed by sizeof. */ -#undef SIZEOF_TIME_T - -/* The size of `unsigned long', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_LONG - -/* define if (v)snprintf does not return length needed, (but length used) */ -#undef SNPRINTF_RET_BROKEN - -/* Define to 1 if libsodium supports sodium_set_misuse_handler */ -#undef SODIUM_MISUSE_HANDLER - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* use default strptime. */ -#undef STRPTIME_WORKS - -/* Use win32 resources and API */ -#undef UB_ON_WINDOWS - -/* the SYSLOG_FACILITY to use, default LOG_DAEMON */ -#undef UB_SYSLOG_FACILITY - -/* default username */ -#undef UB_USERNAME - -/* use to enable lightweight alloc assertions, for debug use */ -#undef UNBOUND_ALLOC_LITE - -/* use malloc not regions, for debug use */ -#undef UNBOUND_ALLOC_NONREGIONAL - -/* use statistics for allocs and frees, for debug use */ -#undef UNBOUND_ALLOC_STATS - -/* define this to enable debug checks. */ -#undef UNBOUND_DEBUG - -/* Define to 1 to use cachedb support */ -#undef USE_CACHEDB - -/* Define to 1 to enable dnscrypt support */ -#undef USE_DNSCRYPT - -/* Define to 1 to enable dnscrypt with xchacha20 support */ -#undef USE_DNSCRYPT_XCHACHA20 - -/* Define to 1 to enable dnstap support */ -#undef USE_DNSTAP - -/* Define this to enable DSA support. */ -#undef USE_DSA - -/* Define this to enable ECDSA support. */ -#undef USE_ECDSA - -/* Define this to enable an EVP workaround for older openssl */ -#undef USE_ECDSA_EVP_WORKAROUND - -/* Define this to enable ED25519 support. */ -#undef USE_ED25519 - -/* Define this to enable ED448 support. */ -#undef USE_ED448 - -/* Define this to enable GOST support. */ -#undef USE_GOST - -/* Define to 1 to use ipsecmod support. */ -#undef USE_IPSECMOD - -/* Define to 1 to use ipset support */ -#undef USE_IPSET - -/* Define if you enable libevent */ -#undef USE_LIBEVENT - -/* Define this to enable use of /proc/sys/net/ipv4/ip_local_port_range as a - default outgoing port range. This is only for the libunbound on Linux and - does not affect unbound resolving daemon itself. This may severely limit - the number of available outgoing ports and thus decrease randomness. Define - this only when the target system restricts (e.g. some of SELinux enabled - distributions) the use of non-ephemeral ports. */ -#undef USE_LINUX_IP_LOCAL_PORT_RANGE - -/* Define if you want to use internal select based events */ -#undef USE_MINI_EVENT - -/* Define this to enable client TCP Fast Open. */ -#undef USE_MSG_FASTOPEN - -/* Define this to enable client TCP Fast Open. */ -#undef USE_OSX_MSG_FASTOPEN - -/* Define this to use hiredis client. */ -#undef USE_REDIS - -/* Define this to enable SHA1 support. */ -#undef USE_SHA1 - -/* Define this to enable SHA256 and SHA512 support. */ -#undef USE_SHA2 - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif - - -/* Define this to enable server TCP Fast Open. */ -#undef USE_TCP_FASTOPEN - -/* Whether the windows socket API is used */ -#undef USE_WINSOCK - -/* the version of the windows API enabled */ -#undef WINVER - -/* Define if you want dynlib module. */ *** 500 LINES SKIPPED *** From nobody Tue Nov 28 15:15:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmHJ4h80z53DfP; Tue, 28 Nov 2023 15:15: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 4SfmHJ3Y2Fz3GvV; Tue, 28 Nov 2023 15:15:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mWbhVlTxkLYg9dpPD6swBAsmPCfXRbT2jDFZ7+/cu5U=; b=xfucPSgKhBoCongukKsKL356HRKxvZKxxSl0R6HFeIPcW20TBFniC5mQhX7uNU9EylwqHw u7dpMBbESHkwzF84m0N6qoQ+WdRHt4/v27LX+JxdvT7lUxdme9kcQTC2RGt1d4pUV49qCC RcR9i5B4P2RQT0ISodyc2w4SgrEU4/hd8w/H+wgWFlkJKdy4GjqsS92sQFbVdFj2VfyPSy QvFvZfV0ZjIXG8+fAwp+m/sSwo8BphE7KhXwL5iiJEPW00KGbs7dHtsTXmwDxiFCx0SbFk pBizygk8QpU2v7TXhM1DgxCDWXN4ss1dACgNWBTNflLYkGItDgjNXfJZJnbj+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mWbhVlTxkLYg9dpPD6swBAsmPCfXRbT2jDFZ7+/cu5U=; b=fWmFKNo8/z2lBXOr476cPtAlRC4AsSwnuHF1P5zO82YlVK0n2FSThtZAIGZqkXZJNr9wss dOq5yhCOKMctTReOm7QHCD69/LJcrxXeekMQdX0cHvc3m3aFvnWSsD3UpjJ4jgGz1KqfKD rkthsyxof8++YI/+/B+2C42A5wrBz3+vqsAc7v264GlgE1lep28xGHE+e+KgN0nAcYYJnz nJ0KiASMoGHT28zHxNfizW56e/uexKH1BlXcOTCAoYtQQb2MFS6Ba7laijlEkdk39sItKQ C3oitFz+zNafFyW5MAFwSiL3iLh0pQiTteQaJcHBi6dHXOz9GVbnEDPOt3Xqkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184540; a=rsa-sha256; cv=none; b=RrBnKho7CASUYg/SJ7wtbe8YGcD67o8G7dZ9YeMftWqNIzw2ILvcyp2pUS1Qa+afs+h4x7 Nc70yCzuSe9S5IUjbkJpGhxlQlBZduG75cAN1M2SX4J8Bbwxq2JLIuCSpEx9+qhPW0mby8 BPq6WJE8hiiNJjZzkG2mvJKZgDplKAFH3xaUjHZppDE8uShOlb5BUbErNh4dJqZ4LSTi+/ 66lE/2ubB8QpyO2wJu1etCykvdWJLHG1FCm1FRi6I9uYYfSwsVY/ejnMdX7BXgfFEeaNC7 YPWsPuKJTAwgzPqSjbqrcJk5Xhebrn3dwxh/1MAWIXUQdmPXg+i02Sj9owWcQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfmHJ1cWgzC8s; Tue, 28 Nov 2023 15:15: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 3ASFFejN094064; Tue, 28 Nov 2023 15:15:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASFFe6f094060; Tue, 28 Nov 2023 15:15:40 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:15:40 GMT Message-Id: <202311281515.3ASFFe6f094060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 131871527732 - stable/14 - Unbound: Manually update version strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1318715277325a508ad5b76c8cd9c17c8146693b Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=1318715277325a508ad5b76c8cd9c17c8146693b commit 1318715277325a508ad5b76c8cd9c17c8146693b Author: Cy Schubert AuthorDate: 2023-11-14 00:39:10 +0000 Commit: Cy Schubert CommitDate: 2023-11-28 15:15:25 +0000 Unbound: Manually update version strings This was missed earlier today. Reported by: "Herbert J. Skuhra" Fixes: 16fd0b249104 (cherry picked from commit 67267734315c6a48db31697f0a0669fa1f985969) --- lib/libunbound/config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libunbound/config.h b/lib/libunbound/config.h index ef552a856a9d..2fe30076a109 100644 --- a/lib/libunbound/config.h +++ b/lib/libunbound/config.h @@ -793,7 +793,7 @@ #define PACKAGE_NAME "unbound" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "unbound 1.18.0" +#define PACKAGE_STRING "unbound 1.19.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "unbound" @@ -802,7 +802,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.18.0" +#define PACKAGE_VERSION "1.19.0" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" @@ -825,7 +825,7 @@ #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" /* version number for resource files */ -#define RSRC_PACKAGE_VERSION 1,18,0,0 +#define RSRC_PACKAGE_VERSION 1,19,0,0 /* Directory to chdir to */ #define RUN_DIR "/var/unbound" From nobody Tue Nov 28 15:15:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmHL4Xjzz53DfX; Tue, 28 Nov 2023 15:15: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 4SfmHK6RzMz3GtB; Tue, 28 Nov 2023 15:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6mbaCQ2n2Vdb745IHa8A6EsAdYf6UNVnCPlyVyPcbAY=; b=cKzzBl/ZIOpkR1lc5raUvoXsOcM+TYYgvtmnCigI/1UvIAnyzCk0buhjwEGoEogqaBRh5t 7Qd+AGg3DbAnC+TY0TqH/ER6FfP/wpujYlKyM2c1sll96WmcVVLNZNoeNCPb5ifch1uJXF hVXBAa9G8RBhlgp0DFCzMitZ3lQwHTFlt58dZaUMqWmbUeZnPSFFoYksmD+dcP6ndR5/CJ 4AZTEKDf7MAE1SCgXJ0ahNuQ2EksC0b8+dRhTWK8PnvIDCZtudSPXwQMwz7NUuzWNfL1aF 4+TvNA14iSgASPpU6k+gOOFTQCy4FWGoBLMtvxX0ZOkshSUGofMPanRAqlgUwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6mbaCQ2n2Vdb745IHa8A6EsAdYf6UNVnCPlyVyPcbAY=; b=yy+SBPTdQRDJ1StH6tPadkZmZCfDDnk9drKYJ4vwdHB9po3EbhpFhU2rKxLC1aRmVB0WW1 gMKG99Fg/DYW8cPR3u3Fs6LspP/1lY6ghaYiRSpHHhfzzrovCj0Tv1++B5po02giXLcy48 hjD7sQBjqkosvEHHsTLOpsDoFtZjjQl5nuwbkXCZV9rqmzxzLmoWYtUzywdOZ2nz+s1eUC 9TgEdY5KOw9pCpXcj9Sl+3DeHbKxi5PoL6Zksxft5YytDSiJ/ICjGQIDlj4/Bh7b9Qg6eP H/mnl/xd4TzhWaH6p264whlXLjzcNoMUCGOXiUOJIU0CepCg0y6JQabhM4z9ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184541; a=rsa-sha256; cv=none; b=csY8KvfX4h3LyNvFd764N1znGKD1RUg+aAJoa0KW3qHlzEqCR9pb3u1M3oPRahEz+V/dnq 18JuH7UqpFxVVmROw15Cs5SfdU+b7nQIqeOVdveQVDJPUuUjsrGdSivy8+stTvk9h9Avxy 93cn8xM3NONWI+bWww5R+s9k2hvJtYehUReVfvOmBDonGogwgTNc2ooipOjxg58M7JpXxw OeJpHWbVe2/EtUiUc7c3pBiHzDlMCFMRjN9SIdVey2HJFbdqUoXJdhCHEorpGK2a9SMq3H g56gO+oxpWdqXtgBUi8SClhNMKGoFLSl1K7Hah0Udst1ZVOkg0M2mGjvuBRTIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfmHK4mpnzBsF; Tue, 28 Nov 2023 15:15: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 3ASFFfAZ094111; Tue, 28 Nov 2023 15:15:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASFFfpT094108; Tue, 28 Nov 2023 15:15:41 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:15:41 GMT Message-Id: <202311281515.3ASFFfpT094108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 4ebd34fbd5c7 - stable/14 - libevent: Import libevent 2.1.12 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4ebd34fbd5c77f615a4cc0df555a0fbc0477f98e Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4ebd34fbd5c77f615a4cc0df555a0fbc0477f98e commit 4ebd34fbd5c77f615a4cc0df555a0fbc0477f98e Author: Cy Schubert AuthorDate: 2023-11-14 23:04:28 +0000 Commit: Cy Schubert CommitDate: 2023-11-28 15:15:25 +0000 libevent: Import libevent 2.1.12 Merge commit '5223d1d95fddcef6f9a36e264a5800bd907ade8b' into main (cherry picked from commit b50261e21f39a6c7249a49e7b60aa878c98512a8) --- contrib/libevent/CMakeLists.txt | 1575 +++++++++ contrib/libevent/ChangeLog | 313 ++ contrib/libevent/ChangeLog-1.4 | 2 +- contrib/libevent/ChangeLog-2.0 | 2 +- contrib/libevent/Doxyfile | 46 +- contrib/libevent/Makefile.am | 67 +- contrib/libevent/Makefile.in | 1486 ++++++--- contrib/libevent/README.md | 487 +++ contrib/libevent/WIN32-Code/getopt.c | 149 + contrib/libevent/WIN32-Code/getopt.h | 33 + contrib/libevent/WIN32-Code/getopt_long.c | 234 ++ .../WIN32-Code/nmake/event2/event-config.h | 26 +- contrib/libevent/aclocal.m4 | 193 +- contrib/libevent/arc4random.c | 40 +- contrib/libevent/buffer.c | 50 +- contrib/libevent/buffer_iocp.c | 1 + contrib/libevent/bufferevent-internal.h | 36 + contrib/libevent/bufferevent.c | 115 +- contrib/libevent/bufferevent_async.c | 66 +- contrib/libevent/bufferevent_filter.c | 10 +- contrib/libevent/bufferevent_openssl.c | 75 +- contrib/libevent/bufferevent_pair.c | 4 +- contrib/libevent/bufferevent_ratelim.c | 9 +- contrib/libevent/bufferevent_sock.c | 74 +- contrib/libevent/{ => build-aux}/compile | 17 +- contrib/libevent/{ => build-aux}/config.guess | 970 +++--- contrib/libevent/build-aux/config.sub | 1793 +++++++++++ contrib/libevent/{ => build-aux}/depcomp | 10 +- contrib/libevent/{ => build-aux}/install-sh | 60 +- contrib/libevent/{ => build-aux}/ltmain.sh | 766 +++-- contrib/libevent/{ => build-aux}/missing | 16 +- contrib/libevent/{ => build-aux}/test-driver | 10 +- contrib/libevent/cmake/AddCompilerFlags.cmake | 13 + contrib/libevent/cmake/AddEventLibrary.cmake | 193 ++ contrib/libevent/cmake/COPYING-CMAKE-SCRIPTS | 22 + contrib/libevent/cmake/CheckConstExists.cmake | 25 + contrib/libevent/cmake/CheckFileOffsetBits.c | 14 + contrib/libevent/cmake/CheckFileOffsetBits.cmake | 43 + contrib/libevent/cmake/CheckFunctionKeywords.cmake | 14 + .../libevent/cmake/CheckPrototypeDefinition.c.in | 29 + .../libevent/cmake/CheckPrototypeDefinition.cmake | 82 + contrib/libevent/cmake/CheckWorkingKqueue.cmake | 52 + contrib/libevent/cmake/CodeCoverage.cmake | 165 + contrib/libevent/cmake/Copyright.txt | 57 + contrib/libevent/cmake/LibeventConfig.cmake.in | 183 ++ .../libevent/cmake/LibeventConfigVersion.cmake.in | 11 + contrib/libevent/cmake/Macros.cmake | 36 + contrib/libevent/cmake/Uninstall.cmake.in | 23 + contrib/libevent/cmake/UseDoxygen.cmake | 111 + contrib/libevent/cmake/VersionViaGit.cmake | 66 + contrib/libevent/config.h.in | 63 +- contrib/libevent/config.sub | 1807 ----------- contrib/libevent/configure | 3390 +++++++++++++++++--- contrib/libevent/configure.ac | 328 +- contrib/libevent/defer-internal.h | 3 + contrib/libevent/doxygen.am | 55 + contrib/libevent/epoll.c | 15 +- contrib/libevent/epolltable-internal.h | 2 +- contrib/libevent/evbuffer-internal.h | 2 +- contrib/libevent/evconfig-private.h.cmake | 40 + contrib/libevent/evconfig-private.h.in | 7 + contrib/libevent/evdns.c | 144 +- contrib/libevent/event-config.h.cmake | 513 +++ contrib/libevent/event-internal.h | 13 +- contrib/libevent/event.c | 392 ++- contrib/libevent/event_iocp.c | 2 +- contrib/libevent/event_rpcgen.py | 2057 ++++++------ contrib/libevent/event_tagging.c | 4 + contrib/libevent/evmap.c | 43 +- contrib/libevent/evrpc.c | 6 +- contrib/libevent/evthread-internal.h | 16 +- contrib/libevent/evthread.c | 2 +- contrib/libevent/evutil.c | 144 +- contrib/libevent/evutil_rand.c | 6 +- contrib/libevent/evutil_time.c | 65 +- contrib/libevent/http-internal.h | 9 +- contrib/libevent/http.c | 254 +- contrib/libevent/include/event2/buffer.h | 3 +- contrib/libevent/include/event2/buffer_compat.h | 3 +- contrib/libevent/include/event2/bufferevent.h | 11 +- .../libevent/include/event2/bufferevent_compat.h | 4 + contrib/libevent/include/event2/dns.h | 46 +- contrib/libevent/include/event2/dns_compat.h | 24 +- contrib/libevent/include/event2/event.h | 77 +- contrib/libevent/include/event2/http.h | 13 +- contrib/libevent/include/event2/http_compat.h | 6 +- contrib/libevent/include/event2/listener.h | 12 + contrib/libevent/include/event2/rpc.h | 48 +- contrib/libevent/include/event2/rpc_struct.h | 14 + contrib/libevent/include/event2/util.h | 34 +- contrib/libevent/include/event2/visibility.h | 31 +- contrib/libevent/include/include.am | 7 +- contrib/libevent/iocp-internal.h | 14 + contrib/libevent/kqueue.c | 17 +- contrib/libevent/listener.c | 29 +- contrib/libevent/log-internal.h | 25 +- contrib/libevent/log.c | 11 +- contrib/libevent/m4/ax_check_funcs_ex.m4 | 22 + contrib/libevent/m4/ax_prog_doxygen.m4 | 600 ++++ contrib/libevent/m4/libevent_openssl.m4 | 9 + contrib/libevent/m4/libtool.m4 | 102 +- contrib/libevent/m4/ltoptions.m4 | 2 +- contrib/libevent/m4/ltsugar.m4 | 2 +- contrib/libevent/m4/ltversion.m4 | 12 +- contrib/libevent/m4/lt~obsolete.m4 | 2 +- contrib/libevent/make-event-config.sed | 10 +- contrib/libevent/minheap-internal.h | 6 +- contrib/libevent/mm-internal.h | 5 + contrib/libevent/openssl-compat.h | 16 +- contrib/libevent/poll.c | 25 +- contrib/libevent/sample/dns-example.c | 17 +- contrib/libevent/sample/event-read-fifo.c | 4 +- contrib/libevent/sample/hello-world.c | 3 +- contrib/libevent/sample/http-connect.c | 86 +- contrib/libevent/sample/http-server.c | 292 +- contrib/libevent/sample/https-client.c | 88 +- contrib/libevent/sample/include.am | 11 +- contrib/libevent/sample/le-proxy.c | 16 +- .../libevent/sample/openssl_hostname_validation.c | 3 +- contrib/libevent/sample/signal-test.c | 25 +- contrib/libevent/sample/time-test.c | 7 +- contrib/libevent/select.c | 2 +- contrib/libevent/signal.c | 2 + contrib/libevent/strlcpy-internal.h | 2 + contrib/libevent/test/bench.c | 60 +- contrib/libevent/test/bench_cascade.c | 8 +- contrib/libevent/test/bench_http.c | 3 + contrib/libevent/test/bench_httpclient.c | 4 +- contrib/libevent/test/check-dumpevents.py | 10 +- contrib/libevent/test/include.am | 43 +- contrib/libevent/test/print-winsock-errors.c | 86 + contrib/libevent/test/regress.c | 332 +- contrib/libevent/test/regress.gen.c | 105 +- contrib/libevent/test/regress.gen.h | 11 +- contrib/libevent/test/regress.h | 7 +- contrib/libevent/test/regress_buffer.c | 369 ++- contrib/libevent/test/regress_bufferevent.c | 156 +- contrib/libevent/test/regress_dns.c | 522 ++- contrib/libevent/test/regress_et.c | 146 +- contrib/libevent/test/regress_finalize.c | 48 + contrib/libevent/test/regress_http.c | 479 ++- contrib/libevent/test/regress_listener.c | 100 +- contrib/libevent/test/regress_main.c | 68 +- contrib/libevent/test/regress_rpc.c | 49 +- contrib/libevent/test/regress_ssl.c | 404 ++- contrib/libevent/test/regress_testutils.c | 2 +- contrib/libevent/test/regress_thread.c | 8 +- contrib/libevent/test/regress_thread.h | 34 +- contrib/libevent/test/regress_util.c | 196 +- contrib/libevent/test/rpcgen_wrapper.sh | 11 +- contrib/libevent/test/test-changelist.c | 4 +- contrib/libevent/test/test-closed.c | 1 + contrib/libevent/test/test-eof.c | 4 +- contrib/libevent/test/test-fdleak.c | 15 +- contrib/libevent/test/test-init.c | 2 +- contrib/libevent/test/test-ratelim.c | 87 +- contrib/libevent/test/test-time.c | 25 +- contrib/libevent/test/test-weof.c | 4 +- contrib/libevent/test/test.sh | 4 +- contrib/libevent/test/tinytest.c | 169 +- contrib/libevent/test/tinytest.h | 5 +- contrib/libevent/test/tinytest_macros.h | 12 +- contrib/libevent/time-internal.h | 3 + contrib/libevent/util-internal.h | 72 +- contrib/libevent/win32select.c | 3 +- 165 files changed, 18349 insertions(+), 6378 deletions(-) diff --git a/contrib/libevent/CMakeLists.txt b/contrib/libevent/CMakeLists.txt new file mode 100644 index 000000000000..676727f16563 --- /dev/null +++ b/contrib/libevent/CMakeLists.txt @@ -0,0 +1,1575 @@ +# +# Libevent CMake project +# +# Based on initial work by: +# Alexey Ozeritsky +# +# Additional changes: +# Brodie Thiesfield +# Joakim Soderberg +# Trond Norbye +# Sergei Nikulov +# +# Build example: +# +# cd libevent +# md build +# cd build +# cmake -G "Visual Studio 10" .. +# start libevent.sln +# + +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) + +if (POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +endif() +if (POLICY CMP0074) + cmake_policy(SET CMP0074 NEW) +endif() +if (POLICY CMP0075) + cmake_policy(SET CMP0075 NEW) +endif() + +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release + CACHE STRING "Set build type to Debug o Release (default Release)" FORCE) +endif() +string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) + +# get rid of the extra default configurations +# what? why would you get id of other useful build types? - Ellzey +set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Limited configurations" FORCE) + +set(EVENT__LIBRARY_TYPE DEFAULT CACHE STRING + "Set library type to SHARED/STATIC/BOTH (default SHARED for MSVC, otherwise BOTH)") + +project(libevent C) + +list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/") +string(REGEX MATCH "SunOS" SOLARIS "${CMAKE_SYSTEM_NAME}") + + +include(CheckTypeSize) +include(CheckFileOffsetBits) +include(Macros) +include(CheckVariableExists) +include(CheckSymbolExists) +include(CheckStructHasMember) +include(CheckCSourceCompiles) +include(CheckPrototypeDefinition) +include(CheckFunctionKeywords) +include(CheckConstExists) +include(AddCompilerFlags) +include(VersionViaGit) + +event_fuzzy_version_from_git() + +set(EVENT_VERSION_MAJOR ${EVENT_GIT___VERSION_MAJOR}) +set(EVENT_VERSION_MINOR ${EVENT_GIT___VERSION_MINOR}) +set(EVENT_VERSION_PATCH ${EVENT_GIT___VERSION_PATCH}) +set(EVENT_VERSION_STAGE ${EVENT_GIT___VERSION_STAGE}) + + +set(EVENT_ABI_MAJOR ${EVENT_VERSION_MAJOR}) +set(EVENT_ABI_MINOR ${EVENT_VERSION_MINOR}) +set(EVENT_ABI_PATCH ${EVENT_VERSION_PATCH}) + +set(EVENT_ABI_LIBVERSION + "${EVENT_ABI_MAJOR}.${EVENT_ABI_MINOR}.${EVENT_ABI_PATCH}") + +set(EVENT_PACKAGE_VERSION + "${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}") + +set(EVENT_NUMERIC_VERSION 0x02010c00) +# equals to VERSION_INFO in Makefile.am +set(EVENT_ABI_LIBVERSION_CURRENT 7) +set(EVENT_ABI_LIBVERSION_REVISION 1) +set(EVENT_ABI_LIBVERSION_AGE 0) + +# equals to RELEASE in Makefile.am +set(EVENT_PACKAGE_RELEASE 2.1) + +# only a subset of names can be used, defaults to "beta" +set(EVENT_STAGE_NAME ${EVENT_VERSION_STAGE}) + +# a list that defines what can set for EVENT_STAGE_VERSION +set(EVENT__ALLOWED_STAGE_NAMES + rc + beta + alpha + alpha-dev + release + stable +) +list( + FIND EVENT__ALLOWED_STAGE_NAMES + "${EVENT_STAGE_NAME}" + EVENT__STAGE_RET +) +if (EVENT__STAGE_RET EQUAL -1) + message(WARNING + "stage ${EVENT_STAGE_NAME} is not allowed, reset to beta") + set(EVENT_STAGE_NAME beta) +endif() + +set(EVENT_VERSION + "${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}-${EVENT_STAGE_NAME}") + +option(EVENT__DISABLE_DEBUG_MODE + "Define if libevent should build without support for a debug mode" OFF) + +option(EVENT__ENABLE_VERBOSE_DEBUG + "Enables verbose debugging" OFF) + +option(EVENT__DISABLE_MM_REPLACEMENT + "Define if libevent should not allow replacing the mm functions" OFF) + +option(EVENT__DISABLE_THREAD_SUPPORT + "Define if libevent should not be compiled with thread support" OFF) + +option(EVENT__DISABLE_OPENSSL + "Define if libevent should build without support for OpenSSL encryption" OFF) + +option(EVENT__DISABLE_BENCHMARK + "Defines if libevent should build without the benchmark executables" OFF) + +option(EVENT__DISABLE_TESTS + "If tests should be compiled or not" OFF) + +option(EVENT__DISABLE_REGRESS + "Disable the regress tests" OFF) + +option(EVENT__DISABLE_SAMPLES + "Disable sample files" OFF) + +option(EVENT__DISABLE_CLOCK_GETTIME + "Do not use clock_gettime even if it is available" OFF) + +option(EVENT__FORCE_KQUEUE_CHECK + "When crosscompiling forces running a test program that verifies that Kqueue works with pipes. Note that this requires you to manually run the test program on the cross compilation target to verify that it works. See cmake documentation for try_run for more details" OFF) + +# TODO: Add --disable-largefile omit support for large files +option(EVENT__COVERAGE +"Enable running gcov to get a test coverage report (only works with GCC/CLang). Make sure to enable -DCMAKE_BUILD_TYPE=Debug as well." OFF) + +# Put the libaries and binaries that get built into directories at the +# top of the build tree rather than in hard-to-find leaf directories. +# +# But only if this variables are not defined yet +# (i.e. libevent is used via add_subdirectory()) +if (NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) +endif() +if (NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) +endif() +if (NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) +endif() + +if (EVENT__ENABLE_VERBOSE_DEBUG) + add_definitions(-DUSE_DEBUG=1) +endif() + +# make it colorful under ninja-build +if ("${CMAKE_GENERATOR}" STREQUAL "Ninja") + add_compiler_flags(-fdiagnostics-color=always) +endif() + +# Setup compiler flags for coverage. +if (EVENT__COVERAGE) + if (NOT "${CMAKE_BUILD_TYPE_LOWER}" STREQUAL "debug") + message(FATAL_ERROR "Coverage requires -DCMAKE_BUILD_TYPE=Debug") + endif() + + message(STATUS "Setting coverage compiler flags") + + set(CMAKE_REQUIRED_LIBRARIES "--coverage") + add_compiler_flags(-g -O0 --coverage) + set(CMAKE_REQUIRED_LIBRARIES "") +endif() + +set(GNUC 0) +set(CLANG 0) +set(MSVC 0) +if (("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") OR + ("${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")) + set(CLANG 1) +endif() +if (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR (${CLANG})) + set(GNUC 1) +endif() +if (("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") OR (${CLANG})) + set(MSVC 1) +endif() + +# Detect library type +set(EVENT_LIBRARY_TYPE) +if ("${EVENT__LIBRARY_TYPE}" STREQUAL "DEFAULT") + if (${MSVC}) + set(EVENT_LIBRARY_TYPE SHARED) + else() + set(EVENT_LIBRARY_TYPE BOTH) + endif() +else() + string(TOUPPER "${EVENT__LIBRARY_TYPE}" EVENT_LIBRARY_TYPE) +endif() +if ((${MSVC}) AND ("${EVENT_LIBRARY_TYPE}" STREQUAL "BOTH")) + message(WARNING + "Building SHARED and STATIC is not supported for MSVC " + "(due to conflicts in library name" + " between STATIC library and IMPORTED library for SHARED libraries)") +endif() +set(EVENT_LIBRARY_STATIC OFF) +set(EVENT_LIBRARY_SHARED OFF) +if ("${EVENT_LIBRARY_TYPE}" STREQUAL "BOTH") + set(EVENT_LIBRARY_STATIC ON) + set(EVENT_LIBRARY_SHARED ON) +elseif ("${EVENT_LIBRARY_TYPE}" STREQUAL "STATIC") + set(EVENT_LIBRARY_STATIC ON) +elseif ("${EVENT_LIBRARY_TYPE}" STREQUAL "SHARED") + set(EVENT_LIBRARY_SHARED ON) +else() + message(FATAL_ERROR "${EVENT_LIBRARY_TYPE} is not supported") +endif() + +if (${MSVC}) + set(msvc_static_runtime OFF) + if ("${EVENT_LIBRARY_TYPE}" STREQUAL "STATIC") + set(msvc_static_runtime ON) + endif() + + # For more info: + # - https://docs.microsoft.com/en-us/cpp/build/reference/md-mt-ld-use-run-time-library?view=vs-2017 + # - https://gitlab.kitware.com/cmake/community/wikis/FAQ#how-can-i-build-my-msvc-application-with-a-static-runtime + option(EVENT__MSVC_STATIC_RUNTIME + "Link static runtime libraries" + ${msvc_static_runtime}) + + if (EVENT__MSVC_STATIC_RUNTIME) + foreach (flag_var + CMAKE_C_FLAGS_DEBUG + CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL + CMAKE_C_FLAGS_RELWITHDEBINFO + ) + if (${flag_var} MATCHES "/MD") + string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + endif() + endforeach() + endif() +endif() + +# GNUC specific options. +if (${GNUC}) + option(EVENT__DISABLE_GCC_WARNINGS "Disable verbose warnings with GCC" OFF) + option(EVENT__ENABLE_GCC_HARDENING "Enable compiler security checks" OFF) + option(EVENT__ENABLE_GCC_FUNCTION_SECTIONS "Enable gcc function sections" OFF) + option(EVENT__ENABLE_GCC_WARNINGS "Make all GCC warnings into errors" OFF) + + set(GCC_V ${CMAKE_C_COMPILER_VERSION}) + + list(APPEND __FLAGS + -Wall -Wextra -Wno-unused-parameter -Wstrict-aliasing -Wstrict-prototypes + + -fno-strict-aliasing # gcc 2.9.5+ + -Wmissing-prototypes + + # gcc 4 + -Winit-self + -Wmissing-field-initializers + -Wdeclaration-after-statement + + # gcc 4.2 + -Waddress + -Wnormalized=id + -Woverride-init + + # gcc 4.5 + -Wlogical-op + + -Wwrite-strings + ) + + if (${CLANG}) + list(APPEND __FLAGS -Wno-unused-function) + endif() + + if (EVENT__DISABLE_GCC_WARNINGS) + list(APPEND __FLAGS -w) + endif() + + if (EVENT__ENABLE_GCC_HARDENING) + list(APPEND __FLAGS + -fstack-protector-all + -fwrapv + -fPIE + -Wstack-protector + "--param ssp-buffer-size=1") + + add_definitions(-D_FORTIFY_SOURCE=2) + endif() + + if (EVENT__ENABLE_GCC_FUNCTION_SECTIONS) + list(APPEND __FLAGS -ffunction-sections) + # TODO: Add --gc-sections support. We need some checks for NetBSD to ensure this works. + endif() + + if (EVENT__ENABLE_GCC_WARNINGS) + list(APPEND __FLAGS -Werror) + endif() + + add_compiler_flags(${__FLAGS}) +endif() + +if (APPLE) + # Get rid of deprecated warnings for OpenSSL on OSX 10.7 and greater. + add_compiler_flags( + -Wno-error=deprecated-declarations + -Qunused-arguments + ) +endif() + +if (MINGW OR CYGWIN) + set(WIN32 TRUE) +endif() + +# Winsock. +if(WIN32) + set(CMAKE_REQUIRED_LIBRARIES ws2_32 shell32 advapi32) + set(CMAKE_REQUIRED_DEFINITIONS -FIwinsock2.h -FIws2tcpip.h -D_WIN32_WINNT=0x0600) +endif() +if (SOLARIS) + set(CMAKE_REQUIRED_LIBRARIES socket nsl) +endif() + +# Check if _GNU_SOURCE is available. +if (NOT DEFINED _GNU_SOURCE) + CHECK_SYMBOL_EXISTS(__GNU_LIBRARY__ "features.h" _GNU_SOURCE) + + if (NOT _GNU_SOURCE) + unset(_GNU_SOURCE CACHE) + CHECK_SYMBOL_EXISTS(_GNU_SOURCE "features.h" _GNU_SOURCE) + endif() + + if (ANDROID) + set(_GNU_SOURCE TRUE) + endif() +endif() + +if (_GNU_SOURCE) + add_definitions(-D_GNU_SOURCE=1) + set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) +endif() + +# Check if header files exist +list(APPEND FILES_TO_CHECK + fcntl.h + inttypes.h + memory.h + signal.h + stdarg.h + stddef.h + stdint.h + stdlib.h + string.h + errno.h + unistd.h + time.h + sys/types.h + sys/stat.h + sys/time.h + sys/param.h +) +if (WIN32) + list(APPEND FILES_TO_CHECK + io.h + winsock2.h + ws2tcpip.h + afunix.h + ) +else() + list(APPEND FILES_TO_CHECK + netdb.h + dlfcn.h + arpa/inet.h + poll.h + port.h + sys/socket.h + sys/random.h + sys/un.h + sys/devpoll.h + sys/epoll.h + sys/eventfd.h + sys/event.h + sys/ioctl.h + sys/mman.h + sys/queue.h + sys/select.h + sys/sendfile.h + sys/uio.h + sys/wait.h + sys/resource.h + sys/timerfd.h + netinet/in.h + netinet/in6.h + netinet/tcp.h + ifaddrs.h + ) +endif() + +if (NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux") + list(APPEND FILES_TO_CHECK sys/sysctl.h) +endif() + +if (APPLE) + list(APPEND FILES_TO_CHECK + mach/mach_time.h + mach/mach.h + ) +endif() + +foreach(FILE ${FILES_TO_CHECK}) + CHECK_INCLUDE_FILE_CONCAT(${FILE} "EVENT") +endforeach() +unset(FILES_TO_CHECK) + +# Check if functions exist +list(APPEND SYMBOLS_TO_CHECK + getaddrinfo + getnameinfo + getprotobynumber + getservbyname + gethostbyname + inet_ntop + inet_pton + gettimeofday + signal + strtoll + splice + strlcpy + strsep + strtok_r + vasprintf + timerclear + timercmp + timerisset + timeradd + nanosleep + putenv + umask +) +if (NOT EVENT__DISABLE_CLOCK_GETTIME) + list(APPEND SYMBOLS_TO_CHECK clock_gettime) +endif() + +if (WIN32) + list(APPEND SYMBOLS_TO_CHECK + _gmtime64_s + _gmtime64 + ) +else() + list(APPEND SYMBOLS_TO_CHECK + getifaddrs + select + epoll_create + epoll_create1 + epoll_ctl + eventfd + poll + port_create + kqueue + fcntl + mmap + pipe + pipe2 + sendfile + sigaction + strsignal + sysctl + accept4 + arc4random + arc4random_buf + arc4random_addrandom + getrandom + getegid + geteuid + issetugid + usleep + timerfd_create + setenv + unsetenv + setrlimit + gethostbyname_r + ) + if (APPLE) + list(APPEND SYMBOLS_TO_CHECK mach_absolute_time) + endif() +endif() + +# Add stdio.h for vasprintf +set(EVENT_INCLUDES ${EVENT_INCLUDES} stdio.h) +CHECK_SYMBOLS_EXIST("${SYMBOLS_TO_CHECK}" "${EVENT_INCLUDES}" "EVENT") +unset(SYMBOLS_TO_CHECK) +set(EVENT__HAVE_EPOLL ${EVENT__HAVE_EPOLL_CREATE}) + +# Get the gethostbyname_r prototype. +if(EVENT__HAVE_GETHOSTBYNAME_R) + CHECK_PROTOTYPE_DEFINITION(gethostbyname_r + "int gethostbyname_r(const char *name, struct hostent *hp, struct hostent_data *hdata)" + "0" + "netdb.h" + EVENT__HAVE_GETHOSTBYNAME_R_3_ARG) + + CHECK_PROTOTYPE_DEFINITION(gethostbyname_r + "struct hostent *gethostbyname_r(const char *name, struct hostent *hp, char *buf, size_t buflen, int *herr)" + "NULL" + "netdb.h" + EVENT__HAVE_GETHOSTBYNAME_R_5_ARG) + + CHECK_PROTOTYPE_DEFINITION(gethostbyname_r + "int gethostbyname_r(const char *name, struct hostent *hp, char *buf, size_t buflen, struct hostent **result, int *herr)" + "0" + "netdb.h" + EVENT__HAVE_GETHOSTBYNAME_R_6_ARG) +endif() + +if(HAVE_PORT_H AND HAVE_PORT_CREATE) + set(EVENT__HAVE_EVENT_PORTS 1) +endif() + +# Only `CHECK_TYPE_SIZE()' will use `CMAKE_EXTRA_INCLUDE_FILES' +set(CMAKE_EXTRA_INCLUDE_FILES ${EVENT_INCLUDES}) + +CHECK_TYPE_SIZE("struct sockaddr_un" EVENT__HAVE_STRUCT_SOCKADDR_UN) +CHECK_TYPE_SIZE("uint8_t" EVENT__HAVE_UINT8_T) +CHECK_TYPE_SIZE("uint16_t" EVENT__HAVE_UINT16_T) +CHECK_TYPE_SIZE("uint32_t" EVENT__HAVE_UINT32_T) +CHECK_TYPE_SIZE("uint64_t" EVENT__HAVE_UINT64_T) +CHECK_TYPE_SIZE("short" EVENT__SIZEOF_SHORT BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("int" EVENT__SIZEOF_INT BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("unsigned" EVENT__SIZEOF_UNSIGNED BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("unsigned int" EVENT__SIZEOF_UNSIGNED_INT BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("long" EVENT__SIZEOF_LONG BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("long long" EVENT__SIZEOF_LONG_LONG BUILTIN_TYPES_ONLY) + +if(WIN32) + # These aren't available until Windows Vista. + # But you can still link them. They just won't be found when running the exe. + set(EVENT__HAVE_INET_NTOP 0) + set(EVENT__HAVE_INET_PTON 0) +endif() + +# Check for different inline keyword versions. +check_function_keywords("inline" "__inline" "__inline__") + +if (HAVE_INLINE) + set(EVENT__inline inline) +elseif (HAVE___INLINE) + set(EVENT__inline __inline) +elseif(HAVE___INLINE__) + set(EVENT__inline __inline__) +else() + set(EVENT__inline) +endif() + +# __func__/__FUNCTION__ is not a macros in general +CHECK_SYMBOL_EXISTS("__func__" "" EVENT__HAVE___func__) +CHECK_SYMBOL_EXISTS("__FUNCTION__" "" EVENT__HAVE___FUNCTION__) + +CHECK_SYMBOL_EXISTS(TAILQ_FOREACH sys/queue.h EVENT__HAVE_TAILQFOREACH) +CHECK_CONST_EXISTS(CTL_KERN sys/sysctl.h EVENT__HAVE_DECL_CTL_KERN) +CHECK_CONST_EXISTS(KERN_ARND sys/sysctl.h EVENT__HAVE_DECL_KERN_ARND) +CHECK_SYMBOL_EXISTS(F_SETFD fcntl.h EVENT__HAVE_SETFD) + +CHECK_TYPE_SIZE(fd_mask EVENT__HAVE_FD_MASK) + +CHECK_TYPE_SIZE(size_t EVENT__SIZEOF_SIZE_T) +if(NOT EVENT__SIZEOF_SIZE_T) + set(EVENT__size_t "unsigned") + set(EVENT__SIZEOF_SIZE_T ${EVENT__SIZEOF_UNSIGNED}) +else() + set(EVENT__size_t size_t) +endif() + +CHECK_TYPE_SIZE("off_t" EVENT__SIZEOF_OFF_T LANGUAGE C) + + +# XXX we should functionalize these size and type sets. --elley + +# Winssck. +if (_MSC_VER) + list(APPEND CMAKE_EXTRA_INCLUDE_FILES BaseTsd.h) +endif() +CHECK_TYPE_SIZE("ssize_t" EVENT__SIZEOF_SSIZE_T_LOWER LANGUAGE C) +CHECK_TYPE_SIZE("SSIZE_T" EVENT__SIZEOF_SSIZE_T_UPPER LANGUAGE C) + +if (EVENT__SIZEOF_SSIZE_T_LOWER) + set(EVENT__ssize_t "ssize_t") + set(EVENT__SIZEOF_SSIZE_T ${EVENT__SIZEOF_SSIZE_T_LOWER}) +elseif (EVENT__SIZEOF_SSIZE_T_UPPER) + set(EVENT__ssize_t "SSIZE_T") + set(EVENT__SIZEOF_SSIZE_T ${EVENT__SIZEOF_SSIZE_T_UPPER}) +else() + set(EVENT__ssize_t "int") + set(EVENT__SIZEOF_SSIZE_T ${EVENT__SIZEOF_INT}) +endif() + +CHECK_TYPE_SIZE(socklen_t EVENT__SIZEOF_SOCKLEN_T) +if(NOT EVENT__SIZEOF_SOCKLEN_T) + set(EVENT__socklen_t "unsigned int") + set(EVENT__SIZEOF_SOCKLEN_T ${EVENT__SIZEOF_UNSIGNED_INT}) +else() + set(EVENT__socklen_t "socklen_t") +endif() + +CHECK_TYPE_SIZE(pid_t EVENT__SIZEOF_PID_T) +if(NOT EVENT__SIZEOF_PID_T) + set(EVENT__SIZEOF_PID_T ${EVENT__SIZEOF_INT}) +else() + set(EVENT__SIZEOF_PID_T EVENT__SIZEOF_PID_T) +endif() + +if (NOT EVENT__DISABLE_THREAD_SUPPORT) + if (NOT WIN32) + list(APPEND CMAKE_EXTRA_INCLUDE_FILES pthread.h) + endif() + CHECK_TYPE_SIZE(pthread_t EVENT__SIZEOF_PTHREAD_T) +endif() + +if(EVENT__HAVE_CLOCK_GETTIME) + set(EVENT__DNS_USE_CPU_CLOCK_FOR_ID 1) +endif() + +# we're just getting lazy now. +CHECK_TYPE_SIZE("uintptr_t" EVENT__HAVE_UINTPTR_T) +CHECK_TYPE_SIZE("void *" EVENT__SIZEOF_VOID_P) +CHECK_TYPE_SIZE("time_t" EVENT__SIZEOF_TIME_T) + +# Tests file offset bits. +# TODO: Add AIX test for if -D_LARGE_FILES is needed. + +# XXX: Why is this here? we don't even use it. Well, we don't even use it +# on top of that, why is it set in the config.h?! IT_MAKES_NO_SENSE +# I'm commenting it out for now. +# - ellzey + +#CHECK_FILE_OFFSET_BITS() + +# Verify kqueue works with pipes. +if (EVENT__HAVE_KQUEUE) + if ((CMAKE_CROSSCOMPILING OR APPLE) AND NOT EVENT__FORCE_KQUEUE_CHECK) + message(WARNING "Cannot check if kqueue works with pipes when crosscompiling, use EVENT__FORCE_KQUEUE_CHECK to be sure (this requires manually running a test program on the cross compilation target)") + set(EVENT__HAVE_WORKING_KQUEUE 1) + else() + message(STATUS "Checking if kqueue works with pipes...") + include(CheckWorkingKqueue) + endif() +endif() + +if(EVENT__HAVE_NETDB_H) + list(APPEND CMAKE_EXTRA_INCLUDE_FILES netdb.h) + CHECK_TYPE_SIZE("struct addrinfo" EVENT__HAVE_STRUCT_ADDRINFO) +elseif(WIN32) + list(APPEND CMAKE_EXTRA_INCLUDE_FILES ws2tcpip.h) + CHECK_TYPE_SIZE("struct addrinfo" EVENT__HAVE_STRUCT_ADDRINFO) +endif() + +# Check for sockaddr structure sizes. +set(SOCKADDR_HEADERS) +if (WIN32) + set(CMAKE_REQUIRED_DEFINITIONS "-DWIN32_LEAN_AND_MEAN") + if (_MSC_VER LESS 1300) + set(SOCKADDR_HEADERS winsock.h) + else() + set(SOCKADDR_HEADERS winsock2.h ws2tcpip.h) + endif() +else() + if (EVENT__HAVE_NETINET_IN_H) + set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} netinet/in.h) + endif() + + if (EVENT__HAVE_NETINET_IN6_H) + set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} netinet/in6.h) + endif() + + if (EVENT__HAVE_SYS_SOCKET_H) + set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} sys/socket.h) + endif() + + if (EVENT__HAVE_NETDB_H) + set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} netdb.h) + endif() +endif() + +CHECK_TYPE_SIZE("struct in6_addr" EVENT__HAVE_STRUCT_IN6_ADDR) +if(EVENT__HAVE_STRUCT_IN6_ADDR) + CHECK_STRUCT_HAS_MEMBER("struct in6_addr" + s6_addr16 "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR16) + + CHECK_STRUCT_HAS_MEMBER("struct in6_addr" + s6_addr32 "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR32) +endif() + +CHECK_TYPE_SIZE("sa_family_t" EVENT__HAVE_SA_FAMILY_T) +CHECK_TYPE_SIZE("struct sockaddr_in6" EVENT__HAVE_STRUCT_SOCKADDR_IN6) + +if(EVENT__HAVE_STRUCT_SOCKADDR_IN6) + CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" + sin6_len "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN) + + CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" + sin_len "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN) +endif() + +CHECK_TYPE_SIZE("struct sockaddr_storage" EVENT__HAVE_STRUCT_SOCKADDR_STORAGE) +if(EVENT__HAVE_STRUCT_SOCKADDR_STORAGE) + CHECK_STRUCT_HAS_MEMBER("struct sockaddr_storage" + ss_family "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY) + + CHECK_STRUCT_HAS_MEMBER("struct sockaddr_storage" + __ss_family "${SOCKADDR_HEADERS}" EVENT__HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY) +endif() + +CHECK_TYPE_SIZE("struct linger" EVENT__HAVE_STRUCT_LINGER) + +# Group the source files. +set(HDR_PRIVATE + bufferevent-internal.h + changelist-internal.h + defer-internal.h + epolltable-internal.h + evbuffer-internal.h + event-internal.h + evmap-internal.h + evrpc-internal.h + evsignal-internal.h + evthread-internal.h + ht-internal.h + http-internal.h + iocp-internal.h + ipv6-internal.h + log-internal.h + minheap-internal.h + mm-internal.h + ratelim-internal.h + strlcpy-internal.h + util-internal.h + evconfig-private.h + compat/sys/queue.h) + +set(HDR_COMPAT + include/evdns.h + include/evrpc.h + include/event.h + include/evhttp.h + include/evutil.h) + +set(HDR_PUBLIC + include/event2/buffer.h + include/event2/bufferevent.h + include/event2/bufferevent_compat.h + include/event2/bufferevent_struct.h + include/event2/buffer_compat.h + include/event2/dns.h + include/event2/dns_compat.h + include/event2/dns_struct.h + include/event2/event.h + include/event2/event_compat.h + include/event2/event_struct.h + include/event2/http.h + include/event2/http_compat.h + include/event2/http_struct.h + include/event2/keyvalq_struct.h + include/event2/listener.h + include/event2/rpc.h + include/event2/rpc_compat.h + include/event2/rpc_struct.h + include/event2/tag.h + include/event2/tag_compat.h + include/event2/thread.h + include/event2/util.h *** 36060 LINES SKIPPED *** From nobody Tue Nov 28 15:16:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmHn5DRSz53DgD; Tue, 28 Nov 2023 15:16: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 4SfmHn39gCz3Hh6; Tue, 28 Nov 2023 15:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CKuPRjiiAbObNUHtYI4Fw69UmEdJG/CDzB4AiCIvYEE=; b=JGyZTAPPSbPEGU3X7IilzNtcJIeKPHE0X09SfZhYUaKTo9uUwsl+5+71oCgfqRruDQ6Bfy AfhYRh3dYtx2fmbhNWK0sR24hzuGh/P9LGXFwrFmbT8sfq2lSVr0VdKKGla/nM7M3vY09l hiy8MY4VFcjQ7MMRlg8kKDfMUpgT/FOiflGk0pf9NO3Rc49OPYvtJQoXRh4a0KQR8WKwK8 36esB1AA1Iu34EZiFs/Ah7Gr4GMAxbVaFjVdPgl/Z218rUXx36Uf3W86/rIibN4uBIxHFd Nb8S+9j+XM8j8mr/K2xU+8lBzOKKc+HK/8J7wbnRkFQmZQtWLvO4eJ2cPDhu2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CKuPRjiiAbObNUHtYI4Fw69UmEdJG/CDzB4AiCIvYEE=; b=eIj0ikQIcT9SCeKbGcaCKf1DHPBeD4wAwOg0AQSXl48RQ+FCHIbMsEkeck/DbSb58weLp3 jENHF/cpXhFoqQWwSW8cJrbDlE7gOufJNwgjVPrMyAjmZ9YwMBfKVTBJIJcAuefYmyRG5e HgUPzXUD9fxAGFxAtPOgl5fqXTTgfdAoLFvgTegwzscek8opaAV1wnat6zLTlG4hI+oDt7 fkJjWKs4aOKNh2cQGwkgtfb1UmvAR+Vu1trZOtbuwqevMzJr6ndtsRaqLQzIb2E6cKTONs F7mxxwNrIgxrJCtQhrYcVMr+3foSMKE3uvds1K2SMxb50y66V+4LjPDU42L8uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184565; a=rsa-sha256; cv=none; b=vf95rTh/iN88pcM72+0becd1FzOzGu0ebUdI6mBlnS0coqlfV03ENcuAiovdl35kW0TAFE 1iiGgS3hknRncr+6pD66g3KEuI7NTAUWfnq4fViSD6jvHa0uO+lfwIDw+9NcC5a9nRB5do ZHkggCqiyh8mQkBbPKjXkjaqfbJkVTMJNhL03/ZZvrE06EUC04doFp4fInys6e9/eCnUZ4 tYJ9sZfc+FCq25lBjiP294wsbh2CY/aJ2WbO8Fz/8rwP98eNB3vfZSWGevLZm/OvOClvUb RxTFdKUI4YVlANfUj8s4tjalIWik7JrwRBE6DFcxrEEMYEUbEeOZvZC6p2uaBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfmHn1kH9zC8t; Tue, 28 Nov 2023 15:16: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 3ASFG5t2094341; Tue, 28 Nov 2023 15:16:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASFG4ZX094338; Tue, 28 Nov 2023 15:16:04 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:16:04 GMT Message-Id: <202311281516.3ASFG4ZX094338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 5829cbe9b308 - stable/13 - sqlite3: Vendor import of sqlite3 3.44.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5829cbe9b3089375c2d55522179601cc95e84405 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=5829cbe9b3089375c2d55522179601cc95e84405 commit 5829cbe9b3089375c2d55522179601cc95e84405 Author: Cy Schubert AuthorDate: 2023-11-13 16:50:36 +0000 Commit: Cy Schubert CommitDate: 2023-11-28 15:15:53 +0000 sqlite3: Vendor import of sqlite3 3.44.0 Release notes at https://www.sqlite.org/releaselog/3_44_0.html. Obtained from: https://www.sqlite.org/2023/sqlite-autoconf-3440000.tar.gz Merge commit '3a88fe13354325b9f56f07927e654de4f5398707' (cherry picked from commit 7963e4115453c0aa003023386cbbc635de242150) --- contrib/sqlite3/Makefile.msc | 14 +- contrib/sqlite3/configure | 20 +- contrib/sqlite3/configure.ac | 2 +- contrib/sqlite3/shell.c | 404 ++- contrib/sqlite3/sqlite3.c | 6485 ++++++++++++++++++++++++-------------- contrib/sqlite3/sqlite3.h | 199 +- contrib/sqlite3/sqlite3ext.h | 6 + contrib/sqlite3/sqlite3rc.h | 2 +- contrib/sqlite3/tea/configure | 20 +- contrib/sqlite3/tea/configure.ac | 2 +- 10 files changed, 4661 insertions(+), 2493 deletions(-) diff --git a/contrib/sqlite3/Makefile.msc b/contrib/sqlite3/Makefile.msc index 13663d877757..280bb95deb3e 100644 --- a/contrib/sqlite3/Makefile.msc +++ b/contrib/sqlite3/Makefile.msc @@ -52,8 +52,8 @@ MINIMAL_AMALGAMATION = 0 USE_STDCALL = 0 !ENDIF -# Set this non-0 to use structured exception handling (SEH) for WAL mode -# in the core library. +# Use the USE_SEH=0 option on the nmake command line to omit structured +# exception handling (SEH) support. SEH is on by default. # !IFNDEF USE_SEH USE_SEH = 1 @@ -296,6 +296,7 @@ SQLITE3EXEPDB = /pdb:sqlite3sh.pdb !IFNDEF OPT_FEATURE_FLAGS !IF $(MINIMAL_AMALGAMATION)==0 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS5=1 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_GEOPOLY=1 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1 @@ -325,10 +326,11 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RBU=1 !ENDIF # Should structured exception handling (SEH) be enabled for WAL mode in -# the core library? +# the core library? It is on by default. Only omit it if the +# USE_SEH=0 option is provided on the nmake command-line. # -!IF $(USE_SEH)!=0 -OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_USE_SEH=1 +!IF $(USE_SEH)==0 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_OMIT_SEH=1 !ENDIF # These are the "extended" SQLite compilation options used when compiling for @@ -986,6 +988,8 @@ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_DQS=0 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1 +SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION=1 +SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_STMT_SCANSTATUS=1 !ENDIF diff --git a/contrib/sqlite3/configure b/contrib/sqlite3/configure index 39694c06793b..251e5da23650 100755 --- a/contrib/sqlite3/configure +++ b/contrib/sqlite3/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sqlite 3.43.1. +# Generated by GNU Autoconf 2.71 for sqlite 3.44.0. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.43.1' -PACKAGE_STRING='sqlite 3.43.1' +PACKAGE_VERSION='3.44.0' +PACKAGE_STRING='sqlite 3.44.0' PACKAGE_BUGREPORT='http://www.sqlite.org' PACKAGE_URL='' @@ -1367,7 +1367,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.43.1 to adapt to many kinds of systems. +\`configure' configures sqlite 3.44.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1438,7 +1438,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.43.1:";; + short | recursive ) echo "Configuration of sqlite 3.44.0:";; esac cat <<\_ACEOF @@ -1563,7 +1563,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.43.1 +sqlite configure 3.44.0 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1833,7 +1833,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.43.1, which was +It was created by sqlite $as_me 3.44.0, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3106,7 +3106,7 @@ fi # Define the identity of the package. PACKAGE='sqlite' - VERSION='3.43.1' + VERSION='3.44.0' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -15314,7 +15314,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.43.1, which was +This file was extended by sqlite $as_me 3.44.0, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15373,7 +15373,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -sqlite config.status 3.43.1 +sqlite config.status 3.44.0 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/sqlite3/configure.ac b/contrib/sqlite3/configure.ac index 3d7da8b984c3..cf5fae5d060b 100644 --- a/contrib/sqlite3/configure.ac +++ b/contrib/sqlite3/configure.ac @@ -10,7 +10,7 @@ # AC_PREREQ(2.61) -AC_INIT(sqlite, 3.43.1, http://www.sqlite.org) +AC_INIT(sqlite, 3.44.0, http://www.sqlite.org) AC_CONFIG_SRCDIR([sqlite3.c]) AC_CONFIG_AUX_DIR([.]) diff --git a/contrib/sqlite3/shell.c b/contrib/sqlite3/shell.c index 6b2cdca83d6b..e357f9e9a5f7 100644 --- a/contrib/sqlite3/shell.c +++ b/contrib/sqlite3/shell.c @@ -467,20 +467,25 @@ static int bail_on_error = 0; */ static int stdin_is_interactive = 1; +/* +** If build is for non-RT Windows, without 3rd-party line editing, +** console input and output may be done in a UTF-8 compatible way, +** if the OS is capable of it and the --no-utf8 option is not seen. +*/ #if (defined(_WIN32) || defined(WIN32)) && SHELL_USE_LOCAL_GETLINE \ - && !defined(SHELL_OMIT_WIN_UTF8) + && !defined(SHELL_OMIT_WIN_UTF8) && !SQLITE_OS_WINRT # define SHELL_WIN_UTF8_OPT 1 +/* Record whether to do UTF-8 console I/O translation per stream. */ + static int console_utf8_in = 0; + static int console_utf8_out = 0; +/* Record whether can do UTF-8 or --no-utf8 seen in invocation. */ + static int mbcs_opted = 1; /* Assume cannot do until shown otherwise. */ #else +# define console_utf8_in 0 +# define console_utf8_out 0 # define SHELL_WIN_UTF8_OPT 0 #endif -#if SHELL_WIN_UTF8_OPT -/* -** Setup console for UTF-8 input/output when following variable true. -*/ -static int console_utf8 = 0; -#endif - /* ** On Windows systems we have to know if standard output is a console ** in order to translate UTF-8 into MBCS. The following variable is @@ -614,13 +619,13 @@ static char *dynamicContinuePrompt(void){ #endif /* !defined(SQLITE_OMIT_DYNAPROMPT) */ #if SHELL_WIN_UTF8_OPT -/* Following struct is used for -utf8 operation. */ +/* Following struct is used for UTF-8 console I/O. */ static struct ConsoleState { int stdinEof; /* EOF has been seen on console input */ int infsMode; /* Input file stream mode upon shell start */ UINT inCodePage; /* Input code page upon shell start */ UINT outCodePage; /* Output code page upon shell start */ - HANDLE hConsoleIn; /* Console input handle */ + HANDLE hConsole; /* Console input or output handle */ DWORD consoleMode; /* Console mode upon shell start */ } conState = { 0, 0, 0, 0, INVALID_HANDLE_VALUE, 0 }; @@ -629,50 +634,123 @@ static struct ConsoleState { #endif /* -** Prepare console, (if known to be a WIN32 console), for UTF-8 -** input (from either typing or suitable paste operations) and for -** UTF-8 rendering. This may "fail" with a message to stderr, where -** the preparation is not done and common "code page" issues occur. +** If given stream number is a console, return 1 and get some attributes, +** else return 0 and set the output attributes to invalid values. */ -static void console_prepare(void){ - HANDLE hCI = GetStdHandle(STD_INPUT_HANDLE); - DWORD consoleMode = 0; - if( isatty(0) && GetFileType(hCI)==FILE_TYPE_CHAR - && GetConsoleMode( hCI, &consoleMode) ){ - if( !IsValidCodePage(CP_UTF8) ){ - fprintf(stderr, "Cannot use UTF-8 code page.\n"); - console_utf8 = 0; - return; - } - conState.hConsoleIn = hCI; - conState.consoleMode = consoleMode; - conState.inCodePage = GetConsoleCP(); - conState.outCodePage = GetConsoleOutputCP(); - SetConsoleCP(CP_UTF8); +static short console_attrs(unsigned stnum, HANDLE *pH, DWORD *pConsMode){ + static int stid[3] = { STD_INPUT_HANDLE,STD_OUTPUT_HANDLE,STD_ERROR_HANDLE }; + HANDLE h; + *pH = INVALID_HANDLE_VALUE; + *pConsMode = 0; + if( stnum > 2 ) return 0; + h = GetStdHandle(stid[stnum]); + if( h!=*pH && GetFileType(h)==FILE_TYPE_CHAR && GetConsoleMode(h,pConsMode) ){ + *pH = h; + return 1; + } + return 0; +} + +/* +** Perform a runtime test of Windows console to determine if it can +** do char-stream I/O correctly when the code page is set to CP_UTF8. +** Returns are: 1 => yes it can, 0 => no it cannot +** +** The console's output code page is momentarily set, then restored. +** So this should only be run when the process is given use of the +** console for either input or output. +*/ +static short ConsoleDoesUTF8(void){ + UINT ocp = GetConsoleOutputCP(); + const char TrialUtf8[] = { '\xC8', '\xAB' }; /* "ȫ" or 2 MBCS characters */ + WCHAR aReadBack[1] = { 0 }; /* Read back as 0x022B when decoded as UTF-8. */ + CONSOLE_SCREEN_BUFFER_INFO csbInfo = {0}; + /* Create an inactive screen buffer with which to do the experiment. */ + HANDLE hCSB = CreateConsoleScreenBuffer(GENERIC_READ|GENERIC_WRITE, 0, 0, + CONSOLE_TEXTMODE_BUFFER, NULL); + if( hCSB!=INVALID_HANDLE_VALUE ){ + COORD cpos = {0,0}; + DWORD rbc; + SetConsoleCursorPosition(hCSB, cpos); SetConsoleOutputCP(CP_UTF8); - consoleMode |= ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT; - SetConsoleMode(conState.hConsoleIn, consoleMode); + /* Write 2 chars which are a single character in UTF-8 but more in MBCS. */ + WriteConsoleA(hCSB, TrialUtf8, sizeof(TrialUtf8), NULL, NULL); + ReadConsoleOutputCharacterW(hCSB, &aReadBack[0], 1, cpos, &rbc); + GetConsoleScreenBufferInfo(hCSB, &csbInfo); + SetConsoleOutputCP(ocp); + CloseHandle(hCSB); + } + /* Return 1 if cursor advanced by 1 position, else 0. */ + return (short)(csbInfo.dwCursorPosition.X == 1 && aReadBack[0] == 0x022B); +} + +static short in_console = 0; +static short out_console = 0; + +/* +** Determine whether either normal I/O stream is the console, +** and whether it can do UTF-8 translation, setting globals +** in_console, out_console and mbcs_opted accordingly. +*/ +static void probe_console(void){ + HANDLE h; + DWORD cMode; + in_console = console_attrs(0, &h, &cMode); + out_console = console_attrs(1, &h, &cMode); + if( in_console || out_console ) mbcs_opted = !ConsoleDoesUTF8(); +} + +/* +** If console is used for normal I/O, absent a --no-utf8 option, +** prepare console for UTF-8 input (from either typing or suitable +** paste operations) and/or for UTF-8 output rendering. +** +** The console state upon entry is preserved, in conState, so that +** console_restore() can later restore the same console state. +** +** The globals console_utf8_in and console_utf8_out are set, for +** later use in selecting UTF-8 or MBCS console I/O translations. +** This routine depends upon globals set by probe_console(). +*/ +static void console_prepare_utf8(void){ + struct ConsoleState csWork = { 0, 0, 0, 0, INVALID_HANDLE_VALUE, 0 }; + + console_utf8_in = console_utf8_out = 0; + if( (!in_console && !out_console) || mbcs_opted ) return; + console_attrs((in_console)? 0 : 1, &conState.hConsole, &conState.consoleMode); + conState.inCodePage = GetConsoleCP(); + conState.outCodePage = GetConsoleOutputCP(); + if( in_console ){ + SetConsoleCP(CP_UTF8); + DWORD newConsoleMode = conState.consoleMode + | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT; + SetConsoleMode(conState.hConsole, newConsoleMode); conState.infsMode = _setmode(_fileno(stdin), _O_U16TEXT); - console_utf8 = 1; - }else{ - console_utf8 = 0; + console_utf8_in = 1; + } + if( out_console ){ + SetConsoleOutputCP(CP_UTF8); + console_utf8_out = 1; } } /* -** Undo the effects of console_prepare(), if any. +** Undo the effects of console_prepare_utf8(), if any. */ static void SQLITE_CDECL console_restore(void){ - if( console_utf8 && conState.inCodePage!=0 - && conState.hConsoleIn!=INVALID_HANDLE_VALUE ){ - _setmode(_fileno(stdin), conState.infsMode); - SetConsoleCP(conState.inCodePage); - SetConsoleOutputCP(conState.outCodePage); - SetConsoleMode(conState.hConsoleIn, conState.consoleMode); + if( (console_utf8_in||console_utf8_out) + && conState.hConsole!=INVALID_HANDLE_VALUE ){ + if( console_utf8_in ){ + SetConsoleCP(conState.inCodePage); + _setmode(_fileno(stdin), conState.infsMode); + } + if( console_utf8_out ) SetConsoleOutputCP(conState.outCodePage); + SetConsoleMode(conState.hConsole, conState.consoleMode); /* Avoid multiple calls. */ - conState.hConsoleIn = INVALID_HANDLE_VALUE; + conState.hConsole = INVALID_HANDLE_VALUE; conState.consoleMode = 0; - console_utf8 = 0; + console_utf8_in = 0; + console_utf8_out = 0; } } @@ -680,11 +758,11 @@ static void SQLITE_CDECL console_restore(void){ ** Collect input like fgets(...) with special provisions for input ** from the Windows console to get around its strange coding issues. ** Defers to plain fgets() when input is not interactive or when the -** startup option, -utf8, has not been provided or taken effect. +** UTF-8 input is unavailable or opted out. */ static char* utf8_fgets(char *buf, int ncmax, FILE *fin){ if( fin==0 ) fin = stdin; - if( fin==stdin && stdin_is_interactive && console_utf8 ){ + if( fin==stdin && stdin_is_interactive && console_utf8_in ){ # define SQLITE_IALIM 150 wchar_t wbuf[SQLITE_IALIM]; int lend = 0; @@ -697,7 +775,7 @@ static char* utf8_fgets(char *buf, int ncmax, FILE *fin){ ? SQLITE_IALIM : (ncmax-1 - noc)/4; # undef SQLITE_IALIM DWORD nbr = 0; - BOOL bRC = ReadConsoleW(conState.hConsoleIn, wbuf, na, &nbr, 0); + BOOL bRC = ReadConsoleW(conState.hConsole, wbuf, na, &nbr, 0); if( !bRC || (noc==0 && nbr==0) ) return 0; if( nbr > 0 ){ int nmb = WideCharToMultiByte(CP_UTF8,WC_COMPOSITECHECK|WC_DEFAULTCHAR, @@ -743,20 +821,16 @@ static char* utf8_fgets(char *buf, int ncmax, FILE *fin){ /* ** Render output like fprintf(). Except, if the output is going to the -** console and if this is running on a Windows machine, and if the -utf8 -** option is unavailable or (available and inactive), translate the +** console and if this is running on a Windows machine, and if UTF-8 +** output unavailable (or available but opted out), translate the ** output from UTF-8 into MBCS for output through 8-bit stdout stream. -** (With -utf8 active, no translation is needed and must not be done.) +** (Without -no-utf8, no translation is needed and must not be done.) */ #if defined(_WIN32) || defined(WIN32) void utf8_printf(FILE *out, const char *zFormat, ...){ va_list ap; va_start(ap, zFormat); - if( stdout_is_console && (out==stdout || out==stderr) -# if SHELL_WIN_UTF8_OPT - && !console_utf8 -# endif - ){ + if( stdout_is_console && (out==stdout || out==stderr) && !console_utf8_out ){ char *z1 = sqlite3_vmprintf(zFormat, ap); char *z2 = sqlite3_win32_utf8_to_mbcs_v2(z1, 0); sqlite3_free(z1); @@ -967,14 +1041,10 @@ static char *local_getline(char *zLine, FILE *in){ } } #if defined(_WIN32) || defined(WIN32) - /* For interactive input on Windows systems, without -utf8, + /* For interactive input on Windows systems, with -no-utf8, ** translate the multi-byte characterset characters into UTF-8. - ** This is the translation that predates the -utf8 option. */ - if( stdin_is_interactive && in==stdin -# if SHELL_WIN_UTF8_OPT - && !console_utf8 -# endif /* SHELL_WIN_UTF8_OPT */ - ){ + ** This is the translation that predates console UTF-8 input. */ + if( stdin_is_interactive && in==stdin && !console_utf8_in ){ char *zTrans = sqlite3_win32_mbcs_to_utf8_v2(zLine, 0); if( zTrans ){ i64 nTrans = strlen(zTrans)+1; @@ -1260,7 +1330,7 @@ static void shellDtostr( char z[400]; if( n<1 ) n = 1; if( n>350 ) n = 350; - sprintf(z, "%#+.*e", n, r); + snprintf(z, sizeof(z)-1, "%#+.*e", n, r); sqlite3_result_text(pCtx, z, -1, SQLITE_TRANSIENT); } @@ -5372,7 +5442,8 @@ static sqlite3_module seriesModule = { 0, /* xSavepoint */ 0, /* xRelease */ 0, /* xRollbackTo */ - 0 /* xShadowName */ + 0, /* xShadowName */ + 0 /* xIntegrity */ }; #endif /* SQLITE_OMIT_VIRTUALTABLE */ @@ -7270,6 +7341,7 @@ static int fsdirRegister(sqlite3 *db){ 0, /* xRelease */ 0, /* xRollbackTo */ 0, /* xShadowName */ + 0 /* xIntegrity */ }; int rc = sqlite3_create_module(db, "fsdir", &fsdirModule, 0); @@ -7790,7 +7862,8 @@ static sqlite3_module completionModule = { 0, /* xSavepoint */ 0, /* xRelease */ 0, /* xRollbackTo */ - 0 /* xShadowName */ + 0, /* xShadowName */ + 0 /* xIntegrity */ }; #endif /* SQLITE_OMIT_VIRTUALTABLE */ @@ -8530,6 +8603,7 @@ SQLITE_EXTENSION_INIT1 #include #include #include +#include #include @@ -10701,7 +10775,8 @@ static int zipfileRegister(sqlite3 *db){ 0, /* xSavepoint */ 0, /* xRelease */ 0, /* xRollback */ - 0 /* xShadowName */ + 0, /* xShadowName */ + 0 /* xIntegrity */ }; int rc = sqlite3_create_module(db, "zipfile" , &zipfileModule, 0); @@ -11070,7 +11145,7 @@ void sqlite3_expert_destroy(sqlite3expert*); #endif /* !defined(SQLITE_AMALGAMATION) */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef SQLITE_OMIT_VIRTUALTABLE /* typedef sqlite3_int64 i64; */ /* typedef sqlite3_uint64 u64; */ @@ -11700,6 +11775,7 @@ static int idxRegisterVtab(sqlite3expert *p){ 0, /* xRelease */ 0, /* xRollbackTo */ 0, /* xShadowName */ + 0, /* xIntegrity */ }; return sqlite3_create_module(p->dbv, "expert", &expertModule, (void*)p); @@ -12856,6 +12932,88 @@ static int idxPopulateStat1(sqlite3expert *p, char **pzErr){ return rc; } +/* +** Define and possibly pretend to use a useless collation sequence. +** This pretense allows expert to accept SQL using custom collations. +*/ +int dummyCompare(void *up1, int up2, const void *up3, int up4, const void *up5){ + (void)up1; + (void)up2; + (void)up3; + (void)up4; + (void)up5; + assert(0); /* VDBE should never be run. */ + return 0; +} +/* And a callback to register above upon actual need */ +void useDummyCS(void *up1, sqlite3 *db, int etr, const char *zName){ + (void)up1; + sqlite3_create_collation_v2(db, zName, etr, 0, dummyCompare, 0); +} + +#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) \ + && !defined(SQLITE_OMIT_INTROSPECTION_PRAGMAS) +/* +** dummy functions for no-op implementation of UDFs during expert's work +*/ +void dummyUDF(sqlite3_context *up1, int up2, sqlite3_value **up3){ + (void)up1; + (void)up2; + (void)up3; + assert(0); /* VDBE should never be run. */ +} +void dummyUDFvalue(sqlite3_context *up1){ + (void)up1; + assert(0); /* VDBE should never be run. */ +} + +/* +** Register UDFs from user database with another. +*/ +int registerUDFs(sqlite3 *dbSrc, sqlite3 *dbDst){ + sqlite3_stmt *pStmt; + int rc = sqlite3_prepare_v2(dbSrc, + "SELECT name,type,enc,narg,flags " + "FROM pragma_function_list() " + "WHERE builtin==0", -1, &pStmt, 0); + if( rc==SQLITE_OK ){ + while( SQLITE_ROW==(rc = sqlite3_step(pStmt)) ){ + int nargs = sqlite3_column_int(pStmt,3); + int flags = sqlite3_column_int(pStmt,4); + const char *name = (char*)sqlite3_column_text(pStmt,0); + const char *type = (char*)sqlite3_column_text(pStmt,1); + const char *enc = (char*)sqlite3_column_text(pStmt,2); + if( name==0 || type==0 || enc==0 ){ + /* no-op. Only happens on OOM */ + }else{ + int ienc = SQLITE_UTF8; + int rcf = SQLITE_ERROR; + if( strcmp(enc,"utf16le")==0 ) ienc = SQLITE_UTF16LE; + else if( strcmp(enc,"utf16be")==0 ) ienc = SQLITE_UTF16BE; + ienc |= (flags & (SQLITE_DETERMINISTIC|SQLITE_DIRECTONLY)); + if( strcmp(type,"w")==0 ){ + rcf = sqlite3_create_window_function(dbDst,name,nargs,ienc,0, + dummyUDF,dummyUDFvalue,0,0,0); + }else if( strcmp(type,"a")==0 ){ + rcf = sqlite3_create_function(dbDst,name,nargs,ienc,0, + 0,dummyUDF,dummyUDFvalue); + }else if( strcmp(type,"s")==0 ){ + rcf = sqlite3_create_function(dbDst,name,nargs,ienc,0, + dummyUDF,0,0); + } + if( rcf!=SQLITE_OK ){ + rc = rcf; + break; + } + } + } + sqlite3_finalize(pStmt); + if( rc==SQLITE_DONE ) rc = SQLITE_OK; + } + return rc; +} +#endif + /* ** Allocate a new sqlite3expert object. */ @@ -12882,7 +13040,21 @@ sqlite3expert *sqlite3_expert_new(sqlite3 *db, char **pzErrmsg){ sqlite3_db_config(pNew->dbm, SQLITE_DBCONFIG_TRIGGER_EQP, 1, (int*)0); } } - + + /* Allow custom collations to be dealt with through prepare. */ + if( rc==SQLITE_OK ) rc = sqlite3_collation_needed(pNew->dbm,0,useDummyCS); + if( rc==SQLITE_OK ) rc = sqlite3_collation_needed(pNew->dbv,0,useDummyCS); + +#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) \ + && !defined(SQLITE_OMIT_INTROSPECTION_PRAGMAS) + /* Register UDFs from database [db] with [dbm] and [dbv]. */ + if( rc==SQLITE_OK ){ + rc = registerUDFs(pNew->db, pNew->dbm); + } + if( rc==SQLITE_OK ){ + rc = registerUDFs(pNew->db, pNew->dbv); + } +#endif /* Copy the entire schema of database [db] into [dbm]. */ if( rc==SQLITE_OK ){ @@ -12958,6 +13130,10 @@ int sqlite3_expert_sql( while( rc==SQLITE_OK && zStmt && zStmt[0] ){ sqlite3_stmt *pStmt = 0; + /* Ensure that the provided statement compiles against user's DB. */ + rc = idxPrepareStmt(p->db, &pStmt, pzErr, zStmt); + if( rc!=SQLITE_OK ) break; + sqlite3_finalize(pStmt); rc = sqlite3_prepare_v2(p->dbv, zStmt, -1, &pStmt, &zStmt); if( rc==SQLITE_OK ){ if( pStmt ){ @@ -14282,7 +14458,8 @@ static int sqlite3DbdataRegister(sqlite3 *db){ 0, /* xSavepoint */ 0, /* xRelease */ 0, /* xRollbackTo */ - 0 /* xShadowName */ + 0, /* xShadowName */ + 0 /* xIntegrity */ }; int rc = sqlite3_create_module(db, "sqlite_dbdata", &dbdata_module, 0); @@ -19154,7 +19331,7 @@ static void display_explain_scanstats( if( sqlite3_stmt_scanstatus_v2(p,ii,SQLITE_SCANSTAT_EXPLAIN,f,(void*)&z) ){ break; } - n = strlen(z) + scanStatsHeight(p, ii)*3; + n = (int)strlen(z) + scanStatsHeight(p, ii)*3; if( n>nWidth ) nWidth = n; } nWidth += 4; @@ -19166,12 +19343,12 @@ static void display_explain_scanstats( i64 nCycle = 0; int iId = 0; int iPid = 0; - const char *z = 0; + const char *zo = 0; const char *zName = 0; char *zText = 0; double rEst = 0.0; - if( sqlite3_stmt_scanstatus_v2(p,ii,SQLITE_SCANSTAT_EXPLAIN,f,(void*)&z) ){ + if( sqlite3_stmt_scanstatus_v2(p,ii,SQLITE_SCANSTAT_EXPLAIN,f,(void*)&zo) ){ break; } sqlite3_stmt_scanstatus_v2(p, ii, SQLITE_SCANSTAT_EST,f,(void*)&rEst); @@ -19182,7 +19359,7 @@ static void display_explain_scanstats( sqlite3_stmt_scanstatus_v2(p, ii, SQLITE_SCANSTAT_PARENTID,f,(void*)&iPid); sqlite3_stmt_scanstatus_v2(p, ii, SQLITE_SCANSTAT_NAME,f,(void*)&zName); - zText = sqlite3_mprintf("%s", z); + zText = sqlite3_mprintf("%s", zo); if( nCycle>=0 || nLoop>=0 || nRow>=0 ){ char *z = 0; if( nCycle>=0 && nTotal>0 ){ @@ -23830,7 +24007,6 @@ static int do_meta_command(char *zLine, ShellState *p){ azArg[nArg++] = &zLine[h]; while( zLine[h] && !IsSpace(zLine[h]) ){ h++; } if( zLine[h] ) zLine[h++] = 0; - resolve_backslashes(azArg[nArg-1]); } } azArg[nArg] = 0; @@ -24569,8 +24745,10 @@ static int do_meta_command(char *zLine, ShellState *p){ "SELECT rowid FROM sqlite_schema" " WHERE name GLOB 'sqlite_stat[134]'", -1, &pStmt, 0); - doStats = sqlite3_step(pStmt)==SQLITE_ROW; - sqlite3_finalize(pStmt); + if( rc==SQLITE_OK ){ + doStats = sqlite3_step(pStmt)==SQLITE_ROW; + sqlite3_finalize(pStmt); + } } if( doStats==0 ){ raw_printf(p->out, "/* No STAT tables available */\n"); @@ -24859,6 +25037,14 @@ static int do_meta_command(char *zLine, ShellState *p){ ** the remaining columns. */ if( p->mode==MODE_Ascii && (z==0 || z[0]==0) && i==0 ) break; + /* + ** For CSV mode, per RFC 4180, accept EOF in lieu of final + ** record terminator but only for last field of multi-field row. + ** (If there are too few fields, it's not valid CSV anyway.) + */ + if( z==0 && (xRead==csv_read_one_field) && i==nCol-1 && i>0 ){ + z = ""; + } sqlite3_bind_text(pStmt, i+1, z, -1, SQLITE_TRANSIENT); if( idb, opt); @@ -27720,6 +27908,9 @@ static const char zOptions[] = " -multiplex enable the multiplexor VFS\n" #endif " -newline SEP set output row separator. Default: '\\n'\n" +#if SHELL_WIN_UTF8_OPT + " -no-utf8 do not try to set up UTF-8 output (for legacy)\n" +#endif " -nofollow refuse to open symbolic links to database files\n" " -nonce STRING set the safe-mode escape nonce\n" " -nullvalue TEXT set text string for NULL values. Default ''\n" @@ -27736,7 +27927,7 @@ static const char zOptions[] = " -table set output mode to 'table'\n" " -tabs set output mode to 'tabs'\n" " -unsafe-testing allow unsafe commands and modes for testing\n" -#if SHELL_WIN_UTF8_OPT +#if SHELL_WIN_UTF8_OPT && 0 /* Option is accepted, but is now the default. */ " -utf8 setup interactive console code page for UTF-8\n" #endif " -version show SQLite version\n" @@ -27887,7 +28078,8 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ stdout_is_console = isatty(1); #endif #if SHELL_WIN_UTF8_OPT - atexit(console_restore); /* Needs revision for CLI as library call */ + probe_console(); /* Check for console I/O and UTF-8 capability. */ + if( !mbcs_opted ) atexit(console_restore); #endif atexit(sayAbnormalExit); #ifdef SQLITE_DEBUG @@ -27974,8 +28166,8 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ /* Do an initial pass through the command-line argument to locate ** the name of the database file, the name of the initialization file, - ** the size of the alternative malloc heap, - ** and the first command to execute. + ** the size of the alternative malloc heap, options affecting commands + ** or SQL run from the command line, and the first command to execute. */ #ifndef SQLITE_SHELL_FIDDLE verify_uninitialized(); @@ -28009,12 +28201,26 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ (void)cmdline_option_value(argc, argv, ++i); }else if( cli_strcmp(z,"-init")==0 ){ zInitFile = cmdline_option_value(argc, argv, ++i); + }else if( cli_strcmp(z,"-interactive")==0 ){ + /* Need to check for interactive override here to so that it can + ** affect console setup (for Windows only) and testing thereof. + */ + stdin_is_interactive = 1; }else if( cli_strcmp(z,"-batch")==0 ){ /* Need to check for batch mode here to so we can avoid printing ** informational messages (like from process_sqliterc) before ** we do the actual processing of arguments later in a second pass. */ stdin_is_interactive = 0; + }else if( cli_strcmp(z,"-utf8")==0 ){ +#if SHELL_WIN_UTF8_OPT + /* Option accepted, but is ignored except for this diagnostic. */ + if( mbcs_opted ) fprintf(stderr, "Cannot do UTF-8 at this console.\n"); +#endif /* SHELL_WIN_UTF8_OPT */ + }else if( cli_strcmp(z,"-no-utf8")==0 ){ +#if SHELL_WIN_UTF8_OPT + mbcs_opted = 1; +#endif /* SHELL_WIN_UTF8_OPT */ }else if( cli_strcmp(z,"-heap")==0 ){ #if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5) const char *zSize; @@ -28153,6 +28359,15 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ exit(1); } } +#if SHELL_WIN_UTF8_OPT + /* Get indicated Windows console setup done before running invocation commands. */ + if( in_console || out_console ){ + console_prepare_utf8(); + } + if( !in_console ){ + setBinaryMode(stdin, 0); + } +#endif if( data.pAuxDb->zDbFilename==0 ){ #ifndef SQLITE_OMIT_MEMORYDB @@ -28280,13 +28495,13 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ 8*(int)sizeof(char*)); return 0; }else if( cli_strcmp(z,"-interactive")==0 ){ - stdin_is_interactive = 1; + /* already handled */ }else if( cli_strcmp(z,"-batch")==0 ){ - stdin_is_interactive = 0; + /* already handled */ }else if( cli_strcmp(z,"-utf8")==0 ){ -#if SHELL_WIN_UTF8_OPT - console_utf8 = 1; -#endif /* SHELL_WIN_UTF8_OPT */ + /* already handled */ + }else if( cli_strcmp(z,"-no-utf8")==0 ){ + /* already handled */ }else if( cli_strcmp(z,"-heap")==0 ){ i++; }else if( cli_strcmp(z,"-pagecache")==0 ){ @@ -28368,14 +28583,6 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ } data.cMode = data.mode; } -#if SHELL_WIN_UTF8_OPT - if( console_utf8 && stdin_is_interactive ){ - console_prepare(); - }else{ - setBinaryMode(stdin, 0); - console_utf8 = 0; - } -#endif if( !readStdin ){ /* Run all arguments that do not begin with '-' as if they were separate @@ -28411,11 +28618,20 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ if( stdin_is_interactive ){ char *zHome; char *zHistory; + const char *zCharset = ""; int nHistory; +#if SHELL_WIN_UTF8_OPT + switch( console_utf8_in+2*console_utf8_out ){ + default: case 0: break; + case 1: zCharset = " (utf8 in)"; break; + case 2: zCharset = " (utf8 out)"; break; + case 3: zCharset = " (utf8 I/O)"; break; + } +#endif printf( - "SQLite version %s %.19s\n" /*extra-version-info*/ + "SQLite version %s %.19s%s\n" /*extra-version-info*/ "Enter \".help\" for usage hints.\n", - sqlite3_libversion(), sqlite3_sourceid() + sqlite3_libversion(), sqlite3_sourceid(), zCharset ); if( warnInmemoryDb ){ printf("Connected to a "); diff --git a/contrib/sqlite3/sqlite3.c b/contrib/sqlite3/sqlite3.c index 1884b0823969..8f9309a8ba7e 100644 --- a/contrib/sqlite3/sqlite3.c +++ b/contrib/sqlite3/sqlite3.c @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.43.1. By combining all the individual C code files into this +** version 3.44.0. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -18,7 +18,7 @@ ** separate file. This file contains only code for the core SQLite library. ** ** The content in this amalgamation comes from Fossil check-in -** d3a40c05c49e1a49264912b1a05bc2143ac. +** 17129ba1ff7f0daf37100ee82d507aef7827. */ #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 @@ -459,9 +459,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.43.1" -#define SQLITE_VERSION_NUMBER 3043001 -#define SQLITE_SOURCE_ID "2023-09-11 12:01:27 2d3a40c05c49e1a49264912b1a05bc2143ac0e7c3df588276ce80a4cbc9bd1b0" +#define SQLITE_VERSION "3.44.0" +#define SQLITE_VERSION_NUMBER 3044000 +#define SQLITE_SOURCE_ID "2023-11-01 11:23:50 17129ba1ff7f0daf37100ee82d507aef7827cf38de1866e2633096ae6ad81301" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -2440,7 +2440,7 @@ struct sqlite3_mem_methods { ** is stored in each sorted record and the required column values loaded ** from the database as records are returned in sorted order. The default ** value for this option is to never use this optimization. Specifying a -** negative value for this option restores the default behaviour. +** negative value for this option restores the default behavior. ** This option is only available if SQLite is compiled with the ** [SQLITE_ENABLE_SORTER_REFERENCES] compile-time option. ** @@ -2615,7 +2615,7 @@ struct sqlite3_mem_methods { ** database handle, SQLite checks if this will mean that there are now no ** connections at all to the database. If so, it performs a checkpoint ** operation before closing the connection. This option may be used to -** override this behaviour. The first parameter passed to this operation +** override this behavior. The first parameter passed to this operation ** is an integer - positive to disable checkpoints-on-close, or zero (the ** default) to enable them, and negative to leave the setting unchanged. ** The second parameter is a pointer to an integer @@ -4268,6 +4268,7 @@ SQLITE_API void sqlite3_free_filename(sqlite3_filename); ** ** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language ** text that describes the error, as either UTF-8 or UTF-16 respectively. +** (See how SQLite handles [invalid UTF] for exceptions to this rule.) ** ^(Memory to hold the error message string is managed internally. ** The application does not need to worry about freeing the result. ** However, the error string might be overwritten or deallocated by @@ -5638,6 +5639,7 @@ SQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt); */ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt); + /* ** CAPI3REF: Create Or Redefine SQL Functions ** KEYWORDS: {function creation routines} @@ -6192,32 +6194,32 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*); ** METHOD: sqlite3_context ** ** These functions may be used by (non-aggregate) SQL functions to -** associate metadata with argument values. If the same value is passed to -** multiple invocations of the same SQL function during query execution, under -** some circumstances the associated metadata may be preserved. An example -** of where this might be useful is in a regular-expression matching -** function. The compiled version of the regular expression can be stored as -** metadata associated with the pattern string. +** associate auxiliary data with argument values. If the same argument +** value is passed to multiple invocations of the same SQL function during +** query execution, under some circumstances the associated auxiliary data +** might be preserved. An example of where this might be useful is in a +** regular-expression matching function. The compiled version of the regular +** expression can be stored as auxiliary data associated with the pattern string. ** Then as long as the pattern string remains the same, ** the compiled regular expression can be reused on multiple ** invocations of the same function. ** -** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the metadata +** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the auxiliary data ** associated by the sqlite3_set_auxdata(C,N,P,X) function with the Nth argument ** value to the application-defined function. ^N is zero for the left-most -** function argument. ^If there is no metadata +** function argument. ^If there is no auxiliary data ** associated with the function argument, the sqlite3_get_auxdata(C,N) interface ** returns a NULL pointer. ** -** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as metadata for the N-th -** argument of the application-defined function. ^Subsequent +** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as auxiliary data for the +** N-th argument of the application-defined function. ^Subsequent *** 10434 LINES SKIPPED *** From nobody Tue Nov 28 15:16:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmHq2nFXz53Dj3; Tue, 28 Nov 2023 15:16: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 4SfmHp5QTZz3HkL; Tue, 28 Nov 2023 15:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YpdnvX4C6gm8kOpnbCbLgaAiUAuLbgKI3sYogxfjvok=; b=i4OEjb0Ddxqkhs8AxDtIorf7ZwmJRRXPQzbzNHxoMp+irePPngGAJGBjPOPH1MXybFuTY8 ysE9x2qFTmWIDsErV4UKgXvLhjCNCKs0Z8lOFJcSWEOH3IlnxMaXvy8FH+EIEu6FCzhyyP qTnxs+Uw6CD3ONhemOnYDWNdGwf9p2MpIN3nPAwngWaC5UQnSfMamL7shORIlgyfb+Qf8I CIPeni7A8RMqikBcQjE76q12SDthP2VuCMa6CskXs50JoWSVkPSngfQYXn80TbfTbwRjeU S0aCHt/7ARqwAhOtupLPWmjuWDUd23fu6gpEAEaBWoKL5l24Q0JfZVp66p31Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YpdnvX4C6gm8kOpnbCbLgaAiUAuLbgKI3sYogxfjvok=; b=uXNA12qcvGLhnEX6OL5c8Gtf3LfW8LN51HyeCfGVuR8fbctgRcpJyY8N5FschBtdvThrYH XfKRGFWGkR2f8uwgjpiAD8dRoielM+GRfqJVLEg8E3f3AAYX/FOluSnb1aMfHZLElB81Xl kFsqVp0tjUYzufBqbFtC2wM0nCBP7Uk3MsXSiIFQ6qC0C+cZEMVgDIwisYVxvXB7aZVqts 53Py+VtK9HkYAhltrqPVd+MZ2tpetmEHimjwnsdAS44q5Si2UYUCNU9/rlTScEmv8lengD zcqmjwd3k0I+/iJEJErEpW6o5qjaQWiwY9I2UACa/mhMjJ9pu0RTsbx5TZhnQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184566; a=rsa-sha256; cv=none; b=CJj2lQa7BrN1sDgVdlR5fh03t0rsysQZQLre0wrEyE8HN64y94BiNc7UYzQGP+oWGMEvSp ivPzIHfJJi3AW+E6r15gbdrsZNf98VAqTYCc8R7l94ym5/dFnsHfN3ic2yNRlmfAGODmh5 wNk+1W70va5oFk47oMhbt0vP85QPYX52U8E/uTeiYqBY9qRHHmYXr0wFCuiQvRB0b8WJsc VaKsYFGoShAmcwqquHjR89v3hxM4pbBws4Wm8Q6ghk+OjT/R5MsP9UknM63J0DzbURUkIN NK5FRoFRScKUIkfl8rtQpq7VhKMDmUJ9dD2ZjsrMC+kT3bAFNN+Ss4oAoNLjLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfmHp3P2MzBsG; Tue, 28 Nov 2023 15:16: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 3ASFG64u094380; Tue, 28 Nov 2023 15:16:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASFG6aw094377; Tue, 28 Nov 2023 15:16:06 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:16:06 GMT Message-Id: <202311281516.3ASFG6aw094377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 2bdab519a5c9 - stable/13 - unbound: Vendor import 1.19.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2bdab519a5c9822571d005c62adec484cf65c2e7 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2bdab519a5c9822571d005c62adec484cf65c2e7 commit 2bdab519a5c9822571d005c62adec484cf65c2e7 Author: Cy Schubert AuthorDate: 2023-11-13 21:38:45 +0000 Commit: Cy Schubert CommitDate: 2023-11-28 15:15:53 +0000 unbound: Vendor import 1.19.0 Release notes at https://www.nlnetlabs.nl/news/2023/Aug/30/unbound-1.19.0-released/ Merge commit '16fd0b24910488e59ca1941387b9ac7fb646a837' into unbound (cherry picked from commit 103ba509e72e3949d22485666949e9705d4af8cd) --- contrib/unbound/.gitignore | 1 - contrib/unbound/Makefile.in | 4 +- contrib/unbound/README.md | 6 +- contrib/unbound/cachedb/cachedb.c | 11 +- contrib/unbound/cachedb/redis.c | 68 +- contrib/unbound/config.guess | 8 +- contrib/unbound/config.h.in~ | 1456 ++++++++++++++++++++ contrib/unbound/config.sub | 155 ++- contrib/unbound/configure | 632 +++------ contrib/unbound/configure.ac | 17 +- contrib/unbound/daemon/remote.c | 35 +- contrib/unbound/daemon/worker.c | 8 + contrib/unbound/dns64/dns64.c | 99 +- contrib/unbound/dnstap/dnstap.m4 | 2 +- contrib/unbound/dnstap/dtstream.c | 8 +- contrib/unbound/dnstap/unbound-dnstap-socket.c | 12 +- contrib/unbound/doc/Changelog | 154 ++- contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf.in | 11 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 32 +- contrib/unbound/dynlibmod/dynlibmod.c | 3 +- contrib/unbound/edns-subnet/subnetmod.c | 30 +- contrib/unbound/edns-subnet/subnetmod.h | 7 + contrib/unbound/ipset/ipset.c | 4 +- contrib/unbound/iterator/iter_priv.c | 26 +- contrib/unbound/iterator/iter_resptype.c | 25 +- contrib/unbound/iterator/iter_resptype.h | 4 +- contrib/unbound/iterator/iter_scrub.c | 67 +- contrib/unbound/iterator/iter_scrub.h | 5 +- contrib/unbound/iterator/iterator.c | 74 +- contrib/unbound/iterator/iterator.h | 7 + contrib/unbound/libunbound/libworker.c | 4 + contrib/unbound/services/authzone.c | 11 +- contrib/unbound/services/listen_dnsport.c | 8 +- contrib/unbound/services/mesh.c | 9 +- contrib/unbound/services/outside_network.c | 2 +- contrib/unbound/services/rpz.c | 10 +- contrib/unbound/sldns/str2wire.c | 21 +- contrib/unbound/sldns/wire2str.c | 82 ++ contrib/unbound/sldns/wire2str.h | 13 + contrib/unbound/smallapp/unbound-checkconf.c | 17 + .../cachedb_no_store.tdir/cachedb_no_store.conf | 29 + .../cachedb_no_store.tdir/cachedb_no_store.dsc | 16 + .../cachedb_no_store.tdir/cachedb_no_store.post | 20 + .../cachedb_no_store.tdir/cachedb_no_store.pre | 36 + .../cachedb_no_store.servfail.testns | 8 + .../cachedb_no_store.tdir/cachedb_no_store.test | 132 ++ .../cachedb_no_store.tdir/cachedb_no_store.testns | 9 + contrib/unbound/testdata/disable_edns_do.rpl | 164 +++ contrib/unbound/testdata/iter_ignore_empty.rpl | 50 + contrib/unbound/testdata/iter_scrub_rr_length.rpl | 298 ++++ .../testdata/root_zonemd.tdir/root_zonemd.conf | 34 + .../testdata/root_zonemd.tdir/root_zonemd.dsc | 16 + .../testdata/root_zonemd.tdir/root_zonemd.post | 14 + .../testdata/root_zonemd.tdir/root_zonemd.pre | 50 + .../testdata/root_zonemd.tdir/root_zonemd.test | 51 + .../testdata/root_zonemd.tdir/root_zonemd.testns | 9 + contrib/unbound/testdata/rpz_cached_cname.rpl | 122 ++ contrib/unbound/testdata/subnet_prezero.crpl | 155 +++ contrib/unbound/testdata/val_scrub_rr_length.rpl | 164 +++ contrib/unbound/util/config_file.c | 10 + contrib/unbound/util/config_file.h | 6 + contrib/unbound/util/configlexer.lex | 3 + contrib/unbound/util/configparser.y | 45 +- contrib/unbound/util/data/msgencode.c | 4 +- contrib/unbound/util/data/msgparse.c | 25 + contrib/unbound/util/data/msgparse.h | 18 + contrib/unbound/util/fptr_wlist.c | 2 + contrib/unbound/util/log.c | 2 +- contrib/unbound/util/module.c | 18 + contrib/unbound/util/module.h | 10 + contrib/unbound/util/net_help.c | 108 +- contrib/unbound/util/net_help.h | 18 + contrib/unbound/util/netevent.c | 102 +- contrib/unbound/util/proxy_protocol.c | 162 ++- contrib/unbound/util/proxy_protocol.h | 66 +- contrib/unbound/util/rfc_1982.c | 1 + contrib/unbound/util/siphash.c | 5 + contrib/unbound/validator/val_anchor.c | 21 + contrib/unbound/validator/val_anchor.h | 8 + contrib/unbound/validator/validator.c | 11 + 87 files changed, 4408 insertions(+), 780 deletions(-) diff --git a/contrib/unbound/.gitignore b/contrib/unbound/.gitignore deleted file mode 100644 index b25c15b81fae..000000000000 --- a/contrib/unbound/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/contrib/unbound/Makefile.in b/contrib/unbound/Makefile.in index 0a2e7f9b6f08..22fb75c123bd 100644 --- a/contrib/unbound/Makefile.in +++ b/contrib/unbound/Makefile.in @@ -738,7 +738,7 @@ msgencode.lo msgencode.o: $(srcdir)/util/data/msgencode.c config.h $(srcdir)/uti msgparse.lo msgparse.o: $(srcdir)/util/data/msgparse.c config.h $(srcdir)/util/data/msgparse.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h msgreply.lo msgreply.o: $(srcdir)/util/data/msgreply.c config.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h \ @@ -793,7 +793,7 @@ iter_priv.lo iter_priv.o: $(srcdir)/iterator/iter_priv.c config.h $(srcdir)/iter $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/sbuffer.h iter_resptype.lo iter_resptype.o: $(srcdir)/iterator/iter_resptype.c config.h \ - $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/util/log.h \ + $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iterator.h $(srcdir)/util/log.h \ $(srcdir)/services/cache/dns.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/net_help.h \ $(srcdir)/util/data/dname.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h diff --git a/contrib/unbound/README.md b/contrib/unbound/README.md index c220da030458..3bbd38b3b78b 100644 --- a/contrib/unbound/README.md +++ b/contrib/unbound/README.md @@ -17,7 +17,9 @@ You can learn more about Unbound by reading our ## Compiling Make sure you have the C toolchain, OpenSSL and its include files, and libexpat -installed. Unbound can be compiled and installed using: +installed. +If building from the repository source you also need flex and bison installed. +Unbound can be compiled and installed using: ``` ./configure && make && make install @@ -27,7 +29,7 @@ You can use libevent if you want. libevent is useful when using many (10000) outgoing ports. By default max 256 ports are opened at the same time and the builtin alternative is equally capable and a little faster. -Use the `--with-libevent=dir` configure option to compile Unbound with libevent +Use the `--with-libevent` configure option to compile Unbound with libevent support. ## Unbound configuration diff --git a/contrib/unbound/cachedb/cachedb.c b/contrib/unbound/cachedb/cachedb.c index 30645268ca23..b912be8ed54f 100644 --- a/contrib/unbound/cachedb/cachedb.c +++ b/contrib/unbound/cachedb/cachedb.c @@ -265,11 +265,11 @@ cachedb_init(struct module_env* env, int id) return 0; } cachedb_env->enabled = 1; - if(env->cfg->serve_expired_reply_ttl) + if(env->cfg->serve_expired && env->cfg->serve_expired_reply_ttl) log_warn( "cachedb: serve-expired-reply-ttl is set but not working for data " - "originating from the external cache; 0 TLL is used for those."); - if(env->cfg->serve_expired_client_timeout) + "originating from the external cache; 0 TTL is used for those."); + if(env->cfg->serve_expired && env->cfg->serve_expired_client_timeout) log_warn( "cachedb: serve-expired-client-timeout is set but not working for " "data originating from the external cache; expired data are used " @@ -815,6 +815,11 @@ cachedb_handle_response(struct module_qstate* qstate, qstate->ext_state[id] = module_finished; return; } + if(qstate->env->cfg->cachedb_no_store) { + /* do not store the item in the external cache */ + qstate->ext_state[id] = module_finished; + return; + } /* store the item into the backend cache */ cachedb_extcache_store(qstate, ie); diff --git a/contrib/unbound/cachedb/redis.c b/contrib/unbound/cachedb/redis.c index 93a575a4c6d2..6cc975901df2 100644 --- a/contrib/unbound/cachedb/redis.c +++ b/contrib/unbound/cachedb/redis.c @@ -59,11 +59,28 @@ struct redis_moddata { const char* server_path; /* server's unix path, or "", NULL if unused */ const char* server_password; /* server's AUTH password, or "", NULL if unused */ struct timeval timeout; /* timeout for connection setup and commands */ + int logical_db; /* the redis logical database to use */ }; static redisReply* redis_command(struct module_env*, struct cachedb_env*, const char*, const uint8_t*, size_t); +static void +moddata_clean(struct redis_moddata** moddata) { + if(!moddata || !*moddata) + return; + if((*moddata)->ctxs) { + int i; + for(i = 0; i < (*moddata)->numctxs; i++) { + if((*moddata)->ctxs[i]) + redisFree((*moddata)->ctxs[i]); + } + free((*moddata)->ctxs); + } + free(*moddata); + *moddata = NULL; +} + static redisContext* redis_connect(const struct redis_moddata* moddata) { @@ -97,10 +114,21 @@ redis_connect(const struct redis_moddata* moddata) } freeReplyObject(rep); } + if(moddata->logical_db > 0) { + redisReply* rep; + rep = redisCommand(ctx, "SELECT %d", moddata->logical_db); + if(!rep || rep->type == REDIS_REPLY_ERROR) { + log_err("failed to set logical database (%d)", + moddata->logical_db); + freeReplyObject(rep); + goto fail; + } + freeReplyObject(rep); + } verbose(VERB_OPS, "Connection to Redis established"); return ctx; - fail: +fail: if(ctx) redisFree(ctx); return NULL; @@ -117,14 +145,13 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) moddata = calloc(1, sizeof(struct redis_moddata)); if(!moddata) { log_err("out of memory"); - return 0; + goto fail; } moddata->numctxs = env->cfg->num_threads; moddata->ctxs = calloc(env->cfg->num_threads, sizeof(redisContext*)); if(!moddata->ctxs) { log_err("out of memory"); - free(moddata); - return 0; + goto fail; } /* note: server_host is a shallow reference to configured string. * we don't have to free it in this module. */ @@ -134,8 +161,15 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) moddata->server_password = env->cfg->redis_server_password; moddata->timeout.tv_sec = env->cfg->redis_timeout / 1000; moddata->timeout.tv_usec = (env->cfg->redis_timeout % 1000) * 1000; - for(i = 0; i < moddata->numctxs; i++) - moddata->ctxs[i] = redis_connect(moddata); + moddata->logical_db = env->cfg->redis_logical_db; + for(i = 0; i < moddata->numctxs; i++) { + redisContext* ctx = redis_connect(moddata); + if(!ctx) { + log_err("redis_init: failed to init redis"); + goto fail; + } + moddata->ctxs[i] = ctx; + } cachedb_env->backend_data = moddata; if(env->cfg->redis_expire_records) { redisReply* rep = NULL; @@ -148,7 +182,7 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) log_err("redis_init: failed to init redis, the " "redis-expire-records option requires the SETEX command " "(redis >= 2.0.0)"); - return 0; + goto fail; } redis_reply_type = rep->type; freeReplyObject(rep); @@ -160,11 +194,14 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) log_err("redis_init: failed to init redis, the " "redis-expire-records option requires the SETEX command " "(redis >= 2.0.0)"); - return 0; + goto fail; } } - return 1; + +fail: + moddata_clean(&moddata); + return 0; } static void @@ -175,18 +212,7 @@ redis_deinit(struct module_env* env, struct cachedb_env* cachedb_env) (void)env; verbose(VERB_OPS, "Redis deinitialization"); - - if(!moddata) - return; - if(moddata->ctxs) { - int i; - for(i = 0; i < moddata->numctxs; i++) { - if(moddata->ctxs[i]) - redisFree(moddata->ctxs[i]); - } - free(moddata->ctxs); - } - free(moddata); + moddata_clean(&moddata); } /* diff --git a/contrib/unbound/config.guess b/contrib/unbound/config.guess index b187213930f1..cdfc4392047c 100755 --- a/contrib/unbound/config.guess +++ b/contrib/unbound/config.guess @@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2023-07-20' +timestamp='2023-08-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -155,6 +155,9 @@ Linux|GNU|GNU/*) set_cc_for_build cat <<-EOF > "$dummy.c" + #if defined(__ANDROID__) + LIBC=android + #else #include #if defined(__UCLIBC__) LIBC=uclibc @@ -169,6 +172,7 @@ Linux|GNU|GNU/*) LIBC=musl #endif #endif + #endif EOF cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` eval "$cc_set_libc" @@ -904,7 +908,7 @@ EOF fi ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` + UNAME_PROCESSOR=`uname -p` case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; diff --git a/contrib/unbound/config.h.in~ b/contrib/unbound/config.h.in~ new file mode 100644 index 000000000000..f31354d01408 --- /dev/null +++ b/contrib/unbound/config.h.in~ @@ -0,0 +1,1456 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* apply the noreturn attribute to a function that exits the program */ +#undef ATTR_NORETURN + +/* apply the weak attribute to a symbol */ +#undef ATTR_WEAK + +/* Directory to chroot to */ +#undef CHROOT_DIR + +/* Define this to enable client subnet option. */ +#undef CLIENT_SUBNET + +/* Do sha512 definitions in config.h */ +#undef COMPAT_SHA512 + +/* Command line arguments used with configure */ +#undef CONFCMDLINE + +/* Pathname to the Unbound configuration file */ +#undef CONFIGFILE + +/* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work + */ +#undef DARWIN_BROKEN_SETREUID + +/* Whether daemon is deprecated */ +#undef DEPRECATED_DAEMON + +/* Deprecate RSA 1024 bit length, makes that an unsupported key */ +#undef DEPRECATE_RSA_1024 + +/* Define this to enable kernel based UDP source port randomization. */ +#undef DISABLE_EXPLICIT_PORT_RANDOMISATION + +/* default dnstap socket path */ +#undef DNSTAP_SOCKET_PATH + +/* Define if you want to use debug lock checking (slow). */ +#undef ENABLE_LOCK_CHECKS + +/* Define this if you enabled-allsymbols from libunbound to link binaries to + it for smaller install size, but the libunbound export table is polluted by + internal symbols */ +#undef EXPORT_ALL_SYMBOLS + +/* Define to 1 if you have the `accept4' function. */ +#undef HAVE_ACCEPT4 + +/* Define to 1 if you have the `arc4random' function. */ +#undef HAVE_ARC4RANDOM + +/* Define to 1 if you have the `arc4random_uniform' function. */ +#undef HAVE_ARC4RANDOM_UNIFORM + +/* Define to 1 if you have the header file. */ +#undef HAVE_ARPA_INET_H + +/* Whether the C compiler accepts the "format" attribute */ +#undef HAVE_ATTR_FORMAT + +/* Whether the C compiler accepts the "noreturn" attribute */ +#undef HAVE_ATTR_NORETURN + +/* Whether the C compiler accepts the "unused" attribute */ +#undef HAVE_ATTR_UNUSED + +/* Whether the C compiler accepts the "weak" attribute */ +#undef HAVE_ATTR_WEAK + +/* If we have be64toh */ +#undef HAVE_BE64TOH + +/* Define to 1 if you have the `BIO_set_callback_ex' function. */ +#undef HAVE_BIO_SET_CALLBACK_EX + +/* Define to 1 if you have the header file. */ +#undef HAVE_BSD_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_BSD_STRING_H + +/* Define to 1 if you have the `chown' function. */ +#undef HAVE_CHOWN + +/* Define to 1 if you have the `chroot' function. */ +#undef HAVE_CHROOT + +/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ +#undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA + +/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ +#undef HAVE_CRYPTO_THREADID_SET_CALLBACK + +/* Define to 1 if you have the `ctime_r' function. */ +#undef HAVE_CTIME_R + +/* Define to 1 if you have the `daemon' function. */ +#undef HAVE_DAEMON + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#undef HAVE_DECL_ARC4RANDOM + +/* Define to 1 if you have the declaration of `arc4random_uniform', and to 0 + if you don't. */ +#undef HAVE_DECL_ARC4RANDOM_UNIFORM + +/* Define to 1 if you have the declaration of `evsignal_assign', and to 0 if + you don't. */ +#undef HAVE_DECL_EVSIGNAL_ASSIGN + +/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you + don't. */ +#undef HAVE_DECL_INET_NTOP + +/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you + don't. */ +#undef HAVE_DECL_INET_PTON + +/* Define to 1 if you have the declaration of `nghttp2_session_server_new', + and to 0 if you don't. */ +#undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW + +/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you + don't. */ +#undef HAVE_DECL_NID_ED25519 + +/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you + don't. */ +#undef HAVE_DECL_NID_ED448 + +/* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you + don't. */ +#undef HAVE_DECL_NID_SECP384R1 + +/* Define to 1 if you have the declaration of `NID_X9_62_prime256v1', and to 0 + if you don't. */ +#undef HAVE_DECL_NID_X9_62_PRIME256V1 + +/* Define to 1 if you have the declaration of `reallocarray', and to 0 if you + don't. */ +#undef HAVE_DECL_REALLOCARRAY + +/* Define to 1 if you have the declaration of `redisConnect', and to 0 if you + don't. */ +#undef HAVE_DECL_REDISCONNECT + +/* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0 + if you don't. */ +#undef HAVE_DECL_SK_SSL_COMP_POP_FREE + +/* Define to 1 if you have the declaration of + `SSL_COMP_get_compression_methods', and to 0 if you don't. */ +#undef HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS + +/* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to + 0 if you don't. */ +#undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO + +/* Define to 1 if you have the declaration of `strlcat', and to 0 if you + don't. */ +#undef HAVE_DECL_STRLCAT + +/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you + don't. */ +#undef HAVE_DECL_STRLCPY + +/* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if + you don't. */ +#undef HAVE_DECL_XML_STOPPARSER + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the `DSA_SIG_set0' function. */ +#undef HAVE_DSA_SIG_SET0 + +/* Define to 1 if you have the header file. */ +#undef HAVE_ENDIAN_H + +/* Define to 1 if you have the `endprotoent' function. */ +#undef HAVE_ENDPROTOENT + +/* Define to 1 if you have the `endpwent' function. */ +#undef HAVE_ENDPWENT + +/* Define to 1 if you have the `endservent' function. */ +#undef HAVE_ENDSERVENT + +/* Define to 1 if you have the `ENGINE_cleanup' function. */ +#undef HAVE_ENGINE_CLEANUP + +/* Define to 1 if you have the `ERR_free_strings' function. */ +#undef HAVE_ERR_FREE_STRINGS + +/* Define to 1 if you have the `ERR_load_crypto_strings' function. */ +#undef HAVE_ERR_LOAD_CRYPTO_STRINGS + +/* Define to 1 if you have the `event_assign' function. */ +#undef HAVE_EVENT_ASSIGN + +/* Define to 1 if you have the `event_base_free' function. */ +#undef HAVE_EVENT_BASE_FREE + +/* Define to 1 if you have the `event_base_get_method' function. */ +#undef HAVE_EVENT_BASE_GET_METHOD + +/* Define to 1 if you have the `event_base_new' function. */ +#undef HAVE_EVENT_BASE_NEW + +/* Define to 1 if you have the `event_base_once' function. */ +#undef HAVE_EVENT_BASE_ONCE + +/* Define to 1 if you have the header file. */ +#undef HAVE_EVENT_H + +/* Define to 1 if you have the `EVP_aes_256_cbc' function. */ +#undef HAVE_EVP_AES_256_CBC + +/* Define to 1 if you have the `EVP_cleanup' function. */ +#undef HAVE_EVP_CLEANUP + +/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled' + function. */ +#undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED + +/* Define to 1 if you have the `EVP_DigestVerify' function. */ +#undef HAVE_EVP_DIGESTVERIFY + +/* Define to 1 if you have the `EVP_dss1' function. */ +#undef HAVE_EVP_DSS1 + +/* Define to 1 if you have the `EVP_EncryptInit_ex' function. */ +#undef HAVE_EVP_ENCRYPTINIT_EX + +/* Define to 1 if you have the `EVP_MAC_CTX_set_params' function. */ +#undef HAVE_EVP_MAC_CTX_SET_PARAMS + +/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ +#undef HAVE_EVP_MD_CTX_NEW + +/* Define to 1 if you have the `EVP_sha1' function. */ +#undef HAVE_EVP_SHA1 + +/* Define to 1 if you have the `EVP_sha256' function. */ +#undef HAVE_EVP_SHA256 + +/* Define to 1 if you have the `EVP_sha512' function. */ +#undef HAVE_EVP_SHA512 + +/* Define to 1 if you have the `ev_default_loop' function. */ +#undef HAVE_EV_DEFAULT_LOOP + +/* Define to 1 if you have the `ev_loop' function. */ +#undef HAVE_EV_LOOP + +/* Define to 1 if you have the header file. */ +#undef HAVE_EXPAT_H + +/* Define to 1 if you have the `explicit_bzero' function. */ +#undef HAVE_EXPLICIT_BZERO + +/* Define to 1 if you have the `fcntl' function. */ +#undef HAVE_FCNTL + +/* Define to 1 if you have the `FIPS_mode' function. */ +#undef HAVE_FIPS_MODE + +/* Define to 1 if you have the `fork' function. */ +#undef HAVE_FORK + +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#undef HAVE_FSEEKO + +/* Define to 1 if you have the `fsync' function. */ +#undef HAVE_FSYNC + +/* Whether getaddrinfo is available */ +#undef HAVE_GETADDRINFO + +/* Define to 1 if you have the `getauxval' function. */ +#undef HAVE_GETAUXVAL + +/* Define to 1 if you have the `getentropy' function. */ +#undef HAVE_GETENTROPY + +/* Define to 1 if you have the `getifaddrs' function. */ +#undef HAVE_GETIFADDRS + +/* Define to 1 if you have the header file. */ +#undef HAVE_GETOPT_H + +/* Define to 1 if you have the `getpwnam' function. */ +#undef HAVE_GETPWNAM + +/* Define to 1 if you have the `getrlimit' function. */ +#undef HAVE_GETRLIMIT + +/* Define to 1 if you have the `gettid' function. */ +#undef HAVE_GETTID + +/* Define to 1 if you have the `glob' function. */ +#undef HAVE_GLOB + +/* Define to 1 if you have the header file. */ +#undef HAVE_GLOB_H + +/* Define to 1 if you have the `gmtime_r' function. */ +#undef HAVE_GMTIME_R + +/* Define to 1 if you have the header file. */ +#undef HAVE_GRP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_HIREDIS_HIREDIS_H + +/* Define to 1 if you have the `HMAC_Init_ex' function. */ +#undef HAVE_HMAC_INIT_EX + +/* If we have htobe64 */ +#undef HAVE_HTOBE64 + +/* Define to 1 if you have the header file. */ +#undef HAVE_IFADDRS_H + +/* Define to 1 if you have the `if_nametoindex' function. */ +#undef HAVE_IF_NAMETOINDEX + +/* Define to 1 if you have the `inet_aton' function. */ +#undef HAVE_INET_ATON + +/* Define to 1 if you have the `inet_ntop' function. */ +#undef HAVE_INET_NTOP + +/* Define to 1 if you have the `inet_pton' function. */ +#undef HAVE_INET_PTON + +/* Define to 1 if you have the `initgroups' function. */ +#undef HAVE_INITGROUPS + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* if the function 'ioctlsocket' is available */ +#undef HAVE_IOCTLSOCKET + +/* Define to 1 if you have the header file. */ +#undef HAVE_IPHLPAPI_H + +/* Define to 1 if you have the `isblank' function. */ +#undef HAVE_ISBLANK + +/* Define to 1 if you have the `kill' function. */ +#undef HAVE_KILL + +/* Use portable libbsd functions */ +#undef HAVE_LIBBSD + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBKERN_OSBYTEORDER_H + +/* Define if we have LibreSSL */ +#undef HAVE_LIBRESSL + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_NET_TSTAMP_H + +/* Define to 1 if you have the `localtime_r' function. */ +#undef HAVE_LOCALTIME_R + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOGIN_CAP_H + +/* If have GNU libc compatible malloc */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the `memmove' function. */ +#undef HAVE_MEMMOVE + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETDB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_TCP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETIOAPI_H + +/* Use libnettle for crypto */ +#undef HAVE_NETTLE + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETTLE_DSA_COMPAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETTLE_EDDSA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_IF_H + +/* Define this to use nghttp2 client. */ +#undef HAVE_NGHTTP2 + +/* Define to 1 if you have the header file. */ +#undef HAVE_NGHTTP2_NGHTTP2_H + +/* Use libnss for crypto */ +#undef HAVE_NSS + +/* Define to 1 if you have the `OpenSSL_add_all_digests' function. */ +#undef HAVE_OPENSSL_ADD_ALL_DIGESTS + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_BN_H + +/* Define to 1 if you have the `OPENSSL_config' function. */ +#undef HAVE_OPENSSL_CONFIG + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_CONF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_CORE_NAMES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_DH_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_DSA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_ENGINE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_ERR_H + +/* Define to 1 if you have the `OPENSSL_init_crypto' function. */ +#undef HAVE_OPENSSL_INIT_CRYPTO + +/* Define to 1 if you have the `OPENSSL_init_ssl' function. */ +#undef HAVE_OPENSSL_INIT_SSL + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_PARAM_BUILD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_RAND_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_RSA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_SSL_H + +/* Define to 1 if you have the `OSSL_PARAM_BLD_new' function. */ +#undef HAVE_OSSL_PARAM_BLD_NEW + +/* Define to 1 if you have the `poll' function. */ +#undef HAVE_POLL + +/* Define to 1 if you have the header file. */ +#undef HAVE_POLL_H + +/* Define if you have POSIX threads libraries and header files. */ +#undef HAVE_PTHREAD + +/* Have PTHREAD_PRIO_INHERIT. */ +#undef HAVE_PTHREAD_PRIO_INHERIT + +/* Define to 1 if the system has the type `pthread_rwlock_t'. */ +#undef HAVE_PTHREAD_RWLOCK_T + +/* Define to 1 if the system has the type `pthread_spinlock_t'. */ +#undef HAVE_PTHREAD_SPINLOCK_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_PWD_H + +/* Define if you have Python libraries and header files. */ +#undef HAVE_PYTHON + +/* Define to 1 if you have the `random' function. */ +#undef HAVE_RANDOM + +/* Define to 1 if you have the `RAND_cleanup' function. */ +#undef HAVE_RAND_CLEANUP + +/* If we have reallocarray(3) */ +#undef HAVE_REALLOCARRAY + +/* Define to 1 if you have the `recvmsg' function. */ +#undef HAVE_RECVMSG + +/* Define to 1 if you have the `sendmsg' function. */ +#undef HAVE_SENDMSG + +/* Define to 1 if you have the `setregid' function. */ +#undef HAVE_SETREGID + +/* Define to 1 if you have the `setresgid' function. */ +#undef HAVE_SETRESGID + +/* Define to 1 if you have the `setresuid' function. */ +#undef HAVE_SETRESUID + +/* Define to 1 if you have the `setreuid' function. */ +#undef HAVE_SETREUID + +/* Define to 1 if you have the `setrlimit' function. */ +#undef HAVE_SETRLIMIT + +/* Define to 1 if you have the `setsid' function. */ +#undef HAVE_SETSID + +/* Define to 1 if you have the `setusercontext' function. */ +#undef HAVE_SETUSERCONTEXT + +/* Define to 1 if you have the `SHA512_Update' function. */ +#undef HAVE_SHA512_UPDATE + +/* Define to 1 if you have the `shmget' function. */ +#undef HAVE_SHMGET + +/* Define to 1 if you have the `sigprocmask' function. */ +#undef HAVE_SIGPROCMASK + +/* Define to 1 if you have the `sleep' function. */ +#undef HAVE_SLEEP + +/* Define to 1 if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF + +/* Define to 1 if you have the `socketpair' function. */ +#undef HAVE_SOCKETPAIR + +/* Using Solaris threads */ +#undef HAVE_SOLARIS_THREADS + +/* Define to 1 if you have the `srandom' function. */ +#undef HAVE_SRANDOM + +/* Define if you have the SSL libraries installed. */ +#undef HAVE_SSL + +/* Define to 1 if you have the `SSL_CTX_set_alpn_protos' function. */ +#undef HAVE_SSL_CTX_SET_ALPN_PROTOS + +/* Define to 1 if you have the `SSL_CTX_set_alpn_select_cb' function. */ +#undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB + +/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */ +#undef HAVE_SSL_CTX_SET_CIPHERSUITES + +/* Define to 1 if you have the `SSL_CTX_set_security_level' function. */ +#undef HAVE_SSL_CTX_SET_SECURITY_LEVEL + +/* Define to 1 if you have the `SSL_CTX_set_tlsext_ticket_key_evp_cb' + function. */ +#undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB + +/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ +#undef HAVE_SSL_GET0_ALPN_SELECTED + +/* Define to 1 if you have the `SSL_get0_peername' function. */ +#undef HAVE_SSL_GET0_PEERNAME + +/* Define to 1 if you have the `SSL_get1_peer_certificate' function. */ +#undef HAVE_SSL_GET1_PEER_CERTIFICATE + +/* Define to 1 if you have the `SSL_set1_host' function. */ +#undef HAVE_SSL_SET1_HOST + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDARG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDBOOL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strftime' function. */ +#undef HAVE_STRFTIME + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strlcat' function. */ +#undef HAVE_STRLCAT + +/* Define to 1 if you have the `strlcpy' function. */ +#undef HAVE_STRLCPY + +/* Define to 1 if you have the `strptime' function. */ +#undef HAVE_STRPTIME + +/* Define to 1 if you have the `strsep' function. */ *** 6599 LINES SKIPPED *** From nobody Tue Nov 28 15:16:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmHr3N8xz53DYw; Tue, 28 Nov 2023 15: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 4SfmHq6319z3HSn; Tue, 28 Nov 2023 15:16:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WlQPxW81yiLHwvb8nxUE5CRCIBz/8vvDCumZie0ejbw=; b=MiAhZuGeZQ3wR3Zxi8GWinOa2K8XMUa2E6BFV6HG/hKEdzWTZDr3P1WtBdSFQpOFTUlS/i AyOh4l5767ks20WEHpIPeKpUK7M+PS6HEHWj3KHoCd9WXY73Qc7fCkETyQMdBlU5sGs7YT PqoGFQPYcCaD++eaN6bvxJleFOqm6b7On90L2f/sf/m/c+FmOvaGnZIP6ETvwEBdBhombg 6uGoRhrRjAag3vrBJ+sbDzSqaI63g4gmxg/DONBkGkj45wjDxhn88Cht3PCPvKWkqFM9ss pMbIV5wy0NIRot2adkIVmxg3x/9P5otzoZttRya+S/nPqERQDFVJDk41ZYpb4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WlQPxW81yiLHwvb8nxUE5CRCIBz/8vvDCumZie0ejbw=; b=LPtM5M/NV7yQc8pIuYgagh1dwmeYFI41OqKi1o5WBchVVmGdIe5l1T6zAh9C8qQI6Mu+vE tbKV0EF2hWVsUPF70jVt8bgahYcC9TIYJkJjJdUkzAzPkSbubUAWCUbjqx3TL40EDx2z0R uibm2xeaTR1s1blR217JD4TabuuH+Nlln9QVQT+SHqmNH7N3loUBHpTNKziUfuJuwksNtm RWSFNxKaJVlaJw9mtkilpK2d9P89sCRtHAHuHC9DCAXZ94ai20xExoQ3ZvJl82pQIpSo5Y P+NphgibaMc6+5FV25uooryDW7e2RhXSfaGxbII4J0Yk5TiiayDVs0i+CyjUUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184568; a=rsa-sha256; cv=none; b=xFC7+2dCE9Tkrv53C+N2+6uAGcUwiJztkgMp4Zsr4bW3FQiESnHf10D45TljT8P3CAYr7B m8oSX7awDZSdFv9Zrq0GBD5J1QsJUD7SWgph+jPXFY9qyjyPBNvciVWnEHyeubROtcoCY6 wdv/GfislLiKqALWGgACclh7hu+ZzmDbL+DrU+APm55GPU0EeqVLbHcUR8v2Ij4bjIskgY 0J2T8olMqQDIJoTBUqXXkTurOU8s0ZN8jDqm7Br6nQsvaTITlCAGVtVytXrK5kPoLZNhIK XabXF3Q/PP/saRLRNB3topLb56klieX9OBZwfHwcLZ60DS13EFNwDV+0kCD+4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfmHq4JC3zC6W; Tue, 28 Nov 2023 15:16: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 3ASFG7lJ094437; Tue, 28 Nov 2023 15:16:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASFG71n094434; Tue, 28 Nov 2023 15:16:07 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:16:07 GMT Message-Id: <202311281516.3ASFG71n094434@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: a077e95570d9 - stable/13 - Unbound: Remove backup file brought in from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a077e95570d9cef9882be688dc28303b6257cfd0 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a077e95570d9cef9882be688dc28303b6257cfd0 commit a077e95570d9cef9882be688dc28303b6257cfd0 Author: Cy Schubert AuthorDate: 2023-11-14 00:36:24 +0000 Commit: Cy Schubert CommitDate: 2023-11-28 15:15:54 +0000 Unbound: Remove backup file brought in from upstream Upstream tarball included config.h~. This was previously manually removed from vendor where in fact it should not have been as it would have caused a merge conflict. Reported by: "Herbert J. Skuhra" (cherry picked from commit 5aab39b24ce7437265b94461ffdd9b12c0723658) --- contrib/unbound/config.h.in~ | 1456 ------------------------------------------ 1 file changed, 1456 deletions(-) diff --git a/contrib/unbound/config.h.in~ b/contrib/unbound/config.h.in~ deleted file mode 100644 index f31354d01408..000000000000 --- a/contrib/unbound/config.h.in~ +++ /dev/null @@ -1,1456 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* apply the noreturn attribute to a function that exits the program */ -#undef ATTR_NORETURN - -/* apply the weak attribute to a symbol */ -#undef ATTR_WEAK - -/* Directory to chroot to */ -#undef CHROOT_DIR - -/* Define this to enable client subnet option. */ -#undef CLIENT_SUBNET - -/* Do sha512 definitions in config.h */ -#undef COMPAT_SHA512 - -/* Command line arguments used with configure */ -#undef CONFCMDLINE - -/* Pathname to the Unbound configuration file */ -#undef CONFIGFILE - -/* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work - */ -#undef DARWIN_BROKEN_SETREUID - -/* Whether daemon is deprecated */ -#undef DEPRECATED_DAEMON - -/* Deprecate RSA 1024 bit length, makes that an unsupported key */ -#undef DEPRECATE_RSA_1024 - -/* Define this to enable kernel based UDP source port randomization. */ -#undef DISABLE_EXPLICIT_PORT_RANDOMISATION - -/* default dnstap socket path */ -#undef DNSTAP_SOCKET_PATH - -/* Define if you want to use debug lock checking (slow). */ -#undef ENABLE_LOCK_CHECKS - -/* Define this if you enabled-allsymbols from libunbound to link binaries to - it for smaller install size, but the libunbound export table is polluted by - internal symbols */ -#undef EXPORT_ALL_SYMBOLS - -/* Define to 1 if you have the `accept4' function. */ -#undef HAVE_ACCEPT4 - -/* Define to 1 if you have the `arc4random' function. */ -#undef HAVE_ARC4RANDOM - -/* Define to 1 if you have the `arc4random_uniform' function. */ -#undef HAVE_ARC4RANDOM_UNIFORM - -/* Define to 1 if you have the header file. */ -#undef HAVE_ARPA_INET_H - -/* Whether the C compiler accepts the "format" attribute */ -#undef HAVE_ATTR_FORMAT - -/* Whether the C compiler accepts the "noreturn" attribute */ -#undef HAVE_ATTR_NORETURN - -/* Whether the C compiler accepts the "unused" attribute */ -#undef HAVE_ATTR_UNUSED - -/* Whether the C compiler accepts the "weak" attribute */ -#undef HAVE_ATTR_WEAK - -/* If we have be64toh */ -#undef HAVE_BE64TOH - -/* Define to 1 if you have the `BIO_set_callback_ex' function. */ -#undef HAVE_BIO_SET_CALLBACK_EX - -/* Define to 1 if you have the header file. */ -#undef HAVE_BSD_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_BSD_STRING_H - -/* Define to 1 if you have the `chown' function. */ -#undef HAVE_CHOWN - -/* Define to 1 if you have the `chroot' function. */ -#undef HAVE_CHROOT - -/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ -#undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA - -/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ -#undef HAVE_CRYPTO_THREADID_SET_CALLBACK - -/* Define to 1 if you have the `ctime_r' function. */ -#undef HAVE_CTIME_R - -/* Define to 1 if you have the `daemon' function. */ -#undef HAVE_DAEMON - -/* Define to 1 if you have the declaration of `arc4random', and to 0 if you - don't. */ -#undef HAVE_DECL_ARC4RANDOM - -/* Define to 1 if you have the declaration of `arc4random_uniform', and to 0 - if you don't. */ -#undef HAVE_DECL_ARC4RANDOM_UNIFORM - -/* Define to 1 if you have the declaration of `evsignal_assign', and to 0 if - you don't. */ -#undef HAVE_DECL_EVSIGNAL_ASSIGN - -/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you - don't. */ -#undef HAVE_DECL_INET_NTOP - -/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you - don't. */ -#undef HAVE_DECL_INET_PTON - -/* Define to 1 if you have the declaration of `nghttp2_session_server_new', - and to 0 if you don't. */ -#undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW - -/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you - don't. */ -#undef HAVE_DECL_NID_ED25519 - -/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you - don't. */ -#undef HAVE_DECL_NID_ED448 - -/* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you - don't. */ -#undef HAVE_DECL_NID_SECP384R1 - -/* Define to 1 if you have the declaration of `NID_X9_62_prime256v1', and to 0 - if you don't. */ -#undef HAVE_DECL_NID_X9_62_PRIME256V1 - -/* Define to 1 if you have the declaration of `reallocarray', and to 0 if you - don't. */ -#undef HAVE_DECL_REALLOCARRAY - -/* Define to 1 if you have the declaration of `redisConnect', and to 0 if you - don't. */ -#undef HAVE_DECL_REDISCONNECT - -/* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0 - if you don't. */ -#undef HAVE_DECL_SK_SSL_COMP_POP_FREE - -/* Define to 1 if you have the declaration of - `SSL_COMP_get_compression_methods', and to 0 if you don't. */ -#undef HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS - -/* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to - 0 if you don't. */ -#undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO - -/* Define to 1 if you have the declaration of `strlcat', and to 0 if you - don't. */ -#undef HAVE_DECL_STRLCAT - -/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you - don't. */ -#undef HAVE_DECL_STRLCPY - -/* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if - you don't. */ -#undef HAVE_DECL_XML_STOPPARSER - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the `DSA_SIG_set0' function. */ -#undef HAVE_DSA_SIG_SET0 - -/* Define to 1 if you have the header file. */ -#undef HAVE_ENDIAN_H - -/* Define to 1 if you have the `endprotoent' function. */ -#undef HAVE_ENDPROTOENT - -/* Define to 1 if you have the `endpwent' function. */ -#undef HAVE_ENDPWENT - -/* Define to 1 if you have the `endservent' function. */ -#undef HAVE_ENDSERVENT - -/* Define to 1 if you have the `ENGINE_cleanup' function. */ -#undef HAVE_ENGINE_CLEANUP - -/* Define to 1 if you have the `ERR_free_strings' function. */ -#undef HAVE_ERR_FREE_STRINGS - -/* Define to 1 if you have the `ERR_load_crypto_strings' function. */ -#undef HAVE_ERR_LOAD_CRYPTO_STRINGS - -/* Define to 1 if you have the `event_assign' function. */ -#undef HAVE_EVENT_ASSIGN - -/* Define to 1 if you have the `event_base_free' function. */ -#undef HAVE_EVENT_BASE_FREE - -/* Define to 1 if you have the `event_base_get_method' function. */ -#undef HAVE_EVENT_BASE_GET_METHOD - -/* Define to 1 if you have the `event_base_new' function. */ -#undef HAVE_EVENT_BASE_NEW - -/* Define to 1 if you have the `event_base_once' function. */ -#undef HAVE_EVENT_BASE_ONCE - -/* Define to 1 if you have the header file. */ -#undef HAVE_EVENT_H - -/* Define to 1 if you have the `EVP_aes_256_cbc' function. */ -#undef HAVE_EVP_AES_256_CBC - -/* Define to 1 if you have the `EVP_cleanup' function. */ -#undef HAVE_EVP_CLEANUP - -/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled' - function. */ -#undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED - -/* Define to 1 if you have the `EVP_DigestVerify' function. */ -#undef HAVE_EVP_DIGESTVERIFY - -/* Define to 1 if you have the `EVP_dss1' function. */ -#undef HAVE_EVP_DSS1 - -/* Define to 1 if you have the `EVP_EncryptInit_ex' function. */ -#undef HAVE_EVP_ENCRYPTINIT_EX - -/* Define to 1 if you have the `EVP_MAC_CTX_set_params' function. */ -#undef HAVE_EVP_MAC_CTX_SET_PARAMS - -/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ -#undef HAVE_EVP_MD_CTX_NEW - -/* Define to 1 if you have the `EVP_sha1' function. */ -#undef HAVE_EVP_SHA1 - -/* Define to 1 if you have the `EVP_sha256' function. */ -#undef HAVE_EVP_SHA256 - -/* Define to 1 if you have the `EVP_sha512' function. */ -#undef HAVE_EVP_SHA512 - -/* Define to 1 if you have the `ev_default_loop' function. */ -#undef HAVE_EV_DEFAULT_LOOP - -/* Define to 1 if you have the `ev_loop' function. */ -#undef HAVE_EV_LOOP - -/* Define to 1 if you have the header file. */ -#undef HAVE_EXPAT_H - -/* Define to 1 if you have the `explicit_bzero' function. */ -#undef HAVE_EXPLICIT_BZERO - -/* Define to 1 if you have the `fcntl' function. */ -#undef HAVE_FCNTL - -/* Define to 1 if you have the `FIPS_mode' function. */ -#undef HAVE_FIPS_MODE - -/* Define to 1 if you have the `fork' function. */ -#undef HAVE_FORK - -/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -#undef HAVE_FSEEKO - -/* Define to 1 if you have the `fsync' function. */ -#undef HAVE_FSYNC - -/* Whether getaddrinfo is available */ -#undef HAVE_GETADDRINFO - -/* Define to 1 if you have the `getauxval' function. */ -#undef HAVE_GETAUXVAL - -/* Define to 1 if you have the `getentropy' function. */ -#undef HAVE_GETENTROPY - -/* Define to 1 if you have the `getifaddrs' function. */ -#undef HAVE_GETIFADDRS - -/* Define to 1 if you have the header file. */ -#undef HAVE_GETOPT_H - -/* Define to 1 if you have the `getpwnam' function. */ -#undef HAVE_GETPWNAM - -/* Define to 1 if you have the `getrlimit' function. */ -#undef HAVE_GETRLIMIT - -/* Define to 1 if you have the `gettid' function. */ -#undef HAVE_GETTID - -/* Define to 1 if you have the `glob' function. */ -#undef HAVE_GLOB - -/* Define to 1 if you have the header file. */ -#undef HAVE_GLOB_H - -/* Define to 1 if you have the `gmtime_r' function. */ -#undef HAVE_GMTIME_R - -/* Define to 1 if you have the header file. */ -#undef HAVE_GRP_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_HIREDIS_HIREDIS_H - -/* Define to 1 if you have the `HMAC_Init_ex' function. */ -#undef HAVE_HMAC_INIT_EX - -/* If we have htobe64 */ -#undef HAVE_HTOBE64 - -/* Define to 1 if you have the header file. */ -#undef HAVE_IFADDRS_H - -/* Define to 1 if you have the `if_nametoindex' function. */ -#undef HAVE_IF_NAMETOINDEX - -/* Define to 1 if you have the `inet_aton' function. */ -#undef HAVE_INET_ATON - -/* Define to 1 if you have the `inet_ntop' function. */ -#undef HAVE_INET_NTOP - -/* Define to 1 if you have the `inet_pton' function. */ -#undef HAVE_INET_PTON - -/* Define to 1 if you have the `initgroups' function. */ -#undef HAVE_INITGROUPS - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* if the function 'ioctlsocket' is available */ -#undef HAVE_IOCTLSOCKET - -/* Define to 1 if you have the header file. */ -#undef HAVE_IPHLPAPI_H - -/* Define to 1 if you have the `isblank' function. */ -#undef HAVE_ISBLANK - -/* Define to 1 if you have the `kill' function. */ -#undef HAVE_KILL - -/* Use portable libbsd functions */ -#undef HAVE_LIBBSD - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBKERN_OSBYTEORDER_H - -/* Define if we have LibreSSL */ -#undef HAVE_LIBRESSL - -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_NET_TSTAMP_H - -/* Define to 1 if you have the `localtime_r' function. */ -#undef HAVE_LOCALTIME_R - -/* Define to 1 if you have the header file. */ -#undef HAVE_LOGIN_CAP_H - -/* If have GNU libc compatible malloc */ -#undef HAVE_MALLOC - -/* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETDB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_IN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_TCP_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETIOAPI_H - -/* Use libnettle for crypto */ -#undef HAVE_NETTLE - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETTLE_DSA_COMPAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETTLE_EDDSA_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NET_IF_H - -/* Define this to use nghttp2 client. */ -#undef HAVE_NGHTTP2 - -/* Define to 1 if you have the header file. */ -#undef HAVE_NGHTTP2_NGHTTP2_H - -/* Use libnss for crypto */ -#undef HAVE_NSS - -/* Define to 1 if you have the `OpenSSL_add_all_digests' function. */ -#undef HAVE_OPENSSL_ADD_ALL_DIGESTS - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_BN_H - -/* Define to 1 if you have the `OPENSSL_config' function. */ -#undef HAVE_OPENSSL_CONFIG - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_CONF_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_CORE_NAMES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_DH_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_DSA_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_ENGINE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_ERR_H - -/* Define to 1 if you have the `OPENSSL_init_crypto' function. */ -#undef HAVE_OPENSSL_INIT_CRYPTO - -/* Define to 1 if you have the `OPENSSL_init_ssl' function. */ -#undef HAVE_OPENSSL_INIT_SSL - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_PARAM_BUILD_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_RAND_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_RSA_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_SSL_H - -/* Define to 1 if you have the `OSSL_PARAM_BLD_new' function. */ -#undef HAVE_OSSL_PARAM_BLD_NEW - -/* Define to 1 if you have the `poll' function. */ -#undef HAVE_POLL - -/* Define to 1 if you have the header file. */ -#undef HAVE_POLL_H - -/* Define if you have POSIX threads libraries and header files. */ -#undef HAVE_PTHREAD - -/* Have PTHREAD_PRIO_INHERIT. */ -#undef HAVE_PTHREAD_PRIO_INHERIT - -/* Define to 1 if the system has the type `pthread_rwlock_t'. */ -#undef HAVE_PTHREAD_RWLOCK_T - -/* Define to 1 if the system has the type `pthread_spinlock_t'. */ -#undef HAVE_PTHREAD_SPINLOCK_T - -/* Define to 1 if you have the header file. */ -#undef HAVE_PWD_H - -/* Define if you have Python libraries and header files. */ -#undef HAVE_PYTHON - -/* Define to 1 if you have the `random' function. */ -#undef HAVE_RANDOM - -/* Define to 1 if you have the `RAND_cleanup' function. */ -#undef HAVE_RAND_CLEANUP - -/* If we have reallocarray(3) */ -#undef HAVE_REALLOCARRAY - -/* Define to 1 if you have the `recvmsg' function. */ -#undef HAVE_RECVMSG - -/* Define to 1 if you have the `sendmsg' function. */ -#undef HAVE_SENDMSG - -/* Define to 1 if you have the `setregid' function. */ -#undef HAVE_SETREGID - -/* Define to 1 if you have the `setresgid' function. */ -#undef HAVE_SETRESGID - -/* Define to 1 if you have the `setresuid' function. */ -#undef HAVE_SETRESUID - -/* Define to 1 if you have the `setreuid' function. */ -#undef HAVE_SETREUID - -/* Define to 1 if you have the `setrlimit' function. */ -#undef HAVE_SETRLIMIT - -/* Define to 1 if you have the `setsid' function. */ -#undef HAVE_SETSID - -/* Define to 1 if you have the `setusercontext' function. */ -#undef HAVE_SETUSERCONTEXT - -/* Define to 1 if you have the `SHA512_Update' function. */ -#undef HAVE_SHA512_UPDATE - -/* Define to 1 if you have the `shmget' function. */ -#undef HAVE_SHMGET - -/* Define to 1 if you have the `sigprocmask' function. */ -#undef HAVE_SIGPROCMASK - -/* Define to 1 if you have the `sleep' function. */ -#undef HAVE_SLEEP - -/* Define to 1 if you have the `snprintf' function. */ -#undef HAVE_SNPRINTF - -/* Define to 1 if you have the `socketpair' function. */ -#undef HAVE_SOCKETPAIR - -/* Using Solaris threads */ -#undef HAVE_SOLARIS_THREADS - -/* Define to 1 if you have the `srandom' function. */ -#undef HAVE_SRANDOM - -/* Define if you have the SSL libraries installed. */ -#undef HAVE_SSL - -/* Define to 1 if you have the `SSL_CTX_set_alpn_protos' function. */ -#undef HAVE_SSL_CTX_SET_ALPN_PROTOS - -/* Define to 1 if you have the `SSL_CTX_set_alpn_select_cb' function. */ -#undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB - -/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */ -#undef HAVE_SSL_CTX_SET_CIPHERSUITES - -/* Define to 1 if you have the `SSL_CTX_set_security_level' function. */ -#undef HAVE_SSL_CTX_SET_SECURITY_LEVEL - -/* Define to 1 if you have the `SSL_CTX_set_tlsext_ticket_key_evp_cb' - function. */ -#undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB - -/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ -#undef HAVE_SSL_GET0_ALPN_SELECTED - -/* Define to 1 if you have the `SSL_get0_peername' function. */ -#undef HAVE_SSL_GET0_PEERNAME - -/* Define to 1 if you have the `SSL_get1_peer_certificate' function. */ -#undef HAVE_SSL_GET1_PEER_CERTIFICATE - -/* Define to 1 if you have the `SSL_set1_host' function. */ -#undef HAVE_SSL_SET1_HOST - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDARG_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDBOOL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strftime' function. */ -#undef HAVE_STRFTIME - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strlcat' function. */ -#undef HAVE_STRLCAT - -/* Define to 1 if you have the `strlcpy' function. */ -#undef HAVE_STRLCPY - -/* Define to 1 if you have the `strptime' function. */ -#undef HAVE_STRPTIME - -/* Define to 1 if you have the `strsep' function. */ -#undef HAVE_STRSEP - -/* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */ -#undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST - -/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */ -#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN - -/* Define if you have Swig libraries and header files. */ -#undef HAVE_SWIG - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYSLOG_H - -/* Define to 1 if systemd should be used */ -#undef HAVE_SYSTEMD - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_ENDIAN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_IPC_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_RESOURCE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SELECT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SHA2_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SHM_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SOCKET_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SYSCTL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_UIO_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_UN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_WAIT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_TARGETCONDITIONALS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_TIME_H - -/* Define to 1 if you have the `tzset' function. */ -#undef HAVE_TZSET - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `usleep' function. */ -#undef HAVE_USLEEP - -/* Define to 1 if you have the `vfork' function. */ -#undef HAVE_VFORK - -/* Define to 1 if you have the header file. */ -#undef HAVE_VFORK_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_WINDOWS_H - -/* Using Windows threads */ -#undef HAVE_WINDOWS_THREADS - -/* Define to 1 if you have the header file. */ -#undef HAVE_WINSOCK2_H - -/* Define to 1 if `fork' works. */ -#undef HAVE_WORKING_FORK - -/* Define to 1 if `vfork' works. */ -#undef HAVE_WORKING_VFORK - -/* Define to 1 if you have the `writev' function. */ -#undef HAVE_WRITEV - -/* Define to 1 if you have the header file. */ -#undef HAVE_WS2TCPIP_H - -/* Define to 1 if you have the `X509_VERIFY_PARAM_set1_host' function. */ -#undef HAVE_X509_VERIFY_PARAM_SET1_HOST - -/* Define to 1 if you have the `_beginthreadex' function. */ -#undef HAVE__BEGINTHREADEX - -/* If HMAC_Init_ex() returns void */ -#undef HMAC_INIT_EX_RETURNS_VOID - -/* if lex has yylex_destroy */ -#undef LEX_HAS_YYLEX_DESTROY - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#undef LT_OBJDIR - -/* Define to the maximum message length to pass to syslog. */ -#undef MAXSYSLOGMSGLEN - -/* Define if memcmp() does not compare unsigned bytes */ -#undef MEMCMP_IS_BROKEN - -/* Define if mkdir has one argument. */ -#undef MKDIR_HAS_ONE_ARG - -/* Define if the network stack does not fully support nonblocking io (causes - lower performance). */ -#undef NONBLOCKING_IS_BROKEN - -/* Put -D_ALL_SOURCE define in config.h */ -#undef OMITTED__D_ALL_SOURCE - -/* Put -D_BSD_SOURCE define in config.h */ -#undef OMITTED__D_BSD_SOURCE - -/* Put -D_DEFAULT_SOURCE define in config.h */ -#undef OMITTED__D_DEFAULT_SOURCE - -/* Put -D_GNU_SOURCE define in config.h */ -#undef OMITTED__D_GNU_SOURCE - -/* Put -D_LARGEFILE_SOURCE=1 define in config.h */ -#undef OMITTED__D_LARGEFILE_SOURCE_1 - -/* Put -D_POSIX_C_SOURCE=200112 define in config.h */ -#undef OMITTED__D_POSIX_C_SOURCE_200112 - -/* Put -D_XOPEN_SOURCE=600 define in config.h */ -#undef OMITTED__D_XOPEN_SOURCE_600 - -/* Put -D_XOPEN_SOURCE_EXTENDED=1 define in config.h */ -#undef OMITTED__D_XOPEN_SOURCE_EXTENDED_1 - -/* Put -D__EXTENSIONS__ define in config.h */ -#undef OMITTED__D__EXTENSIONS__ - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* default pidfile location */ -#undef PIDFILE - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -#undef PTHREAD_CREATE_JOINABLE - -/* Return type of signal handlers, but autoconf 2.70 says 'your code may - safely assume C89 semantics that RETSIGTYPE is void.' */ -#undef RETSIGTYPE - -/* if REUSEPORT is enabled by default */ -#undef REUSEPORT_DEFAULT - -/* default rootkey location */ -#undef ROOT_ANCHOR_FILE - -/* default rootcert location */ -#undef ROOT_CERT_FILE - -/* version number for resource files */ -#undef RSRC_PACKAGE_VERSION - -/* Directory to chdir to */ -#undef RUN_DIR - -/* Shared data */ -#undef SHARE_DIR - -/* The size of `pthread_t', as computed by sizeof. */ -#undef SIZEOF_PTHREAD_T - -/* The size of `size_t', as computed by sizeof. */ -#undef SIZEOF_SIZE_T - -/* The size of `time_t', as computed by sizeof. */ -#undef SIZEOF_TIME_T - -/* The size of `unsigned long', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_LONG - -/* define if (v)snprintf does not return length needed, (but length used) */ -#undef SNPRINTF_RET_BROKEN - -/* Define to 1 if libsodium supports sodium_set_misuse_handler */ -#undef SODIUM_MISUSE_HANDLER - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* use default strptime. */ -#undef STRPTIME_WORKS - -/* Use win32 resources and API */ -#undef UB_ON_WINDOWS - -/* the SYSLOG_FACILITY to use, default LOG_DAEMON */ -#undef UB_SYSLOG_FACILITY - -/* default username */ -#undef UB_USERNAME - -/* use to enable lightweight alloc assertions, for debug use */ -#undef UNBOUND_ALLOC_LITE - -/* use malloc not regions, for debug use */ -#undef UNBOUND_ALLOC_NONREGIONAL - -/* use statistics for allocs and frees, for debug use */ -#undef UNBOUND_ALLOC_STATS - -/* define this to enable debug checks. */ -#undef UNBOUND_DEBUG - -/* Define to 1 to use cachedb support */ -#undef USE_CACHEDB - -/* Define to 1 to enable dnscrypt support */ -#undef USE_DNSCRYPT - -/* Define to 1 to enable dnscrypt with xchacha20 support */ -#undef USE_DNSCRYPT_XCHACHA20 - -/* Define to 1 to enable dnstap support */ -#undef USE_DNSTAP - -/* Define this to enable DSA support. */ -#undef USE_DSA - -/* Define this to enable ECDSA support. */ -#undef USE_ECDSA - -/* Define this to enable an EVP workaround for older openssl */ -#undef USE_ECDSA_EVP_WORKAROUND - -/* Define this to enable ED25519 support. */ -#undef USE_ED25519 - -/* Define this to enable ED448 support. */ -#undef USE_ED448 - -/* Define this to enable GOST support. */ -#undef USE_GOST - -/* Define to 1 to use ipsecmod support. */ -#undef USE_IPSECMOD - -/* Define to 1 to use ipset support */ -#undef USE_IPSET - -/* Define if you enable libevent */ -#undef USE_LIBEVENT - -/* Define this to enable use of /proc/sys/net/ipv4/ip_local_port_range as a - default outgoing port range. This is only for the libunbound on Linux and - does not affect unbound resolving daemon itself. This may severely limit - the number of available outgoing ports and thus decrease randomness. Define - this only when the target system restricts (e.g. some of SELinux enabled - distributions) the use of non-ephemeral ports. */ -#undef USE_LINUX_IP_LOCAL_PORT_RANGE - -/* Define if you want to use internal select based events */ -#undef USE_MINI_EVENT - -/* Define this to enable client TCP Fast Open. */ -#undef USE_MSG_FASTOPEN - -/* Define this to enable client TCP Fast Open. */ -#undef USE_OSX_MSG_FASTOPEN - -/* Define this to use hiredis client. */ -#undef USE_REDIS - -/* Define this to enable SHA1 support. */ -#undef USE_SHA1 - -/* Define this to enable SHA256 and SHA512 support. */ -#undef USE_SHA2 - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif - - -/* Define this to enable server TCP Fast Open. */ -#undef USE_TCP_FASTOPEN - -/* Whether the windows socket API is used */ -#undef USE_WINSOCK - -/* the version of the windows API enabled */ -#undef WINVER - -/* Define if you want dynlib module. */ *** 500 LINES SKIPPED *** From nobody Tue Nov 28 15:16:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmHs3BjPz53DlP; Tue, 28 Nov 2023 15:16: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 4SfmHr701Cz3Hmc; Tue, 28 Nov 2023 15: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=1701184569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lSv851OefYADJ691z/HPZaXqSgHRNoXaKRWqSXVM7iQ=; b=ZF9XpY1oh6EjrThkve1vfnD9q3De0RImkZG3VJHt8BEr7jAtjcgXWzaRO5VX2cl5LNwlW/ 012Ie0MYy9yEVax6/T76ztAedJWeY9oNnU6YNijt9XS+H4D891kGmUPNGbEsaEVLzhm34D N+fLMJknNLgBwSBx5BUcq98LDEJawLl0YXDlEZ/bJ+uN4fK34hIBgKTxZlBeJCYL6ehGuN E/Y0SFz9CRjlB5rMbT4O0VkJ5kYcPHknYKNl7jckQ5Gbg6SmT6gGs/6+Odzj6QUEtYB5Tq 3a3zcaZV2cc0obDMReVsVeVL/QTVgupPS3jZhX9t3lA70GmhP11kb//LJwQPsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lSv851OefYADJ691z/HPZaXqSgHRNoXaKRWqSXVM7iQ=; b=guxQr442QV8Z9xzLMtM5F9vSqN1FZR/877VO3cIYkXyA72kwq1wBrZGULO1RTjttFVig1i kGunznCVVA9xeuXaQJThV8QvFGSZaAFBXojKtfpFnrq0hjfSRCDXMNtQoVsj7xuCVekHJf wIfuAkA3QXWFnALLKQcHhMDCffi8ejf9UAHLwInevTgG8vEchsDEwGHxcqM8j9StghftYC ZzNC+3soocq6v1lOCf96tK5dyY/IrH+qeJWZ8YIlFQ2YzYHTTa8hLyp1ZYtb7ipsej1Fiv OPdjYVmhG64WdmYkZgDmp9EYluEePjTPp1xNcgiCJQi9Rs38TCHK8ZhjyW3xaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184569; a=rsa-sha256; cv=none; b=i0llpf5X6POlVDhq4IijPhCM1ajF9hYlwdNnEEto8/HjnOdNgvtjZUzRcpkG1VptlSjp68 FN0p0Ef+hObB0Qt3DxJePEywxui/V8TCGpLol+eTWtXnr3OsLbqpvMM1WJgBSCs7FlTvOG Zc2IL9mQJd39bkMJj8rdwXKJuk9HmuEwbk+L2xD+z/lm7zDAHihaqx3Rmz2ll5DADXfNVY HthZoj/crnAGXYr0kFXB22AHVNdCcVsn4ckuhR6mRdIgCerVTEyqCfqNb8KjXCdXCDSXXI EdjO+kDj/9rACwY4rGmEtfXR4L7ne28fRRs6A1KQfaOXroSkLtSrHpfgU96bzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfmHr50W8zBp5; Tue, 28 Nov 2023 15: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 3ASFG8ZZ094488; Tue, 28 Nov 2023 15: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 3ASFG8vH094485; Tue, 28 Nov 2023 15:16:08 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:16:08 GMT Message-Id: <202311281516.3ASFG8vH094485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 17b51a12dca0 - stable/13 - Unbound: Manually update version strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 17b51a12dca08f5126600e11181cee9454884e02 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=17b51a12dca08f5126600e11181cee9454884e02 commit 17b51a12dca08f5126600e11181cee9454884e02 Author: Cy Schubert AuthorDate: 2023-11-14 00:39:10 +0000 Commit: Cy Schubert CommitDate: 2023-11-28 15:15:54 +0000 Unbound: Manually update version strings This was missed earlier today. Reported by: "Herbert J. Skuhra" Fixes: 16fd0b249104 (cherry picked from commit 67267734315c6a48db31697f0a0669fa1f985969) --- usr.sbin/unbound/config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/unbound/config.h b/usr.sbin/unbound/config.h index ff9e17667e7d..31ab10e57e6a 100644 --- a/usr.sbin/unbound/config.h +++ b/usr.sbin/unbound/config.h @@ -793,7 +793,7 @@ #define PACKAGE_NAME "unbound" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "unbound 1.18.0" +#define PACKAGE_STRING "unbound 1.19.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "unbound" @@ -802,7 +802,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.18.0" +#define PACKAGE_VERSION "1.19.0" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" @@ -825,7 +825,7 @@ #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" /* version number for resource files */ -#define RSRC_PACKAGE_VERSION 1,18,0,0 +#define RSRC_PACKAGE_VERSION 1,19,0,0 /* Directory to chdir to */ #define RUN_DIR "/var/unbound" From nobody Tue Nov 28 15:16:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmHx4cQGz53DlS; Tue, 28 Nov 2023 15:16: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 4SfmHw2YkGz3Hc0; Tue, 28 Nov 2023 15: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=1701184572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7ssazNVe1odA6zCwNlr7AuMNbHbCn69N7yMZxyH/VF4=; b=ens26w/4E/ZfVILgbMlLRcFWG1RCUxvjYcWHvNU2PkL5ZgYlJjNHAbalcxBVuFb/pr4E5q bB/C5HnWccol1cToqiZSXNdUt5f6oKILizwpLF5AN77TQp/pW6AJXqHZZHUgbExz3vt3QH RH1WGXxwIhJoVPVMZc1f+hDKMsEeXv6PVh4w0seL8wluiKeFdGHCVa1LslI1qSp9XWas9m zy+hnxU+7UrinDBUzj6vWAwfq4htUizJQTiIMKRHLrHOg09Fs/26EVjm1XSa4lWIANoCb2 Z+uogY2EjVR4RKHYziTmSE0tpQ+rS3y8pPyJlAiqnYhKJhkKh1gJ1MBfvUdhSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7ssazNVe1odA6zCwNlr7AuMNbHbCn69N7yMZxyH/VF4=; b=uMecrmJCnXi5A3WkZX094vEvnpdG4oy2z5f1ksStBQadcYlxgiv5fy01jkO/UDLmWLs/d8 +5F0WEFalT7wBEr9UZYYBXy1MXW8J6GaFFXVyf+muS2jlRMuPCSrp28QZl+XXg9m8HSZC8 8CQteDqxCssgzGIydyYbzQOeOwBzAfdSmL4qRJe0ov6F8j0IJ4B43aINgcjHFaDj4CEggh p/l1RDAiYLSxCsikNe5KfzQSdTR0bJnWZIhs/D7B4y4w7NB+KOd1vwWqdi5qjYsXtcfXNs MukkQRVvHvN4hcrxFOgeUSdJ/NblSGXoaNmTijnE/iiGRNbthj/5f2O9nulxzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184572; a=rsa-sha256; cv=none; b=Y1PAem6ptnKJJ/TZzGcKE41oVykMUgffIAdRWmEvs1+vkfshAW1ONeB3l/41NssMCSh22/ Z1Aigcf5E2FChSo4bRTFR6HKKulMpreFUhFI4FQ7lyYY072POgn+rPtti92K7EJVedCmM4 mR2H6SCsdmGlyw9ALlWZQ5XUu9gBqKULO3y6O40jXME8jV52WLU/w0f8Ow14L5lJWSNVdB bg7FNrfWXIzGUiX7XmWFa6By7CdGzB4Xy2jFrNEUQVn0pFbh8Q8FMcTmO4qyT2M5lZs/fV 6BQ3aCvHKZZxl83GcL9BHFxBw/m1N0qLKxQqkT03daofLmxD6/Y+sDEEIbZpYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfmHt2KjdzBvW; Tue, 28 Nov 2023 15: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 3ASFGAZT094534; Tue, 28 Nov 2023 15: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 3ASFG9ZV094531; Tue, 28 Nov 2023 15:16:09 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:16:09 GMT Message-Id: <202311281516.3ASFG9ZV094531@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: b4d6d81dd112 - stable/13 - libevent: Import libevent 2.1.12 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b4d6d81dd112b3c537e755c5ccf19268f6c16d9e Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b4d6d81dd112b3c537e755c5ccf19268f6c16d9e commit b4d6d81dd112b3c537e755c5ccf19268f6c16d9e Author: Cy Schubert AuthorDate: 2023-11-14 23:04:28 +0000 Commit: Cy Schubert CommitDate: 2023-11-28 15:15:54 +0000 libevent: Import libevent 2.1.12 Merge commit '5223d1d95fddcef6f9a36e264a5800bd907ade8b' into main (cherry picked from commit b50261e21f39a6c7249a49e7b60aa878c98512a8) --- contrib/libevent/CMakeLists.txt | 1575 +++++++++ contrib/libevent/ChangeLog | 313 ++ contrib/libevent/ChangeLog-1.4 | 2 +- contrib/libevent/ChangeLog-2.0 | 2 +- contrib/libevent/Doxyfile | 46 +- contrib/libevent/Makefile.am | 67 +- contrib/libevent/Makefile.in | 1486 ++++++--- contrib/libevent/README.md | 487 +++ contrib/libevent/WIN32-Code/getopt.c | 149 + contrib/libevent/WIN32-Code/getopt.h | 33 + contrib/libevent/WIN32-Code/getopt_long.c | 234 ++ .../WIN32-Code/nmake/event2/event-config.h | 26 +- contrib/libevent/aclocal.m4 | 193 +- contrib/libevent/arc4random.c | 40 +- contrib/libevent/buffer.c | 50 +- contrib/libevent/buffer_iocp.c | 1 + contrib/libevent/bufferevent-internal.h | 36 + contrib/libevent/bufferevent.c | 115 +- contrib/libevent/bufferevent_async.c | 66 +- contrib/libevent/bufferevent_filter.c | 10 +- contrib/libevent/bufferevent_openssl.c | 75 +- contrib/libevent/bufferevent_pair.c | 4 +- contrib/libevent/bufferevent_ratelim.c | 9 +- contrib/libevent/bufferevent_sock.c | 74 +- contrib/libevent/{ => build-aux}/compile | 17 +- contrib/libevent/{ => build-aux}/config.guess | 970 +++--- contrib/libevent/build-aux/config.sub | 1793 +++++++++++ contrib/libevent/{ => build-aux}/depcomp | 10 +- contrib/libevent/{ => build-aux}/install-sh | 60 +- contrib/libevent/{ => build-aux}/ltmain.sh | 766 +++-- contrib/libevent/{ => build-aux}/missing | 16 +- contrib/libevent/{ => build-aux}/test-driver | 10 +- contrib/libevent/cmake/AddCompilerFlags.cmake | 13 + contrib/libevent/cmake/AddEventLibrary.cmake | 193 ++ contrib/libevent/cmake/COPYING-CMAKE-SCRIPTS | 22 + contrib/libevent/cmake/CheckConstExists.cmake | 25 + contrib/libevent/cmake/CheckFileOffsetBits.c | 14 + contrib/libevent/cmake/CheckFileOffsetBits.cmake | 43 + contrib/libevent/cmake/CheckFunctionKeywords.cmake | 14 + .../libevent/cmake/CheckPrototypeDefinition.c.in | 29 + .../libevent/cmake/CheckPrototypeDefinition.cmake | 82 + contrib/libevent/cmake/CheckWorkingKqueue.cmake | 52 + contrib/libevent/cmake/CodeCoverage.cmake | 165 + contrib/libevent/cmake/Copyright.txt | 57 + contrib/libevent/cmake/LibeventConfig.cmake.in | 183 ++ .../libevent/cmake/LibeventConfigVersion.cmake.in | 11 + contrib/libevent/cmake/Macros.cmake | 36 + contrib/libevent/cmake/Uninstall.cmake.in | 23 + contrib/libevent/cmake/UseDoxygen.cmake | 111 + contrib/libevent/cmake/VersionViaGit.cmake | 66 + contrib/libevent/config.h.in | 63 +- contrib/libevent/config.sub | 1807 ----------- contrib/libevent/configure | 3390 +++++++++++++++++--- contrib/libevent/configure.ac | 328 +- contrib/libevent/defer-internal.h | 3 + contrib/libevent/doxygen.am | 55 + contrib/libevent/epoll.c | 15 +- contrib/libevent/epolltable-internal.h | 2 +- contrib/libevent/evbuffer-internal.h | 2 +- contrib/libevent/evconfig-private.h.cmake | 40 + contrib/libevent/evconfig-private.h.in | 7 + contrib/libevent/evdns.c | 144 +- contrib/libevent/event-config.h.cmake | 513 +++ contrib/libevent/event-internal.h | 13 +- contrib/libevent/event.c | 392 ++- contrib/libevent/event_iocp.c | 2 +- contrib/libevent/event_rpcgen.py | 2057 ++++++------ contrib/libevent/event_tagging.c | 4 + contrib/libevent/evmap.c | 43 +- contrib/libevent/evrpc.c | 6 +- contrib/libevent/evthread-internal.h | 16 +- contrib/libevent/evthread.c | 2 +- contrib/libevent/evutil.c | 144 +- contrib/libevent/evutil_rand.c | 6 +- contrib/libevent/evutil_time.c | 65 +- contrib/libevent/http-internal.h | 9 +- contrib/libevent/http.c | 254 +- contrib/libevent/include/event2/buffer.h | 3 +- contrib/libevent/include/event2/buffer_compat.h | 3 +- contrib/libevent/include/event2/bufferevent.h | 11 +- .../libevent/include/event2/bufferevent_compat.h | 4 + contrib/libevent/include/event2/dns.h | 46 +- contrib/libevent/include/event2/dns_compat.h | 24 +- contrib/libevent/include/event2/event.h | 77 +- contrib/libevent/include/event2/http.h | 13 +- contrib/libevent/include/event2/http_compat.h | 6 +- contrib/libevent/include/event2/listener.h | 12 + contrib/libevent/include/event2/rpc.h | 48 +- contrib/libevent/include/event2/rpc_struct.h | 14 + contrib/libevent/include/event2/util.h | 34 +- contrib/libevent/include/event2/visibility.h | 31 +- contrib/libevent/include/include.am | 7 +- contrib/libevent/iocp-internal.h | 14 + contrib/libevent/kqueue.c | 17 +- contrib/libevent/listener.c | 29 +- contrib/libevent/log-internal.h | 25 +- contrib/libevent/log.c | 11 +- contrib/libevent/m4/ax_check_funcs_ex.m4 | 22 + contrib/libevent/m4/ax_prog_doxygen.m4 | 600 ++++ contrib/libevent/m4/libevent_openssl.m4 | 9 + contrib/libevent/m4/libtool.m4 | 102 +- contrib/libevent/m4/ltoptions.m4 | 2 +- contrib/libevent/m4/ltsugar.m4 | 2 +- contrib/libevent/m4/ltversion.m4 | 12 +- contrib/libevent/m4/lt~obsolete.m4 | 2 +- contrib/libevent/make-event-config.sed | 10 +- contrib/libevent/minheap-internal.h | 6 +- contrib/libevent/mm-internal.h | 5 + contrib/libevent/openssl-compat.h | 16 +- contrib/libevent/poll.c | 25 +- contrib/libevent/sample/dns-example.c | 17 +- contrib/libevent/sample/event-read-fifo.c | 4 +- contrib/libevent/sample/hello-world.c | 3 +- contrib/libevent/sample/http-connect.c | 86 +- contrib/libevent/sample/http-server.c | 292 +- contrib/libevent/sample/https-client.c | 88 +- contrib/libevent/sample/include.am | 11 +- contrib/libevent/sample/le-proxy.c | 16 +- .../libevent/sample/openssl_hostname_validation.c | 3 +- contrib/libevent/sample/signal-test.c | 25 +- contrib/libevent/sample/time-test.c | 7 +- contrib/libevent/select.c | 2 +- contrib/libevent/signal.c | 2 + contrib/libevent/strlcpy-internal.h | 2 + contrib/libevent/test/bench.c | 60 +- contrib/libevent/test/bench_cascade.c | 8 +- contrib/libevent/test/bench_http.c | 3 + contrib/libevent/test/bench_httpclient.c | 4 +- contrib/libevent/test/check-dumpevents.py | 10 +- contrib/libevent/test/include.am | 43 +- contrib/libevent/test/print-winsock-errors.c | 86 + contrib/libevent/test/regress.c | 332 +- contrib/libevent/test/regress.gen.c | 105 +- contrib/libevent/test/regress.gen.h | 11 +- contrib/libevent/test/regress.h | 7 +- contrib/libevent/test/regress_buffer.c | 369 ++- contrib/libevent/test/regress_bufferevent.c | 156 +- contrib/libevent/test/regress_dns.c | 522 ++- contrib/libevent/test/regress_et.c | 146 +- contrib/libevent/test/regress_finalize.c | 48 + contrib/libevent/test/regress_http.c | 479 ++- contrib/libevent/test/regress_listener.c | 100 +- contrib/libevent/test/regress_main.c | 68 +- contrib/libevent/test/regress_rpc.c | 49 +- contrib/libevent/test/regress_ssl.c | 404 ++- contrib/libevent/test/regress_testutils.c | 2 +- contrib/libevent/test/regress_thread.c | 8 +- contrib/libevent/test/regress_thread.h | 34 +- contrib/libevent/test/regress_util.c | 196 +- contrib/libevent/test/rpcgen_wrapper.sh | 11 +- contrib/libevent/test/test-changelist.c | 4 +- contrib/libevent/test/test-closed.c | 1 + contrib/libevent/test/test-eof.c | 4 +- contrib/libevent/test/test-fdleak.c | 15 +- contrib/libevent/test/test-init.c | 2 +- contrib/libevent/test/test-ratelim.c | 87 +- contrib/libevent/test/test-time.c | 25 +- contrib/libevent/test/test-weof.c | 4 +- contrib/libevent/test/test.sh | 4 +- contrib/libevent/test/tinytest.c | 169 +- contrib/libevent/test/tinytest.h | 5 +- contrib/libevent/test/tinytest_macros.h | 12 +- contrib/libevent/time-internal.h | 3 + contrib/libevent/util-internal.h | 72 +- contrib/libevent/win32select.c | 3 +- 165 files changed, 18349 insertions(+), 6378 deletions(-) diff --git a/contrib/libevent/CMakeLists.txt b/contrib/libevent/CMakeLists.txt new file mode 100644 index 000000000000..676727f16563 --- /dev/null +++ b/contrib/libevent/CMakeLists.txt @@ -0,0 +1,1575 @@ +# +# Libevent CMake project +# +# Based on initial work by: +# Alexey Ozeritsky +# +# Additional changes: +# Brodie Thiesfield +# Joakim Soderberg +# Trond Norbye +# Sergei Nikulov +# +# Build example: +# +# cd libevent +# md build +# cd build +# cmake -G "Visual Studio 10" .. +# start libevent.sln +# + +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) + +if (POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +endif() +if (POLICY CMP0074) + cmake_policy(SET CMP0074 NEW) +endif() +if (POLICY CMP0075) + cmake_policy(SET CMP0075 NEW) +endif() + +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release + CACHE STRING "Set build type to Debug o Release (default Release)" FORCE) +endif() +string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) + +# get rid of the extra default configurations +# what? why would you get id of other useful build types? - Ellzey +set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Limited configurations" FORCE) + +set(EVENT__LIBRARY_TYPE DEFAULT CACHE STRING + "Set library type to SHARED/STATIC/BOTH (default SHARED for MSVC, otherwise BOTH)") + +project(libevent C) + +list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/") +string(REGEX MATCH "SunOS" SOLARIS "${CMAKE_SYSTEM_NAME}") + + +include(CheckTypeSize) +include(CheckFileOffsetBits) +include(Macros) +include(CheckVariableExists) +include(CheckSymbolExists) +include(CheckStructHasMember) +include(CheckCSourceCompiles) +include(CheckPrototypeDefinition) +include(CheckFunctionKeywords) +include(CheckConstExists) +include(AddCompilerFlags) +include(VersionViaGit) + +event_fuzzy_version_from_git() + +set(EVENT_VERSION_MAJOR ${EVENT_GIT___VERSION_MAJOR}) +set(EVENT_VERSION_MINOR ${EVENT_GIT___VERSION_MINOR}) +set(EVENT_VERSION_PATCH ${EVENT_GIT___VERSION_PATCH}) +set(EVENT_VERSION_STAGE ${EVENT_GIT___VERSION_STAGE}) + + +set(EVENT_ABI_MAJOR ${EVENT_VERSION_MAJOR}) +set(EVENT_ABI_MINOR ${EVENT_VERSION_MINOR}) +set(EVENT_ABI_PATCH ${EVENT_VERSION_PATCH}) + +set(EVENT_ABI_LIBVERSION + "${EVENT_ABI_MAJOR}.${EVENT_ABI_MINOR}.${EVENT_ABI_PATCH}") + +set(EVENT_PACKAGE_VERSION + "${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}") + +set(EVENT_NUMERIC_VERSION 0x02010c00) +# equals to VERSION_INFO in Makefile.am +set(EVENT_ABI_LIBVERSION_CURRENT 7) +set(EVENT_ABI_LIBVERSION_REVISION 1) +set(EVENT_ABI_LIBVERSION_AGE 0) + +# equals to RELEASE in Makefile.am +set(EVENT_PACKAGE_RELEASE 2.1) + +# only a subset of names can be used, defaults to "beta" +set(EVENT_STAGE_NAME ${EVENT_VERSION_STAGE}) + +# a list that defines what can set for EVENT_STAGE_VERSION +set(EVENT__ALLOWED_STAGE_NAMES + rc + beta + alpha + alpha-dev + release + stable +) +list( + FIND EVENT__ALLOWED_STAGE_NAMES + "${EVENT_STAGE_NAME}" + EVENT__STAGE_RET +) +if (EVENT__STAGE_RET EQUAL -1) + message(WARNING + "stage ${EVENT_STAGE_NAME} is not allowed, reset to beta") + set(EVENT_STAGE_NAME beta) +endif() + +set(EVENT_VERSION + "${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}-${EVENT_STAGE_NAME}") + +option(EVENT__DISABLE_DEBUG_MODE + "Define if libevent should build without support for a debug mode" OFF) + +option(EVENT__ENABLE_VERBOSE_DEBUG + "Enables verbose debugging" OFF) + +option(EVENT__DISABLE_MM_REPLACEMENT + "Define if libevent should not allow replacing the mm functions" OFF) + +option(EVENT__DISABLE_THREAD_SUPPORT + "Define if libevent should not be compiled with thread support" OFF) + +option(EVENT__DISABLE_OPENSSL + "Define if libevent should build without support for OpenSSL encryption" OFF) + +option(EVENT__DISABLE_BENCHMARK + "Defines if libevent should build without the benchmark executables" OFF) + +option(EVENT__DISABLE_TESTS + "If tests should be compiled or not" OFF) + +option(EVENT__DISABLE_REGRESS + "Disable the regress tests" OFF) + +option(EVENT__DISABLE_SAMPLES + "Disable sample files" OFF) + +option(EVENT__DISABLE_CLOCK_GETTIME + "Do not use clock_gettime even if it is available" OFF) + +option(EVENT__FORCE_KQUEUE_CHECK + "When crosscompiling forces running a test program that verifies that Kqueue works with pipes. Note that this requires you to manually run the test program on the cross compilation target to verify that it works. See cmake documentation for try_run for more details" OFF) + +# TODO: Add --disable-largefile omit support for large files +option(EVENT__COVERAGE +"Enable running gcov to get a test coverage report (only works with GCC/CLang). Make sure to enable -DCMAKE_BUILD_TYPE=Debug as well." OFF) + +# Put the libaries and binaries that get built into directories at the +# top of the build tree rather than in hard-to-find leaf directories. +# +# But only if this variables are not defined yet +# (i.e. libevent is used via add_subdirectory()) +if (NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) +endif() +if (NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) +endif() +if (NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) +endif() + +if (EVENT__ENABLE_VERBOSE_DEBUG) + add_definitions(-DUSE_DEBUG=1) +endif() + +# make it colorful under ninja-build +if ("${CMAKE_GENERATOR}" STREQUAL "Ninja") + add_compiler_flags(-fdiagnostics-color=always) +endif() + +# Setup compiler flags for coverage. +if (EVENT__COVERAGE) + if (NOT "${CMAKE_BUILD_TYPE_LOWER}" STREQUAL "debug") + message(FATAL_ERROR "Coverage requires -DCMAKE_BUILD_TYPE=Debug") + endif() + + message(STATUS "Setting coverage compiler flags") + + set(CMAKE_REQUIRED_LIBRARIES "--coverage") + add_compiler_flags(-g -O0 --coverage) + set(CMAKE_REQUIRED_LIBRARIES "") +endif() + +set(GNUC 0) +set(CLANG 0) +set(MSVC 0) +if (("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") OR + ("${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")) + set(CLANG 1) +endif() +if (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR (${CLANG})) + set(GNUC 1) +endif() +if (("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") OR (${CLANG})) + set(MSVC 1) +endif() + +# Detect library type +set(EVENT_LIBRARY_TYPE) +if ("${EVENT__LIBRARY_TYPE}" STREQUAL "DEFAULT") + if (${MSVC}) + set(EVENT_LIBRARY_TYPE SHARED) + else() + set(EVENT_LIBRARY_TYPE BOTH) + endif() +else() + string(TOUPPER "${EVENT__LIBRARY_TYPE}" EVENT_LIBRARY_TYPE) +endif() +if ((${MSVC}) AND ("${EVENT_LIBRARY_TYPE}" STREQUAL "BOTH")) + message(WARNING + "Building SHARED and STATIC is not supported for MSVC " + "(due to conflicts in library name" + " between STATIC library and IMPORTED library for SHARED libraries)") +endif() +set(EVENT_LIBRARY_STATIC OFF) +set(EVENT_LIBRARY_SHARED OFF) +if ("${EVENT_LIBRARY_TYPE}" STREQUAL "BOTH") + set(EVENT_LIBRARY_STATIC ON) + set(EVENT_LIBRARY_SHARED ON) +elseif ("${EVENT_LIBRARY_TYPE}" STREQUAL "STATIC") + set(EVENT_LIBRARY_STATIC ON) +elseif ("${EVENT_LIBRARY_TYPE}" STREQUAL "SHARED") + set(EVENT_LIBRARY_SHARED ON) +else() + message(FATAL_ERROR "${EVENT_LIBRARY_TYPE} is not supported") +endif() + +if (${MSVC}) + set(msvc_static_runtime OFF) + if ("${EVENT_LIBRARY_TYPE}" STREQUAL "STATIC") + set(msvc_static_runtime ON) + endif() + + # For more info: + # - https://docs.microsoft.com/en-us/cpp/build/reference/md-mt-ld-use-run-time-library?view=vs-2017 + # - https://gitlab.kitware.com/cmake/community/wikis/FAQ#how-can-i-build-my-msvc-application-with-a-static-runtime + option(EVENT__MSVC_STATIC_RUNTIME + "Link static runtime libraries" + ${msvc_static_runtime}) + + if (EVENT__MSVC_STATIC_RUNTIME) + foreach (flag_var + CMAKE_C_FLAGS_DEBUG + CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL + CMAKE_C_FLAGS_RELWITHDEBINFO + ) + if (${flag_var} MATCHES "/MD") + string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + endif() + endforeach() + endif() +endif() + +# GNUC specific options. +if (${GNUC}) + option(EVENT__DISABLE_GCC_WARNINGS "Disable verbose warnings with GCC" OFF) + option(EVENT__ENABLE_GCC_HARDENING "Enable compiler security checks" OFF) + option(EVENT__ENABLE_GCC_FUNCTION_SECTIONS "Enable gcc function sections" OFF) + option(EVENT__ENABLE_GCC_WARNINGS "Make all GCC warnings into errors" OFF) + + set(GCC_V ${CMAKE_C_COMPILER_VERSION}) + + list(APPEND __FLAGS + -Wall -Wextra -Wno-unused-parameter -Wstrict-aliasing -Wstrict-prototypes + + -fno-strict-aliasing # gcc 2.9.5+ + -Wmissing-prototypes + + # gcc 4 + -Winit-self + -Wmissing-field-initializers + -Wdeclaration-after-statement + + # gcc 4.2 + -Waddress + -Wnormalized=id + -Woverride-init + + # gcc 4.5 + -Wlogical-op + + -Wwrite-strings + ) + + if (${CLANG}) + list(APPEND __FLAGS -Wno-unused-function) + endif() + + if (EVENT__DISABLE_GCC_WARNINGS) + list(APPEND __FLAGS -w) + endif() + + if (EVENT__ENABLE_GCC_HARDENING) + list(APPEND __FLAGS + -fstack-protector-all + -fwrapv + -fPIE + -Wstack-protector + "--param ssp-buffer-size=1") + + add_definitions(-D_FORTIFY_SOURCE=2) + endif() + + if (EVENT__ENABLE_GCC_FUNCTION_SECTIONS) + list(APPEND __FLAGS -ffunction-sections) + # TODO: Add --gc-sections support. We need some checks for NetBSD to ensure this works. + endif() + + if (EVENT__ENABLE_GCC_WARNINGS) + list(APPEND __FLAGS -Werror) + endif() + + add_compiler_flags(${__FLAGS}) +endif() + +if (APPLE) + # Get rid of deprecated warnings for OpenSSL on OSX 10.7 and greater. + add_compiler_flags( + -Wno-error=deprecated-declarations + -Qunused-arguments + ) +endif() + +if (MINGW OR CYGWIN) + set(WIN32 TRUE) +endif() + +# Winsock. +if(WIN32) + set(CMAKE_REQUIRED_LIBRARIES ws2_32 shell32 advapi32) + set(CMAKE_REQUIRED_DEFINITIONS -FIwinsock2.h -FIws2tcpip.h -D_WIN32_WINNT=0x0600) +endif() +if (SOLARIS) + set(CMAKE_REQUIRED_LIBRARIES socket nsl) +endif() + +# Check if _GNU_SOURCE is available. +if (NOT DEFINED _GNU_SOURCE) + CHECK_SYMBOL_EXISTS(__GNU_LIBRARY__ "features.h" _GNU_SOURCE) + + if (NOT _GNU_SOURCE) + unset(_GNU_SOURCE CACHE) + CHECK_SYMBOL_EXISTS(_GNU_SOURCE "features.h" _GNU_SOURCE) + endif() + + if (ANDROID) + set(_GNU_SOURCE TRUE) + endif() +endif() + +if (_GNU_SOURCE) + add_definitions(-D_GNU_SOURCE=1) + set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) +endif() + +# Check if header files exist +list(APPEND FILES_TO_CHECK + fcntl.h + inttypes.h + memory.h + signal.h + stdarg.h + stddef.h + stdint.h + stdlib.h + string.h + errno.h + unistd.h + time.h + sys/types.h + sys/stat.h + sys/time.h + sys/param.h +) +if (WIN32) + list(APPEND FILES_TO_CHECK + io.h + winsock2.h + ws2tcpip.h + afunix.h + ) +else() + list(APPEND FILES_TO_CHECK + netdb.h + dlfcn.h + arpa/inet.h + poll.h + port.h + sys/socket.h + sys/random.h + sys/un.h + sys/devpoll.h + sys/epoll.h + sys/eventfd.h + sys/event.h + sys/ioctl.h + sys/mman.h + sys/queue.h + sys/select.h + sys/sendfile.h + sys/uio.h + sys/wait.h + sys/resource.h + sys/timerfd.h + netinet/in.h + netinet/in6.h + netinet/tcp.h + ifaddrs.h + ) +endif() + +if (NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux") + list(APPEND FILES_TO_CHECK sys/sysctl.h) +endif() + +if (APPLE) + list(APPEND FILES_TO_CHECK + mach/mach_time.h + mach/mach.h + ) +endif() + +foreach(FILE ${FILES_TO_CHECK}) + CHECK_INCLUDE_FILE_CONCAT(${FILE} "EVENT") +endforeach() +unset(FILES_TO_CHECK) + +# Check if functions exist +list(APPEND SYMBOLS_TO_CHECK + getaddrinfo + getnameinfo + getprotobynumber + getservbyname + gethostbyname + inet_ntop + inet_pton + gettimeofday + signal + strtoll + splice + strlcpy + strsep + strtok_r + vasprintf + timerclear + timercmp + timerisset + timeradd + nanosleep + putenv + umask +) +if (NOT EVENT__DISABLE_CLOCK_GETTIME) + list(APPEND SYMBOLS_TO_CHECK clock_gettime) +endif() + +if (WIN32) + list(APPEND SYMBOLS_TO_CHECK + _gmtime64_s + _gmtime64 + ) +else() + list(APPEND SYMBOLS_TO_CHECK + getifaddrs + select + epoll_create + epoll_create1 + epoll_ctl + eventfd + poll + port_create + kqueue + fcntl + mmap + pipe + pipe2 + sendfile + sigaction + strsignal + sysctl + accept4 + arc4random + arc4random_buf + arc4random_addrandom + getrandom + getegid + geteuid + issetugid + usleep + timerfd_create + setenv + unsetenv + setrlimit + gethostbyname_r + ) + if (APPLE) + list(APPEND SYMBOLS_TO_CHECK mach_absolute_time) + endif() +endif() + +# Add stdio.h for vasprintf +set(EVENT_INCLUDES ${EVENT_INCLUDES} stdio.h) +CHECK_SYMBOLS_EXIST("${SYMBOLS_TO_CHECK}" "${EVENT_INCLUDES}" "EVENT") +unset(SYMBOLS_TO_CHECK) +set(EVENT__HAVE_EPOLL ${EVENT__HAVE_EPOLL_CREATE}) + +# Get the gethostbyname_r prototype. +if(EVENT__HAVE_GETHOSTBYNAME_R) + CHECK_PROTOTYPE_DEFINITION(gethostbyname_r + "int gethostbyname_r(const char *name, struct hostent *hp, struct hostent_data *hdata)" + "0" + "netdb.h" + EVENT__HAVE_GETHOSTBYNAME_R_3_ARG) + + CHECK_PROTOTYPE_DEFINITION(gethostbyname_r + "struct hostent *gethostbyname_r(const char *name, struct hostent *hp, char *buf, size_t buflen, int *herr)" + "NULL" + "netdb.h" + EVENT__HAVE_GETHOSTBYNAME_R_5_ARG) + + CHECK_PROTOTYPE_DEFINITION(gethostbyname_r + "int gethostbyname_r(const char *name, struct hostent *hp, char *buf, size_t buflen, struct hostent **result, int *herr)" + "0" + "netdb.h" + EVENT__HAVE_GETHOSTBYNAME_R_6_ARG) +endif() + +if(HAVE_PORT_H AND HAVE_PORT_CREATE) + set(EVENT__HAVE_EVENT_PORTS 1) +endif() + +# Only `CHECK_TYPE_SIZE()' will use `CMAKE_EXTRA_INCLUDE_FILES' +set(CMAKE_EXTRA_INCLUDE_FILES ${EVENT_INCLUDES}) + +CHECK_TYPE_SIZE("struct sockaddr_un" EVENT__HAVE_STRUCT_SOCKADDR_UN) +CHECK_TYPE_SIZE("uint8_t" EVENT__HAVE_UINT8_T) +CHECK_TYPE_SIZE("uint16_t" EVENT__HAVE_UINT16_T) +CHECK_TYPE_SIZE("uint32_t" EVENT__HAVE_UINT32_T) +CHECK_TYPE_SIZE("uint64_t" EVENT__HAVE_UINT64_T) +CHECK_TYPE_SIZE("short" EVENT__SIZEOF_SHORT BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("int" EVENT__SIZEOF_INT BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("unsigned" EVENT__SIZEOF_UNSIGNED BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("unsigned int" EVENT__SIZEOF_UNSIGNED_INT BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("long" EVENT__SIZEOF_LONG BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("long long" EVENT__SIZEOF_LONG_LONG BUILTIN_TYPES_ONLY) + +if(WIN32) + # These aren't available until Windows Vista. + # But you can still link them. They just won't be found when running the exe. + set(EVENT__HAVE_INET_NTOP 0) + set(EVENT__HAVE_INET_PTON 0) +endif() + +# Check for different inline keyword versions. +check_function_keywords("inline" "__inline" "__inline__") + +if (HAVE_INLINE) + set(EVENT__inline inline) +elseif (HAVE___INLINE) + set(EVENT__inline __inline) +elseif(HAVE___INLINE__) + set(EVENT__inline __inline__) +else() + set(EVENT__inline) +endif() + +# __func__/__FUNCTION__ is not a macros in general +CHECK_SYMBOL_EXISTS("__func__" "" EVENT__HAVE___func__) +CHECK_SYMBOL_EXISTS("__FUNCTION__" "" EVENT__HAVE___FUNCTION__) + +CHECK_SYMBOL_EXISTS(TAILQ_FOREACH sys/queue.h EVENT__HAVE_TAILQFOREACH) +CHECK_CONST_EXISTS(CTL_KERN sys/sysctl.h EVENT__HAVE_DECL_CTL_KERN) +CHECK_CONST_EXISTS(KERN_ARND sys/sysctl.h EVENT__HAVE_DECL_KERN_ARND) +CHECK_SYMBOL_EXISTS(F_SETFD fcntl.h EVENT__HAVE_SETFD) + +CHECK_TYPE_SIZE(fd_mask EVENT__HAVE_FD_MASK) + +CHECK_TYPE_SIZE(size_t EVENT__SIZEOF_SIZE_T) +if(NOT EVENT__SIZEOF_SIZE_T) + set(EVENT__size_t "unsigned") + set(EVENT__SIZEOF_SIZE_T ${EVENT__SIZEOF_UNSIGNED}) +else() + set(EVENT__size_t size_t) +endif() + +CHECK_TYPE_SIZE("off_t" EVENT__SIZEOF_OFF_T LANGUAGE C) + + +# XXX we should functionalize these size and type sets. --elley + +# Winssck. +if (_MSC_VER) + list(APPEND CMAKE_EXTRA_INCLUDE_FILES BaseTsd.h) +endif() +CHECK_TYPE_SIZE("ssize_t" EVENT__SIZEOF_SSIZE_T_LOWER LANGUAGE C) +CHECK_TYPE_SIZE("SSIZE_T" EVENT__SIZEOF_SSIZE_T_UPPER LANGUAGE C) + +if (EVENT__SIZEOF_SSIZE_T_LOWER) + set(EVENT__ssize_t "ssize_t") + set(EVENT__SIZEOF_SSIZE_T ${EVENT__SIZEOF_SSIZE_T_LOWER}) +elseif (EVENT__SIZEOF_SSIZE_T_UPPER) + set(EVENT__ssize_t "SSIZE_T") + set(EVENT__SIZEOF_SSIZE_T ${EVENT__SIZEOF_SSIZE_T_UPPER}) +else() + set(EVENT__ssize_t "int") + set(EVENT__SIZEOF_SSIZE_T ${EVENT__SIZEOF_INT}) +endif() + +CHECK_TYPE_SIZE(socklen_t EVENT__SIZEOF_SOCKLEN_T) +if(NOT EVENT__SIZEOF_SOCKLEN_T) + set(EVENT__socklen_t "unsigned int") + set(EVENT__SIZEOF_SOCKLEN_T ${EVENT__SIZEOF_UNSIGNED_INT}) +else() + set(EVENT__socklen_t "socklen_t") +endif() + +CHECK_TYPE_SIZE(pid_t EVENT__SIZEOF_PID_T) +if(NOT EVENT__SIZEOF_PID_T) + set(EVENT__SIZEOF_PID_T ${EVENT__SIZEOF_INT}) +else() + set(EVENT__SIZEOF_PID_T EVENT__SIZEOF_PID_T) +endif() + +if (NOT EVENT__DISABLE_THREAD_SUPPORT) + if (NOT WIN32) + list(APPEND CMAKE_EXTRA_INCLUDE_FILES pthread.h) + endif() + CHECK_TYPE_SIZE(pthread_t EVENT__SIZEOF_PTHREAD_T) +endif() + +if(EVENT__HAVE_CLOCK_GETTIME) + set(EVENT__DNS_USE_CPU_CLOCK_FOR_ID 1) +endif() + +# we're just getting lazy now. +CHECK_TYPE_SIZE("uintptr_t" EVENT__HAVE_UINTPTR_T) +CHECK_TYPE_SIZE("void *" EVENT__SIZEOF_VOID_P) +CHECK_TYPE_SIZE("time_t" EVENT__SIZEOF_TIME_T) + +# Tests file offset bits. +# TODO: Add AIX test for if -D_LARGE_FILES is needed. + +# XXX: Why is this here? we don't even use it. Well, we don't even use it +# on top of that, why is it set in the config.h?! IT_MAKES_NO_SENSE +# I'm commenting it out for now. +# - ellzey + +#CHECK_FILE_OFFSET_BITS() + +# Verify kqueue works with pipes. +if (EVENT__HAVE_KQUEUE) + if ((CMAKE_CROSSCOMPILING OR APPLE) AND NOT EVENT__FORCE_KQUEUE_CHECK) + message(WARNING "Cannot check if kqueue works with pipes when crosscompiling, use EVENT__FORCE_KQUEUE_CHECK to be sure (this requires manually running a test program on the cross compilation target)") + set(EVENT__HAVE_WORKING_KQUEUE 1) + else() + message(STATUS "Checking if kqueue works with pipes...") + include(CheckWorkingKqueue) + endif() +endif() + +if(EVENT__HAVE_NETDB_H) + list(APPEND CMAKE_EXTRA_INCLUDE_FILES netdb.h) + CHECK_TYPE_SIZE("struct addrinfo" EVENT__HAVE_STRUCT_ADDRINFO) +elseif(WIN32) + list(APPEND CMAKE_EXTRA_INCLUDE_FILES ws2tcpip.h) + CHECK_TYPE_SIZE("struct addrinfo" EVENT__HAVE_STRUCT_ADDRINFO) +endif() + +# Check for sockaddr structure sizes. +set(SOCKADDR_HEADERS) +if (WIN32) + set(CMAKE_REQUIRED_DEFINITIONS "-DWIN32_LEAN_AND_MEAN") + if (_MSC_VER LESS 1300) + set(SOCKADDR_HEADERS winsock.h) + else() + set(SOCKADDR_HEADERS winsock2.h ws2tcpip.h) + endif() +else() + if (EVENT__HAVE_NETINET_IN_H) + set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} netinet/in.h) + endif() + + if (EVENT__HAVE_NETINET_IN6_H) + set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} netinet/in6.h) + endif() + + if (EVENT__HAVE_SYS_SOCKET_H) + set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} sys/socket.h) + endif() + + if (EVENT__HAVE_NETDB_H) + set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} netdb.h) + endif() +endif() + +CHECK_TYPE_SIZE("struct in6_addr" EVENT__HAVE_STRUCT_IN6_ADDR) +if(EVENT__HAVE_STRUCT_IN6_ADDR) + CHECK_STRUCT_HAS_MEMBER("struct in6_addr" + s6_addr16 "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR16) + + CHECK_STRUCT_HAS_MEMBER("struct in6_addr" + s6_addr32 "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR32) +endif() + +CHECK_TYPE_SIZE("sa_family_t" EVENT__HAVE_SA_FAMILY_T) +CHECK_TYPE_SIZE("struct sockaddr_in6" EVENT__HAVE_STRUCT_SOCKADDR_IN6) + +if(EVENT__HAVE_STRUCT_SOCKADDR_IN6) + CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" + sin6_len "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN) + + CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" + sin_len "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN) +endif() + +CHECK_TYPE_SIZE("struct sockaddr_storage" EVENT__HAVE_STRUCT_SOCKADDR_STORAGE) +if(EVENT__HAVE_STRUCT_SOCKADDR_STORAGE) + CHECK_STRUCT_HAS_MEMBER("struct sockaddr_storage" + ss_family "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY) + + CHECK_STRUCT_HAS_MEMBER("struct sockaddr_storage" + __ss_family "${SOCKADDR_HEADERS}" EVENT__HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY) +endif() + +CHECK_TYPE_SIZE("struct linger" EVENT__HAVE_STRUCT_LINGER) + +# Group the source files. +set(HDR_PRIVATE + bufferevent-internal.h + changelist-internal.h + defer-internal.h + epolltable-internal.h + evbuffer-internal.h + event-internal.h + evmap-internal.h + evrpc-internal.h + evsignal-internal.h + evthread-internal.h + ht-internal.h + http-internal.h + iocp-internal.h + ipv6-internal.h + log-internal.h + minheap-internal.h + mm-internal.h + ratelim-internal.h + strlcpy-internal.h + util-internal.h + evconfig-private.h + compat/sys/queue.h) + +set(HDR_COMPAT + include/evdns.h + include/evrpc.h + include/event.h + include/evhttp.h + include/evutil.h) + +set(HDR_PUBLIC + include/event2/buffer.h + include/event2/bufferevent.h + include/event2/bufferevent_compat.h + include/event2/bufferevent_struct.h + include/event2/buffer_compat.h + include/event2/dns.h + include/event2/dns_compat.h + include/event2/dns_struct.h + include/event2/event.h + include/event2/event_compat.h + include/event2/event_struct.h + include/event2/http.h + include/event2/http_compat.h + include/event2/http_struct.h + include/event2/keyvalq_struct.h + include/event2/listener.h + include/event2/rpc.h + include/event2/rpc_compat.h + include/event2/rpc_struct.h + include/event2/tag.h + include/event2/tag_compat.h + include/event2/thread.h + include/event2/util.h *** 36060 LINES SKIPPED *** From nobody Tue Nov 28 15:16:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmJN29HHz53Dtl; Tue, 28 Nov 2023 15:16: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 4SfmJM2yf7z3J3H; Tue, 28 Nov 2023 15:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=csbKUCEoA1Q9B9f7bXUHrrOJ1Yyi01EHDNjWVIz9pR8=; b=WFUDmIVmmefPX1J9aiS/xccgnDS5XxKpHVoQx9hP96iyO1ErflXI5MRq4ADlywQPk+GBl0 xJWkvXZZNl0/d+rrU+4vQLfDYb1ZKoNuxKpGAQZ5GUZWobZCFRPV2Teotv0K/QhjgFayOF fx2cNBA562Vw4kaBMaM0M2pSpn7XQJM3MtxM4yuJtXLAMnHnFmIuvvX5UHugQCZV05urxA 662kZZbBx/Zob7+IIYKEw3LWlDbcVKluMvL9VG3AIk/FoSHyshFHzfIma4/i3Rb1fJXhxt G8vmtz17Qf4dG9I6gGtRBWdIf0tNUFvbrAkaV2T50oQiDcJCCiGwdQQQKRB6Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=csbKUCEoA1Q9B9f7bXUHrrOJ1Yyi01EHDNjWVIz9pR8=; b=J0GWwiboPsJf0Ekt7riDNbrzPLLpRVolbxGp08+oabcsCZckvbOQ/0yF+ZK9tEXk+8uW6j FSXaW6FdSneEcIcUv0iaM3QViKzxkb4vTtSrG7AkJYy48l2/op3ro6qnAOIYmUpWqrQ4Rq sWUA6gfguQ09B+uIuUL3TPTA4wjyhvMqYO41h0vFn3a1232W7A8wcs9rQGjoU6evyZVIw/ 7V0AyAwqbHMvqiRE4y0Lj9RQ9mxxkEPz6aC+raeMJK8CCVyLlBCv73daSOCxN2fmjkuRDV BEzQZCj68Z/iAv6IAVPt5U81PcCasqUJrAe5IGsBb8HJkagVzGgpO6OVVpl3Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184595; a=rsa-sha256; cv=none; b=Pwz8dZCImDDJBVmgBRayyEkeOIrMjSUuirrmM4MMq4jm1g4KdjweDp1uIF8rz7gzTl0EBD srgTbi5b6Sv/f/tOjbjgpf134TZmbKoNHTOCPR0HgEoQJcX6eaEoB07cmM0QrqBg0Pl95j 3Un9SEXlNzpREasadYO9e/DuayG1Uhmky6svshFwJGC7A8GFCUqgsjZc7OcTun+dMqUBK0 SNxpjSLdwa3Makcghyn4IkUiQEbjoI79GdizcoNIf1nM4/kiaUStki0e0Rvmgqv3220Wu6 gTZYjxc5kRoxe0jK5rLusNGRGqmRDRGskA3XcKF0u6PmPeGfZHam7jrSYN1DMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfmJM1rrmzBW3; Tue, 28 Nov 2023 15:16: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 3ASFGZLl094801; Tue, 28 Nov 2023 15:16:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASFGZEe094795; Tue, 28 Nov 2023 15:16:35 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:16:35 GMT Message-Id: <202311281516.3ASFGZEe094795@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: a68b13ba5647 - stable/12 - unbound: Vendor import 1.19.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: a68b13ba56473fb6f2ad1a37af0c7075225f7ab9 Auto-Submitted: auto-generated The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a68b13ba56473fb6f2ad1a37af0c7075225f7ab9 commit a68b13ba56473fb6f2ad1a37af0c7075225f7ab9 Author: Cy Schubert AuthorDate: 2023-11-13 21:38:45 +0000 Commit: Cy Schubert CommitDate: 2023-11-27 15:26:31 +0000 unbound: Vendor import 1.19.0 Release notes at https://www.nlnetlabs.nl/news/2023/Aug/30/unbound-1.19.0-released/ Merge commit '16fd0b24910488e59ca1941387b9ac7fb646a837' into unbound (cherry picked from commit 103ba509e72e3949d22485666949e9705d4af8cd) --- contrib/unbound/.gitignore | 1 - contrib/unbound/Makefile.in | 4 +- contrib/unbound/README.md | 6 +- contrib/unbound/cachedb/cachedb.c | 11 +- contrib/unbound/cachedb/redis.c | 68 +- contrib/unbound/config.guess | 8 +- contrib/unbound/config.h.in~ | 1456 ++++++++++++++++++++ contrib/unbound/config.sub | 155 ++- contrib/unbound/configure | 632 +++------ contrib/unbound/configure.ac | 17 +- contrib/unbound/daemon/remote.c | 35 +- contrib/unbound/daemon/worker.c | 8 + contrib/unbound/dns64/dns64.c | 99 +- contrib/unbound/dnstap/dnstap.m4 | 2 +- contrib/unbound/dnstap/dtstream.c | 8 +- contrib/unbound/dnstap/unbound-dnstap-socket.c | 12 +- contrib/unbound/doc/Changelog | 154 ++- contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf.in | 11 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 32 +- contrib/unbound/dynlibmod/dynlibmod.c | 3 +- contrib/unbound/edns-subnet/subnetmod.c | 30 +- contrib/unbound/edns-subnet/subnetmod.h | 7 + contrib/unbound/ipset/ipset.c | 4 +- contrib/unbound/iterator/iter_priv.c | 26 +- contrib/unbound/iterator/iter_resptype.c | 25 +- contrib/unbound/iterator/iter_resptype.h | 4 +- contrib/unbound/iterator/iter_scrub.c | 67 +- contrib/unbound/iterator/iter_scrub.h | 5 +- contrib/unbound/iterator/iterator.c | 74 +- contrib/unbound/iterator/iterator.h | 7 + contrib/unbound/libunbound/libworker.c | 4 + contrib/unbound/services/authzone.c | 11 +- contrib/unbound/services/listen_dnsport.c | 8 +- contrib/unbound/services/mesh.c | 9 +- contrib/unbound/services/outside_network.c | 2 +- contrib/unbound/services/rpz.c | 10 +- contrib/unbound/sldns/str2wire.c | 21 +- contrib/unbound/sldns/wire2str.c | 82 ++ contrib/unbound/sldns/wire2str.h | 13 + contrib/unbound/smallapp/unbound-checkconf.c | 17 + .../cachedb_no_store.tdir/cachedb_no_store.conf | 29 + .../cachedb_no_store.tdir/cachedb_no_store.dsc | 16 + .../cachedb_no_store.tdir/cachedb_no_store.post | 20 + .../cachedb_no_store.tdir/cachedb_no_store.pre | 36 + .../cachedb_no_store.servfail.testns | 8 + .../cachedb_no_store.tdir/cachedb_no_store.test | 132 ++ .../cachedb_no_store.tdir/cachedb_no_store.testns | 9 + contrib/unbound/testdata/disable_edns_do.rpl | 164 +++ contrib/unbound/testdata/iter_ignore_empty.rpl | 50 + contrib/unbound/testdata/iter_scrub_rr_length.rpl | 298 ++++ .../testdata/root_zonemd.tdir/root_zonemd.conf | 34 + .../testdata/root_zonemd.tdir/root_zonemd.dsc | 16 + .../testdata/root_zonemd.tdir/root_zonemd.post | 14 + .../testdata/root_zonemd.tdir/root_zonemd.pre | 50 + .../testdata/root_zonemd.tdir/root_zonemd.test | 51 + .../testdata/root_zonemd.tdir/root_zonemd.testns | 9 + contrib/unbound/testdata/rpz_cached_cname.rpl | 122 ++ contrib/unbound/testdata/subnet_prezero.crpl | 155 +++ contrib/unbound/testdata/val_scrub_rr_length.rpl | 164 +++ contrib/unbound/util/config_file.c | 10 + contrib/unbound/util/config_file.h | 6 + contrib/unbound/util/configlexer.lex | 3 + contrib/unbound/util/configparser.y | 45 +- contrib/unbound/util/data/msgencode.c | 4 +- contrib/unbound/util/data/msgparse.c | 25 + contrib/unbound/util/data/msgparse.h | 18 + contrib/unbound/util/fptr_wlist.c | 2 + contrib/unbound/util/log.c | 2 +- contrib/unbound/util/module.c | 18 + contrib/unbound/util/module.h | 10 + contrib/unbound/util/net_help.c | 108 +- contrib/unbound/util/net_help.h | 18 + contrib/unbound/util/netevent.c | 102 +- contrib/unbound/util/proxy_protocol.c | 162 ++- contrib/unbound/util/proxy_protocol.h | 66 +- contrib/unbound/util/rfc_1982.c | 1 + contrib/unbound/util/siphash.c | 5 + contrib/unbound/validator/val_anchor.c | 21 + contrib/unbound/validator/val_anchor.h | 8 + contrib/unbound/validator/validator.c | 11 + 87 files changed, 4408 insertions(+), 780 deletions(-) diff --git a/contrib/unbound/.gitignore b/contrib/unbound/.gitignore deleted file mode 100644 index b25c15b81fae..000000000000 --- a/contrib/unbound/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/contrib/unbound/Makefile.in b/contrib/unbound/Makefile.in index 0a2e7f9b6f08..22fb75c123bd 100644 --- a/contrib/unbound/Makefile.in +++ b/contrib/unbound/Makefile.in @@ -738,7 +738,7 @@ msgencode.lo msgencode.o: $(srcdir)/util/data/msgencode.c config.h $(srcdir)/uti msgparse.lo msgparse.o: $(srcdir)/util/data/msgparse.c config.h $(srcdir)/util/data/msgparse.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h msgreply.lo msgreply.o: $(srcdir)/util/data/msgreply.c config.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h \ @@ -793,7 +793,7 @@ iter_priv.lo iter_priv.o: $(srcdir)/iterator/iter_priv.c config.h $(srcdir)/iter $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/sbuffer.h iter_resptype.lo iter_resptype.o: $(srcdir)/iterator/iter_resptype.c config.h \ - $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/util/log.h \ + $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iterator.h $(srcdir)/util/log.h \ $(srcdir)/services/cache/dns.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/net_help.h \ $(srcdir)/util/data/dname.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h diff --git a/contrib/unbound/README.md b/contrib/unbound/README.md index c220da030458..3bbd38b3b78b 100644 --- a/contrib/unbound/README.md +++ b/contrib/unbound/README.md @@ -17,7 +17,9 @@ You can learn more about Unbound by reading our ## Compiling Make sure you have the C toolchain, OpenSSL and its include files, and libexpat -installed. Unbound can be compiled and installed using: +installed. +If building from the repository source you also need flex and bison installed. +Unbound can be compiled and installed using: ``` ./configure && make && make install @@ -27,7 +29,7 @@ You can use libevent if you want. libevent is useful when using many (10000) outgoing ports. By default max 256 ports are opened at the same time and the builtin alternative is equally capable and a little faster. -Use the `--with-libevent=dir` configure option to compile Unbound with libevent +Use the `--with-libevent` configure option to compile Unbound with libevent support. ## Unbound configuration diff --git a/contrib/unbound/cachedb/cachedb.c b/contrib/unbound/cachedb/cachedb.c index 30645268ca23..b912be8ed54f 100644 --- a/contrib/unbound/cachedb/cachedb.c +++ b/contrib/unbound/cachedb/cachedb.c @@ -265,11 +265,11 @@ cachedb_init(struct module_env* env, int id) return 0; } cachedb_env->enabled = 1; - if(env->cfg->serve_expired_reply_ttl) + if(env->cfg->serve_expired && env->cfg->serve_expired_reply_ttl) log_warn( "cachedb: serve-expired-reply-ttl is set but not working for data " - "originating from the external cache; 0 TLL is used for those."); - if(env->cfg->serve_expired_client_timeout) + "originating from the external cache; 0 TTL is used for those."); + if(env->cfg->serve_expired && env->cfg->serve_expired_client_timeout) log_warn( "cachedb: serve-expired-client-timeout is set but not working for " "data originating from the external cache; expired data are used " @@ -815,6 +815,11 @@ cachedb_handle_response(struct module_qstate* qstate, qstate->ext_state[id] = module_finished; return; } + if(qstate->env->cfg->cachedb_no_store) { + /* do not store the item in the external cache */ + qstate->ext_state[id] = module_finished; + return; + } /* store the item into the backend cache */ cachedb_extcache_store(qstate, ie); diff --git a/contrib/unbound/cachedb/redis.c b/contrib/unbound/cachedb/redis.c index 93a575a4c6d2..6cc975901df2 100644 --- a/contrib/unbound/cachedb/redis.c +++ b/contrib/unbound/cachedb/redis.c @@ -59,11 +59,28 @@ struct redis_moddata { const char* server_path; /* server's unix path, or "", NULL if unused */ const char* server_password; /* server's AUTH password, or "", NULL if unused */ struct timeval timeout; /* timeout for connection setup and commands */ + int logical_db; /* the redis logical database to use */ }; static redisReply* redis_command(struct module_env*, struct cachedb_env*, const char*, const uint8_t*, size_t); +static void +moddata_clean(struct redis_moddata** moddata) { + if(!moddata || !*moddata) + return; + if((*moddata)->ctxs) { + int i; + for(i = 0; i < (*moddata)->numctxs; i++) { + if((*moddata)->ctxs[i]) + redisFree((*moddata)->ctxs[i]); + } + free((*moddata)->ctxs); + } + free(*moddata); + *moddata = NULL; +} + static redisContext* redis_connect(const struct redis_moddata* moddata) { @@ -97,10 +114,21 @@ redis_connect(const struct redis_moddata* moddata) } freeReplyObject(rep); } + if(moddata->logical_db > 0) { + redisReply* rep; + rep = redisCommand(ctx, "SELECT %d", moddata->logical_db); + if(!rep || rep->type == REDIS_REPLY_ERROR) { + log_err("failed to set logical database (%d)", + moddata->logical_db); + freeReplyObject(rep); + goto fail; + } + freeReplyObject(rep); + } verbose(VERB_OPS, "Connection to Redis established"); return ctx; - fail: +fail: if(ctx) redisFree(ctx); return NULL; @@ -117,14 +145,13 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) moddata = calloc(1, sizeof(struct redis_moddata)); if(!moddata) { log_err("out of memory"); - return 0; + goto fail; } moddata->numctxs = env->cfg->num_threads; moddata->ctxs = calloc(env->cfg->num_threads, sizeof(redisContext*)); if(!moddata->ctxs) { log_err("out of memory"); - free(moddata); - return 0; + goto fail; } /* note: server_host is a shallow reference to configured string. * we don't have to free it in this module. */ @@ -134,8 +161,15 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) moddata->server_password = env->cfg->redis_server_password; moddata->timeout.tv_sec = env->cfg->redis_timeout / 1000; moddata->timeout.tv_usec = (env->cfg->redis_timeout % 1000) * 1000; - for(i = 0; i < moddata->numctxs; i++) - moddata->ctxs[i] = redis_connect(moddata); + moddata->logical_db = env->cfg->redis_logical_db; + for(i = 0; i < moddata->numctxs; i++) { + redisContext* ctx = redis_connect(moddata); + if(!ctx) { + log_err("redis_init: failed to init redis"); + goto fail; + } + moddata->ctxs[i] = ctx; + } cachedb_env->backend_data = moddata; if(env->cfg->redis_expire_records) { redisReply* rep = NULL; @@ -148,7 +182,7 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) log_err("redis_init: failed to init redis, the " "redis-expire-records option requires the SETEX command " "(redis >= 2.0.0)"); - return 0; + goto fail; } redis_reply_type = rep->type; freeReplyObject(rep); @@ -160,11 +194,14 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) log_err("redis_init: failed to init redis, the " "redis-expire-records option requires the SETEX command " "(redis >= 2.0.0)"); - return 0; + goto fail; } } - return 1; + +fail: + moddata_clean(&moddata); + return 0; } static void @@ -175,18 +212,7 @@ redis_deinit(struct module_env* env, struct cachedb_env* cachedb_env) (void)env; verbose(VERB_OPS, "Redis deinitialization"); - - if(!moddata) - return; - if(moddata->ctxs) { - int i; - for(i = 0; i < moddata->numctxs; i++) { - if(moddata->ctxs[i]) - redisFree(moddata->ctxs[i]); - } - free(moddata->ctxs); - } - free(moddata); + moddata_clean(&moddata); } /* diff --git a/contrib/unbound/config.guess b/contrib/unbound/config.guess index b187213930f1..cdfc4392047c 100755 --- a/contrib/unbound/config.guess +++ b/contrib/unbound/config.guess @@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2023-07-20' +timestamp='2023-08-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -155,6 +155,9 @@ Linux|GNU|GNU/*) set_cc_for_build cat <<-EOF > "$dummy.c" + #if defined(__ANDROID__) + LIBC=android + #else #include #if defined(__UCLIBC__) LIBC=uclibc @@ -169,6 +172,7 @@ Linux|GNU|GNU/*) LIBC=musl #endif #endif + #endif EOF cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` eval "$cc_set_libc" @@ -904,7 +908,7 @@ EOF fi ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` + UNAME_PROCESSOR=`uname -p` case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; diff --git a/contrib/unbound/config.h.in~ b/contrib/unbound/config.h.in~ new file mode 100644 index 000000000000..f31354d01408 --- /dev/null +++ b/contrib/unbound/config.h.in~ @@ -0,0 +1,1456 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* apply the noreturn attribute to a function that exits the program */ +#undef ATTR_NORETURN + +/* apply the weak attribute to a symbol */ +#undef ATTR_WEAK + +/* Directory to chroot to */ +#undef CHROOT_DIR + +/* Define this to enable client subnet option. */ +#undef CLIENT_SUBNET + +/* Do sha512 definitions in config.h */ +#undef COMPAT_SHA512 + +/* Command line arguments used with configure */ +#undef CONFCMDLINE + +/* Pathname to the Unbound configuration file */ +#undef CONFIGFILE + +/* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work + */ +#undef DARWIN_BROKEN_SETREUID + +/* Whether daemon is deprecated */ +#undef DEPRECATED_DAEMON + +/* Deprecate RSA 1024 bit length, makes that an unsupported key */ +#undef DEPRECATE_RSA_1024 + +/* Define this to enable kernel based UDP source port randomization. */ +#undef DISABLE_EXPLICIT_PORT_RANDOMISATION + +/* default dnstap socket path */ +#undef DNSTAP_SOCKET_PATH + +/* Define if you want to use debug lock checking (slow). */ +#undef ENABLE_LOCK_CHECKS + +/* Define this if you enabled-allsymbols from libunbound to link binaries to + it for smaller install size, but the libunbound export table is polluted by + internal symbols */ +#undef EXPORT_ALL_SYMBOLS + +/* Define to 1 if you have the `accept4' function. */ +#undef HAVE_ACCEPT4 + +/* Define to 1 if you have the `arc4random' function. */ +#undef HAVE_ARC4RANDOM + +/* Define to 1 if you have the `arc4random_uniform' function. */ +#undef HAVE_ARC4RANDOM_UNIFORM + +/* Define to 1 if you have the header file. */ +#undef HAVE_ARPA_INET_H + +/* Whether the C compiler accepts the "format" attribute */ +#undef HAVE_ATTR_FORMAT + +/* Whether the C compiler accepts the "noreturn" attribute */ +#undef HAVE_ATTR_NORETURN + +/* Whether the C compiler accepts the "unused" attribute */ +#undef HAVE_ATTR_UNUSED + +/* Whether the C compiler accepts the "weak" attribute */ +#undef HAVE_ATTR_WEAK + +/* If we have be64toh */ +#undef HAVE_BE64TOH + +/* Define to 1 if you have the `BIO_set_callback_ex' function. */ +#undef HAVE_BIO_SET_CALLBACK_EX + +/* Define to 1 if you have the header file. */ +#undef HAVE_BSD_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_BSD_STRING_H + +/* Define to 1 if you have the `chown' function. */ +#undef HAVE_CHOWN + +/* Define to 1 if you have the `chroot' function. */ +#undef HAVE_CHROOT + +/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ +#undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA + +/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ +#undef HAVE_CRYPTO_THREADID_SET_CALLBACK + +/* Define to 1 if you have the `ctime_r' function. */ +#undef HAVE_CTIME_R + +/* Define to 1 if you have the `daemon' function. */ +#undef HAVE_DAEMON + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#undef HAVE_DECL_ARC4RANDOM + +/* Define to 1 if you have the declaration of `arc4random_uniform', and to 0 + if you don't. */ +#undef HAVE_DECL_ARC4RANDOM_UNIFORM + +/* Define to 1 if you have the declaration of `evsignal_assign', and to 0 if + you don't. */ +#undef HAVE_DECL_EVSIGNAL_ASSIGN + +/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you + don't. */ +#undef HAVE_DECL_INET_NTOP + +/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you + don't. */ +#undef HAVE_DECL_INET_PTON + +/* Define to 1 if you have the declaration of `nghttp2_session_server_new', + and to 0 if you don't. */ +#undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW + +/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you + don't. */ +#undef HAVE_DECL_NID_ED25519 + +/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you + don't. */ +#undef HAVE_DECL_NID_ED448 + +/* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you + don't. */ +#undef HAVE_DECL_NID_SECP384R1 + +/* Define to 1 if you have the declaration of `NID_X9_62_prime256v1', and to 0 + if you don't. */ +#undef HAVE_DECL_NID_X9_62_PRIME256V1 + +/* Define to 1 if you have the declaration of `reallocarray', and to 0 if you + don't. */ +#undef HAVE_DECL_REALLOCARRAY + +/* Define to 1 if you have the declaration of `redisConnect', and to 0 if you + don't. */ +#undef HAVE_DECL_REDISCONNECT + +/* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0 + if you don't. */ +#undef HAVE_DECL_SK_SSL_COMP_POP_FREE + +/* Define to 1 if you have the declaration of + `SSL_COMP_get_compression_methods', and to 0 if you don't. */ +#undef HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS + +/* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to + 0 if you don't. */ +#undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO + +/* Define to 1 if you have the declaration of `strlcat', and to 0 if you + don't. */ +#undef HAVE_DECL_STRLCAT + +/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you + don't. */ +#undef HAVE_DECL_STRLCPY + +/* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if + you don't. */ +#undef HAVE_DECL_XML_STOPPARSER + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the `DSA_SIG_set0' function. */ +#undef HAVE_DSA_SIG_SET0 + +/* Define to 1 if you have the header file. */ +#undef HAVE_ENDIAN_H + +/* Define to 1 if you have the `endprotoent' function. */ +#undef HAVE_ENDPROTOENT + +/* Define to 1 if you have the `endpwent' function. */ +#undef HAVE_ENDPWENT + +/* Define to 1 if you have the `endservent' function. */ +#undef HAVE_ENDSERVENT + +/* Define to 1 if you have the `ENGINE_cleanup' function. */ +#undef HAVE_ENGINE_CLEANUP + +/* Define to 1 if you have the `ERR_free_strings' function. */ +#undef HAVE_ERR_FREE_STRINGS + +/* Define to 1 if you have the `ERR_load_crypto_strings' function. */ +#undef HAVE_ERR_LOAD_CRYPTO_STRINGS + +/* Define to 1 if you have the `event_assign' function. */ +#undef HAVE_EVENT_ASSIGN + +/* Define to 1 if you have the `event_base_free' function. */ +#undef HAVE_EVENT_BASE_FREE + +/* Define to 1 if you have the `event_base_get_method' function. */ +#undef HAVE_EVENT_BASE_GET_METHOD + +/* Define to 1 if you have the `event_base_new' function. */ +#undef HAVE_EVENT_BASE_NEW + +/* Define to 1 if you have the `event_base_once' function. */ +#undef HAVE_EVENT_BASE_ONCE + +/* Define to 1 if you have the header file. */ +#undef HAVE_EVENT_H + +/* Define to 1 if you have the `EVP_aes_256_cbc' function. */ +#undef HAVE_EVP_AES_256_CBC + +/* Define to 1 if you have the `EVP_cleanup' function. */ +#undef HAVE_EVP_CLEANUP + +/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled' + function. */ +#undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED + +/* Define to 1 if you have the `EVP_DigestVerify' function. */ +#undef HAVE_EVP_DIGESTVERIFY + +/* Define to 1 if you have the `EVP_dss1' function. */ +#undef HAVE_EVP_DSS1 + +/* Define to 1 if you have the `EVP_EncryptInit_ex' function. */ +#undef HAVE_EVP_ENCRYPTINIT_EX + +/* Define to 1 if you have the `EVP_MAC_CTX_set_params' function. */ +#undef HAVE_EVP_MAC_CTX_SET_PARAMS + +/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ +#undef HAVE_EVP_MD_CTX_NEW + +/* Define to 1 if you have the `EVP_sha1' function. */ +#undef HAVE_EVP_SHA1 + +/* Define to 1 if you have the `EVP_sha256' function. */ +#undef HAVE_EVP_SHA256 + +/* Define to 1 if you have the `EVP_sha512' function. */ +#undef HAVE_EVP_SHA512 + +/* Define to 1 if you have the `ev_default_loop' function. */ +#undef HAVE_EV_DEFAULT_LOOP + +/* Define to 1 if you have the `ev_loop' function. */ +#undef HAVE_EV_LOOP + +/* Define to 1 if you have the header file. */ +#undef HAVE_EXPAT_H + +/* Define to 1 if you have the `explicit_bzero' function. */ +#undef HAVE_EXPLICIT_BZERO + +/* Define to 1 if you have the `fcntl' function. */ +#undef HAVE_FCNTL + +/* Define to 1 if you have the `FIPS_mode' function. */ +#undef HAVE_FIPS_MODE + +/* Define to 1 if you have the `fork' function. */ +#undef HAVE_FORK + +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#undef HAVE_FSEEKO + +/* Define to 1 if you have the `fsync' function. */ +#undef HAVE_FSYNC + +/* Whether getaddrinfo is available */ +#undef HAVE_GETADDRINFO + +/* Define to 1 if you have the `getauxval' function. */ +#undef HAVE_GETAUXVAL + +/* Define to 1 if you have the `getentropy' function. */ +#undef HAVE_GETENTROPY + +/* Define to 1 if you have the `getifaddrs' function. */ +#undef HAVE_GETIFADDRS + +/* Define to 1 if you have the header file. */ +#undef HAVE_GETOPT_H + +/* Define to 1 if you have the `getpwnam' function. */ +#undef HAVE_GETPWNAM + +/* Define to 1 if you have the `getrlimit' function. */ +#undef HAVE_GETRLIMIT + +/* Define to 1 if you have the `gettid' function. */ +#undef HAVE_GETTID + +/* Define to 1 if you have the `glob' function. */ +#undef HAVE_GLOB + +/* Define to 1 if you have the header file. */ +#undef HAVE_GLOB_H + +/* Define to 1 if you have the `gmtime_r' function. */ +#undef HAVE_GMTIME_R + +/* Define to 1 if you have the header file. */ +#undef HAVE_GRP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_HIREDIS_HIREDIS_H + +/* Define to 1 if you have the `HMAC_Init_ex' function. */ +#undef HAVE_HMAC_INIT_EX + +/* If we have htobe64 */ +#undef HAVE_HTOBE64 + +/* Define to 1 if you have the header file. */ +#undef HAVE_IFADDRS_H + +/* Define to 1 if you have the `if_nametoindex' function. */ +#undef HAVE_IF_NAMETOINDEX + +/* Define to 1 if you have the `inet_aton' function. */ +#undef HAVE_INET_ATON + +/* Define to 1 if you have the `inet_ntop' function. */ +#undef HAVE_INET_NTOP + +/* Define to 1 if you have the `inet_pton' function. */ +#undef HAVE_INET_PTON + +/* Define to 1 if you have the `initgroups' function. */ +#undef HAVE_INITGROUPS + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* if the function 'ioctlsocket' is available */ +#undef HAVE_IOCTLSOCKET + +/* Define to 1 if you have the header file. */ +#undef HAVE_IPHLPAPI_H + +/* Define to 1 if you have the `isblank' function. */ +#undef HAVE_ISBLANK + +/* Define to 1 if you have the `kill' function. */ +#undef HAVE_KILL + +/* Use portable libbsd functions */ +#undef HAVE_LIBBSD + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBKERN_OSBYTEORDER_H + +/* Define if we have LibreSSL */ +#undef HAVE_LIBRESSL + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_NET_TSTAMP_H + +/* Define to 1 if you have the `localtime_r' function. */ +#undef HAVE_LOCALTIME_R + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOGIN_CAP_H + +/* If have GNU libc compatible malloc */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the `memmove' function. */ +#undef HAVE_MEMMOVE + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETDB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_TCP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETIOAPI_H + +/* Use libnettle for crypto */ +#undef HAVE_NETTLE + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETTLE_DSA_COMPAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETTLE_EDDSA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_IF_H + +/* Define this to use nghttp2 client. */ +#undef HAVE_NGHTTP2 + +/* Define to 1 if you have the header file. */ +#undef HAVE_NGHTTP2_NGHTTP2_H + +/* Use libnss for crypto */ +#undef HAVE_NSS + +/* Define to 1 if you have the `OpenSSL_add_all_digests' function. */ +#undef HAVE_OPENSSL_ADD_ALL_DIGESTS + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_BN_H + +/* Define to 1 if you have the `OPENSSL_config' function. */ +#undef HAVE_OPENSSL_CONFIG + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_CONF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_CORE_NAMES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_DH_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_DSA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_ENGINE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_ERR_H + +/* Define to 1 if you have the `OPENSSL_init_crypto' function. */ +#undef HAVE_OPENSSL_INIT_CRYPTO + +/* Define to 1 if you have the `OPENSSL_init_ssl' function. */ +#undef HAVE_OPENSSL_INIT_SSL + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_PARAM_BUILD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_RAND_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_RSA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_SSL_H + +/* Define to 1 if you have the `OSSL_PARAM_BLD_new' function. */ +#undef HAVE_OSSL_PARAM_BLD_NEW + +/* Define to 1 if you have the `poll' function. */ +#undef HAVE_POLL + +/* Define to 1 if you have the header file. */ +#undef HAVE_POLL_H + +/* Define if you have POSIX threads libraries and header files. */ +#undef HAVE_PTHREAD + +/* Have PTHREAD_PRIO_INHERIT. */ +#undef HAVE_PTHREAD_PRIO_INHERIT + +/* Define to 1 if the system has the type `pthread_rwlock_t'. */ +#undef HAVE_PTHREAD_RWLOCK_T + +/* Define to 1 if the system has the type `pthread_spinlock_t'. */ +#undef HAVE_PTHREAD_SPINLOCK_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_PWD_H + +/* Define if you have Python libraries and header files. */ +#undef HAVE_PYTHON + +/* Define to 1 if you have the `random' function. */ +#undef HAVE_RANDOM + +/* Define to 1 if you have the `RAND_cleanup' function. */ +#undef HAVE_RAND_CLEANUP + +/* If we have reallocarray(3) */ +#undef HAVE_REALLOCARRAY + +/* Define to 1 if you have the `recvmsg' function. */ +#undef HAVE_RECVMSG + +/* Define to 1 if you have the `sendmsg' function. */ +#undef HAVE_SENDMSG + +/* Define to 1 if you have the `setregid' function. */ +#undef HAVE_SETREGID + +/* Define to 1 if you have the `setresgid' function. */ +#undef HAVE_SETRESGID + +/* Define to 1 if you have the `setresuid' function. */ +#undef HAVE_SETRESUID + +/* Define to 1 if you have the `setreuid' function. */ +#undef HAVE_SETREUID + +/* Define to 1 if you have the `setrlimit' function. */ +#undef HAVE_SETRLIMIT + +/* Define to 1 if you have the `setsid' function. */ +#undef HAVE_SETSID + +/* Define to 1 if you have the `setusercontext' function. */ +#undef HAVE_SETUSERCONTEXT + +/* Define to 1 if you have the `SHA512_Update' function. */ +#undef HAVE_SHA512_UPDATE + +/* Define to 1 if you have the `shmget' function. */ +#undef HAVE_SHMGET + +/* Define to 1 if you have the `sigprocmask' function. */ +#undef HAVE_SIGPROCMASK + +/* Define to 1 if you have the `sleep' function. */ +#undef HAVE_SLEEP + +/* Define to 1 if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF + +/* Define to 1 if you have the `socketpair' function. */ +#undef HAVE_SOCKETPAIR + +/* Using Solaris threads */ +#undef HAVE_SOLARIS_THREADS + +/* Define to 1 if you have the `srandom' function. */ +#undef HAVE_SRANDOM + +/* Define if you have the SSL libraries installed. */ +#undef HAVE_SSL + +/* Define to 1 if you have the `SSL_CTX_set_alpn_protos' function. */ +#undef HAVE_SSL_CTX_SET_ALPN_PROTOS + +/* Define to 1 if you have the `SSL_CTX_set_alpn_select_cb' function. */ +#undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB + +/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */ +#undef HAVE_SSL_CTX_SET_CIPHERSUITES + +/* Define to 1 if you have the `SSL_CTX_set_security_level' function. */ +#undef HAVE_SSL_CTX_SET_SECURITY_LEVEL + +/* Define to 1 if you have the `SSL_CTX_set_tlsext_ticket_key_evp_cb' + function. */ +#undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB + +/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ +#undef HAVE_SSL_GET0_ALPN_SELECTED + +/* Define to 1 if you have the `SSL_get0_peername' function. */ +#undef HAVE_SSL_GET0_PEERNAME + +/* Define to 1 if you have the `SSL_get1_peer_certificate' function. */ +#undef HAVE_SSL_GET1_PEER_CERTIFICATE + +/* Define to 1 if you have the `SSL_set1_host' function. */ +#undef HAVE_SSL_SET1_HOST + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDARG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDBOOL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strftime' function. */ +#undef HAVE_STRFTIME + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strlcat' function. */ +#undef HAVE_STRLCAT + +/* Define to 1 if you have the `strlcpy' function. */ +#undef HAVE_STRLCPY + +/* Define to 1 if you have the `strptime' function. */ +#undef HAVE_STRPTIME + +/* Define to 1 if you have the `strsep' function. */ *** 6599 LINES SKIPPED *** From nobody Tue Nov 28 15:16:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmJN28dCz53Dgn; Tue, 28 Nov 2023 15:16: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 4SfmJL6lrDz3HmX; Tue, 28 Nov 2023 15:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184594; h=from:from:reply-to:subject:subject: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/VGLrKks623ornMDiUthg2PAz85vfAR2a0ubybLVb4=; b=VlY4gwq3rsP1k7vWoYlAhJL0bl1V0X/JTtlJ6Tv5Eyu/Mp4s6tT/LI7jExUujyRNl4n7gv gjt1vIpYV9vxysrTgHfgmM1oDVPaki4JwEfS44pgbpVXWchCGeWX6yZYfd2KTOn9TIjdO/ xJBpajIMN0sfHAO1rSs1dV/WNPaSScMa7zzagUGX/tk3Vj0iMdonU0/0JOmOKacJtHwkD7 QhHqwbAOg9XLrkb/cq4DDObG8OvKdteE/6zLqle499Pgrgsa74qb/W3xKg5t4FRR/83SKU CZPMAMz8RpMiF4fplCT44ZihX5fOPaaRext4St54Gn8I9xTrIYRkplKfYNRqIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184594; h=from:from:reply-to:subject:subject: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/VGLrKks623ornMDiUthg2PAz85vfAR2a0ubybLVb4=; b=BC8u0D19t70LZQmrr8tYp5Jzz784vYG3vLyLnXIENxbYcTZ1jZn7eru8qW16IVlVnyFTVr MI/Ubo9n8WUZz2xeZXKO0d1Rni8rsg1xlcGacvhBwxFOy9poLRiBBMN+rEKwL1nOfdGZgd +yEmqbyPwBDHQv3wUbYegC0Bw0pyAIVk8GAv7FaDfY26w+WIXEvo9aQx5ctHoGD4lgTmlw qu8sB4guoSGtIwhjW1lasSkmFrj+Qq7/l/qUp2yfQSYDtxCyo7pcjn+zVPyK9T4epLiXH6 JkRKXs48S/ECFADEkjDG2hNI4PJq6vXnA2F1zKdYJ3lpqh0w4mqzNyAGto380g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184594; a=rsa-sha256; cv=none; b=QMdxkvCiVn61rAugSyjZ5EPMtgazxc1eIjI8Db1IuAUUUbgKquEj2Oi5S8LBMUSf1jS9wb dMtIjDNE+qhZWtJNhzQrobG7WWNnK3rKB4gsGoEJCykEvn1AGPiKu0X5dP1zA5e1XtrXPi qLi2Z8o2qzA+Iy2wtbyCB3j9twSKhpuWTzZcdNUN+59GBnyIiRu87g+/Ztw3Vw/VzYVAOp +tfIh0bvKOyjuc9vHP1uoOqgbu0bSfiL+IcpMU4FeqxrD84+LASTdPCc7114ILRvY1ESHe RQZfgvb7a1Zq+5UGTcSUIPjSX8KCg7ZphDaULmMINet8kM2y6hY+70g6ErQ8kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfmJL1RJrzBsJ; Tue, 28 Nov 2023 15:16: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 3ASFGYJh094755; Tue, 28 Nov 2023 15:16:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASFGX0c094752; Tue, 28 Nov 2023 15:16:33 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:16:33 GMT Message-Id: <202311281516.3ASFGX0c094752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: bad2804aec32 - stable/12 - sqlite3: Vendor import of sqlite3 3.44.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: bad2804aec326e0759602b153cae0f07baad4f5e Auto-Submitted: auto-generated The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=bad2804aec326e0759602b153cae0f07baad4f5e commit bad2804aec326e0759602b153cae0f07baad4f5e Author: Cy Schubert AuthorDate: 2023-11-13 16:50:36 +0000 Commit: Cy Schubert CommitDate: 2023-11-27 15:26:31 +0000 sqlite3: Vendor import of sqlite3 3.44.0 Release notes at https://www.sqlite.org/releaselog/3_44_0.html. Obtained from: https://www.sqlite.org/2023/sqlite-autoconf-3440000.tar.gz Merge commit '3a88fe13354325b9f56f07927e654de4f5398707' (cherry picked from commit 7963e4115453c0aa003023386cbbc635de242150) --- contrib/sqlite3/Makefile.msc | 14 +- contrib/sqlite3/configure | 20 +- contrib/sqlite3/configure.ac | 2 +- contrib/sqlite3/shell.c | 404 ++- contrib/sqlite3/sqlite3.c | 6485 ++++++++++++++++++++++++-------------- contrib/sqlite3/sqlite3.h | 199 +- contrib/sqlite3/sqlite3ext.h | 6 + contrib/sqlite3/sqlite3rc.h | 2 +- contrib/sqlite3/tea/configure | 20 +- contrib/sqlite3/tea/configure.ac | 2 +- 10 files changed, 4661 insertions(+), 2493 deletions(-) diff --git a/contrib/sqlite3/Makefile.msc b/contrib/sqlite3/Makefile.msc index 13663d877757..280bb95deb3e 100644 --- a/contrib/sqlite3/Makefile.msc +++ b/contrib/sqlite3/Makefile.msc @@ -52,8 +52,8 @@ MINIMAL_AMALGAMATION = 0 USE_STDCALL = 0 !ENDIF -# Set this non-0 to use structured exception handling (SEH) for WAL mode -# in the core library. +# Use the USE_SEH=0 option on the nmake command line to omit structured +# exception handling (SEH) support. SEH is on by default. # !IFNDEF USE_SEH USE_SEH = 1 @@ -296,6 +296,7 @@ SQLITE3EXEPDB = /pdb:sqlite3sh.pdb !IFNDEF OPT_FEATURE_FLAGS !IF $(MINIMAL_AMALGAMATION)==0 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS5=1 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_GEOPOLY=1 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1 @@ -325,10 +326,11 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RBU=1 !ENDIF # Should structured exception handling (SEH) be enabled for WAL mode in -# the core library? +# the core library? It is on by default. Only omit it if the +# USE_SEH=0 option is provided on the nmake command-line. # -!IF $(USE_SEH)!=0 -OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_USE_SEH=1 +!IF $(USE_SEH)==0 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_OMIT_SEH=1 !ENDIF # These are the "extended" SQLite compilation options used when compiling for @@ -986,6 +988,8 @@ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_DQS=0 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1 +SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION=1 +SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_STMT_SCANSTATUS=1 !ENDIF diff --git a/contrib/sqlite3/configure b/contrib/sqlite3/configure index 39694c06793b..251e5da23650 100755 --- a/contrib/sqlite3/configure +++ b/contrib/sqlite3/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sqlite 3.43.1. +# Generated by GNU Autoconf 2.71 for sqlite 3.44.0. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.43.1' -PACKAGE_STRING='sqlite 3.43.1' +PACKAGE_VERSION='3.44.0' +PACKAGE_STRING='sqlite 3.44.0' PACKAGE_BUGREPORT='http://www.sqlite.org' PACKAGE_URL='' @@ -1367,7 +1367,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.43.1 to adapt to many kinds of systems. +\`configure' configures sqlite 3.44.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1438,7 +1438,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.43.1:";; + short | recursive ) echo "Configuration of sqlite 3.44.0:";; esac cat <<\_ACEOF @@ -1563,7 +1563,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.43.1 +sqlite configure 3.44.0 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1833,7 +1833,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.43.1, which was +It was created by sqlite $as_me 3.44.0, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3106,7 +3106,7 @@ fi # Define the identity of the package. PACKAGE='sqlite' - VERSION='3.43.1' + VERSION='3.44.0' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -15314,7 +15314,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.43.1, which was +This file was extended by sqlite $as_me 3.44.0, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15373,7 +15373,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -sqlite config.status 3.43.1 +sqlite config.status 3.44.0 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/sqlite3/configure.ac b/contrib/sqlite3/configure.ac index 3d7da8b984c3..cf5fae5d060b 100644 --- a/contrib/sqlite3/configure.ac +++ b/contrib/sqlite3/configure.ac @@ -10,7 +10,7 @@ # AC_PREREQ(2.61) -AC_INIT(sqlite, 3.43.1, http://www.sqlite.org) +AC_INIT(sqlite, 3.44.0, http://www.sqlite.org) AC_CONFIG_SRCDIR([sqlite3.c]) AC_CONFIG_AUX_DIR([.]) diff --git a/contrib/sqlite3/shell.c b/contrib/sqlite3/shell.c index 6b2cdca83d6b..e357f9e9a5f7 100644 --- a/contrib/sqlite3/shell.c +++ b/contrib/sqlite3/shell.c @@ -467,20 +467,25 @@ static int bail_on_error = 0; */ static int stdin_is_interactive = 1; +/* +** If build is for non-RT Windows, without 3rd-party line editing, +** console input and output may be done in a UTF-8 compatible way, +** if the OS is capable of it and the --no-utf8 option is not seen. +*/ #if (defined(_WIN32) || defined(WIN32)) && SHELL_USE_LOCAL_GETLINE \ - && !defined(SHELL_OMIT_WIN_UTF8) + && !defined(SHELL_OMIT_WIN_UTF8) && !SQLITE_OS_WINRT # define SHELL_WIN_UTF8_OPT 1 +/* Record whether to do UTF-8 console I/O translation per stream. */ + static int console_utf8_in = 0; + static int console_utf8_out = 0; +/* Record whether can do UTF-8 or --no-utf8 seen in invocation. */ + static int mbcs_opted = 1; /* Assume cannot do until shown otherwise. */ #else +# define console_utf8_in 0 +# define console_utf8_out 0 # define SHELL_WIN_UTF8_OPT 0 #endif -#if SHELL_WIN_UTF8_OPT -/* -** Setup console for UTF-8 input/output when following variable true. -*/ -static int console_utf8 = 0; -#endif - /* ** On Windows systems we have to know if standard output is a console ** in order to translate UTF-8 into MBCS. The following variable is @@ -614,13 +619,13 @@ static char *dynamicContinuePrompt(void){ #endif /* !defined(SQLITE_OMIT_DYNAPROMPT) */ #if SHELL_WIN_UTF8_OPT -/* Following struct is used for -utf8 operation. */ +/* Following struct is used for UTF-8 console I/O. */ static struct ConsoleState { int stdinEof; /* EOF has been seen on console input */ int infsMode; /* Input file stream mode upon shell start */ UINT inCodePage; /* Input code page upon shell start */ UINT outCodePage; /* Output code page upon shell start */ - HANDLE hConsoleIn; /* Console input handle */ + HANDLE hConsole; /* Console input or output handle */ DWORD consoleMode; /* Console mode upon shell start */ } conState = { 0, 0, 0, 0, INVALID_HANDLE_VALUE, 0 }; @@ -629,50 +634,123 @@ static struct ConsoleState { #endif /* -** Prepare console, (if known to be a WIN32 console), for UTF-8 -** input (from either typing or suitable paste operations) and for -** UTF-8 rendering. This may "fail" with a message to stderr, where -** the preparation is not done and common "code page" issues occur. +** If given stream number is a console, return 1 and get some attributes, +** else return 0 and set the output attributes to invalid values. */ -static void console_prepare(void){ - HANDLE hCI = GetStdHandle(STD_INPUT_HANDLE); - DWORD consoleMode = 0; - if( isatty(0) && GetFileType(hCI)==FILE_TYPE_CHAR - && GetConsoleMode( hCI, &consoleMode) ){ - if( !IsValidCodePage(CP_UTF8) ){ - fprintf(stderr, "Cannot use UTF-8 code page.\n"); - console_utf8 = 0; - return; - } - conState.hConsoleIn = hCI; - conState.consoleMode = consoleMode; - conState.inCodePage = GetConsoleCP(); - conState.outCodePage = GetConsoleOutputCP(); - SetConsoleCP(CP_UTF8); +static short console_attrs(unsigned stnum, HANDLE *pH, DWORD *pConsMode){ + static int stid[3] = { STD_INPUT_HANDLE,STD_OUTPUT_HANDLE,STD_ERROR_HANDLE }; + HANDLE h; + *pH = INVALID_HANDLE_VALUE; + *pConsMode = 0; + if( stnum > 2 ) return 0; + h = GetStdHandle(stid[stnum]); + if( h!=*pH && GetFileType(h)==FILE_TYPE_CHAR && GetConsoleMode(h,pConsMode) ){ + *pH = h; + return 1; + } + return 0; +} + +/* +** Perform a runtime test of Windows console to determine if it can +** do char-stream I/O correctly when the code page is set to CP_UTF8. +** Returns are: 1 => yes it can, 0 => no it cannot +** +** The console's output code page is momentarily set, then restored. +** So this should only be run when the process is given use of the +** console for either input or output. +*/ +static short ConsoleDoesUTF8(void){ + UINT ocp = GetConsoleOutputCP(); + const char TrialUtf8[] = { '\xC8', '\xAB' }; /* "ȫ" or 2 MBCS characters */ + WCHAR aReadBack[1] = { 0 }; /* Read back as 0x022B when decoded as UTF-8. */ + CONSOLE_SCREEN_BUFFER_INFO csbInfo = {0}; + /* Create an inactive screen buffer with which to do the experiment. */ + HANDLE hCSB = CreateConsoleScreenBuffer(GENERIC_READ|GENERIC_WRITE, 0, 0, + CONSOLE_TEXTMODE_BUFFER, NULL); + if( hCSB!=INVALID_HANDLE_VALUE ){ + COORD cpos = {0,0}; + DWORD rbc; + SetConsoleCursorPosition(hCSB, cpos); SetConsoleOutputCP(CP_UTF8); - consoleMode |= ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT; - SetConsoleMode(conState.hConsoleIn, consoleMode); + /* Write 2 chars which are a single character in UTF-8 but more in MBCS. */ + WriteConsoleA(hCSB, TrialUtf8, sizeof(TrialUtf8), NULL, NULL); + ReadConsoleOutputCharacterW(hCSB, &aReadBack[0], 1, cpos, &rbc); + GetConsoleScreenBufferInfo(hCSB, &csbInfo); + SetConsoleOutputCP(ocp); + CloseHandle(hCSB); + } + /* Return 1 if cursor advanced by 1 position, else 0. */ + return (short)(csbInfo.dwCursorPosition.X == 1 && aReadBack[0] == 0x022B); +} + +static short in_console = 0; +static short out_console = 0; + +/* +** Determine whether either normal I/O stream is the console, +** and whether it can do UTF-8 translation, setting globals +** in_console, out_console and mbcs_opted accordingly. +*/ +static void probe_console(void){ + HANDLE h; + DWORD cMode; + in_console = console_attrs(0, &h, &cMode); + out_console = console_attrs(1, &h, &cMode); + if( in_console || out_console ) mbcs_opted = !ConsoleDoesUTF8(); +} + +/* +** If console is used for normal I/O, absent a --no-utf8 option, +** prepare console for UTF-8 input (from either typing or suitable +** paste operations) and/or for UTF-8 output rendering. +** +** The console state upon entry is preserved, in conState, so that +** console_restore() can later restore the same console state. +** +** The globals console_utf8_in and console_utf8_out are set, for +** later use in selecting UTF-8 or MBCS console I/O translations. +** This routine depends upon globals set by probe_console(). +*/ +static void console_prepare_utf8(void){ + struct ConsoleState csWork = { 0, 0, 0, 0, INVALID_HANDLE_VALUE, 0 }; + + console_utf8_in = console_utf8_out = 0; + if( (!in_console && !out_console) || mbcs_opted ) return; + console_attrs((in_console)? 0 : 1, &conState.hConsole, &conState.consoleMode); + conState.inCodePage = GetConsoleCP(); + conState.outCodePage = GetConsoleOutputCP(); + if( in_console ){ + SetConsoleCP(CP_UTF8); + DWORD newConsoleMode = conState.consoleMode + | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT; + SetConsoleMode(conState.hConsole, newConsoleMode); conState.infsMode = _setmode(_fileno(stdin), _O_U16TEXT); - console_utf8 = 1; - }else{ - console_utf8 = 0; + console_utf8_in = 1; + } + if( out_console ){ + SetConsoleOutputCP(CP_UTF8); + console_utf8_out = 1; } } /* -** Undo the effects of console_prepare(), if any. +** Undo the effects of console_prepare_utf8(), if any. */ static void SQLITE_CDECL console_restore(void){ - if( console_utf8 && conState.inCodePage!=0 - && conState.hConsoleIn!=INVALID_HANDLE_VALUE ){ - _setmode(_fileno(stdin), conState.infsMode); - SetConsoleCP(conState.inCodePage); - SetConsoleOutputCP(conState.outCodePage); - SetConsoleMode(conState.hConsoleIn, conState.consoleMode); + if( (console_utf8_in||console_utf8_out) + && conState.hConsole!=INVALID_HANDLE_VALUE ){ + if( console_utf8_in ){ + SetConsoleCP(conState.inCodePage); + _setmode(_fileno(stdin), conState.infsMode); + } + if( console_utf8_out ) SetConsoleOutputCP(conState.outCodePage); + SetConsoleMode(conState.hConsole, conState.consoleMode); /* Avoid multiple calls. */ - conState.hConsoleIn = INVALID_HANDLE_VALUE; + conState.hConsole = INVALID_HANDLE_VALUE; conState.consoleMode = 0; - console_utf8 = 0; + console_utf8_in = 0; + console_utf8_out = 0; } } @@ -680,11 +758,11 @@ static void SQLITE_CDECL console_restore(void){ ** Collect input like fgets(...) with special provisions for input ** from the Windows console to get around its strange coding issues. ** Defers to plain fgets() when input is not interactive or when the -** startup option, -utf8, has not been provided or taken effect. +** UTF-8 input is unavailable or opted out. */ static char* utf8_fgets(char *buf, int ncmax, FILE *fin){ if( fin==0 ) fin = stdin; - if( fin==stdin && stdin_is_interactive && console_utf8 ){ + if( fin==stdin && stdin_is_interactive && console_utf8_in ){ # define SQLITE_IALIM 150 wchar_t wbuf[SQLITE_IALIM]; int lend = 0; @@ -697,7 +775,7 @@ static char* utf8_fgets(char *buf, int ncmax, FILE *fin){ ? SQLITE_IALIM : (ncmax-1 - noc)/4; # undef SQLITE_IALIM DWORD nbr = 0; - BOOL bRC = ReadConsoleW(conState.hConsoleIn, wbuf, na, &nbr, 0); + BOOL bRC = ReadConsoleW(conState.hConsole, wbuf, na, &nbr, 0); if( !bRC || (noc==0 && nbr==0) ) return 0; if( nbr > 0 ){ int nmb = WideCharToMultiByte(CP_UTF8,WC_COMPOSITECHECK|WC_DEFAULTCHAR, @@ -743,20 +821,16 @@ static char* utf8_fgets(char *buf, int ncmax, FILE *fin){ /* ** Render output like fprintf(). Except, if the output is going to the -** console and if this is running on a Windows machine, and if the -utf8 -** option is unavailable or (available and inactive), translate the +** console and if this is running on a Windows machine, and if UTF-8 +** output unavailable (or available but opted out), translate the ** output from UTF-8 into MBCS for output through 8-bit stdout stream. -** (With -utf8 active, no translation is needed and must not be done.) +** (Without -no-utf8, no translation is needed and must not be done.) */ #if defined(_WIN32) || defined(WIN32) void utf8_printf(FILE *out, const char *zFormat, ...){ va_list ap; va_start(ap, zFormat); - if( stdout_is_console && (out==stdout || out==stderr) -# if SHELL_WIN_UTF8_OPT - && !console_utf8 -# endif - ){ + if( stdout_is_console && (out==stdout || out==stderr) && !console_utf8_out ){ char *z1 = sqlite3_vmprintf(zFormat, ap); char *z2 = sqlite3_win32_utf8_to_mbcs_v2(z1, 0); sqlite3_free(z1); @@ -967,14 +1041,10 @@ static char *local_getline(char *zLine, FILE *in){ } } #if defined(_WIN32) || defined(WIN32) - /* For interactive input on Windows systems, without -utf8, + /* For interactive input on Windows systems, with -no-utf8, ** translate the multi-byte characterset characters into UTF-8. - ** This is the translation that predates the -utf8 option. */ - if( stdin_is_interactive && in==stdin -# if SHELL_WIN_UTF8_OPT - && !console_utf8 -# endif /* SHELL_WIN_UTF8_OPT */ - ){ + ** This is the translation that predates console UTF-8 input. */ + if( stdin_is_interactive && in==stdin && !console_utf8_in ){ char *zTrans = sqlite3_win32_mbcs_to_utf8_v2(zLine, 0); if( zTrans ){ i64 nTrans = strlen(zTrans)+1; @@ -1260,7 +1330,7 @@ static void shellDtostr( char z[400]; if( n<1 ) n = 1; if( n>350 ) n = 350; - sprintf(z, "%#+.*e", n, r); + snprintf(z, sizeof(z)-1, "%#+.*e", n, r); sqlite3_result_text(pCtx, z, -1, SQLITE_TRANSIENT); } @@ -5372,7 +5442,8 @@ static sqlite3_module seriesModule = { 0, /* xSavepoint */ 0, /* xRelease */ 0, /* xRollbackTo */ - 0 /* xShadowName */ + 0, /* xShadowName */ + 0 /* xIntegrity */ }; #endif /* SQLITE_OMIT_VIRTUALTABLE */ @@ -7270,6 +7341,7 @@ static int fsdirRegister(sqlite3 *db){ 0, /* xRelease */ 0, /* xRollbackTo */ 0, /* xShadowName */ + 0 /* xIntegrity */ }; int rc = sqlite3_create_module(db, "fsdir", &fsdirModule, 0); @@ -7790,7 +7862,8 @@ static sqlite3_module completionModule = { 0, /* xSavepoint */ 0, /* xRelease */ 0, /* xRollbackTo */ - 0 /* xShadowName */ + 0, /* xShadowName */ + 0 /* xIntegrity */ }; #endif /* SQLITE_OMIT_VIRTUALTABLE */ @@ -8530,6 +8603,7 @@ SQLITE_EXTENSION_INIT1 #include #include #include +#include #include @@ -10701,7 +10775,8 @@ static int zipfileRegister(sqlite3 *db){ 0, /* xSavepoint */ 0, /* xRelease */ 0, /* xRollback */ - 0 /* xShadowName */ + 0, /* xShadowName */ + 0 /* xIntegrity */ }; int rc = sqlite3_create_module(db, "zipfile" , &zipfileModule, 0); @@ -11070,7 +11145,7 @@ void sqlite3_expert_destroy(sqlite3expert*); #endif /* !defined(SQLITE_AMALGAMATION) */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef SQLITE_OMIT_VIRTUALTABLE /* typedef sqlite3_int64 i64; */ /* typedef sqlite3_uint64 u64; */ @@ -11700,6 +11775,7 @@ static int idxRegisterVtab(sqlite3expert *p){ 0, /* xRelease */ 0, /* xRollbackTo */ 0, /* xShadowName */ + 0, /* xIntegrity */ }; return sqlite3_create_module(p->dbv, "expert", &expertModule, (void*)p); @@ -12856,6 +12932,88 @@ static int idxPopulateStat1(sqlite3expert *p, char **pzErr){ return rc; } +/* +** Define and possibly pretend to use a useless collation sequence. +** This pretense allows expert to accept SQL using custom collations. +*/ +int dummyCompare(void *up1, int up2, const void *up3, int up4, const void *up5){ + (void)up1; + (void)up2; + (void)up3; + (void)up4; + (void)up5; + assert(0); /* VDBE should never be run. */ + return 0; +} +/* And a callback to register above upon actual need */ +void useDummyCS(void *up1, sqlite3 *db, int etr, const char *zName){ + (void)up1; + sqlite3_create_collation_v2(db, zName, etr, 0, dummyCompare, 0); +} + +#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) \ + && !defined(SQLITE_OMIT_INTROSPECTION_PRAGMAS) +/* +** dummy functions for no-op implementation of UDFs during expert's work +*/ +void dummyUDF(sqlite3_context *up1, int up2, sqlite3_value **up3){ + (void)up1; + (void)up2; + (void)up3; + assert(0); /* VDBE should never be run. */ +} +void dummyUDFvalue(sqlite3_context *up1){ + (void)up1; + assert(0); /* VDBE should never be run. */ +} + +/* +** Register UDFs from user database with another. +*/ +int registerUDFs(sqlite3 *dbSrc, sqlite3 *dbDst){ + sqlite3_stmt *pStmt; + int rc = sqlite3_prepare_v2(dbSrc, + "SELECT name,type,enc,narg,flags " + "FROM pragma_function_list() " + "WHERE builtin==0", -1, &pStmt, 0); + if( rc==SQLITE_OK ){ + while( SQLITE_ROW==(rc = sqlite3_step(pStmt)) ){ + int nargs = sqlite3_column_int(pStmt,3); + int flags = sqlite3_column_int(pStmt,4); + const char *name = (char*)sqlite3_column_text(pStmt,0); + const char *type = (char*)sqlite3_column_text(pStmt,1); + const char *enc = (char*)sqlite3_column_text(pStmt,2); + if( name==0 || type==0 || enc==0 ){ + /* no-op. Only happens on OOM */ + }else{ + int ienc = SQLITE_UTF8; + int rcf = SQLITE_ERROR; + if( strcmp(enc,"utf16le")==0 ) ienc = SQLITE_UTF16LE; + else if( strcmp(enc,"utf16be")==0 ) ienc = SQLITE_UTF16BE; + ienc |= (flags & (SQLITE_DETERMINISTIC|SQLITE_DIRECTONLY)); + if( strcmp(type,"w")==0 ){ + rcf = sqlite3_create_window_function(dbDst,name,nargs,ienc,0, + dummyUDF,dummyUDFvalue,0,0,0); + }else if( strcmp(type,"a")==0 ){ + rcf = sqlite3_create_function(dbDst,name,nargs,ienc,0, + 0,dummyUDF,dummyUDFvalue); + }else if( strcmp(type,"s")==0 ){ + rcf = sqlite3_create_function(dbDst,name,nargs,ienc,0, + dummyUDF,0,0); + } + if( rcf!=SQLITE_OK ){ + rc = rcf; + break; + } + } + } + sqlite3_finalize(pStmt); + if( rc==SQLITE_DONE ) rc = SQLITE_OK; + } + return rc; +} +#endif + /* ** Allocate a new sqlite3expert object. */ @@ -12882,7 +13040,21 @@ sqlite3expert *sqlite3_expert_new(sqlite3 *db, char **pzErrmsg){ sqlite3_db_config(pNew->dbm, SQLITE_DBCONFIG_TRIGGER_EQP, 1, (int*)0); } } - + + /* Allow custom collations to be dealt with through prepare. */ + if( rc==SQLITE_OK ) rc = sqlite3_collation_needed(pNew->dbm,0,useDummyCS); + if( rc==SQLITE_OK ) rc = sqlite3_collation_needed(pNew->dbv,0,useDummyCS); + +#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) \ + && !defined(SQLITE_OMIT_INTROSPECTION_PRAGMAS) + /* Register UDFs from database [db] with [dbm] and [dbv]. */ + if( rc==SQLITE_OK ){ + rc = registerUDFs(pNew->db, pNew->dbm); + } + if( rc==SQLITE_OK ){ + rc = registerUDFs(pNew->db, pNew->dbv); + } +#endif /* Copy the entire schema of database [db] into [dbm]. */ if( rc==SQLITE_OK ){ @@ -12958,6 +13130,10 @@ int sqlite3_expert_sql( while( rc==SQLITE_OK && zStmt && zStmt[0] ){ sqlite3_stmt *pStmt = 0; + /* Ensure that the provided statement compiles against user's DB. */ + rc = idxPrepareStmt(p->db, &pStmt, pzErr, zStmt); + if( rc!=SQLITE_OK ) break; + sqlite3_finalize(pStmt); rc = sqlite3_prepare_v2(p->dbv, zStmt, -1, &pStmt, &zStmt); if( rc==SQLITE_OK ){ if( pStmt ){ @@ -14282,7 +14458,8 @@ static int sqlite3DbdataRegister(sqlite3 *db){ 0, /* xSavepoint */ 0, /* xRelease */ 0, /* xRollbackTo */ - 0 /* xShadowName */ + 0, /* xShadowName */ + 0 /* xIntegrity */ }; int rc = sqlite3_create_module(db, "sqlite_dbdata", &dbdata_module, 0); @@ -19154,7 +19331,7 @@ static void display_explain_scanstats( if( sqlite3_stmt_scanstatus_v2(p,ii,SQLITE_SCANSTAT_EXPLAIN,f,(void*)&z) ){ break; } - n = strlen(z) + scanStatsHeight(p, ii)*3; + n = (int)strlen(z) + scanStatsHeight(p, ii)*3; if( n>nWidth ) nWidth = n; } nWidth += 4; @@ -19166,12 +19343,12 @@ static void display_explain_scanstats( i64 nCycle = 0; int iId = 0; int iPid = 0; - const char *z = 0; + const char *zo = 0; const char *zName = 0; char *zText = 0; double rEst = 0.0; - if( sqlite3_stmt_scanstatus_v2(p,ii,SQLITE_SCANSTAT_EXPLAIN,f,(void*)&z) ){ + if( sqlite3_stmt_scanstatus_v2(p,ii,SQLITE_SCANSTAT_EXPLAIN,f,(void*)&zo) ){ break; } sqlite3_stmt_scanstatus_v2(p, ii, SQLITE_SCANSTAT_EST,f,(void*)&rEst); @@ -19182,7 +19359,7 @@ static void display_explain_scanstats( sqlite3_stmt_scanstatus_v2(p, ii, SQLITE_SCANSTAT_PARENTID,f,(void*)&iPid); sqlite3_stmt_scanstatus_v2(p, ii, SQLITE_SCANSTAT_NAME,f,(void*)&zName); - zText = sqlite3_mprintf("%s", z); + zText = sqlite3_mprintf("%s", zo); if( nCycle>=0 || nLoop>=0 || nRow>=0 ){ char *z = 0; if( nCycle>=0 && nTotal>0 ){ @@ -23830,7 +24007,6 @@ static int do_meta_command(char *zLine, ShellState *p){ azArg[nArg++] = &zLine[h]; while( zLine[h] && !IsSpace(zLine[h]) ){ h++; } if( zLine[h] ) zLine[h++] = 0; - resolve_backslashes(azArg[nArg-1]); } } azArg[nArg] = 0; @@ -24569,8 +24745,10 @@ static int do_meta_command(char *zLine, ShellState *p){ "SELECT rowid FROM sqlite_schema" " WHERE name GLOB 'sqlite_stat[134]'", -1, &pStmt, 0); - doStats = sqlite3_step(pStmt)==SQLITE_ROW; - sqlite3_finalize(pStmt); + if( rc==SQLITE_OK ){ + doStats = sqlite3_step(pStmt)==SQLITE_ROW; + sqlite3_finalize(pStmt); + } } if( doStats==0 ){ raw_printf(p->out, "/* No STAT tables available */\n"); @@ -24859,6 +25037,14 @@ static int do_meta_command(char *zLine, ShellState *p){ ** the remaining columns. */ if( p->mode==MODE_Ascii && (z==0 || z[0]==0) && i==0 ) break; + /* + ** For CSV mode, per RFC 4180, accept EOF in lieu of final + ** record terminator but only for last field of multi-field row. + ** (If there are too few fields, it's not valid CSV anyway.) + */ + if( z==0 && (xRead==csv_read_one_field) && i==nCol-1 && i>0 ){ + z = ""; + } sqlite3_bind_text(pStmt, i+1, z, -1, SQLITE_TRANSIENT); if( idb, opt); @@ -27720,6 +27908,9 @@ static const char zOptions[] = " -multiplex enable the multiplexor VFS\n" #endif " -newline SEP set output row separator. Default: '\\n'\n" +#if SHELL_WIN_UTF8_OPT + " -no-utf8 do not try to set up UTF-8 output (for legacy)\n" +#endif " -nofollow refuse to open symbolic links to database files\n" " -nonce STRING set the safe-mode escape nonce\n" " -nullvalue TEXT set text string for NULL values. Default ''\n" @@ -27736,7 +27927,7 @@ static const char zOptions[] = " -table set output mode to 'table'\n" " -tabs set output mode to 'tabs'\n" " -unsafe-testing allow unsafe commands and modes for testing\n" -#if SHELL_WIN_UTF8_OPT +#if SHELL_WIN_UTF8_OPT && 0 /* Option is accepted, but is now the default. */ " -utf8 setup interactive console code page for UTF-8\n" #endif " -version show SQLite version\n" @@ -27887,7 +28078,8 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ stdout_is_console = isatty(1); #endif #if SHELL_WIN_UTF8_OPT - atexit(console_restore); /* Needs revision for CLI as library call */ + probe_console(); /* Check for console I/O and UTF-8 capability. */ + if( !mbcs_opted ) atexit(console_restore); #endif atexit(sayAbnormalExit); #ifdef SQLITE_DEBUG @@ -27974,8 +28166,8 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ /* Do an initial pass through the command-line argument to locate ** the name of the database file, the name of the initialization file, - ** the size of the alternative malloc heap, - ** and the first command to execute. + ** the size of the alternative malloc heap, options affecting commands + ** or SQL run from the command line, and the first command to execute. */ #ifndef SQLITE_SHELL_FIDDLE verify_uninitialized(); @@ -28009,12 +28201,26 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ (void)cmdline_option_value(argc, argv, ++i); }else if( cli_strcmp(z,"-init")==0 ){ zInitFile = cmdline_option_value(argc, argv, ++i); + }else if( cli_strcmp(z,"-interactive")==0 ){ + /* Need to check for interactive override here to so that it can + ** affect console setup (for Windows only) and testing thereof. + */ + stdin_is_interactive = 1; }else if( cli_strcmp(z,"-batch")==0 ){ /* Need to check for batch mode here to so we can avoid printing ** informational messages (like from process_sqliterc) before ** we do the actual processing of arguments later in a second pass. */ stdin_is_interactive = 0; + }else if( cli_strcmp(z,"-utf8")==0 ){ +#if SHELL_WIN_UTF8_OPT + /* Option accepted, but is ignored except for this diagnostic. */ + if( mbcs_opted ) fprintf(stderr, "Cannot do UTF-8 at this console.\n"); +#endif /* SHELL_WIN_UTF8_OPT */ + }else if( cli_strcmp(z,"-no-utf8")==0 ){ +#if SHELL_WIN_UTF8_OPT + mbcs_opted = 1; +#endif /* SHELL_WIN_UTF8_OPT */ }else if( cli_strcmp(z,"-heap")==0 ){ #if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5) const char *zSize; @@ -28153,6 +28359,15 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ exit(1); } } +#if SHELL_WIN_UTF8_OPT + /* Get indicated Windows console setup done before running invocation commands. */ + if( in_console || out_console ){ + console_prepare_utf8(); + } + if( !in_console ){ + setBinaryMode(stdin, 0); + } +#endif if( data.pAuxDb->zDbFilename==0 ){ #ifndef SQLITE_OMIT_MEMORYDB @@ -28280,13 +28495,13 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ 8*(int)sizeof(char*)); return 0; }else if( cli_strcmp(z,"-interactive")==0 ){ - stdin_is_interactive = 1; + /* already handled */ }else if( cli_strcmp(z,"-batch")==0 ){ - stdin_is_interactive = 0; + /* already handled */ }else if( cli_strcmp(z,"-utf8")==0 ){ -#if SHELL_WIN_UTF8_OPT - console_utf8 = 1; -#endif /* SHELL_WIN_UTF8_OPT */ + /* already handled */ + }else if( cli_strcmp(z,"-no-utf8")==0 ){ + /* already handled */ }else if( cli_strcmp(z,"-heap")==0 ){ i++; }else if( cli_strcmp(z,"-pagecache")==0 ){ @@ -28368,14 +28583,6 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ } data.cMode = data.mode; } -#if SHELL_WIN_UTF8_OPT - if( console_utf8 && stdin_is_interactive ){ - console_prepare(); - }else{ - setBinaryMode(stdin, 0); - console_utf8 = 0; - } -#endif if( !readStdin ){ /* Run all arguments that do not begin with '-' as if they were separate @@ -28411,11 +28618,20 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ if( stdin_is_interactive ){ char *zHome; char *zHistory; + const char *zCharset = ""; int nHistory; +#if SHELL_WIN_UTF8_OPT + switch( console_utf8_in+2*console_utf8_out ){ + default: case 0: break; + case 1: zCharset = " (utf8 in)"; break; + case 2: zCharset = " (utf8 out)"; break; + case 3: zCharset = " (utf8 I/O)"; break; + } +#endif printf( - "SQLite version %s %.19s\n" /*extra-version-info*/ + "SQLite version %s %.19s%s\n" /*extra-version-info*/ "Enter \".help\" for usage hints.\n", - sqlite3_libversion(), sqlite3_sourceid() + sqlite3_libversion(), sqlite3_sourceid(), zCharset ); if( warnInmemoryDb ){ printf("Connected to a "); diff --git a/contrib/sqlite3/sqlite3.c b/contrib/sqlite3/sqlite3.c index 1884b0823969..8f9309a8ba7e 100644 --- a/contrib/sqlite3/sqlite3.c +++ b/contrib/sqlite3/sqlite3.c @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.43.1. By combining all the individual C code files into this +** version 3.44.0. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -18,7 +18,7 @@ ** separate file. This file contains only code for the core SQLite library. ** ** The content in this amalgamation comes from Fossil check-in -** d3a40c05c49e1a49264912b1a05bc2143ac. +** 17129ba1ff7f0daf37100ee82d507aef7827. */ #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 @@ -459,9 +459,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.43.1" -#define SQLITE_VERSION_NUMBER 3043001 -#define SQLITE_SOURCE_ID "2023-09-11 12:01:27 2d3a40c05c49e1a49264912b1a05bc2143ac0e7c3df588276ce80a4cbc9bd1b0" +#define SQLITE_VERSION "3.44.0" +#define SQLITE_VERSION_NUMBER 3044000 +#define SQLITE_SOURCE_ID "2023-11-01 11:23:50 17129ba1ff7f0daf37100ee82d507aef7827cf38de1866e2633096ae6ad81301" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -2440,7 +2440,7 @@ struct sqlite3_mem_methods { ** is stored in each sorted record and the required column values loaded ** from the database as records are returned in sorted order. The default ** value for this option is to never use this optimization. Specifying a -** negative value for this option restores the default behaviour. +** negative value for this option restores the default behavior. ** This option is only available if SQLite is compiled with the ** [SQLITE_ENABLE_SORTER_REFERENCES] compile-time option. ** @@ -2615,7 +2615,7 @@ struct sqlite3_mem_methods { ** database handle, SQLite checks if this will mean that there are now no ** connections at all to the database. If so, it performs a checkpoint ** operation before closing the connection. This option may be used to -** override this behaviour. The first parameter passed to this operation +** override this behavior. The first parameter passed to this operation ** is an integer - positive to disable checkpoints-on-close, or zero (the ** default) to enable them, and negative to leave the setting unchanged. ** The second parameter is a pointer to an integer @@ -4268,6 +4268,7 @@ SQLITE_API void sqlite3_free_filename(sqlite3_filename); ** ** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language ** text that describes the error, as either UTF-8 or UTF-16 respectively. +** (See how SQLite handles [invalid UTF] for exceptions to this rule.) ** ^(Memory to hold the error message string is managed internally. ** The application does not need to worry about freeing the result. ** However, the error string might be overwritten or deallocated by @@ -5638,6 +5639,7 @@ SQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt); */ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt); + /* ** CAPI3REF: Create Or Redefine SQL Functions ** KEYWORDS: {function creation routines} @@ -6192,32 +6194,32 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*); ** METHOD: sqlite3_context ** ** These functions may be used by (non-aggregate) SQL functions to -** associate metadata with argument values. If the same value is passed to -** multiple invocations of the same SQL function during query execution, under -** some circumstances the associated metadata may be preserved. An example -** of where this might be useful is in a regular-expression matching -** function. The compiled version of the regular expression can be stored as -** metadata associated with the pattern string. +** associate auxiliary data with argument values. If the same argument +** value is passed to multiple invocations of the same SQL function during +** query execution, under some circumstances the associated auxiliary data +** might be preserved. An example of where this might be useful is in a +** regular-expression matching function. The compiled version of the regular +** expression can be stored as auxiliary data associated with the pattern string. ** Then as long as the pattern string remains the same, ** the compiled regular expression can be reused on multiple ** invocations of the same function. ** -** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the metadata +** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the auxiliary data ** associated by the sqlite3_set_auxdata(C,N,P,X) function with the Nth argument ** value to the application-defined function. ^N is zero for the left-most -** function argument. ^If there is no metadata +** function argument. ^If there is no auxiliary data ** associated with the function argument, the sqlite3_get_auxdata(C,N) interface ** returns a NULL pointer. ** -** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as metadata for the N-th -** argument of the application-defined function. ^Subsequent +** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as auxiliary data for the +** N-th argument of the application-defined function. ^Subsequent *** 10434 LINES SKIPPED *** From nobody Tue Nov 28 15:16:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmJP4DSHz53DdK; Tue, 28 Nov 2023 15:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfmJN5JL0z3J5Z; Tue, 28 Nov 2023 15:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a11YoL17dO47aw56b76EeTdiRZ1GT649aLzN0yckia8=; b=ZxDx4C6t1r2dQypp0parDTIX+60tPeF64lDBmQ3HuKwyYTe7B8hy+X/7HyEOTA1f3Trn13 5/jMnswAjqHEcdCaLC1dKZL7tKbbLq8k/bi4rhoy/dV8ldNq1DvGm3gDDMas+PQB+EVdzF I8SogvuJ/NMUQOILn1/U6kM6VJ6NfV23O//GwhxOyUCqmPjwRHUY7cc3Yc96loN3coUno7 tNyufooWW8q7MzEOQQnZ2XhwZAfQJliS6N/byHALeLbLWzUXK8bKGXfv46UyuPXrwFihmF JmSvrWfpxpkswO3ddRUlICkyAX9h8lllr5zI2E+Pl2G3XNEvUS8H1hauOIKDog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a11YoL17dO47aw56b76EeTdiRZ1GT649aLzN0yckia8=; b=r4y1JwTKr5ou6l4vLMqmKca7W695PaAEruEHn2f8dciaDNMnJ9d6VomNQqHgzQbjhtSqov b7BhAkcWQ/2DMeEjsgQD3svV7Uz7D8V0W9BB2TbbNoTZ2mU8JP0uLsLG7vYq+BHiVgrSCT Rp858p2opAaw+M5Hd/6tLuDH2IzuyCVBSbpin0aXxMri4lVeKITDn/up4yt/JPdN256PCt 0r1xMJvCYtRdj3Jx48bA0M3ASfvzSc4kTkGQeTlgZYVTSGaVK5XE+z9mvIHtdMa9pX2k1a /OTN7nwDfOMbk1G134uGeH0TKr7Tx1uKJLCYD57Or72v0AYBthA6/flwWZ8Zig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184596; a=rsa-sha256; cv=none; b=I2NhLNZFc75mk3FG1HevZay1PvuJXfAca1zpekBFRyxwmic5M6aaMggYXtWWOR6Eq2Tu9W bki7Ezig6nbbyOreoq9ClZfLhdDI9XSJFi59Zg+5TAmyTpAT55+J0FBn55WLG0JBMvkEGR JviofGHAC0PNku+I/xav1Tvd4TyT43UJkO7uDiFLh7oqj8QcuqUFUaeCp0LnzqjRn9sDH2 J4RlOITjhtUjQl2plZFnR65RaiLZWpgLMW1BvTk+Wk6fSVtz6P4t9s6cx8cZPD3QVwxtbD ulJcBhFsy824ZM0DZukbZoUNjs/3r7TAnTm43QW5yErDmkFVwUJNEarplkza+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 4SfmJN2j2yzC6X; Tue, 28 Nov 2023 15:16: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 3ASFGaBI094855; Tue, 28 Nov 2023 15:16:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASFGah9094852; Tue, 28 Nov 2023 15:16:36 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:16:36 GMT Message-Id: <202311281516.3ASFGah9094852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 0bca2586dc0f - stable/12 - Unbound: Remove backup file brought in from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0bca2586dc0fe9672113059734576af0e74a3b0c Auto-Submitted: auto-generated The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=0bca2586dc0fe9672113059734576af0e74a3b0c commit 0bca2586dc0fe9672113059734576af0e74a3b0c Author: Cy Schubert AuthorDate: 2023-11-14 00:36:24 +0000 Commit: Cy Schubert CommitDate: 2023-11-27 15:26:31 +0000 Unbound: Remove backup file brought in from upstream Upstream tarball included config.h~. This was previously manually removed from vendor where in fact it should not have been as it would have caused a merge conflict. Reported by: "Herbert J. Skuhra" (cherry picked from commit 5aab39b24ce7437265b94461ffdd9b12c0723658) --- contrib/unbound/config.h.in~ | 1456 ------------------------------------------ 1 file changed, 1456 deletions(-) diff --git a/contrib/unbound/config.h.in~ b/contrib/unbound/config.h.in~ deleted file mode 100644 index f31354d01408..000000000000 --- a/contrib/unbound/config.h.in~ +++ /dev/null @@ -1,1456 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* apply the noreturn attribute to a function that exits the program */ -#undef ATTR_NORETURN - -/* apply the weak attribute to a symbol */ -#undef ATTR_WEAK - -/* Directory to chroot to */ -#undef CHROOT_DIR - -/* Define this to enable client subnet option. */ -#undef CLIENT_SUBNET - -/* Do sha512 definitions in config.h */ -#undef COMPAT_SHA512 - -/* Command line arguments used with configure */ -#undef CONFCMDLINE - -/* Pathname to the Unbound configuration file */ -#undef CONFIGFILE - -/* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work - */ -#undef DARWIN_BROKEN_SETREUID - -/* Whether daemon is deprecated */ -#undef DEPRECATED_DAEMON - -/* Deprecate RSA 1024 bit length, makes that an unsupported key */ -#undef DEPRECATE_RSA_1024 - -/* Define this to enable kernel based UDP source port randomization. */ -#undef DISABLE_EXPLICIT_PORT_RANDOMISATION - -/* default dnstap socket path */ -#undef DNSTAP_SOCKET_PATH - -/* Define if you want to use debug lock checking (slow). */ -#undef ENABLE_LOCK_CHECKS - -/* Define this if you enabled-allsymbols from libunbound to link binaries to - it for smaller install size, but the libunbound export table is polluted by - internal symbols */ -#undef EXPORT_ALL_SYMBOLS - -/* Define to 1 if you have the `accept4' function. */ -#undef HAVE_ACCEPT4 - -/* Define to 1 if you have the `arc4random' function. */ -#undef HAVE_ARC4RANDOM - -/* Define to 1 if you have the `arc4random_uniform' function. */ -#undef HAVE_ARC4RANDOM_UNIFORM - -/* Define to 1 if you have the header file. */ -#undef HAVE_ARPA_INET_H - -/* Whether the C compiler accepts the "format" attribute */ -#undef HAVE_ATTR_FORMAT - -/* Whether the C compiler accepts the "noreturn" attribute */ -#undef HAVE_ATTR_NORETURN - -/* Whether the C compiler accepts the "unused" attribute */ -#undef HAVE_ATTR_UNUSED - -/* Whether the C compiler accepts the "weak" attribute */ -#undef HAVE_ATTR_WEAK - -/* If we have be64toh */ -#undef HAVE_BE64TOH - -/* Define to 1 if you have the `BIO_set_callback_ex' function. */ -#undef HAVE_BIO_SET_CALLBACK_EX - -/* Define to 1 if you have the header file. */ -#undef HAVE_BSD_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_BSD_STRING_H - -/* Define to 1 if you have the `chown' function. */ -#undef HAVE_CHOWN - -/* Define to 1 if you have the `chroot' function. */ -#undef HAVE_CHROOT - -/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ -#undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA - -/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ -#undef HAVE_CRYPTO_THREADID_SET_CALLBACK - -/* Define to 1 if you have the `ctime_r' function. */ -#undef HAVE_CTIME_R - -/* Define to 1 if you have the `daemon' function. */ -#undef HAVE_DAEMON - -/* Define to 1 if you have the declaration of `arc4random', and to 0 if you - don't. */ -#undef HAVE_DECL_ARC4RANDOM - -/* Define to 1 if you have the declaration of `arc4random_uniform', and to 0 - if you don't. */ -#undef HAVE_DECL_ARC4RANDOM_UNIFORM - -/* Define to 1 if you have the declaration of `evsignal_assign', and to 0 if - you don't. */ -#undef HAVE_DECL_EVSIGNAL_ASSIGN - -/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you - don't. */ -#undef HAVE_DECL_INET_NTOP - -/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you - don't. */ -#undef HAVE_DECL_INET_PTON - -/* Define to 1 if you have the declaration of `nghttp2_session_server_new', - and to 0 if you don't. */ -#undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW - -/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you - don't. */ -#undef HAVE_DECL_NID_ED25519 - -/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you - don't. */ -#undef HAVE_DECL_NID_ED448 - -/* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you - don't. */ -#undef HAVE_DECL_NID_SECP384R1 - -/* Define to 1 if you have the declaration of `NID_X9_62_prime256v1', and to 0 - if you don't. */ -#undef HAVE_DECL_NID_X9_62_PRIME256V1 - -/* Define to 1 if you have the declaration of `reallocarray', and to 0 if you - don't. */ -#undef HAVE_DECL_REALLOCARRAY - -/* Define to 1 if you have the declaration of `redisConnect', and to 0 if you - don't. */ -#undef HAVE_DECL_REDISCONNECT - -/* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0 - if you don't. */ -#undef HAVE_DECL_SK_SSL_COMP_POP_FREE - -/* Define to 1 if you have the declaration of - `SSL_COMP_get_compression_methods', and to 0 if you don't. */ -#undef HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS - -/* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to - 0 if you don't. */ -#undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO - -/* Define to 1 if you have the declaration of `strlcat', and to 0 if you - don't. */ -#undef HAVE_DECL_STRLCAT - -/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you - don't. */ -#undef HAVE_DECL_STRLCPY - -/* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if - you don't. */ -#undef HAVE_DECL_XML_STOPPARSER - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the `DSA_SIG_set0' function. */ -#undef HAVE_DSA_SIG_SET0 - -/* Define to 1 if you have the header file. */ -#undef HAVE_ENDIAN_H - -/* Define to 1 if you have the `endprotoent' function. */ -#undef HAVE_ENDPROTOENT - -/* Define to 1 if you have the `endpwent' function. */ -#undef HAVE_ENDPWENT - -/* Define to 1 if you have the `endservent' function. */ -#undef HAVE_ENDSERVENT - -/* Define to 1 if you have the `ENGINE_cleanup' function. */ -#undef HAVE_ENGINE_CLEANUP - -/* Define to 1 if you have the `ERR_free_strings' function. */ -#undef HAVE_ERR_FREE_STRINGS - -/* Define to 1 if you have the `ERR_load_crypto_strings' function. */ -#undef HAVE_ERR_LOAD_CRYPTO_STRINGS - -/* Define to 1 if you have the `event_assign' function. */ -#undef HAVE_EVENT_ASSIGN - -/* Define to 1 if you have the `event_base_free' function. */ -#undef HAVE_EVENT_BASE_FREE - -/* Define to 1 if you have the `event_base_get_method' function. */ -#undef HAVE_EVENT_BASE_GET_METHOD - -/* Define to 1 if you have the `event_base_new' function. */ -#undef HAVE_EVENT_BASE_NEW - -/* Define to 1 if you have the `event_base_once' function. */ -#undef HAVE_EVENT_BASE_ONCE - -/* Define to 1 if you have the header file. */ -#undef HAVE_EVENT_H - -/* Define to 1 if you have the `EVP_aes_256_cbc' function. */ -#undef HAVE_EVP_AES_256_CBC - -/* Define to 1 if you have the `EVP_cleanup' function. */ -#undef HAVE_EVP_CLEANUP - -/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled' - function. */ -#undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED - -/* Define to 1 if you have the `EVP_DigestVerify' function. */ -#undef HAVE_EVP_DIGESTVERIFY - -/* Define to 1 if you have the `EVP_dss1' function. */ -#undef HAVE_EVP_DSS1 - -/* Define to 1 if you have the `EVP_EncryptInit_ex' function. */ -#undef HAVE_EVP_ENCRYPTINIT_EX - -/* Define to 1 if you have the `EVP_MAC_CTX_set_params' function. */ -#undef HAVE_EVP_MAC_CTX_SET_PARAMS - -/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ -#undef HAVE_EVP_MD_CTX_NEW - -/* Define to 1 if you have the `EVP_sha1' function. */ -#undef HAVE_EVP_SHA1 - -/* Define to 1 if you have the `EVP_sha256' function. */ -#undef HAVE_EVP_SHA256 - -/* Define to 1 if you have the `EVP_sha512' function. */ -#undef HAVE_EVP_SHA512 - -/* Define to 1 if you have the `ev_default_loop' function. */ -#undef HAVE_EV_DEFAULT_LOOP - -/* Define to 1 if you have the `ev_loop' function. */ -#undef HAVE_EV_LOOP - -/* Define to 1 if you have the header file. */ -#undef HAVE_EXPAT_H - -/* Define to 1 if you have the `explicit_bzero' function. */ -#undef HAVE_EXPLICIT_BZERO - -/* Define to 1 if you have the `fcntl' function. */ -#undef HAVE_FCNTL - -/* Define to 1 if you have the `FIPS_mode' function. */ -#undef HAVE_FIPS_MODE - -/* Define to 1 if you have the `fork' function. */ -#undef HAVE_FORK - -/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -#undef HAVE_FSEEKO - -/* Define to 1 if you have the `fsync' function. */ -#undef HAVE_FSYNC - -/* Whether getaddrinfo is available */ -#undef HAVE_GETADDRINFO - -/* Define to 1 if you have the `getauxval' function. */ -#undef HAVE_GETAUXVAL - -/* Define to 1 if you have the `getentropy' function. */ -#undef HAVE_GETENTROPY - -/* Define to 1 if you have the `getifaddrs' function. */ -#undef HAVE_GETIFADDRS - -/* Define to 1 if you have the header file. */ -#undef HAVE_GETOPT_H - -/* Define to 1 if you have the `getpwnam' function. */ -#undef HAVE_GETPWNAM - -/* Define to 1 if you have the `getrlimit' function. */ -#undef HAVE_GETRLIMIT - -/* Define to 1 if you have the `gettid' function. */ -#undef HAVE_GETTID - -/* Define to 1 if you have the `glob' function. */ -#undef HAVE_GLOB - -/* Define to 1 if you have the header file. */ -#undef HAVE_GLOB_H - -/* Define to 1 if you have the `gmtime_r' function. */ -#undef HAVE_GMTIME_R - -/* Define to 1 if you have the header file. */ -#undef HAVE_GRP_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_HIREDIS_HIREDIS_H - -/* Define to 1 if you have the `HMAC_Init_ex' function. */ -#undef HAVE_HMAC_INIT_EX - -/* If we have htobe64 */ -#undef HAVE_HTOBE64 - -/* Define to 1 if you have the header file. */ -#undef HAVE_IFADDRS_H - -/* Define to 1 if you have the `if_nametoindex' function. */ -#undef HAVE_IF_NAMETOINDEX - -/* Define to 1 if you have the `inet_aton' function. */ -#undef HAVE_INET_ATON - -/* Define to 1 if you have the `inet_ntop' function. */ -#undef HAVE_INET_NTOP - -/* Define to 1 if you have the `inet_pton' function. */ -#undef HAVE_INET_PTON - -/* Define to 1 if you have the `initgroups' function. */ -#undef HAVE_INITGROUPS - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* if the function 'ioctlsocket' is available */ -#undef HAVE_IOCTLSOCKET - -/* Define to 1 if you have the header file. */ -#undef HAVE_IPHLPAPI_H - -/* Define to 1 if you have the `isblank' function. */ -#undef HAVE_ISBLANK - -/* Define to 1 if you have the `kill' function. */ -#undef HAVE_KILL - -/* Use portable libbsd functions */ -#undef HAVE_LIBBSD - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBKERN_OSBYTEORDER_H - -/* Define if we have LibreSSL */ -#undef HAVE_LIBRESSL - -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_NET_TSTAMP_H - -/* Define to 1 if you have the `localtime_r' function. */ -#undef HAVE_LOCALTIME_R - -/* Define to 1 if you have the header file. */ -#undef HAVE_LOGIN_CAP_H - -/* If have GNU libc compatible malloc */ -#undef HAVE_MALLOC - -/* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETDB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_IN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_TCP_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETIOAPI_H - -/* Use libnettle for crypto */ -#undef HAVE_NETTLE - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETTLE_DSA_COMPAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETTLE_EDDSA_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NET_IF_H - -/* Define this to use nghttp2 client. */ -#undef HAVE_NGHTTP2 - -/* Define to 1 if you have the header file. */ -#undef HAVE_NGHTTP2_NGHTTP2_H - -/* Use libnss for crypto */ -#undef HAVE_NSS - -/* Define to 1 if you have the `OpenSSL_add_all_digests' function. */ -#undef HAVE_OPENSSL_ADD_ALL_DIGESTS - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_BN_H - -/* Define to 1 if you have the `OPENSSL_config' function. */ -#undef HAVE_OPENSSL_CONFIG - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_CONF_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_CORE_NAMES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_DH_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_DSA_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_ENGINE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_ERR_H - -/* Define to 1 if you have the `OPENSSL_init_crypto' function. */ -#undef HAVE_OPENSSL_INIT_CRYPTO - -/* Define to 1 if you have the `OPENSSL_init_ssl' function. */ -#undef HAVE_OPENSSL_INIT_SSL - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_PARAM_BUILD_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_RAND_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_RSA_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_SSL_H - -/* Define to 1 if you have the `OSSL_PARAM_BLD_new' function. */ -#undef HAVE_OSSL_PARAM_BLD_NEW - -/* Define to 1 if you have the `poll' function. */ -#undef HAVE_POLL - -/* Define to 1 if you have the header file. */ -#undef HAVE_POLL_H - -/* Define if you have POSIX threads libraries and header files. */ -#undef HAVE_PTHREAD - -/* Have PTHREAD_PRIO_INHERIT. */ -#undef HAVE_PTHREAD_PRIO_INHERIT - -/* Define to 1 if the system has the type `pthread_rwlock_t'. */ -#undef HAVE_PTHREAD_RWLOCK_T - -/* Define to 1 if the system has the type `pthread_spinlock_t'. */ -#undef HAVE_PTHREAD_SPINLOCK_T - -/* Define to 1 if you have the header file. */ -#undef HAVE_PWD_H - -/* Define if you have Python libraries and header files. */ -#undef HAVE_PYTHON - -/* Define to 1 if you have the `random' function. */ -#undef HAVE_RANDOM - -/* Define to 1 if you have the `RAND_cleanup' function. */ -#undef HAVE_RAND_CLEANUP - -/* If we have reallocarray(3) */ -#undef HAVE_REALLOCARRAY - -/* Define to 1 if you have the `recvmsg' function. */ -#undef HAVE_RECVMSG - -/* Define to 1 if you have the `sendmsg' function. */ -#undef HAVE_SENDMSG - -/* Define to 1 if you have the `setregid' function. */ -#undef HAVE_SETREGID - -/* Define to 1 if you have the `setresgid' function. */ -#undef HAVE_SETRESGID - -/* Define to 1 if you have the `setresuid' function. */ -#undef HAVE_SETRESUID - -/* Define to 1 if you have the `setreuid' function. */ -#undef HAVE_SETREUID - -/* Define to 1 if you have the `setrlimit' function. */ -#undef HAVE_SETRLIMIT - -/* Define to 1 if you have the `setsid' function. */ -#undef HAVE_SETSID - -/* Define to 1 if you have the `setusercontext' function. */ -#undef HAVE_SETUSERCONTEXT - -/* Define to 1 if you have the `SHA512_Update' function. */ -#undef HAVE_SHA512_UPDATE - -/* Define to 1 if you have the `shmget' function. */ -#undef HAVE_SHMGET - -/* Define to 1 if you have the `sigprocmask' function. */ -#undef HAVE_SIGPROCMASK - -/* Define to 1 if you have the `sleep' function. */ -#undef HAVE_SLEEP - -/* Define to 1 if you have the `snprintf' function. */ -#undef HAVE_SNPRINTF - -/* Define to 1 if you have the `socketpair' function. */ -#undef HAVE_SOCKETPAIR - -/* Using Solaris threads */ -#undef HAVE_SOLARIS_THREADS - -/* Define to 1 if you have the `srandom' function. */ -#undef HAVE_SRANDOM - -/* Define if you have the SSL libraries installed. */ -#undef HAVE_SSL - -/* Define to 1 if you have the `SSL_CTX_set_alpn_protos' function. */ -#undef HAVE_SSL_CTX_SET_ALPN_PROTOS - -/* Define to 1 if you have the `SSL_CTX_set_alpn_select_cb' function. */ -#undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB - -/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */ -#undef HAVE_SSL_CTX_SET_CIPHERSUITES - -/* Define to 1 if you have the `SSL_CTX_set_security_level' function. */ -#undef HAVE_SSL_CTX_SET_SECURITY_LEVEL - -/* Define to 1 if you have the `SSL_CTX_set_tlsext_ticket_key_evp_cb' - function. */ -#undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB - -/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ -#undef HAVE_SSL_GET0_ALPN_SELECTED - -/* Define to 1 if you have the `SSL_get0_peername' function. */ -#undef HAVE_SSL_GET0_PEERNAME - -/* Define to 1 if you have the `SSL_get1_peer_certificate' function. */ -#undef HAVE_SSL_GET1_PEER_CERTIFICATE - -/* Define to 1 if you have the `SSL_set1_host' function. */ -#undef HAVE_SSL_SET1_HOST - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDARG_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDBOOL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strftime' function. */ -#undef HAVE_STRFTIME - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strlcat' function. */ -#undef HAVE_STRLCAT - -/* Define to 1 if you have the `strlcpy' function. */ -#undef HAVE_STRLCPY - -/* Define to 1 if you have the `strptime' function. */ -#undef HAVE_STRPTIME - -/* Define to 1 if you have the `strsep' function. */ -#undef HAVE_STRSEP - -/* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */ -#undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST - -/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */ -#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN - -/* Define if you have Swig libraries and header files. */ -#undef HAVE_SWIG - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYSLOG_H - -/* Define to 1 if systemd should be used */ -#undef HAVE_SYSTEMD - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_ENDIAN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_IPC_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_RESOURCE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SELECT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SHA2_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SHM_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SOCKET_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SYSCTL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_UIO_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_UN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_WAIT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_TARGETCONDITIONALS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_TIME_H - -/* Define to 1 if you have the `tzset' function. */ -#undef HAVE_TZSET - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `usleep' function. */ -#undef HAVE_USLEEP - -/* Define to 1 if you have the `vfork' function. */ -#undef HAVE_VFORK - -/* Define to 1 if you have the header file. */ -#undef HAVE_VFORK_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_WINDOWS_H - -/* Using Windows threads */ -#undef HAVE_WINDOWS_THREADS - -/* Define to 1 if you have the header file. */ -#undef HAVE_WINSOCK2_H - -/* Define to 1 if `fork' works. */ -#undef HAVE_WORKING_FORK - -/* Define to 1 if `vfork' works. */ -#undef HAVE_WORKING_VFORK - -/* Define to 1 if you have the `writev' function. */ -#undef HAVE_WRITEV - -/* Define to 1 if you have the header file. */ -#undef HAVE_WS2TCPIP_H - -/* Define to 1 if you have the `X509_VERIFY_PARAM_set1_host' function. */ -#undef HAVE_X509_VERIFY_PARAM_SET1_HOST - -/* Define to 1 if you have the `_beginthreadex' function. */ -#undef HAVE__BEGINTHREADEX - -/* If HMAC_Init_ex() returns void */ -#undef HMAC_INIT_EX_RETURNS_VOID - -/* if lex has yylex_destroy */ -#undef LEX_HAS_YYLEX_DESTROY - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#undef LT_OBJDIR - -/* Define to the maximum message length to pass to syslog. */ -#undef MAXSYSLOGMSGLEN - -/* Define if memcmp() does not compare unsigned bytes */ -#undef MEMCMP_IS_BROKEN - -/* Define if mkdir has one argument. */ -#undef MKDIR_HAS_ONE_ARG - -/* Define if the network stack does not fully support nonblocking io (causes - lower performance). */ -#undef NONBLOCKING_IS_BROKEN - -/* Put -D_ALL_SOURCE define in config.h */ -#undef OMITTED__D_ALL_SOURCE - -/* Put -D_BSD_SOURCE define in config.h */ -#undef OMITTED__D_BSD_SOURCE - -/* Put -D_DEFAULT_SOURCE define in config.h */ -#undef OMITTED__D_DEFAULT_SOURCE - -/* Put -D_GNU_SOURCE define in config.h */ -#undef OMITTED__D_GNU_SOURCE - -/* Put -D_LARGEFILE_SOURCE=1 define in config.h */ -#undef OMITTED__D_LARGEFILE_SOURCE_1 - -/* Put -D_POSIX_C_SOURCE=200112 define in config.h */ -#undef OMITTED__D_POSIX_C_SOURCE_200112 - -/* Put -D_XOPEN_SOURCE=600 define in config.h */ -#undef OMITTED__D_XOPEN_SOURCE_600 - -/* Put -D_XOPEN_SOURCE_EXTENDED=1 define in config.h */ -#undef OMITTED__D_XOPEN_SOURCE_EXTENDED_1 - -/* Put -D__EXTENSIONS__ define in config.h */ -#undef OMITTED__D__EXTENSIONS__ - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* default pidfile location */ -#undef PIDFILE - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -#undef PTHREAD_CREATE_JOINABLE - -/* Return type of signal handlers, but autoconf 2.70 says 'your code may - safely assume C89 semantics that RETSIGTYPE is void.' */ -#undef RETSIGTYPE - -/* if REUSEPORT is enabled by default */ -#undef REUSEPORT_DEFAULT - -/* default rootkey location */ -#undef ROOT_ANCHOR_FILE - -/* default rootcert location */ -#undef ROOT_CERT_FILE - -/* version number for resource files */ -#undef RSRC_PACKAGE_VERSION - -/* Directory to chdir to */ -#undef RUN_DIR - -/* Shared data */ -#undef SHARE_DIR - -/* The size of `pthread_t', as computed by sizeof. */ -#undef SIZEOF_PTHREAD_T - -/* The size of `size_t', as computed by sizeof. */ -#undef SIZEOF_SIZE_T - -/* The size of `time_t', as computed by sizeof. */ -#undef SIZEOF_TIME_T - -/* The size of `unsigned long', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_LONG - -/* define if (v)snprintf does not return length needed, (but length used) */ -#undef SNPRINTF_RET_BROKEN - -/* Define to 1 if libsodium supports sodium_set_misuse_handler */ -#undef SODIUM_MISUSE_HANDLER - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* use default strptime. */ -#undef STRPTIME_WORKS - -/* Use win32 resources and API */ -#undef UB_ON_WINDOWS - -/* the SYSLOG_FACILITY to use, default LOG_DAEMON */ -#undef UB_SYSLOG_FACILITY - -/* default username */ -#undef UB_USERNAME - -/* use to enable lightweight alloc assertions, for debug use */ -#undef UNBOUND_ALLOC_LITE - -/* use malloc not regions, for debug use */ -#undef UNBOUND_ALLOC_NONREGIONAL - -/* use statistics for allocs and frees, for debug use */ -#undef UNBOUND_ALLOC_STATS - -/* define this to enable debug checks. */ -#undef UNBOUND_DEBUG - -/* Define to 1 to use cachedb support */ -#undef USE_CACHEDB - -/* Define to 1 to enable dnscrypt support */ -#undef USE_DNSCRYPT - -/* Define to 1 to enable dnscrypt with xchacha20 support */ -#undef USE_DNSCRYPT_XCHACHA20 - -/* Define to 1 to enable dnstap support */ -#undef USE_DNSTAP - -/* Define this to enable DSA support. */ -#undef USE_DSA - -/* Define this to enable ECDSA support. */ -#undef USE_ECDSA - -/* Define this to enable an EVP workaround for older openssl */ -#undef USE_ECDSA_EVP_WORKAROUND - -/* Define this to enable ED25519 support. */ -#undef USE_ED25519 - -/* Define this to enable ED448 support. */ -#undef USE_ED448 - -/* Define this to enable GOST support. */ -#undef USE_GOST - -/* Define to 1 to use ipsecmod support. */ -#undef USE_IPSECMOD - -/* Define to 1 to use ipset support */ -#undef USE_IPSET - -/* Define if you enable libevent */ -#undef USE_LIBEVENT - -/* Define this to enable use of /proc/sys/net/ipv4/ip_local_port_range as a - default outgoing port range. This is only for the libunbound on Linux and - does not affect unbound resolving daemon itself. This may severely limit - the number of available outgoing ports and thus decrease randomness. Define - this only when the target system restricts (e.g. some of SELinux enabled - distributions) the use of non-ephemeral ports. */ -#undef USE_LINUX_IP_LOCAL_PORT_RANGE - -/* Define if you want to use internal select based events */ -#undef USE_MINI_EVENT - -/* Define this to enable client TCP Fast Open. */ -#undef USE_MSG_FASTOPEN - -/* Define this to enable client TCP Fast Open. */ -#undef USE_OSX_MSG_FASTOPEN - -/* Define this to use hiredis client. */ -#undef USE_REDIS - -/* Define this to enable SHA1 support. */ -#undef USE_SHA1 - -/* Define this to enable SHA256 and SHA512 support. */ -#undef USE_SHA2 - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif - - -/* Define this to enable server TCP Fast Open. */ -#undef USE_TCP_FASTOPEN - -/* Whether the windows socket API is used */ -#undef USE_WINSOCK - -/* the version of the windows API enabled */ -#undef WINVER - -/* Define if you want dynlib module. */ *** 500 LINES SKIPPED *** From nobody Tue Nov 28 15:16:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmJR3Ksbz53Dtt; Tue, 28 Nov 2023 15:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfmJQ2JQrz3J0W; Tue, 28 Nov 2023 15:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ykWO7kEQril9vIl3FhwOkC60UjWlUd0KRWLtIVtYxh0=; b=kP2Xt64Dx6aXRnnebYMSHi3xoLQlBoEcCLzB1VHvC/qYGayzqodrwddp51BHwQq9SO+vk3 niHfUwvMtSOGsE2U9Cv9yOMli88eK3HMJK16hOp4er7D6xkd8KvCBPgMuZp2QLvtJIcF/w 0shp9h1Qa6fTzgQCQDaelOhV2CHzovaT2Qr9raTj3W0h/nMx7Il8+63pNh2z4OSoYhKcEl PirmviPSHWrCcIgRD7ulZT/QdY2glCqEXXKlPN0UNL8g8XIYI9V8hKm1xUbsBSvufdQqLI /l9d/51Qfs9eXR/0/HLSlp6IC4lOk8BJfvFCkDWcBoEJgaduAIqSpF0DmEngrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ykWO7kEQril9vIl3FhwOkC60UjWlUd0KRWLtIVtYxh0=; b=S/0aklmS8H9bg1ESFYsF312W5T9DSlODESiisXYVe3xP4C6LK5bMP55OY7ZNRvxUCanD4B trK0+N1J9ayBeCVGHTqrQzlkCHR59mFNV11gj4oXMYMvGY+2AAfji77IfmwUwLJ3IaVj05 hGlHzi3tc4GhTEwbeBwqj14Nr8rrP+L2kW/q/boI7C0GA8MkKEg4rZMM6JlolYHyjeIPEd BEGvsh7rPcwStBNpW0duT2fRovALTpff6f/nJ8Vv9FT9SM/jYwpxrwExRTtqb0l8lglh/m wUfFyZu1gZKQqjhVh0eiMAct5dmnaGP/OkFEn8JQpws4PQpNTTc08zINa/CtDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184598; a=rsa-sha256; cv=none; b=KPtJWnWhOnjZlmRwtp1hY+GAtAaShmJSUXbhS9UMHgTRUyGTyk5Sjdy+vvV+d904BaXZRs yBqzK2a4uCeW97ueFOU0+DbbWRlbVd3GlQqMhI+S89DSANaN2tH4ETLV5Ex4hugd3kh/E1 0wAtD01iIbPgyHsMhilbk9oAYqUgwrEC2wsHGU7V5zlf6NGe+c8PV6YpNQ/9d/z8DaROSr uAVVSBfW5zB6i75vIs7U2NysBGAg5nsxZmWcJCWke0AoNhW4sbt6Gg7pons8ikezb52wVq 8bxQ2oR/FSerAIxf/izOeduoN8S0ONtix7JBlS002JPikY/JN6AjU8op00mACA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfmJP3fLszC6Y; Tue, 28 Nov 2023 15:16: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 3ASFGb5R094897; Tue, 28 Nov 2023 15:16:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASFGbo0094894; Tue, 28 Nov 2023 15:16:37 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:16:37 GMT Message-Id: <202311281516.3ASFGbo0094894@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 6663d2f67355 - stable/12 - Unbound: Manually update version strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 6663d2f67355c53b40ac0dc28ac33c65d033edbc Auto-Submitted: auto-generated The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=6663d2f67355c53b40ac0dc28ac33c65d033edbc commit 6663d2f67355c53b40ac0dc28ac33c65d033edbc Author: Cy Schubert AuthorDate: 2023-11-14 00:39:10 +0000 Commit: Cy Schubert CommitDate: 2023-11-27 15:26:32 +0000 Unbound: Manually update version strings This was missed earlier today. Reported by: "Herbert J. Skuhra" Fixes: 16fd0b249104 (cherry picked from commit 67267734315c6a48db31697f0a0669fa1f985969) --- usr.sbin/unbound/config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/unbound/config.h b/usr.sbin/unbound/config.h index 6196995bff29..976446ea06ab 100644 --- a/usr.sbin/unbound/config.h +++ b/usr.sbin/unbound/config.h @@ -794,7 +794,7 @@ #define PACKAGE_NAME "unbound" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "unbound 1.18.0" +#define PACKAGE_STRING "unbound 1.19.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "unbound" @@ -803,7 +803,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.18.0" +#define PACKAGE_VERSION "1.19.0" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" @@ -826,7 +826,7 @@ #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" /* version number for resource files */ -#define RSRC_PACKAGE_VERSION 1,18,0,0 +#define RSRC_PACKAGE_VERSION 1,19,0,0 /* Directory to chdir to */ #define RUN_DIR "/var/unbound" From nobody Tue Nov 28 15:16:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfmJS4YPsz53Dk1; Tue, 28 Nov 2023 15: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 4SfmJR4BPPz3J3X; Tue, 28 Nov 2023 15:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mZTNBSYwt2KZiIzM5esrgdzCgqTRG5kG1cW/RqbW1Y4=; b=fifLovB8N2NWmReNfkYFMCuSezUTARALn4VWCEaj8KJzVkwl9qCiSKqMBjKRALTdvgmDX+ /en/VWZQCpYlI9WfnIMPXVaLoc1EKCsw8PVhZxAwFMNkmQc72t3tc6BBmlO8X30Xcy3d8j mOxCTAOklJKKjt6rLCu2w9BYGOta8pj2I0bEQs0SlfLaD2q7ksN9Hmmk9DWLrYSpFgEA4G djHUpxnHEAAmwVayBStSDYi+xuBK0aABiK1i5d0MOsTp0vS2bo9mty8tcAw20OT3NblySr 21MjHpfQc3GKolSXnjL22D7ybjopMLzxqfh+95A0fKVk4X5lMPdbDmIL2JIuKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701184599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mZTNBSYwt2KZiIzM5esrgdzCgqTRG5kG1cW/RqbW1Y4=; b=LFXMFmnS6Onie4clHOh5kr1KgA47ZfDRwN79nFvmQonJQq7XBWmuJ6Ntc3QoIWOgB+SqPy zRzWNT6BmXN8eeLsJlciFcYIlws4SFv/n5w/ulohaSbADxMT5D/XRdL2Q+tHXH+MpmUodt el+UJE3RxnlKBxSCYbOmQANteZcWDUkpM/i4at0CgSLmk+mENMnTVcwKYnmNX/8O6fEFir qrjLkqVL2zenhkG8gyAzkoUIjRELYOfR6jc4IYrLgatM06JJSZbzoUguB3fR5h9cXdugO8 gGL7DY1YAiCxkfS0I2OfRmsvYH0hrjGswdg+HqnvCqoos8H9oHAEh/HphLOiqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701184599; a=rsa-sha256; cv=none; b=PDRLqapOET6AfIW/Aaw9SPWcHmZuCFM52koObqGUMOAy82buCm5vVtQHYNMFJHNs1ctHLb exO6TaCKJ5Bdo6N69nMrzggZvb8UBk5BNDLwtlRj+04MkpboTg0VydBubW3hJWRYfz00pL Nh+ebozoLFAm2KKX2zsKtKSRqrecNmzChdIb1qi94OV35FMWvmm3PTZM1OnVERjWXi2Gf+ /+Q1dgYbzXa7oHl7svvyjzuKH3iVxLbozAHVftH3LJEh3rghN2Az243K1vXf6nLmZ7g4bO 1lSxT/mOd5A+NX/BTFeWjA9IiNSpvg9TYZam0cMRx7gpajStxN2HTFgxJsm3og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfmJR0XJCzC8x; Tue, 28 Nov 2023 15:16: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 3ASFGcu0094946; Tue, 28 Nov 2023 15:16:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASFGcdb094942; Tue, 28 Nov 2023 15:16:38 GMT (envelope-from git) Date: Tue, 28 Nov 2023 15:16:38 GMT Message-Id: <202311281516.3ASFGcdb094942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 8cc42e13f480 - stable/12 - libevent: Import libevent 2.1.12 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8cc42e13f480dfe262ce4e0d761bce509822d5e7 Auto-Submitted: auto-generated The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8cc42e13f480dfe262ce4e0d761bce509822d5e7 commit 8cc42e13f480dfe262ce4e0d761bce509822d5e7 Author: Cy Schubert AuthorDate: 2023-11-14 23:04:28 +0000 Commit: Cy Schubert CommitDate: 2023-11-27 15:26:32 +0000 libevent: Import libevent 2.1.12 Merge commit '5223d1d95fddcef6f9a36e264a5800bd907ade8b' into main (cherry picked from commit b50261e21f39a6c7249a49e7b60aa878c98512a8) --- contrib/libevent/CMakeLists.txt | 1575 +++++++++ contrib/libevent/ChangeLog | 313 ++ contrib/libevent/ChangeLog-1.4 | 2 +- contrib/libevent/ChangeLog-2.0 | 2 +- contrib/libevent/Doxyfile | 46 +- contrib/libevent/Makefile.am | 67 +- contrib/libevent/Makefile.in | 1486 ++++++--- contrib/libevent/README.md | 487 +++ contrib/libevent/WIN32-Code/getopt.c | 149 + contrib/libevent/WIN32-Code/getopt.h | 33 + contrib/libevent/WIN32-Code/getopt_long.c | 234 ++ .../WIN32-Code/nmake/event2/event-config.h | 26 +- contrib/libevent/aclocal.m4 | 193 +- contrib/libevent/arc4random.c | 40 +- contrib/libevent/buffer.c | 50 +- contrib/libevent/buffer_iocp.c | 1 + contrib/libevent/bufferevent-internal.h | 36 + contrib/libevent/bufferevent.c | 115 +- contrib/libevent/bufferevent_async.c | 66 +- contrib/libevent/bufferevent_filter.c | 10 +- contrib/libevent/bufferevent_openssl.c | 75 +- contrib/libevent/bufferevent_pair.c | 4 +- contrib/libevent/bufferevent_ratelim.c | 9 +- contrib/libevent/bufferevent_sock.c | 74 +- contrib/libevent/{ => build-aux}/compile | 17 +- contrib/libevent/{ => build-aux}/config.guess | 970 +++--- contrib/libevent/build-aux/config.sub | 1793 +++++++++++ contrib/libevent/{ => build-aux}/depcomp | 10 +- contrib/libevent/{ => build-aux}/install-sh | 60 +- contrib/libevent/{ => build-aux}/ltmain.sh | 766 +++-- contrib/libevent/{ => build-aux}/missing | 16 +- contrib/libevent/{ => build-aux}/test-driver | 10 +- contrib/libevent/cmake/AddCompilerFlags.cmake | 13 + contrib/libevent/cmake/AddEventLibrary.cmake | 193 ++ contrib/libevent/cmake/COPYING-CMAKE-SCRIPTS | 22 + contrib/libevent/cmake/CheckConstExists.cmake | 25 + contrib/libevent/cmake/CheckFileOffsetBits.c | 14 + contrib/libevent/cmake/CheckFileOffsetBits.cmake | 43 + contrib/libevent/cmake/CheckFunctionKeywords.cmake | 14 + .../libevent/cmake/CheckPrototypeDefinition.c.in | 29 + .../libevent/cmake/CheckPrototypeDefinition.cmake | 82 + contrib/libevent/cmake/CheckWorkingKqueue.cmake | 52 + contrib/libevent/cmake/CodeCoverage.cmake | 165 + contrib/libevent/cmake/Copyright.txt | 57 + contrib/libevent/cmake/LibeventConfig.cmake.in | 183 ++ .../libevent/cmake/LibeventConfigVersion.cmake.in | 11 + contrib/libevent/cmake/Macros.cmake | 36 + contrib/libevent/cmake/Uninstall.cmake.in | 23 + contrib/libevent/cmake/UseDoxygen.cmake | 111 + contrib/libevent/cmake/VersionViaGit.cmake | 66 + contrib/libevent/config.h.in | 63 +- contrib/libevent/config.sub | 1807 ----------- contrib/libevent/configure | 3390 +++++++++++++++++--- contrib/libevent/configure.ac | 328 +- contrib/libevent/defer-internal.h | 3 + contrib/libevent/doxygen.am | 55 + contrib/libevent/epoll.c | 15 +- contrib/libevent/epolltable-internal.h | 2 +- contrib/libevent/evbuffer-internal.h | 2 +- contrib/libevent/evconfig-private.h.cmake | 40 + contrib/libevent/evconfig-private.h.in | 7 + contrib/libevent/evdns.c | 144 +- contrib/libevent/event-config.h.cmake | 513 +++ contrib/libevent/event-internal.h | 13 +- contrib/libevent/event.c | 392 ++- contrib/libevent/event_iocp.c | 2 +- contrib/libevent/event_rpcgen.py | 2057 ++++++------ contrib/libevent/event_tagging.c | 4 + contrib/libevent/evmap.c | 43 +- contrib/libevent/evrpc.c | 6 +- contrib/libevent/evthread-internal.h | 16 +- contrib/libevent/evthread.c | 2 +- contrib/libevent/evutil.c | 144 +- contrib/libevent/evutil_rand.c | 6 +- contrib/libevent/evutil_time.c | 65 +- contrib/libevent/http-internal.h | 9 +- contrib/libevent/http.c | 254 +- contrib/libevent/include/event2/buffer.h | 3 +- contrib/libevent/include/event2/buffer_compat.h | 3 +- contrib/libevent/include/event2/bufferevent.h | 11 +- .../libevent/include/event2/bufferevent_compat.h | 4 + contrib/libevent/include/event2/dns.h | 46 +- contrib/libevent/include/event2/dns_compat.h | 24 +- contrib/libevent/include/event2/event.h | 77 +- contrib/libevent/include/event2/http.h | 13 +- contrib/libevent/include/event2/http_compat.h | 6 +- contrib/libevent/include/event2/listener.h | 12 + contrib/libevent/include/event2/rpc.h | 48 +- contrib/libevent/include/event2/rpc_struct.h | 14 + contrib/libevent/include/event2/util.h | 34 +- contrib/libevent/include/event2/visibility.h | 31 +- contrib/libevent/include/include.am | 7 +- contrib/libevent/iocp-internal.h | 14 + contrib/libevent/kqueue.c | 17 +- contrib/libevent/listener.c | 29 +- contrib/libevent/log-internal.h | 25 +- contrib/libevent/log.c | 11 +- contrib/libevent/m4/ax_check_funcs_ex.m4 | 22 + contrib/libevent/m4/ax_prog_doxygen.m4 | 600 ++++ contrib/libevent/m4/libevent_openssl.m4 | 9 + contrib/libevent/m4/libtool.m4 | 102 +- contrib/libevent/m4/ltoptions.m4 | 2 +- contrib/libevent/m4/ltsugar.m4 | 2 +- contrib/libevent/m4/ltversion.m4 | 12 +- contrib/libevent/m4/lt~obsolete.m4 | 2 +- contrib/libevent/make-event-config.sed | 10 +- contrib/libevent/minheap-internal.h | 6 +- contrib/libevent/mm-internal.h | 5 + contrib/libevent/openssl-compat.h | 16 +- contrib/libevent/poll.c | 25 +- contrib/libevent/sample/dns-example.c | 17 +- contrib/libevent/sample/event-read-fifo.c | 4 +- contrib/libevent/sample/hello-world.c | 3 +- contrib/libevent/sample/http-connect.c | 86 +- contrib/libevent/sample/http-server.c | 292 +- contrib/libevent/sample/https-client.c | 88 +- contrib/libevent/sample/include.am | 11 +- contrib/libevent/sample/le-proxy.c | 16 +- .../libevent/sample/openssl_hostname_validation.c | 3 +- contrib/libevent/sample/signal-test.c | 25 +- contrib/libevent/sample/time-test.c | 7 +- contrib/libevent/select.c | 2 +- contrib/libevent/signal.c | 2 + contrib/libevent/strlcpy-internal.h | 2 + contrib/libevent/test/bench.c | 60 +- contrib/libevent/test/bench_cascade.c | 8 +- contrib/libevent/test/bench_http.c | 3 + contrib/libevent/test/bench_httpclient.c | 4 +- contrib/libevent/test/check-dumpevents.py | 10 +- contrib/libevent/test/include.am | 43 +- contrib/libevent/test/print-winsock-errors.c | 86 + contrib/libevent/test/regress.c | 332 +- contrib/libevent/test/regress.gen.c | 105 +- contrib/libevent/test/regress.gen.h | 11 +- contrib/libevent/test/regress.h | 7 +- contrib/libevent/test/regress_buffer.c | 369 ++- contrib/libevent/test/regress_bufferevent.c | 156 +- contrib/libevent/test/regress_dns.c | 522 ++- contrib/libevent/test/regress_et.c | 146 +- contrib/libevent/test/regress_finalize.c | 48 + contrib/libevent/test/regress_http.c | 479 ++- contrib/libevent/test/regress_listener.c | 100 +- contrib/libevent/test/regress_main.c | 68 +- contrib/libevent/test/regress_rpc.c | 49 +- contrib/libevent/test/regress_ssl.c | 404 ++- contrib/libevent/test/regress_testutils.c | 2 +- contrib/libevent/test/regress_thread.c | 8 +- contrib/libevent/test/regress_thread.h | 34 +- contrib/libevent/test/regress_util.c | 196 +- contrib/libevent/test/rpcgen_wrapper.sh | 11 +- contrib/libevent/test/test-changelist.c | 4 +- contrib/libevent/test/test-closed.c | 1 + contrib/libevent/test/test-eof.c | 4 +- contrib/libevent/test/test-fdleak.c | 15 +- contrib/libevent/test/test-init.c | 2 +- contrib/libevent/test/test-ratelim.c | 87 +- contrib/libevent/test/test-time.c | 25 +- contrib/libevent/test/test-weof.c | 4 +- contrib/libevent/test/test.sh | 4 +- contrib/libevent/test/tinytest.c | 169 +- contrib/libevent/test/tinytest.h | 5 +- contrib/libevent/test/tinytest_macros.h | 12 +- contrib/libevent/time-internal.h | 3 + contrib/libevent/util-internal.h | 72 +- contrib/libevent/win32select.c | 3 +- 165 files changed, 18349 insertions(+), 6378 deletions(-) diff --git a/contrib/libevent/CMakeLists.txt b/contrib/libevent/CMakeLists.txt new file mode 100644 index 000000000000..676727f16563 --- /dev/null +++ b/contrib/libevent/CMakeLists.txt @@ -0,0 +1,1575 @@ +# +# Libevent CMake project +# +# Based on initial work by: +# Alexey Ozeritsky +# +# Additional changes: +# Brodie Thiesfield +# Joakim Soderberg +# Trond Norbye +# Sergei Nikulov +# +# Build example: +# +# cd libevent +# md build +# cd build +# cmake -G "Visual Studio 10" .. +# start libevent.sln +# + +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) + +if (POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +endif() +if (POLICY CMP0074) + cmake_policy(SET CMP0074 NEW) +endif() +if (POLICY CMP0075) + cmake_policy(SET CMP0075 NEW) +endif() + +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release + CACHE STRING "Set build type to Debug o Release (default Release)" FORCE) +endif() +string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) + +# get rid of the extra default configurations +# what? why would you get id of other useful build types? - Ellzey +set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Limited configurations" FORCE) + +set(EVENT__LIBRARY_TYPE DEFAULT CACHE STRING + "Set library type to SHARED/STATIC/BOTH (default SHARED for MSVC, otherwise BOTH)") + +project(libevent C) + +list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/") +string(REGEX MATCH "SunOS" SOLARIS "${CMAKE_SYSTEM_NAME}") + + +include(CheckTypeSize) +include(CheckFileOffsetBits) +include(Macros) +include(CheckVariableExists) +include(CheckSymbolExists) +include(CheckStructHasMember) +include(CheckCSourceCompiles) +include(CheckPrototypeDefinition) +include(CheckFunctionKeywords) +include(CheckConstExists) +include(AddCompilerFlags) +include(VersionViaGit) + +event_fuzzy_version_from_git() + +set(EVENT_VERSION_MAJOR ${EVENT_GIT___VERSION_MAJOR}) +set(EVENT_VERSION_MINOR ${EVENT_GIT___VERSION_MINOR}) +set(EVENT_VERSION_PATCH ${EVENT_GIT___VERSION_PATCH}) +set(EVENT_VERSION_STAGE ${EVENT_GIT___VERSION_STAGE}) + + +set(EVENT_ABI_MAJOR ${EVENT_VERSION_MAJOR}) +set(EVENT_ABI_MINOR ${EVENT_VERSION_MINOR}) +set(EVENT_ABI_PATCH ${EVENT_VERSION_PATCH}) + +set(EVENT_ABI_LIBVERSION + "${EVENT_ABI_MAJOR}.${EVENT_ABI_MINOR}.${EVENT_ABI_PATCH}") + +set(EVENT_PACKAGE_VERSION + "${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}") + +set(EVENT_NUMERIC_VERSION 0x02010c00) +# equals to VERSION_INFO in Makefile.am +set(EVENT_ABI_LIBVERSION_CURRENT 7) +set(EVENT_ABI_LIBVERSION_REVISION 1) +set(EVENT_ABI_LIBVERSION_AGE 0) + +# equals to RELEASE in Makefile.am +set(EVENT_PACKAGE_RELEASE 2.1) + +# only a subset of names can be used, defaults to "beta" +set(EVENT_STAGE_NAME ${EVENT_VERSION_STAGE}) + +# a list that defines what can set for EVENT_STAGE_VERSION +set(EVENT__ALLOWED_STAGE_NAMES + rc + beta + alpha + alpha-dev + release + stable +) +list( + FIND EVENT__ALLOWED_STAGE_NAMES + "${EVENT_STAGE_NAME}" + EVENT__STAGE_RET +) +if (EVENT__STAGE_RET EQUAL -1) + message(WARNING + "stage ${EVENT_STAGE_NAME} is not allowed, reset to beta") + set(EVENT_STAGE_NAME beta) +endif() + +set(EVENT_VERSION + "${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}-${EVENT_STAGE_NAME}") + +option(EVENT__DISABLE_DEBUG_MODE + "Define if libevent should build without support for a debug mode" OFF) + +option(EVENT__ENABLE_VERBOSE_DEBUG + "Enables verbose debugging" OFF) + +option(EVENT__DISABLE_MM_REPLACEMENT + "Define if libevent should not allow replacing the mm functions" OFF) + +option(EVENT__DISABLE_THREAD_SUPPORT + "Define if libevent should not be compiled with thread support" OFF) + +option(EVENT__DISABLE_OPENSSL + "Define if libevent should build without support for OpenSSL encryption" OFF) + +option(EVENT__DISABLE_BENCHMARK + "Defines if libevent should build without the benchmark executables" OFF) + +option(EVENT__DISABLE_TESTS + "If tests should be compiled or not" OFF) + +option(EVENT__DISABLE_REGRESS + "Disable the regress tests" OFF) + +option(EVENT__DISABLE_SAMPLES + "Disable sample files" OFF) + +option(EVENT__DISABLE_CLOCK_GETTIME + "Do not use clock_gettime even if it is available" OFF) + +option(EVENT__FORCE_KQUEUE_CHECK + "When crosscompiling forces running a test program that verifies that Kqueue works with pipes. Note that this requires you to manually run the test program on the cross compilation target to verify that it works. See cmake documentation for try_run for more details" OFF) + +# TODO: Add --disable-largefile omit support for large files +option(EVENT__COVERAGE +"Enable running gcov to get a test coverage report (only works with GCC/CLang). Make sure to enable -DCMAKE_BUILD_TYPE=Debug as well." OFF) + +# Put the libaries and binaries that get built into directories at the +# top of the build tree rather than in hard-to-find leaf directories. +# +# But only if this variables are not defined yet +# (i.e. libevent is used via add_subdirectory()) +if (NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) +endif() +if (NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) +endif() +if (NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) +endif() + +if (EVENT__ENABLE_VERBOSE_DEBUG) + add_definitions(-DUSE_DEBUG=1) +endif() + +# make it colorful under ninja-build +if ("${CMAKE_GENERATOR}" STREQUAL "Ninja") + add_compiler_flags(-fdiagnostics-color=always) +endif() + +# Setup compiler flags for coverage. +if (EVENT__COVERAGE) + if (NOT "${CMAKE_BUILD_TYPE_LOWER}" STREQUAL "debug") + message(FATAL_ERROR "Coverage requires -DCMAKE_BUILD_TYPE=Debug") + endif() + + message(STATUS "Setting coverage compiler flags") + + set(CMAKE_REQUIRED_LIBRARIES "--coverage") + add_compiler_flags(-g -O0 --coverage) + set(CMAKE_REQUIRED_LIBRARIES "") +endif() + +set(GNUC 0) +set(CLANG 0) +set(MSVC 0) +if (("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") OR + ("${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")) + set(CLANG 1) +endif() +if (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR (${CLANG})) + set(GNUC 1) +endif() +if (("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") OR (${CLANG})) + set(MSVC 1) +endif() + +# Detect library type +set(EVENT_LIBRARY_TYPE) +if ("${EVENT__LIBRARY_TYPE}" STREQUAL "DEFAULT") + if (${MSVC}) + set(EVENT_LIBRARY_TYPE SHARED) + else() + set(EVENT_LIBRARY_TYPE BOTH) + endif() +else() + string(TOUPPER "${EVENT__LIBRARY_TYPE}" EVENT_LIBRARY_TYPE) +endif() +if ((${MSVC}) AND ("${EVENT_LIBRARY_TYPE}" STREQUAL "BOTH")) + message(WARNING + "Building SHARED and STATIC is not supported for MSVC " + "(due to conflicts in library name" + " between STATIC library and IMPORTED library for SHARED libraries)") +endif() +set(EVENT_LIBRARY_STATIC OFF) +set(EVENT_LIBRARY_SHARED OFF) +if ("${EVENT_LIBRARY_TYPE}" STREQUAL "BOTH") + set(EVENT_LIBRARY_STATIC ON) + set(EVENT_LIBRARY_SHARED ON) +elseif ("${EVENT_LIBRARY_TYPE}" STREQUAL "STATIC") + set(EVENT_LIBRARY_STATIC ON) +elseif ("${EVENT_LIBRARY_TYPE}" STREQUAL "SHARED") + set(EVENT_LIBRARY_SHARED ON) +else() + message(FATAL_ERROR "${EVENT_LIBRARY_TYPE} is not supported") +endif() + +if (${MSVC}) + set(msvc_static_runtime OFF) + if ("${EVENT_LIBRARY_TYPE}" STREQUAL "STATIC") + set(msvc_static_runtime ON) + endif() + + # For more info: + # - https://docs.microsoft.com/en-us/cpp/build/reference/md-mt-ld-use-run-time-library?view=vs-2017 + # - https://gitlab.kitware.com/cmake/community/wikis/FAQ#how-can-i-build-my-msvc-application-with-a-static-runtime + option(EVENT__MSVC_STATIC_RUNTIME + "Link static runtime libraries" + ${msvc_static_runtime}) + + if (EVENT__MSVC_STATIC_RUNTIME) + foreach (flag_var + CMAKE_C_FLAGS_DEBUG + CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL + CMAKE_C_FLAGS_RELWITHDEBINFO + ) + if (${flag_var} MATCHES "/MD") + string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + endif() + endforeach() + endif() +endif() + +# GNUC specific options. +if (${GNUC}) + option(EVENT__DISABLE_GCC_WARNINGS "Disable verbose warnings with GCC" OFF) + option(EVENT__ENABLE_GCC_HARDENING "Enable compiler security checks" OFF) + option(EVENT__ENABLE_GCC_FUNCTION_SECTIONS "Enable gcc function sections" OFF) + option(EVENT__ENABLE_GCC_WARNINGS "Make all GCC warnings into errors" OFF) + + set(GCC_V ${CMAKE_C_COMPILER_VERSION}) + + list(APPEND __FLAGS + -Wall -Wextra -Wno-unused-parameter -Wstrict-aliasing -Wstrict-prototypes + + -fno-strict-aliasing # gcc 2.9.5+ + -Wmissing-prototypes + + # gcc 4 + -Winit-self + -Wmissing-field-initializers + -Wdeclaration-after-statement + + # gcc 4.2 + -Waddress + -Wnormalized=id + -Woverride-init + + # gcc 4.5 + -Wlogical-op + + -Wwrite-strings + ) + + if (${CLANG}) + list(APPEND __FLAGS -Wno-unused-function) + endif() + + if (EVENT__DISABLE_GCC_WARNINGS) + list(APPEND __FLAGS -w) + endif() + + if (EVENT__ENABLE_GCC_HARDENING) + list(APPEND __FLAGS + -fstack-protector-all + -fwrapv + -fPIE + -Wstack-protector + "--param ssp-buffer-size=1") + + add_definitions(-D_FORTIFY_SOURCE=2) + endif() + + if (EVENT__ENABLE_GCC_FUNCTION_SECTIONS) + list(APPEND __FLAGS -ffunction-sections) + # TODO: Add --gc-sections support. We need some checks for NetBSD to ensure this works. + endif() + + if (EVENT__ENABLE_GCC_WARNINGS) + list(APPEND __FLAGS -Werror) + endif() + + add_compiler_flags(${__FLAGS}) +endif() + +if (APPLE) + # Get rid of deprecated warnings for OpenSSL on OSX 10.7 and greater. + add_compiler_flags( + -Wno-error=deprecated-declarations + -Qunused-arguments + ) +endif() + +if (MINGW OR CYGWIN) + set(WIN32 TRUE) +endif() + +# Winsock. +if(WIN32) + set(CMAKE_REQUIRED_LIBRARIES ws2_32 shell32 advapi32) + set(CMAKE_REQUIRED_DEFINITIONS -FIwinsock2.h -FIws2tcpip.h -D_WIN32_WINNT=0x0600) +endif() +if (SOLARIS) + set(CMAKE_REQUIRED_LIBRARIES socket nsl) +endif() + +# Check if _GNU_SOURCE is available. +if (NOT DEFINED _GNU_SOURCE) + CHECK_SYMBOL_EXISTS(__GNU_LIBRARY__ "features.h" _GNU_SOURCE) + + if (NOT _GNU_SOURCE) + unset(_GNU_SOURCE CACHE) + CHECK_SYMBOL_EXISTS(_GNU_SOURCE "features.h" _GNU_SOURCE) + endif() + + if (ANDROID) + set(_GNU_SOURCE TRUE) + endif() +endif() + +if (_GNU_SOURCE) + add_definitions(-D_GNU_SOURCE=1) + set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) +endif() + +# Check if header files exist +list(APPEND FILES_TO_CHECK + fcntl.h + inttypes.h + memory.h + signal.h + stdarg.h + stddef.h + stdint.h + stdlib.h + string.h + errno.h + unistd.h + time.h + sys/types.h + sys/stat.h + sys/time.h + sys/param.h +) +if (WIN32) + list(APPEND FILES_TO_CHECK + io.h + winsock2.h + ws2tcpip.h + afunix.h + ) +else() + list(APPEND FILES_TO_CHECK + netdb.h + dlfcn.h + arpa/inet.h + poll.h + port.h + sys/socket.h + sys/random.h + sys/un.h + sys/devpoll.h + sys/epoll.h + sys/eventfd.h + sys/event.h + sys/ioctl.h + sys/mman.h + sys/queue.h + sys/select.h + sys/sendfile.h + sys/uio.h + sys/wait.h + sys/resource.h + sys/timerfd.h + netinet/in.h + netinet/in6.h + netinet/tcp.h + ifaddrs.h + ) +endif() + +if (NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux") + list(APPEND FILES_TO_CHECK sys/sysctl.h) +endif() + +if (APPLE) + list(APPEND FILES_TO_CHECK + mach/mach_time.h + mach/mach.h + ) +endif() + +foreach(FILE ${FILES_TO_CHECK}) + CHECK_INCLUDE_FILE_CONCAT(${FILE} "EVENT") +endforeach() +unset(FILES_TO_CHECK) + +# Check if functions exist +list(APPEND SYMBOLS_TO_CHECK + getaddrinfo + getnameinfo + getprotobynumber + getservbyname + gethostbyname + inet_ntop + inet_pton + gettimeofday + signal + strtoll + splice + strlcpy + strsep + strtok_r + vasprintf + timerclear + timercmp + timerisset + timeradd + nanosleep + putenv + umask +) +if (NOT EVENT__DISABLE_CLOCK_GETTIME) + list(APPEND SYMBOLS_TO_CHECK clock_gettime) +endif() + +if (WIN32) + list(APPEND SYMBOLS_TO_CHECK + _gmtime64_s + _gmtime64 + ) +else() + list(APPEND SYMBOLS_TO_CHECK + getifaddrs + select + epoll_create + epoll_create1 + epoll_ctl + eventfd + poll + port_create + kqueue + fcntl + mmap + pipe + pipe2 + sendfile + sigaction + strsignal + sysctl + accept4 + arc4random + arc4random_buf + arc4random_addrandom + getrandom + getegid + geteuid + issetugid + usleep + timerfd_create + setenv + unsetenv + setrlimit + gethostbyname_r + ) + if (APPLE) + list(APPEND SYMBOLS_TO_CHECK mach_absolute_time) + endif() +endif() + +# Add stdio.h for vasprintf +set(EVENT_INCLUDES ${EVENT_INCLUDES} stdio.h) +CHECK_SYMBOLS_EXIST("${SYMBOLS_TO_CHECK}" "${EVENT_INCLUDES}" "EVENT") +unset(SYMBOLS_TO_CHECK) +set(EVENT__HAVE_EPOLL ${EVENT__HAVE_EPOLL_CREATE}) + +# Get the gethostbyname_r prototype. +if(EVENT__HAVE_GETHOSTBYNAME_R) + CHECK_PROTOTYPE_DEFINITION(gethostbyname_r + "int gethostbyname_r(const char *name, struct hostent *hp, struct hostent_data *hdata)" + "0" + "netdb.h" + EVENT__HAVE_GETHOSTBYNAME_R_3_ARG) + + CHECK_PROTOTYPE_DEFINITION(gethostbyname_r + "struct hostent *gethostbyname_r(const char *name, struct hostent *hp, char *buf, size_t buflen, int *herr)" + "NULL" + "netdb.h" + EVENT__HAVE_GETHOSTBYNAME_R_5_ARG) + + CHECK_PROTOTYPE_DEFINITION(gethostbyname_r + "int gethostbyname_r(const char *name, struct hostent *hp, char *buf, size_t buflen, struct hostent **result, int *herr)" + "0" + "netdb.h" + EVENT__HAVE_GETHOSTBYNAME_R_6_ARG) +endif() + +if(HAVE_PORT_H AND HAVE_PORT_CREATE) + set(EVENT__HAVE_EVENT_PORTS 1) +endif() + +# Only `CHECK_TYPE_SIZE()' will use `CMAKE_EXTRA_INCLUDE_FILES' +set(CMAKE_EXTRA_INCLUDE_FILES ${EVENT_INCLUDES}) + +CHECK_TYPE_SIZE("struct sockaddr_un" EVENT__HAVE_STRUCT_SOCKADDR_UN) +CHECK_TYPE_SIZE("uint8_t" EVENT__HAVE_UINT8_T) +CHECK_TYPE_SIZE("uint16_t" EVENT__HAVE_UINT16_T) +CHECK_TYPE_SIZE("uint32_t" EVENT__HAVE_UINT32_T) +CHECK_TYPE_SIZE("uint64_t" EVENT__HAVE_UINT64_T) +CHECK_TYPE_SIZE("short" EVENT__SIZEOF_SHORT BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("int" EVENT__SIZEOF_INT BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("unsigned" EVENT__SIZEOF_UNSIGNED BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("unsigned int" EVENT__SIZEOF_UNSIGNED_INT BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("long" EVENT__SIZEOF_LONG BUILTIN_TYPES_ONLY) +CHECK_TYPE_SIZE("long long" EVENT__SIZEOF_LONG_LONG BUILTIN_TYPES_ONLY) + +if(WIN32) + # These aren't available until Windows Vista. + # But you can still link them. They just won't be found when running the exe. + set(EVENT__HAVE_INET_NTOP 0) + set(EVENT__HAVE_INET_PTON 0) +endif() + +# Check for different inline keyword versions. +check_function_keywords("inline" "__inline" "__inline__") + +if (HAVE_INLINE) + set(EVENT__inline inline) +elseif (HAVE___INLINE) + set(EVENT__inline __inline) +elseif(HAVE___INLINE__) + set(EVENT__inline __inline__) +else() + set(EVENT__inline) +endif() + +# __func__/__FUNCTION__ is not a macros in general +CHECK_SYMBOL_EXISTS("__func__" "" EVENT__HAVE___func__) +CHECK_SYMBOL_EXISTS("__FUNCTION__" "" EVENT__HAVE___FUNCTION__) + +CHECK_SYMBOL_EXISTS(TAILQ_FOREACH sys/queue.h EVENT__HAVE_TAILQFOREACH) +CHECK_CONST_EXISTS(CTL_KERN sys/sysctl.h EVENT__HAVE_DECL_CTL_KERN) +CHECK_CONST_EXISTS(KERN_ARND sys/sysctl.h EVENT__HAVE_DECL_KERN_ARND) +CHECK_SYMBOL_EXISTS(F_SETFD fcntl.h EVENT__HAVE_SETFD) + +CHECK_TYPE_SIZE(fd_mask EVENT__HAVE_FD_MASK) + +CHECK_TYPE_SIZE(size_t EVENT__SIZEOF_SIZE_T) +if(NOT EVENT__SIZEOF_SIZE_T) + set(EVENT__size_t "unsigned") + set(EVENT__SIZEOF_SIZE_T ${EVENT__SIZEOF_UNSIGNED}) +else() + set(EVENT__size_t size_t) +endif() + +CHECK_TYPE_SIZE("off_t" EVENT__SIZEOF_OFF_T LANGUAGE C) + + +# XXX we should functionalize these size and type sets. --elley + +# Winssck. +if (_MSC_VER) + list(APPEND CMAKE_EXTRA_INCLUDE_FILES BaseTsd.h) +endif() +CHECK_TYPE_SIZE("ssize_t" EVENT__SIZEOF_SSIZE_T_LOWER LANGUAGE C) +CHECK_TYPE_SIZE("SSIZE_T" EVENT__SIZEOF_SSIZE_T_UPPER LANGUAGE C) + +if (EVENT__SIZEOF_SSIZE_T_LOWER) + set(EVENT__ssize_t "ssize_t") + set(EVENT__SIZEOF_SSIZE_T ${EVENT__SIZEOF_SSIZE_T_LOWER}) +elseif (EVENT__SIZEOF_SSIZE_T_UPPER) + set(EVENT__ssize_t "SSIZE_T") + set(EVENT__SIZEOF_SSIZE_T ${EVENT__SIZEOF_SSIZE_T_UPPER}) +else() + set(EVENT__ssize_t "int") + set(EVENT__SIZEOF_SSIZE_T ${EVENT__SIZEOF_INT}) +endif() + +CHECK_TYPE_SIZE(socklen_t EVENT__SIZEOF_SOCKLEN_T) +if(NOT EVENT__SIZEOF_SOCKLEN_T) + set(EVENT__socklen_t "unsigned int") + set(EVENT__SIZEOF_SOCKLEN_T ${EVENT__SIZEOF_UNSIGNED_INT}) +else() + set(EVENT__socklen_t "socklen_t") +endif() + +CHECK_TYPE_SIZE(pid_t EVENT__SIZEOF_PID_T) +if(NOT EVENT__SIZEOF_PID_T) + set(EVENT__SIZEOF_PID_T ${EVENT__SIZEOF_INT}) +else() + set(EVENT__SIZEOF_PID_T EVENT__SIZEOF_PID_T) +endif() + +if (NOT EVENT__DISABLE_THREAD_SUPPORT) + if (NOT WIN32) + list(APPEND CMAKE_EXTRA_INCLUDE_FILES pthread.h) + endif() + CHECK_TYPE_SIZE(pthread_t EVENT__SIZEOF_PTHREAD_T) +endif() + +if(EVENT__HAVE_CLOCK_GETTIME) + set(EVENT__DNS_USE_CPU_CLOCK_FOR_ID 1) +endif() + +# we're just getting lazy now. +CHECK_TYPE_SIZE("uintptr_t" EVENT__HAVE_UINTPTR_T) +CHECK_TYPE_SIZE("void *" EVENT__SIZEOF_VOID_P) +CHECK_TYPE_SIZE("time_t" EVENT__SIZEOF_TIME_T) + +# Tests file offset bits. +# TODO: Add AIX test for if -D_LARGE_FILES is needed. + +# XXX: Why is this here? we don't even use it. Well, we don't even use it +# on top of that, why is it set in the config.h?! IT_MAKES_NO_SENSE +# I'm commenting it out for now. +# - ellzey + +#CHECK_FILE_OFFSET_BITS() + +# Verify kqueue works with pipes. +if (EVENT__HAVE_KQUEUE) + if ((CMAKE_CROSSCOMPILING OR APPLE) AND NOT EVENT__FORCE_KQUEUE_CHECK) + message(WARNING "Cannot check if kqueue works with pipes when crosscompiling, use EVENT__FORCE_KQUEUE_CHECK to be sure (this requires manually running a test program on the cross compilation target)") + set(EVENT__HAVE_WORKING_KQUEUE 1) + else() + message(STATUS "Checking if kqueue works with pipes...") + include(CheckWorkingKqueue) + endif() +endif() + +if(EVENT__HAVE_NETDB_H) + list(APPEND CMAKE_EXTRA_INCLUDE_FILES netdb.h) + CHECK_TYPE_SIZE("struct addrinfo" EVENT__HAVE_STRUCT_ADDRINFO) +elseif(WIN32) + list(APPEND CMAKE_EXTRA_INCLUDE_FILES ws2tcpip.h) + CHECK_TYPE_SIZE("struct addrinfo" EVENT__HAVE_STRUCT_ADDRINFO) +endif() + +# Check for sockaddr structure sizes. +set(SOCKADDR_HEADERS) +if (WIN32) + set(CMAKE_REQUIRED_DEFINITIONS "-DWIN32_LEAN_AND_MEAN") + if (_MSC_VER LESS 1300) + set(SOCKADDR_HEADERS winsock.h) + else() + set(SOCKADDR_HEADERS winsock2.h ws2tcpip.h) + endif() +else() + if (EVENT__HAVE_NETINET_IN_H) + set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} netinet/in.h) + endif() + + if (EVENT__HAVE_NETINET_IN6_H) + set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} netinet/in6.h) + endif() + + if (EVENT__HAVE_SYS_SOCKET_H) + set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} sys/socket.h) + endif() + + if (EVENT__HAVE_NETDB_H) + set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} netdb.h) + endif() +endif() + +CHECK_TYPE_SIZE("struct in6_addr" EVENT__HAVE_STRUCT_IN6_ADDR) +if(EVENT__HAVE_STRUCT_IN6_ADDR) + CHECK_STRUCT_HAS_MEMBER("struct in6_addr" + s6_addr16 "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR16) + + CHECK_STRUCT_HAS_MEMBER("struct in6_addr" + s6_addr32 "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR32) +endif() + +CHECK_TYPE_SIZE("sa_family_t" EVENT__HAVE_SA_FAMILY_T) +CHECK_TYPE_SIZE("struct sockaddr_in6" EVENT__HAVE_STRUCT_SOCKADDR_IN6) + +if(EVENT__HAVE_STRUCT_SOCKADDR_IN6) + CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" + sin6_len "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN) + + CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" + sin_len "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN) +endif() + +CHECK_TYPE_SIZE("struct sockaddr_storage" EVENT__HAVE_STRUCT_SOCKADDR_STORAGE) +if(EVENT__HAVE_STRUCT_SOCKADDR_STORAGE) + CHECK_STRUCT_HAS_MEMBER("struct sockaddr_storage" + ss_family "${SOCKADDR_HEADERS}" + EVENT__HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY) + + CHECK_STRUCT_HAS_MEMBER("struct sockaddr_storage" + __ss_family "${SOCKADDR_HEADERS}" EVENT__HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY) +endif() + +CHECK_TYPE_SIZE("struct linger" EVENT__HAVE_STRUCT_LINGER) + +# Group the source files. +set(HDR_PRIVATE + bufferevent-internal.h + changelist-internal.h + defer-internal.h + epolltable-internal.h + evbuffer-internal.h + event-internal.h + evmap-internal.h + evrpc-internal.h + evsignal-internal.h + evthread-internal.h + ht-internal.h + http-internal.h + iocp-internal.h + ipv6-internal.h + log-internal.h + minheap-internal.h + mm-internal.h + ratelim-internal.h + strlcpy-internal.h + util-internal.h + evconfig-private.h + compat/sys/queue.h) + +set(HDR_COMPAT + include/evdns.h + include/evrpc.h + include/event.h + include/evhttp.h + include/evutil.h) + +set(HDR_PUBLIC + include/event2/buffer.h + include/event2/bufferevent.h + include/event2/bufferevent_compat.h + include/event2/bufferevent_struct.h + include/event2/buffer_compat.h + include/event2/dns.h + include/event2/dns_compat.h + include/event2/dns_struct.h + include/event2/event.h + include/event2/event_compat.h + include/event2/event_struct.h + include/event2/http.h + include/event2/http_compat.h + include/event2/http_struct.h + include/event2/keyvalq_struct.h + include/event2/listener.h + include/event2/rpc.h + include/event2/rpc_compat.h + include/event2/rpc_struct.h + include/event2/tag.h + include/event2/tag_compat.h + include/event2/thread.h + include/event2/util.h *** 36060 LINES SKIPPED *** From nobody Tue Nov 28 16:06:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfpmm5NtGz52F1D for ; Tue, 28 Nov 2023 17:07:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) (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 4Sfpmm22GJz3brk for ; Tue, 28 Nov 2023 17:07:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-54af0eca12dso6196626a12.3 for ; Tue, 28 Nov 2023 09:07:52 -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=Q7dM+Lka0NLg9hxbmGjbhIE8lde5bfIoiBMiwtImBZSmNbmN9mQ6Tg/FkMzSyhnoYP J328WuMS7E0sPGTd/qcP1K+Y8mzt3FXFbLXmPx41wtMi1wNbPgn0xYdwepXwrEN+B8ZO QPGeG/KvWa5KqLGtoFnNCrX66//8tx94mklAx2go7X4acDL8jbNBVm3Fm85aCW3yHHKf YhJS+3I4apEhW6++1dzJjsW+eBeaGmfq7jpyAEBHEKTIjSrn0EvP2lnvw6/+q8nbhxxv YIgzsKPESOvy5Qk97ENo5Mp2WfLYU9dtXi+RaAOnB/jB4s+kLdN6m6JVmXk3ujre43hw s1UA== X-Gm-Message-State: AOJu0Yx3MUdFiM8TfZMMrcXeMlrvwDlwK7PgoDcC9NbXicebIS7urATA 2dL1cSWgU9krKHXMXTTZX2AC1TXaXkXYXnGY3EyMEw== 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <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: 4Sfpmm22GJz3brk --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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfq3y4WSTz52G1T 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 4Sfq3y2pj3z3fmW 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-507be298d2aso7815108e87.1 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=erWiPYlSZmR++q7Jj2QtBTpk+c086Kn2VdbeEzfs3Qgf2aXbc0CD/RvXoCikEmA4hM ddevIiM63CfhznZwTXluDSuD2SRZofYFbrrqB8+BHc4ynFTdE2+d/dBFIt+A49cMGkWm 7gpgoZKRFM0yUIUL7f9wcZerBN7u0Mi2Q1jPUwZrg11ZadeNfTKwALz/1QAn3vvK0EtR rXhJnEFf4K4eApPDNGK+bW90j6dCbNIxt705v2GA39nbaxVcGBzErPzxfItnb77y8v1j O8fvdYnzHkBL6Q9dIyfuLx5fkwVZAf5J+8I3MLmVhh6oX/rnIdRtq6VYq3XssLCg0AXo Iltg== X-Gm-Message-State: AOJu0Yy07ml4yufaa7K2uYtwomfLmaVkxaVRwNjMp5d/++UeEyrziAja j/X1iUuebvemY7c1SEsBKpkImQ+CI4S2R1Vhp8sCe82nE/Iu6kHVlX8= 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <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: 4Sfq3y2pj3z3fmW --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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9: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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla 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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfr4B5vbpz52K6Y 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 4Sfr4B43r0z4Jyr 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(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: 4Sfr4B43r0z4Jyr --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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfr4F1lPRz52Jwx 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 4Sfr4D6Zmmz4K0B 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(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: 4Sfr4D6Zmmz4K0B --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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfr536lzJz52KRr for ; Tue, 28 Nov 2023 18:07:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sfr5354q3z4L9n 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-x12b.google.com with SMTP id 2adb3069b0e04-50bc21821a1so519381e87.0 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=GqANBFLlNHwyIGb9yjS5/C7HAz7mWcpCEg73u2xx8QVAD8dJHNxJIuAxiQO/Y/tMSg RZ7eYl49GfbI10c+OQ01rTnyagaMZrnd1qTicOAJo9Xt5WhQOat45kINV+wHuhbrgo0b hUryHd691pJYqwKoSngolGfAoumy5EqFKvw9itwxDol6FjGSZczoVYiHFi05Tfig6WiA WgsxLW35x+V1LOw9cBbsUNkwMg5ZDfRQuogcrMVvyb0OxjsF7XE1411ivaFoeooSteBj 3ibicDFg8YlHI74jGoE9fLo46JbWvpzBUhSr728267niLvpLEiQWxhJEyl9CTurf6GK6 wYgA== X-Gm-Message-State: AOJu0YwaENcu4Hyrv7vDXu5lbBt8hAzJYPt0nO/Dr/iJAkX5gi8is8Rr uSh0WVpJb64rCJ3v+H3+UpcBoFq81vhEINCWptnnhw== 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <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: 4Sfr5354q3z4L9n --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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:24:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfspv6jNPz52Qrk for ; Tue, 28 Nov 2023 19: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 4Sfspv5z2Bz4TkJ; Tue, 28 Nov 2023 19: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=1701199495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAN8U73W29mSo/RRE04rDBM6fgMwASKQWTetxVZg9Rc=; b=a7os+UQXTTCa39BpUv6yQkyFsdKtRj2tNhzUpm1L4UtWgOmtLtj2BuIrHZWIcUx8ef2pU6 wPV6fd1Uns+3KOoIoF+kdrgxoqCDElalbIwnOa05FdwBHZQPigzX0MzZB/kA97AhEbKgH7 C5B88N7gHA9JrSjYwv3S7mydbEiV3FpnctQJ+AcNwIkPylD4jQp4+Pn79nnlJ07Fwsejal G3MvRBOE6DDYTZ92GVKF6o8FUmh8XuMXI9WTSYuyY76iioYSpgHrR9/bwsKPp2hlCb4WdT hEQoU2wZ8K5nAxMaLbPnxamws8vdWVlg3g/Mu9/Px7Ozu47FoXpgimbdFAUnrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701199495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAN8U73W29mSo/RRE04rDBM6fgMwASKQWTetxVZg9Rc=; b=ocAXe2Dc27jPeffRdrj66qo4tBTbuR439VxG40tmGa7bUsM3jGcsIRBSsRi4+ic2bkEC1r p0ksjv+F07wfumh98o23xxjYK/X6whAVR5RThIiVh+bH7mmFW1jVEGYmP0aF+6ay3NAAym M/X7mwUIOQkpHnph4RzgCADxP6hLeTi5bLOM0sbnvzbwVhGXDcUF77IYjdqEWzRKBAssUg oj0T0W+EgzehJEcMOQ/sx4txtiU//XOzaDgsCRJeUUcnlGuwMSmVdJYm4e6UpYYfHXqpEt ZEzKiD5TL73u0I280o7RD5lDCiUCyZnfLhVAPQGFxdvgNP3NYskfjjfgy/RFjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701199495; a=rsa-sha256; cv=none; b=taZ6Reer89YKNDb5SKvUNEJGakKIV3D/MXNpKX2TFKtjcwDo66/d0TLEQsLQk8L8TzNMuH q+TVgOkQr5i9UOnPnr3BYRlVSTxGCXC+URU0/rjJh3qbYCfRjuq4xy0SNZnJ95xDENWYZZ zb/hwuggxYAeors0oKxngEorR+h0pcL5t2XrL69sOD89FRrUKT+R1aLV99j8WJbPNCRq4i nz8pg21CI7LIQPKYa8aO+70SeFhLO3nuQwRibdlcpH3ygfZkT7FmXq34LAuPMDTsOiSZD1 OR3OVZVh+a335VwQxrjWx1kUPOT50Bt9GK5+3yzk5om1EzeHBQ1+BHaSKSXEEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfspv52sBzZwr; Tue, 28 Nov 2023 19: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 3ASJOtPY014501; Tue, 28 Nov 2023 19: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 3ASJOtfo014500; Tue, 28 Nov 2023 19:24:55 GMT (envelope-from git) Date: Tue, 28 Nov 2023 19:24:55 GMT Message-Id: <202311281924.3ASJOtfo014500@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: a94860a6dee1..688514e4704b - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: 688514e4704bdee4551d25960febd322ac26f297 X-Git-Oldrev: a94860a6dee1c07bb96ee36dafcba40b804560cc X-Git-Newrev: 688514e4704bdee4551d25960febd322ac26f297 Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=a94860a6dee1..688514e4704b 7bbd42ef4954 Don't allow attach to a raidz child vdev 27d8c23c5820 ZIL: Do not encrypt block pointers in lr_clone_range_t a49087510365 ZIL: Refactor TX_WRITE encryption similar to TX_CLONE_RANGE 126efb588969 FreeBSD: Fix the build on FreeBSD 12 cf331663369b ZVOL: Minor code cleanup 95b68eb693ba zfs-dkms: fix shell-init error message 3551a32e5ed6 ZTS: Fix zfs_load-key failures on F39 803a9c12c911 brt: lift internal definitions into _impl header 213d6829673c zdb: show BRT statistics and dump its contents c1a47de86fd5 zdb: Fix zdb '-O|-r' options with -e/exported zpool acb33ee1c169 FreeBSD: Fix ZFS so that snapshots under .zfs/snapshot are NFS visible 30d581121bb1 dnode_is_dirty: check dnode and its data for dirtiness 67894a597f40 unnecessary alloc/free in dsl_scan_visitbp() 688514e4704b dmu_buf_will_clone: fix race in transition back to NOFILL From nobody Tue Nov 28 19:43:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/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:06:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfw421wzpz52YgB; Tue, 28 Nov 2023 21:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sfw421VFcz3D5G; Tue, 28 Nov 2023 21:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701205586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F53wbDcvaGNaQiySNHoWkrPmEhplqCo2LcP7u42JdWw=; b=IiytKNOr+vczoQE3rG5XJ3BjEATWgc8QYxDLiXOZZY9A0EyIuLJ7lyAsI5STbviWXxkpQ0 DT8ndyAjPHxkFEt0Bat+Gym/Gq1m86Ibfkx8EQb6l6RjqNZKfkOQluMPJ66/uWuuFoIgQT Y93csKgaxmaxmDX1ouWXFkCtbGsvfvgZPigia07knqecfNvXciQXxTx+ziMZZ+cs6gcEfv rmqMLsldRBArfyZlkXAE+a7sAnawbV6rJ72uS6xgTVeenDOyzjaZ38MmKY006m36/yvuCX C59O/dWlM85CDygJflkm2hMmWdvjmmKDtJgzaAbQdWJhNwOa0GCujEevdyBKYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701205586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F53wbDcvaGNaQiySNHoWkrPmEhplqCo2LcP7u42JdWw=; b=OOkVFQOtHipKVNpUlYDqgHxmvQjzaLky81n8zwvOG//j/ab57iaDMpdMidBxVMdkmubr6g gIOOC48vq1YISPXeJ/BjFNAZOrelnuiPSDjsCyaKUNbVHVCzJ5hwu3GlvovArkdRk4gqXO pe0c/6WvfV1ZYV8mgBm0YLQdDdeTH+iHsYLEyjtLN1wPc9yKkxRlyNh1QA5qxrQTIrp+/A 2h6IGUziz+hX2TDsP8JOIGTV1nYRZen6sVO5r16rVGEKzrywkndtOvv8rt7EAZxD/O+nBy X8R2ZUxCOBWYHJRXGHaeOD6roO8yL2mIbIqWnZq5ZV6YN0bSSIDqGLQF0JEAXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701205586; a=rsa-sha256; cv=none; b=AK7u30mqC0QEIfcllEVy8T/z3NC5oFxueEPtWuOg12pZpTm0SMKTut7b8B4RcMpYE6bHC+ rFxICSGHCatprcCdsFBK54tpwLe4ygpL0WkjJuLDFgegB+Nu395o/SaUz3TLav9+Br+Xka Fw7CIzedBJD7EdHl+CM906ud0Nc/obHkybSUW/QngdKdizRw/3/+P2DXvsE0f7O8ZnnsAj Fh4kzk2ItzPpQa6zod5P5VDHeHAqQv63d1UYw8e0lO2frwOQBjDvi4nohP8wGpcU8LrBRa 8xxMkdGa3nkV8GWhpeJTE8E86IMqyMX+3qphoTTHupu0HEZZ8ybj8U/yWMkqvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfw420Yt5zdc2; Tue, 28 Nov 2023 21:06: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 3ASL6Pqj082127; Tue, 28 Nov 2023 21:06:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASL6PF6082124; Tue, 28 Nov 2023 21:06:25 GMT (envelope-from git) Date: Tue, 28 Nov 2023 21:06:25 GMT Message-Id: <202311282106.3ASL6PF6082124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: d92e0d62c9e3 - stable/14 - zfs: cherry-pick commit from master List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d92e0d62c9e38058fd46c97beb08764538878592 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=d92e0d62c9e38058fd46c97beb08764538878592 commit d92e0d62c9e38058fd46c97beb08764538878592 Author: Rob N AuthorDate: 2023-11-28 17:07:57 +0000 Commit: Martin Matuska CommitDate: 2023-11-28 20:59:32 +0000 zfs: cherry-pick commit from master #15571 30d581121 dnode_is_dirty: check dnode and its data for dirtiness Obtained from: OpenZFS (cherry picked from commit 30d581121bb122c90959658e7b28b1672d342897) --- sys/contrib/openzfs/module/zfs/dnode.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/contrib/openzfs/module/zfs/dnode.c b/sys/contrib/openzfs/module/zfs/dnode.c index 7cf03264dce2..ad9988366ada 100644 --- a/sys/contrib/openzfs/module/zfs/dnode.c +++ b/sys/contrib/openzfs/module/zfs/dnode.c @@ -1764,7 +1764,14 @@ dnode_try_claim(objset_t *os, uint64_t object, int slots) } /* - * Checks if the dnode contains any uncommitted dirty records. + * Checks if the dnode itself is dirty, or is carrying any uncommitted records. + * It is important to check both conditions, as some operations (eg appending + * to a file) can dirty both as a single logical unit, but they are not synced + * out atomically, so checking one and not the other can result in an object + * appearing to be clean mid-way through a commit. + * + * Do not change this lightly! If you get it wrong, dmu_offset_next() can + * detect a hole where there is really data, leading to silent corruption. */ boolean_t dnode_is_dirty(dnode_t *dn) @@ -1772,7 +1779,8 @@ dnode_is_dirty(dnode_t *dn) mutex_enter(&dn->dn_mtx); for (int i = 0; i < TXG_SIZE; i++) { - if (multilist_link_active(&dn->dn_dirty_link[i])) { + if (multilist_link_active(&dn->dn_dirty_link[i]) || + !list_is_empty(&dn->dn_dirty_records[i])) { mutex_exit(&dn->dn_mtx); return (B_TRUE); } From nobody Tue Nov 28 21:06:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfw4344yXz52Ylj; Tue, 28 Nov 2023 21:06: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 4Sfw4336N7z3DkN; Tue, 28 Nov 2023 21:06:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701205587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tf+GUFRL0CsBdlet+pZyoP/e4V6A9uUrqQ6D2HOdt4k=; b=p9J0ovKMIme6s/rhJP05IQGiFpzaFDcVdk37YHgqu/XJ617TmZrwnU5MHfmZYsP5l/7aY5 EFkFtmWB9g4InBuM3SmbivLNzZ5TxtNYZwOnDEHjnyj7CfZp/Lw55rYSQkxNU3X2JuSoDn l3aB+sZzNdgD4dUW31Rdf6h7Ds8Vvw2NBBrLufyrpPpL603i26sYGlVGPVVphRJut8n/s3 Z0+fz6cu1h4LpVqCgxq9Ry6obbaKX/iB2bLyZJqc3XLRK/7dX6fScc1nTdWroERY73k18d 8ku6zd1pGmMJwjjoWttxZ3OqRt1xFT5yKc6r5rQzqIFL8Ekfb1N8lydlS8hmtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701205587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tf+GUFRL0CsBdlet+pZyoP/e4V6A9uUrqQ6D2HOdt4k=; b=N1IWyQ9Wj78XsdmudCO0ueTWlj9+uqJ/x0yS5jeN7gxz+wIz2oyxLYyd2PV+J5ysHVqRJd 2BDnq3KO9IAvZG/EuyPEDFsUTi/Fg2+HrSV5qLLzzdErajdz3cfbayj0qDYN4fyNajf6MO mfqsYHikSilkTOYZM9mLbQ7/+7sppAAvUqswyDKN7l3RTNqIemFFsZJ1UGFJVYhwUZ/8Ng hfHZQ4a2Z3ykLB94jdNTOspJJfv4RzHBdWbJx2OIBFInx5UI6OtpxDLljYUbI2J0Weszjr 7BxOVTWrkjcHzgyFlRactMpg6iVQaQxMbg6TmJDAq/YejKsnIXEBZJLCNy8Acw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701205587; a=rsa-sha256; cv=none; b=xqUut+hluQmQAJWqJnD24k7lNm8g4QJPJm1Kegw+si9EmTmIX1ln0RD3vQhSGjzxXx5WLu mjtCWNQLLmRFYeYcaXJ0STvg8r+0ykJ/T523GGtlGJWKFlE0a88KTd0DWjDdkLxvQqZftq fBJiLZ35pAXHQm92Pju+pXiFT3hZJCK3HaIv2qvVgw8nC45FRlh0OkTzYBMyBGsPNSxLLY c2WK+SE+DPJS9F6JhWyxhknkqUApJMMu1HhfO4457WxAnGSUs/VSY+nFW6g7yLnA+5eMgO a7ZeAHIVIlXXOxlmA/nbRMsAv2c0wUOOJk9d1yyo1IM6iXT6oFqdkdayJkqCaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfw431bqWzdY8; Tue, 28 Nov 2023 21:06: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 3ASL6RTe082169; Tue, 28 Nov 2023 21:06:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASL6Rc7082166; Tue, 28 Nov 2023 21:06:27 GMT (envelope-from git) Date: Tue, 28 Nov 2023 21:06:27 GMT Message-Id: <202311282106.3ASL6Rc7082166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 1b910e43b021 - stable/14 - zfs: cherry-pick commit from master List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b910e43b0216b284bddc83dbdb1322f8d76062c Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=1b910e43b0216b284bddc83dbdb1322f8d76062c commit 1b910e43b0216b284bddc83dbdb1322f8d76062c Author: Alexander Motin AuthorDate: 2023-11-19 01:01:03 +0000 Commit: Martin Matuska CommitDate: 2023-11-28 21:00:02 +0000 zfs: cherry-pick commit from master #15543 27d8c23c5 ZIL: Do not encrypt block pointers in lr_clone_range_t Obtained from: OpenZFS (cherry picked from commit 27d8c23c582056a23509a7b80844a1b6435750b0) --- sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c | 13 +++++++++++++ sys/contrib/openzfs/module/os/linux/zfs/zio_crypt.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c index fdbe13dbb5e9..024a931d7816 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c @@ -1364,6 +1364,19 @@ zio_crypt_init_uios_zil(boolean_t encrypt, uint8_t *plainbuf, vec++; total_len += crypt_len; } + } else if (txtype == TX_CLONE_RANGE) { + const size_t o = offsetof(lr_clone_range_t, lr_nbps); + crypt_len = o - sizeof (lr_t); + dst_iovecs[vec].iov_base = (char *)dlrp + sizeof (lr_t); + dst_iovecs[vec].iov_len = crypt_len; + + /* copy the bps now since they will not be encrypted */ + memcpy(dlrp + o, slrp + o, lr_len - o); + memcpy(aadp, slrp + o, lr_len - o); + aadp += lr_len - o; + aad_len += lr_len - o; + vec++; + total_len += crypt_len; } else { crypt_len = lr_len - sizeof (lr_t); dst_iovecs[vec].iov_base = (char *)dlrp + diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zio_crypt.c b/sys/contrib/openzfs/module/os/linux/zfs/zio_crypt.c index 55554d09ee43..775ab8efbcdf 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/zio_crypt.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/zio_crypt.c @@ -1543,6 +1543,21 @@ zio_crypt_init_uios_zil(boolean_t encrypt, uint8_t *plainbuf, nr_iovecs++; total_len += crypt_len; } + } else if (txtype == TX_CLONE_RANGE) { + const size_t o = offsetof(lr_clone_range_t, lr_nbps); + crypt_len = o - sizeof (lr_t); + src_iovecs[nr_iovecs].iov_base = slrp + sizeof (lr_t); + src_iovecs[nr_iovecs].iov_len = crypt_len; + dst_iovecs[nr_iovecs].iov_base = dlrp + sizeof (lr_t); + dst_iovecs[nr_iovecs].iov_len = crypt_len; + + /* copy the bps now since they will not be encrypted */ + memcpy(dlrp + o, slrp + o, lr_len - o); + memcpy(aadp, slrp + o, lr_len - o); + aadp += lr_len - o; + aad_len += lr_len - o; + nr_iovecs++; + total_len += crypt_len; } else { crypt_len = lr_len - sizeof (lr_t); src_iovecs[nr_iovecs].iov_base = slrp + sizeof (lr_t); From nobody Tue Nov 28 21:06:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfw446jqNz52YYx; Tue, 28 Nov 2023 21:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sfw445jRwz3Dkw; Tue, 28 Nov 2023 21:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701205588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RbJj6/eMiV7hJoWjcXWb/MFW08vkNWkfSYbFWXk1Wj0=; b=PplqUVXD2HRd/nsFiZZXjtWMkjiWrIf9TWebfHLFVOTSWs52OQ4WKZDfyajITjg3RWNT6P CxDcsTKi/HyIOXBGrNfy8ZGFWbkcCA4GwV02J3GPxuJHaZQ+YSyiIN/mt44iNVrnHWBBgL hCt7VpkyL9xQmeonwZkYABjTKdOhYUUfjU7RyObM40q9XuvMNkV8H6VaoyUFo1ucX789S1 uNEut9ORb43xec8gEENexK/ToS16so1muFbm/9yV0r0DfnawFQNp+w0/ccvzGN7sOuEC36 7YX68iZkG01uVqqPkC+IYhl75W+1ObYRTUDQBEDmcCga2Rh1uRfAs8OSmmUFCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701205588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RbJj6/eMiV7hJoWjcXWb/MFW08vkNWkfSYbFWXk1Wj0=; b=NlzmwEUr4AXDnWb+nJnVQSSKo8ToYb/+fncp3k61ixRSyUK2g7cjWiaqwxI6SPb6tUy/+E QTY8sO93VSSoFBCBGMMAvGBYSCGPWdCgLf5ztHGjysqoupEGDE2+TaLaPkRf/cSk8hgIKD TJMvwHIau/VhJqxKzVKG7mbHIa9w47KshSdOISTtEnTMlO4yYjOBRzjkLirRpKtwHN4HiQ AYp+Q/WXSoEtndbYseJzhT6fdma65K/oJ+4izeXuQiNiC5EaED+1mWkmvE0xXsjH5fgmon fqwXOKSZabaqt1Leq3zQPRbTD1cFXOByNgE9Eq6bifpyJcpn8zymat/2mBAi0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701205588; a=rsa-sha256; cv=none; b=fheJTPhYIdOMBCQNmZcRzr/KulJqVloTcK2uiGyXWtoN7Vp2VPHZbjnUT/UW+aNt0oJZTP ByF6F5RXWAAf5gzyvyVnEknRtBt+JDI1VeSG+MfkibpSoOF/RwPzbhfSBHLrC2M0DZK6KX oXbR8/UajDqggYPzn922UVDENMQiN1X0quWTpnVSBnOkKT/+8jFCgaH0xmEXB4Ao1PbFrA zkT8djqnecsuWEHnGsAJITZ+CjilumNi8yW1SZjtL5oMFKnDliW07b3mrG+BIDHoaaSSLD Mt7C7MkluQROJ0VlRXRYaa3fqdeOwOgh7ifcZKo+1ljZLXkxjg+ONV1jJ2gRag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfw442N1ZzdSn; Tue, 28 Nov 2023 21:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASL6Srw082211; Tue, 28 Nov 2023 21:06:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASL6Shl082208; Tue, 28 Nov 2023 21:06:28 GMT (envelope-from git) Date: Tue, 28 Nov 2023 21:06:28 GMT Message-Id: <202311282106.3ASL6Shl082208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 99385ec7c296 - stable/14 - zfs: cherry-pick commit from master List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 99385ec7c2962c2b5e54161aca6ec57546229cb2 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=99385ec7c2962c2b5e54161aca6ec57546229cb2 commit 99385ec7c2962c2b5e54161aca6ec57546229cb2 Author: Rob N AuthorDate: 2023-11-28 17:53:04 +0000 Commit: Martin Matuska CommitDate: 2023-11-28 21:00:48 +0000 zfs: cherry-pick commit from master #15566 688514e47 dmu_buf_will_clone: fix race in transition back to NOFILL Obtained from: OpenZFS (cherry picked from commit 688514e4704bdee4551d25960febd322ac26f297) --- sys/contrib/openzfs/module/zfs/dbuf.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/zfs/dbuf.c b/sys/contrib/openzfs/module/zfs/dbuf.c index f2831a0e8abf..5a7fe42b602a 100644 --- a/sys/contrib/openzfs/module/zfs/dbuf.c +++ b/sys/contrib/openzfs/module/zfs/dbuf.c @@ -2700,15 +2700,23 @@ dmu_buf_will_clone(dmu_buf_t *db_fake, dmu_tx_t *tx) * writes and clones into this block. */ mutex_enter(&db->db_mtx); + DBUF_VERIFY(db); VERIFY(!dbuf_undirty(db, tx)); ASSERT3P(dbuf_find_dirty_eq(db, tx->tx_txg), ==, NULL); if (db->db_buf != NULL) { arc_buf_destroy(db->db_buf, db); db->db_buf = NULL; + dbuf_clear_data(db); } + + db->db_state = DB_NOFILL; + DTRACE_SET_STATE(db, "allocating NOFILL buffer for clone"); + + DBUF_VERIFY(db); mutex_exit(&db->db_mtx); - dmu_buf_will_not_fill(db_fake, tx); + dbuf_noread(db); + (void) dbuf_dirty(db, tx); } void From nobody Tue Nov 28 21:11:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfwBC6Blqz52Yw2; Tue, 28 Nov 2023 21:11: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 4SfwBC5kC4z3FmC; Tue, 28 Nov 2023 21:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701205907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C1j5wD2G3s20ggRieql4Kmr0UWn0q047VGcBMJ69OA4=; b=gdDyKGtxQsco5MDWnKH6W21JyKD2miz8+Qydw7fjpkh5L5Z9tewplqywBtjXw5/fx1KffP cuQG5/ogI5Yuae4KPgT2o7D6BQQQiBj08iJo1bdRytS8cjHioO0SmTrLspKDj4zO8Smr+v nGh9E1UKYGUWYXYqzHBDHMdjGJArNrnifSR1PSUc+c+bEp8610IlNv29ECdzFEnvnfSHk3 mBdtw7juB/SKJ6GfIarX9Nzyo5+fn6ZvqFjo5BkGKAkcSOY1ytUnxe6+/1ikmBbjbRiS1m LeQUYE+PWGaLpREhMUvzaOJXn6iCwwWBxm2ngm4LQ3KC9L299JuvsroGYmwEYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701205907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C1j5wD2G3s20ggRieql4Kmr0UWn0q047VGcBMJ69OA4=; b=sHEq9OQKPOkme/zG/U9xkqdsnWXLXpnR+KJkV4iEWKkUbYxh7/Ico+qec9A1C9i9dzc9CB fU9ro/jwS0zVQFpm1lZHUneDNQrgxmt8bceJzspgmZ7HO2YBVHds2k3/JP35xLL1cWC05E tlTatH7wuhBiWcsR18XHG9fflhvqVpt34PXm3AyC/bX6ucDln+P/r+NsIESraUSsIn/NbH hYkSGtBn/xa8WTK4mBQBcuqzb4FHuIDXzCJGBlX2m7Cd9WlCgoTkjbDAHG5Ep5T1BixLFA F6a0YWzb/0nbqUxzplZvhWl6mf+DQkAcSSOO18AADlQdB3UEgP4AjMM8Zj8J5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701205907; a=rsa-sha256; cv=none; b=MJL18pnKslT9z55ttbCBE7unvyioK72/+2WFJoW9WLQ3cMpoizwESludJbzXRlVdr2599b 9QaZ8pLsqxy5SF2e2YnS+3GNa5Osh3Ozcfjol+d3ueIXo54DRwBpxEtqhHeDkLQUshEeAp SvMy8TouqShUONWKvGxLB0Lk7z4zto/mifo8frU441mD3lWTwNtNirF9AeghQt3SpPeVwZ 1FRaL/cNLCvNL+Jofy+yPm5NVbKvm1YmcJODNQSUHMlHynAoXkH1qoWSDzszMyaJnle7xm Y2b+D7PDgZPBY0bzWMsvf6uq7xKVr4Qv9TkKpceQvU4WsVVE0olFjbNeEY9OKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfwBC4nXdzdWX; Tue, 28 Nov 2023 21:11: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 3ASLBlvN097022; Tue, 28 Nov 2023 21:11:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASLBlnK097019; Tue, 28 Nov 2023 21:11:47 GMT (envelope-from git) Date: Tue, 28 Nov 2023 21:11:47 GMT Message-Id: <202311282111.3ASLBlnK097019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 5858f93a8b66 - stable/13 - zfs: cherry-pick commit from master List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5858f93a8b66aa6331d99bed6aad68bc7e9648ba Auto-Submitted: auto-generated The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=5858f93a8b66aa6331d99bed6aad68bc7e9648ba commit 5858f93a8b66aa6331d99bed6aad68bc7e9648ba Author: Rob N AuthorDate: 2023-11-28 17:07:57 +0000 Commit: Martin Matuska CommitDate: 2023-11-28 21:07:30 +0000 zfs: cherry-pick commit from master #15571 30d581121 dnode_is_dirty: check dnode and its data for dirtiness Obtained from: OpenZFS (cherry picked from commit 30d581121bb122c90959658e7b28b1672d342897) --- sys/contrib/openzfs/module/zfs/dnode.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/contrib/openzfs/module/zfs/dnode.c b/sys/contrib/openzfs/module/zfs/dnode.c index a9aaa4d21d2b..efebc443a210 100644 --- a/sys/contrib/openzfs/module/zfs/dnode.c +++ b/sys/contrib/openzfs/module/zfs/dnode.c @@ -1773,7 +1773,14 @@ dnode_try_claim(objset_t *os, uint64_t object, int slots) } /* - * Checks if the dnode contains any uncommitted dirty records. + * Checks if the dnode itself is dirty, or is carrying any uncommitted records. + * It is important to check both conditions, as some operations (eg appending + * to a file) can dirty both as a single logical unit, but they are not synced + * out atomically, so checking one and not the other can result in an object + * appearing to be clean mid-way through a commit. + * + * Do not change this lightly! If you get it wrong, dmu_offset_next() can + * detect a hole where there is really data, leading to silent corruption. */ boolean_t dnode_is_dirty(dnode_t *dn) @@ -1781,7 +1788,8 @@ dnode_is_dirty(dnode_t *dn) mutex_enter(&dn->dn_mtx); for (int i = 0; i < TXG_SIZE; i++) { - if (multilist_link_active(&dn->dn_dirty_link[i])) { + if (multilist_link_active(&dn->dn_dirty_link[i]) || + !list_is_empty(&dn->dn_dirty_records[i])) { mutex_exit(&dn->dn_mtx); return (B_TRUE); } From nobody Tue Nov 28 21:13:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfzVS0Qk9z52l23 for ; Tue, 28 Nov 2023 23:41:04 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfzVR1yYxz3WcL 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.52 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com; dmarc=none Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-40b4734b975so20887815e9.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=UbL23fW8cP2ze2vGG8dmAHrTWYV6Nua/RZdVy7MCU48WIDUPAyozJATmJW66YYCiAC jAS/VXWv9UTgZZBuLtDn4p9XfI/pfnCATvGXxd203s4QGKes4RY139zRc/hECMtetyRs QH7gfjd0z4vF/4Y+dzGnxA8w1lG4uaYMU6O3T5srkkuU/Rv0phGOkwdvszHYX90Tjr1B XDxIcXvKLz0YCybMPjUb8OasLOnveI0vPCQH4tOwKdfxcX5VppwPq9290lh9cQxZzQlA +3mz0EYk9GtvFM6iFAfWEDPFzL3WWFiwkdsTymc/2ppP1WSiGoG8qOUTbSYoEUnAR+2d 4CSg== X-Gm-Message-State: AOJu0Yzti5Awcx9hygoT30U7j4kT88MdU3G/PqecTxEf8crgupPTt1Sp t3blZAs9ZEnnPM1YOpRE1G+09hVk/z4ajOPvOic= 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(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-all@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-all@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.52:from]; FREEFALL_USER(0.00)[jrtc27]; MIME_TRACE(0.00)[0:+]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.52: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: 4SfzVR1yYxz3WcL 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/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 04:29:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg5vG2CKZz533N0; Wed, 29 Nov 2023 04:29: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 4Sg5vG1m9Cz4TwG; Wed, 29 Nov 2023 04:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701232170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gBdQbynpNdFfR6/VrKDorPhsFdz7LblmfgWstCKv704=; b=tlqEkJH78EWuGGU+JlCsIIZkiH8e/I/8AzY/27PeAySjuvLSqPwjnMoiHOkMHnYJ448+HX yLrogJUakR58NrZs9TTMum8VJb+IKH+I5aDASUE1Z5x2jVFSOdo/8SYahcjmTIV0/z+j2L 934bBLLhiOdf4AaglvCJQC6t+aBgY3YU/6yqQV7FwPdxWQsulJsyL2UVvWqzPQDSo7xKyH jPQDKcAENUTHapzBTxu0okhWZDhSjU6Bi5VdhzI7qZpaRDGwq3lc/hvfQgOoS77w7rHl1F cPJxM+BxswPIyYRXgv5LOO1x5ou1h6qh9C/sjPKiai9Qv14XdgY0I8nDbGdmYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701232170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gBdQbynpNdFfR6/VrKDorPhsFdz7LblmfgWstCKv704=; b=BrZ9NNnbzjgXGMrk33bcFdVWIRJesesrKBHwLNzZbHC7qRrx2fhaIwD4QDJW4KLyRODOwR g2NlO+nkG+sZyVeO54amBMyUyD5eRB4n0uCQkbe9aiMjdfJLrJ9xBHdFAQFpK3pJWHyAXB bGOw7ZS3N2R/BjMGpxYKgRKP7EuljZ8mOndSMnwYiej3qFNNT+Ao5ue8/AjFpps2tnSah1 QE4CpYwzpRwgAexsHIy//VN+jLWIZEBv/mdRL3fBXO5AJGHWk/op6Lmo2z+Lc7J3s/ppk4 X3Nq8qwCCtvMX7fbOcZSJjsDK93gH5+ySMeeXicc+0aWOnb02XuMWKWb4O3wSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701232170; a=rsa-sha256; cv=none; b=clIBxwr7BVIRTLrDL3v91YVR8mVyNusDzmVETNUSse+QjKYN0Lm5OIWZFvTxYLuLTpFFGW 68H6KWSgKBBCvaWRsqVD7ttBkhbSlmXdfhQxCuq2oxyArvBmHfJ8WuH7MtbuM4kshGhiKh cXcbnQMqQKFFMrycg1AlbPyiRhDHXsbRqsgh0Mq/BndNdBAdD1Zdlj+aa4Qmi2/CBkDSr4 ECI2R84Y/9mlwydiqGhx9mq/5FntW29OM7DON0BuEv77SX2GDk7lxjHWpyOYdhg7SY3VEI CcuuEhM54rQlptzk80R9Yi3Ww8/64MJ/M5Y2yil3uCSEVxwB0YvgzaEmR/lEsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg5vG0sYZzr6X; Wed, 29 Nov 2023 04:29: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 3AT4TUNo017740; Wed, 29 Nov 2023 04:29:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT4TU7O017737; Wed, 29 Nov 2023 04:29:30 GMT (envelope-from git) Date: Wed, 29 Nov 2023 04:29:30 GMT Message-Id: <202311290429.3AT4TU7O017737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 2acec38b91fd - stable/14 - Update leap-seconds to leap-seconds.3676924800 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2acec38b91fdf8520ca1ca6aebbde5c527040d14 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=2acec38b91fdf8520ca1ca6aebbde5c527040d14 commit 2acec38b91fdf8520ca1ca6aebbde5c527040d14 Author: Xin LI AuthorDate: 2023-11-26 01:13:23 +0000 Commit: Xin LI CommitDate: 2023-11-29 04:29:08 +0000 Update leap-seconds to leap-seconds.3676924800 Obtained from: ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.3676924800 (cherry picked from commit 832c63f5e07e6f960d051747ccb4358695a393ec) --- 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 Wed Nov 29 04:30:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg5vv3dvFz5338M; Wed, 29 Nov 2023 04:30: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 4Sg5vv31d8z4VhJ; Wed, 29 Nov 2023 04:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701232203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=siOtThRgtIK2HZ+jK9CYCk+/SAuU33K03xYZWP2bNc0=; b=PNiNw74EVjXTB9mLQk3Ke9uEcBr5kyQdxnzvRCbds8ft3NpMuMs50nX2aoBGnO4VNUQBap yBv2mFAGT69LUBUGyGbeljCFhUAfJyG0kbY31rjk0q2FAwlmq+0hV43+5OmpLusxNrgoZG tVDX6sRPhPzYABi2UKfPyl1r4BraW6U6SrhhpZL1Ugqlm6KyL6gciv2rHYERipHztn9mzp 0dn8sjQwvNdKKJ17jqQIcyW8YBMXcaCI7eaXVMD4e5Dc/44meFQ2uW88GlJ8wV69kqN0Dv 0yJMni4TD3nVK0FlDzvtIYnoBF4lIKpcxPGFDDWI16XNiU8TmblsgkggkRAodg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701232203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=siOtThRgtIK2HZ+jK9CYCk+/SAuU33K03xYZWP2bNc0=; b=cabwMpls4p3RJBY9FruEiHC0uubuvdW8+MVLgAV/zFo7yKU1hHVzbf262xcuWaD9O12gHn /ujDfqNF52c49/9GOViGd/glvP6xYs4PRKvnmxbtEANM7EBnBP0Jn8JeRKKqtLWhVFwmVB F6ETQLtp+4abOArom1NHwS6ExXoegzGd0ELQBgzfRb48tWx7YZ1xngKsJJq2aIRZA1DP9Q 6ydRr7qcoCWhT5P7HAs2o3SE46TDO02aFiERd5c1UP/3MkAOVXY0k4Of+DiSYSPqpvbFNm ZVZ+Qui/EVrchXkdz+Sg7/B2cwQ09ET7NjZNxt5105laIfdg/FX9FvOikKO0QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701232203; a=rsa-sha256; cv=none; b=jhC33H1wZvg8iz5YtG8lG2Pj0re77lj9tIIhglhI9mSsbLypg/jYDAjK5oepyxCZX+ysxF pRT4pYLUfR7ZPWKeCuaTQEBFDZHyzVRfPBAe/3rvoUW1VH4P7mnJo5hlm5kThf2vLwcRPG CVYFbbkO1XoGY6qM3sxSU/VRsYQcZ+NMfiXAtljjwItJN5E00jfK4vBsM92lC4USA5NrKC 595WPPjIR7AQy5RazDHjKnYAhfgMvFQ8UslwMf4KOePbukq09WHECydIi3E9EXg6ryoyu/ WIOYtlCkCEYeq9p6t14dJZkoi47c6sTAMTd47hazZxeCLj85IvP+2k3r5rdkrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg5vv255dzrlx; Wed, 29 Nov 2023 04:30: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 3AT4U3Bh020084; Wed, 29 Nov 2023 04:30:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT4U3xC020079; Wed, 29 Nov 2023 04:30:03 GMT (envelope-from git) Date: Wed, 29 Nov 2023 04:30:03 GMT Message-Id: <202311290430.3AT4U3xC020079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: b1d3826ededc - stable/13 - Update leap-seconds to leap-seconds.3676924800 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b1d3826ededc09b271bef8aa9dae6a838ab05c8d Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=b1d3826ededc09b271bef8aa9dae6a838ab05c8d commit b1d3826ededc09b271bef8aa9dae6a838ab05c8d Author: Xin LI AuthorDate: 2023-11-26 01:13:23 +0000 Commit: Xin LI CommitDate: 2023-11-29 04:29:49 +0000 Update leap-seconds to leap-seconds.3676924800 Obtained from: ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.3676924800 (cherry picked from commit 832c63f5e07e6f960d051747ccb4358695a393ec) --- 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 Wed Nov 29 10:58:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgGX15vqGz52X42; Wed, 29 Nov 2023 10:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgGX15MYxz3dSc; Wed, 29 Nov 2023 10:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701255505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PdixdsXm5ORtEQ0GfmUSKAYgiv4JqlKwQ1Mfl2iPC8k=; b=JrWJuyxCi+VzL56qHQE97NLiMYG0+MGegHmuE9ZdYu+dSvbVKknljzQZeeMZu4zxoFwWVw PZbbXin1qRb6YDkatrvAQDkspMrMwd8lRJxx3Bb7zz3mvmIDDOmY27+GBtMROzFl0ar2mw 40iIdNMqSVICzw/pJmtC9a+nnVl6ECAGty+zQNVkIwhe3cJBRJbibeHS1HUusus17TERsk 7B0ze3Zbcf5TtTAeLFLiBuN9h6UFHh9sqmUFr3+Lxt96iH9Wxm+MIuScjCpsdC1Brkap5j XR7VTQ08zunXExyFRPQRYhcGfosFnktocwaToYo1P14xm7TrWSXuzv7zBQzRYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701255505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PdixdsXm5ORtEQ0GfmUSKAYgiv4JqlKwQ1Mfl2iPC8k=; b=x1emEfQJ1qnYe2kg3/pruc3y6kng+8RtC6gQFgsDXsIDQqqubFJ4iKJRIiowy5TaU1X2oQ 6YQYnOJ+bc9Li0KynwEOb6dZCrIXCp9JUwV2GTCel7PETTTXWixspT5cQ8IiLb7nZhaNXp Uj3MDuosWSgO2TVgKovRIWX+eOSN9n1e/ihS5L0PegoeLeQDIuBLj35ekj6x2+iBmlc8yQ u86+K7u3JoKirbDpyoGWi9yGGyaxVm4M9cO/NUK6w4qpRL/AblkbVu8le7ogWJY5aXArKb imeAExq32Li2UvEa+ID0dC0hdNEw7569jtaLrTBnWvOaD0sAz8u1syUSZipG5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701255505; a=rsa-sha256; cv=none; b=GAC4Ld8F6Yz6ORPxf7RCIwL7MguoHK0bhDLfR1+sTqgTpjhayU21D3XvIrgHQ20ombXo4e nmf6iwmhn+S6InFVvWLlVB8Cfojlvby/kQsA8ngYwMq29v4agfa8v6w5qPdXJdCbQtJBsl 0xmYD0oLwnfW3FoJKKMxFN6TpsUqIdtRBxmRIOk4M5QNkRLaO1MMLJpsMOCAmJbc3s7kvy RC30fg56ZSrZVaNRjK8V1ZfrKcJLtOJAH63u61gbqiv08922xmnboYdCQcIZXAkHkv/IKu zo6csqxq+E9VCSmzAzFqX2HMcHDaO5adQ8kYBqO/tF2G1OC90t00eSsXM87rlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgGX14QYbz12g2; Wed, 29 Nov 2023 10:58: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 3ATAwPG0067429; Wed, 29 Nov 2023 10:58:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATAwPos067426; Wed, 29 Nov 2023 10:58:25 GMT (envelope-from git) Date: Wed, 29 Nov 2023 10:58:25 GMT Message-Id: <202311291058.3ATAwPos067426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 746b0f70a229 - stable/14 - vfs: dodge locking for lseek(fd, 0, SEEK_CUR) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 746b0f70a229586b28a2e74eb940cd8854f361e6 Auto-Submitted: auto-generated The branch stable/14 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=746b0f70a229586b28a2e74eb940cd8854f361e6 commit 746b0f70a229586b28a2e74eb940cd8854f361e6 Author: Mateusz Guzik AuthorDate: 2023-11-19 22:23:20 +0000 Commit: Mateusz Guzik CommitDate: 2023-11-29 10:58:16 +0000 vfs: dodge locking for lseek(fd, 0, SEEK_CUR) It is very common and according to dtrace while running poudriere almost all calls with SEEK_CUR pass 0. (cherry picked from commit 305a2676ae93fb50a623024d51039415521cb2da) --- sys/kern/vfs_vnops.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index f81516608eeb..4669296750e4 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -828,6 +828,13 @@ foffset_unlock(struct file *fp, off_t val, int flags) sleepq_broadcast(&fp->f_vnread_flags, SLEEPQ_SLEEP, 0, 0); sleepq_release(&fp->f_vnread_flags); } + +static off_t +foffset_read(struct file *fp) +{ + + return (atomic_load_long(&fp->f_offset)); +} #else off_t foffset_lock(struct file *fp, int flags) @@ -876,6 +883,13 @@ foffset_unlock(struct file *fp, off_t val, int flags) } mtx_unlock(mtxp); } + +static off_t +foffset_read(struct file *fp) +{ + + return (foffset_lock(fp, FOF_NOLOCK)); +} #endif void @@ -2647,8 +2661,19 @@ vn_seek(struct file *fp, off_t offset, int whence, struct thread *td) cred = td->td_ucred; vp = fp->f_vnode; - foffset = foffset_lock(fp, 0); noneg = (vp->v_type != VCHR); + /* + * Try to dodge locking for common case of querying the offset. + */ + if (whence == L_INCR && offset == 0) { + foffset = foffset_read(fp); + if (__predict_false(foffset < 0 && noneg)) { + return (EOVERFLOW); + } + td->td_uretoff.tdu_off = foffset; + return (0); + } + foffset = foffset_lock(fp, 0); error = 0; switch (whence) { case L_INCR: From nobody Wed Nov 29 13:36:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgL2w5MXRz52jtq for ; Wed, 29 Nov 2023 13:36:56 +0000 (UTC) (envelope-from bT.wtqgzz4f30=pfz97fk8457t=u8ed1yjih0@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 4SgL2v65bcz4Q7H for ; Wed, 29 Nov 2023 13:36:55 +0000 (UTC) (envelope-from bT.wtqgzz4f30=pfz97fk8457t=u8ed1yjih0@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=FyJozi8f; spf=pass (mx1.freebsd.org: domain of "bT.wtqgzz4f30=pfz97fk8457t=u8ed1yjih0@return.smtpservice.net" designates 103.2.140.190 as permitted sender) smtp.mailfrom="bT.wtqgzz4f30=pfz97fk8457t=u8ed1yjih0@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=1701265915; h=Feedback-ID: X-Smtpcorp-Track:To:Date:Subject:Message-Id:From:Reply-To:Sender: List-Unsubscribe; bh=zlLIqYpnhHovu+qKNws5CjLcgDKSXhPv0nMmU6xpUSU=; b=FyJozi8f Et6a0G5OGmMllI82IrEaE/uwmdp/FrWFdW/qRvnudB5sIvi1uIhG6riSvOciidGHblUvIQ7QCEiTQ 2aSGBbKZXhtrN3yZtM57RSSmao4vQO6GjlvGYxwjPuUSRciun7rWprUwr+pU+eDFMU9gAOBNg5xQE vTeH3kGKRcwfQioio35oMx1gQvs8uauQzLJdrHgVsIAHCssKTVnwX6IjMnAlYTqbIEmrnECflEois lUIVj5QmpudhAbf0QC1S+l4R/XNtgvRA4voA9QU1WPpvxTgrxNwbXWdAxPMR+lHTFdzhiu8GjFQfB fT23338Q652kZqfXdyJGfworNA==; 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(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.ZA5yay9tbb_tZ 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=pfz97fk8457t=u8ed1yjih0@return.smtpservice.net]; R_SPF_ALLOW(-0.20)[+ip4:103.2.140.0/22]; 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-all@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=pfz97fk8457t=u8ed1yjih0@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: 4SgL2v65bcz4Q7H 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:00:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgLYk5xTCz52lb5; Wed, 29 Nov 2023 14:00: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 4SgLYk5S59z4RnP; Wed, 29 Nov 2023 14:00:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701266410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8gDT5KILiR4aWT3s8SMfnUsWO0q7A7fHxtukfAIL8/E=; b=FKb0VLH4SNw3T9edD98GNtjGWX6cSRwxmE3SGjW2o+kIq2WpIPWxSRKN2nVWcPkbw7DvmT 79Cmh9AIVigA+4SHWLdmb1aKuvwgxfbnnI+SEqgpy+8ro0C7mMXFMfk7VB6YHx52HT1UiV OBKxROcSC949pqqaPt9pZycnw0PwWGJQASh6pxkhLZgzekEuPuCNgppLCHtrem3MTx2fxb DqySYHVZQljUHX+ZxInqd2pAwfgj8CV3jok4vataIFmkXmb85+1bw4cQPcjrtPfmzcuDKS vtDN85mr2nYpbJQcgZFHto1wv7TnqwYlyQBKoPsYy/zbeAgqifqwO/Yj6SDnQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701266410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8gDT5KILiR4aWT3s8SMfnUsWO0q7A7fHxtukfAIL8/E=; b=pgqo8rNYAUJCnHoKiiDEG/xr3FSHhCGk9+Z/E3pj/sRsWWwLn+LMwc1nn+Yz9x78f74YPD rdG3kwDWFcTndSuqnpwQvSddFB0t/1gMCdLpvwbTGhxVlgUwotXkVeaTVIhJCTg6XOb1o1 QdhtcZenAPtdR8WEQc1J829D2/w3kbPjL3MWdRgWETPvRaM74W2HaflZSTE+1P1Oddz66I tmnySVMCNCoSCTpn/RRoRmYRpUUSnYXLpClKAvKVHJf00OZ39HTvMwT6bEJspEb6TseSCM cgJJQw5u5tPiiqNzrcWER6cZcFgDH0jGxAOt9hlXnqQ8MHI23iorhRUFosOMeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701266410; a=rsa-sha256; cv=none; b=w+i9kM6OclwTegLHGpHN2alvdBwAzxiq9CNOM2qm9GhdvxPdzZj1PnMMdeQi2FrXq9XY87 1/TNxTl/AX9NpBCSnnrg85g+sWFvkV/A6fkkRO1RpFJHAnvsMudWTTdP0lpy0j/9D/Ykpq ljj1vfmm7AC5zhMVLLsduMVg6+JWPrwkIPtmQSbN/Vi3lDpTPTnm1KT2fmvx+0YYf9ByiH AHPMVnjrvnAPs9RlTDK9nNznBsg+DBLHd75d04M9luLz01ro5I+oH1/6CpUY83xwPZfLMz RD2An3TDHXtBJv/2DgrsvUmCxfqGTw5cTF9YHFZsRbIUW+oZIGMrqRdUjDvfHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgLYk4VZFz17Pt; Wed, 29 Nov 2023 14:00: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 3ATE0ArZ073611; Wed, 29 Nov 2023 14:00:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATE0A6n073599; Wed, 29 Nov 2023 14:00:10 GMT (envelope-from git) Date: Wed, 29 Nov 2023 14:00:10 GMT Message-Id: <202311291400.3ATE0A6n073599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: dadf64c5586e - stable/14 - ng_ipfw: allow use of 32 bits wide cookies List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dadf64c5586e5fa5e1018a3d8a02c9873b1121b8 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=dadf64c5586e5fa5e1018a3d8a02c9873b1121b8 commit dadf64c5586e5fa5e1018a3d8a02c9873b1121b8 Author: Eugene Grosbein AuthorDate: 2023-11-14 09:36:08 +0000 Commit: Eugene Grosbein CommitDate: 2023-11-29 13:59:20 +0000 ng_ipfw: allow use of 32 bits wide cookies There is no reason in truncating 32 bits cookie value to 16 bits. Reviewed by: glebius (cherry picked from commit 20e1f207cc789a28783344614d6d1d1c639c5797) --- sys/netgraph/ng_ipfw.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/netgraph/ng_ipfw.c b/sys/netgraph/ng_ipfw.c index b660a825c814..01592a4bbb7d 100644 --- a/sys/netgraph/ng_ipfw.c +++ b/sys/netgraph/ng_ipfw.c @@ -69,7 +69,7 @@ static ng_findhook_t ng_ipfw_findhook; static ng_rcvdata_t ng_ipfw_rcvdata; static ng_disconnect_t ng_ipfw_disconnect; -static hook_p ng_ipfw_findhook1(node_p, u_int16_t ); +static hook_p ng_ipfw_findhook1(node_p, uint32_t ); static int ng_ipfw_input(struct mbuf **, struct ip_fw_args *, bool); /* We have only one node */ @@ -94,7 +94,7 @@ MODULE_DEPEND(ng_ipfw, ipfw, 3, 3, 3); /* Information we store for each hook */ struct ng_ipfw_hook_priv { hook_p hook; - u_int16_t rulenum; + uint32_t cookie; }; typedef struct ng_ipfw_hook_priv *hpriv_p; @@ -152,7 +152,7 @@ static int ng_ipfw_newhook(node_p node, hook_p hook, const char *name) { hpriv_p hpriv; - u_int16_t rulenum; + uint32_t cookie; const char *cp; char *endptr; @@ -166,7 +166,7 @@ ng_ipfw_newhook(node_p node, hook_p hook, const char *name) return (EINVAL); /* Convert it to integer */ - rulenum = (u_int16_t)strtol(name, &endptr, 10); + cookie = (uint32_t)strtoul(name, &endptr, 10); if (*endptr != '\0') return (EINVAL); @@ -176,7 +176,7 @@ ng_ipfw_newhook(node_p node, hook_p hook, const char *name) return (ENOMEM); hpriv->hook = hook; - hpriv->rulenum = rulenum; + hpriv->cookie = cookie; NG_HOOK_SET_PRIVATE(hook, hpriv); @@ -198,10 +198,10 @@ ng_ipfw_connect(hook_p hook) static hook_p ng_ipfw_findhook(node_p node, const char *name) { - u_int16_t n; /* numeric representation of hook */ + uint32_t n; /* numeric representation of hook */ char *endptr; - n = (u_int16_t)strtol(name, &endptr, 10); + n = (uint32_t)strtoul(name, &endptr, 10); if (*endptr != '\0') return NULL; return ng_ipfw_findhook1(node, n); @@ -209,14 +209,14 @@ ng_ipfw_findhook(node_p node, const char *name) /* Look up hook by rule number */ static hook_p -ng_ipfw_findhook1(node_p node, u_int16_t rulenum) +ng_ipfw_findhook1(node_p node, uint32_t cookie) { hook_p hook; hpriv_p hpriv; LIST_FOREACH(hook, &node->nd_hooks, hk_hooks) { hpriv = NG_HOOK_PRIVATE(hook); - if (NG_HOOK_IS_VALID(hook) && (hpriv->rulenum == rulenum)) + if (NG_HOOK_IS_VALID(hook) && (hpriv->cookie == cookie)) return (hook); } From nobody Wed Nov 29 14:02:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgLcn5zg6z52llm; Wed, 29 Nov 2023 14:02: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 4SgLcn5QJKz4S97; Wed, 29 Nov 2023 14:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701266569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ygWHcW4Hz3hi4GzvjFYe1Al9cb6jp1XSIBigYMHi2zE=; b=U35svE7zGvqSgMODCVzpKW3WqwcLJaOXFZkv0V+QOV3icbwtsZ1479GVp2d9WP1LrCqkqx KiJz5RZ3GUz6WCzRaLIcGHdVEYzFxLaLM/3ouM+Mdw859nDDYBha13epjq0K/xMVjST2TG b18KHbbtvyu8rbIgXFU0cUbm/z+4QDBvaK1jHyDzXXS6vmZYFC2jLhR/X8qjzoRdfXl+kW NEDwg90Yy5uTip06N2eCVwVxuPG2GrLdA1DMIRgFaCimgxQpGFgrZ+J85R62/gTlIC9Gl4 vVs+Y6DJfZNuaKCkRCjkz47cKIK9BMZJUfzZtGVcqZS/Gf2j5ryXBcSK1oMQvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701266569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ygWHcW4Hz3hi4GzvjFYe1Al9cb6jp1XSIBigYMHi2zE=; b=EhG/lZ56hLrYV9xBQMleX//wYysrW2c2+ZiXNHTZrNkLLTEgRvr9QmKMOeQnTG0+jD4qgn ZezbAxuUDvTRJ2OCbTr4hwQV2Yap4PDo+idfwu2iyqonQGX0MieDFm/SL3zKFxsKrbQxhv /CSukwNnXg4+blhVfpVejZJwBJsWEXpyUDGVEgNZY0Kgo2xAFXlStCKo8P0X6EJfHiE7ki SgGwJ4+XvT+mg+WfZMmdKXHKo41yfEhhkE5v3LIm32cc+aMhMMZk2gEq6k353638Kijo7W U18Ec2wzY1Ss3AtFiOEoKT1jIuDvV2zwgusJPMR6BYcgE+rg9sB4T9DTZI0mUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701266569; a=rsa-sha256; cv=none; b=VyPdRsggSIdFxRLNPa3hQQRyFOjJsCOWN+HDl2x6MboPounV+JCVwbzsmeecuMnqpp0ZPP YK2QM8lrVSoAAazwTpIMuZYT67S1lugk6ySQ7OINoUfeCYxqTKhKH38EjQl0wm8KnURKPQ Lad8GM/My9bioEWE9cCUNuH5Ia8sqPMb93nULyjAxWJecE5O/YhDMOC9wA4quzah5qQZbF HUaYI/lOYbaHIFTeCwvrWWbJfUBzuxBhE9RIoGoFnhRrNcBFbdAjMXQ1etp7h9Lz5QQC5J VKCsEW4a9u8Y2PWj4M8wmq72qtRVEyTlRCYy1yZfSO0NHYA91Ul9F70dt/PE3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgLcn4StTz17fR; Wed, 29 Nov 2023 14:02: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 3ATE2ngD084594; Wed, 29 Nov 2023 14:02:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATE2nMf084591; Wed, 29 Nov 2023 14:02:49 GMT (envelope-from git) Date: Wed, 29 Nov 2023 14:02:49 GMT Message-Id: <202311291402.3ATE2nMf084591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 0b9242dea68c - stable/13 - ng_ipfw: allow use of 32 bits wide cookies List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0b9242dea68c44dc630921d3802f3f80f4d84b48 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=0b9242dea68c44dc630921d3802f3f80f4d84b48 commit 0b9242dea68c44dc630921d3802f3f80f4d84b48 Author: Eugene Grosbein AuthorDate: 2023-11-14 09:36:08 +0000 Commit: Eugene Grosbein CommitDate: 2023-11-29 14:01:35 +0000 ng_ipfw: allow use of 32 bits wide cookies There is no reason in truncating 32 bits cookie value to 16 bits. Reviewed by: glebius (cherry picked from commit 20e1f207cc789a28783344614d6d1d1c639c5797) --- sys/netgraph/ng_ipfw.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/netgraph/ng_ipfw.c b/sys/netgraph/ng_ipfw.c index b660a825c814..01592a4bbb7d 100644 --- a/sys/netgraph/ng_ipfw.c +++ b/sys/netgraph/ng_ipfw.c @@ -69,7 +69,7 @@ static ng_findhook_t ng_ipfw_findhook; static ng_rcvdata_t ng_ipfw_rcvdata; static ng_disconnect_t ng_ipfw_disconnect; -static hook_p ng_ipfw_findhook1(node_p, u_int16_t ); +static hook_p ng_ipfw_findhook1(node_p, uint32_t ); static int ng_ipfw_input(struct mbuf **, struct ip_fw_args *, bool); /* We have only one node */ @@ -94,7 +94,7 @@ MODULE_DEPEND(ng_ipfw, ipfw, 3, 3, 3); /* Information we store for each hook */ struct ng_ipfw_hook_priv { hook_p hook; - u_int16_t rulenum; + uint32_t cookie; }; typedef struct ng_ipfw_hook_priv *hpriv_p; @@ -152,7 +152,7 @@ static int ng_ipfw_newhook(node_p node, hook_p hook, const char *name) { hpriv_p hpriv; - u_int16_t rulenum; + uint32_t cookie; const char *cp; char *endptr; @@ -166,7 +166,7 @@ ng_ipfw_newhook(node_p node, hook_p hook, const char *name) return (EINVAL); /* Convert it to integer */ - rulenum = (u_int16_t)strtol(name, &endptr, 10); + cookie = (uint32_t)strtoul(name, &endptr, 10); if (*endptr != '\0') return (EINVAL); @@ -176,7 +176,7 @@ ng_ipfw_newhook(node_p node, hook_p hook, const char *name) return (ENOMEM); hpriv->hook = hook; - hpriv->rulenum = rulenum; + hpriv->cookie = cookie; NG_HOOK_SET_PRIVATE(hook, hpriv); @@ -198,10 +198,10 @@ ng_ipfw_connect(hook_p hook) static hook_p ng_ipfw_findhook(node_p node, const char *name) { - u_int16_t n; /* numeric representation of hook */ + uint32_t n; /* numeric representation of hook */ char *endptr; - n = (u_int16_t)strtol(name, &endptr, 10); + n = (uint32_t)strtoul(name, &endptr, 10); if (*endptr != '\0') return NULL; return ng_ipfw_findhook1(node, n); @@ -209,14 +209,14 @@ ng_ipfw_findhook(node_p node, const char *name) /* Look up hook by rule number */ static hook_p -ng_ipfw_findhook1(node_p node, u_int16_t rulenum) +ng_ipfw_findhook1(node_p node, uint32_t cookie) { hook_p hook; hpriv_p hpriv; LIST_FOREACH(hook, &node->nd_hooks, hk_hooks) { hpriv = NG_HOOK_PRIVATE(hook); - if (NG_HOOK_IS_VALID(hook) && (hpriv->rulenum == rulenum)) + if (NG_HOOK_IS_VALID(hook) && (hpriv->cookie == cookie)) return (hook); } From nobody Wed Nov 29 14:23:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgM4B4tSBz52mbK; Wed, 29 Nov 2023 14:23: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 4SgM4B4M4mz4VGM; Wed, 29 Nov 2023 14:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701267786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0gwmiKuwbVu1mYASsnCLezDomfIcnX4kkadcvZY5vgw=; b=QC6M7CEHQ0hGy2cZ/8XMoz7Iv0A0ny/nje60k3Esrutyt4RlC+s1XS9o4K0IYyJpwph72E pLoy0cFPgdK+cDxI4yxl5/dBtbWHDztDdJ+OSuQ50LxF7tpmGv8LNB7onv77XDHwuTv85s hchMjQCo5Ht4W6FFHV670yJUntT7PTwHdnTOPl7teLFjo3VUT19y50Tl11m03ABTy1e0Z5 Lh3/9ufZYrhe5ju0J0Dj2C/nOLSq/WmlC9xnS6/9tlZ+fmiqVb8uNYT2PyoDHw2aJRqcnT XE1niGp7/UwWl0aSL/F30WFcpF8PiL/E0jN7GvNt1bgDKSkx56gyC4yiMOIKKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701267786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0gwmiKuwbVu1mYASsnCLezDomfIcnX4kkadcvZY5vgw=; b=c38GVQH3q8gDOYRZ5W8ODwhJd/DDwBbKXAMBkRm+XL0Fdd8j3zeh2lF1Mvzf/NuMJhGwPv FdgQcxQ1HPrbu7DecU7yep0Zkb1HZkLJbuHSUBkuhYsL0y+SyqsQ8gIqGvAxbmgGkUMi9s h6X5gucEg06W1nLVDyU0tBfZmnd79PvmmBPuQVQfNbK3Ngqa3nBH9GM0r97vTLKiYzDjG2 A089S9aJwHFzA8rphyCeqi5Gbd9NaezKPM4I683d2gGonrd3eaiDXir4ENNn1vJwXFr57I K/sOSeRRE+XKyflqW8zanN+VQG4fC75IPGp8EKZb9Ei3GIwDMNbYTGS980iebg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701267786; a=rsa-sha256; cv=none; b=hbFcT8rbcqtl59w4KKc4dHDGq0mR0vJymA9EU+ItyJMW0lwa3C3ccl0R2asG8DDo6Mof+W 16dXHFo8O7WtccM9yl14ijTHHOebDksC/GG2RDz024+zwpmI0a46aPKiRLef6+Enkw05Oq CDVQu52A/YaTj+boqp8abfWYcNw57v9TSezZBELN6dZeFD9tKa/hSbWxHfqTnMfPosHR8J St74H5ikaMchevDUmd8U3kGVSouub0OJ7cqR78aoZqtKWvncnIMd6S3bV8Sfv2cMcK/Knd AvUjRYuOF8dwjaPXmlMiofR45v1BOZ6EBc2gjm7fy1jrLSNLiTNJeduw1VfNCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgM4B3Qbnz17yS; Wed, 29 Nov 2023 14:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATEN6Xv025841; Wed, 29 Nov 2023 14:23:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATEN6lZ025833; Wed, 29 Nov 2023 14:23:06 GMT (envelope-from git) Date: Wed, 29 Nov 2023 14:23:06 GMT Message-Id: <202311291423.3ATEN6lZ025833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 7342935fb3d6 - stable/12 - ng_ipfw: allow use of 32 bits wide cookies List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 7342935fb3d6ce2b7bc65ee9baefc89eaf5d65b3 Auto-Submitted: auto-generated The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=7342935fb3d6ce2b7bc65ee9baefc89eaf5d65b3 commit 7342935fb3d6ce2b7bc65ee9baefc89eaf5d65b3 Author: Eugene Grosbein AuthorDate: 2023-11-14 09:36:08 +0000 Commit: Eugene Grosbein CommitDate: 2023-11-29 14:22:38 +0000 ng_ipfw: allow use of 32 bits wide cookies There is no reason in truncating 32 bits cookie value to 16 bits. Reviewed by: glebius (cherry picked from commit 20e1f207cc789a28783344614d6d1d1c639c5797) --- sys/netgraph/ng_ipfw.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/netgraph/ng_ipfw.c b/sys/netgraph/ng_ipfw.c index 63de133b9495..23c199fe2ccb 100644 --- a/sys/netgraph/ng_ipfw.c +++ b/sys/netgraph/ng_ipfw.c @@ -71,7 +71,7 @@ static ng_findhook_t ng_ipfw_findhook; static ng_rcvdata_t ng_ipfw_rcvdata; static ng_disconnect_t ng_ipfw_disconnect; -static hook_p ng_ipfw_findhook1(node_p, u_int16_t ); +static hook_p ng_ipfw_findhook1(node_p, uint32_t ); static int ng_ipfw_input(struct mbuf **, int, struct ip_fw_args *, int); @@ -97,7 +97,7 @@ MODULE_DEPEND(ng_ipfw, ipfw, 3, 3, 3); /* Information we store for each hook */ struct ng_ipfw_hook_priv { hook_p hook; - u_int16_t rulenum; + uint32_t cookie; }; typedef struct ng_ipfw_hook_priv *hpriv_p; @@ -155,7 +155,7 @@ static int ng_ipfw_newhook(node_p node, hook_p hook, const char *name) { hpriv_p hpriv; - u_int16_t rulenum; + uint32_t cookie; const char *cp; char *endptr; @@ -169,7 +169,7 @@ ng_ipfw_newhook(node_p node, hook_p hook, const char *name) return (EINVAL); /* Convert it to integer */ - rulenum = (u_int16_t)strtol(name, &endptr, 10); + cookie = (uint32_t)strtoul(name, &endptr, 10); if (*endptr != '\0') return (EINVAL); @@ -179,7 +179,7 @@ ng_ipfw_newhook(node_p node, hook_p hook, const char *name) return (ENOMEM); hpriv->hook = hook; - hpriv->rulenum = rulenum; + hpriv->cookie = cookie; NG_HOOK_SET_PRIVATE(hook, hpriv); @@ -201,10 +201,10 @@ ng_ipfw_connect(hook_p hook) static hook_p ng_ipfw_findhook(node_p node, const char *name) { - u_int16_t n; /* numeric representation of hook */ + uint32_t n; /* numeric representation of hook */ char *endptr; - n = (u_int16_t)strtol(name, &endptr, 10); + n = (uint32_t)strtoul(name, &endptr, 10); if (*endptr != '\0') return NULL; return ng_ipfw_findhook1(node, n); @@ -212,14 +212,14 @@ ng_ipfw_findhook(node_p node, const char *name) /* Look up hook by rule number */ static hook_p -ng_ipfw_findhook1(node_p node, u_int16_t rulenum) +ng_ipfw_findhook1(node_p node, uint32_t cookie) { hook_p hook; hpriv_p hpriv; LIST_FOREACH(hook, &node->nd_hooks, hk_hooks) { hpriv = NG_HOOK_PRIVATE(hook); - if (NG_HOOK_IS_VALID(hook) && (hpriv->rulenum == rulenum)) + if (NG_HOOK_IS_VALID(hook) && (hpriv->cookie == cookie)) return (hook); } From nobody Wed Nov 29 14:51:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgN860QVcz52qY6 for ; Wed, 29 Nov 2023 15:11:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) (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 4SgN845RKpz4YxN for ; Wed, 29 Nov 2023 15:11:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-54b8276361cso3988093a12.0 for ; Wed, 29 Nov 2023 07:11:32 -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=w5DdJFMkWiqnThRA9tyi9BPlVLhfzAA1Fvh6Ishi4pM7XpaIO/VoEgoXOFIBCP7Qum CrrZtzn5X4+ZGuSAT3F7Irp6wAhqhbF1kAIcf9UK4Rzr8l8Gw8V4tO7hKCOhbjqwnY/5 ynirmuWT/CUZziU3jg4ROnGB0YTQSdzvE+rybfT2OFJ3Fu7AI1nYQ/TXLRrOvH617qQg WGH8Yny3kTCEvp211CpWtUr9kyNGOnrpx//211cOyiTbJIhrcIYNVA8gjVagN4ZB1SOh d3r0YPNdRC45X7r0HLXUybG83/3RnRxkiN4xYtkjJB/D2eVSZvaLkULrrCDkAMZM9B/j 4eyw== X-Gm-Message-State: AOJu0Yzsxhb00T6VP93F+9EyKSF8uWv7r/JCfe7hqoNde4TrqN2JcSRt 28dxyREa7JMMmDjTMHQwN6ryxjBYG7wc2UF2BkyMDw== 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <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: 4SgN845RKpz4YxN --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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <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 16:37:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3Z4Y9nz52wpd; Wed, 29 Nov 2023 16:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ3Z3bbjz3Ft6; Wed, 29 Nov 2023 16:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h1cK4vSVF1CLBF+EfN6nox/igSlH1edOoJIKEPskS34=; b=UmK79R6xhBwXdC09Q79SAtY8xnoGx9kwFCmYXiN1YWQ5loHo6uzKWRW6AQ3Qq33acYEXqX UyGGqPIsgnzgs7DqQxpNoiLhypgOMiICVFhgvjEOMS+sJx03u5lGAPS8YQum4oVI8w5Tx2 PBnukOg3xTy6fs7yJ4RtJaBuj2WRF+15ZkXJPeHZ4uJK0Mo7rReYMHAV69FjLG5CDhlbdT QHgJAh1GJinqS3SWReq7vst7TczZbICfOPW0xvbJCiO2u63Tm8vl/ZaE1dCO1HqrNGhY7T m3XFTNi62cZrSZxFPlM5+GTE5oRb2iIff3kBJI8LVDu9OXSOjFSbF5BjJO9PsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h1cK4vSVF1CLBF+EfN6nox/igSlH1edOoJIKEPskS34=; b=po0UjNsDMkxfxPSYyYIqkV+ysER27D7GN3CubyvKn8GDn+J7TJ7kRnAqTs9Gr5P9Z+ZvoX KZrHw9kjurF9T0+HK7LCIBn3+Q66qrQuodhHZ3tuUyoEnbFPP/KVwNup75yCyLrz0rbcf0 wkBhkYzTDHo06v9WMImpZtSciOzKJAZkZ936CX1SOSjV398kVYXRWFCkxt5ZpdiM9J8N0k hA+DHFrq4kzTnr0Tn9RaLbG23gun+OchPY0R5kwEs1B4DHzJ1AP6ySosKHLRjLqDCgkE0/ blGI5EqC36IHKI7BKUDCfjxyQkYjoWOqlFo3GrpLbBkMQJEDQqasfcR05seOfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275866; a=rsa-sha256; cv=none; b=On92Jdx2PF8i8HurKlrCR3CNNeCUP35O4b/dXeEn+fujnTp8ZB2M298qyuOrXsRpkjvY4p rylLD0mf8SahMUbdaSbAK/+tQoseDjDla6Vrr5CegnRBu8L4QqVQ8az2004SCeJONw49Gc mrRw/7d/j1kuI/XDf7hjtUwDoiu8ME7+weVrlZ5JdFcbAmxZqKkXmvFtyP+n2wNSMJPeps rtK0IbBtJ4DAH3zROavNn/i80bfnu1RnoApd9nOjq1oFQKDz576SkiAiqbG9GHOEZ/5fA6 E02xBie3N+Wm8dGVFwoyhMUYwfjs4MaK74vhu7/FURnTvUVuM68RlxGdGzjqJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3Z2XgBz1CXd; Wed, 29 Nov 2023 16:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGbkl9044102; Wed, 29 Nov 2023 16:37:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGbkYs044099; Wed, 29 Nov 2023 16:37:46 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:46 GMT Message-Id: <202311291637.3ATGbkYs044099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: d9a05ea7af9f - stable/13 - tools/wlanstats: fix -Wunused-but-set-variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d9a05ea7af9fdd122fcf3c663e12740f61db7534 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d9a05ea7af9fdd122fcf3c663e12740f61db7534 commit d9a05ea7af9fdd122fcf3c663e12740f61db7534 Author: Bjoern A. Zeeb AuthorDate: 2023-09-11 14:11:52 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:02 +0000 tools/wlanstats: fix -Wunused-but-set-variable The "allnodes" code is currently #if 0 so also #if 0 the setting of the command line option and variable in order to keep wlanstats compiling. Sponsored by: The FreeBSD Foundation (cherry picked from commit 530c13c5401c1f29f8325cf851d96778852a1ba3) --- tools/tools/net80211/wlanstats/main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/tools/net80211/wlanstats/main.c b/tools/tools/net80211/wlanstats/main.c index 4c0cf4db0505..ac100a70622e 100644 --- a/tools/tools/net80211/wlanstats/main.c +++ b/tools/tools/net80211/wlanstats/main.c @@ -168,18 +168,26 @@ main(int argc, char *argv[]) struct ether_addr *ea; const uint8_t *mac = NULL; const char *ifname; +#if 0 int allnodes = 0; +#endif int c, mode; ifname = getenv("WLAN"); if (ifname == NULL) ifname = "wlan0"; wf = wlanstats_new(ifname, getfmt("default")); +#if 0 while ((c = getopt(argc, argv, "ahi:lm:o:")) != -1) { +#else + while ((c = getopt(argc, argv, "hi:lm:o:")) != -1) { +#endif switch (c) { +#if 0 case 'a': allnodes++; break; +#endif case 'h': usage(); exit(0); From nobody Wed Nov 29 16:37:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3b5G9Kz52wpj; Wed, 29 Nov 2023 16:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ3b4LkNz3G6V; Wed, 29 Nov 2023 16:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LrUrOBS/C9xjMM1EfHVCICz6xsQ+OSKVHBU6iaXJh0w=; b=uUb5UtxrbtMuZSH0EG85gs6EOuF9rLl5KqZHqSHohvy4nIxGnsIl/lpLVBDeEAf+JwQelY rv56i0gBsPdfp0r7+pbxFuLP95tGhoDnOVq6ZiLcJS4PsgIiqvxauajWAK7tJ7Ih/ud9nZ aqcqg6LTNkWQJX3ifTt/vYmebCrigAw0aXCU3Ht9M9hWc79G4lLsKDRkXmynlOrLVa7tdM diL5NdMbDPqJDBd2DZHm4K+CW8EIaJX+xnA9PL36XjqWLV8MfotZjzlPwUweNQNZ0YdBs/ N2LnWl2cu44NzsfngbWC3KW25tXADf8MiLdYJzLgeix/81NQ0/U8THSgEqV97A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LrUrOBS/C9xjMM1EfHVCICz6xsQ+OSKVHBU6iaXJh0w=; b=SQCAQnx90MNKB6AA0LJV/pP5ILJPBb5y5DScvYqrPW3HnUpC+qUmBBrQ9Q7V2/UYe5Udqq ZZzGKAagsKIb//FXzGJLaIZsfDKLpsPDDQM/bD4LKTSh3gfgIkQbk+aeKQfv7xkWoNmAwn 2CTURLSr1yvbEVW6v/thkqWNsquCVrtwvQ4XEqyVbcdfKMLVCknrnWl+m6vxru7s5QUxut 7SXsr3D8999CfzaDRLCSQvxroIE/SKD6OQwVDN91iAG9kAxJ6M5HeB74bAscAbiR4W2X2A tFtC1AjTONM3XilNMZ7sp8tm4Pz87SqTS5wXRCY9St6FXaPXVFYfXPAtJpMIfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275867; a=rsa-sha256; cv=none; b=c8NbMs0K6TFTNG/wmvmCypZaatbFqF+lejHvSsEAAZLmWMjPjitVJ2gkROQMCNxlj7z9dI HiigEaK9OrvGqV5YZ92YVOO+TGAuCGGoIyVZYdwVKquM0isbRZB0z0eI5RS5vGBo3Cdrye uJY+GYSiUhSiqLOr04rCi/dn+gYTpP7eiiCbk90qI0tpO/3gHIqT8+R616M1b1HF/uh38M 3cLWJd17s2t/w43lE7znG3v6Kt3PCnEIpi9nv7Qi9AUtwGjLgvmOAyRWd/aY4GRo5N0JH3 Oq7OJQNP4ZNdmDtYXVa3K0EFeKBd150FaR5tzxonABqIkVuXXaMYekgfjzTLyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3b3JFWz1CZv; Wed, 29 Nov 2023 16:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGbllH044150; Wed, 29 Nov 2023 16:37:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGblma044147; Wed, 29 Nov 2023 16:37:47 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:47 GMT Message-Id: <202311291637.3ATGblma044147@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: e53573cb3987 - stable/13 - net80211: improve error handling from ieee80211_parse_beacon() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e53573cb3987f7841c81f7222559369efee59cae Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e53573cb3987f7841c81f7222559369efee59cae commit e53573cb3987f7841c81f7222559369efee59cae Author: Bjoern A. Zeeb AuthorDate: 2022-04-07 20:50:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:03 +0000 net80211: improve error handling from ieee80211_parse_beacon() Following up on fb8c87b4f3bfdfac014f9d894fe75fbad0391b24, which was supposed to go into all supported branches, increase ieee80211_scanparams status field from 8bit to 32bit (enum size) and add a dedicated error code for Mesh ID. Sponsored by: The FreeBSD Foundation (cherry picked from commit 7354782698f1cf5d6b368a9b1e65cfe3ee7f235c) --- sys/net80211/ieee80211_input.c | 2 +- sys/net80211/ieee80211_scan.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 4b17ab1188ef..492a3038c971 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -743,7 +743,7 @@ ieee80211_parse_beacon(struct ieee80211_node *ni, struct mbuf *m, #ifdef IEEE80211_SUPPORT_MESH if (scan->meshid != NULL) { IEEE80211_VERIFY_ELEMENT(scan->meshid, IEEE80211_MESHID_LEN, - scan->status |= IEEE80211_BPARSE_RATES_INVALID); + scan->status |= IEEE80211_BPARSE_MESHID_INVALID); } #endif /* diff --git a/sys/net80211/ieee80211_scan.h b/sys/net80211/ieee80211_scan.h index c140ac615979..4274f3948db6 100644 --- a/sys/net80211/ieee80211_scan.h +++ b/sys/net80211/ieee80211_scan.h @@ -210,6 +210,7 @@ enum { IEEE80211_BPARSE_OFFCHAN = 0x20, /* DSPARMS chan != curchan */ IEEE80211_BPARSE_BINTVAL_INVALID= 0x40, /* invalid beacon interval */ IEEE80211_BPARSE_CSA_INVALID = 0x80, /* invalid CSA ie */ + IEEE80211_BPARSE_MESHID_INVALID = 0x100, /* invalid Mesh ID ie */ }; /* @@ -220,7 +221,7 @@ enum { * All multi-byte values must be in host byte order. */ struct ieee80211_scanparams { - uint8_t status; /* bitmask of IEEE80211_BPARSE_* */ + uint32_t status; /* bitmask of IEEE80211_BPARSE_* */ uint8_t chan; /* channel # from FH/DSPARMS */ uint8_t bchan; /* curchan's channel # */ uint8_t fhindex; From nobody Wed Nov 29 16:37:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3c6QxBz52wST; Wed, 29 Nov 2023 16:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ3c4Vp5z3G1w; Wed, 29 Nov 2023 16:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T46rl1w4raKyeTsTnwB7KGFH3DmXl20AXnySsFGZCL4=; b=kuy77q68J+PVa8BN5MauSd2LYN6Efp0VqmC5zxc2kXQBv4FJsRBPGLuMoli4e7HD0WIZHe R6OnxpYcHnlRMoaRIywdikkzc7SzEouXPKtIyKuT6upnAtd97ZSGiaQQOu3eK6TbM1Ny/D 5W6gZC8rPqnUsPxLtYLQqBLRcWuby41sd7FUDdorWj3UnhALcfqdfyF+3i9ACCnblSFQZA gB682UFZwN0cUtvMsRUZzG8hKT9cpRP5wlcQ7wwTKQNJyf2QB6wE1mQd6rC3YXWQaavodD f6pzF6FziioT5aoIwLyZgKCGy2yXqA0uhe9e3eV3c6Jr//h+3AnwcdMo8av5tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T46rl1w4raKyeTsTnwB7KGFH3DmXl20AXnySsFGZCL4=; b=TSxhssF83DpLTZQnTsarBxowKMPsG5AW2wBpgTmsK96PYS197q7zxbsH0OW977Ew/uHL3u xV2iO4nh9hfeZPTqU0JoRBEEgfgcl0e/P/RqiZZXSM99IDJdjzPLNmzahJckzKI+u03O2B lYw1wtfgBqPfqHDz1dz4K2vtGpQYp00fY+I6wGYsLmHMTlFmIbV9DcU+8bsYXZNPWNucZi ZkXSQ9/j394prjiGGpJANK8Vz5+qeMj3LI12JsoYSTMHeNHp7Kq72+/3E0TKj74uH2hJKY 5bTUyX21ppvANtdc1rLhVe/Tf0OMH9pvhymV6iRaAblMHohHaeM6/ecaKFe6Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275868; a=rsa-sha256; cv=none; b=QDZH5p93bKWJJ47Ef/ELk/TWnUFfj5OCmntuZnsaZuMiM8s3pduqE7BBo1uvNx5Yw/p7aB Yv8lNubtNECmtDxeSEE8pYkF/Y9O1m58mjUIIsAORW4mYG+pFj66LQ9qn1rnTrOMkJqPvb vHCOq9glhE5KWc7WOWxOurbxaxFML8K4DTr6KBknZKVHeP/233lCd+6KD2bWJCRTonxzUE 3jWEpmxYqClIr80T7kDbUK/WnEQwB3tuxaatja41pAW58K+41NDq+PDQeWrMunQOYb5JQV Ay6iJ15Jt7AdJJoQ7QmtZTyCC/KSYQwV6n5xVdpDX0zLk/QQ7AbkZJ1bjhp5nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3c3cfkz1Bgy; Wed, 29 Nov 2023 16:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGbmH2044195; Wed, 29 Nov 2023 16:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGbmkM044192; Wed, 29 Nov 2023 16:37:48 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:48 GMT Message-Id: <202311291637.3ATGbmkM044192@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a55a8bfe5d13 - stable/13 - LinuxKPI: add DMA_MAPPING_ERROR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a55a8bfe5d13108c806759a8a85bcb9add610848 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a55a8bfe5d13108c806759a8a85bcb9add610848 commit a55a8bfe5d13108c806759a8a85bcb9add610848 Author: Bjoern A. Zeeb AuthorDate: 2022-09-23 22:13:19 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:03 +0000 LinuxKPI: add DMA_MAPPING_ERROR While we deal with 0 returned, some drivers directly use and check for DMA_MAPPING_ERROR. Add the case and check for both in dma_mapping_error(). (cherry picked from commit 0b9bc97342f98a911985ace5527aef97863dfd23) --- sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 7b12e927addf..3b98e03ad6a4 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -286,11 +286,15 @@ dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle, { } +#define DMA_MAPPING_ERROR (~(dma_addr_t)0) + static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { - return (dma_addr == 0); + if (dma_addr == 0 || dma_addr == DMA_MAPPING_ERROR) + return (-ENOMEM); + return (0); } static inline unsigned int dma_set_max_seg_size(struct device *dev, From nobody Wed Nov 29 16:37:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3f0Y5Lz52wwV; Wed, 29 Nov 2023 16:37: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 4SgQ3d5TtPz3GG1; Wed, 29 Nov 2023 16:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m0jd93ILcAyO/pUvO+wD5cFtzuYPNJUFwYd+gtDju40=; b=qLbwJJUVZ2dWscPIV/9cxhi5LUrfKfI/3Ggx8C0aTdHSIRQAoA4myvrYK0fzuM0aG4S/zI jpbWWzDYWO9TVmS0onX7+UTAUzDqdA98AR6zjcSCTl3s8CVl6DMdSkYKUYuQfX3AiMbb/A NIcQOohgvfrl8k4Pauu7gb6H4B9xPGKETd7J9IVM3gwPqQlJc6MkNBeJcCGnOcgXBbjzO4 rns4y7M9MGHNwByWgKQpuER6IQyY4zm2Z9X960AB/Gc+VTVXzjiFyZS9YmYN0WvA0BOp2X xAx3dPJ5n9BQwgHnQZ1QI2MbYVZ8/IL6szRGw5Ih9E0UI1S4fA4iOVkG5AbtRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m0jd93ILcAyO/pUvO+wD5cFtzuYPNJUFwYd+gtDju40=; b=yINq8omqE77C4DhgzmDRonNBIzq8nXlYnxkPgcvPqvoqGDXq2ngnPONEydvx2IHzW1AxO3 RdAoetHL4QPHEB9kNW7OsiKbVPiDUOBrb6c5mtA6Ulmo3MklSanwB9vFYG6hgEzJcSGkyb ClhUDYk5peawpHe3LbKk1WVyOGf3dY8hL54+CtAmIlMKUJKHBIXmgD+LRnWVLWR4kCtkY7 yfFa9UhxvxWoNyL2u6dqtJ3AgvG/O6KmCWrzKaKlBiDk9jNVsXB5XTEgmrpbVv/yzuwpVd SPVgdPkIwzBmorgQdfd8ViNE8rolUeMmQLEZ+Rkb/EORJBVIpNv8H4dPUOu5KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275869; a=rsa-sha256; cv=none; b=b9c459fVPDOs/8+4fxpGztkXetkdZhPLBjY23eLLxSyA5p/FCGX0rFFdNUAcJSWrJx2IDP mDKpLb05WLjA0o2vcvugW6b7EfjjEQuIylh+VgvZIiBWMvszDeJar0w8fqT9ty7JTqQCIh F2S7pjSeKKmJBmXGs4UndIUIKS7XxKoZDvzVCC0v2uus36POB96KNnFmFV/F12r9kRY8IR iMf4oWxQIDt2ZAU8G6/cxdg+v/1i4V+jEnVsI9o8FDk51C9jMrRDCn/dSnyhIL1ezuqiKh t9SgdB49FL68rTEBvqrlocz1DSFHiEnpr5DVs2hDJWY18riOTcQRk9Yvf3wwTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3d4bg7z1Bwf; Wed, 29 Nov 2023 16:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGbnRU044246; Wed, 29 Nov 2023 16:37:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGbnfg044243; Wed, 29 Nov 2023 16:37:49 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:49 GMT Message-Id: <202311291637.3ATGbnfg044243@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 62abea27d700 - stable/13 - net80211: ieee80211_swscan_bg_scan() track return variable under lock List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 62abea27d7006bd1caaf25faef713c61047fa9be Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=62abea27d7006bd1caaf25faef713c61047fa9be commit 62abea27d7006bd1caaf25faef713c61047fa9be Author: Bjoern A. Zeeb AuthorDate: 2023-02-18 01:15:21 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:03 +0000 net80211: ieee80211_swscan_bg_scan() track return variable under lock As the comment says it probably does not matter but use a local variable to track state under lock so we can return the last known good state of what we thought we were operating under after unlocking. Likely no functional changes. Sponsored by: The FreeBSD Foundation (cherry picked from commit c9ba91435a01a80632a5b68144d75b38241fc8be) --- sys/net80211/ieee80211_scan_sw.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_scan_sw.c b/sys/net80211/ieee80211_scan_sw.c index af90a72d4adb..3a29a784f36b 100644 --- a/sys/net80211/ieee80211_scan_sw.c +++ b/sys/net80211/ieee80211_scan_sw.c @@ -332,12 +332,14 @@ ieee80211_swscan_bg_scan(const struct ieee80211_scanner *scan, { struct ieee80211com *ic = vap->iv_ic; struct ieee80211_scan_state *ss = ic->ic_scan; + bool scanning; /* XXX assert unlocked? */ // IEEE80211_UNLOCK_ASSERT(ic); IEEE80211_LOCK(ic); - if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) { + scanning = ic->ic_flags & IEEE80211_F_SCAN; + if (!scanning) { u_int duration; /* * Go off-channel for a fixed interval that is large @@ -401,6 +403,7 @@ ieee80211_swscan_bg_scan(const struct ieee80211_scanner *scan, ic->ic_flags_ext |= IEEE80211_FEXT_BGSCAN; ieee80211_runtask(ic, &SCAN_PRIVATE(ss)->ss_scan_start); + scanning = true; } else { /* XXX msg+stat */ } @@ -411,8 +414,7 @@ ieee80211_swscan_bg_scan(const struct ieee80211_scanner *scan, } IEEE80211_UNLOCK(ic); - /* NB: racey, does it matter? */ - return (ic->ic_flags & IEEE80211_F_SCAN); + return (scanning); } /* From nobody Wed Nov 29 16:37:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3g0Tr8z52wWt; Wed, 29 Nov 2023 16:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ3f6QQBz3G2x; Wed, 29 Nov 2023 16:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jwy4GPLvXNL8KebU5J6Wj2+3iIyaca0CqKJcPsjaGR8=; b=OZuH7cWZbnvYiHsGB0tqlwN5uMJQBF4CtAq4I1MTKa72akJf7cuGSw/Ac5PDBolta9K8fS eRQV27eNfQ67i0odi/8w73b9mC/Xtv6kw5hwjDOQmc6zDoWSNrDsiep+kSixjLq2ZsPV7r SqKe6EfvGtQ0PUqs86/YgYz6aP0NPM/jeZaf6yD/1AjeCyWt2NRPKs1jHFnu5j6usWWOPV ZIGWRJq4Ifel2yvCFMyBY/f7TyDyiEpNqjce2K+17xjuPc7FsGwU0F9zsrTl+Hd2QuFp5L RBF/WeRfBs8nDNZgPh4qUe2x4i1UcJmmZHNeFRrTURgrDYfySDRl13XlyspcrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jwy4GPLvXNL8KebU5J6Wj2+3iIyaca0CqKJcPsjaGR8=; b=u+5Mcn7WfGGB83dwkcUX781D8xZuetq/pkZmnSi1PuNU32A3zjnJV+U+YSG6jRJRua7w6r 6HzAjqKWCnxrd6nTSuTh0TmvlkLmm/7bzmfeT4Ql/NvMxrBYqUmjwGb152t86Ydx7BfpPD bndFpMBIXCNMUxtY7Ei1ElDGpHalBOE6oigtXJ9W0As4H/hENivX1W8shXVW2J5evU+4et P+HiD7gX+OysQQdtEXNVSN2eCloXbqTIIj1y7JHJ/1CdrmtlOaeBPL+SIs6xhS8vLN2AAY d9nkU42ab62EJNt5y6Hs4yObflXFvvKmUjMLq1MntVd7KDAiK71HhdFP5mudDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275870; a=rsa-sha256; cv=none; b=Oh+mWlYFb69MDcW9m8NARb4XgRPoRkQhFhw2zeEKV/gs3cPhdFlIOCHhRQ6x2xRK5KJ4lg YESHooLL++xEdSygw++UZ7uU96VqiKidPAnLHjDG/WzMTJS7azBSOz3dNyDpk4Gu2sWnFK ezyz7TtmyD8i12VBrCMCgNJfKqiT5C4g/Rn8jA6y/z67ET+NtOt8pEJGMHRV684/+axeFO 4paKy67VhPyseMqCY0isDnS3BkqB1gTZ9kOWbxaRqlEiHqnvC2FgECZvZhnZ1oppSPom5T V74NqzVE/hxboH7jT5A1X64YkM0ev/gQnJHqokRtO7EsD83JZbvrRwrgVTxH/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 4SgQ3f5RpYz1Bwg; Wed, 29 Nov 2023 16:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGboQi044289; Wed, 29 Nov 2023 16:37:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGbos9044286; Wed, 29 Nov 2023 16:37:50 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:50 GMT Message-Id: <202311291637.3ATGbos9044286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 47fb8095f8a8 - stable/13 - LinuxKPI: cast jiffies_to_msecs() result List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 47fb8095f8a840e5cb38e5431d3b128f61b5db40 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=47fb8095f8a840e5cb38e5431d3b128f61b5db40 commit 47fb8095f8a840e5cb38e5431d3b128f61b5db40 Author: Bjoern A. Zeeb AuthorDate: 2023-06-10 22:57:27 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:03 +0000 LinuxKPI: cast jiffies_to_msecs() result jiffies_to_msecs() is expected to return an uint_t. In order to avoid changing printf format strings, properly cast the result to the expected type. Sponsored by: The FreeBSD Foundation (cherry picked from commit 08bc2cc4c4d8e94ad1db63f97d923dee18bee668) --- sys/compat/linuxkpi/common/include/linux/jiffies.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/jiffies.h b/sys/compat/linuxkpi/common/include/linux/jiffies.h index d86e5226420d..d5cb6e14860e 100644 --- a/sys/compat/linuxkpi/common/include/linux/jiffies.h +++ b/sys/compat/linuxkpi/common/include/linux/jiffies.h @@ -38,7 +38,7 @@ #define jiffies ticks #define jiffies_64 ticks -#define jiffies_to_msecs(x) (((int64_t)(int)(x)) * 1000 / hz) +#define jiffies_to_msecs(x) ((unsigned int)(((int64_t)(int)(x)) * 1000 / hz)) #define MAX_JIFFY_OFFSET ((INT_MAX >> 1) - 1) From nobody Wed Nov 29 16:37:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3h0tSnz52wcY; Wed, 29 Nov 2023 16:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ3h0Fl2z3GB7; Wed, 29 Nov 2023 16:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4UdXWmZv4G5kuWMBwKKcMP0iyC2MpxMsBhSl0cy0oQY=; b=i9cGQDCvFZM83n3mYMnssZUD8KYKbE6H/hjGoOMlVrOspzObBqES5UHdC5fPSD1EUw72J6 c1POr3DYm9CU/tRVhy3bo6bh4SRs6IDjItWzNqdgvAZ33tJjnpYr0psRWC9uLC+RGE4aRF Rt6drCSuBrH67AJ6yIRbUfZ9aGO4AF1E2D7erhLLCbpidal1MuKuat5fa8IgQXPZ7v5tHD wvQTTBKRtYgBw38qBwNOKINHiyLEre5bCI52xPPTsq9P/aS4Ah/3FQtff3LbddjujHDcdy mQvZLOxnHuNQVsvDJn07G3No2AeINeQ5KzgEedz+CZUJUG07epw6UmPu9ifwjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4UdXWmZv4G5kuWMBwKKcMP0iyC2MpxMsBhSl0cy0oQY=; b=Z5X4JX1O9Be8wPoUOkEB5K/C42UrwEMo4T8ecIO5Xk2YhknpSpyqAUBtGJEBPWpPf9tm8V 9J7Q/d4aBagal3ldh6szQPRoNMI86BnwCnRFDNjMhlBosly5HRjHGjpW1ritQnqAJgFM+E fpbdYXp4Vr4az1lapND5/mR4DPS+wlp9YzdUobHhLdwdPGFjIC8Vv3NgDLpmnhQFesSdWW 5xi+IgFsQ7Yq+H4ZuFPke1GAs12X0UFGxyn71Wf878j78wukS9NRsYpjZ7rukGJSF1p7hq MQaSiSVCCpCAlrVNFo4ubHJNDFLqnX0gX1gqqY1hZCBl8kDiFtmro4heVLVTYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275872; a=rsa-sha256; cv=none; b=lJBLT0pp2XbtgPAzZ2XZQIyBCmu77nXhHx+yf7EU337XxDokhAwtajAUoSZnB25YcJ6p9g ZnodD2Dho83FxyhajyQHaW5QKBeuFBnSkcNBbHPL8ICMV0aevfq2kTTpeSNv9CK8VjMbXh 5tx0065GszcuaKbHsH4bmawC5jt8gMT+2sp7ATKqwoNY30itIAU2+Uc7M8bLK6frKMzmh4 MbgYTJCsRfQZabsKUML2sB0sgvJ69F37e+TU6Pmi887ycNggu57aa2SHHB82+FU4MPBZnE NS66I3V5kkvKmvuh4OmkLdbTJCJ2CSq4SEMJZ6IwYQlFUdLM24oo5Euiltgghw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3g6QB0z1C7P; Wed, 29 Nov 2023 16:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGbp9X044331; Wed, 29 Nov 2023 16:37:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGbpZ6044328; Wed, 29 Nov 2023 16:37:51 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:51 GMT Message-Id: <202311291637.3ATGbpZ6044328@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: d7ae58192a9a - stable/13 - LinuxKPI: list.h add list_count_nodes() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d7ae58192a9a966929220bc8c6b5280bf73e8437 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d7ae58192a9a966929220bc8c6b5280bf73e8437 commit d7ae58192a9a966929220bc8c6b5280bf73e8437 Author: Bjoern A. Zeeb AuthorDate: 2023-06-26 08:45:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:03 +0000 LinuxKPI: list.h add list_count_nodes() Implement list_count_nodes() using a simple loop. This is needed by an updated wireless driver. Sponsored by: The FreeBSD Foundation (cherry picked from commit 1b18fb7faa75cc6dfa2e253190b41e63a997ca9d) --- sys/compat/linuxkpi/common/include/linux/list.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/list.h b/sys/compat/linuxkpi/common/include/linux/list.h index 30437bb54888..a27abedc55b0 100644 --- a/sys/compat/linuxkpi/common/include/linux/list.h +++ b/sys/compat/linuxkpi/common/include/linux/list.h @@ -464,6 +464,20 @@ static inline int list_is_last(const struct list_head *list, return list->next == head; } +static inline size_t +list_count_nodes(const struct list_head *list) +{ + const struct list_head *lh; + size_t count; + + count = 0; + list_for_each(lh, list) { + count++; + } + + return (count); +} + #define hlist_entry(ptr, type, field) container_of(ptr, type, field) #define hlist_for_each(p, head) \ From nobody Wed Nov 29 16:37:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3j1bNkz52wWy; Wed, 29 Nov 2023 16:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ3j18ypz3GBc; Wed, 29 Nov 2023 16:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VB8dtSEoTxITFxvFm1MkQJQiDU2Zx0F2kewWznnT33s=; b=fUQT6jPuodfg7bTs90iA4VbIL6NBCbL47k+TA5t7Ueq1ScRl/q+yxa2ox2Qd+xPV1R9Yk5 6wJEWOCcviMD1lI+OfAoXm1tOvjsdjJimE+5GNwcl7TrkgAiEUR7uDjZjrNXeuItR+QoKf a7xNa5OTy2KvcHWXale2XHM62hXHiuvwnqKC2adC6rxwoiYbd7frK8SAgLqO41hDgBJ/VH d2rcvyVGcI2hAOPbVywzitE7UTPvmOZo5mGDCGh9Yv/G3xiS52UHGxPG+1XDyeADAy354P UFCpkl+z74dg8SICzO+2AnJJco7LeU8aoDRAjH3fPJ/GWrOyyzDTJDMRN8I0Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VB8dtSEoTxITFxvFm1MkQJQiDU2Zx0F2kewWznnT33s=; b=Kq0kAWbhz8Fkc/7sio5df6KNzPEzRbFl4O1tSBg8RMBRyW1PpuaMGeGF9IIHT9SJehCTn8 A/z4S1TjKnUMahfefyWGJygx50KeU7HCmRf4C3fJN439fiFzRo0TuCi04A5saYgsv4Md5R zgTPk//pkMD8CWkCeDxEVQlw/W74vdEr8U91mAiUVkzZLlRX1KEsAm13v92y6xat4r0TT/ gxdohLVM53IJHtUy73Hm8MYOkLNVuc9wC1vOyCOD82lTKGFKFGw+cueIM+H9k/KUJD7olb TEoIaQMetTyqsIN4uglMxpkBlv1yilJmbFOHvamcbrr2fSP1rODzkniW84cmvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275873; a=rsa-sha256; cv=none; b=muP7t4E3JbSsf3+F44Sb9Tb0glcW+K+ZnBbv55xcjwiSpqlEC6itiLGW/hMJ9gyWeiP/o0 b0a8SinFrSb0UINBLwlM5cQkTSrYNDXdj7kY5RXKUZTPvASpRGx4qRbXP9I95Oh+CNScZL wa+Rf39Brp+ikmojyZhL4y6FxfmpW7jwaVB2axvm5oLPLWwBUwP7XXlxeSzzxF/7f5mVg/ L+GvgtevqNQGrRlVgBbk2PWg6NZZWFPTggVigpM9yoHyI7UQPBq5wyDbG/stCggB+RyDUy sansxrKnsrBCFMKkKinblDY2MtGYH4dD3M1FvonJcABsfPB4ek0bKu2M68msXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3j04jcz1C7Q; Wed, 29 Nov 2023 16:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGbqta044383; Wed, 29 Nov 2023 16:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGbqWV044380; Wed, 29 Nov 2023 16:37:52 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:52 GMT Message-Id: <202311291637.3ATGbqWV044380@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5d493a9556ff - stable/13 - LinuxKPI: implement get_random_u32_inclusive() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5d493a9556ff9c60519838f7a27df60bf695187a Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5d493a9556ff9c60519838f7a27df60bf695187a commit 5d493a9556ff9c60519838f7a27df60bf695187a Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 21:03:30 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:03 +0000 LinuxKPI: implement get_random_u32_inclusive() Implementation of get_random_u32_inclusive(). This is needed by an update for wireless drivers. Sponsored by: The FreeBSD Foundation (cherry picked from commit 1dcd1a539275fe69173bfc4dfc32c963fc7dcdbe) --- sys/compat/linuxkpi/common/include/linux/random.h | 30 +++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/random.h b/sys/compat/linuxkpi/common/include/linux/random.h index 57310377c0c9..5335cca8251c 100644 --- a/sys/compat/linuxkpi/common/include/linux/random.h +++ b/sys/compat/linuxkpi/common/include/linux/random.h @@ -4,6 +4,10 @@ * Copyright (c) 2010 Panasas, Inc. * Copyright (c) 2013-2016 Mellanox Technologies, Ltd. * All rights reserved. + * Copyright 2023 The FreeBSD Foundation + * + * Portions of 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 @@ -34,8 +38,6 @@ #include #include -#define get_random_u32() get_random_int() - static inline void get_random_bytes(void *buf, int nbytes) { @@ -52,6 +54,30 @@ get_random_int(void) return (val); } +#define get_random_u32() get_random_int() + +/* + * See "Fast Random Integer Generation in an Interval" by Daniel Lemire + * [https://arxiv.org/pdf/1805.10941.pdf] for implementation insights. + */ +static inline uint32_t +get_random_u32_inclusive(uint32_t floor, uint32_t ceil) +{ + uint64_t x; + uint32_t t, v; + + MPASS(ceil >= floor); + + v = get_random_u32(); + t = ceil - floor + 1; + x = (uint64_t)t * v; + while (x < t) + x = (uint64_t)t * get_random_u32(); + v = x >> 32; + + return (floor + v); +} + static inline u_long get_random_long(void) { From nobody Wed Nov 29 16:37:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3k59R5z52wX0; Wed, 29 Nov 2023 16:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ3k29GCz3GYL; Wed, 29 Nov 2023 16:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LWL7asUQo5uFeWNrhvm/r5q5Q4ZNoCfTlGdq+lXHfHg=; b=UgOLaqvdpSnNnBtGJhB59FPs+uEbox7pge3do62dMu2X0/N5LiqMZAKFen3ORn7s3FS/Uo 9O5AAbY7qasQypW+Jy2PgeLoYbFqs+IdFD9hAZxDqcfou6u2/79V+5rOigl3UyDjekvhI6 z+poI8UfKDq+XG3IbYkLAooeDtKodgDYwB9OPMH9xNdRgOpcKdkHwyJ7ERWTO+1Mds55jM Ifn7PLfMUtjEBg50R52AwKks25/pa/1lKtRQHJrfDLAiSonKVvWRilgnX16y8VfzrXIA4V CIN5HqoBCFpZ7uTgpTekUthV7QWa1qEnOl9Xyuqr62sMgsufHW7ka/upOm4Bmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LWL7asUQo5uFeWNrhvm/r5q5Q4ZNoCfTlGdq+lXHfHg=; b=Wdnk/65J2PLdCb2EoZuxXxdGeG99WLssnp11SQ7sqW6ceZQa0atrOTV8qYbn4ti11EsiJN JU4naf5RuHxq/PHBX+iTGoGH8zLKHqYLWnoecOcp/dj8Q56nOZgyznAipSvgYMr7SeydVI afy0JGNqiqM4OvF0ttoPGhoLy6Q5pbhoX4FMTRCfVxz6TfniZYvviWxoNMb6L6phS69/KS 89I0L8LP/9aJSJoXCK43DJ8nC0B+dHwGUDnFoHayS0h/qWtT4ImildYpd3JHNrD9uJPCRM ceTy68UktX+aqkiOHV6a723ovbqfUTz34ZygQe27n2w+GVzx3YX8ehveVzIUPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275874; a=rsa-sha256; cv=none; b=UU5+UXXP9kixarkH5zd1Yg1lij9/7HXnVCTAFqnjz3FzUFmc61FquCevmBuK6u8rGY3uxC L3Fq0v/cfbGVxyRUWUBekdqrior+bY7wl71/oYFoKKNtvAr6eEjSPYV+z1qekvcborPU08 Y/zob05TOUS/kHuOj0uQxtG/yhMOWqUiz5+vy09j/z630R81DzReuYJawBYz3u6c13mLNf pOT0+39JrUbNAIWpr8zEPmyEDSRI/O31cHeJi6a6ST/P/mVTmpfLo/ZCinkW7h9QyWDoN8 qLdE8zKO8VHDwb7q6EPOGIF8MaK+UPXQOJrruw4aIHsl3cKVDDAsvEzV0+QEgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3k1Gbqz1Bh0; Wed, 29 Nov 2023 16:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGbsDO044428; Wed, 29 Nov 2023 16:37:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGbs0Q044425; Wed, 29 Nov 2023 16:37:54 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:54 GMT Message-Id: <202311291637.3ATGbs0Q044425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: bac17554e4fb - stable/13 - LinuxKPI: pci.h add more constants List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bac17554e4fb262db103b1378b416560077f75b0 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bac17554e4fb262db103b1378b416560077f75b0 commit bac17554e4fb262db103b1378b416560077f75b0 Author: Bjoern A. Zeeb AuthorDate: 2023-07-26 02:58:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:03 +0000 LinuxKPI: pci.h add more constants Add two more PCI_EXP_LNKSTA_CLS constants to the compat defines needed by wireless drivers. Sponsored by: The FreeBSD Foundation (cherry picked from commit f74c09f3ec69a6cdba46aa821ab665d2f87142f7) --- sys/compat/linuxkpi/common/include/linux/pci.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 41849b4f4b39..d8ab851435f5 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -145,6 +145,8 @@ MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ #define PCI_EXP_TYPE_DOWNSTREAM PCIEM_TYPE_DOWNSTREAM_PORT /* Downstream Port */ #define PCI_EXP_FLAGS_SLOT PCIEM_FLAGS_SLOT /* Slot implemented */ #define PCI_EXP_TYPE_RC_EC PCIEM_TYPE_ROOT_EC /* Root Complex Event Collector */ +#define PCI_EXP_LNKSTA_CLS PCIEM_LINK_STA_SPEED +#define PCI_EXP_LNKSTA_CLS_8_0GB 0x0003 /* Current Link Speed 8.0GT/s */ #define PCI_EXP_LNKCAP_SLS_2_5GB 0x01 /* Supported Link Speed 2.5GT/s */ #define PCI_EXP_LNKCAP_SLS_5_0GB 0x02 /* Supported Link Speed 5.0GT/s */ #define PCI_EXP_LNKCAP_SLS_8_0GB 0x03 /* Supported Link Speed 8.0GT/s */ From nobody Wed Nov 29 16:37:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3l43kzz52wtc; Wed, 29 Nov 2023 16:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ3l3FFpz3GQv; Wed, 29 Nov 2023 16:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZxa0iY5C4DvMnyjmJmlaunmMr0ciAzXPuiTj+MKRQI=; b=X7DKyRpfndtU0pIeu8+gI3dnOSf9QBTtLISB9IgUyqZWJvWECj/kOXXdI1ttIVA4imH/lt /FkGuITmRBSITPECJrzSgvp0wyBhosaUM28Hueb3D6xgZ06JTWKk54rvmZhDSwX7JJZW1X jlNCkOm1K3vJHxYRE7WmrLSkBe/tm1au+BU3NWph1BlUj28VCgSS2KnlMX/UpgxfGgE0st XSpAI7P+IG99RXGl+SKZSDYlP890FYwjMoyDeOe67hA3Z3mtO6s1gfHeUJTzb2eBjvOcio yWeNsfM4MaxiQQBv1h1zNbSfqN+NVevdpH+hhYxjAKP17b/cyF1DpATNEgK7ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZxa0iY5C4DvMnyjmJmlaunmMr0ciAzXPuiTj+MKRQI=; b=eIYrnIxtzuLSV4KR49vPSNSTtJFxWtWWjFhzfDmYvnRBQMZ/lHG0DZyBnqXE153uAjDz6f 1VWn7YAOHLA4jwiUypY/kkkbZt/61m3PAenWNZ2hPI2gwNWIcHVaYiBtSZ9bSXMXiRmM4I 43M2/cVt+qx1ZOANjNeD+EMKHccZsXMgxArPWciS6JEQ8D8XENzu6nYrr3VGgmV1Fr8j1g yc5fgWHOpphPsHSrnObZtlDbcBi5fuX+tdVvyHzrlc4Skss8HYgZz7SyQ6plwwmkqEiOzI WNoq1Z5YxfC3Zf+WbQ0+tG5Z2QGLv4yG6oTHHgRN3n4yDMCP/5ueD/pBEPLxlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275875; a=rsa-sha256; cv=none; b=RmCoEz1/gzlfdae2YsVTBmuCBlL03llP6FlJc+/nkMiX8SqEpTP7VlxryNel/Hs3SnHYfd 6tnB5g5ouCueYTMObBQFKoUjHteD7RSJy7pyrHakoo1vjD95e1hNyCRGZu+V1r2KA7K4wW cSfaRSFRZlfzSrtMnJS12z9ZiAEpr4sFR/QCL4/IldNT8JSvuiSFtEyA/wpk+H8KVvgXQX ylYW8f/bIDv1CUMYgX8sAhUDhcoiV46Fzekit2OiIy62cS1p/MOIr/xAirfoixz9o4gNEt GgO0nw0lUUvJHbmY7dfZ+39bbbxXTlOqt+Lwr6AGq+tJU98e1wDo+zSJH7m4FA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3l2Jwqz1C2C; Wed, 29 Nov 2023 16:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGbtub044486; Wed, 29 Nov 2023 16:37:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGbtgY044483; Wed, 29 Nov 2023 16:37:55 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:55 GMT Message-Id: <202311291637.3ATGbtgY044483@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9d41057c94bc - stable/13 - LinuxKPI: reduce usage of struct vm_page and vm_page_t List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9d41057c94bcbdae8c7b8c9e8a064352da6fccbd Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9d41057c94bcbdae8c7b8c9e8a064352da6fccbd commit 9d41057c94bcbdae8c7b8c9e8a064352da6fccbd Author: Bjoern A. Zeeb AuthorDate: 2023-07-31 02:03:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:04 +0000 LinuxKPI: reduce usage of struct vm_page and vm_page_t We currently define (Linux) page to (FreeBSD) vm_page. Cleanup some of the direct struct vm_page and vm_page_t declarations and usages in the Linux KPI and make them 'struct page' or 'struct page *' to prepare for more upcoming work. This should be a NOP. Sponsored by: The FreeBSD Foundation (cherry picked from commit 9e9c682ff3a1aec20a7e5f5b1dd88ceaec7c3950) --- sys/compat/linuxkpi/common/include/asm/set_memory.h | 12 ++++++------ sys/compat/linuxkpi/common/include/linux/gfp.h | 4 ++-- sys/compat/linuxkpi/common/include/linux/highmem.h | 12 ++++++------ sys/compat/linuxkpi/common/include/linux/mm.h | 10 +++++----- sys/compat/linuxkpi/common/include/linux/pagevec.h | 4 ++-- sys/compat/linuxkpi/common/src/linux_page.c | 6 +++--- sys/compat/linuxkpi/common/src/linux_shmemfs.c | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/asm/set_memory.h b/sys/compat/linuxkpi/common/include/asm/set_memory.h index cdb7ad912acc..ae50148f0314 100644 --- a/sys/compat/linuxkpi/common/include/asm/set_memory.h +++ b/sys/compat/linuxkpi/common/include/asm/set_memory.h @@ -54,7 +54,7 @@ set_memory_wb(unsigned long addr, int numpages) } static inline int -set_pages_uc(vm_page_t page, int numpages) +set_pages_uc(struct page *page, int numpages) { KASSERT(numpages == 1, ("%s: numpages %d", __func__, numpages)); @@ -63,7 +63,7 @@ set_pages_uc(vm_page_t page, int numpages) } static inline int -set_pages_wc(vm_page_t page, int numpages) +set_pages_wc(struct page *page, int numpages) { KASSERT(numpages == 1, ("%s: numpages %d", __func__, numpages)); @@ -76,7 +76,7 @@ set_pages_wc(vm_page_t page, int numpages) } static inline int -set_pages_wb(vm_page_t page, int numpages) +set_pages_wb(struct page *page, int numpages) { KASSERT(numpages == 1, ("%s: numpages %d", __func__, numpages)); @@ -85,7 +85,7 @@ set_pages_wb(vm_page_t page, int numpages) } static inline int -set_pages_array_wb(vm_page_t *pages, int addrinarray) +set_pages_array_wb(struct page **pages, int addrinarray) { int i; @@ -95,7 +95,7 @@ set_pages_array_wb(vm_page_t *pages, int addrinarray) } static inline int -set_pages_array_wc(vm_page_t *pages, int addrinarray) +set_pages_array_wc(struct page **pages, int addrinarray) { int i; @@ -105,7 +105,7 @@ set_pages_array_wc(vm_page_t *pages, int addrinarray) } static inline int -set_pages_array_uc(vm_page_t *pages, int addrinarray) +set_pages_array_uc(struct page **pages, int addrinarray) { int i; diff --git a/sys/compat/linuxkpi/common/include/linux/gfp.h b/sys/compat/linuxkpi/common/include/linux/gfp.h index 70c486002335..c5de09e896de 100644 --- a/sys/compat/linuxkpi/common/include/linux/gfp.h +++ b/sys/compat/linuxkpi/common/include/linux/gfp.h @@ -97,8 +97,8 @@ extern void *linux_page_address(struct page *); /* * Page management for unmapped pages: */ -extern vm_page_t linux_alloc_pages(gfp_t flags, unsigned int order); -extern void linux_free_pages(vm_page_t page, unsigned int order); +extern struct page *linux_alloc_pages(gfp_t flags, unsigned int order); +extern void linux_free_pages(struct page *page, unsigned int order); void *linuxkpi_page_frag_alloc(struct page_frag_cache *, size_t, gfp_t); void linuxkpi_page_frag_free(void *); void linuxkpi__page_frag_cache_drain(struct page *, size_t); diff --git a/sys/compat/linuxkpi/common/include/linux/highmem.h b/sys/compat/linuxkpi/common/include/linux/highmem.h index 1c2c97e03578..a3f9af82400e 100644 --- a/sys/compat/linuxkpi/common/include/linux/highmem.h +++ b/sys/compat/linuxkpi/common/include/linux/highmem.h @@ -47,7 +47,7 @@ #define PageHighMem(p) (0) -static inline vm_page_t +static inline struct page * kmap_to_page(void *addr) { @@ -55,7 +55,7 @@ kmap_to_page(void *addr) } static inline void * -kmap(vm_page_t page) +kmap(struct page *page) { struct sf_buf *sf; @@ -73,7 +73,7 @@ kmap(vm_page_t page) } static inline void * -kmap_atomic_prot(vm_page_t page, pgprot_t prot) +kmap_atomic_prot(struct page *page, pgprot_t prot) { vm_memattr_t attr = pgprot2cachemode(prot); @@ -87,21 +87,21 @@ kmap_atomic_prot(vm_page_t page, pgprot_t prot) } static inline void * -kmap_atomic(vm_page_t page) +kmap_atomic(struct page *page) { return (kmap_atomic_prot(page, VM_PROT_ALL)); } static inline void * -kmap_local_page_prot(vm_page_t page, pgprot_t prot) +kmap_local_page_prot(struct page *page, pgprot_t prot) { return (kmap_atomic_prot(page, prot)); } static inline void -kunmap(vm_page_t page) +kunmap(struct page *page) { struct sf_buf *sf; diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h index ce3c94ee64aa..3d826f73a494 100644 --- a/sys/compat/linuxkpi/common/include/linux/mm.h +++ b/sys/compat/linuxkpi/common/include/linux/mm.h @@ -246,19 +246,19 @@ vma_pages(struct vm_area_struct *vma) #define offset_in_page(off) ((unsigned long)(off) & (PAGE_SIZE - 1)) static inline void -set_page_dirty(struct vm_page *page) +set_page_dirty(struct page *page) { vm_page_dirty(page); } static inline void -mark_page_accessed(struct vm_page *page) +mark_page_accessed(struct page *page) { vm_page_reference(page); } static inline void -get_page(struct vm_page *page) +get_page(struct page *page) { vm_page_wire(page); } @@ -305,7 +305,7 @@ pin_user_pages_remote(struct task_struct *task, struct mm_struct *mm, } static inline void -put_page(struct vm_page *page) +put_page(struct page *page) { vm_page_unwire(page, PQ_ACTIVE); } @@ -321,7 +321,7 @@ vm_get_page_prot(unsigned long vm_flags) return (vm_flags & VM_PROT_ALL); } -static inline vm_page_t +static inline struct page * vmalloc_to_page(const void *addr) { vm_paddr_t paddr; diff --git a/sys/compat/linuxkpi/common/include/linux/pagevec.h b/sys/compat/linuxkpi/common/include/linux/pagevec.h index 4224124c4fe4..9ba8ff8effa0 100644 --- a/sys/compat/linuxkpi/common/include/linux/pagevec.h +++ b/sys/compat/linuxkpi/common/include/linux/pagevec.h @@ -13,7 +13,7 @@ struct pagevec { uint8_t nr; - struct vm_page *pages[PAGEVEC_SIZE]; + struct page *pages[PAGEVEC_SIZE]; }; static inline unsigned int @@ -41,7 +41,7 @@ pagevec_count(struct pagevec *pvec) } static inline unsigned int -pagevec_add(struct pagevec *pvec, struct vm_page *page) +pagevec_add(struct pagevec *pvec, struct page *page) { pvec->pages[pvec->nr++] = page; return PAGEVEC_SIZE - pvec->nr; diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 41e4989c397c..ca2f6a8e6d08 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -96,10 +96,10 @@ linux_page_address(struct page *page) IDX_TO_OFF(page->pindex))); } -vm_page_t +struct page * linux_alloc_pages(gfp_t flags, unsigned int order) { - vm_page_t page; + struct page *page; if (PMAP_HAS_DMAP) { unsigned long npages = 1UL << order; @@ -146,7 +146,7 @@ linux_alloc_pages(gfp_t flags, unsigned int order) } void -linux_free_pages(vm_page_t page, unsigned int order) +linux_free_pages(struct page *page, unsigned int order) { if (PMAP_HAS_DMAP) { unsigned long npages = 1UL << order; diff --git a/sys/compat/linuxkpi/common/src/linux_shmemfs.c b/sys/compat/linuxkpi/common/src/linux_shmemfs.c index 0ebbd34d067d..3c71d6495f4a 100644 --- a/sys/compat/linuxkpi/common/src/linux_shmemfs.c +++ b/sys/compat/linuxkpi/common/src/linux_shmemfs.c @@ -45,7 +45,7 @@ struct page * linux_shmem_read_mapping_page_gfp(vm_object_t obj, int pindex, gfp_t gfp) { - vm_page_t page; + struct page *page; int rv; if ((gfp & GFP_NOWAIT) != 0) From nobody Wed Nov 29 16:37:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3m4vDxz52wYj; Wed, 29 Nov 2023 16: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 4SgQ3m4FJMz3GFl; Wed, 29 Nov 2023 16: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=1701275876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7tx20D5tNntL59z9HOAa5wegbCQ9xL1175xNoUn6xOQ=; b=sfV4oZPmeos+Jbk2ukeYxP8NCffC091xm07TQpsQMnomnjGQ4VzSqaWi2xN0XQC3YeR1GO RPNR2gnwb+mjASlONqK6lnxIIm1CUwJqNt4f/svX9gLqeA79Vr4C0/dO3zXjdtwjCL8zF5 PoKAZLaUTp6K+xqQ1n+2IkLfyhqu7SYOoWFbraGix13gbdP1A3xeYxpBfmr7ozCzBRy3xt 3AukGHAP0KeoTKJhz3hnFy3HgkqZBUgdtKnTJvntUjqj1a0jjxI8dfx5LVt6vdYegjt3U0 jurzFIrCTqjmlFLois/xa+FCsd2q6K7tsK2SJZEh52ljdw4vgOyBmYKn9aCkSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7tx20D5tNntL59z9HOAa5wegbCQ9xL1175xNoUn6xOQ=; b=XwvGOosAicE8xLy9Rg0RT7dzrR0KhxkLtvm9IWI2dXD623VZaMIpoDgJ10VGk+jFeT1Bdu NZdUk4BteYIEtjiPSW/NH+nib/jtmXK9vVJ5vry+rxu4SCjbmzEMFKDuVwhQB883qHH3Tk JWjHajAPJ8xp0Lw6CuyzM58YdRkxcQThLl2HEg2UWYRLheSsGpG9UP3+ESJqj0JXpmcO3t DzTlnZeoF3LYrl3Y80ke9kuiqHpCgtyGrlDVJOC4PtCbyqe37qKUyDfonEsaqWVG6qjd4x eRFcZCt7T14HlTPtqKEkcOLNy4aPg1KTdNop+M1Vg7JrmvdfAf595fbTPYaITQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275876; a=rsa-sha256; cv=none; b=biUAzVTS/DR1zObkYjDvErEQMqOhxEbKq2Vq4sp/Wn6IEml2smHhblFys8la9f+UmHjAzD njHxUSrT6dIHrXG8QX51AQR/6cmWEtym1ESJkzB5Dw+S7RsvEzljWjhoI2we1VCi7ZJI6q 34LmFCm3oOd/XxeRV5LbAJJAsoZG1oYZRBjTDpRcPobfrPXQlzzTvvAeN8k2wmeOtaOZ6q 6mtth8WM3NV224p1vYRNOvJ4DgBXldLY+7JAEEbycu5C0w8qMI6NM2nP5A6OQhkpW0WGIq Qly/RiluwZ3KppA1fw9v7zPavtEoFrjQTDTqF6dY0wtAVDNJC/QZeY/Sm/QS0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3m3KrVz1C7R; Wed, 29 Nov 2023 16: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 3ATGbuEr044538; Wed, 29 Nov 2023 16: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 3ATGbu9D044535; Wed, 29 Nov 2023 16:37:56 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:56 GMT Message-Id: <202311291637.3ATGbu9D044535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b4e06954f55d - stable/13 - LinuxKPI: cleanup internal calls to VM_PAGE_TO_PHYS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b4e06954f55d9380afb8333791b7b2b16f368be2 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b4e06954f55d9380afb8333791b7b2b16f368be2 commit b4e06954f55d9380afb8333791b7b2b16f368be2 Author: Bjoern A. Zeeb AuthorDate: 2023-07-31 03:15:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:04 +0000 LinuxKPI: cleanup internal calls to VM_PAGE_TO_PHYS Replace FreeBSD native VM_PAGE_TO_PHYS() calls with page_to_phys() allowing us to work on a struct page in the future using the one single public Linux KPI interface to map to a native FreeBSD vm_page. This should be a NOP. Sponsored by: The FreeBSD Foundation (cherry picked from commit d1ea07642c47e26effec58f53b7369bf5f797252) --- sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 4 ++-- sys/compat/linuxkpi/common/include/linux/highmem.h | 2 +- sys/compat/linuxkpi/common/include/linux/scatterlist.h | 4 ++-- sys/compat/linuxkpi/common/src/linux_page.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 3b98e03ad6a4..4a53b7675302 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -181,7 +181,7 @@ dma_map_page_attrs(struct device *dev, struct page *page, size_t offset, size_t size, enum dma_data_direction dir, unsigned long attrs) { - return (linux_dma_map_phys(dev, VM_PAGE_TO_PHYS(page) + offset, size)); + return (linux_dma_map_phys(dev, page_to_phys(page) + offset, size)); } /* linux_dma_(un)map_sg_attrs does not support attrs yet */ @@ -196,7 +196,7 @@ dma_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction direction) { - return (linux_dma_map_phys(dev, VM_PAGE_TO_PHYS(page) + offset, size)); + return (linux_dma_map_phys(dev, page_to_phys(page) + offset, size)); } static inline void diff --git a/sys/compat/linuxkpi/common/include/linux/highmem.h b/sys/compat/linuxkpi/common/include/linux/highmem.h index a3f9af82400e..f770bef6b3b7 100644 --- a/sys/compat/linuxkpi/common/include/linux/highmem.h +++ b/sys/compat/linuxkpi/common/include/linux/highmem.h @@ -60,7 +60,7 @@ kmap(struct page *page) struct sf_buf *sf; if (PMAP_HAS_DMAP) { - return ((void *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(page))); + return ((void *)PHYS_TO_DMAP(page_to_phys(page))); } else { sched_pin(); sf = sf_buf_alloc(page, SFB_NOWAIT | SFB_CPUPRIVATE); diff --git a/sys/compat/linuxkpi/common/include/linux/scatterlist.h b/sys/compat/linuxkpi/common/include/linux/scatterlist.h index 4c4629583080..17928f9c50e5 100644 --- a/sys/compat/linuxkpi/common/include/linux/scatterlist.h +++ b/sys/compat/linuxkpi/common/include/linux/scatterlist.h @@ -156,7 +156,7 @@ sg_next(struct scatterlist *sg) static inline vm_paddr_t sg_phys(struct scatterlist *sg) { - return (VM_PAGE_TO_PHYS(sg_page(sg)) + sg->offset); + return (page_to_phys(sg_page(sg)) + sg->offset); } static inline void * @@ -647,7 +647,7 @@ sg_pcopy_to_buffer(struct scatterlist *sgl, unsigned int nents, break; vaddr = (char *)sf_buf_kva(sf); } else - vaddr = (char *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(page)); + vaddr = (char *)PHYS_TO_DMAP(page_to_phys(page)); memcpy(buf, vaddr + sg->offset + offset, len); if (!PMAP_HAS_DMAP) sf_buf_free(sf); diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index ca2f6a8e6d08..d99d64cac403 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -89,7 +89,7 @@ linux_page_address(struct page *page) if (page->object != kernel_object) { return (PMAP_HAS_DMAP ? - ((void *)(uintptr_t)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(page))) : + ((void *)(uintptr_t)PHYS_TO_DMAP(page_to_phys(page))) : NULL); } return ((void *)(uintptr_t)(VM_MIN_KERNEL_ADDRESS + From nobody Wed Nov 29 16:37:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3n5h0cz52wwh; Wed, 29 Nov 2023 16:37: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 4SgQ3n55ZSz3GjK; Wed, 29 Nov 2023 16:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=09zX8ruimltBKjPVs0wa49mea46I8A3UpISXTSueRGU=; b=BcZxvffeLlLAfvl1FupC86TbE90g+3TR6mqhyqG2oA9HUxCNZaxhTS2BNhtwjT9qW1SWrl 0BMa4pY50U9jKQjmeTC2VBiqrX/Cf3lIFxtWTqMIUlEr/R6ZNCB6sEYc2n+xc71oFkW+rg BGAMd2A6BvngsiEcee/vdHEtdDLN0CdMqMmXjmHdSExWA/DJpgh2X7xs2K5/ytDVpQy1DZ +GWjnYlOwsq+uPuw/km7YtXklZ4utNQS1iNyR+i74srl7BGqVyk1yZ5XS65DJ9OapSnaPO hrjzDgGezljXiLti6fWrBA8vmP8JLCWadKQgP60bjtsPqehRu3/qqMzNNBnADQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=09zX8ruimltBKjPVs0wa49mea46I8A3UpISXTSueRGU=; b=fkAFNoiBgOAMghgbL1cRxzENmIcH9xxBSaDY2/UzvboQrP2OmdxPyjd2I2B+fLggwzF9yd nB9vqU8caQm7nNeFUezXdj42sS5yQYQR7FPFTM/uLrfUBooJO5Wkl0Xbv9h3rwp6pRDiL5 BDFcfZ8orSitgKX6HRleLCJUe+F7t/JZbcEJkXPivpn6Q6AhZWkglGYkYJepYkX0UHBVxd yJXI6wG+asfpqyX8noUeBzM3oyDmNqnFwxP+Fje9dtYpj7xYLQNhq8Vv0NifeX8NgvmgqE JmFpRCFqI7aZ3PK+DfP1Nutn64282GcwGVbYosohZ5WW46QYa1XsifIDGosXAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275877; a=rsa-sha256; cv=none; b=lFdfIHgAE5WbEdfHGAJ4wimiVMWg93thdUxd0biIBrDV4aqfqZ9tFtOWnRRs6KZKbh3u7m QujqmVG0ycQv2f9E/FFtA6kAf/MpbyH0WS1QjOw+x4WgazgMyUI2jyJrl05s7/5eOdXrZS Cmiyrx9m/2riVCnx6ayTvVclEti9I7/Doy2UpG+pvBV/U6zGRDAY4w+LNlZHYbwhanvTPv UBN3CJdK+ixk1f1cFzsbg2Qt1aM6i4c058u9m8HR/Vgl/v5eiMnKag1c3Myv40NXpLFRsO SUcWtjiLS92XcLM0NkMNuiL0dH14vqOD+tbiEE7kSTzYpE8D5G2Z81WOQBQQ6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3n4CPbz1CXf; Wed, 29 Nov 2023 16:37: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 3ATGbvrl044583; Wed, 29 Nov 2023 16:37:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGbv6t044580; Wed, 29 Nov 2023 16:37:57 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:57 GMT Message-Id: <202311291637.3ATGbv6t044580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: de57268b96f2 - stable/13 - LinuxKPI: replace vtophys+PHYS_TO_VM_PAGE with virt_to_page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: de57268b96f23606eb069d63d4e4bbbc7af779c6 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=de57268b96f23606eb069d63d4e4bbbc7af779c6 commit de57268b96f23606eb069d63d4e4bbbc7af779c6 Author: Bjoern A. Zeeb AuthorDate: 2023-07-31 05:28:42 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:04 +0000 LinuxKPI: replace vtophys+PHYS_TO_VM_PAGE with virt_to_page Rather than using the FreeBSD internal calls vtophys() and PHYS_TO_VM_PAGE() use the already existing LinuxKPI abstraction for this called virt_to_page(). This reduces the amount of compat code to maintain and will allow further work on struct [vm_]page. This should be a NOP. Sponsored by: The FreeBSD Foundation (cherry picked from commit dcb0c54968db10d3c7619f16c4bcfa9284d50ea2) --- sys/compat/linuxkpi/common/src/linux_page.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index d99d64cac403..d59435ba934f 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -136,7 +136,7 @@ linux_alloc_pages(gfp_t flags, unsigned int order) if (vaddr == 0) return (NULL); - page = PHYS_TO_VM_PAGE(vtophys((void *)vaddr)); + page = virt_to_page((void *)vaddr); KASSERT(vaddr == (vm_offset_t)page_address(page), ("Page address mismatch")); @@ -524,7 +524,7 @@ linuxkpi_page_frag_free(void *addr) { vm_page_t page; - page = PHYS_TO_VM_PAGE(vtophys(addr)); + page = virt_to_page(addr); linux_free_pages(page, 0); } From nobody Wed Nov 29 16:37:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3q1LC7z52wpy; Wed, 29 Nov 2023 16:37: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 4SgQ3p65LXz3GVJ; Wed, 29 Nov 2023 16:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x0gNjD+EtedgRDdehZPjnmSE4PbKQwP1yDJZ3IqcofA=; b=pvR6piW7eF77JPQmULt62ODIw4F+BAHXeiFNoo0vhqQVKtx8osMcl2Iu8kjEmEBAhEG4Gq gWuD/zjZPnMe1ePPW3Ieu2xQR70k7zUgmfPt+eIF26B1WSwlNR6GFkqXLjUTmzJ8jHWEsa cUKJzCcenKl3KQkYtXw0jiRmRO2BAKwyXM2T/j7qIpJKR/nculXACC+p7JDzxnMiXIH/LG N+UW2q4CbwneM6prnhiGHIOtFYzp62Ns3Panhb3oiaZnWJSLuG73Sv+yIwUn6lGvb9Z+cn cyd+osVgXz13LO4aGw7WqGE+NHPFpKZAYVJljuscgNBrAuo5NeSoV5trQ3enNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x0gNjD+EtedgRDdehZPjnmSE4PbKQwP1yDJZ3IqcofA=; b=yrsYgDyPGWWX/bJNLSok8ngJW6R035FTdhOEwavUclqKQMM4c+u5kVhZKobJ3GAC1u0e1q G4DYZ4hOKZydYEjRTCnT07vD8z00hKHbEoYvYmEB+cOwR5Fybu06TzG/eXL4oY+iFvtayZ MJWtfHkb7mQeq3E22m3T3VFCHKPhN3Fxpyecjj44tKkrfjwnrQoiAlAp0wa+g1/TKx7mlz VycQuCWKb/Smts2t33IA7yErHgn2cscmEMoFaVGcLSFhRZ8r6V2aznRDSV/JYGbm3zat/J +m8vUTnb3oet6WX0ex2nRQUV48xkI3v3wfHL21BjRPlG1W3w5/4KePABKfmkpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275878; a=rsa-sha256; cv=none; b=dsgaWm+cYJjkxdkQUa7OiFGVthUq5Qa2W6SsmUNRn86E1L0BtwTdlr1x9Z26P3D8fMDNCd 8i64QojD9P8umVn6rOZn5X4lAeRS0++6r758DZEsXScOW5DDbd+ZCK5AZY7js3QCZYiUct XATF3wVkiH+BvbPNKR7NAzChXRIJFnpKPMZd9uxJJK0L0ixXnmhd1ltG9VBn9DcfIVTtNQ gK6VfpaLfLMqn7UXLaAy1qWevrz6ZgP63kM1hYCHC5Rz7bade+BIbLP7+zKxGRAzrVGTJB /nKr/F7uFBcoNpHcWeuXf1TKxQ/sQzzRGmIt95PPH1C+HY2Gh/f2Z1FnSFf3Sw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3p5BWyz1C7S; Wed, 29 Nov 2023 16:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGbwUY044634; Wed, 29 Nov 2023 16:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGbwjK044631; Wed, 29 Nov 2023 16:37:58 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:58 GMT Message-Id: <202311291637.3ATGbwjK044631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 98e22f48a1b3 - stable/13 - net80211: Radiotap: add two more EHT defines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 98e22f48a1b33873968963c20c5b012b8b376b7e Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=98e22f48a1b33873968963c20c5b012b8b376b7e commit 98e22f48a1b33873968963c20c5b012b8b376b7e Author: Bjoern A. Zeeb AuthorDate: 2023-07-26 02:57:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:04 +0000 net80211: Radiotap: add two more EHT defines An updated iwlwifi needs further radiotap updates for EHT. Sponsored by: The FreeBSD Foundation (cherry picked from commit d73de457431943526cad7bd74e60f6264032d3c0) --- sys/net80211/ieee80211_radiotap.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/net80211/ieee80211_radiotap.h b/sys/net80211/ieee80211_radiotap.h index 85faa092a4b7..dba454a8fa42 100644 --- a/sys/net80211/ieee80211_radiotap.h +++ b/sys/net80211/ieee80211_radiotap.h @@ -536,6 +536,8 @@ struct ieee80211_radiotap_eht_usig { #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR_KNOWN 0x00000008 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP_KNOWN 0x00000010 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BAD_USIG_CRC 0x00000020 +#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_VALIDATE_BITS_CHECKED 0x00000040 +#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_VALIDATE_BITS_OK 0x00000080 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER 0x00007000 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW 0x00038000 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL 0x00040000 From nobody Wed Nov 29 16:37:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3r1D6Tz52wq0; Wed, 29 Nov 2023 16:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ3q6q9mz3Gx3; Wed, 29 Nov 2023 16:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xzyMYQjVVkgpNPxTxMFcAJS5Ucmg421P/pGZzNw7Kks=; b=LGY+0tBD1e9x+oJr6GF/xOa6xfzniXyzaE+x7rNIHA06z2KGcAXCie+RCJigDHDVBtWAGA NPQrevk/CMTY0t/wWw3xYZhWb/fQIqt8eD7TNeDx1R5Ih5+c9kc3SHl/doW5/mAUkjNlhr BoX0eFLd5ztIRw6Y9rXCrI8dXy/PYMC/6D8/uo09xxgYmQjO5d1/zPbu08H3HN8RQCbSvl Ts84eOpqsOnlinE1NJ8xAJFkDrXjLp1f0KZJyZoO8TqgCEETsBuU5f5Jz4k33F7epyRh8w 9GCjpSOKPYDBKSl610tTN4BDlmgPcMlQII4VV3FIA9oMTDzyat6Uqv7g2rs4HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xzyMYQjVVkgpNPxTxMFcAJS5Ucmg421P/pGZzNw7Kks=; b=CBDjoO5lULwGX1Lxh55KVlGBay3WAIcffPQQoqGwkXw5mNutnEb0RibfO/LEgQrjpvhyM5 ACWJGlEO8U6tqHhl/eO8Xh822seSX86tvRkDB6nRsksgtCFGS52WqpJHVRBjnYlfHbjNuF b9SyFMXh4OO/slyG3GfE7utU5XJ3d9zN/mQRITtJyInSXTM2nI0ZMraX2y6/XiCsEhcTq6 sz684JSE/WKhnQMw3H2mTYtus1bveexOR6yVK/OupNDLq96g7O9/GTG4DAcN7OYjlwTHNV WifaI6inAdkHRFXv0GYb98BaJEi5Ze1TM8v5/r3yww1Ws0tNTa9xHSUqPr2oJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275880; a=rsa-sha256; cv=none; b=y2jS4WIj/JgVTThzX6vAERAN06PETVw+GnrhHEycFtJHSJ0ocpjuHSeTZ80gMVumvGPzA1 jqjFYftygH2CHQxwCnlcpq6BrBFH+zZFZL3xrPqfFSnD5BdCxuFyXmG8pmFVL/35n/ruwm m5grbDcZY4EXBGCcdLuXwBgjFMM/ksfkEVCe1p9vtfu/75mz1wTee4zzM7Smg33eKTIpkw 1Ez6DlUJ9RTFWs6OMZuZWKxdBrLssNf0edYUf7ChGwaqL2iERqM2BgARbPyHT6Mh4U4rJQ N/4XVTC/An9T1nWQM7pJ3PdfCEze/NKzOlTOomoc142NMgeCfasQ61iEGEuACQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3q5stcz1C2D; Wed, 29 Nov 2023 16:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGbxgE044686; Wed, 29 Nov 2023 16:37:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGbxTF044683; Wed, 29 Nov 2023 16:37:59 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:59 GMT Message-Id: <202311291637.3ATGbxTF044683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 4317faf44d43 - stable/13 - LinuxKPI: add page pool skeleton List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4317faf44d434f514487c1c1c54b760971ed6f9c Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4317faf44d434f514487c1c1c54b760971ed6f9c commit 4317faf44d434f514487c1c1c54b760971ed6f9c Author: Bjoern A. Zeeb AuthorDate: 2023-05-23 23:15:57 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:04 +0000 LinuxKPI: add page pool skeleton Add the page pool skeleton based on a wireless driver. We have to sort out some struct page problems first before we can start implementing this but that should happen independent of all other changes. (cherry picked from commit 517e0978db1ff92d9f2b86fe735aba24bca72038) --- sys/compat/linuxkpi/common/include/net/page_pool.h | 119 +++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/net/page_pool.h b/sys/compat/linuxkpi/common/include/net/page_pool.h new file mode 100644 index 000000000000..4377ec1d53d4 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/net/page_pool.h @@ -0,0 +1,119 @@ +/*- + * Copyright (c) 2023 Bjoern A. Zeeb + * + * 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. + * + * $FreeBSD$ + */ + +#ifndef _LINUXKPI_NET_PAGE_POOL_H +#define _LINUXKPI_NET_PAGE_POOL_H + +#include /* pr_debug */ +#include +#include + +struct device; + +struct page_pool_params { + struct device *dev; + uint32_t flags; + uint32_t order; + uint32_t pool_size; + uint32_t max_len; + uint32_t offset; + int nid; /* NUMA */ + enum dma_data_direction dma_dir; +}; + +struct page_pool { +}; + +#define PP_FLAG_DMA_MAP BIT(0) +#define PP_FLAG_DMA_SYNC_DEV BIT(1) +#define PP_FLAG_PAGE_FRAG BIT(2) + +static inline struct page_pool * +page_pool_create(const struct page_pool_params *ppparams) +{ + + pr_debug("%s: TODO\n", __func__); + return (NULL); +} + +static inline void +page_pool_destroy(struct page_pool *ppool) +{ + + pr_debug("%s: TODO\n", __func__); +} + +static inline struct page * +page_pool_dev_alloc_frag(struct page_pool *ppool, uint32_t *offset, + size_t size) +{ + + pr_debug("%s: TODO\n", __func__); + return (NULL); +} + +static inline dma_addr_t +page_pool_get_dma_addr(struct page *page) +{ + + pr_debug("%s: TODO\n", __func__); + return (0); +} + +static inline enum dma_data_direction +page_pool_get_dma_dir(const struct page_pool *ppool) +{ + + pr_debug("%s: TODO\n", __func__); + return (DMA_BIDIRECTIONAL); +} + +static inline void +page_pool_put_full_page(struct page_pool *ppool, struct page *page, + bool allow_direct) +{ + + pr_debug("%s: TODO\n", __func__); +} + +static inline int +page_pool_ethtool_stats_get_count(void) +{ + + pr_debug("%s: TODO\n", __func__); + return (0); +} + +static inline uint8_t * +page_pool_ethtool_stats_get_strings(uint8_t *x) +{ + + pr_debug("%s: TODO\n", __func__); + return (x); +} + +#endif /* _LINUXKPI_NET_PAGE_POOL_H */ From nobody Wed Nov 29 16:38:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3s1tp7z52wwk; Wed, 29 Nov 2023 16:38: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 4SgQ3s0qlcz3Grg; Wed, 29 Nov 2023 16:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZpgGiK04wiK9KSdpYnMuF9uxQOZyP4dqTPTOBrL0Js=; b=cMJ6a+dRxTPahgz+sG72nSCh20NTiTmc/H+Czzeko/fNQSRrxtELfZsjBmQ+3nhqpO6cMt aijexZm+QP4jkI9XTpvZhZlAtpIJKZMyGp7AqXSWhPQraE0Wb87BtTwv2UY1D1SgjmWXhL FHXIWiitT95J3Ur8TnzzLKDY/CwWMZlCE4UPiXzwaTcpGR5zxuJ8V0ksskYZDU7RcupoQU TUsBBjFzEHPUKdaiKmGz2eebIgHLPiBceqC6WBSn2Nhhhu1fIBTWZ4ETyF2el8bO88pw3P NTcpV5fti5M+tR0DYoQvo+GpBq5+f0/EspORKKs5QPv+YsMJdypQJIo7f0Kb0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZpgGiK04wiK9KSdpYnMuF9uxQOZyP4dqTPTOBrL0Js=; b=e+q0W2V4jXGKt+NtjdZiCKyetHRDeENFy+MdVNK96WqdMhlrvxKtNSCkZrxPNhm0wLJqvJ GMM5l4ISg9vlRUwI0p2ahw2p/GedNEzm1I6D/+Xz91fi/3stwhcQnXSq9HbvC5G08uJwfF KFWi86jC/QRYkVg7/jmnpj/HjL2eEk9CDpWl++ASLOGIxl9ZMHNQHCzutMKRpieRGaoAbd uhond5TBRwNZ/dzCItGuPvwnfnm/EiEsrXbd8DeOC2kowDK7MWMcEhUORxRgLyBxMLvATJ zMzLD49CsHP6xi01+jbXbU0Tha9LSRiiq20LBVIxNUJCtfiRJTET7h+dGFtQQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275881; a=rsa-sha256; cv=none; b=hM+XcRLAakWwZvEE6ByyaXYrUwKYHCwQF4Gvy5hRNHX3OouKrcoUBBIw+ana5LFiZHSTY6 imT2lfbgt7uMERebk9IggYEgYUOrBrT9Uclj0Fzs0tzuachkCRi3Un1wCrSC9Qc+CJL4Ej QsW5eYW4KP2aJ1Os03MQl80M2i5on0gnH8R5W7/nGJXl6mW+gIjKRofbthvCz0JULsSqyB 7sihQPxTwSAW8aI4Tt2F3swIysH9puuN6SGF9iEHoxo3tKEPHRATEKdmQYfluqIlP/Yyxl NWuJFTjIjqUknb/qrc1L4nEvPjSbJsHI8kRDJHDWJ/Z1Jh5cGVvjgWfMQMgwQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3r6wThz1Bwh; Wed, 29 Nov 2023 16:38: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 3ATGc0G3044731; Wed, 29 Nov 2023 16:38:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGc0Fj044728; Wed, 29 Nov 2023 16:38:00 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:00 GMT Message-Id: <202311291638.3ATGc0Fj044728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f0d33323feab - stable/13 - LinuxKPI: implement mul_u64_u64_div_u64() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f0d33323feab22b2550437132b8ee89f2086b310 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f0d33323feab22b2550437132b8ee89f2086b310 commit f0d33323feab22b2550437132b8ee89f2086b310 Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 20:55:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:04 +0000 LinuxKPI: implement mul_u64_u64_div_u64() Implement mul_u64_u64_div_u64() for an updated iwlwifi driver (though we do not yet use it there; it is used for in-kernel ptp on wifi). Sponsored by: The FreeBSD Foundation (cherry picked from commit b80ea452375f52a3ab7d82a9aef10da0d89985d9) Unbalanced parentheses broke the build; re-balance. Fixes: b80ea452375f ("LinuxKPI: implement mul_u64_u64_div_u64()") (cherry picked from commit dabbbebcb0f5ced163454cd08b78e551b4a365b5) linuxkpi math: fix kassert in math64.h Include in math64.h, so that KASSERT and bool are defined, to allow compilation to succeed after b80ea452375f52a3ab7d82a9aef10da0d89985d9 and dabbbebcb0f5... (cherry picked from commit b6a61d6836d90ff2756d804eb981a02b0828f496) --- sys/compat/linuxkpi/common/include/linux/math64.h | 49 +++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/math64.h b/sys/compat/linuxkpi/common/include/linux/math64.h index 1b00fd71e69f..cae5e30b08df 100644 --- a/sys/compat/linuxkpi/common/include/linux/math64.h +++ b/sys/compat/linuxkpi/common/include/linux/math64.h @@ -29,6 +29,7 @@ #define _LINUXKPI_LINUX_MATH64_H #include +#include #define do_div(n, base) ({ \ uint32_t __base = (base); \ @@ -106,6 +107,54 @@ mul_u64_u32_div(uint64_t x, uint32_t y, uint32_t div) return ((x / div) * y + (rem * y) / div); } +static inline uint64_t +mul_u64_u64_div_u64(uint64_t x, uint64_t y, uint64_t z) +{ + uint64_t res, rem; + uint64_t x1, y1, y1z; + + res = rem = 0; + x1 = x; + y1z = y / z; + y1 = y - y1z * z; + + /* + * INVARIANT: x * y = res * z + rem + (y1 + y1z * z) * x1 + * INVARIANT: y1 < z + * INVARIANT: rem < z + */ + while (x1 > 0) { + /* Handle low bit. */ + if (x1 & 1) { + x1 &= ~1; + res += y1z; + rem += y1; + if ((rem < y1) || (rem >= z)) { + res += 1; + rem -= z; + } + } + + /* Shift x1 right and (y1 + y1z * z) left */ + x1 >>= 1; + if ((y1 * 2 < y1) || (y1 * 2 >= z)) { + y1z = y1z * 2 + 1; + y1 = y1 * 2 - z; + } else { + y1z *= 2; + y1 *= 2; + } + } + + KASSERT(res * z + rem == x * y, ("%s: res %ju * z %ju + rem %ju != " + "x %ju * y %ju", __func__, (uintmax_t)res, (uintmax_t)z, + (uintmax_t)rem, (uintmax_t)x, (uintmax_t)y)); + KASSERT(rem < z, ("%s: rem %ju >= z %ju\n", __func__, + (uintmax_t)rem, (uintmax_t)z)); + + return (res); +} + static inline uint64_t mul_u64_u32_shr(uint64_t x, uint32_t y, unsigned int shift) { From nobody Wed Nov 29 16:38:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3t2b58z52ws7; Wed, 29 Nov 2023 16:38: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 4SgQ3t1rDWz3Gn9; Wed, 29 Nov 2023 16:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rUkulMAJ0lZPyYR2cQFSMNc1ggv/21FBpxBjRCoBbHA=; b=LAIRiv31b9kRkX/913WXdDvX57MKe+A1+hQtMPlWnaaZOaQh0PWyNpn2EzPxjWipaSDMvk JBvXCGhzVaY6uXV9NvmXuLTQmzYISiw4eydqU4ukt8hpgOeN4xvTjwrFkNpdATiWzFoI9O +Gd+OdHEgszq+MObw70JmdodYPXc47x28IrR2t8jm3flhGvHJ2Pp8qf+L8nCZVOge/ylvw Xapq++Ges06j09oOb/iDeSWLMZIvcgo5RIlWnoLmKZ3o9QNQQviIaNzBsmL84r2bKUjMVQ xAhBodWLJgLqh+0XSTGpSD5uSUjiodAknNFPemfoY2ZOOIu4ACRpkQLHLT5TOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rUkulMAJ0lZPyYR2cQFSMNc1ggv/21FBpxBjRCoBbHA=; b=JKmkDjENtuLQJP5b+JB7tpi/3VO0a512jczznRxKf4Bam7bg6N0CT+84sKTF7LGcU/Vqmo Z5DqMz5ZXSRquCnV+f7prDxhdF0kRQ2wEIBcXSXV07IZGfNUR/Lc2sazIjJlxYFoCYnUy5 3+d/C+VZcsTNM05ItdktNey+JH3BPFkWMv4BL870qYeJeX/2RAm/x1x9GxNXRYtwbceApj vFmTEFzCWkGpw4rAmAzVBvrqRRWe1FgIe5eUkUR5UaSaOtWPE9yJXPWuvigKDiv5+6DMP+ /dAW94CcnliXQFaMDS48OG0721001G5BeyDdMIw1ulfBYKepegcDnDSLENCW3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275882; a=rsa-sha256; cv=none; b=oHg4SQy8J5cEUj0RS8XVUySlrP6b2hX9nn5QbCT8OTz0c3OLwUeCVfp23pixV7QbLvJpA1 epe+y/thrWdA1xh01AURfgDpqz79N2/oVGuuqgpJTARf4IhsikowWTbmKcr/P8Hu4sXcxd bQ0sdSAEMKLXsBmp9NvsBKDGhw/qpp+nV95QDlm1uDSJj/u0kYAR78PBkUhN2DY7jkmCQX LN6M5ao46S5T2EaUnoJaE1HlYkB+VpbZznvD2LMJ3XTUMlmtjO8CNdTZ3DJuJpqgLNMioX cCI6X49VF6x4HJUwg6pgZLpklw57FVRfFY3YIh22Pws3Tuu2VwT7u1VVrekiSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3t0xqLz1CXg; Wed, 29 Nov 2023 16:38: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 3ATGc2YQ044773; Wed, 29 Nov 2023 16:38:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGc2lJ044770; Wed, 29 Nov 2023 16:38:02 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:02 GMT Message-Id: <202311291638.3ATGc2lJ044770@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 88910886fa50 - stable/13 - LinuxKPI: skbuff: fix tracing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 88910886fa50a6eccdc7d263778143ddd68c61df Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=88910886fa50a6eccdc7d263778143ddd68c61df commit 88910886fa50a6eccdc7d263778143ddd68c61df Author: Bjoern A. Zeeb AuthorDate: 2023-08-19 04:50:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:04 +0000 LinuxKPI: skbuff: fix tracing Fix arguments to a trace line and remove another trace line until we actually will have the skb to trace along with a future implementation. Sponsored by: The FreeBSD Foundation (cherry picked from commit 149c457de14a06a40e0419d7a4249b1a3b01ae7a) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 5e5f7e4a0a69..6f48ac74996b 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -573,7 +573,7 @@ __skb_queue_tail(struct sk_buff_head *q, struct sk_buff *new) static inline void skb_queue_tail(struct sk_buff_head *q, struct sk_buff *new) { - SKB_TRACE2(q, skb); + SKB_TRACE2(q, new); return (__skb_queue_tail(q, new)); } @@ -1048,7 +1048,6 @@ static inline struct sk_buff * napi_build_skb(void *data, size_t len) { - SKB_TRACE(skb); SKB_TODO(); return (NULL); } From nobody Wed Nov 29 16:38:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3v64gjz52wXF; Wed, 29 Nov 2023 16:38: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 4SgQ3v3J2Mz3HBv; Wed, 29 Nov 2023 16:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IuSqTQnn1rjx39erw8yzVxEyZPIGCzJlmg192IKnHJM=; b=Hiz+YCAXt0KKDolMyoJdUZjoXaPnSlLzb6PV0FNfK0qAkyWh3raMH2VmHWiQ/iN+b5J2K6 7fT4P+NVN7Ts3DhX9+waJgoWZSUmo2MElOSytaACKyXmcxx/k35u2UKELmhcou6r+DGwKh tNWKeDLNcuhWc9pU1HchbRbPGsjrFiTD0gdYURGAktZh3WZiBvYSJ2+BbMqsRApDRVBkqD doMJUMkZfju8bDmYGEzF997opgVikaVKg4pJugpyZ79hzCbtzGX5X/WCTk2dj/Uo/w6FGd aKLhmRBwJ0DFjOIzxvTLoPJvT0XREIVyyr84uxnqYNOCoc0xv5Fyzbsa2YtJnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IuSqTQnn1rjx39erw8yzVxEyZPIGCzJlmg192IKnHJM=; b=hkui4G+tECQGPCS3TwcK13zXGYtXB7GnawXrIooxaVL4t3oRBpvOPL2SrzXmikI+fLDYkq 3FAnWQpHQh87i5t23qFrKhv8ntxfuZLeB3sebso5sWdEIioSIC1WzHi6AZ7ls5BbmiUwHy cFqiAkBJ/JtlrXTofeRtqF0ZqeSYjpbLt/7itodun7MfGBE6n0TUjvRwWo9hWtzTBsjt4o 6EDh931WH71b70WJR0N5yWVi1S/FXrWqMG2DlGSjrlWBhthqF6IlPNmBpfnlzvM4ILXn49 1cA/AEaVfcC+7//Of+9eak2sJkg9anaMI+KaE34/xf4x65Q8adD3kQmvhI9Sdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275883; a=rsa-sha256; cv=none; b=X51W/QOsRH8vFnIkz6s/OnmF2E9ZP7hQUWXm5Z+FMAIiGUolvXOOUpdcno9h4qnmxi0eVX Jtjw4T156jq+ZFidaMDawiZRO9mRgw9On1gyqgnXJgKBiStPFD6+viF5KsR4QGNYG3cBB5 9H1IAkN4XWoVj3BqcKqUCU44uM5rZzipOxMDgMl8C5OEuXlwelXd+mT3tdhTc/LT0GPjwn rpvtkh9C1GcGA5u2d2QaLiW5lN1+UsAC4tYW5plN1kImFaPbqdtUfTGpxHHeT3yHPwsu1N /8Vg3+BZxzGaajVX6LbvkSX0U19QrPDXfJbBc6Tl5LqoyM+ghHEGVlbUro9uUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3v2632z1CZw; Wed, 29 Nov 2023 16:38: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 3ATGc3KN044815; Wed, 29 Nov 2023 16:38:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGc3TP044812; Wed, 29 Nov 2023 16:38:03 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:03 GMT Message-Id: <202311291638.3ATGc3TP044812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 934b2489b951 - stable/13 - linuxkpi: Fix __sg_alloc_table_from_pages loop List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 934b2489b951698adc5d4c3421fa66fb80be7052 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=934b2489b951698adc5d4c3421fa66fb80be7052 commit 934b2489b951698adc5d4c3421fa66fb80be7052 Author: Austin Shafer AuthorDate: 2023-04-21 07:56:50 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:05 +0000 linuxkpi: Fix __sg_alloc_table_from_pages loop Commit 3e0856b63fe0e375a0951e05c2ef98bb2ebd9421 updated __sg_alloc_table_from_pages to use the same API as linux, but modified the loop condition when going over the pages in a sg list. Part of the change included moving the sg_next call out of the for loop and into the body, which causes an off by one error when traversing the list. Since sg_next is called before the loop body it will skip the first element and read one past the last element. This caused panics when running PRIME with nvidia-drm as the off-by-one issue causes a NULL dereference. (cherry picked from commit 3f686532c9b4fd603d4ad2d3392232cff24188f4) Commit 3f686532c9b4 tried to fix an issue with not properly starting at the first page in the sg list to prevent a panic. This worked but with the side effect of incrementing "s" during the final iteration causing it to be NULL since the list had ended. In cases non-DEBUG kernels this causes a panic with drm-5.15, since "s" is NULL when we later pass it to sg_mark_end(). This change decouples the iteration sg from the return value so that it is never incremented past the final page in the chain. (cherry picked from commit 09b0401e91a92bcb58ea1873857b42f8211f660f) --- sys/compat/linuxkpi/common/include/linux/scatterlist.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/scatterlist.h b/sys/compat/linuxkpi/common/include/linux/scatterlist.h index 17928f9c50e5..e462d5c649f1 100644 --- a/sys/compat/linuxkpi/common/include/linux/scatterlist.h +++ b/sys/compat/linuxkpi/common/include/linux/scatterlist.h @@ -343,7 +343,7 @@ __sg_alloc_table_from_pages(struct sg_table *sgt, { unsigned int i, segs, cur, len; int rc; - struct scatterlist *s; + struct scatterlist *s, *sg_iter; #if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51300 if (prv != NULL) { @@ -377,11 +377,17 @@ __sg_alloc_table_from_pages(struct sg_table *sgt, #endif cur = 0; - for (i = 0, s = sgt->sgl; i < sgt->orig_nents; i++) { + for_each_sg(sgt->sgl, sg_iter, sgt->orig_nents, i) { unsigned long seg_size; unsigned int j; - s = sg_next(s); + /* + * We need to make sure that when we exit this loop "s" has the + * last sg in the chain so we can call sg_mark_end() on it. + * Only set this inside the loop since sg_iter will be iterated + * until it is NULL. + */ + s = sg_iter; len = 0; for (j = cur + 1; j < count; ++j) { From nobody Wed Nov 29 16:38:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3w6w32z52wsC; Wed, 29 Nov 2023 16:38: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 4SgQ3w4D1Rz3HC6; Wed, 29 Nov 2023 16:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/99CfDmrkYshYaATn/FrZrlItu/fbMo6RfatDTLTCDs=; b=XSEvj616rZVHpEYpMhQUEdhQYslcEzDoqdkVdkC2hwhMloWnVUoNRD2BqSnUgi3U2xuTAy g+rP1QPAEqQ4WIbKrWoiX22U7RFdqXD86izgqQLDyiLs/RxYOywGQQxz/T6hZo/1l5ywTo 1K2NzpZpUPW3JKzsRCDBhTh55jKNHvLTg5K7HXSSOOsMVWgjcOcxdpMKLpkjDK/fI5apfP eMjX7wBx+dfnFa4q0D2S7zcs1qS5dBYCovSVoiW/+0VXZnewYXcVYpVhKoeV6aYs92ujbi LRssxNeYIzUBpnglOdP71x8wZXZzRtDEN6gx24GIKr5+k52ERnz+gv5vEXzzjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/99CfDmrkYshYaATn/FrZrlItu/fbMo6RfatDTLTCDs=; b=dm4veiP4v6Kvv04T92xA7/dusabCvMBEvy7pRkx3ODNYCv5RqPWx8Wn5vF4Oq9lo+98pTp y8NcLU9UwwWzTXreFg+fvEsbihI5ySALTgq7faC+YqK5HbJzxzxJ14JdUH0fx7DyO6MnHi NL5G9/HmWQByYIxhWQWyF4NTG546qZ1S9E699IboYJSmwSydugVZVTVmK7Fp4W1EV0RWgr CE/lQPw9Ir+O8UQbbjcrgIi7PZU1wd4Xz5g+0a2ZNLXOFuXovVUUJhsFO09DKUUuT3i9Rv Si/aWEqT8R6XG3qYixSa+jbnPSOowIx93G3i51FWg4lu6jhwwf75WRpP/vp3lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275884; a=rsa-sha256; cv=none; b=H4PQxlTxggNo2NwsCP51F7Vo4z5jRC0MHYO+Io+dgwA53o91vf5oJ5MX6nGFrEfiUrm31N yUmMpjRC1zLuOr0MlD4g+KowYEJuqlxS6ZW8mFHKyt3sPLxnAHXTt9chweiryDe6PsWChl fE4aYChTGeZHLYWxNB0HjdUqKkkH0K+w92ZQhAYUN2HAsAoOrk6vuHRT5gI3wq3PWnCh6M JXdcBcbO2t27aIktjP6hpLl6IOz8sWJipSXMTURA6XN4opQvuM2z22PVnVnW/QqF3dKSev SWxlwMTBWVh4PO4RIxn4BEX2eOfFCnnVAarN2o6igj/qe0+d7py+GcfwjDzB8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3w3K8Gz1Bwj; Wed, 29 Nov 2023 16:38: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 3ATGc4fc044857; Wed, 29 Nov 2023 16:38:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGc4LU044854; Wed, 29 Nov 2023 16:38:04 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:04 GMT Message-Id: <202311291638.3ATGc4LU044854@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c4b6c6c2d408 - stable/13 - LinuxKPI: skbuff: add skb_cow_head() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c4b6c6c2d4083de4bdbbcfc8d39573e30d799501 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c4b6c6c2d4083de4bdbbcfc8d39573e30d799501 commit c4b6c6c2d4083de4bdbbcfc8d39573e30d799501 Author: Bjoern A. Zeeb AuthorDate: 2023-08-10 02:07:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:05 +0000 LinuxKPI: skbuff: add skb_cow_head() Add dummy implementation of skb_cow_head(). Sponsored by: The FreeBSD Foundation (cherry picked from commit e039b38d4652b6a68567f8d632c3dfa4f15c40f6) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 6f48ac74996b..c917b3f09ac9 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -1067,6 +1067,14 @@ skb_mark_for_recycle(struct sk_buff *skb) SKB_TODO(); } +static inline int +skb_cow_head(struct sk_buff *skb, unsigned int headroom) +{ + SKB_TRACE(skb); + SKB_TODO(); + return (-1); +} + #define SKB_WITH_OVERHEAD(_s) \ (_s) - ALIGN(sizeof(struct skb_shared_info), CACHE_LINE_SIZE) From nobody Wed Nov 29 16:38:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3x5n0Nz52wyv; Wed, 29 Nov 2023 16:38: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 4SgQ3x5LwXz3H4r; Wed, 29 Nov 2023 16: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=1701275885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AWFbntDhb1bmJPbo1JNz25Txym5pqQ4SYpbuLzqimW4=; b=EayEYoSQw94y7QDHH0QpVl1TgPtDHgiCBBXy7PRiAkglqVmTfh4VVJZbfMFM9ratM5sRQh ZqXK3gF0ogSZSpzSTutmGFiHO9FeKpzejgGi7CIwTSbftt7hN2xO2uuZuovRudpqRbdUMT ndeHpAJk3eD26YyG77TLBT4WV6wLzTi/FZixEPqi/msmM/Y4npiWlbClH0sezgMDld1kA+ nyzryf0YUMgA7SurE39kn74gB0DyeXzNy9c2xhnSLLWKWEY98RlGgvBTYRDtW/+KL9Mnbq 43kMvVGpnyupgFL59y6H3cIM5oPETADKx7fwIT8qaQKmgoo4cDqX5eqfqXwbmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AWFbntDhb1bmJPbo1JNz25Txym5pqQ4SYpbuLzqimW4=; b=ANvSf3MxntNLAcLSb6WTFqXmwFPdlWWfJngELwxVPF8W7wtmxI9Krf3svXad2CGPfjcEon TmC8bEfk45+9lUcFUXzxzLUcJzSCIpUyvQl+d+p0+FafUa0ZiRPNoP4gJpdU6PxKx+IIDC XkA1MXs9thaAaex31s38NBhunOamhKsmq++ePPRnpOzXXShmUgExsJOngrk47YembzqQqb X0fi3qcbeN6id9rXx6Ym+mGvn4kgAyXMUsYUKe0qRLbLfsjMhSFFz8KqnWefVHF3Y+Xa1R bQW83x8oQ9NrT6UZXo1ioIcdnrUe0Wahkc1itXQezFSvAY4PBwwC8xOHMoU/kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275885; a=rsa-sha256; cv=none; b=RVlvoZCqL0bkp6QvNklUqm0mhjXKYuz+pRcG1WAHd4q3Jyz7PbbI+ibMeJUdrtBMaHNe6D wHr6DXpl4hqRDamHt8r5q2tJKhBFBmsv04g+/l1ApIaYfGIh8RDp75816EW6Rm4QdTxiHC lyaxxTw0qfNTYTfmtCSg9378HXLAoAAe8RfmqPk8XpUcflS0i5lzZN4EabTuVVPOgSmRP9 D3C8IiJ9i6BqYbbe4Pzv9e3YK5ZmFYBd/GkJDuy9EXxVbuTWmeLsS00+SD16b1d6DCrVjw Wi8rDz4l39WDl2z8aSPyHSUOYuRnBBUse3mkPgBs8F7/tgRPe8LchHTb4WMAFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3x4Qdwz1CXh; Wed, 29 Nov 2023 16: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 3ATGc5Ol044911; Wed, 29 Nov 2023 16: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 3ATGc57b044908; Wed, 29 Nov 2023 16:38:05 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:05 GMT Message-Id: <202311291638.3ATGc57b044908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: cd13e7704579 - stable/13 - iwlwifi/rtw88: temporary disable build for updates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cd13e7704579344405655d9170a707d3a7119702 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cd13e7704579344405655d9170a707d3a7119702 commit cd13e7704579344405655d9170a707d3a7119702 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 17:04:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:05 +0000 iwlwifi/rtw88: temporary disable build for updates Disconnect iwlwifi/rtw88 from the build for a few commits which, due to incompatible LinuxKPI 802.11 changes would break the build for a revision. It will be re-enabled "instantly". Sponsored by: The FreeBSD Foundation (cherry picked from commit b75d1ce6c10652fc4bfbf509deeae0e05c3d1356) --- sys/modules/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index e607c5f69e1a..71b22941f261 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -540,7 +540,7 @@ _ipoib= ipoib _iser= iser .endif _ipmi= ipmi -_iwlwifi= iwlwifi +#_iwlwifi= iwlwifi .if ${MK_SOURCELESS_UCODE} != "no" _iwlwififw= iwlwififw .endif @@ -556,9 +556,8 @@ _mthca= mthca _mlx4ib= mlx4ib _mlx5ib= mlx5ib .endif - _ossl= ossl -_rtw88= rtw88 +#_rtw88= rtw88 .if ${MK_SOURCELESS_UCODE} != "no" _rtw88fw= rtw88fw .endif From nobody Wed Nov 29 16:38:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ3y6Ynzz52wsJ; Wed, 29 Nov 2023 16: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 4SgQ3y6JY4z3HR8; Wed, 29 Nov 2023 16: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=1701275886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t9G0XS+mGTJhQ/3FKx0ojMVKebKy4LnorcbNnzQ8GhM=; b=pVdYFju5t2PVtabrKW0R9Bu/TDcmu6wr1VQfjj841EbnLGcVG4frHnceaMqzKVTgZj8yvm 7hk+TxsUWw4WXQF4AaGNylJ8WMS+MKTGyNpgGEY8hGgGA/Lv2FGHmzV/1QsjemAsjYUm80 CgTLvIGRDINotglhdj/D8wXFz4m6sWSwhszwaQX0c6Jqz/1jktAHk3RKV0yfLEJrXm/nx2 CQ1oPyF51TaBP8miZyN5y3lRsAeIA6cwqCZaLdJyo3ktJtmjfUJ27ItABvF/rcT0yJXIVg uEZUYtzmjF8Q78nb+Htps20KKGlsPXqk8Rj2aR6mcyXiPo/cmdflhgnv1HgSWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t9G0XS+mGTJhQ/3FKx0ojMVKebKy4LnorcbNnzQ8GhM=; b=nG0tVP+4zdeEXfgiJyEB4OXQ48uNwK6GcrAaMlXpqOFo/FJDAIp4PptjtSpYRoodZyp24J 24RllXBag1gvLO0jW1APZmemUAeJBK8Mn2lUqjk2XKwZuBuqOtnCwdGT+064Lk9m/oS45A feZD5d72yLOnjRPrOZ1Jev09BlylLpupHGjrmzQXIEKcUqIhuVUHy1yEdwecD63yFq+vsc SjNTx+zaAez8jbMXDhMvjxSQJUx2hQHyvLpLvIafQWsTWgSRRQL21KT3FnkzSOvWKerC8h 6jJAXuIoko8nEhx4ZUyE3vb8kDUZ7tdP4V8SOxrkiuH0VZAsUqZz1fAOiElivQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275886; a=rsa-sha256; cv=none; b=BjLP2GqHiqwJNYMVJyIEjiQb6d36UMeejU4+37djuQwUncJ0rz3grykRqgiszcivJfcPa6 e4Xp2+mBDEZQpSHpY257+/jftF9ys5hIj/di9VmMKwXGDCQXntM1TvxbOuAsIqSWqp2BIi wQikBp9GzrrVMNJRuPO13G6sHYUxd9LVMtLoSmbuvF5kvPuKgpf1OYX97hstlYrra0ZAqV pzuJHer1sRdYhyvpX0MDhTw8XGQj57wF94itK6kHPCdy5rkg78+xF6hAAu1ABdxSWqysD4 lCnrwOQJhSYH1zzihibFC88SFcbV+udYQOeBBLJJuTsbHdr/fV5DXvvIWMeqqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3y5Pvjz1C7T; Wed, 29 Nov 2023 16: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 3ATGc6YW044965; Wed, 29 Nov 2023 16: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 3ATGc69I044962; Wed, 29 Nov 2023 16:38:06 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:06 GMT Message-Id: <202311291638.3ATGc69I044962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9a9bb0d0fbf4 - stable/13 - LinuxKPI: 802.11: update compat code for updated drivers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9a9bb0d0fbf461282dfca6a8e11cbeabde791a28 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9a9bb0d0fbf461282dfca6a8e11cbeabde791a28 commit 9a9bb0d0fbf461282dfca6a8e11cbeabde791a28 Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 22:07:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:05 +0000 LinuxKPI: 802.11: update compat code for updated drivers Adjust and add structs, fields, functions to make more modern versions of LinuxKPI based wireless drivers (based on wireless-testing ( wt-2023-06-09, wt-2023-07-24, and later)) compile. Some of these changes can only be applied once all drivers get updated to not break the old versions currently in the tree. Mark those changes with __FOR_LATER_DRV_UPDATE for now and flip the switch at a later point. Sponsored by: The FreeBSD Foundation (cherry picked from commit adff403fe7a870c5b7a2d7e003d445c3b409bc0c) --- .../linuxkpi/common/include/linux/ieee80211.h | 60 ++++- sys/compat/linuxkpi/common/include/linux/nl80211.h | 38 ++- sys/compat/linuxkpi/common/include/net/cfg80211.h | 161 +++++++++++- sys/compat/linuxkpi/common/include/net/mac80211.h | 280 +++++++++++++++++++-- sys/compat/linuxkpi/common/src/linux_80211.c | 15 +- sys/compat/linuxkpi/dummy/include/net/gso.h | 0 6 files changed, 509 insertions(+), 45 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 4e37ee612921..4648a12ec889 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2021 The FreeBSD Foundation + * Copyright (c) 2020-2023 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -60,9 +60,10 @@ struct ieee80211_mmie_16 { #define IEEE80211_INVAL_HW_QUEUE ((uint8_t)-1) -#define IEEE80211_MAX_AMPDU_BUF_HT 0x40 #define IEEE80211_MAX_AMPDU_BUF 256 /* for HE? */ +#define IEEE80211_MAX_AMPDU_BUF_HT 64 #define IEEE80211_MAX_AMPDU_BUF_HE 256 +#define IEEE80211_MAX_AMPDU_BUF_EHT 1024 #define IEEE80211_MAX_FRAME_LEN 2352 #define IEEE80211_MAX_DATA_LEN (2300 + IEEE80211_CRC_LEN) @@ -140,8 +141,8 @@ enum ieee80211_min_mpdu_start_spacing { IEEE80211_HT_MPDU_DENSITY_NONE = 0, #if 0 IEEE80211_HT_MPDU_DENSITY_XXX = 1, /* 1/4 us */ - IEEE80211_HT_MPDU_DENSITY_YYY = 2, /* 1/2 us */ #endif + IEEE80211_HT_MPDU_DENSITY_0_5 = 2, /* 1/2 us */ IEEE80211_HT_MPDU_DENSITY_1 = 3, /* 1 us */ IEEE80211_HT_MPDU_DENSITY_2 = 4, /* 2 us */ IEEE80211_HT_MPDU_DENSITY_4 = 5, /* 4us */ @@ -159,6 +160,7 @@ enum ieee80211_min_mpdu_start_spacing { #define IEEE80211_FCTL_FROMDS (IEEE80211_FC1_DIR_FROMDS << 8) #define IEEE80211_FCTL_TODS (IEEE80211_FC1_DIR_TODS << 8) #define IEEE80211_FCTL_MOREFRAGS (IEEE80211_FC1_MORE_FRAG << 8) +#define IEEE80211_FCTL_PM (IEEE80211_FC1_PWR_MGT << 8) #define IEEE80211_FTYPE_MGMT IEEE80211_FC0_TYPE_MGT #define IEEE80211_FTYPE_CTL IEEE80211_FC0_TYPE_CTL @@ -170,8 +172,12 @@ enum ieee80211_min_mpdu_start_spacing { #define IEEE80211_STYPE_DISASSOC IEEE80211_FC0_SUBTYPE_DISASSOC #define IEEE80211_STYPE_AUTH IEEE80211_FC0_SUBTYPE_AUTH #define IEEE80211_STYPE_DEAUTH IEEE80211_FC0_SUBTYPE_DEAUTH +#define IEEE80211_STYPE_CTS IEEE80211_FC0_SUBTYPE_CTS +#define IEEE80211_STYPE_RTS IEEE80211_FC0_SUBTYPE_RTS #define IEEE80211_STYPE_ACTION IEEE80211_FC0_SUBTYPE_ACTION #define IEEE80211_STYPE_QOS_DATA IEEE80211_FC0_SUBTYPE_QOS_DATA +#define IEEE80211_STYPE_QOS_NULLFUNC IEEE80211_FC0_SUBTYPE_QOS_NULL +#define IEEE80211_STYPE_QOS_CFACK 0xd0 /* XXX-BZ reserved? */ #define IEEE80211_NUM_ACS 4 /* net8021::WME_NUM_AC */ @@ -211,15 +217,19 @@ enum ieee80211_tdls_action_code { /* 11-255 reserved */ }; -/* 9.4.2.27, Table 9-135. Extended Capabilities field. */ +/* 802.11-2020 9.4.2.26, Table 9-153. Extended Capabilities field. */ /* This is split up into octets CAPA1 = octet 1, ... */ #define WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING BIT(2 % 8) #define WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT BIT(22 % 8) +#define WLAN_EXT_CAPA3_TIMING_MEASUREMENT_SUPPORT BIT(23 % 8) #define WLAN_EXT_CAPA8_OPMODE_NOTIF BIT(62 % 8) +#define WLAN_EXT_CAPA8_MAX_MSDU_IN_AMSDU_LSB BIT(63 % 8) +#define WLAN_EXT_CAPA9_MAX_MSDU_IN_AMSDU_MSB BIT(64 % 8) +#define WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT BIT(77 % 8) +#define WLAN_EXT_CAPA10_TWT_RESPONDER_SUPPORT BIT(78 % 8) +#define WLAN_EXT_CAPA10_OBSS_NARROW_BW_RU_TOLERANCE_SUPPORT BIT(79 % 8) -#define WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT BIT(5) /* XXX */ -#define WLAN_EXT_CAPA10_OBSS_NARROW_BW_RU_TOLERANCE_SUPPORT BIT(7) /* XXX */ -#define WLAN_EXT_CAPA10_TWT_RESPONDER_SUPPORT BIT(6) /* XXX */ +#define WLAN_EXT_CAPA11_EMA_SUPPORT 0x00 /* XXX TODO FIXME */ /* iwlwifi/mvm/utils:: for (ac = IEEE80211_AC_VO; ac <= IEEE80211_AC_VI; ac++) */ @@ -262,6 +272,8 @@ enum ieee80211_ac_numbers { #define IEEE80211_HT_MCS_RX_HIGHEST_MASK 0x3ff #define IEEE80211_HT_MCS_MASK_LEN 10 +#define IEEE80211_MLD_MAX_NUM_LINKS 15 + struct ieee80211_mcs_info { uint8_t rx_mask[IEEE80211_HT_MCS_MASK_LEN]; uint16_t rx_highest; @@ -384,12 +396,20 @@ enum ieee80211_tx_info_flags { IEEE80211_TX_CTL_HW_80211_ENCAP = BIT(16), IEEE80211_TX_CTL_USE_MINRATE = BIT(17), IEEE80211_TX_CTL_RATE_CTRL_PROBE = BIT(18), + IEEE80211_TX_CTL_LDPC = BIT(19), + IEEE80211_TX_CTL_STBC = BIT(20), +}; + +enum ieee80211_tx_status_flags { + IEEE80211_TX_STATUS_ACK_SIGNAL_VALID = BIT(0), }; enum ieee80211_tx_control_flags { /* XXX TODO .. right shift numbers */ IEEE80211_TX_CTRL_PORT_CTRL_PROTO = BIT(0), IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1), + IEEE80211_TX_CTRL_RATE_INJECT = BIT(2), + IEEE80211_TX_CTRL_MLO_LINK = 0xF0000000, /* This is IEEE80211_LINK_UNSPECIFIED on the high bits. */ }; enum ieee80211_tx_rate_flags { @@ -404,6 +424,8 @@ enum ieee80211_tx_rate_flags { IEEE80211_TX_RC_USE_SHORT_PREAMBLE = BIT(7), }; +#define IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED -128 + #define IEEE80211_HT_CTL_LEN 4 struct ieee80211_hdr { /* net80211::ieee80211_frame_addr4 */ @@ -511,11 +533,28 @@ struct ieee80211_mgmt { /* Optional follows... */ uint8_t variable[0]; } addba_req; + /* XXX */ + struct { + uint8_t dialog_token; + } wnm_timing_msr; } u; } action; } u; }; +struct ieee80211_cts { /* net80211::ieee80211_frame_cts */ + __le16 frame_control; + __le16 duration; + uint8_t ra[ETH_ALEN]; +} __packed; + +struct ieee80211_rts { /* net80211::ieee80211_frame_rts */ + __le16 frame_control; + __le16 duration; + uint8_t ra[ETH_ALEN]; + uint8_t ta[ETH_ALEN]; +} __packed; + #define MHZ_TO_KHZ(_f) ((_f) * 1000) #define DBI_TO_MBI(_g) ((_g) * 100) #define MBI_TO_DBI(_x) ((_x) / 100) @@ -546,6 +585,7 @@ enum ieee80211_eid { WLAN_EID_HT_CAPABILITY = 45, /* IEEE80211_ELEMID_HTCAP */ WLAN_EID_RSN = 48, /* IEEE80211_ELEMID_RSN */ WLAN_EID_EXT_SUPP_RATES = 50, + WLAN_EID_EXT_NON_INHERITANCE = 56, WLAN_EID_EXT_CHANSWITCH_ANN = 60, WLAN_EID_MULTIPLE_BSSID = 71, /* IEEE80211_ELEMID_MULTIBSSID */ WLAN_EID_MULTI_BSSID_IDX = 85, @@ -650,6 +690,12 @@ struct ieee80211_bssid_index { int bssid_index; }; +enum ieee80211_reg_ap_power { + IEEE80211_REG_LPI_AP, + IEEE80211_REG_SP_AP, + IEEE80211_REG_VLP_AP, +}; + /* net80211: IEEE80211_IS_CTL() */ static __inline bool ieee80211_is_ctl(__le16 fc) diff --git a/sys/compat/linuxkpi/common/include/linux/nl80211.h b/sys/compat/linuxkpi/common/include/linux/nl80211.h index 93b40361202d..5b43ff675e19 100644 --- a/sys/compat/linuxkpi/common/include/linux/nl80211.h +++ b/sys/compat/linuxkpi/common/include/linux/nl80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2021 The FreeBSD Foundation + * Copyright (c) 2020-2023 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -78,6 +78,8 @@ enum nl80211_reg_rule_flags { NL80211_RRF_NO_160MHZ = BIT(8), NL80211_RRF_NO_HE = BIT(9), NL80211_RRF_NO_OFDM = BIT(10), + NL80211_RRF_NO_320MHZ = BIT(11), + NL80211_RRF_NO_EHT = BIT(12), }; #define NL80211_RRF_NO_HT40 (NL80211_RRF_NO_HT40MINUS|NL80211_RRF_NO_HT40PLUS) @@ -143,6 +145,7 @@ enum nl80211_chan_width { NL80211_CHAN_WIDTH_160, NL80211_CHAN_WIDTH_5, NL80211_CHAN_WIDTH_10, + NL80211_CHAN_WIDTH_320, }; enum nl80211_iftype { @@ -159,6 +162,7 @@ enum nl80211_iftype { NL80211_IFTYPE_MESH_POINT, NL80211_IFTYPE_WDS, NL80211_IFTYPE_OCB, + NL80211_IFTYPE_NAN, /* Keep this last. */ NUM_NL80211_IFTYPES @@ -223,6 +227,9 @@ enum nl80211_ext_feature { NL80211_EXT_FEATURE_FILS_DISCOVERY, NL80211_EXT_FEATURE_RADAR_BACKGROUND, NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP, + NL80211_EXT_FEATURE_BEACON_PROTECTION, + NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT, + NL80211_EXT_FEATURE_PUNCT, /* Keep this last. */ NUM_NL80211_EXT_FEATURES @@ -247,10 +254,13 @@ enum nl80211_sta_info { NL80211_STA_INFO_TX_PACKETS, NL80211_STA_INFO_TX_BYTES, NL80211_STA_INFO_TX_BYTES64, + NL80211_STA_INFO_RX_BYTES64, NL80211_STA_INFO_TX_FAILED, NL80211_STA_INFO_TX_RETRIES, NL80211_STA_INFO_RX_DURATION, NL80211_STA_INFO_TX_DURATION, + NL80211_STA_INFO_ACK_SIGNAL, + NL80211_STA_INFO_ACK_SIGNAL_AVG, }; enum nl80211_ftm_stats { @@ -326,6 +336,31 @@ enum nl80211_he_ltf { NL80211_RATE_INFO_HE_4XLTF, }; +enum nl80211_eht_gi { + NL80211_RATE_INFO_EHT_GI_0_8, + NL80211_RATE_INFO_EHT_GI_1_6, + NL80211_RATE_INFO_EHT_GI_3_2, +}; + +enum nl80211_eht_ru_alloc { + NL80211_RATE_INFO_EHT_RU_ALLOC_26, + NL80211_RATE_INFO_EHT_RU_ALLOC_52, + NL80211_RATE_INFO_EHT_RU_ALLOC_52P26, + NL80211_RATE_INFO_EHT_RU_ALLOC_106, + NL80211_RATE_INFO_EHT_RU_ALLOC_106P26, + NL80211_RATE_INFO_EHT_RU_ALLOC_242, + NL80211_RATE_INFO_EHT_RU_ALLOC_484, + NL80211_RATE_INFO_EHT_RU_ALLOC_484P242, + NL80211_RATE_INFO_EHT_RU_ALLOC_996, + NL80211_RATE_INFO_EHT_RU_ALLOC_996P484, + NL80211_RATE_INFO_EHT_RU_ALLOC_996P484P242, + NL80211_RATE_INFO_EHT_RU_ALLOC_2x996, + NL80211_RATE_INFO_EHT_RU_ALLOC_2x996P484, + NL80211_RATE_INFO_EHT_RU_ALLOC_3x996, + NL80211_RATE_INFO_EHT_RU_ALLOC_3x996P484, + NL80211_RATE_INFO_EHT_RU_ALLOC_4x996, +}; + enum nl80211_dfs_regions { NL80211_DFS_UNSET, NL80211_DFS_FCC, @@ -352,6 +387,7 @@ enum nl80211_tid_cfg_attr { NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL, NL80211_TID_CONFIG_ATTR_RETRY_LONG, NL80211_TID_CONFIG_ATTR_AMPDU_CTRL, + NL80211_TID_CONFIG_ATTR_AMSDU_CTRL, }; enum nl80211_tid_config { diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 43d4cd662c97..56ca9a231d2d 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -70,10 +70,11 @@ enum rfkill_hard_block_reasons { #define IEEE80211_MAX_CHAINS 4 /* net80211: IEEE80211_MAX_CHAINS copied */ enum cfg80211_rate_info_flags { - RATE_INFO_FLAGS_SHORT_GI = BIT(0), - RATE_INFO_FLAGS_MCS = BIT(1), - RATE_INFO_FLAGS_VHT_MCS = BIT(2), - RATE_INFO_FLAGS_HE_MCS = BIT(3), + RATE_INFO_FLAGS_MCS = BIT(0), + RATE_INFO_FLAGS_VHT_MCS = BIT(1), + RATE_INFO_FLAGS_SHORT_GI = BIT(2), + RATE_INFO_FLAGS_HE_MCS = BIT(4), + RATE_INFO_FLAGS_EHT_MCS = BIT(7), /* Max 8 bits as used in struct rate_info. */ }; @@ -149,6 +150,8 @@ enum rate_info_bw { RATE_INFO_BW_80, RATE_INFO_BW_160, RATE_INFO_BW_HE_RU, + RATE_INFO_BW_320, + RATE_INFO_BW_EHT_RU, }; struct rate_info { @@ -160,6 +163,7 @@ struct rate_info { uint8_t he_dcm; uint8_t he_gi; uint8_t he_ru_alloc; + uint8_t eht_gi; }; struct ieee80211_rate { @@ -224,6 +228,7 @@ struct ieee80211_sta_ht_cap { #define IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK \ (7 << IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT) /* IEEE80211_VHTCAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK */ +#define IEEE80211_VHT_CAP_EXT_NSS_BW_MASK 0xc0000000 struct ieee80211_sta_vht_cap { /* TODO FIXME */ @@ -362,7 +367,7 @@ struct cfg80211_ssid { struct cfg80211_scan_6ghz_params { /* XXX TODO */ uint8_t *bssid; - int channel_idx, psc_no_listen, short_ssid, short_ssid_valid, unsolicited_probe; + int channel_idx, psc_no_listen, short_ssid, short_ssid_valid, unsolicited_probe, psd_20; }; struct cfg80211_match_set { @@ -529,6 +534,7 @@ struct station_info { int generation, inactive_time, rx_bytes, rx_dropped_misc, rx_packets, signal, tx_bytes, tx_packets; int filled, rx_beacon, rx_beacon_signal_avg, signal_avg; int rx_duration, tx_duration, tx_failed, tx_retries; + int ack_signal, avg_ack_signal; int chains; uint8_t chain_signal[IEEE80211_MAX_CHAINS]; @@ -656,6 +662,7 @@ struct linuxkpi_ieee80211_regdomain { #define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_2G 0x10 #define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G 0x20 #define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK 0x40 +#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL 0xff #define IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A 0x1 #define IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD 0x2 @@ -753,12 +760,95 @@ struct linuxkpi_ieee80211_regdomain { #define IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED 0x1 #define IEEE80211_HE_OPERATION_BSS_COLOR_OFFSET 0x2 +#define IEEE80211_HE_OPERATION_ER_SU_DISABLE 0x4 #define IEEE80211_HE_SPR_HESIGA_SR_VAL15_ALLOWED 0x01 #define IEEE80211_HE_SPR_NON_SRG_OBSS_PD_SR_DISALLOWED 0x02 #define IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT 0x04 #define IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT 0x08 +#define IEEE80211_EHT_MAC_CAP0_EPCS_PRIO_ACCESS 0x01 +#define IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_11454 0x02 +#define IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK 0x03 +#define IEEE80211_EHT_MAC_CAP0_OM_CONTROL 0x04 +#define IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE1 0x05 +#define IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE2 0x06 +#define IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_7991 0x07 + +#define IEEE80211_EHT_MAC_CAP1_MAX_AMPDU_LEN_MASK 0x01 + +#define IEEE80211_EHT_MCS_NSS_RX 0x01 +#define IEEE80211_EHT_MCS_NSS_TX 0x02 + +#define IEEE80211_EHT_PHY_CAP0_242_TONE_RU_GT20MHZ 0x01 +#define IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ 0x02 +#define IEEE80211_EHT_PHY_CAP0_BEAMFORMEE_SS_80MHZ_MASK 0x03 +#define IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI 0x04 +#define IEEE80211_EHT_PHY_CAP0_PARTIAL_BW_UL_MU_MIMO 0x05 +#define IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE 0x06 +#define IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER 0x07 + +#define IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_160MHZ_MASK 0x01 +#define IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_320MHZ_MASK 0x02 +#define IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_80MHZ_MASK 0x03 + +#define IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_80MHZ_MASK 0x01 +#define IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_160MHZ_MASK 0x02 +#define IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK 0x03 + +#define IEEE80211_EHT_PHY_CAP3_CODEBOOK_4_2_SU_FDBK 0x01 +#define IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK 0x02 +#define IEEE80211_EHT_PHY_CAP3_NG_16_MU_FEEDBACK 0x03 +#define IEEE80211_EHT_PHY_CAP3_NG_16_SU_FEEDBACK 0x04 +#define IEEE80211_EHT_PHY_CAP3_TRIG_CQI_FDBK 0x05 +#define IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK 0x06 +#define IEEE80211_EHT_PHY_CAP3_TRIG_SU_BF_FDBK 0x07 +#define IEEE80211_EHT_PHY_CAP3_SOUNDING_DIM_320MHZ_MASK 0x08 + +#define IEEE80211_EHT_PHY_CAP4_EHT_MU_PPDU_4_EHT_LTF_08_GI 0x01 +#define IEEE80211_EHT_PHY_CAP4_PART_BW_DL_MU_MIMO 0x02 +#define IEEE80211_EHT_PHY_CAP4_POWER_BOOST_FACT_SUPP 0x03 +#define IEEE80211_EHT_PHY_CAP4_MAX_NC_MASK 0x04 + +#define IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_0US 0x01 +#define IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US 0x02 +#define IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_20US 0x03 +#define IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_8US 0x04 +#define IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK 0x05 +#define IEEE80211_EHT_PHY_CAP5_NON_TRIG_CQI_FEEDBACK 0x06 +#define IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT 0x07 +#define IEEE80211_EHT_PHY_CAP5_RX_LESS_242_TONE_RU_SUPP 0x08 +#define IEEE80211_EHT_PHY_CAP5_TX_LESS_242_TONE_RU_SUPP 0x09 +#define IEEE80211_EHT_PHY_CAP5_MAX_NUM_SUPP_EHT_LTF_MASK 0x0a +#define IEEE80211_EHT_PHY_CAP5_SUPP_EXTRA_EHT_LTF 0x0b + +#define IEEE80211_EHT_PHY_CAP6_EHT_DUP_6GHZ_SUPP 0x01 +#define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK 0x02 +#define IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK 0x03 + +#define IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ 0x01 +#define IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ 0x02 +#define IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ 0x03 +#define IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ 0x04 +#define IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ 0x05 +#define IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_320MHZ 0x06 + +#define IEEE80211_EHT_PHY_CAP8_RX_1024QAM_WIDER_BW_DL_OFDMA 0x01 +#define IEEE80211_EHT_PHY_CAP8_RX_4096QAM_WIDER_BW_DL_OFDMA 0x02 + +#define IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE 0x01 +#define IEEE80211_EHT_PPE_THRES_NSS_MASK 0x02 +#define IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK 0x03 +#define IEEE80211_EHT_PPE_THRES_INFO_PPET_SIZE 0x04 + +#define IEEE80211_EML_CAP_EMLSR_SUPP 0x01 +#define IEEE80211_EML_CAP_TRANSITION_TIMEOUT 0x02 +#define IEEE80211_EML_CAP_TRANSITION_TIMEOUT_128TU 0x04 +#define IEEE80211_EML_CAP_EMLSR_PADDING_DELAY 0x08 +#define IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_32US 0x10 +#define IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY 0x20 +#define IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_64US 0x40 + #define VENDOR_CMD_RAW_DATA (void *)(uintptr_t)(-ENOENT) struct ieee80211_he_cap_elem { @@ -804,11 +894,51 @@ struct ieee80211_sta_he_6ghz_capa { int capa; }; +struct ieee80211_eht_mcs_nss_supp_20mhz_only { + uint8_t rx_tx_mcs7_max_nss; + uint8_t rx_tx_mcs9_max_nss; + uint8_t rx_tx_mcs11_max_nss; + uint8_t rx_tx_mcs13_max_nss; +}; + +struct ieee80211_eht_mcs_nss_supp_bw { + uint8_t rx_tx_mcs9_max_nss; + uint8_t rx_tx_mcs11_max_nss; + uint8_t rx_tx_mcs13_max_nss; +}; + +struct ieee80211_eht_cap_elem_fixed { + uint8_t mac_cap_info[2]; + uint8_t phy_cap_info[9]; +}; + +struct ieee80211_eht_mcs_nss_supp { + /* TODO FIXME */ + /* Can only have either or... */ + union { + struct ieee80211_eht_mcs_nss_supp_20mhz_only only_20mhz; + struct { + struct ieee80211_eht_mcs_nss_supp_bw _80; + struct ieee80211_eht_mcs_nss_supp_bw _160; + struct ieee80211_eht_mcs_nss_supp_bw _320; + } bw; + }; +}; + +#define IEEE80211_STA_EHT_PPE_THRES_MAX 32 +struct ieee80211_sta_eht_cap { + bool has_eht; + struct ieee80211_eht_cap_elem_fixed eht_cap_elem; + struct ieee80211_eht_mcs_nss_supp eht_mcs_nss_supp; + uint8_t eht_ppe_thres[IEEE80211_STA_EHT_PPE_THRES_MAX]; +}; + struct ieee80211_sband_iftype_data { /* TODO FIXME */ enum nl80211_iftype types_mask; struct ieee80211_sta_he_cap he_cap; struct ieee80211_sta_he_6ghz_capa he_6ghz_capa; + struct ieee80211_sta_eht_cap eht_cap; struct { const uint8_t *data; size_t len; @@ -900,7 +1030,7 @@ struct cfg80211_gtk_rekey_data { struct cfg80211_tid_cfg { /* XXX TODO */ - int mask, noack, retry_long, rtscts, tids; + int mask, noack, retry_long, rtscts, tids, amsdu, ampdu; enum nl80211_tx_rate_setting txrate_type; struct cfg80211_bitrate_mask txrate_mask; }; @@ -938,6 +1068,11 @@ struct regulatory_request { int user_reg_hint_type; }; +struct cfg80211_set_hw_timestamp { + const uint8_t *macaddr; + bool enable; +}; + enum wiphy_vendor_cmd_need_flags { WIPHY_VENDOR_CMD_NEED_NETDEV = 0x01, WIPHY_VENDOR_CMD_NEED_RUNNING = 0x02, @@ -960,6 +1095,7 @@ struct wiphy_iftype_ext_capab { const uint8_t *extended_capabilities; const uint8_t *extended_capabilities_mask; uint8_t extended_capabilities_len; + uint16_t eml_capabilities; }; @@ -996,6 +1132,7 @@ enum wiphy_flags { WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD = BIT(13), WIPHY_FLAG_4ADDR_AP = BIT(14), WIPHY_FLAG_4ADDR_STATION = BIT(15), + WIPHY_FLAG_SUPPORTS_MLO = BIT(16), }; struct wiphy { @@ -1037,6 +1174,8 @@ struct wiphy { int max_data_retry_count; int tx_queue_len, rfkill; int mbssid_max_interfaces; + int hw_timestamp_max_peers; + int ema_max_profile_periodicity; unsigned long ext_features[BITS_TO_LONGS(NUM_NL80211_EXT_FEATURES)]; struct dentry *debugfsdir; @@ -1816,7 +1955,7 @@ cfg80211_background_radar_event(struct wiphy *wiphy, } static __inline const u8 * -cfg80211_find_ext_ie(uint8_t eid, uint8_t *p, size_t len) +cfg80211_find_ext_ie(uint8_t eid, const uint8_t *p, size_t len) { TODO(); return (NULL); @@ -1829,6 +1968,14 @@ cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef) return (false); } +static __inline const struct ieee80211_sta_eht_cap * +ieee80211_get_eht_iftype_cap(const struct ieee80211_supported_band *band, + enum nl80211_iftype iftype) +{ + TODO(); + return (NULL); +} + #define wiphy_info(wiphy, fmt, ...) \ printf("%s:%d XXX TODO " fmt, __func__, __LINE__, __VA_ARGS__) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 5597300e18c9..cacf9d652fd0 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2022 The FreeBSD Foundation + * Copyright (c) 2020-2023 The FreeBSD Foundation * Copyright (c) 2020-2022 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from @@ -50,6 +50,8 @@ #define WLAN_OUI_TYPE_WFA_P2P (9) #define WLAN_OUI_WFA (0x506F9A) +#define IEEE80211_LINK_UNSPECIFIED 0x0f + /* hw->conf.flags */ enum ieee80211_hw_conf_flags { IEEE80211_CONF_IDLE = BIT(0), @@ -114,6 +116,7 @@ enum ieee80211_bss_changed { BSS_CHANGED_HE_OBSS_PD = BIT(27), BSS_CHANGED_TWT = BIT(28), BSS_CHANGED_UNSOL_BCAST_PROBE_RESP = BIT(30), + BSS_CHANGED_EHT_PUNCTURING = BIT(31), }; /* 802.11 Figure 9-256 Suite selector format. [OUI(3), SUITE TYPE(1)] */ @@ -224,6 +227,15 @@ struct ieee80211_chanctx_conf { struct ieee80211_rate_status { struct rate_info rate_idx; + uint8_t try_count; +}; + +struct ieee80211_ema_beacons { + uint8_t cnt; + struct { + struct sk_buff *skb; + struct ieee80211_mutable_offsets offs; + } bcn[0]; }; #define WLAN_MEMBERSHIP_LEN (8) @@ -231,7 +243,11 @@ struct ieee80211_rate_status { struct ieee80211_bss_conf { /* TODO FIXME */ + struct ieee80211_vif *vif; const uint8_t *bssid; + uint8_t addr[ETH_ALEN]; + uint8_t link_id; + uint8_t _pad0; uint8_t transmitter_bssid[ETH_ALEN]; struct ieee80211_ftm_responder_params *ftmr_params; struct ieee80211_p2p_noa_attr p2p_noa_attr; @@ -248,11 +264,28 @@ struct ieee80211_bss_conf { } he_oper; struct cfg80211_he_bss_color he_bss_color; struct ieee80211_he_obss_pd he_obss_pd; + + bool ht_ldpc; + bool vht_ldpc; + bool he_ldpc; + bool vht_mu_beamformee; + bool vht_mu_beamformer; + bool vht_su_beamformee; + bool vht_su_beamformer; + bool he_mu_beamformer; + bool he_su_beamformee; + bool he_su_beamformer; + bool he_full_ul_mumimo; + bool eht_su_beamformee; + bool eht_su_beamformer; + bool eht_mu_beamformer; + size_t ssid_len; uint8_t ssid[IEEE80211_NWID_LEN]; uint16_t aid; uint16_t ht_operation_mode; int arp_addr_cnt; + uint16_t eht_puncturing; uint8_t dtim_period; uint8_t sync_dtim_count; @@ -265,16 +298,20 @@ struct ieee80211_bss_conf { bool use_short_preamble; bool use_short_slot; bool he_support; + bool eht_support; bool csa_active; + bool mu_mimo_owner; uint32_t sync_device_ts; uint64_t sync_tsf; uint16_t beacon_int; int16_t txpower; uint32_t basic_rates; int mcast_rate[NUM_NL80211_BANDS]; + enum ieee80211_reg_ap_power power_type; struct cfg80211_bitrate_mask beacon_tx_rate; struct mac80211_fils_discovery fils_discovery; struct ieee80211_chanctx_conf *chanctx_conf; + struct ieee80211_vif *mbssid_tx_vif; int ack_enabled, bssid_index, bssid_indicator, cqm_rssi_hyst, cqm_rssi_thold, ema_ap, frame_time_rts_th, ftm_responder; int htc_trig_based_pkt_ext; @@ -410,6 +447,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_SUPPORTS_RX_DECAP_OFFLOAD, IEEE80211_HW_SUPPORTS_TX_ENCAP_OFFLOAD, IEEE80211_HW_SUPPORTS_RC_TABLE, + IEEE80211_HW_DETECTS_COLOR_COLLISION, /* Keep last. */ NUM_IEEE80211_HW_FLAGS @@ -477,6 +515,7 @@ struct ieee80211_key_conf { uint16_t flags; uint8_t keylen; uint8_t key[0]; + int8_t link_id; /* signed! */ }; struct ieee80211_key_seq { @@ -529,31 +568,47 @@ enum ieee80211_rx_status_flags { RX_FLAG_ONLY_MONITOR = BIT(25), RX_FLAG_SKIP_MONITOR = BIT(26), RX_FLAG_8023 = BIT(27), + RX_FLAG_RADIOTAP_TLV_AT_END = BIT(28), }; enum mac80211_rx_encoding { RX_ENC_LEGACY = 0, RX_ENC_HT, RX_ENC_VHT, - RX_ENC_HE + RX_ENC_HE, + RX_ENC_EHT, }; struct ieee80211_rx_status { /* TODO FIXME, this is too large. Over-reduce types to u8 where possible. */ - uint64_t boottime_ns; + union { + uint64_t boottime_ns; + int64_t ack_tx_hwtstamp; + }; uint64_t mactime; uint32_t device_timestamp; enum ieee80211_rx_status_flags flag; uint16_t freq; - uint8_t encoding:2, bw:3, he_ru:3; /* enum mac80211_rx_encoding, rate_info_bw */ /* See mt76.h */ + uint8_t encoding:3, bw:4; /* enum mac80211_rx_encoding, rate_info_bw */ /* See mt76.h */ uint8_t ampdu_reference; uint8_t band; uint8_t chains; int8_t chain_signal[IEEE80211_MAX_CHAINS]; int8_t signal; uint8_t enc_flags; - uint8_t he_dcm; - uint8_t he_gi; + union { + struct { + uint8_t he_ru:3; /* nl80211::enum nl80211_he_ru_alloc */ + uint8_t he_gi:2; /* nl80211::enum nl80211_he_gi */ + uint8_t he_dcm:1; + }; + struct { + uint8_t ru:4; /* nl80211::enum nl80211_eht_ru_alloc */ + uint8_t gi:2; /* nl80211::enum nl80211_eht_gi */ + } eht; + }; + bool link_valid; + uint8_t link_id; /* very incosistent sizes? */ uint8_t zero_length_psdu_type; uint8_t nss; uint8_t rate_idx; @@ -562,6 +617,7 @@ struct ieee80211_rx_status { struct ieee80211_tx_status { struct ieee80211_sta *sta; struct ieee80211_tx_info *info; + int64_t ack_hwtstamp; u8 n_rates; struct ieee80211_rate_status *rates; @@ -608,17 +664,22 @@ struct ieee80211_sta_txpwr { short power; }; +#define IEEE80211_NUM_TIDS 16 /* net80211::WME_NUM_TID */ struct ieee80211_sta_agg { - /* XXX TODO */ - int max_amsdu_len; + uint16_t max_amsdu_len; + uint16_t max_rc_amsdu_len; + uint16_t max_tid_amsdu_len[IEEE80211_NUM_TIDS]; }; struct ieee80211_link_sta { + uint8_t addr[ETH_ALEN]; + uint8_t link_id; uint32_t supp_rates[NUM_NL80211_BANDS]; struct ieee80211_sta_ht_cap ht_cap; struct ieee80211_sta_vht_cap vht_cap; struct ieee80211_sta_he_cap he_cap; struct ieee80211_sta_he_6ghz_capa he_6ghz_capa; + struct ieee80211_sta_eht_cap eht_cap; uint8_t rx_nss; enum ieee80211_sta_rx_bw bandwidth; enum ieee80211_smps_mode smps_mode; @@ -626,21 +687,27 @@ struct ieee80211_link_sta { struct ieee80211_sta_txpwr txpwr; }; -#define IEEE80211_NUM_TIDS 16 /* net80211::WME_NUM_TID */ struct ieee80211_sta { /* TODO FIXME */ - int max_amsdu_len, max_amsdu_subframes, max_rc_amsdu_len; + int max_amsdu_subframes; int mfp, smps_mode, tdls, tdls_initiator; struct ieee80211_txq *txq[IEEE80211_NUM_TIDS + 1]; /* iwlwifi: 8 and adds +1 to tid_data, net80211::IEEE80211_TID_SIZE */ struct ieee80211_sta_rates *rates; /* some rcu thing? */ - uint32_t max_tid_amsdu_len[IEEE80211_NUM_TIDS]; uint8_t addr[ETH_ALEN]; uint16_t aid; bool wme; uint8_t max_sp; uint8_t uapsd_queues; + uint16_t valid_links; struct ieee80211_link_sta deflink; + struct ieee80211_link_sta *link[IEEE80211_MLD_MAX_NUM_LINKS]; /* rcu? */ + +#ifndef __FOR_LATER_DRV_UPDATE + uint16_t max_rc_amsdu_len; + uint16_t max_amsdu_len; + uint16_t max_tid_amsdu_len[IEEE80211_NUM_TIDS]; +#endif /* Must stay last. */ uint8_t drv_priv[0] __aligned(CACHE_LINE_SIZE); @@ -681,16 +748,24 @@ enum ieee80211_vif_driver_flags { IEEE80211_VIF_BEACON_FILTER = BIT(0), IEEE80211_VIF_SUPPORTS_CQM_RSSI = BIT(1), IEEE80211_VIF_SUPPORTS_UAPSD = BIT(2), + IEEE80211_VIF_DISABLE_SMPS_OVERRIDE = BIT(3), }; #define IEEE80211_BSS_ARP_ADDR_LIST_LEN 4 struct ieee80211_vif_cfg { uint16_t aid; + uint16_t eml_cap; + uint16_t eml_med_sync_delay; bool assoc; bool ps; + bool idle; + bool ibss_joined; int arp_addr_cnt; + size_t ssid_len; uint32_t arp_addr_list[IEEE80211_BSS_ARP_ADDR_LIST_LEN]; /* big endian */ + uint8_t ssid[IEEE80211_NWID_LEN]; + uint8_t ap_addr[ETH_ALEN]; }; struct ieee80211_vif { @@ -707,7 +782,11 @@ struct ieee80211_vif { struct ieee80211_chanctx_conf *chanctx_conf; struct ieee80211_txq *txq; struct ieee80211_bss_conf bss_conf; + struct ieee80211_bss_conf *link_conf[IEEE80211_MLD_MAX_NUM_LINKS]; /* rcu? */ uint8_t hw_queue[IEEE80211_NUM_ACS]; + uint16_t active_links; + uint16_t valid_links; + struct ieee80211_vif *mbssid_tx_vif; /* #ifdef CONFIG_MAC80211_DEBUGFS */ /* Do not change structure depending on compile-time option. */ struct dentry *debugfs_dir; @@ -720,6 +799,7 @@ struct ieee80211_vif { struct ieee80211_vif_chanctx_switch { struct ieee80211_chanctx_conf *old_ctx, *new_ctx; struct ieee80211_vif *vif; + struct ieee80211_bss_conf *link_conf; }; struct ieee80211_prep_tx_info { @@ -750,7 +830,7 @@ struct ieee80211_tx_info { uint8_t ampdu_len; uint8_t antenna; uint16_t tx_time; - bool is_valid_ack_signal; + uint8_t flags; void *status_driver_data[16 / sizeof(void *)]; /* XXX TODO */ } status; #define IEEE80211_TX_INFO_DRIVER_DATA_SIZE 40 @@ -792,11 +872,10 @@ enum ieee80211_iface_iter { IEEE80211_IFACE_ITER_NORMAL = BIT(0), IEEE80211_IFACE_ITER_RESUME_ALL = BIT(1), IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER = BIT(2), /* seems to be an iter flag */ + IEEE80211_IFACE_ITER_ACTIVE = BIT(3), /* Internal flags only. */ - /* ieee80211_iterate_active_interfaces*(). */ IEEE80211_IFACE_ITER__ATOMIC = BIT(6), - IEEE80211_IFACE_ITER__ACTIVE = BIT(7), IEEE80211_IFACE_ITER__MTX = BIT(8), }; @@ -864,6 +943,7 @@ struct ieee80211_ops { void (*mgd_protect_tdls_discover)(struct ieee80211_hw *, struct ieee80211_vif *); void (*flush)(struct ieee80211_hw *, struct ieee80211_vif *, u32, bool); + void (*flush_sta)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *); int (*set_frag_threshold)(struct ieee80211_hw *, u32); @@ -933,6 +1013,7 @@ struct ieee80211_ops { int (*set_key)(struct ieee80211_hw *, enum set_key_cmd, struct ieee80211_vif *, struct ieee80211_sta *, struct ieee80211_key_conf *); void (*set_default_unicast_key)(struct ieee80211_hw *, struct ieee80211_vif *, int); void (*update_tkip_key)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_key_conf *, struct ieee80211_sta *, u32, u16 *); + void (*set_rekey_data)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_gtk_rekey_data *); int (*start_pmsr)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_pmsr_request *); void (*abort_pmsr)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_pmsr_request *); @@ -961,6 +1042,14 @@ struct ieee80211_ops { void (*add_twt_setup)(struct ieee80211_hw *, struct ieee80211_sta *, struct ieee80211_twt_setup *); void (*twt_teardown_request)(struct ieee80211_hw *, struct ieee80211_sta *, u8); + int (*set_hw_timestamp)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_set_hw_timestamp *); + + void (*link_info_changed)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, u64); + void (*vif_cfg_changed)(struct ieee80211_hw *, struct ieee80211_vif *, u64); + + int (*change_vif_links)(struct ieee80211_hw *, struct ieee80211_vif *, u16, u16, struct ieee80211_bss_conf *[IEEE80211_MLD_MAX_NUM_LINKS]); + int (*change_sta_links)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, u16, u16); + /* #ifdef CONFIG_MAC80211_DEBUGFS */ /* Do not change depending on compile-time option. */ void (*sta_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, struct dentry *); /* #endif */ @@ -1017,7 +1106,7 @@ void linuxkpi_ieee80211_queue_work(struct ieee80211_hw *, struct work_struct *); struct sk_buff *linuxkpi_ieee80211_pspoll_get(struct ieee80211_hw *, struct ieee80211_vif *); struct sk_buff *linuxkpi_ieee80211_nullfunc_get(struct ieee80211_hw *, - struct ieee80211_vif *, bool); + struct ieee80211_vif *, int, bool); void linuxkpi_ieee80211_txq_get_depth(struct ieee80211_txq *, unsigned long *, unsigned long *); struct wireless_dev *linuxkpi_ieee80211_vif_to_wdev(struct ieee80211_vif *); @@ -1140,6 +1229,37 @@ ieee80211_restart_hw(struct ieee80211_hw *hw) linuxkpi_ieee80211_restart_hw(hw); } +static inline void +ieee80211_hw_restart_disconnect(struct ieee80211_vif *vif) +{ + TODO(); +} + +/* -------------------------------------------------------------------------- */ + +#define link_conf_dereference_check(_vif, _linkid) \ + rcu_dereference_check((_vif)->link_conf[_linkid], true) + +#define link_conf_dereference_protected(_vif, _linkid) \ + rcu_dereference_protected((_vif)->link_conf[_linkid], true) + +#define link_sta_dereference_check(_sta, _linkid) \ + rcu_dereference_check((_sta)->link[_linkid], true) + +#define link_sta_dereference_protected(_sta, _linkid) \ + rcu_dereference_protected((_sta)->link[_linkid], true) + +#define for_each_vif_active_link(_vif, _link, _linkid) \ + for (_linkid = 0; _linkid < nitems((_vif)->link_conf); _linkid++) \ + if ( ((_vif)->active_links == 0 /* no MLO */ || \ + ((_vif)->active_links & BIT(_linkid)) != 0) && \ + (_link = rcu_dereference((_vif)->link_conf[_linkid])) ) + +#define for_each_sta_active_link(_vif, _sta, _linksta, _linkid) \ + for (_linkid = 0; _linkid < nitems((_vif)->link_conf); _linkid++) \ + if ( ((_vif)->active_links == 0 /* no MLO */ || \ + ((_vif)->active_links & BIT(_linkid)) != 0) && \ + (_linksta = link_sta_dereference_protected((_sta), (_linkid))) ) /* -------------------------------------------------------------------------- */ @@ -1301,8 +1421,18 @@ ieee80211_is_back_req(__le16 fc) } static __inline bool +#ifdef __FOR_LATER_DRV_UPDATE +ieee80211_is_bufferable_mmpdu(struct sk_buff *skb) +{ + struct ieee80211_mgmt *mgmt; + __le16 fc; + + mgmt = (struct ieee80211_mgmt *)skb->data; + fc = mgmt->frame_control; +#else ieee80211_is_bufferable_mmpdu(__le16 fc) *** 299 LINES SKIPPED *** From nobody Wed Nov 29 16:38:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ400qNDz52wsM; Wed, 29 Nov 2023 16:38: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 4SgQ400fD4z3H7s; Wed, 29 Nov 2023 16:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wU7LlYGmKDVhJchZguHoNKCCekv9LRcH9YVNt9T4/G0=; b=ptvDm1g0ZaXUtqOvrOE6x7j/T0uQNIgD3sRq+m0UBi2FdsKoeQfnXK1sVWuuOmIQZNydWG 8SeDToOejZLWohzU8CzGPiBf6EpFx31bde1sgyQKX6DC5X/lsNAoA1oJSwFPNxEk+o09ry vf8F8jYRxpEIfixYAlbGG8iuo2SqF9u2d7y8Zxc64JR5uuHIiFhoNKtMpO8cVmRAaSz32i cWeA0i7sc8bR3rxFd3YTSZM+kn2h25JUxvKRHcH04vtNtPblmAj3EdE6oM6zw1XbVwCpje bE8XKG57IGJeAa5M2AFiTR7mPY7hs7obG09uUYmITrGDBMe5nitCz6inkJHIjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wU7LlYGmKDVhJchZguHoNKCCekv9LRcH9YVNt9T4/G0=; b=vsfegGhoWVuvy/BpTUvMwXYSaNyNXItH/JJ3MiWkQfh7ptHOz9Mngh19/CPmmTVcsI5uqd sBNEGF4zUxzp8trbCV8yyWVaOyznSSsuqhPf+5Jnacti0wBdD3ggJJsIEaJhtReZ8H6Qvw igpipqgjwDY6chbxnHmulQolMj8MkVHa8S3T/nEgtFt+kkPq/jE98DWJF4+gO65eO6db0Z +Nq87DHbyWQkoZF2+5JVd5iWLMB1W9jgWI3uJSUWF3gAKRaQ9VR3kEee36tkhI7IDzo2cy vKeIHYbT1SJuRaSg6d5XS4qY3PVi9/bIWca72g2wffOzfJ9ddbV8C3Bmpn+aZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275888; a=rsa-sha256; cv=none; b=TfGh5APyenFJUmoNCPgHvyV1vDCtEFSg++9b7X4NTYtlTEBkTvvGTJk+lHrnwx7zp42Y4A yrAhnDm83/jDiIdkTJbNlplQzRRh4wTq2Smjm1f8dvsCD8+d6Cab6bi7VYR4iEqpdnb0as fNT6HB1hKAqC6Bvimrf0MEXMla6J3ogG/nBCXeScLCjfklOsXT9fjWqAVPnadQSwkelVx/ 7m/0SPi/hJumRcEDr/GTOADhtk25Rn1yViL75G894dqvTjMxYXk9ZHsw1vp/+MkeAziMHk 3d1uaGHjgrCXw+vnBUZ0MEvkbNxNgu/b3F+YP1FT4hYC5wGwiy4FcGsnV9sssA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ3z6hqjz1C7V; Wed, 29 Nov 2023 16:38: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 3ATGc7L4045010; Wed, 29 Nov 2023 16:38:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGc7FX045007; Wed, 29 Nov 2023 16:38:07 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:07 GMT Message-Id: <202311291638.3ATGc7FX045007@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: acd8edb9723f - stable/13 - rtw88: update driver from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: acd8edb9723f397ea248a24f26b94064dff57d01 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=acd8edb9723f397ea248a24f26b94064dff57d01 commit acd8edb9723f397ea248a24f26b94064dff57d01 Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 23:19:34 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:05 +0000 rtw88: update driver from upstream This is a combined version of updates of the rtw88 driver based on wireless-testing (wt-2023-05-11) 711dca0ca3d77414f8f346e564e9c8640147f40d (after v6.4-rc1), (wt-2023-06-09) 7bd20e011626ccc3ad53e57873452b1716fcfaaa (after v6.4-rc5), (wt-2023-07-24) 62e409149b62a285e89018e49b2e115757fb9022 (after v6.5-rc3), (wt-2023-08-06) 2a220a15be657a24868368892e3e2caba2115283 (after v6.5-rc4). This update follows other currently disconnected LinuxKPI based wireless drivers to lift them all to a same version in case someone else wants to work on this driver in parallel to predominant iwlwifi efforts. MFC after: 20 days (cherry picked from commit 90aac0d83bc9645f51ef0c2aeae6f9c0540bb031) --- sys/contrib/dev/rtw88/Makefile | 78 +++ sys/contrib/dev/rtw88/bf.c | 17 +- sys/contrib/dev/rtw88/coex.c | 93 ++- sys/contrib/dev/rtw88/coex.h | 14 +- sys/contrib/dev/rtw88/debug.c | 85 ++- sys/contrib/dev/rtw88/debug.h | 1 + sys/contrib/dev/rtw88/efuse.c | 4 +- sys/contrib/dev/rtw88/fw.c | 220 ++++-- sys/contrib/dev/rtw88/fw.h | 47 +- sys/contrib/dev/rtw88/hci.h | 9 +- sys/contrib/dev/rtw88/mac.c | 119 +++- sys/contrib/dev/rtw88/mac.h | 1 - sys/contrib/dev/rtw88/mac80211.c | 89 ++- sys/contrib/dev/rtw88/main.c | 451 +++++++++--- sys/contrib/dev/rtw88/main.h | 81 ++- sys/contrib/dev/rtw88/pci.c | 89 +-- sys/contrib/dev/rtw88/phy.c | 71 +- sys/contrib/dev/rtw88/phy.h | 2 +- sys/contrib/dev/rtw88/ps.c | 57 +- sys/contrib/dev/rtw88/ps.h | 2 + sys/contrib/dev/rtw88/reg.h | 15 + sys/contrib/dev/rtw88/regd.c | 2 + sys/contrib/dev/rtw88/rtw8723d.c | 43 +- sys/contrib/dev/rtw88/rtw8723d.h | 19 +- sys/contrib/dev/rtw88/rtw8723ds.c | 41 ++ sys/contrib/dev/rtw88/rtw8723du.c | 39 ++ sys/contrib/dev/rtw88/rtw8821c.c | 54 +- sys/contrib/dev/rtw88/rtw8821c.h | 27 + sys/contrib/dev/rtw88/rtw8821cs.c | 36 + sys/contrib/dev/rtw88/rtw8821cu.c | 53 ++ sys/contrib/dev/rtw88/rtw8822b.c | 32 +- sys/contrib/dev/rtw88/rtw8822b.h | 8 +- sys/contrib/dev/rtw88/rtw8822bs.c | 36 + sys/contrib/dev/rtw88/rtw8822bu.c | 93 +++ sys/contrib/dev/rtw88/rtw8822c.c | 37 +- sys/contrib/dev/rtw88/rtw8822c.h | 8 +- sys/contrib/dev/rtw88/rtw8822cs.c | 36 + sys/contrib/dev/rtw88/rtw8822cu.c | 47 ++ sys/contrib/dev/rtw88/sdio.c | 1404 +++++++++++++++++++++++++++++++++++++ sys/contrib/dev/rtw88/sdio.h | 178 +++++ sys/contrib/dev/rtw88/tx.c | 149 ++-- sys/contrib/dev/rtw88/tx.h | 138 ++-- sys/contrib/dev/rtw88/usb.c | 919 ++++++++++++++++++++++++ sys/contrib/dev/rtw88/usb.h | 100 +++ sys/contrib/dev/rtw88/util.c | 104 ++- sys/contrib/dev/rtw88/util.h | 11 +- sys/contrib/dev/rtw88/wow.c | 2 +- 47 files changed, 4610 insertions(+), 551 deletions(-) diff --git a/sys/contrib/dev/rtw88/Makefile b/sys/contrib/dev/rtw88/Makefile new file mode 100644 index 000000000000..fd212c09d88a --- /dev/null +++ b/sys/contrib/dev/rtw88/Makefile @@ -0,0 +1,78 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + +obj-$(CONFIG_RTW88_CORE) += rtw88_core.o +rtw88_core-y += main.o \ + mac80211.o \ + util.o \ + debug.o \ + tx.o \ + rx.o \ + mac.o \ + phy.o \ + coex.o \ + efuse.o \ + fw.o \ + ps.o \ + sec.o \ + bf.o \ + sar.o \ + regd.o + +rtw88_core-$(CONFIG_PM) += wow.o + +obj-$(CONFIG_RTW88_8822B) += rtw88_8822b.o +rtw88_8822b-objs := rtw8822b.o rtw8822b_table.o + +obj-$(CONFIG_RTW88_8822BE) += rtw88_8822be.o +rtw88_8822be-objs := rtw8822be.o + +obj-$(CONFIG_RTW88_8822BS) += rtw88_8822bs.o +rtw88_8822bs-objs := rtw8822bs.o + +obj-$(CONFIG_RTW88_8822BU) += rtw88_8822bu.o +rtw88_8822bu-objs := rtw8822bu.o + +obj-$(CONFIG_RTW88_8822C) += rtw88_8822c.o +rtw88_8822c-objs := rtw8822c.o rtw8822c_table.o + +obj-$(CONFIG_RTW88_8822CE) += rtw88_8822ce.o +rtw88_8822ce-objs := rtw8822ce.o + +obj-$(CONFIG_RTW88_8822CS) += rtw88_8822cs.o +rtw88_8822cs-objs := rtw8822cs.o + +obj-$(CONFIG_RTW88_8822CU) += rtw88_8822cu.o +rtw88_8822cu-objs := rtw8822cu.o + +obj-$(CONFIG_RTW88_8723D) += rtw88_8723d.o +rtw88_8723d-objs := rtw8723d.o rtw8723d_table.o + +obj-$(CONFIG_RTW88_8723DE) += rtw88_8723de.o +rtw88_8723de-objs := rtw8723de.o + +obj-$(CONFIG_RTW88_8723DS) += rtw88_8723ds.o +rtw88_8723ds-objs := rtw8723ds.o + +obj-$(CONFIG_RTW88_8723DU) += rtw88_8723du.o +rtw88_8723du-objs := rtw8723du.o + +obj-$(CONFIG_RTW88_8821C) += rtw88_8821c.o +rtw88_8821c-objs := rtw8821c.o rtw8821c_table.o + +obj-$(CONFIG_RTW88_8821CE) += rtw88_8821ce.o +rtw88_8821ce-objs := rtw8821ce.o + +obj-$(CONFIG_RTW88_8821CS) += rtw88_8821cs.o +rtw88_8821cs-objs := rtw8821cs.o + +obj-$(CONFIG_RTW88_8821CU) += rtw88_8821cu.o +rtw88_8821cu-objs := rtw8821cu.o + +obj-$(CONFIG_RTW88_PCI) += rtw88_pci.o +rtw88_pci-objs := pci.o + +obj-$(CONFIG_RTW88_SDIO) += rtw88_sdio.o +rtw88_sdio-objs := sdio.o + +obj-$(CONFIG_RTW88_USB) += rtw88_usb.o +rtw88_usb-objs := usb.o diff --git a/sys/contrib/dev/rtw88/bf.c b/sys/contrib/dev/rtw88/bf.c index d207fa5c122f..16c6a1d972e5 100644 --- a/sys/contrib/dev/rtw88/bf.c +++ b/sys/contrib/dev/rtw88/bf.c @@ -30,11 +30,11 @@ void rtw_bf_disassoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, struct ieee80211_bss_conf *bss_conf) { + const struct rtw_chip_info *chip = rtwdev->chip; struct ieee80211_hw *hw = rtwdev->hw; struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv; struct rtw_bfee *bfee = &rtwvif->bfee; struct rtw_bf_info *bfinfo = &rtwdev->bf_info; - struct rtw_chip_info *chip = rtwdev->chip; struct ieee80211_sta *sta; struct ieee80211_sta_vht_cap *vht_cap; struct ieee80211_sta_vht_cap *ic_vht_cap; @@ -49,6 +49,8 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, sta = ieee80211_find_sta(vif, bssid); if (!sta) { + rcu_read_unlock(); + #if defined(__linux__) rtw_warn(rtwdev, "failed to find station entry for bss %pM\n", bssid); @@ -56,23 +58,25 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, rtw_warn(rtwdev, "failed to find station entry for bss %6D\n", bssid, ":"); #endif - goto out_unlock; + return; } ic_vht_cap = &hw->wiphy->bands[NL80211_BAND_5GHZ]->vht_cap; vht_cap = &sta->deflink.vht_cap; + rcu_read_unlock(); + if ((ic_vht_cap->cap & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE) && (vht_cap->cap & IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE)) { if (bfinfo->bfer_mu_cnt >= chip->bfer_mu_max_num) { rtw_dbg(rtwdev, RTW_DBG_BF, "mu bfer number over limit\n"); - goto out_unlock; + return; } ether_addr_copy(bfee->mac_addr, bssid); bfee->role = RTW_BFEE_MU; bfee->p_aid = (bssid[5] << 1) | (bssid[4] >> 7); - bfee->aid = bss_conf->aid; + bfee->aid = vif->cfg.aid; bfinfo->bfer_mu_cnt++; rtw_chip_config_bfee(rtwdev, rtwvif, bfee, true); @@ -80,7 +84,7 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, (vht_cap->cap & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE)) { if (bfinfo->bfer_su_cnt >= chip->bfer_su_max_num) { rtw_dbg(rtwdev, RTW_DBG_BF, "su bfer number over limit\n"); - goto out_unlock; + return; } sound_dim = vht_cap->cap & @@ -103,9 +107,6 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, rtw_chip_config_bfee(rtwdev, rtwvif, bfee, true); } - -out_unlock: - rcu_read_unlock(); } void rtw_bf_init_bfer_entry_mu(struct rtw_dev *rtwdev, diff --git a/sys/contrib/dev/rtw88/coex.c b/sys/contrib/dev/rtw88/coex.c index cac053f485c3..86467d2f8888 100644 --- a/sys/contrib/dev/rtw88/coex.c +++ b/sys/contrib/dev/rtw88/coex.c @@ -13,7 +13,7 @@ static u8 rtw_coex_next_rssi_state(struct rtw_dev *rtwdev, u8 pre_state, u8 rssi, u8 rssi_thresh) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; u8 tol = chip->rssi_tolerance; u8 next_state; @@ -36,7 +36,7 @@ static u8 rtw_coex_next_rssi_state(struct rtw_dev *rtwdev, u8 pre_state, static void rtw_coex_limited_tx(struct rtw_dev *rtwdev, bool tx_limit_en, bool ampdu_limit_en) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; u8 num_of_active_port = 1; @@ -365,7 +365,7 @@ static void rtw_coex_set_wl_pri_mask(struct rtw_dev *rtwdev, u8 bitmap, void rtw_coex_write_scbd(struct rtw_dev *rtwdev, u16 bitpos, bool set) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; u16 val = 0x2; @@ -400,7 +400,7 @@ EXPORT_SYMBOL(rtw_coex_write_scbd); static u16 rtw_coex_read_scbd(struct rtw_dev *rtwdev) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; if (!chip->scbd_support) return 0; @@ -410,7 +410,7 @@ static u16 rtw_coex_read_scbd(struct rtw_dev *rtwdev) static void rtw_coex_check_rfk(struct rtw_dev *rtwdev) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_rfe *coex_rfe = &coex->rfe; @@ -489,7 +489,7 @@ static void rtw_coex_monitor_bt_ctr(struct rtw_dev *rtwdev) static void rtw_coex_monitor_bt_enable(struct rtw_dev *rtwdev) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_dm *coex_dm = &coex->dm; @@ -524,10 +524,10 @@ static void rtw_coex_monitor_bt_enable(struct rtw_dev *rtwdev) static void rtw_coex_update_wl_link_info(struct rtw_dev *rtwdev, u8 reason) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_dm *coex_dm = &coex->dm; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_traffic_stats *stats = &rtwdev->stats; bool is_5G = false; bool wl_busy = false; @@ -633,7 +633,7 @@ static struct sk_buff *rtw_coex_info_request(struct rtw_dev *rtwdev, struct rtw_coex *coex = &rtwdev->coex; struct sk_buff *skb_resp = NULL; - mutex_lock(&coex->mutex); + lockdep_assert_held(&rtwdev->mutex); rtw_fw_query_bt_mp_info(rtwdev, req); @@ -650,7 +650,6 @@ static struct sk_buff *rtw_coex_info_request(struct rtw_dev *rtwdev, } out: - mutex_unlock(&coex->mutex); return skb_resp; } @@ -706,10 +705,10 @@ static const char *rtw_coex_get_bt_status_string(u8 bt_status) static void rtw_coex_update_bt_link_info(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_dm *coex_dm = &coex->dm; - struct rtw_chip_info *chip = rtwdev->chip; u8 i; u8 rssi_state; u8 rssi_step; @@ -806,7 +805,7 @@ static void rtw_coex_update_bt_link_info(struct rtw_dev *rtwdev) static void rtw_coex_update_wl_ch_info(struct rtw_dev *rtwdev, u8 type) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; struct rtw_coex_dm *coex_dm = &rtwdev->coex.dm; struct rtw_coex_stat *coex_stat = &rtwdev->coex.stat; @@ -933,7 +932,7 @@ EXPORT_SYMBOL(rtw_coex_write_indirect_reg); static void rtw_coex_coex_ctrl_owner(struct rtw_dev *rtwdev, bool wifi_control) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; const struct rtw_hw_reg *btg_reg = chip->btg_reg; if (wifi_control) { @@ -981,7 +980,7 @@ static void rtw_coex_mimo_ps(struct rtw_dev *rtwdev, bool force, bool state) static void rtw_btc_wltoggle_table_a(struct rtw_dev *rtwdev, bool force, u8 table_case) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; u8 h2c_para[6] = {0}; u32 table_wl = 0x5a5a5a5a; @@ -1065,9 +1064,9 @@ static void rtw_coex_set_table(struct rtw_dev *rtwdev, bool force, u32 table0, static void rtw_coex_table(struct rtw_dev *rtwdev, bool force, u8 type) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_dm *coex_dm = &coex->dm; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; struct rtw_coex_stat *coex_stat = &coex->stat; @@ -1135,9 +1134,9 @@ static void rtw_coex_power_save_state(struct rtw_dev *rtwdev, u8 ps_type, static void rtw_coex_set_tdma(struct rtw_dev *rtwdev, u8 byte1, u8 byte2, u8 byte3, u8 byte4, u8 byte5) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_dm *coex_dm = &coex->dm; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_stat *coex_stat = &coex->stat; u8 ps_type = COEX_PS_WIFI_NATIVE; bool ap_enable = false; @@ -1193,10 +1192,10 @@ static void rtw_coex_set_tdma(struct rtw_dev *rtwdev, u8 byte1, u8 byte2, static void rtw_coex_tdma(struct rtw_dev *rtwdev, bool force, u32 tcase) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_dm *coex_dm = &coex->dm; struct rtw_coex_stat *coex_stat = &coex->stat; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; u8 n, type; bool turn_on; @@ -1526,8 +1525,8 @@ static u8 rtw_coex_algorithm(struct rtw_dev *rtwdev) static void rtw_coex_action_coex_all_off(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -1549,11 +1548,11 @@ static void rtw_coex_action_coex_all_off(struct rtw_dev *rtwdev) static void rtw_coex_action_freerun(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_dm *coex_dm = &coex->dm; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 level = 0; bool bt_afh_loss = true; @@ -1594,8 +1593,8 @@ static void rtw_coex_action_freerun(struct rtw_dev *rtwdev) static void rtw_coex_action_rf4ce(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -1619,8 +1618,8 @@ static void rtw_coex_action_rf4ce(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_whql_test(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -1644,10 +1643,10 @@ static void rtw_coex_action_bt_whql_test(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_relink(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; u32 slot_type = 0; @@ -1684,11 +1683,11 @@ static void rtw_coex_action_bt_relink(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_idle(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_dm *coex_dm = &coex->dm; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_rfe *coex_rfe = &coex->rfe; u8 table_case = 0xff, tdma_case = 0xff; @@ -1753,10 +1752,10 @@ exit: static void rtw_coex_action_bt_inquiry(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; bool wl_hi_pri = false; u8 table_case, tdma_case; u32 slot_type = 0; @@ -1853,11 +1852,11 @@ static void rtw_coex_action_bt_inquiry(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_game_hid(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; struct rtw_coex_dm *coex_dm = &coex->dm; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -1901,10 +1900,10 @@ static void rtw_coex_action_bt_game_hid(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_hfp(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -1932,10 +1931,10 @@ static void rtw_coex_action_bt_hfp(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_hid(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; u32 slot_type = 0; bool bt_multi_link_remain = false, is_toggle_table = false; @@ -2015,11 +2014,11 @@ static void rtw_coex_action_bt_hid(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_a2dp(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_dm *coex_dm = &coex->dm; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; u32 slot_type = 0; @@ -2057,10 +2056,10 @@ static void rtw_coex_action_bt_a2dp(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_a2dpsink(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; bool ap_enable = false; @@ -2096,10 +2095,10 @@ static void rtw_coex_action_bt_a2dpsink(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_pan(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -2133,11 +2132,11 @@ static void rtw_coex_action_bt_pan(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_a2dp_hid(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_dm *coex_dm = &coex->dm; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case, interval = 0; u32 slot_type = 0; bool is_toggle_table = false; @@ -2190,10 +2189,10 @@ static void rtw_coex_action_bt_a2dp_hid(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_a2dp_pan(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; bool wl_cpt_test = false, bt_cpt_test = false; @@ -2247,10 +2246,10 @@ static void rtw_coex_action_bt_a2dp_pan(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_pan_hid(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -2282,10 +2281,10 @@ static void rtw_coex_action_bt_pan_hid(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_a2dp_pan_hid(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -2316,9 +2315,9 @@ static void rtw_coex_action_bt_a2dp_pan_hid(struct rtw_dev *rtwdev) static void rtw_coex_action_wl_under5g(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_stat *coex_stat = &coex->stat; u8 table_case, tdma_case; @@ -2348,8 +2347,8 @@ static void rtw_coex_action_wl_under5g(struct rtw_dev *rtwdev) static void rtw_coex_action_wl_only(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -2372,9 +2371,9 @@ static void rtw_coex_action_wl_only(struct rtw_dev *rtwdev) static void rtw_coex_action_wl_native_lps(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_stat *coex_stat = &coex->stat; u8 table_case, tdma_case; @@ -2411,10 +2410,10 @@ static void rtw_coex_action_wl_native_lps(struct rtw_dev *rtwdev) static void rtw_coex_action_wl_linkscan(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; u32 slot_type = 0; @@ -2451,8 +2450,8 @@ static void rtw_coex_action_wl_linkscan(struct rtw_dev *rtwdev) static void rtw_coex_action_wl_not_connected(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -2528,8 +2527,8 @@ static void rtw_coex_action_wl_connected(struct rtw_dev *rtwdev) static void rtw_coex_run_coex(struct rtw_dev *rtwdev, u8 reason) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_dm *coex_dm = &coex->dm; struct rtw_coex_stat *coex_stat = &coex->stat; bool rf4ce_en = false; @@ -3002,9 +3001,9 @@ void rtw_coex_media_status_notify(struct rtw_dev *rtwdev, u8 type) void rtw_coex_bt_info_notify(struct rtw_dev *rtwdev, u8 *buf, u8 length) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_dm *coex_dm = &coex->dm; u32 bt_relink_time; u8 i, rsp_source = 0, type; @@ -3270,8 +3269,8 @@ static const u8 coex_bt_hidinfo_xb[] = {0x58, 0x62, 0x6f}; void rtw_coex_bt_hid_info_notify(struct rtw_dev *rtwdev, u8 *buf, u8 length) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_hid *hidinfo; struct rtw_coex_hid_info_a *hida; @@ -3360,8 +3359,8 @@ void rtw_coex_bt_hid_info_notify(struct rtw_dev *rtwdev, u8 *buf, u8 length) void rtw_coex_query_bt_hid_list(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_hid *hidinfo; u8 i, handle; @@ -3582,7 +3581,7 @@ static const char *rtw_coex_get_reason_string(u8 reason) static u8 rtw_coex_get_table_index(struct rtw_dev *rtwdev, u32 wl_reg_6c0, u32 wl_reg_6c4) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; u8 ans = 0xFF; u8 n, i; @@ -3618,8 +3617,8 @@ static u8 rtw_coex_get_table_index(struct rtw_dev *rtwdev, u32 wl_reg_6c0, static u8 rtw_coex_get_tdma_index(struct rtw_dev *rtwdev, u8 *tdma_para) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 ans = 0xFF; u8 n, i, j; u8 load_cur_tab_val; @@ -3736,7 +3735,7 @@ static int rtw_coex_val_info(struct rtw_dev *rtwdev, static void rtw_coex_set_coexinfo_hw(struct rtw_dev *rtwdev, struct seq_file *m) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; const struct rtw_reg_domain *reg; char addr_info[INFO_SIZE]; int n_addr = 0; @@ -3910,7 +3909,7 @@ static const char *rtw_coex_get_wl_coex_mode(u8 coex_wl_link_mode) void rtw_coex_display_coex_info(struct rtw_dev *rtwdev, struct seq_file *m) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_dm_info *dm_info = &rtwdev->dm_info; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; @@ -4057,7 +4056,7 @@ void rtw_coex_display_coex_info(struct rtw_dev *rtwdev, struct seq_file *m) rtwdev->stats.tx_throughput, rtwdev->stats.rx_throughput); seq_printf(m, "%-40s = %u/ %u/ %u\n", "IPS/ Low Power/ PS mode", - test_bit(RTW_FLAG_INACTIVE_PS, rtwdev->flags), + !test_bit(RTW_FLAG_POWERON, rtwdev->flags), test_bit(RTW_FLAG_LEISURE_PS_DEEP, rtwdev->flags), rtwdev->lps_conf.mode); diff --git a/sys/contrib/dev/rtw88/coex.h b/sys/contrib/dev/rtw88/coex.h index 07fa7aa34d4b..57cf29da9ea4 100644 --- a/sys/contrib/dev/rtw88/coex.h +++ b/sys/contrib/dev/rtw88/coex.h @@ -327,7 +327,7 @@ struct coex_rf_para { static inline void rtw_coex_set_init(struct rtw_dev *rtwdev) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_init(rtwdev); } @@ -335,7 +335,7 @@ static inline void rtw_coex_set_init(struct rtw_dev *rtwdev) static inline void rtw_coex_set_ant_switch(struct rtw_dev *rtwdev, u8 ctrl_type, u8 pos_type) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; if (!chip->ops->coex_set_ant_switch) return; @@ -345,28 +345,28 @@ void rtw_coex_set_ant_switch(struct rtw_dev *rtwdev, u8 ctrl_type, u8 pos_type) static inline void rtw_coex_set_gnt_fix(struct rtw_dev *rtwdev) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_gnt_fix(rtwdev); } static inline void rtw_coex_set_gnt_debug(struct rtw_dev *rtwdev) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_gnt_debug(rtwdev); } static inline void rtw_coex_set_rfe_type(struct rtw_dev *rtwdev) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_rfe_type(rtwdev); } static inline void rtw_coex_set_wl_tx_power(struct rtw_dev *rtwdev, u8 wl_pwr) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_wl_tx_power(rtwdev, wl_pwr); } @@ -374,7 +374,7 @@ static inline void rtw_coex_set_wl_tx_power(struct rtw_dev *rtwdev, u8 wl_pwr) static inline void rtw_coex_set_wl_rx_gain(struct rtw_dev *rtwdev, bool low_gain) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_wl_rx_gain(rtwdev, low_gain); } diff --git a/sys/contrib/dev/rtw88/debug.c b/sys/contrib/dev/rtw88/debug.c index fbbd11be5eef..d745c774aa6f 100644 --- a/sys/contrib/dev/rtw88/debug.c +++ b/sys/contrib/dev/rtw88/debug.c @@ -144,7 +144,9 @@ static int rtw_debugfs_get_rf_read(struct seq_file *m, void *v) addr = debugfs_priv->rf_addr; mask = debugfs_priv->rf_mask; + mutex_lock(&rtwdev->mutex); val = rtw_read_rf(rtwdev, path, addr, mask); + mutex_unlock(&rtwdev->mutex); seq_printf(m, "rf_read path:%d addr:0x%08x mask:0x%08x val=0x%08x\n", path, addr, mask, val); @@ -181,8 +183,8 @@ static int rtw_debugfs_copy_from_user(char tmp[], int size, tmp_len = (count > size - 1 ? size - 1 : count); - if (!buffer || copy_from_user(tmp, buffer, tmp_len)) - return count; + if (copy_from_user(tmp, buffer, tmp_len)) + return -EFAULT; tmp[tmp_len] = '\0'; @@ -199,13 +201,16 @@ static ssize_t rtw_debugfs_set_read_reg(struct file *filp, char tmp[32 + 1]; u32 addr, len; int num; + int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 2); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 2); + if (ret) + return ret; num = sscanf(tmp, "%x %x", &addr, &len); if (num != 2) - return count; + return -EINVAL; if (len != 1 && len != 2 && len != 4) { rtw_warn(rtwdev, "read reg setting wrong len\n"); @@ -286,8 +291,11 @@ static ssize_t rtw_debugfs_set_rsvd_page(struct file *filp, char tmp[32 + 1]; u32 offset, page_num; int num; + int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 2); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 2); + if (ret) + return ret; num = sscanf(tmp, "%d %d", &offset, &page_num); @@ -312,8 +320,11 @@ static ssize_t rtw_debugfs_set_single_input(struct file *filp, char tmp[32 + 1]; u32 input; int num; + int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 1); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 1); + if (ret) + return ret; num = kstrtoint(tmp, 0, &input); @@ -336,14 +347,17 @@ static ssize_t rtw_debugfs_set_write_reg(struct file *filp, char tmp[32 + 1]; u32 addr, val, len; int num; + int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + if (ret) + return ret; /* write BB/MAC register */ num = sscanf(tmp, "%x %x %x", &addr, &val, &len); if (num != 3) - return count; + return -EINVAL; switch (len) { case 1: @@ -379,8 +393,11 @@ static ssize_t rtw_debugfs_set_h2c(struct file *filp, char tmp[32 + 1]; u8 param[8]; int num; + int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + if (ret) + return ret; num = sscanf(tmp, "%hhx,%hhx,%hhx,%hhx,%hhx,%hhx,%hhx,%hhx", ¶m[0], ¶m[1], ¶m[2], ¶m[3], @@ -390,7 +407,9 @@ static ssize_t rtw_debugfs_set_h2c(struct file *filp, return -EINVAL; } + mutex_lock(&rtwdev->mutex); rtw_fw_h2c_cmd_dbg(rtwdev, param); + mutex_unlock(&rtwdev->mutex); return count; } @@ -404,17 +423,22 @@ static ssize_t rtw_debugfs_set_rf_write(struct file *filp, char tmp[32 + 1]; u32 path, addr, mask, val; int num; + int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 4); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 4); + if (ret) + return ret; num = sscanf(tmp, "%x %x %x %x", &path, &addr, &mask, &val); if (num != 4) { rtw_warn(rtwdev, "invalid args, [path] [addr] [mask] [val]\n"); - return count; + return -EINVAL; } + mutex_lock(&rtwdev->mutex); rtw_write_rf(rtwdev, path, addr, mask, val); + mutex_unlock(&rtwdev->mutex); rtw_dbg(rtwdev, RTW_DBG_DEBUGFS, "write_rf path:%d addr:0x%08x mask:0x%08x, val:0x%08x\n", path, addr, mask, val); @@ -432,14 +456,17 @@ static ssize_t rtw_debugfs_set_rf_read(struct file *filp, char tmp[32 + 1]; u32 path, addr, mask; int num; + int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + if (ret) + return ret; num = sscanf(tmp, "%x %x %x", &path, &addr, &mask); if (num != 3) { rtw_warn(rtwdev, "invalid args, [path] [addr] [mask] [val]\n"); - return count; + return -EINVAL; } debugfs_priv->rf_path = path; @@ -461,7 +488,9 @@ static ssize_t rtw_debugfs_set_fix_rate(struct file *filp, char tmp[32 + 1]; int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 1); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 1); + if (ret) + return ret; ret = kstrtou8(tmp, 0, &fix_rate); if (ret) { @@ -519,6 +548,8 @@ static int rtw_debug_get_rf_dump(struct seq_file *m, void *v) u32 addr, offset, data; u8 path; + mutex_lock(&rtwdev->mutex); + for (path = 0; path < rtwdev->hal.rf_path_num; path++) { seq_printf(m, "RF path:%d\n", path); for (addr = 0; addr < 0x100; addr += 4) { @@ -533,6 +564,8 @@ static int rtw_debug_get_rf_dump(struct seq_file *m, void *v) seq_puts(m, "\n"); } + mutex_unlock(&rtwdev->mutex); + *** 7316 LINES SKIPPED *** From nobody Wed Nov 29 16:38:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ414X7sz52wsT; Wed, 29 Nov 2023 16:38: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 4SgQ411Rfwz3HPS; Wed, 29 Nov 2023 16:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9rViG3tM89ZjsyLtlcZVsqICE2VXac8l0u3pOeDlgco=; b=n/6zOBd3dpMN2fxb+GIJF37PuAYp0OiB3Qld5bscK6O56TfqGKWI6XVUmNRnT6xm/t9qax riNRVKDcQRwKvkn6BumHsN76ys/9HVfob/FEzHWZpXq4B2T+jGMvK6qMUVaEprfsJXUMSO EC8leeZqOYSsEFr64AY/rHEgMQtGnSVXO19KTZznLd7rbuiJ81iiT/z3BIlH/xO82klhgz 7ytZINB1p2fonkqCtGj72/DI2SKl+YiJ7FFSx4uj3SpZ7DrSsQXRnykrfRCbHaRXQhz/wU RAVHEYEgleV+x9SfZARI0B9hK/IH8FnOa81Orj3vRA4RQqxPpcppafMXUsM9Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9rViG3tM89ZjsyLtlcZVsqICE2VXac8l0u3pOeDlgco=; b=gRkBgAcuzXLS7HBeLutvzmc9DIwLun1ljGqL4jIHxaKTS28m72kl8PBNqUbTfFktzQfzEC b7LtCAvo6wV0fUgWEMGpaX5Wwl3670rke+cSerOl+Ed6EbVauxbt5W3rUisiYaQhqNcdo0 1D/0OoeSWZ5/8j+iSYCIF7jqMsCLmXGPjsr5XMKjtd+O1UqgPO3MqL/RYgossTjYoMlR33 +ujImiJVsS7L4Gxdtt/wrPyPGW9zTV7LIWGcQtT7wweh0BBLZRh+pahfPQmnfPWU7gHjKt 1Xw0J/rDEU7jatK23ta8fZAHEFjZUekUGWFHQLv2Abu5h+LebLxihsx4T7jbCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275889; a=rsa-sha256; cv=none; b=kJ4V3lq7Ldc4tpbG79mV9fSPQ5s7xDBLBPb18KJtOuKSg1YA6aP8Yv0zlZvB7TaELp7Kmc XumZq463ZsmdjewVIsi/9tPvE1vT+lcdIs/D4M7H1eCajg5+UkqBzVNaG5Aa/jnyaMhoGx NkSh/pIFpxBoOxx3+pYstAGdj0QiB1ov65qMVPvEBFV6oXjVT4WFjARslRd9ds/Hukamd6 N3hkFeXvhXwu0vgyogTx9vQ9/q42geLL7c7yvfCOeAjBgwhvdtwIEWe7wIoSzOiwdQTOGz +pELfBnj18rBMPW1TZM+MohL3zN2EsZJeIp8c0ZO9cwOcIFFy5XpnMtX7UFdCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ410Yk5z1CXj; Wed, 29 Nov 2023 16:38: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 3ATGc8eJ045052; Wed, 29 Nov 2023 16:38:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGc8tE045049; Wed, 29 Nov 2023 16:38:08 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:08 GMT Message-Id: <202311291638.3ATGc8tE045049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: fb9c182f5ea4 - stable/13 - iwlwifi/LinuxKPI: 802.11: update ieee80211_request_smps() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fb9c182f5ea42ad0c6f839dc894130f5268a938a Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fb9c182f5ea42ad0c6f839dc894130f5268a938a commit fb9c182f5ea42ad0c6f839dc894130f5268a938a Author: Bjoern A. Zeeb AuthorDate: 2023-09-05 18:02:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:05 +0000 iwlwifi/LinuxKPI: 802.11: update ieee80211_request_smps() Update ieee80211_request_smps() to the new number of arguments in LinuxKPI (which was already prepared) and update the one call in the older iwlwifi driver version. This will allow iwlwifi as-is now and rtw88 to compile in case someone else wants to work on the latter in parallel to predominant efforts on the former. Sponsored by: The FreeBSD Foundation (cherry picked from commit 815b7436a7c6302365b6514194d27d41cb736227) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 13 ++----------- sys/contrib/dev/iwlwifi/mvm/utils.c | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index cacf9d652fd0..bc7f22f5aa15 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -2022,10 +2022,7 @@ ieee80211_ie_split(const u8 *ies, size_t ies_len, } static __inline void -ieee80211_request_smps(struct ieee80211_vif *vif, -#ifdef __FOR_LATER_DRV_UPDATE - u_int link_id, -#endif +ieee80211_request_smps(struct ieee80211_vif *vif, u_int link_id, enum ieee80211_smps_mode smps) { static const char *smps_mode_name[] = { @@ -2345,14 +2342,8 @@ ieee80211_proberesp_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif) static __inline struct sk_buff * ieee80211_nullfunc_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif, -#ifdef __FOR_LATER_DRV_UPDATE - int linkid, -#endif - bool qos) + int linkid, bool qos) { -#ifndef __FOR_LATER_DRV_UPDATE - int linkid = 0; -#endif /* Only STA needs this. Otherwise return NULL and panic bad drivers. */ if (vif->type != NL80211_IFTYPE_STATION) diff --git a/sys/contrib/dev/iwlwifi/mvm/utils.c b/sys/contrib/dev/iwlwifi/mvm/utils.c index 075ada8ba356..5370cec8140a 100644 --- a/sys/contrib/dev/iwlwifi/mvm/utils.c +++ b/sys/contrib/dev/iwlwifi/mvm/utils.c @@ -307,7 +307,7 @@ void iwl_mvm_update_smps(struct iwl_mvm *mvm, struct ieee80211_vif *vif, smps_mode = IEEE80211_SMPS_DYNAMIC; } - ieee80211_request_smps(vif, smps_mode); + ieee80211_request_smps(vif, 0, smps_mode); } static bool iwl_wait_stats_complete(struct iwl_notif_wait_data *notif_wait, From nobody Wed Nov 29 16:38:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ423KFSz52wx4; Wed, 29 Nov 2023 16:38: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 4SgQ422Kr7z3HKJ; Wed, 29 Nov 2023 16:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wDmSx7PGDAt+W0BSeKxqxeFqK6nOWpXimMUn6a8YKCg=; b=HUsuxUW2RW7rcj3+sQHRDmiVmE0h76BolWlToul1XrPjG3mzddtA32noxJizIT6ctcfRyM R/rDTm3LhCqO6Jq926iw53cGMp9JMzyxHEe9fWpuhlUoRgM10wekpfAoIA4IkN3kMkylXw 6CLDub7WdmuJ/nBlyRmoxR2l4DbWkS7Ui5w1CiL1BVI3/193GqwO2ojLZQIUGR59StQA/4 GOFYUYNCC6ZmxJ3sH+Z2BODAhLeOuHdRAZn+C0ftcWOH5pWgXOn4Om9ZJhNG9a6b/TQX8N 4OB0c1At37E21PmWJlmaWhlk/2lv5Ht3wXwOlvsXPOu7XLIpZ8J/jPaFgP422g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wDmSx7PGDAt+W0BSeKxqxeFqK6nOWpXimMUn6a8YKCg=; b=fLEwobUvKAFxOWDdTZz4X+Dsn0XbJLswFvocn/TgbcIGwWnWxxuWckffJamIkifpioFQJJ C9YEDgmtnnm8h0w1YDSCSHByzxpL+0T9Q92LQ+lgM4GBryPwU1O/3LCvtWuyK00GGA8u0z axOc6B16SD18UH54RqFRpEnOpVZ9VQ/uX+WSw1Au/WogzAPyI+xMYULYU6KQNPZAU3z7yo z+XjIMNTDuJtIffYAd4skZKKGs6G3l9v0cn7lkf5zx9a3+VPBU0XAFyrQCgltcQwCW5ycg fZ7JNkQGPBjSesECgdjdblDDnQ/wT0sg+t2NBorGPYI+2e9ujEsP95CrZHIY/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275890; a=rsa-sha256; cv=none; b=nqRCnsN7MmLI0uhc4lwWwHAfIUJX06XuMnmiPS6YbXJhVurBLPDPke4iwO1W8HEstVbviZ l+A0DeqxLJohV/2BfD8NNpKJGEABMQ0Hwy2Qo2TZQAIXhxPgvX0xoRYGd/TtiB9KOCK7Fn P5zf9bf08D0qvalleyex3cI2C2EvWYI3AMGCLwSErV2poxI64QuenzYEUgZ04CWkvby32C Fm3yBlj+Vi/bTOPkmb4MbvsQFZDBEqnNvDiz1bQlFD9U2Srkx/I+e8GrgEn+7kkwcW94iX SgGZN34OEg0/vjVSRMG1RPs2qqcLAQsD7f+O5p/ykYlAmjHlToBqx5hN5lDOkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ421R4Lz1C47; Wed, 29 Nov 2023 16:38: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 3ATGcA3t045097; Wed, 29 Nov 2023 16:38:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcApV045094; Wed, 29 Nov 2023 16:38:10 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:10 GMT Message-Id: <202311291638.3ATGcApV045094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 4e03427c55a5 - stable/13 - net80211: fix ddb print alignment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4e03427c55a59bbde92386034c8ba03fbf63aa0f Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4e03427c55a59bbde92386034c8ba03fbf63aa0f commit 4e03427c55a59bbde92386034c8ba03fbf63aa0f Author: Bjoern A. Zeeb AuthorDate: 2023-09-11 14:23:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:05 +0000 net80211: fix ddb print alignment Add missing \ts after new lines to properly align output of ddb show commands. Sponsored by: The FreeBSD Foundation (cherry picked from commit c45d05b71817e478953d6f235d921c2b4acc82de) --- sys/net80211/ieee80211_ddb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index 9fe1ad1c62e5..eb4ad9cc777d 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -506,7 +506,7 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) db_printf(" ht_sta_assoc %u", vap->iv_ht_sta_assoc); db_printf(" ht40_sta_assoc %u", vap->iv_ht40_sta_assoc); db_printf("\n"); - db_printf(" nonerpsta %u", vap->iv_nonerpsta); + db_printf("\tnonerpsta %u", vap->iv_nonerpsta); db_printf(" longslotsta %u", vap->iv_longslotsta); db_printf(" lastnonerp %d", vap->iv_lastnonerp); db_printf(" lastnonht %d", vap->iv_lastnonht); @@ -550,7 +550,7 @@ _db_show_com(const struct ieee80211com *ic, int showvaps, int showsta, db_printf(" phytype %d", ic->ic_phytype); db_printf(" opmode %s", ieee80211_opmode_name[ic->ic_opmode]); db_printf("\n"); - db_printf(" inact %p", &ic->ic_inact); + db_printf("\tinact %p", &ic->ic_inact); db_printf("\n"); db_printf("\tflags=%b\n", ic->ic_flags, IEEE80211_F_BITS); From nobody Wed Nov 29 16:38:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ433TMmz52wqL; Wed, 29 Nov 2023 16:38: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 4SgQ432wQdz3HN2; Wed, 29 Nov 2023 16:38:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=boH6FTQT4oKL60vKUzwFb9av+WYAwgwDVBVeL466Q8Q=; b=Ds6p7oE1bqDah7e87uujHBZ8sYapF1KvsUdpWk4WPH+wIA3Gl3saiUA3RegvyXMcAMNafS RPTHTMVIjfpXiH+Kjz15YO963L2rrSUh1RJppK3BFuD71u6MXzLViGZsQQSP+Uz1hpZ2Yu RS7rD6KLSG57TE6ymGp2Zy1w5BlAP6I0iXTb8NzgMR1x5bdV6G/RwH7tyx69FqSFw9JmUx mIYuUdbwv2GCI8ElQxeSEUaHqJegQU8NfFo3zrONB392i4laCJnWj4p3HUxltjITu8m4WL /Z0kY8eikqjwgGVnrn7qRGTE0im2tmrHGkSdbSQjg3sVNwU1QgW7AMlfos2BuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=boH6FTQT4oKL60vKUzwFb9av+WYAwgwDVBVeL466Q8Q=; b=fg8F9yiE8WMp1CB9HdK3RkSLDoHq3T2Z9paioDgtnakN8+RsTxBhGjFF8+vbwW7rDa3D2R 6OulpWYTep7yTrVy78uSe8SLf2+AITNdpGvvcu552ee+3lStFN/388AhoW+opmMVVVX/0q oSN+qNzEGPvs20OwhP8WeZmPxhYUuAlHXWUspI3hjQAASt3KONh7yS9tjFxYDz5eXaA4XL opBOoHtZAJJXCLCzei98Tx5jWax4rcPq3oHkbVZmsoTLrLu8qnHP/cZZ1arvSZMzNxitxi WGQz3OUX3kZRddA397gsiUaW8+94snb+pLsnkicldFqPDTEY3zpJUizEeenl1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275891; a=rsa-sha256; cv=none; b=qTRwTOYoksYacTYeEKsr95/kdIpe/QEd7yQ7ry+YOoHrhYjasQTibGjMELbNpqxiFrE8sx VSCU6FMz7HkJZW1McPyd0pxNSuIc1rQvxoFqLETT6MenxV8m0gbQ/YXa8YBHVbU79GG+jm +uhJDIepG+LNVjiTxpLjdldQVeajBAl/EvrC21osYo9SNsKi1vj4pF1sDI9TcMRQBG+oDn uKHJCBC5yLmvew1TYj9L3qwDdudNmG9sagrgghEYfxbHl8KezLkdrrjI7gppVO5xo4jZF9 ciOzcWJ7zcnRuxVjnzHOihdjkuuUqy/v4ATXrl6vAOQurwHSt7AwnaL7wnCc7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4321jlz1C2F; Wed, 29 Nov 2023 16:38: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 3ATGcBWl045151; Wed, 29 Nov 2023 16:38:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcBsb045148; Wed, 29 Nov 2023 16:38:11 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:11 GMT Message-Id: <202311291638.3ATGcBsb045148@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b5e94d0bad60 - stable/13 - LinuxKPI: skbuff: remove assumption about mac_header List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b5e94d0bad60705239ddd865bfc7cf93c400e0a4 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b5e94d0bad60705239ddd865bfc7cf93c400e0a4 commit b5e94d0bad60705239ddd865bfc7cf93c400e0a4 Author: Bjoern A. Zeeb AuthorDate: 2023-09-08 12:47:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:06 +0000 LinuxKPI: skbuff: remove assumption about mac_header It seems the mac_header can be set to offset 0 for frames received. Remove the warning splattering messages to the console for each packet. Sponsored by: The FreeBSD Foundation (cherry picked from commit f0e59b6903c881859d7f4eaf269b2336b774c7bc) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index c917b3f09ac9..f8ce212e7853 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -935,10 +935,9 @@ static inline uint8_t * skb_mac_header(const struct sk_buff *skb) { SKB_TRACE(skb); - /* Make sure the mac_header was set as otherwise we return garbage. */ - WARN_ON(skb->mac_header == 0); return (skb->head + skb->mac_header); } + static inline void skb_reset_mac_header(struct sk_buff *skb) { From nobody Wed Nov 29 16:38:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ444hCHz52wTB; Wed, 29 Nov 2023 16:38: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 4SgQ444G3bz3HTX; Wed, 29 Nov 2023 16:38:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zYGKOZeY6AuEl9xN7/eiY3hdbwQCrKlxmHq+x2ZWWN8=; b=ebRxC0btUbqJE6+TrBOXuXdJ56+SQpwstZlJOwk06qycmgZYScw/efKGxxMXyvnvCTvSDF g9XNDTqWIi1Mo51/iEHJoVj+gRAVapGDsPAocegXS/tcoygWYW4GIpvyNxz/bgqG0DhVp8 vgybNHv+jwduJKpepd+ATxbT5EKV+k7tInmJfeaTXu6bMKjs6SuvZ/vtAvn2kz4R0O+Grt xuaRbQizFp5qxFdx6L7a+v4jby1kBJuEnQXyW44/Rj9I+1eAlW5JaiQ3x29SItd6Mpje39 ytuGmw+jMMmidLY4bTg/KmOPoM4SaN4Jz0HuZBCPUnziicoyD8B1BPS46gO2fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zYGKOZeY6AuEl9xN7/eiY3hdbwQCrKlxmHq+x2ZWWN8=; b=JU2kwCev8TV8a8cU36mZ8b9ZNOAgDq8/fqF4S+ojzFFSk9MqIvJNwWilkAy1l7uvsa2QpQ 6SYCokodfSMkNjQs3T9IpcQdobERqg+f7U98dWfJZrSo5QC5TDJALuE7Gy/vlRjRQgB/hf giR/MlMm9O0LRHbWm5kAZhraek6Nm4SAyaVSl7IGzUpCe6+/qHmS9M40ZoWBLjlZyHAmrt rX6xXPsPw/u8QJm87ehQnF45fos6DRJt4WL3M5Tx4UwBJet8x9cbsz/TIW9GpTWhHissx9 RykFueeuIaaOREsOCJu4fZKT7zQXMBxCgegClf0k5VQQ3Lko0ALOxgeG7KoMXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275892; a=rsa-sha256; cv=none; b=mBvpA7xazKhz+1UgwnzCQKOK4Q0kfKMKj5bgcXxPKIdn9JG0RAHGfgMCkUuscbS2qx4ZOh N9USCaZSQkDtHBwtEX+wzbEyaoTogZ6siUIiDBnDOsh1XXv8r05Ex1EoTYCERkj4fHjUJO lxo/dpTwHUTWxJftJT+EZ53MtI0Hv2prH0zM4XVFg9KtFzc17yYjB+LJ/SVpghhrOeWZNB HnkdcMjbBYGsl62Eijd7oaJoqRvwhUCkugzEN84lFLehUGq9hBRyU6FIm8roaeWuwxO6/K Ph2jGFnkNusfydrllLr+HrBi3FtIfWu15IkCAVn3282EvYCzUbv2smm5mo05Ig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4431Wwz1C2G; Wed, 29 Nov 2023 16:38: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 3ATGcCg9045193; Wed, 29 Nov 2023 16:38:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcC7E045190; Wed, 29 Nov 2023 16:38:12 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:12 GMT Message-Id: <202311291638.3ATGcC7E045190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7d558c429f74 - stable/13 - net80211: improve scan debugging List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7d558c429f743204682f506b6c5970b63bf48c64 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7d558c429f743204682f506b6c5970b63bf48c64 commit 7d558c429f743204682f506b6c5970b63bf48c64 Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:36:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:06 +0000 net80211: improve scan debugging While debugging other problems I ran into the case where net80211 was thinking a scan was ongoing and new scans could not be started but given other logging there was clearly no more scan running. It was hard after the fact to quickly determine enough state to reconstruct or validate assumptions. Improve a MSG_SCAN debug logging and implement _db_show_scan() ddb output which can be printed along with show com /S or /a. Sponsored by: The FreeBSD Foundation (cherry picked from commit 33396ec29f1daae31f4738f0da98dce168ca73c6) --- sys/net80211/ieee80211_ddb.c | 74 ++++++++++++++++++++++++++++++++++++++---- sys/net80211/ieee80211_ioctl.c | 6 ++-- sys/net80211/ieee80211_scan.h | 6 +++- 3 files changed, 77 insertions(+), 9 deletions(-) diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index eb4ad9cc777d..f34998ce1ade 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -67,7 +67,7 @@ static void _db_show_sta(const struct ieee80211_node *); static void _db_show_vap(const struct ieee80211vap *, int, int); static void _db_show_com(const struct ieee80211com *, - int showvaps, int showsta, int showmesh, int showprocs); + int showvaps, int showsta, int showmesh, int showprocs, int); static void _db_show_all_vaps(void *, struct ieee80211com *); @@ -132,7 +132,7 @@ DB_SHOW_COMMAND(vap, db_show_vap) DB_SHOW_COMMAND(com, db_show_com) { const struct ieee80211com *ic; - int i, showprocs = 0, showvaps = 0, showsta = 0, showmesh = 0; + int i, showprocs = 0, showvaps = 0, showsta = 0, showmesh = 0, showscan = 0; if (!have_addr) { db_printf("usage: show com \n"); @@ -141,7 +141,10 @@ DB_SHOW_COMMAND(com, db_show_com) for (i = 0; modif[i] != '\0'; i++) switch (modif[i]) { case 'a': - showsta = showmesh = showvaps = showprocs = 1; + showsta = showmesh = showvaps = showprocs = showscan = 1; + break; + case 'S': + showscan = 1; break; case 's': showsta = 1; @@ -158,7 +161,7 @@ DB_SHOW_COMMAND(com, db_show_com) } ic = (const struct ieee80211com *) addr; - _db_show_com(ic, showvaps, showsta, showmesh, showprocs); + _db_show_com(ic, showvaps, showsta, showmesh, showprocs, showscan); } DB_SHOW_ALL_COMMAND(vaps, db_show_all_vaps) @@ -345,6 +348,61 @@ _db_show_tdma(const char *sep, const struct ieee80211_tdma_state *ts, int showpr } #endif /* IEEE80211_SUPPORT_TDMA */ +static void +_db_show_scan(const struct ieee80211_scan_state *ss, int showprocs) +{ + int i; + const struct ieee80211_scanner *ss_ops; + + db_printf("SCAN %p:", ss); + db_printf(" vap %p ic %p", ss->ss_vap, ss->ss_ic); + db_printf("\n"); + + db_printf("\tss_ops %p (%s) ss_priv %p", + ss->ss_ops, ss->ss_ops->scan_name, ss->ss_priv); + db_printf("\n"); + if (showprocs) { + ss_ops = ss->ss_ops; + DB_PRINTSYM("\t", "scan_attach", ss_ops->scan_attach); + DB_PRINTSYM("\t", "scan_detach", ss_ops->scan_detach); + DB_PRINTSYM("\t", "scan_start", ss_ops->scan_start); + DB_PRINTSYM("\t", "scan_restart", ss_ops->scan_restart); + DB_PRINTSYM("\t", "scan_cancel", ss_ops->scan_cancel); + DB_PRINTSYM("\t", "scan_end", ss_ops->scan_end); + DB_PRINTSYM("\t", "scan_flush", ss_ops->scan_flush); + DB_PRINTSYM("\t", "scan_pickchan", ss_ops->scan_pickchan); + DB_PRINTSYM("\t", "scan_add", ss_ops->scan_add); + DB_PRINTSYM("\t", "scan_age", ss_ops->scan_age); + DB_PRINTSYM("\t", "scan_assoc_fail", ss_ops->scan_assoc_fail); + DB_PRINTSYM("\t", "scan_assoc_success", ss_ops->scan_assoc_success); + DB_PRINTSYM("\t", "scan_iterate", ss_ops->scan_iterate); + DB_PRINTSYM("\t", "scan_spare0", ss_ops->scan_spare0); + DB_PRINTSYM("\t", "scan_spare1", ss_ops->scan_spare1); + DB_PRINTSYM("\t", "scan_spare2", ss_ops->scan_spare2); + DB_PRINTSYM("\t", "scan_spare3", ss_ops->scan_spare3); + } + + db_printf("\tss_flags %b", ss->ss_flags, IEEE80211_SS_FLAGS_BITS); + db_printf("\n"); + + db_printf("\tss_nssid %u", ss->ss_nssid); + for (i = 0; i < ss->ss_nssid && i < IEEE80211_SCAN_MAX_SSID; i++) + _db_show_ssid(" ss_nssid[%d]", i, + ss->ss_ssid[i].len, ss->ss_ssid[i].ssid); + db_printf("\n"); + + db_printf("\tss_chans:\n"); + for (i = 0; i < ss->ss_last && i < IEEE80211_SCAN_MAX; i++) { + db_printf("\t%-3d", i); + _db_show_channel(" ", ss->ss_chans[i]); + db_printf("\n"); + } + + db_printf("\tss_next %u ss_last %u ss_mindwell %lu ss_maxdwell %lu", + ss->ss_next, ss->ss_last, ss->ss_mindwell, ss->ss_maxdwell); + db_printf("\n"); +} + static void _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) { @@ -532,7 +590,7 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) static void _db_show_com(const struct ieee80211com *ic, int showvaps, int showsta, - int showmesh, int showprocs) + int showmesh, int showprocs, int showscan) { struct ieee80211vap *vap; @@ -679,6 +737,10 @@ _db_show_com(const struct ieee80211com *ic, int showvaps, int showsta, DB_PRINTSYM("\t", "ic_addba_response", ic->ic_addba_response); DB_PRINTSYM("\t", "ic_addba_stop", ic->ic_addba_stop); } + if (showscan) { + db_printf("\n"); + _db_show_scan(ic->ic_scan, showprocs); + } if (showvaps && !TAILQ_EMPTY(&ic->ic_vaps)) { db_printf("\n"); TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) @@ -707,7 +769,7 @@ _db_show_all_vaps(void *arg, struct ieee80211com *ic) db_printf(" %s(%p)", vap->iv_ifp->if_xname, vap); db_printf("\n"); } else - _db_show_com(ic, 1, 1, 1, 1); + _db_show_com(ic, 1, 1, 1, 1, 1); } static void diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index f6357476255f..64cb9f229519 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -2589,8 +2589,10 @@ ieee80211_scanreq(struct ieee80211vap *vap, struct ieee80211_scan_req *sr) sr->sr_flags |= IEEE80211_IOC_SCAN_NOPICK; IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, - "%s: flags 0x%x%s duration 0x%x mindwell %u maxdwell %u nssid %d\n", - __func__, sr->sr_flags, + "%s: vap %p iv_state %#x (%s) flags 0x%x%s " + "duration 0x%x mindwell %u maxdwell %u nssid %d\n", + __func__, vap, vap->iv_state, ieee80211_state_name[vap->iv_state], + sr->sr_flags, (vap->iv_ifp->if_flags & IFF_UP) == 0 ? " (!IFF_UP)" : "", sr->sr_duration, sr->sr_mindwell, sr->sr_maxdwell, sr->sr_nssid); /* diff --git a/sys/net80211/ieee80211_scan.h b/sys/net80211/ieee80211_scan.h index 4274f3948db6..a33864b102e2 100644 --- a/sys/net80211/ieee80211_scan.h +++ b/sys/net80211/ieee80211_scan.h @@ -147,6 +147,10 @@ struct ieee80211_scan_state { unsigned long ss_maxdwell; /* max dwell on channel */ }; +#define IEEE80211_SS_FLAGS_BITS \ + "\20\1NOPICK\2ACTIVE\3PICK1ST\4BGSCAN\5ONCE\6NOBCAST\7NOJOIN" \ + "\15GOTPICK" + /* * The upper 16 bits of the flags word is used to communicate * information to the scanning code that is NOT recorded in @@ -328,7 +332,7 @@ struct ieee80211_scanner { void (*scan_spare0)(void); void (*scan_spare1)(void); void (*scan_spare2)(void); - void (*scan_spare4)(void); + void (*scan_spare3)(void); }; void ieee80211_scanner_register(enum ieee80211_opmode, const struct ieee80211_scanner *); From nobody Wed Nov 29 16:38:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ460CMsz52wx8; Wed, 29 Nov 2023 16:38: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 4SgQ454wp5z3Hfm; Wed, 29 Nov 2023 16:38:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PAzK6oD3+kQmGWn3Trg9gkeYkT+UEe/nocs4qt6Uz7c=; b=H7mZkbWG//2Vqz0ADXjMOUMorMxrnOHvya8ZD/IjyuX5f9LTTgYImGkYOPv1lpT0vE59tB XZaPP3jf+f42QzFJEmKrxbeeiASEuCUjxhaKThdFuY0WiFgwRofZy2sPqr/9Ec43NZYcoP KaEUMsZMk+GeZ07I9dE8mWRnKM5B3/wsWTgr4imSw18DXK3KXPtjq86b/oJSSZ/nDVlGQs 8Kq8E7bNVyHzsNDzM3MblEp3FP3tbAek25vGDQeLN4DYIaegZX72oz9/4J7JNe0CVYucgQ a3T7yDy53nax2DZdzmBwBk977asNr3PtAXx2uWANC/ylZ3eekPGcKJf3790+Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PAzK6oD3+kQmGWn3Trg9gkeYkT+UEe/nocs4qt6Uz7c=; b=ic08iKCY060QDHr02ICOlvmruev/DWinCdYcbY3Uu8pxqAZ2DBRjMnaG9WPahb55eI3l4J 9obEogCK7KFJa+Z6rIJF0H10trDUUzNa76KFoQlNV6+6nL5AQ6Maua4TaXwevJ15GbB6uy DsJEkEJgcRSOep7YU4TTycNOJ3RnWEK/aWZ8hu7xymNiV+d/qDULh3wRije5UbCS94jqNB wJB+pCT74TwaeSFPoq86zOmfN0rNUNVPGSxFKeKSRZNwMRhEL7Wru5hxpXxLtfjBRYmnvv uB7mDsq1FkOvMa1J8pdOfeBwUHYt9V8XBwx6mGdZoK+YYUnRuF/Cq96++H1jdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275893; a=rsa-sha256; cv=none; b=xn2zFMOaHYpiApQ0ROHIyNBlhEAbwWQJUz8JHKtfpLpkdpD9av40raor52Qz/haNhY6+2q TEtnxrys40lBWPF95gZPexVX4x2IQ8zmIyHAvipmGHSWtX0gn+K2HX87gJ5XeS6NQrZoG+ iOwF8HcmzqbEpwd8JXWtE8OdPPcZbl8ReS0UQ7GvSMVbOmp/TuTeW2xIlhRIhao9acnFH0 W2oRlZxRtcPihfRRK7+oUovKDC2ri3/5JAV1aIdnkIgFqx5qfsfGfzRD+XE/sd7rNnwNke 7EXJUh3NYMy3ld30sEBex7QuyEPzHzva9cSA6Sy1o3VFuzDD9T1HtdiiVsr9IA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4542QDz1CZx; Wed, 29 Nov 2023 16:38: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 3ATGcDK8045241; Wed, 29 Nov 2023 16:38:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcDR7045238; Wed, 29 Nov 2023 16:38:13 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:13 GMT Message-Id: <202311291638.3ATGcDR7045238@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b34e41e26b5f - stable/13 - net80211: mark argument to scan_curchan_task() __unused List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b34e41e26b5f88bbb16a22cdd25fad80b47a4018 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b34e41e26b5f88bbb16a22cdd25fad80b47a4018 commit b34e41e26b5f88bbb16a22cdd25fad80b47a4018 Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:34:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:06 +0000 net80211: mark argument to scan_curchan_task() __unused Mostly as documentation mark an unused argument to scan_curchan_task() as __unused. We may possibly want to check all callers in the future and see if the argument was supposed to be useful or should be entirely removed. Sponsored by: The FreeBSD Foundation (cherry picked from commit 778da03b1271f52051620ec9b053524727961c9e) --- sys/net80211/ieee80211_scan_sw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_scan_sw.c b/sys/net80211/ieee80211_scan_sw.c index 3a29a784f36b..60e9a635b94d 100644 --- a/sys/net80211/ieee80211_scan_sw.c +++ b/sys/net80211/ieee80211_scan_sw.c @@ -673,7 +673,7 @@ scan_start(void *arg, int pending) } static void -scan_curchan_task(void *arg, int pending) +scan_curchan_task(void *arg, int pending __unused) { struct ieee80211_scan_state *ss = arg; struct scan_state *ss_priv = SCAN_PRIVATE(ss); From nobody Wed Nov 29 16:38:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ470Sqmz52x06; Wed, 29 Nov 2023 16:38: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 4SgQ4663VMz3Hcy; Wed, 29 Nov 2023 16:38:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ojraBW50k+t08uAIv/RakzaT2TDb54763nHiSKEFVaQ=; b=XC7T0L2+zwqsznnsuZ4kh9Ea0P+Ye0OADOLlkqmwzgPCpOjmhvCT1gmpishqlAUgH18HIf Bmhum/hPtzijpUXWBdIf6UngF8hE+KKu135VJ9c8uqnr4nY2CGt+Vu0eKB61Pbn9sfoNdZ JmvWkBloziNsUPps10tDck4kFbnce0HUg9u/k+jK4EvLfUa9/wfs1AryzwowDQFVRD6zdx 9PY3pTgxBTMTShHHAa1q/IzM2tdvALkSVt9+v4DBEimoJrstLGW2ptyU7pbNGwxM4KqJb9 ufKtGcrfpt4CscmVOunuSJUP49LT9BD9lapxUXrymHAbmYMdPMuDS0Z8RLHsNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ojraBW50k+t08uAIv/RakzaT2TDb54763nHiSKEFVaQ=; b=T/h4cX70UnJy1oRk5s1fa+RmV18jOTVtu1XFFbx19DlNt67G2lWAoHXHljSZFI8hI22Dpc lfTRasHVQVqMuAXjshLaOib9ZhVBl0vb1Zlpg93N2nBcbw2SVld4houHGsuzEcrrRgiEY2 nLKlcdH+sYa4NGUEjzkykNw3k2/CYO8DBIp47KMheyO/5+dvCFWzvRoXPC321xiXnK3ilf jpDybPrbOCDwDSIWzHpow+CKeJfPmbBa5Ca7P8SJlaa/d9wrAhrBsVCdy3vpa26enbZu+F ZYKVgzi4e16HrHaQAoUv8pAkTW7CAwgDIqXlFlSSSP2+EAbh9EaU85kcbCfezA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275894; a=rsa-sha256; cv=none; b=Enh2/Tq7P8tto9J81x9BLGiEHLP32aG2t3lB/EWX4unzsfATvkOLWGYOVyK2yT6XiRzgxU GaikdSgoJ5RuTs69OZ2/i9vNp3IXWyuPoK2+BDXT45Nh4muwj11SH2wb3SXeSeltuyy1Np /52meAR57qzKQAxvWEt2/PTGtoefpW31fwx4GK8mbycYz6v3lYti5USdoopc5vvmv1eUes VlExKrR6E3zndWn0JPDRUppCzbxdRx3t9lxHo8N5QqLTP1XUKftJDVvajfOJL1O9782QH9 d3keVhnn7WIOl1HRTcvkHKmoYdARqX7BKR/bQUniz+TWSqt1XM32X65lgyWh4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ46572Gz1CXk; Wed, 29 Nov 2023 16:38: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 3ATGcE2V045301; Wed, 29 Nov 2023 16:38:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcEB6045298; Wed, 29 Nov 2023 16:38:14 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:14 GMT Message-Id: <202311291638.3ATGcEB6045298@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 81c6a57140f4 - stable/13 - LinuxKPI: 802.11: make sure bssid for scans (probe_req) is set List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 81c6a57140f47936e6b2b95d9c57c1553fa9f071 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=81c6a57140f47936e6b2b95d9c57c1553fa9f071 commit 81c6a57140f47936e6b2b95d9c57c1553fa9f071 Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:48:19 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:06 +0000 LinuxKPI: 802.11: make sure bssid for scans (probe_req) is set In b0f73768220e9 we added bssid[] to struct cfg80211_scan_request likely while working on mt76 and did not need it (yet) back then. iwlwifi started to use the field in Linux f1fec51cda70f (April 2023). Without it set firmware crashes when trying to send probe requests ((empty) SSID also given to hw_scan). For now always set the field to the wildcard BSSID. Sponsored by: The FreeBSD Foundation (cherry picked from commit e1e90be05017c335862c938fd9d577e56f02af30) --- sys/compat/linuxkpi/common/src/linux_80211.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 7ac61275e255..1931a8528ed5 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2728,6 +2728,7 @@ sw_scan: memcpy(hw_req->req.mac_addr, xxx, IEEE80211_ADDR_LEN); memset(hw_req->req.mac_addr_mask, 0xxx, IEEE80211_ADDR_LEN); #endif + eth_broadcast_addr(hw_req->req.bssid); hw_req->req.n_channels = nchan; cpp = (struct linuxkpi_ieee80211_channel **)(hw_req + 1); From nobody Wed Nov 29 16:38:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ480fwMz52x2V; Wed, 29 Nov 2023 16:38: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 4SgQ4770Mbz3HwW; Wed, 29 Nov 2023 16:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ua6RkeVykrX0DlOiqtGCF9rRljf002wx3iXp57h5cPE=; b=aUPwsNMQG/oJ47X2mKvCIk6hRHYEUtk2c9P8uTxUHp8epHxQ98XVXq9KkWD8laLgLUJ8Rn X0FR5cmHtr6j4LlxYTw8s60Jy2ln5auCQtUC6/FHO/KKYu4z5VNkJTX37Dimf+B/WTYUvh a0WD8O87kgLLZIavi00UBy7L0K36vTwokkcVwuKaxqhWpGmnlEi9InL8KbKqUBInpvPK31 QYrMBFGxcgbifzp1rvxJQNyfhx79HbiHV7p5AvsZ108RcZupkBjvTg80enOzATu/loJlGg iSD5Any05XGKuryRrAlzxoZlxQSCwNA06Ahw6asM2EM+Tnfw6/Kku9u2Ngm4Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ua6RkeVykrX0DlOiqtGCF9rRljf002wx3iXp57h5cPE=; b=v2lnHSo14UKCHrCmfYf5LEl6ndi/9ZvjH+8+5V0bPNI4sUeUv3uKG3rshfn0e4OvrRzZwt Z1xfP09/H1LOchu5oE+ZYL1s5NhxmUmtyR3pi2dXK/RIlx7751sp9ogosz44Nj381TJtdN hJP/ws2C95ceZHC6J8kkmJWTqCq77kvpsjzlQRWXEplrD5vvofmzvE8ElbtZwn4/acKr0K yS3ApRJeEwYvzustpTeeKJkpiSBX+/0MKE9iWt9uHidHly0XoxXHU2ieUf3qBI5SfqcMxp aF1hVe2ml4Mb0XKSp3SVFPaNHP+UYEezVuVgoYi613Rr45ohjgpdESPQwUbrMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275896; a=rsa-sha256; cv=none; b=mnFonF3i0Po3RdEQWMvNy3jM8X59gPp3hjQcnyfEAn5bMyE6erFqbM7MYQeY9Ji1+b7AMB HafVYazLSASh6GlLxJ6aoC7NzmkwyxAgrY+Ys7taizmHSwdjeg41Jp7Ckz1WGL7UdquTXz yJVMlcuKSP1IhEv1bk8yum0xTmL4x2LR0Bfkwv6mJ87KBQr8YV1tLBZil64VtuOMaqLYDS 5aTyZ0AxMW8NOLthvYnF3woYHdQnlv5BEHbaNMkqfA0lYEzavi/AZwTJHZOGWD6OQkSexy kZwfxC7H7LGLlJAHCotX+Qq+KfcaLeGdWNNJ2hDNZXj6J9AXOLiJ41qUdbiDyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4761nPz1CXl; Wed, 29 Nov 2023 16:38: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 3ATGcFc8045349; Wed, 29 Nov 2023 16:38:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcFjQ045346; Wed, 29 Nov 2023 16:38:15 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:15 GMT Message-Id: <202311291638.3ATGcFjQ045346@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7f40fc099de6 - stable/13 - iwlwifi: fix a bug in iwl_ssid_exist() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7f40fc099de6720363d4e0bc1a45c094ccf451d5 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7f40fc099de6720363d4e0bc1a45c094ccf451d5 commit 7f40fc099de6720363d4e0bc1a45c094ccf451d5 Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:22:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:06 +0000 iwlwifi: fix a bug in iwl_ssid_exist() Rather than always comparing a given SSID to the first SSID of the IE list, compare it to the the iterator one. That way duplicates can be found. Sponsored by: The FreeBSD Foundation (cherry picked from commit ee7077f24f5b02bde8cf5c202848128f18733398) --- sys/contrib/dev/iwlwifi/mvm/scan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mvm/scan.c b/sys/contrib/dev/iwlwifi/mvm/scan.c index a4077053e374..8c5d6860914b 100644 --- a/sys/contrib/dev/iwlwifi/mvm/scan.c +++ b/sys/contrib/dev/iwlwifi/mvm/scan.c @@ -447,7 +447,11 @@ static int iwl_ssid_exist(u8 *ssid, u8 ssid_len, struct iwl_ssid_ie *ssid_list) if (!ssid_list[i].len) break; if (ssid_list[i].len == ssid_len && +#if defined(__linux__) !memcmp(ssid_list->ssid, ssid, ssid_len)) +#elif defined(__FreeBSD__) + !memcmp(ssid_list[i].ssid, ssid, ssid_len)) +#endif return i; } return -1; From nobody Wed Nov 29 16:38:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ491fG4z52wTP; Wed, 29 Nov 2023 16:38: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 4SgQ4910Dzz3Hs1; Wed, 29 Nov 2023 16:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X5hotxyvubgyeXFwS9SXgBWwRTVE1jS+tfX/7e7Fij4=; b=TLUOzkVpapVSD9x/7KEF5EEKPVQOSy72V4MGimg6dB9ptgQGhf4+koDSyya+4rktyqgxTw knesiu3m8K4vcGCPORhR1Je54aNxMpGZgHLa+OqUZ9e9O4WdfudygB6f57521mLPUQEcrm K4xK61Y/rO/ToW9slL0sHUt/lGNy+a//OhCogMm/2nAC8L2/5LDVp+PZ4QS1MyA3s6Z5HX U25layNcWRiBA5kN0OA592vVnWmmtUPJPqMyUIO61EkqaLASh30RvPkv9C9yt6jzKPOLzi LtWTmVxjWfkizMNBjQPqMSYjYii3Hr5b/q4NqWXnvNFCYBXok8PgMTrDD5Sn7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X5hotxyvubgyeXFwS9SXgBWwRTVE1jS+tfX/7e7Fij4=; b=AZaXTBCkHf6dT06prdzwp87PU1iZF7a9hxWrGE8S6xHqo4Orh2RrPkuknYqDgssd/yKFaq OQCqWXKffhcTUrHqJ2Wa1lxa2t3XRLcb5BTfygbUltdakzTDY7tNrcx5C5xKVOpo++lyJz GT5psTup/lR1NjH2NRV1YX2PEznyL3qmdALumG4HhSGWRff5QkDNkCJ/2AioMbhHGL5KnY 16mW/1BSpApSK9tgzLIv0a7S2GW0Zg8hLGOPXBu+bS4c6uaITLacAzvP4FCrJ1I/mPdhQ2 rJ+uut8vqx+v7+u1Csw27CMOKnfcO1pksdR43ciqpFLm5G6dJdDpZOM0h8ncNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275897; a=rsa-sha256; cv=none; b=ZfZs/Ff7IjBOpUHcPCwk7HIr3HVek1FRa2uisyB6TaV0tWEp4sncnlv2APXPwkBo7vKMSN R+PhnWFh2jwwAwcWBSnjbeZlPt1HUpeefCF5bfAtstrQe5yJrdoSbSuwmb0CWyhTScrYe1 0A+Jvayua48neRGxnvGKqgYGfvyyVEl612llQneg7eWRYeEXzJLy3mzqghtnH7XeY1whJT 2ukvg+QZ3mWG/FCWE9VHgVJV+zTZBHnytpljUxIspPNa6QWpgECzA3y9ZGPkbphg+OKrzU NGgWBfxuWKXVDH/oQXCyGewuuGlItg+IaiFJHPo9/t26hUDz83iHFwrDGVd+cQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4906G6z1CZy; Wed, 29 Nov 2023 16:38: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 3ATGcGEH045411; Wed, 29 Nov 2023 16:38:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcGKF045408; Wed, 29 Nov 2023 16:38:16 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:16 GMT Message-Id: <202311291638.3ATGcGKF045408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9ceccf808c85 - stable/13 - LinuxKPI: 802.11: fix counting the number of supbands List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9ceccf808c85808252cf166d2d334f297551a85e Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9ceccf808c85808252cf166d2d334f297551a85e commit 9ceccf808c85808252cf166d2d334f297551a85e Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:57:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:06 +0000 LinuxKPI: 802.11: fix counting the number of supbands While the main purpose was to assign an(y) early chandef with the loop, later additions made use of it to also count supbands as well as to initialise max_rates. Due to the main goal we can exit the loop early and not properly count and initialise supbands and max_rates. Move the terminating condition into the loop and make it a continue rather than ending the loop. Sponsored by: The FreeBSD Foundation (cherry picked from commit f454a4a10dc027474a85269cb4a3f50bbbf90528) --- sys/compat/linuxkpi/common/src/linux_80211.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 1931a8528ed5..d0f718ae0dc7 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3760,8 +3760,7 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) * in any band so we can scale [(ext) sup rates] IE(s) accordingly. */ lhw->supbands = lhw->max_rates = 0; - for (band = 0; band < NUM_NL80211_BANDS && - hw->conf.chandef.chan == NULL; band++) { + for (band = 0; band < NUM_NL80211_BANDS; band++) { struct ieee80211_supported_band *supband; struct linuxkpi_ieee80211_channel *channels; @@ -3772,6 +3771,10 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) lhw->supbands++; lhw->max_rates = max(lhw->max_rates, supband->n_bitrates); + /* If we have a channel, we need to keep counting supbands. */ + if (hw->conf.chandef.chan != NULL) + continue; + channels = supband->channels; for (i = 0; i < supband->n_channels; i++) { From nobody Wed Nov 29 16:38:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4B2Z4zz52wZF; Wed, 29 Nov 2023 16:38: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 4SgQ4B22zQz3J0T; Wed, 29 Nov 2023 16:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G23zh+1sk/D29ViOFW86Y0Eb/TjCBR0dbFB+OfsUP9Q=; b=DabCcSb6QNIWJMTSVf96Ayz3gbSosSSkWh55nE55xyARBks5rap5yUUPN+RGW+H9jaNtjt rA8a8OJxbdiha1w1ZThIHmmiEYCEjQMfa0Q/0qeLkGa1AZ1+JEhFCpTalHWKrz85heZ/V1 ZftW2l2zeLu4EO6lB2pye83chOAoWQng1fT2jacLZVTzswNDB+42fpLXKm9D4zObs1Zp6R HtJaJLvuHRp2RnARQ0qYehpPQP+62yaoa453343VAmuujiKFSjWasfMlXL93vW1Cs80os5 YG/HmwX6m7jdO3wqzVGOAqWji//8AqmJOl+aIwTI3ITQ/231fOY0KXxdhd+pFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G23zh+1sk/D29ViOFW86Y0Eb/TjCBR0dbFB+OfsUP9Q=; b=MXsLW920mQO1OUg4QeYjdwwXifJ5erAPjSCCUAl6qDFPcYgUQnJrZVP+kRaZauFB98ZV9r 0rjG/a0vMo8FWq98wf11LkRBzXNQAUn5wiiPibE3JStWGSRUSSt2XzrUcSWpM+0gmtawLJ D8HuwlX4WKzLbKa4iXRaHdFmDcPFjFJWFCdmDx69Qo1lcVlNlqpxaMaPAYvJengroyIKkg Dz8ssbv0vqThzIU7An2jXPrY0GIB4s3CWTKVhQkNhnCn84QA/DDVM668RVBElVOqFKEvmK mJg5hxKKuhIJ4/LV+ov89uLKoaLSfQnCcb46dseG7gndTAW7/mSyKO5AGXkMWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275898; a=rsa-sha256; cv=none; b=W2DV/FkryIcGCX6FKMj3IxuJQx5iD8mXxljLBhazlzXIEZ0LhtPnaxSIRLtyyTrgqLIaVd GqACtXG5tSPoFXcDTg3UaIu5D4tWKpOKWjVMi5B8h7zUt8k96HLMbTljaqkqxh7tRJ2oZA L9Tk12mu9dt/WyMFUXJQbMehVbkN1hgGbK5PhN8WA8bi+sBUlbcmrX5/9CD8pre7XA7rzW gLNN1eWADlVGrTpnkjvHtMoPr8EztgAE8f6yuv5GLUlDJu91AMlZmkAEhlgkfgRp2EOI/M Dsd95XT1m/pT8aoLVSQia1guvbl3KNnhvgAmkZprSoGxyCqzp5nUsi4lmFzyyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4B1417z1C2H; Wed, 29 Nov 2023 16:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGcIxo045473; Wed, 29 Nov 2023 16:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcIH5045470; Wed, 29 Nov 2023 16:38:18 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:18 GMT Message-Id: <202311291638.3ATGcIH5045470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a7b3d5f7dcb7 - stable/13 - LinuxKPI: 802.11: prepare for iwlwifi driver updates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a7b3d5f7dcb70185ef0b3a986d7464a02483bd9a Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a7b3d5f7dcb70185ef0b3a986d7464a02483bd9a commit a7b3d5f7dcb70185ef0b3a986d7464a02483bd9a Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:31:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:06 +0000 LinuxKPI: 802.11: prepare for iwlwifi driver updates Unconditionally enable the changes for newer drivers, as needed by iwlwifi (and others). Sponsored by: The FreeBSD Foundation (cherry picked from commit 3e1f5cc9a81a6065ddc371eea5755b4e207d72f8) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index bc7f22f5aa15..20371812198a 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -703,12 +703,6 @@ struct ieee80211_sta { struct ieee80211_link_sta deflink; struct ieee80211_link_sta *link[IEEE80211_MLD_MAX_NUM_LINKS]; /* rcu? */ -#ifndef __FOR_LATER_DRV_UPDATE - uint16_t max_rc_amsdu_len; - uint16_t max_amsdu_len; - uint16_t max_tid_amsdu_len[IEEE80211_NUM_TIDS]; -#endif - /* Must stay last. */ uint8_t drv_priv[0] __aligned(CACHE_LINE_SIZE); }; @@ -1421,7 +1415,6 @@ ieee80211_is_back_req(__le16 fc) } static __inline bool -#ifdef __FOR_LATER_DRV_UPDATE ieee80211_is_bufferable_mmpdu(struct sk_buff *skb) { struct ieee80211_mgmt *mgmt; @@ -1429,10 +1422,6 @@ ieee80211_is_bufferable_mmpdu(struct sk_buff *skb) mgmt = (struct ieee80211_mgmt *)skb->data; fc = mgmt->frame_control; -#else -ieee80211_is_bufferable_mmpdu(__le16 fc) -{ -#endif /* 11.2.2 Bufferable MMPDUs, 80211-2020. */ /* XXX we do not care about IBSS yet. */ @@ -2219,10 +2208,7 @@ ieee80211_tx_dequeue(struct ieee80211_hw *hw, struct ieee80211_txq *txq) static __inline void ieee80211_update_mu_groups(struct ieee80211_vif *vif, -#ifdef __FOR_LATER_DRV_UPDATE - u_int _i, -#endif - uint8_t *ms, uint8_t *up) + u_int _i, uint8_t *ms, uint8_t *up) { TODO(); } From nobody Wed Nov 29 16:38:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4C6rK8z52wdD; Wed, 29 Nov 2023 16:38: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 4SgQ4C6WkMz3J7p; Wed, 29 Nov 2023 16:38:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SGy0Z3SR31lUwdRnLQBRDli55YN3t2lhSNrEX2aQm8o=; b=AOVtyYyrBWdGxXjlqwTKjp+D6JBRt+qdLl1NY5i1MRBzPC3LHn/JN2MNFPmHPTtXfO+yfJ P4u58cZmpPb+A+MD9KdUeEPqwPXlBMWjKDBEU7Nsx3mU2oJkKoURoeZAPjBhZI4HlMbSMF +ICXtgjWi61SDavXp5gKmjmYk95jQfgtAVGuWIa+9H8iPmDe9l0ew0ZG74RilL9RxdgT0s ++f+Jesvp60uuBfYuZpr/jEG5j3FZo9ieHM21FpgWSSAbZ3GH+suWhgZfmrosPK7NrvVak UpcYxzdosHlM/yl5gpRoDLXH0sp7Ud7v3HwmmqVfo1x3b6rci5lD7NBMTJ9TZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SGy0Z3SR31lUwdRnLQBRDli55YN3t2lhSNrEX2aQm8o=; b=Cv7CKAfhbmxcxWwDR0W/FlwwKKDERfvR57ZsOEc1wsGWMIqZhirQQQBGaRMcTNvC6AA9o4 dii4g/9i1rrVgmHiL4v/jKllsBg0Cexne2gPlOWAhkjzfTnSHjHyf01vVOlHzfbjmA8oTz /ON8/XUhXmlngDVDVoFTpdX6J48xKxOmgMdFPRSDrMl9aZ8Jbvr4KNRkCODMuvJIoADud5 MWCv6xS9OztkVTWQTz0avq5ityjCuiFjIsbtG/9uWZ8VFsOStxnBh9R3eJ5D2bMlokoMiS oBFHgizXz94bI95SwM74msNLTBzzgCNUFeMP5JsKsmmBG/9FOyz0PafQigIj9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275899; a=rsa-sha256; cv=none; b=Ores5J0Y3juyfubGReFAu6eAp7Wy79YbWh5r7QHeHjx1Jv5XZWNKY+c2BCfmlvMKEz7Eze 2ptpDYZLasR5dpUa9eIHmhs/W0Rfkp5dWtlwwbxA9q24f9S1/0xfAU+RHOn0SeZWfdmbgy VuvJzqWokltc3COuhA1phH+1/UU6cBZcR573vs2Mi5iTXAGcc8lk9GxlKWWapuKB/gCRXd Zse3TNNiIqM283zgk13tGFO27KcQOP58vmh/HGw/tW3ShPj+tCLWYTmK4Z0R+NB4WI5yjD WH7msL9XLJIv1DyjYxaW/cZIH47lPDdxruDWNAJg6Rri6yrT+wNNAnUPc2YZHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4C5Mjtz1C2J; Wed, 29 Nov 2023 16:38: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 3ATGcJo5045518; Wed, 29 Nov 2023 16:38:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcJCo045515; Wed, 29 Nov 2023 16:38:19 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:19 GMT Message-Id: <202311291638.3ATGcJCo045515@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c79180ed480b - stable/13 - iwlwifi: update driver from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c79180ed480b7bdbba3cbc9e143fae950328edef Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c79180ed480b7bdbba3cbc9e143fae950328edef commit c79180ed480b7bdbba3cbc9e143fae950328edef Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 21:56:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:07 +0000 iwlwifi: update driver from upstream This is a combined versions of updates of the iwlwifi driver based on wireless-testing (wt-2023-05-11) 711dca0ca3d77414f8f346e564e9c8640147f40d (after v6.4-rc1). (wt-2023-06-09) 7bd20e011626ccc3ad53e57873452b1716fcfaaa (after v6.4-rc5). (wt-2023-07-24) 62e409149b62a285e89018e49b2e115757fb9022 (after v6.5-rc3). Sponsored by: The FreeBSD Foundation (cherry picked from commit 9af1bba44e1ce9b0296ae56760b564d67ab7a1cf) --- sys/contrib/dev/iwlwifi/cfg/22000.c | 617 +----- sys/contrib/dev/iwlwifi/cfg/7000.c | 22 +- sys/contrib/dev/iwlwifi/cfg/8000.c | 10 +- sys/contrib/dev/iwlwifi/cfg/9000.c | 10 +- sys/contrib/dev/iwlwifi/cfg/ax210.c | 301 +++ sys/contrib/dev/iwlwifi/cfg/bz.c | 183 ++ sys/contrib/dev/iwlwifi/cfg/sc.c | 166 ++ sys/contrib/dev/iwlwifi/fw/acpi.c | 172 +- sys/contrib/dev/iwlwifi/fw/acpi.h | 41 +- sys/contrib/dev/iwlwifi/fw/api/binding.h | 14 +- sys/contrib/dev/iwlwifi/fw/api/commands.h | 47 +- sys/contrib/dev/iwlwifi/fw/api/config.h | 15 +- sys/contrib/dev/iwlwifi/fw/api/context.h | 13 +- sys/contrib/dev/iwlwifi/fw/api/d3.h | 98 +- sys/contrib/dev/iwlwifi/fw/api/datapath.h | 287 ++- sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h | 4 +- sys/contrib/dev/iwlwifi/fw/api/debug.h | 100 +- sys/contrib/dev/iwlwifi/fw/api/filter.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/location.h | 16 +- sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h | 465 ++++- sys/contrib/dev/iwlwifi/fw/api/mac.h | 30 +- sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h | 46 +- sys/contrib/dev/iwlwifi/fw/api/offload.h | 20 +- sys/contrib/dev/iwlwifi/fw/api/phy-ctxt.h | 39 +- sys/contrib/dev/iwlwifi/fw/api/phy.h | 10 +- sys/contrib/dev/iwlwifi/fw/api/power.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/rs.h | 39 +- sys/contrib/dev/iwlwifi/fw/api/rx.h | 215 ++- sys/contrib/dev/iwlwifi/fw/api/scan.h | 66 +- sys/contrib/dev/iwlwifi/fw/api/sta.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/tdls.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/time-event.h | 7 +- sys/contrib/dev/iwlwifi/fw/api/tx.h | 23 +- sys/contrib/dev/iwlwifi/fw/dbg.c | 129 +- sys/contrib/dev/iwlwifi/fw/dbg.h | 18 +- sys/contrib/dev/iwlwifi/fw/debugfs.c | 39 +- sys/contrib/dev/iwlwifi/fw/dump.c | 87 +- sys/contrib/dev/iwlwifi/fw/error-dump.h | 19 +- sys/contrib/dev/iwlwifi/fw/file.h | 23 +- sys/contrib/dev/iwlwifi/fw/img.h | 5 +- sys/contrib/dev/iwlwifi/fw/pnvm.c | 233 ++- sys/contrib/dev/iwlwifi/fw/pnvm.h | 27 +- sys/contrib/dev/iwlwifi/fw/rs.c | 6 +- sys/contrib/dev/iwlwifi/fw/runtime.h | 11 +- sys/contrib/dev/iwlwifi/fw/uefi.c | 331 ++-- sys/contrib/dev/iwlwifi/fw/uefi.h | 58 +- sys/contrib/dev/iwlwifi/iwl-config.h | 55 +- sys/contrib/dev/iwlwifi/iwl-context-info-gen3.h | 53 +- sys/contrib/dev/iwlwifi/iwl-context-info.h | 5 +- sys/contrib/dev/iwlwifi/iwl-csr.h | 5 + sys/contrib/dev/iwlwifi/iwl-dbg-tlv.c | 99 +- sys/contrib/dev/iwlwifi/iwl-debug.c | 3 +- sys/contrib/dev/iwlwifi/iwl-drv.c | 105 +- sys/contrib/dev/iwlwifi/iwl-drv.h | 6 +- sys/contrib/dev/iwlwifi/iwl-eeprom-parse.h | 8 +- sys/contrib/dev/iwlwifi/iwl-fh.h | 4 +- sys/contrib/dev/iwlwifi/iwl-io.c | 4 +- sys/contrib/dev/iwlwifi/iwl-modparams.h | 1 + sys/contrib/dev/iwlwifi/iwl-nvm-parse.c | 393 +++- sys/contrib/dev/iwlwifi/iwl-nvm-parse.h | 4 +- sys/contrib/dev/iwlwifi/iwl-prph.h | 20 +- sys/contrib/dev/iwlwifi/iwl-trans.c | 6 +- sys/contrib/dev/iwlwifi/iwl-trans.h | 138 +- sys/contrib/dev/iwlwifi/mei/iwl-mei.h | 23 +- sys/contrib/dev/iwlwifi/mvm/binding.c | 23 +- sys/contrib/dev/iwlwifi/mvm/coex.c | 112 +- sys/contrib/dev/iwlwifi/mvm/constants.h | 6 +- sys/contrib/dev/iwlwifi/mvm/d3.c | 1148 ++++++++---- sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c | 31 +- sys/contrib/dev/iwlwifi/mvm/debugfs.c | 468 ++++- sys/contrib/dev/iwlwifi/mvm/ftm-initiator.c | 98 +- sys/contrib/dev/iwlwifi/mvm/ftm-responder.c | 44 +- sys/contrib/dev/iwlwifi/mvm/fw.c | 383 ++-- sys/contrib/dev/iwlwifi/mvm/link.c | 285 +++ sys/contrib/dev/iwlwifi/mvm/mac-ctxt.c | 686 ++++--- sys/contrib/dev/iwlwifi/mvm/mac80211.c | 2288 +++++++++++++++-------- sys/contrib/dev/iwlwifi/mvm/mld-key.c | 376 ++++ sys/contrib/dev/iwlwifi/mvm/mld-mac.c | 321 ++++ sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c | 1215 ++++++++++++ sys/contrib/dev/iwlwifi/mvm/mld-sta.c | 1181 ++++++++++++ sys/contrib/dev/iwlwifi/mvm/mvm.h | 669 ++++++- sys/contrib/dev/iwlwifi/mvm/nvm.c | 73 +- sys/contrib/dev/iwlwifi/mvm/offloading.c | 10 +- sys/contrib/dev/iwlwifi/mvm/ops.c | 131 +- sys/contrib/dev/iwlwifi/mvm/phy-ctxt.c | 73 +- sys/contrib/dev/iwlwifi/mvm/power.c | 104 +- sys/contrib/dev/iwlwifi/mvm/ptp.c | 326 ++++ sys/contrib/dev/iwlwifi/mvm/quota.c | 15 +- sys/contrib/dev/iwlwifi/mvm/rfi.c | 16 +- sys/contrib/dev/iwlwifi/mvm/rs-fw.c | 366 +++- sys/contrib/dev/iwlwifi/mvm/rs.c | 6 +- sys/contrib/dev/iwlwifi/mvm/rs.h | 14 +- sys/contrib/dev/iwlwifi/mvm/rx.c | 94 +- sys/contrib/dev/iwlwifi/mvm/rxmq.c | 1204 ++++++++---- sys/contrib/dev/iwlwifi/mvm/scan.c | 313 +++- sys/contrib/dev/iwlwifi/mvm/sf.c | 66 +- sys/contrib/dev/iwlwifi/mvm/sta.c | 844 +++++---- sys/contrib/dev/iwlwifi/mvm/sta.h | 154 +- sys/contrib/dev/iwlwifi/mvm/tdls.c | 12 +- sys/contrib/dev/iwlwifi/mvm/time-event.c | 33 +- sys/contrib/dev/iwlwifi/mvm/time-sync.c | 173 ++ sys/contrib/dev/iwlwifi/mvm/time-sync.h | 30 + sys/contrib/dev/iwlwifi/mvm/tt.c | 79 +- sys/contrib/dev/iwlwifi/mvm/tx.c | 342 ++-- sys/contrib/dev/iwlwifi/mvm/utils.c | 115 +- sys/contrib/dev/iwlwifi/pcie/ctxt-info-gen3.c | 278 ++- sys/contrib/dev/iwlwifi/pcie/ctxt-info.c | 8 +- sys/contrib/dev/iwlwifi/pcie/drv.c | 711 +++---- sys/contrib/dev/iwlwifi/pcie/internal.h | 13 +- sys/contrib/dev/iwlwifi/pcie/rx.c | 52 +- sys/contrib/dev/iwlwifi/pcie/trans-gen2.c | 89 +- sys/contrib/dev/iwlwifi/pcie/trans.c | 225 ++- sys/contrib/dev/iwlwifi/pcie/tx.c | 7 +- sys/contrib/dev/iwlwifi/queue/tx.c | 32 +- sys/contrib/dev/iwlwifi/queue/tx.h | 8 +- sys/modules/iwlwifi/Makefile | 4 + 116 files changed, 15387 insertions(+), 4969 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/cfg/22000.c b/sys/contrib/dev/iwlwifi/cfg/22000.c index 192ecc480f90..d594694206b3 100644 --- a/sys/contrib/dev/iwlwifi/cfg/22000.c +++ b/sys/contrib/dev/iwlwifi/cfg/22000.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation */ #include #include @@ -10,10 +10,10 @@ #include "fw/api/txq.h" /* Highest firmware API version supported */ -#define IWL_22000_UCODE_API_MAX 73 +#define IWL_22000_UCODE_API_MAX 77 /* Lowest firmware API version supported */ -#define IWL_22000_UCODE_API_MIN 39 +#define IWL_22000_UCODE_API_MIN 50 /* NVM versions */ #define IWL_22000_NVM_VERSION 0x0a1d @@ -26,111 +26,26 @@ #define IWL_22000_SMEM_OFFSET 0x400000 #define IWL_22000_SMEM_LEN 0xD0000 -#define IWL_QU_B_HR_B_FW_PRE "iwlwifi-Qu-b0-hr-b0-" -#define IWL_QNJ_B_HR_B_FW_PRE "iwlwifi-QuQnj-b0-hr-b0-" -#define IWL_QU_C_HR_B_FW_PRE "iwlwifi-Qu-c0-hr-b0-" -#define IWL_QU_B_JF_B_FW_PRE "iwlwifi-Qu-b0-jf-b0-" -#define IWL_QU_C_JF_B_FW_PRE "iwlwifi-Qu-c0-jf-b0-" -#define IWL_QUZ_A_HR_B_FW_PRE "iwlwifi-QuZ-a0-hr-b0-" -#define IWL_QUZ_A_JF_B_FW_PRE "iwlwifi-QuZ-a0-jf-b0-" -#define IWL_QNJ_B_JF_B_FW_PRE "iwlwifi-QuQnj-b0-jf-b0-" -#define IWL_CC_A_FW_PRE "iwlwifi-cc-a0-" -#define IWL_SO_A_JF_B_FW_PRE "iwlwifi-so-a0-jf-b0-" -#define IWL_SO_A_HR_B_FW_PRE "iwlwifi-so-a0-hr-b0-" -#define IWL_SO_A_GF_A_FW_PRE "iwlwifi-so-a0-gf-a0-" -#define IWL_TY_A_GF_A_FW_PRE "iwlwifi-ty-a0-gf-a0-" -#define IWL_SO_A_GF4_A_FW_PRE "iwlwifi-so-a0-gf4-a0-" -#define IWL_SO_A_MR_A_FW_PRE "iwlwifi-so-a0-mr-a0-" -#define IWL_SNJ_A_GF4_A_FW_PRE "iwlwifi-SoSnj-a0-gf4-a0-" -#define IWL_SNJ_A_GF_A_FW_PRE "iwlwifi-SoSnj-a0-gf-a0-" -#define IWL_SNJ_A_HR_B_FW_PRE "iwlwifi-SoSnj-a0-hr-b0-" -#define IWL_SNJ_A_JF_B_FW_PRE "iwlwifi-SoSnj-a0-jf-b0-" -#define IWL_MA_A_HR_B_FW_PRE "iwlwifi-ma-a0-hr-b0-" -#define IWL_MA_A_GF_A_FW_PRE "iwlwifi-ma-a0-gf-a0-" -#define IWL_MA_A_GF4_A_FW_PRE "iwlwifi-ma-a0-gf4-a0-" -#define IWL_MA_A_MR_A_FW_PRE "iwlwifi-ma-a0-mr-a0-" -#define IWL_MA_A_FM_A_FW_PRE "iwlwifi-ma-a0-fm-a0-" -#define IWL_SNJ_A_MR_A_FW_PRE "iwlwifi-SoSnj-a0-mr-a0-" -#define IWL_BZ_A_HR_B_FW_PRE "iwlwifi-bz-a0-hr-b0-" -#define IWL_BZ_A_GF_A_FW_PRE "iwlwifi-bz-a0-gf-a0-" -#define IWL_BZ_A_GF4_A_FW_PRE "iwlwifi-bz-a0-gf4-a0-" -#define IWL_BZ_A_MR_A_FW_PRE "iwlwifi-bz-a0-mr-a0-" -#define IWL_BZ_A_FM_A_FW_PRE "iwlwifi-bz-a0-fm-a0-" -#define IWL_GL_A_FM_A_FW_PRE "iwlwifi-gl-a0-fm-a0-" -#define IWL_BZ_Z_GF_A_FW_PRE "iwlwifi-bz-z0-gf-a0-" -#define IWL_BNJ_A_FM_A_FW_PRE "iwlwifi-BzBnj-a0-fm-a0-" -#define IWL_BNJ_A_FM4_A_FW_PRE "iwlwifi-BzBnj-a0-fm4-a0-" -#define IWL_BNJ_A_GF_A_FW_PRE "iwlwifi-BzBnj-a0-gf-a0-" -#define IWL_BNJ_A_GF4_A_FW_PRE "iwlwifi-BzBnj-a0-gf4-a0-" -#define IWL_BNJ_A_HR_B_FW_PRE "iwlwifi-BzBnj-a0-hr-b0-" - +#define IWL_QU_B_HR_B_FW_PRE "iwlwifi-Qu-b0-hr-b0" +#define IWL_QU_C_HR_B_FW_PRE "iwlwifi-Qu-c0-hr-b0" +#define IWL_QU_B_JF_B_FW_PRE "iwlwifi-Qu-b0-jf-b0" +#define IWL_QU_C_JF_B_FW_PRE "iwlwifi-Qu-c0-jf-b0" +#define IWL_QUZ_A_HR_B_FW_PRE "iwlwifi-QuZ-a0-hr-b0" +#define IWL_QUZ_A_JF_B_FW_PRE "iwlwifi-QuZ-a0-jf-b0" +#define IWL_CC_A_FW_PRE "iwlwifi-cc-a0" #define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \ - IWL_QU_B_HR_B_FW_PRE __stringify(api) ".ucode" -#define IWL_QNJ_B_HR_B_MODULE_FIRMWARE(api) \ - IWL_QNJ_B_HR_B_FW_PRE __stringify(api) ".ucode" + IWL_QU_B_HR_B_FW_PRE "-" __stringify(api) ".ucode" #define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \ - IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode" + IWL_QUZ_A_HR_B_FW_PRE "-" __stringify(api) ".ucode" #define IWL_QUZ_A_JF_B_MODULE_FIRMWARE(api) \ - IWL_QUZ_A_JF_B_FW_PRE __stringify(api) ".ucode" + IWL_QUZ_A_JF_B_FW_PRE "-" __stringify(api) ".ucode" #define IWL_QU_C_HR_B_MODULE_FIRMWARE(api) \ - IWL_QU_C_HR_B_FW_PRE __stringify(api) ".ucode" + IWL_QU_C_HR_B_FW_PRE "-" __stringify(api) ".ucode" #define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \ - IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode" -#define IWL_QNJ_B_JF_B_MODULE_FIRMWARE(api) \ - IWL_QNJ_B_JF_B_FW_PRE __stringify(api) ".ucode" + IWL_QU_B_JF_B_FW_PRE "-" __stringify(api) ".ucode" #define IWL_CC_A_MODULE_FIRMWARE(api) \ - IWL_CC_A_FW_PRE __stringify(api) ".ucode" -#define IWL_SO_A_JF_B_MODULE_FIRMWARE(api) \ - IWL_SO_A_JF_B_FW_PRE __stringify(api) ".ucode" -#define IWL_SO_A_HR_B_MODULE_FIRMWARE(api) \ - IWL_SO_A_HR_B_FW_PRE __stringify(api) ".ucode" -#define IWL_SO_A_GF_A_MODULE_FIRMWARE(api) \ - IWL_SO_A_GF_A_FW_PRE __stringify(api) ".ucode" -#define IWL_TY_A_GF_A_MODULE_FIRMWARE(api) \ - IWL_TY_A_GF_A_FW_PRE __stringify(api) ".ucode" -#define IWL_SNJ_A_GF4_A_MODULE_FIRMWARE(api) \ - IWL_SNJ_A_GF4_A_FW_PRE __stringify(api) ".ucode" -#define IWL_SNJ_A_GF_A_MODULE_FIRMWARE(api) \ - IWL_SNJ_A_GF_A_FW_PRE __stringify(api) ".ucode" -#define IWL_SNJ_A_HR_B_MODULE_FIRMWARE(api) \ - IWL_SNJ_A_HR_B_FW_PRE __stringify(api) ".ucode" -#define IWL_SNJ_A_JF_B_MODULE_FIRMWARE(api) \ - IWL_SNJ_A_JF_B_FW_PRE __stringify(api) ".ucode" -#define IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(api) \ - IWL_MA_A_HR_B_FW_PRE __stringify(api) ".ucode" -#define IWL_MA_A_GF_A_FW_MODULE_FIRMWARE(api) \ - IWL_MA_A_GF_A_FW_PRE __stringify(api) ".ucode" -#define IWL_MA_A_GF4_A_FW_MODULE_FIRMWARE(api) \ - IWL_MA_A_GF4_A_FW_PRE __stringify(api) ".ucode" -#define IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(api) \ - IWL_MA_A_MR_A_FW_PRE __stringify(api) ".ucode" -#define IWL_MA_A_FM_A_FW_MODULE_FIRMWARE(api) \ - IWL_MA_A_FM_A_FW_PRE __stringify(api) ".ucode" -#define IWL_SNJ_A_MR_A_MODULE_FIRMWARE(api) \ - IWL_SNJ_A_MR_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BZ_A_HR_B_MODULE_FIRMWARE(api) \ - IWL_BZ_A_HR_B_FW_PRE __stringify(api) ".ucode" -#define IWL_BZ_A_GF_A_MODULE_FIRMWARE(api) \ - IWL_BZ_A_GF_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BZ_A_GF4_A_MODULE_FIRMWARE(api) \ - IWL_BZ_A_GF4_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BZ_A_MR_A_MODULE_FIRMWARE(api) \ - IWL_BZ_A_MR_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BZ_A_FM_A_MODULE_FIRMWARE(api) \ - IWL_BZ_A_FM_A_FW_PRE __stringify(api) ".ucode" -#define IWL_GL_A_FM_A_MODULE_FIRMWARE(api) \ - IWL_GL_A_FM_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BNJ_A_FM_A_MODULE_FIRMWARE(api) \ - IWL_BNJ_A_FM_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BNJ_A_FM4_A_MODULE_FIRMWARE(api) \ - IWL_BNJ_A_FM4_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BNJ_A_GF_A_MODULE_FIRMWARE(api) \ - IWL_BNJ_A_GF_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BNJ_A_GF4_A_MODULE_FIRMWARE(api) \ - IWL_BNJ_A_GF4_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BNJ_A_HR_B_MODULE_FIRMWARE(api) \ - IWL_BNJ_A_HR_B_FW_PRE __stringify(api) ".ucode" + IWL_CC_A_FW_PRE "-" __stringify(api) ".ucode" static const struct iwl_base_params iwl_22000_base_params = { .eeprom_size = OTP_LOW_IMAGE_SIZE_32K, @@ -144,19 +59,7 @@ static const struct iwl_base_params iwl_22000_base_params = { .pcie_l1_allowed = true, }; -static const struct iwl_base_params iwl_ax210_base_params = { - .eeprom_size = OTP_LOW_IMAGE_SIZE_32K, - .num_of_queues = 512, - .max_tfd_queue_size = 65536, - .shadow_ram_support = true, - .led_compensation = 57, - .wd_timeout = IWL_LONG_WD_TIMEOUT, - .max_event_log_size = 512, - .shadow_reg_enable = true, - .pcie_l1_allowed = true, -}; - -static const struct iwl_ht_params iwl_22000_ht_params = { +const struct iwl_ht_params iwl_22000_ht_params = { .stbc = true, .ldpc = true, .ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ) | @@ -164,7 +67,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = { }; #define IWL_DEVICE_22000_COMMON \ - .ucode_api_max = IWL_22000_UCODE_API_MAX, \ .ucode_api_min = IWL_22000_UCODE_API_MIN, \ .led_mode = IWL_LED_RF_STATE, \ .nvm_hw_section_num = 10, \ @@ -182,7 +84,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = { .mac_addr_from_csr = 0x380, \ .ht_params = &iwl_22000_ht_params, \ .nvm_ver = IWL_22000_NVM_VERSION, \ - .trans.use_tfh = true, \ .trans.rf_id = true, \ .trans.gen2 = true, \ .nvm_type = IWL_NVM_EXT, \ @@ -203,6 +104,7 @@ static const struct iwl_ht_params iwl_22000_ht_params = { #define IWL_DEVICE_22500 \ IWL_DEVICE_22000_COMMON, \ + .ucode_api_max = IWL_22000_UCODE_API_MAX, \ .trans.device_family = IWL_DEVICE_FAMILY_22000, \ .trans.base_params = &iwl_22000_base_params, \ .gp2_reg_addr = 0xa02c68, \ @@ -217,108 +119,8 @@ static const struct iwl_ht_params iwl_22000_ht_params = { }, \ } -#define IWL_DEVICE_AX210 \ - IWL_DEVICE_22000_COMMON, \ - .trans.umac_prph_offset = 0x300000, \ - .trans.device_family = IWL_DEVICE_FAMILY_AX210, \ - .trans.base_params = &iwl_ax210_base_params, \ - .min_txq_size = 128, \ - .gp2_reg_addr = 0xd02c68, \ - .min_ba_txq_size = IWL_DEFAULT_QUEUE_SIZE_HE, \ - .mon_dram_regs = { \ - .write_ptr = { \ - .addr = DBGC_CUR_DBGBUF_STATUS, \ - .mask = DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK, \ - }, \ - .cycle_cnt = { \ - .addr = DBGC_DBGBUF_WRAP_AROUND, \ - .mask = 0xffffffff, \ - }, \ - .cur_frag = { \ - .addr = DBGC_CUR_DBGBUF_STATUS, \ - .mask = DBGC_CUR_DBGBUF_STATUS_IDX_MSK, \ - }, \ - } - -#define IWL_DEVICE_BZ_COMMON \ - .ucode_api_max = IWL_22000_UCODE_API_MAX, \ - .ucode_api_min = IWL_22000_UCODE_API_MIN, \ - .led_mode = IWL_LED_RF_STATE, \ - .nvm_hw_section_num = 10, \ - .non_shared_ant = ANT_B, \ - .dccm_offset = IWL_22000_DCCM_OFFSET, \ - .dccm_len = IWL_22000_DCCM_LEN, \ - .dccm2_offset = IWL_22000_DCCM2_OFFSET, \ - .dccm2_len = IWL_22000_DCCM2_LEN, \ - .smem_offset = IWL_22000_SMEM_OFFSET, \ - .smem_len = IWL_22000_SMEM_LEN, \ - .features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM, \ - .apmg_not_supported = true, \ - .trans.mq_rx_supported = true, \ - .vht_mu_mimo_supported = true, \ - .mac_addr_from_csr = 0x30, \ - .ht_params = &iwl_22000_ht_params, \ - .nvm_ver = IWL_22000_NVM_VERSION, \ - .trans.use_tfh = true, \ - .trans.rf_id = true, \ - .trans.gen2 = true, \ - .nvm_type = IWL_NVM_EXT, \ - .dbgc_supported = true, \ - .min_umac_error_event_table = 0x400000, \ - .d3_debug_data_base_addr = 0x401000, \ - .d3_debug_data_length = 60 * 1024, \ - .mon_smem_regs = { \ - .write_ptr = { \ - .addr = LDBG_M2S_BUF_WPTR, \ - .mask = LDBG_M2S_BUF_WPTR_VAL_MSK, \ - }, \ - .cycle_cnt = { \ - .addr = LDBG_M2S_BUF_WRAP_CNT, \ - .mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK, \ - }, \ - } - -#define IWL_DEVICE_BZ \ - IWL_DEVICE_BZ_COMMON, \ - .trans.umac_prph_offset = 0x300000, \ - .trans.device_family = IWL_DEVICE_FAMILY_BZ, \ - .trans.base_params = &iwl_ax210_base_params, \ - .min_txq_size = 128, \ - .gp2_reg_addr = 0xd02c68, \ - .min_ba_txq_size = IWL_DEFAULT_QUEUE_SIZE_EHT, \ - .mon_dram_regs = { \ - .write_ptr = { \ - .addr = DBGC_CUR_DBGBUF_STATUS, \ - .mask = DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK, \ - }, \ - .cycle_cnt = { \ - .addr = DBGC_DBGBUF_WRAP_AROUND, \ - .mask = 0xffffffff, \ - }, \ - .cur_frag = { \ - .addr = DBGC_CUR_DBGBUF_STATUS, \ - .mask = DBGC_CUR_DBGBUF_STATUS_IDX_MSK, \ - }, \ - }, \ - .mon_dbgi_regs = { \ - .write_ptr = { \ - .addr = DBGI_SRAM_FIFO_POINTERS, \ - .mask = DBGI_SRAM_FIFO_POINTERS_WR_PTR_MSK, \ - }, \ - } - -const struct iwl_cfg_trans_params iwl_qnj_trans_cfg = { - .mq_rx_supported = true, - .use_tfh = true, - .rf_id = true, - .gen2 = true, - .device_family = IWL_DEVICE_FAMILY_22000, - .base_params = &iwl_22000_base_params, -}; - const struct iwl_cfg_trans_params iwl_qu_trans_cfg = { .mq_rx_supported = true, - .use_tfh = true, .rf_id = true, .gen2 = true, .device_family = IWL_DEVICE_FAMILY_22000, @@ -330,7 +132,6 @@ const struct iwl_cfg_trans_params iwl_qu_trans_cfg = { const struct iwl_cfg_trans_params iwl_qu_medium_latency_trans_cfg = { .mq_rx_supported = true, - .use_tfh = true, .rf_id = true, .gen2 = true, .device_family = IWL_DEVICE_FAMILY_22000, @@ -342,7 +143,6 @@ const struct iwl_cfg_trans_params iwl_qu_medium_latency_trans_cfg = { const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = { .mq_rx_supported = true, - .use_tfh = true, .rf_id = true, .gen2 = true, .device_family = IWL_DEVICE_FAMILY_22000, @@ -353,59 +153,6 @@ const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = { .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, }; -const struct iwl_cfg_trans_params iwl_snj_trans_cfg = { - .mq_rx_supported = true, - .use_tfh = true, - .rf_id = true, - .gen2 = true, - .device_family = IWL_DEVICE_FAMILY_AX210, - .base_params = &iwl_ax210_base_params, - .umac_prph_offset = 0x300000, -}; - -const struct iwl_cfg_trans_params iwl_so_trans_cfg = { - .mq_rx_supported = true, - .use_tfh = true, - .rf_id = true, - .gen2 = true, - .device_family = IWL_DEVICE_FAMILY_AX210, - .base_params = &iwl_ax210_base_params, - .umac_prph_offset = 0x300000, - .integrated = true, - /* TODO: the following values need to be checked */ - .xtal_latency = 500, - .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_200US, -}; - -const struct iwl_cfg_trans_params iwl_so_long_latency_trans_cfg = { - .mq_rx_supported = true, - .use_tfh = true, - .rf_id = true, - .gen2 = true, - .device_family = IWL_DEVICE_FAMILY_AX210, - .base_params = &iwl_ax210_base_params, - .umac_prph_offset = 0x300000, - .integrated = true, - .low_latency_xtal = true, - .xtal_latency = 12000, - .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, -}; - -const struct iwl_cfg_trans_params iwl_so_long_latency_imr_trans_cfg = { - .mq_rx_supported = true, - .use_tfh = true, - .rf_id = true, - .gen2 = true, - .device_family = IWL_DEVICE_FAMILY_AX210, - .base_params = &iwl_ax210_base_params, - .umac_prph_offset = 0x300000, - .integrated = true, - .low_latency_xtal = true, - .xtal_latency = 12000, - .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, - .imr_enabled = true, -}; - /* * If the device doesn't support HE, no need to have that many buffers. * 22000 devices can split multiple frames into a single RB, so fewer are @@ -415,7 +162,6 @@ const struct iwl_cfg_trans_params iwl_so_long_latency_imr_trans_cfg = { */ #define IWL_NUM_RBDS_NON_HE 512 #define IWL_NUM_RBDS_22000_HE 2048 -#define IWL_NUM_RBDS_AX210_HE 4096 /* * All JF radio modules are part of the 9000 series, but the MAC part @@ -446,63 +192,20 @@ const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg = { .num_rbds = IWL_NUM_RBDS_NON_HE, }; -const struct iwl_cfg iwl9560_qnj_b0_jf_b0_cfg = { - .fw_name_pre = IWL_QNJ_B_JF_B_FW_PRE, - IWL_DEVICE_22500, - /* - * This device doesn't support receiving BlockAck with a large bitmap - * so we need to restrict the size of transmitted aggregation to the - * HT size; mac80211 would otherwise pick the HE max (256) by default. - */ - .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, - .num_rbds = IWL_NUM_RBDS_NON_HE, -}; - const struct iwl_cfg_trans_params iwl_ax200_trans_cfg = { .device_family = IWL_DEVICE_FAMILY_22000, .base_params = &iwl_22000_base_params, .mq_rx_supported = true, - .use_tfh = true, .rf_id = true, .gen2 = true, .bisr_workaround = 1, }; -const struct iwl_cfg_trans_params iwl_ma_trans_cfg = { - .device_family = IWL_DEVICE_FAMILY_AX210, - .base_params = &iwl_ax210_base_params, - .mq_rx_supported = true, - .use_tfh = true, - .rf_id = true, - .gen2 = true, - .integrated = true, - .umac_prph_offset = 0x300000 -}; - -const struct iwl_cfg_trans_params iwl_bz_trans_cfg = { - .device_family = IWL_DEVICE_FAMILY_BZ, - .base_params = &iwl_ax210_base_params, - .mq_rx_supported = true, - .use_tfh = true, - .rf_id = true, - .gen2 = true, - .integrated = true, - .umac_prph_offset = 0x300000, - .xtal_latency = 12000, - .low_latency_xtal = true, - .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, -}; - const char iwl_ax101_name[] = "Intel(R) Wi-Fi 6 AX101"; const char iwl_ax200_name[] = "Intel(R) Wi-Fi 6 AX200 160MHz"; const char iwl_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz"; const char iwl_ax203_name[] = "Intel(R) Wi-Fi 6 AX203"; const char iwl_ax204_name[] = "Intel(R) Wi-Fi 6 AX204 160MHz"; -const char iwl_ax211_name[] = "Intel(R) Wi-Fi 6E AX211 160MHz"; -const char iwl_ax221_name[] = "Intel(R) Wi-Fi 6E AX221 160MHz"; -const char iwl_ax231_name[] = "Intel(R) Wi-Fi 6E AX231 160MHz"; -const char iwl_ax411_name[] = "Intel(R) Wi-Fi 6E AX411 160MHz"; -const char iwl_bz_name[] = "Intel(R) TBD Bz device"; const char iwl_ax200_killer_1650w_name[] = "Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)"; @@ -512,18 +215,6 @@ const char iwl_ax201_killer_1650s_name[] = "Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)"; const char iwl_ax201_killer_1650i_name[] = "Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)"; -const char iwl_ax210_killer_1675w_name[] = - "Killer(R) Wi-Fi 6E AX1675w 160MHz Wireless Network Adapter (210D2W)"; -const char iwl_ax210_killer_1675x_name[] = - "Killer(R) Wi-Fi 6E AX1675x 160MHz Wireless Network Adapter (210NGW)"; -const char iwl_ax211_killer_1675s_name[] = - "Killer(R) Wi-Fi 6E AX1675s 160MHz Wireless Network Adapter (211NGW)"; -const char iwl_ax211_killer_1675i_name[] = - "Killer(R) Wi-Fi 6E AX1675i 160MHz Wireless Network Adapter (211NGW)"; -const char iwl_ax411_killer_1690s_name[] = - "Killer(R) Wi-Fi 6E AX1690s 160MHz Wireless Network Adapter (411D2W)"; -const char iwl_ax411_killer_1690i_name[] = - "Killer(R) Wi-Fi 6E AX1690i 160MHz Wireless Network Adapter (411NGW)"; const struct iwl_cfg iwl_qu_b0_hr1_b0 = { .fw_name_pre = IWL_QU_B_HR_B_FW_PRE, @@ -717,168 +408,6 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = { .num_rbds = IWL_NUM_RBDS_22000_HE, }; -const struct iwl_cfg iwl_qnj_b0_hr_b0_cfg = { - .fw_name_pre = IWL_QNJ_B_HR_B_FW_PRE, - IWL_DEVICE_22500, - /* - * This device doesn't support receiving BlockAck with a large bitmap - * so we need to restrict the size of transmitted aggregation to the - * HT size; mac80211 would otherwise pick the HE max (256) by default. - */ - .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, - .num_rbds = IWL_NUM_RBDS_22000_HE, -}; - -const struct iwl_cfg iwlax210_2ax_cfg_so_jf_b0 = { - .name = "Intel(R) Wireless-AC 9560 160MHz", - .fw_name_pre = IWL_SO_A_JF_B_FW_PRE, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_NON_HE, -}; - -const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0 = { - .name = iwl_ax211_name, - .fw_name_pre = IWL_SO_A_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0_long = { - .name = iwl_ax211_name, - .fw_name_pre = IWL_SO_A_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, - .trans.xtal_latency = 12000, - .trans.low_latency_xtal = true, -}; - -const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = { - .name = "Intel(R) Wi-Fi 6 AX210 160MHz", - .fw_name_pre = IWL_TY_A_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0 = { - .name = iwl_ax411_name, - .fw_name_pre = IWL_SO_A_GF4_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long = { - .name = iwl_ax411_name, - .fw_name_pre = IWL_SO_A_GF4_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, - .trans.xtal_latency = 12000, - .trans.low_latency_xtal = true, -}; - -const struct iwl_cfg iwlax411_2ax_cfg_sosnj_gf4_a0 = { - .name = iwl_ax411_name, - .fw_name_pre = IWL_SNJ_A_GF4_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwlax211_cfg_snj_gf_a0 = { - .name = iwl_ax211_name, - .fw_name_pre = IWL_SNJ_A_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_snj_hr_b0 = { - .fw_name_pre = IWL_SNJ_A_HR_B_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_snj_a0_jf_b0 = { - .fw_name_pre = IWL_SNJ_A_JF_B_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_ma_a0_hr_b0 = { - .fw_name_pre = IWL_MA_A_HR_B_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_ma_a0_gf_a0 = { - .fw_name_pre = IWL_MA_A_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_ma_a0_gf4_a0 = { - .fw_name_pre = IWL_MA_A_GF4_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_ma_a0_mr_a0 = { - .fw_name_pre = IWL_MA_A_MR_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_ma_a0_ms_a0 = { - .fw_name_pre = IWL_MA_A_MR_A_FW_PRE, - .uhb_supported = false, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_so_a0_ms_a0 = { - .fw_name_pre = IWL_SO_A_MR_A_FW_PRE, - .uhb_supported = false, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_ma_a0_fm_a0 = { - .fw_name_pre = IWL_MA_A_FM_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_snj_a0_mr_a0 = { - .fw_name_pre = IWL_SNJ_A_MR_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_snj_a0_ms_a0 = { - .fw_name_pre = IWL_SNJ_A_MR_A_FW_PRE, - .uhb_supported = false, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_so_a0_hr_a0 = { - .fw_name_pre = IWL_SO_A_HR_B_FW_PRE, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - const struct iwl_cfg iwl_cfg_quz_a0_hr_b0 = { .fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE, IWL_DEVICE_22500, @@ -891,119 +420,9 @@ const struct iwl_cfg iwl_cfg_quz_a0_hr_b0 = { .num_rbds = IWL_NUM_RBDS_22000_HE, }; -const struct iwl_cfg iwl_cfg_bz_a0_hr_b0 = { - .fw_name_pre = IWL_BZ_A_HR_B_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bz_a0_gf_a0 = { - .fw_name_pre = IWL_BZ_A_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bz_a0_gf4_a0 = { - .fw_name_pre = IWL_BZ_A_GF4_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bz_a0_mr_a0 = { - .fw_name_pre = IWL_BZ_A_MR_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bz_a0_fm_a0 = { - .fw_name_pre = IWL_BZ_A_FM_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_gl_a0_fm_a0 = { - .fw_name_pre = IWL_GL_A_FM_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bz_z0_gf_a0 = { - .fw_name_pre = IWL_BZ_Z_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bnj_a0_fm_a0 = { - .fw_name_pre = IWL_BNJ_A_FM_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bnj_a0_fm4_a0 = { - .fw_name_pre = IWL_BNJ_A_FM4_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bnj_a0_gf_a0 = { - .fw_name_pre = IWL_BNJ_A_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bnj_a0_gf4_a0 = { - .fw_name_pre = IWL_BNJ_A_GF4_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bnj_a0_hr_b0 = { - .fw_name_pre = IWL_BNJ_A_HR_B_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_QNJ_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_QUZ_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_QNJ_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_CC_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SO_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SO_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SO_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_TY_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SNJ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SNJ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SNJ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SNJ_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_MA_A_GF_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_MA_A_GF4_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_MA_A_FM_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SNJ_A_MR_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BZ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BZ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BZ_A_MR_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BZ_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_GL_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BNJ_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BNJ_A_FM4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BNJ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BNJ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BNJ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); diff --git a/sys/contrib/dev/iwlwifi/cfg/7000.c b/sys/contrib/dev/iwlwifi/cfg/7000.c index b24dc5523a52..4e2afdedf4c6 100644 --- a/sys/contrib/dev/iwlwifi/cfg/7000.c +++ b/sys/contrib/dev/iwlwifi/cfg/7000.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2012-2014, 2018-2020 Intel Corporation + * Copyright (C) 2012-2014, 2018-2020, 2023 Intel Corporation * Copyright (C) 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015 Intel Deutschland GmbH */ @@ -34,20 +34,20 @@ #define IWL3160_DCCM_LEN 0x10000 #define IWL7265_DCCM_LEN 0x17A00 -#define IWL7260_FW_PRE "iwlwifi-7260-" -#define IWL7260_MODULE_FIRMWARE(api) IWL7260_FW_PRE __stringify(api) ".ucode" +#define IWL7260_FW_PRE "iwlwifi-7260" +#define IWL7260_MODULE_FIRMWARE(api) IWL7260_FW_PRE "-" __stringify(api) ".ucode" -#define IWL3160_FW_PRE "iwlwifi-3160-" -#define IWL3160_MODULE_FIRMWARE(api) IWL3160_FW_PRE __stringify(api) ".ucode" +#define IWL3160_FW_PRE "iwlwifi-3160" +#define IWL3160_MODULE_FIRMWARE(api) IWL3160_FW_PRE "-" __stringify(api) ".ucode" -#define IWL3168_FW_PRE "iwlwifi-3168-" -#define IWL3168_MODULE_FIRMWARE(api) IWL3168_FW_PRE __stringify(api) ".ucode" +#define IWL3168_FW_PRE "iwlwifi-3168" +#define IWL3168_MODULE_FIRMWARE(api) IWL3168_FW_PRE "-" __stringify(api) ".ucode" -#define IWL7265_FW_PRE "iwlwifi-7265-" -#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode" +#define IWL7265_FW_PRE "iwlwifi-7265" +#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE "-" __stringify(api) ".ucode" -#define IWL7265D_FW_PRE "iwlwifi-7265D-" -#define IWL7265D_MODULE_FIRMWARE(api) IWL7265D_FW_PRE __stringify(api) ".ucode" +#define IWL7265D_FW_PRE "iwlwifi-7265D" +#define IWL7265D_MODULE_FIRMWARE(api) IWL7265D_FW_PRE "-" __stringify(api) ".ucode" static const struct iwl_base_params iwl7000_base_params = { .eeprom_size = OTP_LOW_IMAGE_SIZE_16K, diff --git a/sys/contrib/dev/iwlwifi/cfg/8000.c b/sys/contrib/dev/iwlwifi/cfg/8000.c index a6454287d506..d09cf8d7dc01 100644 --- a/sys/contrib/dev/iwlwifi/cfg/8000.c +++ b/sys/contrib/dev/iwlwifi/cfg/8000.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2014, 2018-2020 Intel Corporation + * Copyright (C) 2014, 2018-2020, 2023 Intel Corporation * Copyright (C) 2014-2015 Intel Mobile Communications GmbH * Copyright (C) 2016 Intel Deutschland GmbH */ @@ -27,13 +27,13 @@ #define IWL8260_SMEM_OFFSET 0x400000 #define IWL8260_SMEM_LEN 0x68000 -#define IWL8000_FW_PRE "iwlwifi-8000C-" +#define IWL8000_FW_PRE "iwlwifi-8000C" #define IWL8000_MODULE_FIRMWARE(api) \ - IWL8000_FW_PRE __stringify(api) ".ucode" + IWL8000_FW_PRE "-" __stringify(api) ".ucode" -#define IWL8265_FW_PRE "iwlwifi-8265-" +#define IWL8265_FW_PRE "iwlwifi-8265" #define IWL8265_MODULE_FIRMWARE(api) \ - IWL8265_FW_PRE __stringify(api) ".ucode" + IWL8265_FW_PRE "-" __stringify(api) ".ucode" #define DEFAULT_NVM_FILE_FAMILY_8000C "nvmData-8000C" diff --git a/sys/contrib/dev/iwlwifi/cfg/9000.c b/sys/contrib/dev/iwlwifi/cfg/9000.c index 7a7ca06d46c1..0130d9a9b78b 100644 --- a/sys/contrib/dev/iwlwifi/cfg/9000.c +++ b/sys/contrib/dev/iwlwifi/cfg/9000.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2021, 2023 Intel Corporation */ #include *** 31085 LINES SKIPPED *** From nobody Wed Nov 29 16:38:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4F5thLz52wdH; Wed, 29 Nov 2023 16:38: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 4SgQ4F5Spwz3J1S; Wed, 29 Nov 2023 16:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=huVJK0dtTsseMiNsDKZXkuhVT3m92F/XAah7xwnETsk=; b=pL1jnevW7uegkvoyruOmjyGGlRtZPWdVdVhYemTm4AoyyozwQLYoD/sXhEwRmcMUTPSKFe djuiMqqlft8lw34uV9BV2eGNT5pedjVPfqvePALB4vGX4+u48HQzpIPXyPWG1zI+nAYIJg NsSklnOjagflbRcKnJbHAuIU3e55Ezyl9zqjhq4RCl8S1JP9hCoISG79JkoQfUJITRMfCe tp6xooD+YpSz9fWYO4TzHLV4ZCI537jU1xOtLv16e1/8ByWCE+FsB5pSNkdVj4UMPaQ9YK rCa2KfuJNGshQtpF2pInMiRjSA+NpZcB2jy1yz7djHq4HipZzAxuEFpeDyD3Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=huVJK0dtTsseMiNsDKZXkuhVT3m92F/XAah7xwnETsk=; b=wMj9AbTpRuglnAmS3oVCP+gJTeBqQyOzKfrUWlK1s5LXthjecNi8N6ub0CGVfMqj4+f0Vf P2dgtqiHYiCePYm9S+JR/uql/LLaXgZJmwJ/kXA/ow3nHVk8tlsGGAEau2tjFZvkN3AZlg H6IF3FwiRDha3a6m6AAw/r936yDUeYAHLL+czswX5scXelil1Pmgm3y8pTJGxcILUjrLRw d6LQUQAAb0pVcZeeLltbPxjyxmHcG5qlvJCnk4pa/mDPGPpy80qLGvJoKKMj2BZZYeTQcH 76jbD6EU7uU3bUBxfCKyUKp6WHVldQeQvUrAQnBQSOAWLRGZeWIEeL8Ufz1lkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275901; a=rsa-sha256; cv=none; b=DxdmPwf9tyvKlhAEKHI+uiZChTzRXul5Ic5dp/PXafrX0+n9BCYppSUwT7fPa4e+50M3eE qAaS7Zu3Tqec1NzcCrufal59gLnij6i2nJo1xzlwvFw9Y+aTWsWNHpi3Agf1Jj9vpp+vIJ WYnfVQwjt2fcNqSv963OTCyXgzrk+gKSzydZwDtEE4McuN8/FmmoTVPIOunrHywRs43W+5 8SCK6vmxTYqHE/ifUJgj117b1DEog/vRtZWUrsbDMQ904Gb5RASYxpFGXyy0Nb+qy8Xn2E m1N+Z01uW5SyMkCEWsW2YzpEcV8vtBqKVWFQmIzvn5EryL+es8fWoLApy6BJVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4F4DB1z1Bwk; Wed, 29 Nov 2023 16:38: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 3ATGcLf2045578; Wed, 29 Nov 2023 16:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcL9N045575; Wed, 29 Nov 2023 16:38:21 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:21 GMT Message-Id: <202311291638.3ATGcL9N045575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 643cd7c437bf - stable/13 - iwlwifi firmware: update up-to -83 / updated -77 for others List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 643cd7c437bfd54d4292dd26eb7c5eb29044a922 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=643cd7c437bfd54d4292dd26eb7c5eb29044a922 commit 643cd7c437bfd54d4292dd26eb7c5eb29044a922 Author: Bjoern A. Zeeb AuthorDate: 2023-06-11 00:45:37 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:07 +0000 iwlwifi firmware: update up-to -83 / updated -77 for others Firmware was obtained from linux-firmware at dfa11466cf000120d1551146fd5bf78c44941eda. Sponsored by: The FreeBSD Foundation (cherry picked from commit 027768a21217499dd85aba8608715a5bf66a7857) --- .../iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode | Bin 1518788 -> 1518772 bytes .../iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode | Bin 1489548 -> 1489652 bytes ...hr-b0-73.ucode => iwlwifi-Qu-b0-hr-b0-77.ucode} | Bin 1369840 -> 1404704 bytes ...jf-b0-73.ucode => iwlwifi-Qu-b0-jf-b0-77.ucode} | Bin 1290220 -> 1322436 bytes ...hr-b0-73.ucode => iwlwifi-Qu-c0-hr-b0-77.ucode} | Bin 1369976 -> 1404720 bytes ...jf-b0-73.ucode => iwlwifi-Qu-c0-jf-b0-77.ucode} | Bin 1290100 -> 1322452 bytes ...r-b0-73.ucode => iwlwifi-QuZ-a0-hr-b0-77.ucode} | Bin 1369856 -> 1404840 bytes ...f-b0-73.ucode => iwlwifi-QuZ-a0-jf-b0-77.ucode} | Bin 1290084 -> 1321956 bytes ...lwifi-cc-a0-73.ucode => iwlwifi-cc-a0-77.ucode} | Bin 1333296 -> 1366144 bytes .../dev/iwlwififw/iwlwifi-so-a0-gf-a0-73.ucode | Bin 1563692 -> 0 bytes .../dev/iwlwififw/iwlwifi-so-a0-gf-a0-83.ucode | Bin 0 -> 1739988 bytes sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm | Bin 41808 -> 55580 bytes .../dev/iwlwififw/iwlwifi-so-a0-gf4-a0-73.ucode | Bin 1587800 -> 0 bytes .../dev/iwlwififw/iwlwifi-so-a0-gf4-a0-83.ucode | Bin 0 -> 1703968 bytes .../dev/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm | Bin 28064 -> 28064 bytes ...hr-b0-73.ucode => iwlwifi-so-a0-hr-b0-81.ucode} | Bin 1465208 -> 1539288 bytes ...jf-b0-73.ucode => iwlwifi-so-a0-jf-b0-77.ucode} | Bin 1409336 -> 1446036 bytes .../dev/iwlwififw/iwlwifi-ty-a0-gf-a0-73.ucode | Bin 1502900 -> 0 bytes .../dev/iwlwififw/iwlwifi-ty-a0-gf-a0-83.ucode | Bin 0 -> 1683076 bytes sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm | Bin 41588 -> 55484 bytes .../iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile | 2 +- sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile | 2 +- .../iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile | 2 +- .../iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile | 2 +- 35 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode index f9ea46dc928c..9af424f1ce06 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode index fec9d0aba254..4c2b25e585cb 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode similarity index 52% rename from sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode index 26abb3a850a4..de6cd8b98985 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode similarity index 52% rename from sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode index 072064dde7b1..ad87490d470b 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode similarity index 51% rename from sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode index 16e42ff8889f..37e1c7af3f16 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-77.ucode similarity index 52% rename from sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-77.ucode index 4e88eb24ba76..bd0b2b249894 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode similarity index 52% rename from sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode index c3a23c81643c..256997390af6 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode similarity index 52% rename from sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode index e1ecc31408e2..7c2a06a2dd2e 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-77.ucode similarity index 51% rename from sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-77.ucode index 9f7df7693322..d138e34af24d 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-73.ucode deleted file mode 100644 index 196a3bda21b7..000000000000 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-73.ucode and /dev/null differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-83.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-83.ucode new file mode 100644 index 000000000000..dbb15f487716 Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-83.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm index b649de0118ef..9dad35a1f5f5 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-73.ucode deleted file mode 100644 index c1595fd0baa8..000000000000 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-73.ucode and /dev/null differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-83.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-83.ucode new file mode 100644 index 000000000000..1bc07d83ac07 Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-83.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm index 8658ebaa8fa8..86b9a7c63776 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-81.ucode similarity index 50% rename from sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-81.ucode index 2da5b4cdcae9..fc8558c6cc90 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-81.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-77.ucode similarity index 54% rename from sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-77.ucode index 4704c56f8456..3649a1c89238 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-73.ucode deleted file mode 100644 index 1a6592408f1d..000000000000 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-73.ucode and /dev/null differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-83.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-83.ucode new file mode 100644 index 000000000000..3fdd6d5a0d9a Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-83.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm index 70882a9127db..68b8668df93d 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm and b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm differ diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile index bc41b21969dd..e781e790a048 100644 --- a/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= Qu-b0-hr-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile index 125d3e969e51..ac8b13cd1777 100644 --- a/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= Qu-b0-jf-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile index c254768fcb68..15389b3c3e2f 100644 --- a/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= Qu-c0-hr-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile index af8ad15e7576..bd9cd5077021 100644 --- a/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= Qu-c0-jf-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile index d89f4c878d7b..d15ee3643679 100644 --- a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= QuZ-a0-hr-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile index e92608872e07..ac0f398a10d6 100644 --- a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= QuZ-a0-jf-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile index 0cb3830c4d57..645e3c94684a 100644 --- a/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= cc-a0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile index 98e1efddd7f3..4106eedfa339 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 83 NAME= so-a0-gf-a0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile index 6a4085119166..56b5cbde6c26 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 83 NAME= so-a0-gf-a0 EXT= pnvm _NAME= iwlwifi-${NAME}.${EXT} diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile index 44cd873e0b8e..f89756193b89 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 83 NAME= so-a0-gf4-a0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile index 5a63a147c156..a13ba593b628 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 83 NAME= so-a0-gf4-a0 EXT= pnvm _NAME= iwlwifi-${NAME}.${EXT} diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile index b95aba38ed80..ae908c41376a 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 81 NAME= so-a0-hr-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile index 0211cf81d4e3..372a04314cf7 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= so-a0-jf-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile index 62c98afb76ba..3bb0931b5248 100644 --- a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 83 NAME= ty-a0-gf-a0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile index f61111576131..1dcb41414755 100644 --- a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 83 NAME= ty-a0-gf-a0 EXT= pnvm _NAME= iwlwifi-${NAME}.${EXT} From nobody Wed Nov 29 16:38:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4H039hz52x7R; Wed, 29 Nov 2023 16:38: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 4SgQ4G6Xgsz3J6j; Wed, 29 Nov 2023 16:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Umk2CGrWoSyN/6dKW4f6+baTk1uj34inXvj5CEU8HcM=; b=P9G6Ub6dWvsXaB8/UShtaeCRTzXArSPuKq6KMNUJgbB1r/JcbIKmd96o9eEeGpZzaIVQqm Uo4e4oZkPAqROvW89DrC1mw6UIw36HGywPzH93xa3XCgcGDiTE2HIQek5gjYdkJDrCdJez I6JGYOP9+CU2cHAgGfh4BOMcd0lzeMISZb0ZjugZ9GwfpYPfj3naPqbAIw+5s7wtH4N6Oj sRqcxIDijzVgj/3cT82mox5KjTCgmzIBQceLxRbCgMRaM2HAdmrQZofu2XkKZi0MgGfvPq 6PD384GRttZqDLK/wmbZptl0SV2xKAoYR3J57aLljEK+ee/k18tvXogLztkYog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Umk2CGrWoSyN/6dKW4f6+baTk1uj34inXvj5CEU8HcM=; b=it6AfbWUg1l2glBXaqcgAZvzTDOw8LYpRS1iKej2bY80m9YlfKjQMLg62hKIfBVjlh68Pa JvVH74Pvn8umxyKA6mnVbW/9JtWChDly0cfe4bABviRZHCLsKV3JMX9ORKDy9OYbzS9j5K Di3LxvgFGKQltCP1pmIK8NWDHCGmyoZVq+ZiiIu9hyWsV3AYarxq/gkA0D7mW7GW1zRO9K akomupEifpSBAoNpepKIfCKxKl0jxyei3mZNf0j2m8XFQ32WglItW6ZRA0nxMTK5uyxYEG tQvWkRnSgn9fHRyxvJfTylxaED9yPww5UupDyMo2uneir394eHuYgZQx6Tw5lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275902; a=rsa-sha256; cv=none; b=R66SvWO8LAguoXIVfpeCSDzDNzvMFtQBiNO6UJQuOVx4KsTFvjdgKEmcV3YkMlVjYXQCGA GEtsjNCRpEanpb2AHkSx+x0drdePUV83HKZb1bd2JoZ54dfHNi0pc9Y4mnCos1lK6+jCWS JTn4CWFD66FlkyiVPtWAPplt2uva3oJ6pdrx+AsGZzP/skeUqmV3eWe6uTCpnbm9UE9ogf yT15mSN/2XTVq8yeP9rRidz/YFkMoNvNrry5E/iY4g01/GvMIhkf5FXCHHiMx4iWAj1cM4 i8ZB+K8zyIvhEnMWLjCYfpF2dtJSuAjMMMWojzJ09LhrDIK6DKxKDxCVuP5UJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4G5GyDz1CXm; Wed, 29 Nov 2023 16:38: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 3ATGcMkx045638; Wed, 29 Nov 2023 16:38:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcM8Z045635; Wed, 29 Nov 2023 16:38:22 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:22 GMT Message-Id: <202311291638.3ATGcM8Z045635@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 11434103528e - stable/13 - LinuxKPI: 802.11: pass non-0/NULL arguments to MO functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 11434103528ed6d78c0a6dcef33ea55db0e3df41 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=11434103528ed6d78c0a6dcef33ea55db0e3df41 commit 11434103528ed6d78c0a6dcef33ea55db0e3df41 Author: Bjoern A. Zeeb AuthorDate: 2023-09-16 13:10:57 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:07 +0000 LinuxKPI: 802.11: pass non-0/NULL arguments to MO functions In [1] we updated the KPI for various mac80211 ops functions to deal with MLD code. Newer iwlwifi driver and firmware supports these functions so we need to pass non-dummy (0, NULL) arguments to them. Start extending the internel MO functions by these arguments and pass down values from LinuxKPI 802.11 code. It is assumed that further work will be needed to have all the right fields available to at least work in the lgeacy way of a single link. Sponsored by: The FreeBSD Foundation Improves: 549198b1ab95 (update mac80211 KPI) [1] (cherry picked from commit 6854154638a2c04ab59da43aedbe2c0ee8ef71a5) --- sys/compat/linuxkpi/common/src/linux_80211.c | 11 ++++++----- sys/compat/linuxkpi/common/src/linux_80211.h | 6 +++--- sys/compat/linuxkpi/common/src/linux_80211_macops.c | 21 ++++++++++++--------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index d0f718ae0dc7..3e654b73e18c 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -990,7 +990,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int } /* Assign vif chanctx. */ if (error == 0) - error = lkpi_80211_mo_assign_vif_chanctx(hw, vif, conf); + error = lkpi_80211_mo_assign_vif_chanctx(hw, vif, + &vif->bss_conf, conf); if (error == EOPNOTSUPP) error = 0; if (error != 0) { @@ -1171,7 +1172,7 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int conf = vif->chanctx_conf; /* Remove vif context. */ - lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->chanctx_conf); + lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->bss_conf, &vif->chanctx_conf); /* NB: vif->chanctx_conf is NULL now. */ /* Remove chan ctx. */ @@ -1446,7 +1447,7 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i conf = vif->chanctx_conf; /* Remove vif context. */ - lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->chanctx_conf); + lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->bss_conf, &vif->chanctx_conf); /* NB: vif->chanctx_conf is NULL now. */ /* Remove chan ctx. */ @@ -1908,7 +1909,7 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int conf = vif->chanctx_conf; /* Remove vif context. */ - lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->chanctx_conf); + lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->bss_conf, &vif->chanctx_conf); /* NB: vif->chanctx_conf is NULL now. */ /* Remove chan ctx. */ @@ -2199,7 +2200,7 @@ lkpi_wme_update(struct lkpi_hw *lhw, struct ieee80211vap *vap, bool planned) txqp.cw_max = wmep->wmep_logcwmax; txqp.txop = wmep->wmep_txopLimit; txqp.aifs = wmep->wmep_aifsn; - error = lkpi_80211_mo_conf_tx(hw, vif, ac, &txqp); + error = lkpi_80211_mo_conf_tx(hw, vif, /* link_id */0, ac, &txqp); if (error != 0) ic_printf(ic, "%s: conf_tx ac %u failed %d\n", __func__, ac, error); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index 42b4192bac63..22a5f5a6377c 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -276,9 +276,9 @@ int lkpi_80211_mo_sta_state(struct ieee80211_hw *, struct ieee80211_vif *, struct lkpi_sta *, enum ieee80211_sta_state); int lkpi_80211_mo_config(struct ieee80211_hw *, uint32_t); int lkpi_80211_mo_assign_vif_chanctx(struct ieee80211_hw *, struct ieee80211_vif *, - struct ieee80211_chanctx_conf *); + struct ieee80211_bss_conf *, struct ieee80211_chanctx_conf *); void lkpi_80211_mo_unassign_vif_chanctx(struct ieee80211_hw *, struct ieee80211_vif *, - struct ieee80211_chanctx_conf **); + struct ieee80211_bss_conf *, struct ieee80211_chanctx_conf **); int lkpi_80211_mo_add_chanctx(struct ieee80211_hw *, struct ieee80211_chanctx_conf *); void lkpi_80211_mo_change_chanctx(struct ieee80211_hw *, struct ieee80211_chanctx_conf *, uint32_t); @@ -287,7 +287,7 @@ void lkpi_80211_mo_remove_chanctx(struct ieee80211_hw *, void lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, uint64_t); int lkpi_80211_mo_conf_tx(struct ieee80211_hw *, struct ieee80211_vif *, - uint16_t, const struct ieee80211_tx_queue_params *); + uint32_t, uint16_t, const struct ieee80211_tx_queue_params *); void lkpi_80211_mo_flush(struct ieee80211_hw *, struct ieee80211_vif *, uint32_t, bool); void lkpi_80211_mo_mgd_prepare_tx(struct ieee80211_hw *, struct ieee80211_vif *, diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index c386c096add7..8444c3b3f245 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -444,7 +444,7 @@ out: int lkpi_80211_mo_assign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - struct ieee80211_chanctx_conf *chanctx_conf) + struct ieee80211_bss_conf *conf, struct ieee80211_chanctx_conf *chanctx_conf) { struct lkpi_hw *lhw; int error; @@ -455,8 +455,9 @@ lkpi_80211_mo_assign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif * goto out; } - LKPI_80211_TRACE_MO("hw %p vif %p chanctx_conf %p", hw, vif, chanctx_conf); - error = lhw->ops->assign_vif_chanctx(hw, vif, NULL, chanctx_conf); + LKPI_80211_TRACE_MO("hw %p vif %p bss_conf %p chanctx_conf %p", + hw, vif, conf, chanctx_conf); + error = lhw->ops->assign_vif_chanctx(hw, vif, conf, chanctx_conf); if (error == 0) vif->chanctx_conf = chanctx_conf; @@ -466,7 +467,7 @@ out: void lkpi_80211_mo_unassign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - struct ieee80211_chanctx_conf **chanctx_conf) + struct ieee80211_bss_conf *conf, struct ieee80211_chanctx_conf **chanctx_conf) { struct lkpi_hw *lhw; @@ -477,8 +478,9 @@ lkpi_80211_mo_unassign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif if (*chanctx_conf == NULL) return; - LKPI_80211_TRACE_MO("hw %p vif %p chanctx_conf %p", hw, vif, *chanctx_conf); - lhw->ops->unassign_vif_chanctx(hw, vif, NULL, *chanctx_conf); + LKPI_80211_TRACE_MO("hw %p vif %p bss_conf %p chanctx_conf %p", + hw, vif, conf, *chanctx_conf); + lhw->ops->unassign_vif_chanctx(hw, vif, conf, *chanctx_conf); *chanctx_conf = NULL; } @@ -548,7 +550,7 @@ lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vi int lkpi_80211_mo_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - uint16_t ac, const struct ieee80211_tx_queue_params *txqp) + uint32_t link_id, uint16_t ac, const struct ieee80211_tx_queue_params *txqp) { struct lkpi_hw *lhw; int error; @@ -559,8 +561,9 @@ lkpi_80211_mo_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, goto out; } - LKPI_80211_TRACE_MO("hw %p vif %p ac %u txpq %p", hw, vif, ac, txqp); - error = lhw->ops->conf_tx(hw, vif, 0, ac, txqp); + LKPI_80211_TRACE_MO("hw %p vif %p link_id %u ac %u txpq %p", + hw, vif, link_id, ac, txqp); + error = lhw->ops->conf_tx(hw, vif, link_id, ac, txqp); out: return (error); From nobody Wed Nov 29 16:38:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4J3mfGz52x0P; Wed, 29 Nov 2023 16:38: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 4SgQ4J066pz3JQH; Wed, 29 Nov 2023 16:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PXdb6NCZTE4wWRFwW2lZnJce90iNG0pgorgxFw2Ie2k=; b=BnI6OpI/pdeL3xol8xHYJJtJc3gizkk3h159qlFxA9ZdvfB69USA8WKlFtWXhF05cS73lw NbwJMOQhfKrrJAQLnVIxjes1Kg6I1ELM5yVa1JBL1WyW+otjaaBKmLiMfqnJVJW7dqeH0O AbQLUv+FECt1tn+2ea14g2CgkSONxzNAk9rqf+hp/poEZZfc51IsvDRrOPZNHfO29/HwYy FNJvJkOeP+ERANZcseYlWT4jnfKYTGpLxUKgRCfdXb4J6lMf0xnXOPg9G4hwiTW2sme9oo wrv4y2itN+P9Jouqut6pbDZMGVnZJiQIb+EFe3Y5Qvgaq/eH8+momYINXVWrrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PXdb6NCZTE4wWRFwW2lZnJce90iNG0pgorgxFw2Ie2k=; b=NBd8aC7MNRBfmawU7o+CfMF6Q13sCuvNr6ikwKPLsQLjn9RkibDpYTjwNvDdGqX8X4oUR+ mDBeoX6SPKobHdnD1hCo/TQ5xkiXV1fHQZbZIAFzia0gbSDgQ7ftWpYXgTAM4PAr8ySCn1 6GVHQlP0kG4Z6/SIru6nghrE/zoCxAT8+yrVtki+iRdPQkjOaekTKyytTcGIVTeiMbEdnF cH6h3W8nMsNmhlQ4eho7jnYOpNHraoCc/aqxGAh2B8cmP0QEFNuqKB/C3xLq5CaRyODJF/ rVcL8aX3125lEbgUja6BP+15mHOCKVPaVA4S5PjuS1B+qjnvEFV81WM/beJ6Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275904; a=rsa-sha256; cv=none; b=rCA5eWihPHnhkrhbe90W8QT98QJDI4UFEFLKRV+YuaJPNZFnJd2zGrbNMTXFRsMvrYOyGu cU7HL8UmtH10aXwjSQ3Yvav4mS13X4Wg+cbxstNBPCxeRq8S8s2bjVFUZ6Lenega1b1Bti 3Lja58HQRCzcIff67cfett/I10fTK6I4jiEiVbMBnN1fkufOznJraCLL3qylOgMVpw68KK zEhrpyTAj1hwZA/hAbMyI4BJ497dIcFF8fhcDOoLbOyI+a0F2IYIS5iIU2/2XKZrWTdpDW i7Xp0/8/yXqNBMCF5ztw2y4QT4O8n0HrtbwbGaHl9gOX9N0b0/ay8TSL9Ex3VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4H6Hrsz1Bh2; Wed, 29 Nov 2023 16:38: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 3ATGcNNE045691; Wed, 29 Nov 2023 16:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcNIM045688; Wed, 29 Nov 2023 16:38:23 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:23 GMT Message-Id: <202311291638.3ATGcNIM045688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 21ee781ddc35 - stable/13 - LinuxKPI: 802.11: mac80211 ops: distinguish between {bss,link}_info_changed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 21ee781ddc35ecad97f7d3f7b3624f7babeccc62 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=21ee781ddc35ecad97f7d3f7b3624f7babeccc62 commit 21ee781ddc35ecad97f7d3f7b3624f7babeccc62 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 11:58:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:07 +0000 LinuxKPI: 802.11: mac80211 ops: distinguish between {bss,link}_info_changed With MLO and multi-link setups if avail we want to call link_info_changed whereas for legacy drivers we still need to call bss_info_changed. While we currently do not (yet) support multi-link configurations we still need to drive the correct commands to satisfy firmware requirements. Sponsored by: The FreeBSD Foundation (cherry picked from commit 727f88f2617acaff4ada0f3dda6ca23c6679310d) --- sys/compat/linuxkpi/common/src/linux_80211_macops.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index 8444c3b3f245..b3b53d23f62e 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -540,14 +540,17 @@ lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vi struct lkpi_hw *lhw; lhw = HW_TO_LHW(hw); - if (lhw->ops->bss_info_changed == NULL) + if (lhw->ops->link_info_changed == NULL && + lhw->ops->bss_info_changed == NULL) return; LKPI_80211_TRACE_MO("hw %p vif %p conf %p changed %#jx", hw, vif, conf, (uintmax_t)changed); - lhw->ops->bss_info_changed(hw, vif, conf, changed); + if (lhw->ops->link_info_changed != NULL) + lhw->ops->link_info_changed(hw, vif, conf, changed); + else + lhw->ops->bss_info_changed(hw, vif, conf, changed); } - int lkpi_80211_mo_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, uint32_t link_id, uint16_t ac, const struct ieee80211_tx_queue_params *txqp) From nobody Wed Nov 29 16:38:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4K1fVlz52x2h; Wed, 29 Nov 2023 16:38: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 4SgQ4K17kYz3JNW; Wed, 29 Nov 2023 16:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/vvEdXU/7C3PlEtxx6piaZuBDc6CfwSS6jzjQhg3IwM=; b=LwM0XTBWPQ5TysxWQ0H3jvySf6SzI2oSWTnwNKSaEAXStY8hnFOUtrmTL2BMK5ebSBoyCk 6MYK+OIYVtS0b3lgrxxnQoOjRO2h2o+ksZRWrKxcMrEqMJM+ajZgSD5ylipVhNCs6CcwzN ODGw5T9w/t/Kv/9Tww2isQ1TUGS0L4MGXYzpJSVXOfedC4A6W3BAg1/Eko63a6rszp9RJq nKbcG2FKzv1jf4B+9bcBLTmRiQsDJAjNOvyJgadYhqz6bDOKi2U4aLSSnnhQpPJpZaNpXM gfa9ICtLV6aS+DdSPaJg+7kW6EGzIiicWl3gtFNgUDG8BdKikUIBty7AYV9Iuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/vvEdXU/7C3PlEtxx6piaZuBDc6CfwSS6jzjQhg3IwM=; b=AXBHbyO7uA3ImvB1iZlpXP8D/weJSUK3++d4FepwqL3hGRn8fmBY9Svx8G4Be0yJjOy8JL fz2RoRgpeQWifkII0yuLuKcW/kY4rbjA7KcmTB5ogXX3AU7xqyGmWrrWJE0PsTVAIe+a+2 dk4XefJQe7HOjLwb2EpMiudawZiMbeljaHw6uwb7C3Yc3iq4iFZQXimGKBPRTM8wQ9lgk1 Pd8lZoy41hl2014Jamkl9OR4+ClUUVW/ONnCftndDPKeEzvOt95wV2ycbyDE+Q1cOnFlVY Nxg7fsWfq3vZOvxPHUnC2hTAmdhGIUHQFwze/WuMryPU3dpiZ0/LFmmBDmXXSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275905; a=rsa-sha256; cv=none; b=oQv29Bq2R/Pe2j/LhpTM9E7jJHFzuwTriHiN0B5RedoWQPRxXtGkX+AdHa+9Ke6Y8f+Phf rVvrLDS+Jgf2mcdFZBBt9tKFcD7L+rYsmT6WnDODAE8S1B+TG3poKZ22uy2tYaypWnKvJd wY0pT9wcQrC9agmRY5KXLv6ESVj0PvqCKpLYwtW1ISHAnjl9ibp7qqaj1EWqQlA5Zm4E/R 0CPngSehXiGXhpNPShzEjfKROiNBXimOO/nQ1is9c3WKGj2yvVv+7vcXaAfrwiW3yipE+P hMCoOnWbzcbBRAxrivplnojeSqrChoW0jgkJz766pt/RhD5FEiES6MGZuoBz4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4K0FH6z1Bwl; Wed, 29 Nov 2023 16:38: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 3ATGcOhu045745; Wed, 29 Nov 2023 16:38:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcO6H045742; Wed, 29 Nov 2023 16:38:24 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:24 GMT Message-Id: <202311291638.3ATGcO6H045742@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 4fbbc24005e2 - stable/13 - LinuxKPI: 802.11: adjust code to new structure layout List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4fbbc24005e216a1266cf0bb9c8764347d834a32 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4fbbc24005e216a1266cf0bb9c8764347d834a32 commit 4fbbc24005e216a1266cf0bb9c8764347d834a32 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 12:19:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:08 +0000 LinuxKPI: 802.11: adjust code to new structure layout With past commits new structures were added. Now switch over some bss_conf fields into vif->cfg where they got moved to and remove the old fields. This allows drivers to find the expected values in the now expected places and work better. Sponsored by: The FreeBSD Foundation (cherry picked from commit 616e13301bcf274b007f84ef99ea857a55bef46d) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 9 ++--- sys/compat/linuxkpi/common/src/linux_80211.c | 44 +++++++++++------------ 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 20371812198a..7e6fb1bce16e 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -280,19 +280,13 @@ struct ieee80211_bss_conf { bool eht_su_beamformer; bool eht_mu_beamformer; - size_t ssid_len; - uint8_t ssid[IEEE80211_NWID_LEN]; - uint16_t aid; uint16_t ht_operation_mode; int arp_addr_cnt; uint16_t eht_puncturing; uint8_t dtim_period; uint8_t sync_dtim_count; - bool assoc; - bool idle; bool qos; - bool ps; bool twt_broadcast; bool use_cts_prot; bool use_short_preamble; @@ -991,6 +985,8 @@ struct ieee80211_ops { void (*config_iface_filter)(struct ieee80211_hw *, struct ieee80211_vif *, unsigned int, unsigned int); void (*bss_info_changed)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, u64); + void (*link_info_changed)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, u64); + int (*set_rts_threshold)(struct ieee80211_hw *, u32); void (*event_callback)(struct ieee80211_hw *, struct ieee80211_vif *, const struct ieee80211_event *); int (*get_survey)(struct ieee80211_hw *, int, struct survey_info *); @@ -1038,7 +1034,6 @@ struct ieee80211_ops { int (*set_hw_timestamp)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_set_hw_timestamp *); - void (*link_info_changed)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, u64); void (*vif_cfg_changed)(struct ieee80211_hw *, struct ieee80211_vif *, u64); int (*change_vif_links)(struct ieee80211_hw *, struct ieee80211_vif *, u16, u16, struct ieee80211_bss_conf *[IEEE80211_MLD_MAX_NUM_LINKS]); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 3e654b73e18c..bfc3e79929d7 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -743,7 +743,7 @@ lkpi_update_dtim_tsf(struct ieee80211_vif *vif, struct ieee80211_node *ni, "dtim_period %u sync_dtim_count %u sync_tsf %ju " "sync_device_ts %u bss_changed %#08x\n", __func__, __LINE__, _f, _l, - vif->bss_conf.assoc, vif->bss_conf.aid, + vif->cfg.assoc, vif->cfg.aid, vif->bss_conf.beacon_int, vif->bss_conf.dtim_period, vif->bss_conf.sync_dtim_count, (uintmax_t)vif->bss_conf.sync_tsf, @@ -774,7 +774,7 @@ lkpi_update_dtim_tsf(struct ieee80211_vif *vif, struct ieee80211_node *ni, "dtim_period %u sync_dtim_count %u sync_tsf %ju " "sync_device_ts %u bss_changed %#08x\n", __func__, __LINE__, _f, _l, - vif->bss_conf.assoc, vif->bss_conf.aid, + vif->cfg.assoc, vif->cfg.aid, vif->bss_conf.beacon_int, vif->bss_conf.dtim_period, vif->bss_conf.sync_dtim_count, (uintmax_t)vif->bss_conf.sync_tsf, @@ -845,7 +845,7 @@ lkpi_disassoc(struct ieee80211_sta *sta, struct ieee80211_vif *vif, struct lkpi_hw *lhw) { sta->aid = 0; - if (vif->bss_conf.assoc) { + if (vif->cfg.assoc) { struct ieee80211_hw *hw; enum ieee80211_bss_changed changed; @@ -853,8 +853,8 @@ lkpi_disassoc(struct ieee80211_sta *sta, struct ieee80211_vif *vif, lkpi_update_mcast_filter(lhw->ic, true); changed = 0; - vif->bss_conf.assoc = false; - vif->bss_conf.aid = 0; + vif->cfg.assoc = false; + vif->cfg.aid = 0; changed |= BSS_CHANGED_ASSOC; /* * This will remove the sta from firmware for iwlwifi. @@ -1008,12 +1008,12 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int bss_changed |= BSS_CHANGED_BSSID; vif->bss_conf.txpower = ni->ni_txpower; bss_changed |= BSS_CHANGED_TXPOWER; - vif->bss_conf.idle = false; + vif->cfg.idle = false; bss_changed |= BSS_CHANGED_IDLE; /* Should almost assert it is this. */ - vif->bss_conf.assoc = false; - vif->bss_conf.aid = 0; + vif->cfg.assoc = false; + vif->cfg.aid = 0; bss_changed |= lkpi_update_dtim_tsf(vif, ni, vap, __func__, __LINE__); @@ -1432,8 +1432,8 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i bss_changed = 0; vif->bss_conf.qos = 0; bss_changed |= BSS_CHANGED_QOS; - vif->bss_conf.ssid_len = 0; - memset(vif->bss_conf.ssid, '\0', sizeof(vif->bss_conf.ssid)); + vif->cfg.ssid_len = 0; + memset(vif->cfg.ssid, '\0', sizeof(vif->cfg.ssid)); bss_changed |= BSS_CHANGED_BSSID; lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); @@ -1548,14 +1548,14 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int #ifdef LKPI_80211_WME bss_changed |= lkpi_wme_update(lhw, vap, true); #endif - if (!vif->bss_conf.assoc || vif->bss_conf.aid != IEEE80211_NODE_AID(ni)) { - vif->bss_conf.assoc = true; - vif->bss_conf.aid = IEEE80211_NODE_AID(ni); + if (!vif->cfg.assoc || vif->cfg.aid != IEEE80211_NODE_AID(ni)) { + vif->cfg.assoc = true; + vif->cfg.aid = IEEE80211_NODE_AID(ni); bss_changed |= BSS_CHANGED_ASSOC; } /* We set SSID but this is not BSSID! */ - vif->bss_conf.ssid_len = ni->ni_esslen; - memcpy(vif->bss_conf.ssid, ni->ni_essid, ni->ni_esslen); + vif->cfg.ssid_len = ni->ni_esslen; + memcpy(vif->cfg.ssid, ni->ni_essid, ni->ni_esslen); if ((vap->iv_flags & IEEE80211_F_SHPREAMBLE) != vif->bss_conf.use_short_preamble) { vif->bss_conf.use_short_preamble ^= 1; @@ -1894,8 +1894,8 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int bss_changed = 0; vif->bss_conf.qos = 0; bss_changed |= BSS_CHANGED_QOS; - vif->bss_conf.ssid_len = 0; - memset(vif->bss_conf.ssid, '\0', sizeof(vif->bss_conf.ssid)); + vif->cfg.ssid_len = 0; + memset(vif->cfg.ssid, '\0', sizeof(vif->cfg.ssid)); bss_changed |= BSS_CHANGED_BSSID; lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); @@ -2275,16 +2275,16 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], #if 1 vif->chanctx_conf = NULL; vif->bss_conf.vif = vif; - vif->bss_conf.idle = true; - vif->bss_conf.ps = false; vif->bss_conf.chandef.width = NL80211_CHAN_WIDTH_20_NOHT; vif->bss_conf.use_short_preamble = false; /* vap->iv_flags IEEE80211_F_SHPREAMBLE */ vif->bss_conf.use_short_slot = false; /* vap->iv_flags IEEE80211_F_SHSLOT */ vif->bss_conf.qos = false; vif->bss_conf.use_cts_prot = false; /* vap->iv_protmode */ vif->bss_conf.ht_operation_mode = IEEE80211_HT_OP_MODE_PROTECTION_NONE; - vif->bss_conf.assoc = false; - vif->bss_conf.aid = 0; + vif->cfg.aid = 0; + vif->cfg.assoc = false; + vif->cfg.idle = true; + vif->cfg.ps = false; /* * We need to initialize it to something as the bss_info_changed call * will try to copy from it in iwlwifi and NULL is a panic. @@ -4694,7 +4694,7 @@ linuxkpi_ieee80211_pspoll_get(struct ieee80211_hw *hw, psp = skb_put_zero(skb, sizeof(*psp)); psp->i_fc[0] = IEEE80211_FC0_VERSION_0; psp->i_fc[0] |= IEEE80211_FC0_SUBTYPE_PS_POLL | IEEE80211_FC0_TYPE_CTL; - v = htole16(vif->bss_conf.aid | 1<<15 | 1<<16); + v = htole16(vif->cfg.aid | 1<<15 | 1<<16); memcpy(&psp->i_aid, &v, sizeof(v)); IEEE80211_ADDR_COPY(psp->i_bssid, vap->iv_bss->ni_macaddr); IEEE80211_ADDR_COPY(psp->i_ta, vif->addr); From nobody Wed Nov 29 16:38:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4L2pC5z52wvJ; Wed, 29 Nov 2023 16:38: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 4SgQ4L27gdz3JZJ; Wed, 29 Nov 2023 16:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sPCHsOOD1augY2uYIk2epDys4X7LbpXFgTqnIjdQf1A=; b=iWNrJSW48iWNPKw0BxWuBtxTySYI2lPeYxWTonp59QBFV1f/Q96KCsN30UO42iXLlX311o DDBILsTYkcS1aQ1T4fkwcGiRqpXJdD+ChlFPEu9Ub9l1AJaga3i68C3aGe6KG/OuKrAsAs UXLmqmIj/2U90XoPPta7SPeJl9tufSSVg2LOzgiEjp5d528Ub11vQDHbIEQGGUueLXXp1H U1oPyCvMee4zJA05vGkYLQhMNG2pNQPKAUDsoymJMgPK55n3RtaPPzdZOec+plqdoBFDy+ MHxWp8kX6XeN8qGCg+9pTacFNgXkPhSMoeN5v68++tJ7GsajrdM6p1m0lq+oRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sPCHsOOD1augY2uYIk2epDys4X7LbpXFgTqnIjdQf1A=; b=PfcS8vVzWlmym6wuRhTWgQZvICc+GszfCwwNBC8zZq1wCrwSBJ6DJzyZMJ9NCsZeXJ4vnK FMShE7anEYvaNNAslaJ04aHBZr4VAcgpaE2Nz8OPhKbF19Z/jUJq98zXtGuslXBsC5SgeL OcXWJEwvWEZje/EFUyHGbCGgJ+HqOVheDmwER66ACFiZXHeTnxlIvo3ogAgBCWhCXpx7p3 s7DgZ3bszLE5ANXDw9NvUknsV52ChLa5rlAWaE70OPadOW3bFI2hslr5ahuayX1FE81Y4X hPRhZEXQUHaJ9h/QmZjDBxgX4WOPZApQgyjd3BnliJOWs/zMoM+7DHFlCy2Egw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275906; a=rsa-sha256; cv=none; b=Kep/8leikXBob77NwO7EUyvQDGXBXdGTwnNnfccJv0PdGnc7Yjv4qTbjjDOxt+uBINMac1 zbcddviMXEgZJBhgbCcFd50RZLGyfDdENT81NLl007OQAL23h26mTXPcHuSyzxErsDmCaw akpcNg+iQfOTqylny1joj8kz3PIeQ3kdppUvA8zgYFoC4DY2bsCJTsEJJmkBrUSmwTvOPb Q+30cBCUzRG6RczWh8ayj4spCfnavsTk5CCyBrxrgTPDOQ8dZcGFqoXVKqSosMjkaKYemM MMdF3X0lu3Pv+m+pYpNL2/jBLk284/YlHjK8CLq3froN9XsmDQSJZ7uRFoiyJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4L143Kz1Cb0; Wed, 29 Nov 2023 16:38: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 3ATGcQ0L045799; Wed, 29 Nov 2023 16:38:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcQna045796; Wed, 29 Nov 2023 16:38:26 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:26 GMT Message-Id: <202311291638.3ATGcQna045796@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f55063e268af - stable/13 - LinuxKPI: 802.11: change ic_parent() to not call mo_stop()/mo_start() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f55063e268afa7f4e098d52afa7dc898b28899dd Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f55063e268afa7f4e098d52afa7dc898b28899dd commit f55063e268afa7f4e098d52afa7dc898b28899dd Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 12:25:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:08 +0000 LinuxKPI: 802.11: change ic_parent() to not call mo_stop()/mo_start() Driven by net80211 we may call mac80211 ops stop() and start() mostly when toggling a first VAP. While this is FreeBSD behaviour the firmware based LinuxKPI drivers seem to possibly clear state in the case of stop() triggering further errors down the line. We call mo_start() when starting the VAP and mo_stop() when destroying it now only. In the future (e.g., in multi-VAP setups) we may need to re-address some of this so keep the code under #ifdef. Sponsored by: The FreeBSD Foundation (cherry picked from commit 8d58a0578635dc7dd1025ab08b0479f2b383e1a4) --- sys/compat/linuxkpi/common/src/linux_80211.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index bfc3e79929d7..fa22a0fce826 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2460,24 +2460,32 @@ static void lkpi_ic_parent(struct ieee80211com *ic) { struct lkpi_hw *lhw; +#ifdef HW_START_STOP struct ieee80211_hw *hw; int error; +#endif bool start_all; IMPROVE(); lhw = ic->ic_softc; +#ifdef HW_START_STOP hw = LHW_TO_HW(lhw); +#endif start_all = false; /* IEEE80211_UNLOCK(ic); */ LKPI_80211_LHW_LOCK(lhw); if (ic->ic_nrunning > 0) { +#ifdef HW_START_STOP error = lkpi_80211_mo_start(hw); if (error == 0) +#endif start_all = true; } else { +#ifdef HW_START_STOP lkpi_80211_mo_stop(hw); +#endif } LKPI_80211_LHW_UNLOCK(lhw); /* IEEE80211_LOCK(ic); */ From nobody Wed Nov 29 16:38:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4M4HTMz52wvL; Wed, 29 Nov 2023 16:38: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 4SgQ4M3GB3z3Jg4; Wed, 29 Nov 2023 16:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zgpVldTQ5V5CuPQJ9xDdB9lmQKD5Y+aUeU+0zAEuD/s=; b=sOO3qqx+4gUGROiMokBdkdMsFmdFmRdV4uCqiIkBaKBg3XQhXcAK6eDz4Q00zLAozUO+H0 jGSJlm7gHbDDBP737CMomy2dowfeR1FcYrJaahNPcUhVEfjl1pux0VYMppqwVZWFOeeX/9 ThjpnYv+1JwzI8pbhasAjP7cEparIrz12eWXdVTTnlb5I8ZZO68I8qTdEKSaVVLAooH2rn 0olAEChYo0eX9QrR7tfHNHlNKI+0DOhyuVFa05eFVLMdr0cOKnoSCE+jX2yc3Le+htLrUT 1agifeIbuKzADcznhPlG16VErL6yqG44AX5tM13n1aQfnNyTAHJ0orBPjswqsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zgpVldTQ5V5CuPQJ9xDdB9lmQKD5Y+aUeU+0zAEuD/s=; b=S20/+jzS5+zYsYGKgg9qmwhFbG5/YRG0kr3vQXJxVVl/0BZ+r1oUIBrfZwy70sP3Xdy/NR ka7o8dyDGnsT8HkcXH6iKIyKfnUtF8xt/V7tO+q9fHiYsfPOLGwgjutFqshPwO9fgJoP4k rGhat6i9j7i/Ik7FczyJ8U8DTjcjW325IXAEcv76ih7mzTTtItoJxk5m6DFNrGe9UAkCB0 b30Pzw+dDrVKhaq8Wmd2oajzZoigeM4hYB1YgRgzYrTz2WReOY9sh0g2a065o+Iv8iTBbV 2qGg0nxf9CRL3FMVoDb+ZtOdzpTQ6xD7b6hzrc5VrNHJd1N9+3zAmOwp4c98iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275907; a=rsa-sha256; cv=none; b=nDWSLGcmhIbkAkJUgApLdxyurGv2hvC3SLGmXSC6FH5n3S2oXO12edcvQvuy8ZeQ8GnGw5 NvXZ5Tp/BC5Xwxf2z/YAl8+iD+34v+/qfiRZdW+uHRjpPapDT02MurWfm7YqeQ4fH9jJZD EL3N0FanX0Dr9Hge+0IbW/fpmOINlHOqUvTzytcSd4u8nk303vCzEea96HpL6lHzAt6LPP AQ7wECrTjuCifJD4fJihu6MPH7kMNX1E6lje3sWLWsnqHNNTbC8byOnMH89TSwZ2o0CbgM OKnGUW1q+bNv/IqMr/SnyhdkNtU6tTsfNwPjGAYUS8jEwBXopV69jHQ4b6dKdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4M2JW8z1C48; Wed, 29 Nov 2023 16:38: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 3ATGcRnx045848; Wed, 29 Nov 2023 16:38:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcRIx045845; Wed, 29 Nov 2023 16:38:27 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:27 GMT Message-Id: <202311291638.3ATGcRIx045845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 70f3472c36e0 - stable/13 - LinuxKPI: 802.11: inialize tx queue params List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 70f3472c36e0d809f6b9bb657c7edab2b2d7079e Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=70f3472c36e0d809f6b9bb657c7edab2b2d7079e commit 70f3472c36e0d809f6b9bb657c7edab2b2d7079e Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 12:36:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:08 +0000 LinuxKPI: 802.11: inialize tx queue params When adding a VAP (vif) initialize its tx queue parameters calling mo_conf_tx(). I could not spot net80211 providing some of the values needed before having a node so currrently we use hard-coded values with a comment with a reference on how to properly calculate the values in the future (e.g., in case of 11b or other cases). Sponsored by: The FreeBSD Foundation (cherry picked from commit a6042e17c8999c4965bd4d762c4564b322f1ae7b) --- sys/compat/linuxkpi/common/src/linux_80211.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index fa22a0fce826..1785fb077145 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2244,9 +2244,11 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], struct lkpi_vif *lvif; struct ieee80211vap *vap; struct ieee80211_vif *vif; + struct ieee80211_tx_queue_params txqp; enum ieee80211_bss_changed changed; size_t len; int error, i; + uint16_t ac; if (!TAILQ_EMPTY(&ic->ic_vaps)) /* 1 so far. Add once this works. */ return (NULL); @@ -2345,7 +2347,24 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], changed = 0; lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, changed); - /* conf_tx setup; default WME? */ + /* Configure tx queues (conf_tx), default WME & send BSS_CHANGED_QOS. */ + IMPROVE("Hardcoded values; to fix see 802.11-2016, 9.4.2.29 EDCA Parameter Set element"); + LKPI_80211_LHW_LOCK(lhw); + for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { + + bzero(&txqp, sizeof(txqp)); + txqp.cw_min = 15; + txqp.cw_max = 1023; + txqp.txop = 0; + txqp.aifs = 2; + error = lkpi_80211_mo_conf_tx(hw, vif, /* link_id */0, ac, &txqp); + if (error != 0) + ic_printf(ic, "%s: conf_tx ac %u failed %d\n", + __func__, ac, error); + } + LKPI_80211_LHW_UNLOCK(lhw); + changed = BSS_CHANGED_QOS; + lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, changed); /* Force MC init. */ lkpi_update_mcast_filter(ic, true); From nobody Wed Nov 29 16:38:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4N6WP9z52xDd; Wed, 29 Nov 2023 16:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ4N4f8cz3JYg; Wed, 29 Nov 2023 16:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wiSF7XCWWht9Q9aYk4tYhQJSE2AcO2BmHpfEpNB9anA=; b=F2j04uEXWOGFl4Tur8TngFmbP1+mSx5FlNoNWKu8AEQIQV+lABNelBk6wmNaSle7ON8icD hT04IbRzBTPQe2mGU0Xn4/k7Yz6QhZN+ozbVNnIhNVqh3mBwih6FJ+vg/xlvAuJzuhdZLb 6X8aYkh+5hVYlz27ChLjUhJYoF5c3oTrP2c5R3NWsCRdgf52r/MqWhSRnv8h2/OUUsa2vz HdjlOunyrxwlgjkvxBORdz6xDtt6divWHKqDEAH3d/I+9xolY9b7tXJIRawyYTPRYkYv94 /a//SG/op7Ge0mxzLB76YoaW0DQP1kK19+VZ3HotLhyIpJYyA6EQBNCjWqcJKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wiSF7XCWWht9Q9aYk4tYhQJSE2AcO2BmHpfEpNB9anA=; b=ZvCMyZzXSpWCVf+D5+f2ABABJBWz8kxdH/v+xPrVVzmxzDcdYX8rnszs6PKW4NcG+oW0kG TcO/ZP81eltOGFhtgn40phDUkxxtBHJ/Z12iLfMAwrsXqLYAkXoyrN2KafoKnSuXXsbPmu lqyVwbWwBSGAxcL6wzDhGKC3Yku6i+aWQs/+qjkUojBaxPieWj6fQQk4OBWvZD0Mwz1LP2 uGyRDHGa937bbYzMjxEC1eR4f1d12Dvu+22SeXY4oYmw+D7McKj2J2Vb6mK/CHAusNZyr2 C88ermlVbfdV1apT0v/k8tob/dfeAmDUDYdYbvnYnSHuAIF32scKuaL9oPY2cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275908; a=rsa-sha256; cv=none; b=sAlWmJUqcKkKPXpsR122LWSUdmXGY6VC05RZp3ZOFvx0S7PGFfDGno9r8CeR9x1nVbxv0D nyrBRGGRfJiZgT8EO7f66QjgxagNprvDK7/Ncx2xh9YbU37VRLiUF9BPdEzSBxgvzi29Hd 6Wu/rWwgHHpuyATUkPiLY0gFnSmdD5WxIUNFvzcbliVtePk259zZNf24vV81c8WI5GdOcc LVAbKHo74Nszfoz5tL6IfZLNsQoAGLnQ62GVSjU/xHu62nkveOdny1e7Ui7G5ICiyqR55C cUuSYzb+FW9a/JMUuB4ORB3E0qe0adYe6XIgEuDv7R0987v6yC2zsTp4ER3qaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4N3SGyz1Cb1; Wed, 29 Nov 2023 16:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGcSrU045914; Wed, 29 Nov 2023 16:38:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcSVb045911; Wed, 29 Nov 2023 16:38:28 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:28 GMT Message-Id: <202311291638.3ATGcSVb045911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5bb9354a0374 - stable/13 - LinuxKPI: 802.11: setup a default link[0] and adjust related needs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5bb9354a0374c080009cef230797e27aeb0e3147 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5bb9354a0374c080009cef230797e27aeb0e3147 commit 5bb9354a0374c080009cef230797e27aeb0e3147 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 12:49:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:08 +0000 LinuxKPI: 802.11: setup a default link[0] and adjust related needs Setup more link_conf/deflink fields for vif/sta as are needed to allow us to work with the KPI bits in a non-MLO configuration. In lkpi_sta_scan_to_auth() set the bss_conf values before calling into the driver for chanctx setup/updates as certain values (e.g., beacon_int) need to be set before; we still call the MO function for the updates after to keep the expected workflow. Deal with the (to be dealt with otherwise later) net80211 ni swaps and update the addresses on the deflink as well as otherwise firmware will hit asserts or things will not work (e.g. indicating the peer is us). Sponsored by: The FreeBSD Foundation (cherry picked from commit 6ffb7bd469b26f2ff6cc62cedca6ffe884076196) --- sys/compat/linuxkpi/common/src/linux_80211.c | 63 ++++++++++++++++++---------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 1785fb077145..98ffcbfbef74 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -107,9 +107,6 @@ SYSCTL_INT(_compat_linuxkpi_80211, OID_AUTO, debug, CTLFLAG_RWTUN, #define PREP_TX_INFO_DURATION 0 /* Let the driver do its thing. */ #endif -/* c.f. ieee80211_ioctl.c */ -static const uint8_t zerobssid[IEEE80211_ADDR_LEN]; - /* This is DSAP | SSAP | CTRL | ProtoID/OrgCode{3}. */ const uint8_t rfc1042_header[6] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; @@ -269,9 +266,17 @@ 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_... */ + /* Link configuration. */ + IEEE80211_ADDR_COPY(sta->deflink.addr, sta->addr); + sta->link[0] = &sta->deflink; + for (i = 1; i < nitems(sta->link); i++) { + IMPROVE("more links; only link[0] = deflink currently."); + } + /* Deferred TX path. */ mtx_init(&lsta->txq_mtx, "lsta_txq", NULL, MTX_DEF); TASK_INIT(&lsta->txq_task, 0, lkpi_80211_txq_task, lsta); @@ -969,6 +974,23 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int conf->min_def.center_freq2 = 0; IMPROVE("currently 20_NOHT only"); + /* Set bss info (bss_info_changed). */ + bss_changed = 0; + vif->bss_conf.bssid = ni->ni_bssid; + bss_changed |= BSS_CHANGED_BSSID; + vif->bss_conf.txpower = ni->ni_txpower; + bss_changed |= BSS_CHANGED_TXPOWER; + vif->cfg.idle = false; + bss_changed |= BSS_CHANGED_IDLE; + + /* vif->bss_conf.basic_rates ? Where exactly? */ + + /* Should almost assert it is this. */ + vif->cfg.assoc = false; + vif->cfg.aid = 0; + + bss_changed |= lkpi_update_dtim_tsf(vif, ni, vap, __func__, __LINE__); + error = 0; if (vif->chanctx_conf != NULL) { changed = IEEE80211_CHANCTX_CHANGE_MIN_WIDTH; @@ -988,6 +1010,9 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int } else { goto out; } + + vif->bss_conf.chanctx_conf = conf; + /* Assign vif chanctx. */ if (error == 0) error = lkpi_80211_mo_assign_vif_chanctx(hw, vif, @@ -1002,21 +1027,6 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int } IMPROVE("update radiotap chan fields too"); - /* Set bss info (bss_info_changed). */ - bss_changed = 0; - vif->bss_conf.bssid = ni->ni_bssid; - bss_changed |= BSS_CHANGED_BSSID; - vif->bss_conf.txpower = ni->ni_txpower; - bss_changed |= BSS_CHANGED_TXPOWER; - vif->cfg.idle = false; - bss_changed |= BSS_CHANGED_IDLE; - - /* Should almost assert it is this. */ - vif->cfg.assoc = false; - vif->cfg.aid = 0; - - bss_changed |= lkpi_update_dtim_tsf(vif, ni, vap, __func__, __LINE__); - /* RATES */ IMPROVE("bss info: not all needs to come now and rates are missing"); lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); @@ -2131,12 +2141,14 @@ lkpi_iv_update_bss(struct ieee80211vap *vap, struct ieee80211_node *ni) lsta->ni = ni; sta = LSTA_TO_STA(lsta); IEEE80211_ADDR_COPY(sta->addr, lsta->ni->ni_macaddr); + IEEE80211_ADDR_COPY(sta->deflink.addr, sta->addr); } lsta = obss->ni_drv_data; if (lsta != NULL) { lsta->ni = obss; sta = LSTA_TO_STA(lsta); IEEE80211_ADDR_COPY(sta->addr, lsta->ni->ni_macaddr); + IEEE80211_ADDR_COPY(sta->deflink.addr, sta->addr); } out: @@ -2277,6 +2289,9 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], #if 1 vif->chanctx_conf = NULL; vif->bss_conf.vif = vif; + /* vap->iv_myaddr is not set until net80211::vap_setup or vap_attach. */ + IEEE80211_ADDR_COPY(vif->bss_conf.addr, mac); + vif->bss_conf.link_id = 0; /* Non-MLO operation. */ vif->bss_conf.chandef.width = NL80211_CHAN_WIDTH_20_NOHT; vif->bss_conf.use_short_preamble = false; /* vap->iv_flags IEEE80211_F_SHPREAMBLE */ vif->bss_conf.use_short_slot = false; /* vap->iv_flags IEEE80211_F_SHSLOT */ @@ -2287,15 +2302,13 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], vif->cfg.assoc = false; vif->cfg.idle = true; vif->cfg.ps = false; + IMPROVE("Check other fields and then figure out whats is left elsewhere of them"); /* * We need to initialize it to something as the bss_info_changed call * will try to copy from it in iwlwifi and NULL is a panic. * We will set the proper one in scan_to_auth() before being assoc. - * NB: the logic there with using an array as bssid_override and checking - * for non-NULL later is flawed but in their workflow does not seem to - * matter. */ - vif->bss_conf.bssid = zerobssid; + vif->bss_conf.bssid = ieee80211broadcastaddr; #endif #if 0 vif->bss_conf.dtim_period = 0; /* IEEE80211_DTIM_DEFAULT ; must stay 0. */ @@ -2306,6 +2319,12 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], vif->bss_conf.beacon_int = 16; #endif + /* Link Config */ + vif->link_conf[0] = &vif->bss_conf; + for (i = 0; i < nitems(vif->link_conf); i++) { + IMPROVE("more than 1 link one day"); + } + /* Setup queue defaults; driver may override in (*add_interface). */ for (i = 0; i < IEEE80211_NUM_ACS; i++) { if (ieee80211_hw_check(hw, QUEUE_CONTROL)) From nobody Wed Nov 29 16:38:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4Q119Wz52wvP; Wed, 29 Nov 2023 16: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 4SgQ4P5SlSz3Jm8; Wed, 29 Nov 2023 16:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gAsefyloSPCIUsjYtJoS6P2cv+E5zdW5x0T0ieRIgzA=; b=AYaaRfwkHgRlM0rwMVLGGT27hTzSHs+WIrAjS7HYQmxUvHbbHaKQJVkw8ctm9Joa2NDUtr XwkHnwxolvOna8i2LBwYW7va6xWPPcNoRl7GG++8ETQ8zk2ao7KVg/qRj+rW6bjEHtsQ3/ Yr7BhsbsgSFhPHIVaLZgTpGqwrbJcvHMABQoGuFpzPrx1yZMwzxsxl6jwYq0T9iiHdHQVS xZjAqudbc+lmNjLDbe5Xd0Z4VNaLgWYZ61jOX5TIGI4D7RF2hCNey1Vpq7FkWAtkpM163z lhpE3qAl/aO/amoz29DYRc21r+3UMJgORDy61Tt8eaiigBMAb9Un/zOo74PbZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gAsefyloSPCIUsjYtJoS6P2cv+E5zdW5x0T0ieRIgzA=; b=b6ilgHpddsNj+9tV96ToaJBCyoHfM9KbX8YzbHwqPa6I+24LL5np52lmAmDGfoqppi5GDQ aT62cgDLZMQVJ5RZjaxXjIagoPN12kaZrm4f2iEbrUQHWKFaDtkXDvCJyBcabyuNNEIvj3 T915wj49lTiIs/iD9Q3zgTRa8LmGrTxq6jfKfUR2AzCSiIrkQKGuATdrmGnls0c1SyXVi5 5GLpjQ1aUEokrsV9Q2raBfxo4HorLlBUeOO4I+8cYeNM2Rp7jQJtxg+HgxF48qubcP23zg Bo58A0+9Kd5oMivAwBXpkzp31cYvK7C1Bg6XhVGijCqfR1JajCIBK6EPTFt+Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275909; a=rsa-sha256; cv=none; b=pilrHRTNkQ3adYa79vt0zCqQqyvAOK6C/0SFWUaT7Z4pGy0gYqMLGKVY4NywGVNJuM7L5w 6CkXFzkCvrG2V8nhkf20VJYVEAd01xJOnrNJ2rFnyAmojKDS0uqW1p0pBKWrf0qPoLs4A+ H473QV71YXwFm+87mMJ/Pp9TxYxvktxoKvYZUfHqeh2urTDHjRH9H1pHGCxEAKidP6Zx7n lBB3OAusj4QpjqUUHaYKMe/2YvRPKhtHWlJmptSGPhQrrZh0cTVbFw80YkMoIyy1t74x9O E4JvKxsqeNrkY+LYSbrZOALqMWnXEiNFi/xY/uINzWFhLG7asYOUn17af91WSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4P4Xxbz1Cd5; Wed, 29 Nov 2023 16:38: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 3ATGcTtv045969; Wed, 29 Nov 2023 16:38:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcTtI045966; Wed, 29 Nov 2023 16:38:29 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:29 GMT Message-Id: <202311291638.3ATGcTtI045966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a34d2eb4b2ca - stable/13 - iwlwifi/rtw88: re-attach to build after updates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a34d2eb4b2ca5496bbf21906fbb5f1ca51b6f3ff Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a34d2eb4b2ca5496bbf21906fbb5f1ca51b6f3ff commit a34d2eb4b2ca5496bbf21906fbb5f1ca51b6f3ff Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 17:12:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:08 +0000 iwlwifi/rtw88: re-attach to build after updates While the build-breaking changes were only in the window of the two commits, further updates were easier to merge and restored some functionality as well. Now that we are done, add iwlwifi/rtw88 back to the build. This reverts commit b75d1ce6c10652fc4bfbf509deeae0e05c3d1356. Sponsored by: The FreeBSD Foundation (cherry picked from commit af6aaa90057d75644c41527acc903082104e4114) --- sys/modules/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 71b22941f261..a61b4ad19095 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -540,7 +540,7 @@ _ipoib= ipoib _iser= iser .endif _ipmi= ipmi -#_iwlwifi= iwlwifi +_iwlwifi= iwlwifi .if ${MK_SOURCELESS_UCODE} != "no" _iwlwififw= iwlwififw .endif @@ -557,7 +557,7 @@ _mlx4ib= mlx4ib _mlx5ib= mlx5ib .endif _ossl= ossl -#_rtw88= rtw88 +_rtw88= rtw88 .if ${MK_SOURCELESS_UCODE} != "no" _rtw88fw= rtw88fw .endif From nobody Wed Nov 29 16:38:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4R1Dw2z52wvQ; Wed, 29 Nov 2023 16:38: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 4SgQ4Q62nGz3Jf1; Wed, 29 Nov 2023 16: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=1701275910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HCyRUeWepkpiwxU15TkQ5QGg+2+LQ9IzZZrKOv0rj1g=; b=Vqpv5EoxOCXwu3sOx71M/ka2BR+bUPJ5KcAOW29fA35eOHZ1PJ8NzzmJ+9n7GOQjg7qRKM 7pfhm0BDY6fzwsd/g+1/tPJ5s/wqRYd4IkMB8ijJZAxuk8x8E7fyx2p9F4Sjv5FxgTbDKO GCde628R/b+LsC39P7rqhHziuZVACy8RAlzFnr2exNlVF6eftX38gAWZOsn/HUVLoImkZ0 ukymW+qbjWKJLCYCzfzQTkOlhLfe1k0kQrRd3JqOkh/d1ecGGG849M5hH9FttEKqLJdM0b 8c0ME1sGAmfvO/Wo38TboGGHxG6RvhYQB+F8OyI4eUQR0AvBN6u3+R05CS0wrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HCyRUeWepkpiwxU15TkQ5QGg+2+LQ9IzZZrKOv0rj1g=; b=Eqlywtft+xRpFbyoK9yDu2Mu5YFzhgwM9DyO+t3IJiG/W5Wx9NcufTpJADFKZw1scrTPw8 ZoEJpJPojijncjZawztEefW382bhKcD7DW7JH6AtR9v0CMVSLdDrOXpooAxEz4vehysAgQ rBaiQQcHk0g5Vo0WlNftutwPCUp7kZuXbC2dQRnTzLsvd1PMW7JbajrkM3iStuPOKMW+Ot AZpnBMxO4z4xSjlFmMHl+icANdztfNjmZx4u4wovPOa8MJIZX/MzdlWDeEg1rODdSavJAI GpiHGInb4tAdm5cZlNB4f8X7NpnOd4f2ENoTJY/CJ5pm5JaUP/B96LoBQDJ39A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275910; a=rsa-sha256; cv=none; b=nJM77ECv8qyaUjiIVLfPnXkFzYVnMB6FpWW+Q74MTYPnzInXlsFdJqEbqlK0vrxNjQOSWT 75yiRPZ/W3kaplw/ejMqnwzm8E47HOkGh89T3g+Iu8gUDEU76WNC3zRHfhAlJk7HXD9dRa X0idup60NXmZKOkyqzqwotfgwtxyN2UGxGWSHxTIBLAkaVjOxnE+oHx1Ig6kbvuAFuXYBe oCNYvzjBET9g6KuASInb+uMQY9f6KjTt3huOqUG8Uy62yEV6tXa4BIZ3q07fZc90y2xoLH prPPn9c0whHwdWEVyvE0l2lMm4mRU93vHxZtLhmR7n4jOcmKNv2Z7gNzYZE/cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4Q56jvz1Bwm; Wed, 29 Nov 2023 16: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 3ATGcU3N046014; Wed, 29 Nov 2023 16: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 3ATGcUig046012; Wed, 29 Nov 2023 16:38:30 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:30 GMT Message-Id: <202311291638.3ATGcUig046012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6a40b366fce7 - stable/13 - net80211: introduce two extra ieee80211_notify_scan_done() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6a40b366fce73c8e825c8a134d07f00e3a9387fe Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6a40b366fce73c8e825c8a134d07f00e3a9387fe commit 6a40b366fce73c8e825c8a134d07f00e3a9387fe Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 11:51:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:08 +0000 net80211: introduce two extra ieee80211_notify_scan_done() We have multiple problems with scanning currently, one being that an initial scan restarts itself and we are unable to start another scan. wpa_supplicant in that case never shows scan results. Starting wpa_cli you may see: <3>CTRL-EVENT-SCAN-FAILED ret=-1 retry=1 messages. Add two extra calls to ieee80211_notify_scan_done() at the end of scans (before possible restarts). That will get wpa_supplicant to get scan results and possibly start associating to a BSSID and get us out of scan. This is kind-of a bandaid but on short notice may help to improve the situation for some. Based on analysis by: enweiwu Submitted by: enweiwu (initial version) Sponsored by: The FreeBSD Foundation (cherry picked from commit 3f382eb23b9fee75d05276a44feb5351d956238e) --- sys/net80211/ieee80211_scan_sw.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_scan_sw.c b/sys/net80211/ieee80211_scan_sw.c index 60e9a635b94d..3b47f08ad359 100644 --- a/sys/net80211/ieee80211_scan_sw.c +++ b/sys/net80211/ieee80211_scan_sw.c @@ -387,9 +387,10 @@ ieee80211_swscan_bg_scan(const struct ieee80211_scanner *scan, * scan_start method to populate it. */ ss->ss_next = 0; - if (ss->ss_last != 0) + if (ss->ss_last != 0) { + ieee80211_notify_scan_done(vap); ss->ss_ops->scan_restart(ss, vap); - else { + } else { ss->ss_ops->scan_start(ss, vap); #ifdef IEEE80211_DEBUG if (ieee80211_msg_scan(vap)) @@ -856,6 +857,7 @@ scan_end(struct ieee80211_scan_state *ss, int scandone) else vap->iv_stats.is_scan_passive++; + ieee80211_notify_scan_done(vap); ss->ss_ops->scan_restart(ss, vap); /* XXX? */ ieee80211_runtask(ic, &ss_priv->ss_scan_start); IEEE80211_UNLOCK(ic); From nobody Wed Nov 29 16:38:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4S0Dmxz52x0k; Wed, 29 Nov 2023 16: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 4SgQ4R6pk7z3Jl8; Wed, 29 Nov 2023 16:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zOA4G/fsxmUtj81MB0mwde5gxB5JC+vsO5MNZF8l55A=; b=O9VZngnNlTqvkN/ccU3kenGSOZ0oZ4mTTNWmbn7Uv/rtkFzlrnnI+AB8AXCY/4oRyBfTO3 dLsTSSqof2k2f/UOXtEnp87lTEhGdW9NNh9jEXxmEN09HJib+tS4ScAJhdndDwtHpfNEC1 a6u28ulbWiIux4EcrTMmwM8QQkVkBAMkoemTFwB8RZJ2pl+QYtZGpnugp5gTwWma/KCgh0 1vFT3mp5slfka2rlzMgsU093Q9v3nl936QY+jZEjzDmSNYtork505lQKHLIvjLj3h3aZIC +xUTDgZnHMVKpKMow4Dauw5fmvMf+aMQfn65vjoNXdUjUdkMwvTYOerHaiOv7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zOA4G/fsxmUtj81MB0mwde5gxB5JC+vsO5MNZF8l55A=; b=Z7R6LFLA/qbWmL3z6lHPMfOTjmQT3fi6tpooEZ4B+aEusQBTXpYKVEPwimhZ8ePYAput1W OIiHFOPYeKOcFwbCpkRbCNGy7mJRkU/ems+fw8s67KP7E9HTSn4WRgIk1ypMskoQyh4Vq/ VsZ4FLRqfO+cNXUqFPuPRpku++HnX0esaLaDBbqJr4Cv0JiFaSboqsc0ajNYQ9H5XXhUxH SRaln4Mpo1404OYaX0+2Ci/zp59mFcnEYK99q8yDZZRrHEwhQvJJovsgpenbJ4xOYCCCXi 8Vt5JOb6w5U9FrvN3VUWpqXNqvPhUM3BpqEMNWS7HOt5eXZ94sfcjjF5UoPcEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275912; a=rsa-sha256; cv=none; b=v0Nov+CDF+rzmTLubgWFQ/1Wp3wbKDjQET043qqPfkfDfgOJMwzeWL9/ZiCeY1dyr5uwcf J4AbhRbRqtDOrpffYFQLjg5DZvF0lkLLYq1QS0WyWL5hTZJFK2mU+7+MeFM8dGN4L9+9la MkK48NIo8k/YMfIftvj8HNoEAh85z2UPUFbw9+HIWVp/e8KU58DgrHopRGUUwhN2vnldAo mPFHL2oT4OjPX0BwWt+cZ3KWEb8bIxmEl6eEwXbl4W/bV+9200sc12+w9PI8ReYj35xrY3 /3fqeo5lmdyZReWFiX2RMR2SD9kut6PFfTNj4l/mBFVYkp841C1s40A4laG0xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4R5nlVz1Bwn; Wed, 29 Nov 2023 16:38: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 3ATGcVo7046065; Wed, 29 Nov 2023 16:38:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcVsf046062; Wed, 29 Nov 2023 16:38:31 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:31 GMT Message-Id: <202311291638.3ATGcVsf046062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3d97482b9bcf - stable/13 - iwlwifi: Update iwlwifi.4 and iwlwififw.4 device list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3d97482b9bcff74038dce1d56e410b38f0ae3ca4 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3d97482b9bcff74038dce1d56e410b38f0ae3ca4 commit 3d97482b9bcff74038dce1d56e410b38f0ae3ca4 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 21:47:18 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:08 +0000 iwlwifi: Update iwlwifi.4 and iwlwififw.4 device list Update the man pages for iwlwifi.4 and iwlwififw.4 to list the current state of devices supported and which firmware they need. The list is automatically generated based on a sysctl added to the iwlwifi driver (so this is the driver's view). The reader should not be surprised by the larger number of any/any/any/any entries for PCI vendor and devices in the firmware table for which other matching logic happens. The reader should also not be confused about "TBD" (to be done) entries for chipsets which the driver already supports but have no (public) product yet. Sponsored by: The FreeBSD Foundation (cherry picked from commit 242f314842767c36eaaacca9f433c80d34def39c) --- share/man/man4/iwlwifi.4 | 6 +- share/man/man4/iwlwififw.4 | 1002 +++++++++++++++++++------------------------- 2 files changed, 445 insertions(+), 563 deletions(-) diff --git a/share/man/man4/iwlwifi.4 b/share/man/man4/iwlwifi.4 index b67f1d440bde..1cf61c0008b5 100644 --- a/share/man/man4/iwlwifi.4 +++ b/share/man/man4/iwlwifi.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2021 The FreeBSD Foundation +.\" Copyright (c) 2021-2023 The FreeBSD Foundation .\" .\" This documentation was written by Bj\xc3\xb6rn Zeeb under sponsorship from .\" the FreeBSD Foundation. @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 3, 2022 +.Dd September 21, 2023 .Dt IWLWIFI 4 .Os .Sh NAME @@ -178,6 +178,8 @@ Intel(R) Wi-Fi 6E AX231 160MHz Intel(R) TBD Bz device .It Intel(R) Wi-Fi 6 AX204 160MHz +.It +Intel(R) TBD Sc device .\" --------------------------------------------------------------------- .El .Pp diff --git a/share/man/man4/iwlwififw.4 b/share/man/man4/iwlwififw.4 index 82ee376aaa72..a377f6b51f78 100644 --- a/share/man/man4/iwlwififw.4 +++ b/share/man/man4/iwlwififw.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2021 The FreeBSD Foundation +.\" Copyright (c) 2021-2023 The FreeBSD Foundation .\" .\" This documentation was written by Bj\xc3\xb6rn Zeeb under sponsorship from .\" the FreeBSD Foundation. @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 3, 2022 +.Dd September 21, 2023 .Dt iwlwififw 4 .Os .Sh NAME @@ -52,1414 +52,1294 @@ driver. .% --------------------------------------------------------------------- .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4070 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4070 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4072 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4072 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4170 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4170 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4c60 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4c60 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4c70 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4c70 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4060 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4060 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x406a Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x406a Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4160 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4160 Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4062 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4062 Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4162 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4162 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x4270 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x4270 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x4272 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x4272 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x4260 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x4260 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x426a Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x426a Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x4262 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x4262 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4470 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4470 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4472 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4472 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4460 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4460 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x446a Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x446a Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4462 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4462 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4870 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4870 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x486e Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x486e Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4a70 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4a70 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4a6e Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4a6e Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4a6c Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4a6c Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4570 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4570 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4560 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4560 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x4370 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x4370 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x4360 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x4360 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x5070 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x5070 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x5072 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x5072 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x5170 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x5170 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x5770 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x5770 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4020 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4020 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x402a Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x402a Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x4220 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x4220 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4420 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4420 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc070 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc070 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc072 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc072 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc170 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc170 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc060 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc060 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc06a Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc06a Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc160 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc160 Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc062 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc062 Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc162 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc162 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc770 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc770 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc760 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc760 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0xc270 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0xc270 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xcc70 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xcc70 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xcc60 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xcc60 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0xc272 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0xc272 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0xc260 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0xc260 Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0xc26a Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0xc26a Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0xc262 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0xc262 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc470 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc470 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc472 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc472 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc460 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc460 Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc462 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc462 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc570 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc570 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc560 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc560 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0xc370 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0xc370 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc360 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc360 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc020 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc020 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc02a Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc02a Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0xc220 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0xc220 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc420 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc420 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0070 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0070 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0072 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0072 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0170 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0170 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0172 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0172 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless N 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0060 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0060 Ta iwlwifi-3160 .It "" .It Intel(R) Wireless N 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0062 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0062 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b4 Ta any Ta 0x0270 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b4 Ta any Ta 0x0270 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b4 Ta any Ta 0x0272 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b4 Ta any Ta 0x0272 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0470 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0470 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0472 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0472 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b4 Ta any Ta 0x0370 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b4 Ta any Ta 0x0370 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8070 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8070 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8072 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8072 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8170 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8170 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8172 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8172 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless N 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8060 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8060 Ta iwlwifi-3160 .It "" .It Intel(R) Wireless N 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8062 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8062 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b4 Ta any Ta 0x8270 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b4 Ta any Ta 0x8270 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b4 Ta any Ta 0x8370 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b4 Ta any Ta 0x8370 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b4 Ta any Ta 0x8272 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b4 Ta any Ta 0x8272 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8470 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8470 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8570 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8570 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x1070 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x1070 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x1170 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x1170 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3165 Ta any Ta 0x4010 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3165 Ta any Ta 0x4010 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3165 Ta any Ta 0x4012 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3165 Ta any Ta 0x4012 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3166 Ta any Ta 0x4212 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3166 Ta any Ta 0x4212 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3165 Ta any Ta 0x4410 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3165 Ta any Ta 0x4410 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3165 Ta any Ta 0x4510 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3165 Ta any Ta 0x4510 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3165 Ta any Ta 0x4110 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3165 Ta any Ta 0x4110 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3166 Ta any Ta 0x4310 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3166 Ta any Ta 0x4310 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3166 Ta any Ta 0x4210 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3166 Ta any Ta 0x4210 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3165 Ta any Ta 0x8010 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3165 Ta any Ta 0x8010 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3165 Ta any Ta 0x8110 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3165 Ta any Ta 0x8110 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3168 -.It 0x8086 Ta 0x24fb Ta any Ta 0x2010 Ta iwlwifi-3168- +.It 0x8086 Ta 0x24fb Ta any Ta 0x2010 Ta iwlwifi-3168 .It "" .It Intel(R) Dual Band Wireless AC 3168 -.It 0x8086 Ta 0x24fb Ta any Ta 0x2110 Ta iwlwifi-3168- +.It 0x8086 Ta 0x24fb Ta any Ta 0x2110 Ta iwlwifi-3168 .It "" .It Intel(R) Dual Band Wireless AC 3168 -.It 0x8086 Ta 0x24fb Ta any Ta 0x2050 Ta iwlwifi-3168- +.It 0x8086 Ta 0x24fb Ta any Ta 0x2050 Ta iwlwifi-3168 .It "" .It Intel(R) Dual Band Wireless AC 3168 -.It 0x8086 Ta 0x24fb Ta any Ta 0x2150 Ta iwlwifi-3168- +.It 0x8086 Ta 0x24fb Ta any Ta 0x2150 Ta iwlwifi-3168 .It "" .It Intel(R) Dual Band Wireless AC 3168 -.It 0x8086 Ta 0x24fb Ta any Ta 000000 Ta iwlwifi-3168- +.It 0x8086 Ta 0x24fb Ta any Ta 000000 Ta iwlwifi-3168 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5010 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5010 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5110 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5110 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5100 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5100 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x5310 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x5310 Ta iwlwifi-7265 .It "" .It Intel(R) Wireless N 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x5302 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x5302 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x5210 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x5210 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5c10 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5c10 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5012 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5012 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5412 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5412 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5410 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5410 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5510 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5510 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5400 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5400 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x1010 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x1010 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless N 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5000 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5000 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless N 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x500a Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x500a Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless N 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x5200 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x5200 Ta iwlwifi-7265 .It "" .It Intel(R) Wireless N 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5002 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5002 Ta iwlwifi-7265 .It "" .It Intel(R) Wireless N 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5102 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5102 Ta iwlwifi-7265 .It "" .It Intel(R) Wireless N 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x5202 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x5202 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9010 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9010 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9012 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9012 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x900a Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x900a Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9110 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9110 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9112 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9112 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x9210 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x9210 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x9200 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x9200 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9510 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9510 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x9310 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x9310 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9410 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9410 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless N 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5020 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5020 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless N 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x502a Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x502a Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless N 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5420 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5420 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5090 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5090 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5190 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5190 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5590 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5590 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x5290 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x5290 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5490 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5490 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5f10 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5f10 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x5212 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x5212 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x520a Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x520a Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9000 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9000 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9400 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9400 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9e10 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9e10 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x1010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x1010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x10b0 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x10b0 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0130 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0130 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x1130 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x1130 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0132 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0132 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x1132 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x1132 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0110 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0110 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x01f0 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x01f0 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0012 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0012 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x1012 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x1012 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x1110 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x1110 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0050 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0050 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0250 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0250 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x1050 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x1050 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0150 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0150 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x1150 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x1150 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f4 Ta any Ta 0x0030 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f4 Ta any Ta 0x0030 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f4 Ta any Ta 0x1030 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f4 Ta any Ta 0x1030 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0xc010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0xc010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0xc110 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0xc110 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0xd010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0xd010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0xc050 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0xc050 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0xd050 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0xd050 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0xd0b0 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0xd0b0 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0xb0b0 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0xb0b0 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x8010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x8010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x8110 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x8110 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x9010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x9010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x9110 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x9110 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f4 Ta any Ta 0x8030 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f4 Ta any Ta 0x8030 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f4 Ta any Ta 0x9030 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f4 Ta any Ta 0x9030 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f4 Ta any Ta 0xc030 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f4 Ta any Ta 0xc030 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f4 Ta any Ta 0xd030 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f4 Ta any Ta 0xd030 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x8130 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x8130 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x9130 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x9130 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x8132 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x8132 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x9132 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x9132 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x8050 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x8050 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x8150 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x8150 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x9050 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x9050 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x9150 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x9150 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless N 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0004 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0004 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless N 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0044 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0044 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 4165 -.It 0x8086 Ta 0x24f5 Ta any Ta 0x0010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f5 Ta any Ta 0x0010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 4165 -.It 0x8086 Ta 0x24f6 Ta any Ta 0x0030 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f6 Ta any Ta 0x0030 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0810 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0810 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0910 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0910 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0850 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0850 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0950 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0950 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0930 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0930 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24f3 Ta any Ta 000000 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24f3 Ta any Ta 000000 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x4010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x4010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0010 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0010 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0110 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0110 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x1110 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x1110 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x1130 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x1130 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0130 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0130 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x1010 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x1010 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x10d0 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x10d0 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0050 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0050 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0150 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0150 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x9010 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x9010 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x8110 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x8110 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x8050 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x8050 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x8010 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x8010 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0810 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0810 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x9110 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x9110 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x8130 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x8130 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0910 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0910 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0930 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0930 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0950 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0950 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0850 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0850 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x1014 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x1014 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8275 -.It 0x8086 Ta 0x24fd Ta any Ta 0x3e02 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x3e02 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8275 -.It 0x8086 Ta 0x24fd Ta any Ta 0x3e01 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x3e01 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8275 -.It 0x8086 Ta 0x24fd Ta any Ta 0x1012 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x1012 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8275 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0012 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0012 Ta iwlwifi-8265 .It "" *** 947 LINES SKIPPED *** From nobody Wed Nov 29 16:38:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4T1JlDz52x5G; Wed, 29 Nov 2023 16:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ4T0qMjz3Jvx; Wed, 29 Nov 2023 16:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FhvqToeKaE+UrGhd9uqpx0jqsINDIR6LKrHcqYjXtig=; b=QcR1qesuFMZHqQ/bAldPFt4jrLeCUj5V9GjK8nU5gcC7AFqfBI2CxoBq9kxv7Un9l8CZva TbLaJQKg+YfMGvXPjDOE563fjg/x5aClf4DFKX5fSqv34AliIYsUpoHf5jBDNmhnzpMdNe OnqHuCOy3JT4S581ED3yWnPWQN6AKLj38gqfIe3nOssF3WFF7QWkuSZ788SnoyiNQ1FcfO DdKUmYtIr/cxIjLDBKg9isSatYZFvFRGwNOV8RJP+bkTtd6Vg2XTwTZ6eBkhoHI+OwhKNQ ErVARHavFeIaqJYTDMIc8miQZ0q2YTJr7n/wmXwIaPd3NEx/KQx7bs2ND3q7/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FhvqToeKaE+UrGhd9uqpx0jqsINDIR6LKrHcqYjXtig=; b=KLjE5GtBLrOKd37oEoJ7XFFS05JoP2//nDMSCQaalyPMpN9tj59aHw2MSf2XUy2U8MNdJ9 jlSRi6fuffLvtqHZQQ0nsSi45WthoqbGJP7bYbaYbQXUiNt5hjLKXXG6fHAP885wHv6KPp heIPP821MlnKZtVVoLOUMFJEGIx41kYIBvqNWMHw2x/F9VxzE4+0w9gRfKTwt8dy89cvc0 BXn1yFxfXHsqx0IKvR1Almn/BkqtwPrF5ZXTNESqCbLasTg1VarbW7WGnvkVOZeS4apfQy MziOJlsXUWfRVkWga4r24PFZuHnQMeV5+h7zjw47YWHzPABovrKZjA3p8iKcow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275913; a=rsa-sha256; cv=none; b=GXVAn2aB+m7TmbDugUJXmn2isvBr3TnaQ8Mc3rWgFyScwwVKdMV8rPWUCxEJEKsJRczcfF P91rg/OCwc6sRX+M04fpFU4Fkdn1jnBfuqaDL+Izs1Q2BCvQhNpIaM6WWSaLgEK+PQJEAH 2afcwtYOjXVBC4Z4PcvWLhdLtBaqtauguS0RkZTQIyPH2L2a6sH2IbzdZvw2KpXmi51ydI pMBXZZuQylivGVO5KXH7qfQ+JQ25teGHD3IDNppKJxA5gIA4NXIiYetvxRy6B4OOyQqqM/ c2BMr8QEQBGTGwmgnOYZgEO+o+EfA/33GyIrDQkn3N6BnV+DyARyGOGCjlHyAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4S7159z1Cd6; Wed, 29 Nov 2023 16: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 3ATGcWAo046113; Wed, 29 Nov 2023 16: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 3ATGcWNt046110; Wed, 29 Nov 2023 16:38:32 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:32 GMT Message-Id: <202311291638.3ATGcWNt046110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 2dd2dd2f25b6 - stable/13 - iwlwifi: local namespace change for sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2dd2dd2f25b6a8868b541442c035dffd99dc0ef0 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2dd2dd2f25b6a8868b541442c035dffd99dc0ef0 commit 2dd2dd2f25b6a8868b541442c035dffd99dc0ef0 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 22:05:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:09 +0000 iwlwifi: local namespace change for sysctl In order for the FreeBSD-specific sysctl (which gives us a full list of PCI device IDs/names/and firmware prefixes) to be in the proper namespace add a LINUXKPI_PARAM_PREFIX definition to the file as well. The sysctl can now be used as: sysctl -n compat.linuxkpi.iwlwifi_pci_ids_name Sponsored by: The FreeBSD Foundation (cherry picked from commit 0a22677bce28bc9ad39f219b726b5791852d84ba) --- sys/contrib/dev/iwlwifi/pcie/drv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/pcie/drv.c b/sys/contrib/dev/iwlwifi/pcie/drv.c index 3bde223e3f9c..0aab7a1fdc8e 100644 --- a/sys/contrib/dev/iwlwifi/pcie/drv.c +++ b/sys/contrib/dev/iwlwifi/pcie/drv.c @@ -4,6 +4,9 @@ * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX iwlwifi_ +#endif #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include From nobody Wed Nov 29 16:38:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4V4q1Wz52x5M; Wed, 29 Nov 2023 16: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 4SgQ4V1rcJz3Jqw; Wed, 29 Nov 2023 16: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=1701275914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0PuBviWNcWiIZ5aUBR6V46jJeiQ2J/TgOPNuwlLbfzs=; b=r3lrtw+Nf5PFK/PWFnxPs1THMEihfFWqJX/ute0RYOKopBej7z1eu+BNgC0lvPz4YJ6mmq uFVXQ/N21mYsYyRj5TgByWmravGms7Q23m0tK2cDcA5zEQ9AEwYmdwE1f0gbvkZx+PCpQk YntRDI8Y9ysbdasM6fZ+9V0kgb7NSny22TnyWH8NjRE/ghym3b8myaAQ+6i789ErF31ro/ uE8ue8O3l+ee1BDzjr0oaMWYz4pH5awEdWmeTp12nIoIdNhxSyiMYuZ/inGknPLJuCaSsk g7JnoA26Ddk0FgW0Yqauqok0ADj/OkogYfT3nitpvOQvswZ222RSEcxlDAwP+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0PuBviWNcWiIZ5aUBR6V46jJeiQ2J/TgOPNuwlLbfzs=; b=e18kteVEadxGumDFdrXbcLnazFXGCbBUQOA2hFT+AKiw2052MwxZPA4/SsbPJBwcartA3q NiXatGSq5gp3YwHqRxztAToAPjxwbKN0QExo6t4uX06ecn40axmmM37T6CyX7WtVHb1gdu PB9w4E/TPyoQA8Q8mfQVtwul4Fg2l5uR4ABV6axASmnzrsK2odhKwkBAoewaqBQPEj8ycy sQF8gz7A3XiGyOaDyj5gu/GgVEXomga6Kf6xpJ93I2drN+pw3GZT6gzmBTAoaUp6x2f4zV s1TKajRfmn95bggENc9n4pthIo1NJ1LIykxwxtzb+ehZfgvV/sNr7M3NEM9FrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275914; a=rsa-sha256; cv=none; b=M5W2mJNNBKEGS0SzTOu+8CxerX+BYDLnY+0Zc7eSalZfqacOCIoH+/amsSMDj0jV+gacTi B/SbUqpxxCt6befOSVw/j1az2fEM/g8XJ3QXQXwhqp4xVGeWQaVr5mPqpHwluEF7babi8J Pr9NYhMzWBG48gJ0yNojc1Pf/egDdVAZ1S0gMO1QRdMoxvJYn2hf3DVk3oyWSY51JI2Il1 zrXh0SrIQ8avr83UxwrnEHqzn3h5t3SCdiMikoaQPYJnl2Evc0MvZDHnSttNMlVzXyyBTw kzyvNwW6sitSgqDZ93qmGJNnLZBW3DEQ74gyqEdjfMcDjRqjAuzHeqgC7cHW8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4V0xR3z1C49; Wed, 29 Nov 2023 16:38: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 3ATGcYh2046179; Wed, 29 Nov 2023 16: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 3ATGcYhb046176; Wed, 29 Nov 2023 16:38:34 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:34 GMT Message-Id: <202311291638.3ATGcYhb046176@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: cf245c69978e - stable/13 - LinuxKPI: 802.11: avoid symbol clash on UP to AC mapping List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cf245c69978ed8a9aa43340d7c3285166730889d Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cf245c69978ed8a9aa43340d7c3285166730889d commit cf245c69978ed8a9aa43340d7c3285166730889d Author: Bjoern A. Zeeb AuthorDate: 2023-09-24 11:55:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:09 +0000 LinuxKPI: 802.11: avoid symbol clash on UP to AC mapping tid_to_mac80211_ac is an exported symbol in and likely based on iwlwifi, which leads to a symbol clash in NetBSD. Rename our local LinuxKPI copy to a better name and add a comment where to find a copy of the mapping table. Sponsored by: The FreeBSD Foundation Reported by: Phil Nelson (phil netbsd org) (cherry picked from commit fb3c249ed93c834d70f8361215bc40a9e9004d3b) --- sys/compat/linuxkpi/common/src/linux_80211.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 98ffcbfbef74..4a641c296ed2 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -113,7 +113,8 @@ const uint8_t rfc1042_header[6] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; /* IEEE 802.11-05/0257r1 */ const uint8_t bridge_tunnel_header[6] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; -const uint8_t tid_to_mac80211_ac[] = { +/* IEEE 802.11e Table 20i-UP-to-AC mappings. */ +static const uint8_t ieee80211e_up_to_ac[] = { IEEE80211_AC_BE, IEEE80211_AC_BK, IEEE80211_AC_BK, @@ -239,7 +240,7 @@ lkpi_lsta_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN], IMPROVE("AP/if we support non-STA here too"); ltxq->txq.ac = IEEE80211_AC_VO; } else { - ltxq->txq.ac = tid_to_mac80211_ac[tid & 7]; + ltxq->txq.ac = ieee80211e_up_to_ac[tid & 7]; } ltxq->seen_dequeue = false; ltxq->stopped = false; @@ -3283,7 +3284,7 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) ac = IEEE80211_AC_BE; } else { skb->priority = tid & IEEE80211_QOS_CTL_TID_MASK; - ac = tid_to_mac80211_ac[tid & 7]; + ac = ieee80211e_up_to_ac[tid & 7]; } skb_set_queue_mapping(skb, ac); From nobody Wed Nov 29 16:38:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4W3QhBz52wvb; Wed, 29 Nov 2023 16: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 4SgQ4W2yDCz3JwZ; Wed, 29 Nov 2023 16: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=1701275915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rHVWTr8V3azn1CUapqikD8Yc+71YwzQpLgNEIiler90=; b=ezFGi3Pz4PJ3y/my6GFx6988RNwihr+rlBm0mdlJXrjY0Mix2Ij7d+pOZh5qq/G+4bgr6g +nMyJUbFdwZRLlNNnX8bByifW48HuGo2Y9qgx7AEgb+YIdbHI4by1QoX6QMZPQeJpe3k/i ubebyja1LQb3LVY58k9O6rk60m/9SEZiKTXUiEW1i+iTlgPyBfIM9cd7kOU+daMSRkWUPK dcxfGTN/f8e9ypZOyVZvNqNh7twJhZhP2e25TQqrEvbNrP9wdUuNQI4HRPSK59mQRJ5jjQ A0Bmvqka9Kv6T7UHGUQXJ2F/4qg3WoGzvlASKsbbKQwiiEAhBTI25rl3s7EDfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rHVWTr8V3azn1CUapqikD8Yc+71YwzQpLgNEIiler90=; b=Rkr7c1Ip9ehY1vHKVQwwsii8AFdGW99WMkMfOhWgfqvKdZksxFL7E+tep1V/rEdeLP2ycA VzTKSJEZJkTy3UNnSqAICROBvNqYj9cN1UFbiagkqRR9vyDnnKDONeUt3qbF0qgawf09hT VgzKhPzTTdEbsCYBFR4w9b66J2kav3DjQ+QM+ApN8oW6Y4yRML4ehvkflPt38cnGxU0sEc mzoBSyn6DYPMx4B844qs99h+BG0mNsGuAd3xuc1Njv81zM7tytKY5mvjojq+05UFI63FEs H8ON1vsUj2Pq9Dj4/e7g/pY5k0ktMHHccOxDf38tve/Mb31rbXwTr10PRY301A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275915; a=rsa-sha256; cv=none; b=FzoALdrbsXTRZEkJNRFuuYpTBeUCRy+yr8lG1DZhCeEMPJ4gduWUQg08Ij9HHxT1v1BoWa v5pzNsDt98jZAIOefihjiYp0dKTTGAJJDAn3lJWCrqH+zI42cnAxio06hTaInldBpQL7dB s38qdLXhByL6jBNYBc1q5/hgsX5eOai/yJaCX/U08C+fCVBqFw7imt80UuaX8hrqDa5mp/ 6WjN7lPy+UWyRLRRNEeahXD3k4vjXs2dGVtT6fIQn/OxGt4zls8ti806yr9FoWbPtqwvvL Gn9ZHZDzC0oewEyRJXEfwGy49ORXfBkvdzKGC6Kd4B+R5rDq4ODuiYIBKwNB1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4W20RXz1CXn; Wed, 29 Nov 2023 16: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 3ATGcZ6X046233; Wed, 29 Nov 2023 16:38:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcZe1046230; Wed, 29 Nov 2023 16:38:35 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:35 GMT Message-Id: <202311291638.3ATGcZe1046230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 47db348f2aba - stable/13 - LiunxKPI: 802.11: move ieee80211_chanctx_conf into lkpi private struct List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 47db348f2aba15a4e6cb27f53da2a1102b96e7df Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=47db348f2aba15a4e6cb27f53da2a1102b96e7df commit 47db348f2aba15a4e6cb27f53da2a1102b96e7df Author: Bjoern A. Zeeb AuthorDate: 2023-09-25 16:57:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:09 +0000 LiunxKPI: 802.11: move ieee80211_chanctx_conf into lkpi private struct Factor out ieee80211_chanctx_conf into struct lkpi_chanctx in order to keep local state as well. In first instance that is added_to_drv only. For now we stay single-chanctx only but this paves the path to make it a list. Use the new information to implement ieee80211_iter_chan_contexts_atomic(). Sponsored by: The FreeBSD Foundation (cherry picked from commit c5e257985085bd987b1dddffd0455c2230df2d1d) --- sys/compat/linuxkpi/common/src/linux_80211.c | 46 +++++++++++++++++++--- sys/compat/linuxkpi/common/src/linux_80211.h | 9 +++++ .../linuxkpi/common/src/linux_80211_macops.c | 8 ++++ 3 files changed, 57 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 4a641c296ed2..a16aa42ba2a3 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -922,6 +922,7 @@ static int lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { struct linuxkpi_ieee80211_channel *chan; + struct lkpi_chanctx *lchanctx; struct ieee80211_chanctx_conf *conf; struct lkpi_hw *lhw; struct ieee80211_hw *hw; @@ -953,11 +954,13 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* Add chanctx (or if exists, change it). */ if (vif->chanctx_conf != NULL) { conf = vif->chanctx_conf; + lchanctx = CHANCTX_CONF_TO_LCHANCTX(conf); IMPROVE("diff changes for changed, working on live copy, rcu"); } else { /* Keep separate alloc as in Linux this is rcu managed? */ - conf = malloc(sizeof(*conf) + hw->chanctx_data_size, + lchanctx = malloc(sizeof(*lchanctx) + hw->chanctx_data_size, M_LKPI80211, M_WAITOK | M_ZERO); + conf = &lchanctx->conf; } conf->rx_chains_dynamic = 1; @@ -1022,7 +1025,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int error = 0; if (error != 0) { lkpi_80211_mo_remove_chanctx(hw, conf); - free(conf, M_LKPI80211); + lchanctx = CHANCTX_CONF_TO_LCHANCTX(conf); + free(lchanctx, M_LKPI80211); goto out; } } @@ -1179,6 +1183,7 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* Take the chan ctx down. */ if (vif->chanctx_conf != NULL) { + struct lkpi_chanctx *lchanctx; struct ieee80211_chanctx_conf *conf; conf = vif->chanctx_conf; @@ -1188,7 +1193,8 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* Remove chan ctx. */ lkpi_80211_mo_remove_chanctx(hw, conf); - free(conf, M_LKPI80211); + lchanctx = CHANCTX_CONF_TO_LCHANCTX(conf); + free(lchanctx, M_LKPI80211); } out: @@ -1454,6 +1460,7 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i /* Take the chan ctx down. */ if (vif->chanctx_conf != NULL) { + struct lkpi_chanctx *lchanctx; struct ieee80211_chanctx_conf *conf; conf = vif->chanctx_conf; @@ -1463,7 +1470,8 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i /* Remove chan ctx. */ lkpi_80211_mo_remove_chanctx(hw, conf); - free(conf, M_LKPI80211); + lchanctx = CHANCTX_CONF_TO_LCHANCTX(conf); + free(lchanctx, M_LKPI80211); } error = EALREADY; @@ -1916,6 +1924,7 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* Take the chan ctx down. */ if (vif->chanctx_conf != NULL) { + struct lkpi_chanctx *lchanctx; struct ieee80211_chanctx_conf *conf; conf = vif->chanctx_conf; @@ -1925,7 +1934,8 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* Remove chan ctx. */ lkpi_80211_mo_remove_chanctx(hw, conf); - free(conf, M_LKPI80211); + lchanctx = CHANCTX_CONF_TO_LCHANCTX(conf); + free(lchanctx, M_LKPI80211); } error = EALREADY; @@ -3961,8 +3971,32 @@ linuxkpi_ieee80211_iterate_chan_contexts(struct ieee80211_hw *hw, void *), void *arg) { + struct lkpi_hw *lhw; + struct lkpi_vif *lvif; + struct ieee80211_vif *vif; + struct lkpi_chanctx *lchanctx; - UNIMPLEMENTED; + KASSERT(hw != NULL && iterfunc != NULL, + ("%s: hw %p iterfunc %p arg %p\n", __func__, hw, iterfunc, arg)); + + lhw = HW_TO_LHW(hw); + + IMPROVE("lchanctx should be its own list somewhere"); + + LKPI_80211_LHW_LVIF_LOCK(lhw); + TAILQ_FOREACH(lvif, &lhw->lvif_head, lvif_entry) { + + vif = LVIF_TO_VIF(lvif); + if (vif->chanctx_conf == NULL) + continue; + + lchanctx = CHANCTX_CONF_TO_LCHANCTX(vif->chanctx_conf); + if (!lchanctx->added_to_drv) + continue; + + iterfunc(hw, &lchanctx->conf, arg); + } + LKPI_80211_LHW_LVIF_UNLOCK(lhw); } void diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index 22a5f5a6377c..93c1e2873206 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -210,6 +210,15 @@ struct lkpi_hw { /* name it mac80211_sc? */ #define LHW_TO_HW(_lhw) (&(_lhw)->hw) #define HW_TO_LHW(_hw) container_of(_hw, struct lkpi_hw, hw) +struct lkpi_chanctx { + bool added_to_drv; /* Managed by MO */ + struct ieee80211_chanctx_conf conf __aligned(CACHE_LINE_SIZE); +}; +#define LCHANCTX_TO_CHANCTX_CONF(_lchanctx) \ + (&(_lchanctx)->conf) +#define CHANCTX_CONF_TO_LCHANCTX(_conf) \ + container_of(_conf, struct lkpi_chanctx, conf) + struct lkpi_wiphy { const struct cfg80211_ops *ops; diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index b3b53d23f62e..8f75b1bdf8b1 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -490,6 +490,7 @@ lkpi_80211_mo_add_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *chanctx_conf) { struct lkpi_hw *lhw; + struct lkpi_chanctx *lchanctx; int error; lhw = HW_TO_LHW(hw); @@ -500,6 +501,10 @@ lkpi_80211_mo_add_chanctx(struct ieee80211_hw *hw, LKPI_80211_TRACE_MO("hw %p chanctx_conf %p", hw, chanctx_conf); error = lhw->ops->add_chanctx(hw, chanctx_conf); + if (error == 0) { + lchanctx = CHANCTX_CONF_TO_LCHANCTX(chanctx_conf); + lchanctx->added_to_drv = true; + } out: return (error); @@ -524,6 +529,7 @@ lkpi_80211_mo_remove_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *chanctx_conf) { struct lkpi_hw *lhw; + struct lkpi_chanctx *lchanctx; lhw = HW_TO_LHW(hw); if (lhw->ops->remove_chanctx == NULL) @@ -531,6 +537,8 @@ lkpi_80211_mo_remove_chanctx(struct ieee80211_hw *hw, LKPI_80211_TRACE_MO("hw %p chanctx_conf %p", hw, chanctx_conf); lhw->ops->remove_chanctx(hw, chanctx_conf); + lchanctx = CHANCTX_CONF_TO_LCHANCTX(chanctx_conf); + lchanctx->added_to_drv = false; } void From nobody Wed Nov 29 16:38:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4X3nRfz52x0x; Wed, 29 Nov 2023 16: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 4SgQ4X3KVGz3Jx8; Wed, 29 Nov 2023 16: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=1701275916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cq4zTGhQt8whzVi6JwxLsn9uNdkERri36v0L4y/S73M=; b=rBUfTxobnTxboUcusb5XTVbus2i8WFKCTVTYEz10RhM8J0NxWJG8zFyw76vahpL/Iu9Wfn v5UX/nRX8PuP+qGwiFp1UbvmYDEe9MYuzBePmlKg77JrJ1d41nK4WIHYyLqd9OYSrzCmon ve9ZwBBk3yOC9RgcIfJHi3FKa0OLH09KMU7w6b8uj9+WsRDBfHimMOxBV3acy9xaNjW/hz 7boocnGKj3FbJchVgrelhF0XjjM0yZxou+tLB2gH6v6ZR1nt8+yZowHxcUjUhj+/ZWOrty eKYi1EAFT3JFMxj3cs3A8RkoEaLJdAVK5u9vAF38cVnLdmGuLGo1Ie7rqdspoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cq4zTGhQt8whzVi6JwxLsn9uNdkERri36v0L4y/S73M=; b=HonVEJE+8IZxfPVbsqAzv0H7p/SMJ6Edm4Vxvltl+EJCsVDr8t45zLDClzeXqYybvkl6HY Jlv8yFXgvgEStlX3vylP4aycvUxo1aAh/nqKCl7Mw7zUB1Ee6gQzbzIPnw9a3lH/0G8En8 takppTIesguuh+Wl3Hsyz5dgsIvvz56C48KdI+oxx5O64wioUoPAv7OACd9LQv6Cpd0/GU /3mLpKcLqsDgg1D2HBIp3NpUfUZ7FRLlKLZkEae3KEdrE2dOve0Cm0lHe+faP8fO9510/3 dE5QhGw34A02LqssPXWJ3ZtkBhvkg+mqrkjeg4KtTPd2Z5ewWHwqNLOnEXEKsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275916; a=rsa-sha256; cv=none; b=YML5teQTq1tBmkRkcybv7n0DsRPrqWDbIJKyVqDqgY97BN+HG9s9HGX5y1EpDrSlLSXAu4 bxL7PlcoAAMJJn/X7BPfVxs2+PBKE+GMw/ycZ4FmLnnek8QTVQpNWo5kEntQ8LY4YV9QNe Wm6t72ziNgXbpJfkO581RPIwgm6l8Lh5ztcDxBbImpyoJsSKtttkoaIhU5cgYcn0glL4v/ /XJczTyjYviWcfzWa1jjkxFBh6lfgmnpmfaeYzu5qSEaot+BE2r5WYnvOwrgTFTVteERFH h9gQ7sDaqlPIKkvoLpzGSG9lnnjdwfqW2Mk1t9ElnrefqD+LqN4wAnINhH2H5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4X2PCxz1Bwp; Wed, 29 Nov 2023 16: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 3ATGcacv046289; Wed, 29 Nov 2023 16: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 3ATGcaIe046286; Wed, 29 Nov 2023 16:38:36 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:36 GMT Message-Id: <202311291638.3ATGcaIe046286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 38fff4bd9433 - stable/13 - LinuxKPI: 802.11: fill regulatory_hint() with some life List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 38fff4bd94338441d77446c05e3ef11111915297 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=38fff4bd94338441d77446c05e3ef11111915297 commit 38fff4bd94338441d77446c05e3ef11111915297 Author: Bjoern A. Zeeb AuthorDate: 2023-09-25 17:54:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:09 +0000 LinuxKPI: 802.11: fill regulatory_hint() with some life Start implementing regulatory_hint() using a .c file based allocation helper function so we could change structures in the future with better chances to keep compatibility. This sets wiphy->regd needed by various LinuxKPI based WiFi drivers. Sponsored by: The FreeBSD Foundation (cherry picked from commit 673d62fc359b0cb7a70af42c36d2fa54fb29452a) --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 20 ++++++++++++++++++-- sys/compat/linuxkpi/common/src/linux_80211.c | 10 ++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 56ca9a231d2d..7e57ce67cc26 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -1260,6 +1260,8 @@ struct cfg80211_bss *linuxkpi_cfg80211_get_bss(struct wiphy *, const uint8_t *, size_t, enum ieee80211_bss_type, enum ieee80211_privacy); void linuxkpi_cfg80211_put_bss(struct wiphy *, struct cfg80211_bss *); void linuxkpi_cfg80211_bss_flush(struct wiphy *); +struct linuxkpi_ieee80211_regdomain * + lkpi_get_linuxkpi_ieee80211_regdomain(size_t); /* -------------------------------------------------------------------------- */ @@ -1587,8 +1589,22 @@ regulatory_set_wiphy_regd(struct wiphy *wiphy, static __inline int regulatory_hint(struct wiphy *wiphy, const uint8_t *alpha2) { - TODO(); - return (-ENXIO); + struct linuxkpi_ieee80211_regdomain *regd; + + if (wiphy->regd != NULL) + return (-EBUSY); + + regd = lkpi_get_linuxkpi_ieee80211_regdomain(0); + if (regd == NULL) + return (-ENOMEM); + + regd->alpha2[0] = alpha2[0]; + regd->alpha2[1] = alpha2[1]; + wiphy->regd = regd; + + IMPROVE("are there flags who is managing? update net8011?"); + + return (0); } static __inline const char * diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index a16aa42ba2a3..85ee4f22434c 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -4028,6 +4028,16 @@ linuxkpi_ieee80211_iterate_stations_atomic(struct ieee80211_hw *hw, LKPI_80211_LHW_LVIF_UNLOCK(lhw); } +struct linuxkpi_ieee80211_regdomain * +lkpi_get_linuxkpi_ieee80211_regdomain(size_t n) +{ + struct linuxkpi_ieee80211_regdomain *regd; + + regd = kzalloc(sizeof(*regd) + n * sizeof(struct ieee80211_reg_rule), + GFP_KERNEL); + return (regd); +} + int linuxkpi_regulatory_set_wiphy_regd_sync(struct wiphy *wiphy, struct linuxkpi_ieee80211_regdomain *regd) From nobody Wed Nov 29 16:38:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4Y4vwkz52wy0; Wed, 29 Nov 2023 16: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 4SgQ4Y4Q8Cz3KCf; Wed, 29 Nov 2023 16: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=1701275917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e2E3PpXV4pRVZBDECylxuBABr6LAjP95UOgjutTTkz4=; b=Ha3SQxYO7dT5GB2xoQ/1tCRllSlHuB/kLjuHmW1n7bkBAHaO++tszFwM+sq3iztRgZYLfl hkz3C4K7hpKF9d+CNXwgNy1G/dn9CQVEQFlgmb3ELKwG44XkaGh2B8gRoQKe8qs2NY5a6T Mab3dSMmgG6c4u8UaM5YIdMHwgCyOLK1Ezrc2/4lICqcy3dDB8qEvKFM2byzN8xfvM/a5u aApJ8eUsnLv0wz4WPG6z7gJ1HEhCfvqjq9km3IHG6zr26ofI72WqS/rIyKSarnIibp2cUd YV5utdYM+s5l79xhh2a+GLOrXV+AgMenSeECP90imIl8XoLmelam8z3mwEnYEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e2E3PpXV4pRVZBDECylxuBABr6LAjP95UOgjutTTkz4=; b=YnDD6ST/ZRK36E+fz2O0TXzFlqj+ouHxKmnU7QN6Be4/+9EcsWnKqKIttw3jjBAzZ80rrs vF6XRR0PODUlX4pDTjW4bnovhR9z9oKgXQSSFLANT9IyhXkk+fqwo/EGLQkP+xUdDOt6aZ uMRX+2WEySZBLFE2ormqIp30GZqOh1vqdNoUPqXrY+h7wYjpD0T+D0NtPu7SfqawYcrO+V GSvbDU0PAD9azb+tHoBDXhQeENuFcbwaSJniZig2GeOWF5FfM/DiplBa0mHFVIe9HoyGTu j3+g6HvLJ3ZP6UGUKcAnngl2kIS2b4lCz3BZPMHAJC50rv9j+7sDg//6VK4YwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275917; a=rsa-sha256; cv=none; b=dy9QLsFLxGX0SJkUhkaFyYTUXexSKrFrZl5EVt5hc2YqqC9bJv5cRsDTL+eFdMezmutcua 1SsoJGILBu1TqR/LioS6VHceE9fehjkpnd7alUK5PITfUz3E9Gr10cb2Wa0KuwWIi/FOC1 AIRYpVokPeV4cjBQBec2VJMXERgxF/8oMlGaxXpC/XewPlP/HfGigbOljPdSgc97U80dYg /IjbjMPiCLsAJwTt4cxGHqNhKgim9pU4fv74jTIdo7fgRGOHNmkLAk1W19wOkdZAjAQXGq r8W+xrQfiF7RYfedKMcvAoFsYLmqGS8My15GPJI6/LscnmaiFR+0C+E/kcFxWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4Y3Nw1z1CXp; Wed, 29 Nov 2023 16: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 3ATGcbx6046337; Wed, 29 Nov 2023 16: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 3ATGcbBn046334; Wed, 29 Nov 2023 16:38:37 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:37 GMT Message-Id: <202311291638.3ATGcbBn046334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6b816fdfada1 - stable/13 - LinuxKPI: 802.11: fix problem removing sta List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b816fdfada19b56750053c02f0c32f562a77b94 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6b816fdfada19b56750053c02f0c32f562a77b94 commit 6b816fdfada19b56750053c02f0c32f562a77b94 Author: Bjoern A. Zeeb AuthorDate: 2023-09-30 07:59:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:09 +0000 LinuxKPI: 802.11: fix problem removing sta Move the call to lkpi_disassoc() before the state change to IEEE80211_STA_NOTEXIST which will remove the sta (from firmware). Based on a comment it seems that originally we had to do it the other way round. iwlwifi(4) has a check and will silently not remove the sta from the firmware when vif->cfg.assoc is still set (see iwl_mvm_sta_del()). This leads to the LinuxKPI 802.11 code thinking the sta is gone as downward state changes by the mac80211 op (*sta_state)() may not fail. Once we try to assoc with a newly added station later, iwlwifi firmware will run into an assert having two ap_sta set on the same vif. We can observe that problem in iwlwifi(4) having __le32 sta_id = 1 instead of sta_id = 0 in iwl_mvm_sta_cfg_cmd{} on the HCMD. This should fix one of the most seen problems with iwlwifi(4), e.g., when running service netif restart wlan0 or service wpa_supplicant restart wlan0. Sponsored by: The FreeBSD Foundation (cherry picked from commit 16e688b2a403a3dbc05de3b9f8a3132838613790) --- sys/compat/linuxkpi/common/src/linux_80211.c | 37 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 85ee4f22434c..54c7c5de6627 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1426,6 +1426,15 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i lkpi_lsta_dump(lsta, ni, __func__, __LINE__); + /* Update bss info (bss_info_changed) (assoc, aid, ..). */ + /* + * We need to do this now, before sta changes to IEEE80211_STA_NOTEXIST + * as otherwise drivers (iwlwifi at least) will silently not remove + * the sta from the firmware and when we will add a new one trigger + * a fw assert. + */ + lkpi_disassoc(sta, vif, lhw); + /* Adjust sta and change state (from NONE) to NOTEXIST. */ KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); KASSERT(lsta->state == IEEE80211_STA_NONE, ("%s: lsta %p state not " @@ -1435,15 +1444,8 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i IMPROVE("do we need to undo the chan ctx?"); goto out; } -#if 0 - lsta->added_to_drv = false; /* mo manages. */ -#endif - lkpi_lsta_dump(lsta, ni, __func__, __LINE__); - - /* Update bss info (bss_info_changed) (assoc, aid, ..). */ - /* We need to do this now, can only do after sta is IEEE80211_STA_NOTEXIST. */ - lkpi_disassoc(sta, vif, lhw); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); /* sta no longer save to use. */ IMPROVE("Any bss_info changes to announce?"); bss_changed = 0; @@ -1887,6 +1889,13 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_lsta_dump(lsta, ni, __func__, __LINE__); + /* Update bss info (bss_info_changed) (assoc, aid, ..). */ + /* + * One would expect this to happen when going off AUTHORIZED. + * See comment there; removes the sta from fw. + */ + lkpi_disassoc(sta, vif, lhw); + /* Adjust sta and change state (from NONE) to NOTEXIST. */ KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); KASSERT(lsta->state == IEEE80211_STA_NONE, ("%s: lsta %p state not " @@ -1896,18 +1905,8 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int IMPROVE("do we need to undo the chan ctx?"); goto out; } -#if 0 - lsta->added_to_drv = false; /* mo manages. */ -#endif - lkpi_lsta_dump(lsta, ni, __func__, __LINE__); - - /* Update bss info (bss_info_changed) (assoc, aid, ..). */ - /* - * One would expect this to happen when going off AUTHORIZED. - * See comment there; removes the sta from fw. - */ - lkpi_disassoc(sta, vif, lhw); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); /* sta no longer save to use. */ IMPROVE("Any bss_info changes to announce?"); bss_changed = 0; From nobody Wed Nov 29 16:38:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4b4gYkz52xC3; Wed, 29 Nov 2023 16:38: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 4SgQ4Z5YS6z3K8D; Wed, 29 Nov 2023 16: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=1701275918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XoYyBSpTJqC2y8kP3oeydSpD72Y0h3nxO0hoVHKuHos=; b=HT8pvKrV7Pf81/vx1VtrVTO2rOiyPStaZkbLCqlfOAuZ8Co/25rKEvtgA8sKdvJKVWAxbu RDZVCvtgJZ0NkMD2d8tOHky4tU4YM+8+ROU0/I6yFjxq5VCeHnVIpcjhJ+NhaBGfBU4m1I OchWx/ES+CXbaW5jlhfY60Qv/b5rV6Qh0jf7sO27qM6Ufo06wuH4TFIa8g2tkgfx9ewDtE GZfs/VzyLEUr7YYSG234yWVdkzO6ZrGi8E5Ap6fxMXbwCmt4Tfh8uK7f8jeKVQAUXanR+S 42XCDbGZjG4GBKrRVPKvtNg+eTbtTy/BvLUOzbvnQtIONufI34gHY5aUKPty2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XoYyBSpTJqC2y8kP3oeydSpD72Y0h3nxO0hoVHKuHos=; b=ugJZhKlAS4JwmyYNiQBaIspSaaS01oMwSf1NE5j86Ept6jYB9yjkMWvQ4vO0VfeNrl6ER1 EzntZRWVoDkmV7IUY39u3/9nbjCsC3Zmc+ImWmK2KCjOL+QeGBuwohZll3WXWZh5PoctHE eHjPaLOgNuU3nG4oNRX7Pao/V4C1s+gzxFDhdsZSadNGsnD3Nqiha73WRKXHtRWYDkM7Dg o4PHQE5wdT8aEgynktupZzBjLx1DDJDezqbceNURJy7l08sov1X6+xfl1neeeAVxFh5Px+ 9s1N6z285GEJnuuPiKtKxCRg2aJRyBBNBODalM/dSAIT2zL15lZC3NwV8/H2rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275918; a=rsa-sha256; cv=none; b=TrX5OlZJUygiaKUZIOv0obSre/lU1QWdrj3QB9C+Si5fLEmbunvYmwkAftQeQtwdRHxMmb ZoMIglRRw13C2ii4GmhNsUXpKs8iQdzx7tqep3eazCHNquMRoeh1+vH7yKy9l1k+K8X/4T ItcXl2MgZ7m7b0A7wMRRXvHBIJa+0S4S4P2c44oJVA+h5lkfZ2t6SIo4yj83JZvVvkjXS+ W1mNVhP5/CucdNLRln/kaB75/OzCk/GCf64juBE58RyLa9slaah8DK/BxcKVnSbhUKkhhu LMZe7wdOr9ndW3l4wpvhvwUTHePo5espMigLURChw48PlOUF3UtKKwffVLvZZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4Z4dHGz1CgT; Wed, 29 Nov 2023 16: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 3ATGccex046383; Wed, 29 Nov 2023 16: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 3ATGccwr046381; Wed, 29 Nov 2023 16:38:38 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:38 GMT Message-Id: <202311291638.3ATGccwr046381@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3419d1459715 - stable/13 - LinuxKPI: 802.11: improve lkpi_ic_vap_delete() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3419d14597153c15756d2737d16c168edf33247d Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3419d14597153c15756d2737d16c168edf33247d commit 3419d14597153c15756d2737d16c168edf33247d Author: Bjoern A. Zeeb AuthorDate: 2023-09-30 15:20:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:09 +0000 LinuxKPI: 802.11: improve lkpi_ic_vap_delete() Changing the order of cleanup in lkpi_ic_vap_delete() will avoid firmware crashes or a direct panic as observed as ieee80211_vap_detach() will do most cleanup for us and get us into the correct state. The solution is not fully developed yet and one may not be able to create a new vap (lkpi_ic_vap_create may fail with error 17) afterwards. It is supposed to be a step towards more stability for now. Sponsored by: The FreeBSD Foundation PR: 269842 (cherry picked from commit dbf7691999abe501e0ebc0fe4d8d9e97718d3890) --- sys/compat/linuxkpi/common/src/linux_80211.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 54c7c5de6627..85965493e5ef 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2473,10 +2473,14 @@ lkpi_ic_vap_delete(struct ieee80211vap *vap) LKPI_80211_LHW_LVIF_LOCK(lhw); TAILQ_REMOVE(&lhw->lvif_head, lvif, lvif_entry); LKPI_80211_LHW_LVIF_UNLOCK(lhw); - lkpi_80211_mo_remove_interface(hw, vif); ieee80211_ratectl_deinit(vap); ieee80211_vap_detach(vap); + + IMPROVE("clear up other bits in this state"); + + lkpi_80211_mo_remove_interface(hw, vif); + mtx_destroy(&lvif->mtx); free(lvif, M_80211_VAP); } From nobody Wed Nov 29 16:38:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4c1WR6z52x83; Wed, 29 Nov 2023 16: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 4SgQ4b6PhXz3K66; Wed, 29 Nov 2023 16: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=1701275919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K9j95CVLHvRpDa6Tk3K+Xou8NcgRnCfUEJj9E3PCUTU=; b=uZYlK8P3qfZfEvC9zEr+WWTL7953CNglKMswS+4w/G52dsOfQAt0xkvkfu/1WCb68tMUI7 Mt459ZmZa6FoXR3A7wJD3Z2a22XPdFry6hn/AdepUfqeG+/h6gUs5zIjevYzlcTj8gG6av hQI6kvhzGQtVz3g1SP/4H8+0rJE+JB8CI7fgFN5OIM6itkHgm0Goz4PMKW+gKbOzN2cJQp VZ+IWvRpisC76lWOwoB0YuQ5seksKfj8bM8kfDRsQBurUDYEPAS1T5oytDcBsRguwtHHp0 iDiLya5Pj4XTJ89hdS+lzUX0jS49sjK+BETv+/5YGHk6pNg4jQKQlwFQb7maVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K9j95CVLHvRpDa6Tk3K+Xou8NcgRnCfUEJj9E3PCUTU=; b=ZauC7chAbwrO+LnDMTqjoNSYl7mhoGRLReOo4AjPp/61fMbgeDXA7R/yUfzqJG7+jM87/k g2t2zFBBnnI3HRBcU8czU1GAMh8cdhbfa5DoHIU2wqXnVErH119T3wOcutax+0mSc4Fp7X l1+dii6nB/9bBcsFJ4DLIyotsPF9AlBNddWKswpw4ZFrKJCaXj0uGK6MMRsjF9UwStwxkI turhF7xEgPOe7LjvPJgGUKLXS42NwoojOvFQLKbd7cN1BjpKSdLuNg2f8ZlFGngsPFyhZ3 YY3J7m00bvzoCS2QqT3KO/qVG9cvriEl0gthrlfBDfINR9sQLAB2Ce5/FgbL9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275919; a=rsa-sha256; cv=none; b=QyB48HJGG7FI6AUIUzVUIG4FTYmQh4VnFdJwTNlhZObYQkW6M1o9Pth+0pZ6KO/lLMs7Oq 5MWZ7eju+5FAc2L2u7WOKnd/38QpWhTGgehBhx3mnKYc6mioxV+xbK7U+syKNYL5CddHej gOb1G+EAqg6aGynnImb80nc3jbW8drVpkisdQhlAZ0vJMQVIbWy5p7Ar7oBrYTxoMg9thv ngcikkfLkP333pmTFdxJfe3In8w1XdfAZD/WALAs3HzZM6JFVtv0NOJFGojmsUJrIlBVlZ umHZK01O2PQmINVN2Q5Ra9SyAqMHq5C8kUNuEdqrHAjjyifhXZmWVw9yjxzB8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4b5RK3z1CXq; Wed, 29 Nov 2023 16: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 3ATGcdxK046444; Wed, 29 Nov 2023 16: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 3ATGcdai046441; Wed, 29 Nov 2023 16:38:39 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:39 GMT Message-Id: <202311291638.3ATGcdai046441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 94608b91e75f - stable/13 - net80211: improve ddb output for sta and rate List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 94608b91e75fe55d356fdf596074058afad43bd5 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=94608b91e75fe55d356fdf596074058afad43bd5 commit 94608b91e75fe55d356fdf596074058afad43bd5 Author: Bjoern A. Zeeb AuthorDate: 2023-10-02 13:53:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:09 +0000 net80211: improve ddb output for sta and rate Add more missing fields to the ddb output of sta (including spares so people will notice if they use them to adjust ddb as well). There are still more missing fields (some left as reminder in an uncompiled __notyet__ block). Add _db_show_rate() to print iv_rate as well optionally including function pointers. Sponsored by: The FreeBSD Foundation (cherry picked from commit 4ed35b7d1eb5dddfd04f574ac122651d532d2df9) --- sys/net80211/ieee80211_ddb.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index f34998ce1ade..ae6e20e09da4 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -48,6 +48,7 @@ #include #include +#include #ifdef IEEE80211_SUPPORT_TDMA #include #endif @@ -327,6 +328,31 @@ _db_show_sta(const struct ieee80211_node *ni) ni->ni_vht_pad1, ni->ni_vht_spare[0], ni->ni_vht_spare[1], ni->ni_vht_spare[2], ni->ni_vht_spare[3], ni->ni_vht_spare[4], ni->ni_vht_spare[5], ni->ni_vht_spare[6], ni->ni_vht_spare[7]); + + db_printf("\tni_tx_superg[] = {"); + for (i = 0; i < WME_NUM_TID; i++) + db_printf(" %p%s", ni->ni_tx_superg[i], (i == 0) ? "" : ","); + db_printf(" }\n"); + + db_printf("\tni_rctls = %p", ni->ni_rctls); + db_printf("\tni_drv_data = %p", ni->ni_drv_data); + db_printf("\n"); + + db_printf("\tni_spare[3] = { %#jx %#jx %#jx }", + ni->ni_spare[0], ni->ni_spare[1], ni->ni_spare[2]); + db_printf("\n"); + +#ifdef __notyet__ + struct ieee80211_psq ni_psq; /* power save queue */ + struct ieee80211_nodestats ni_stats; /* per-node statistics */ + + /* quiet time IE state for the given node */ + uint32_t ni_quiet_ie_set; /* Quiet time IE was seen */ + struct ieee80211_quiet_ie ni_quiet_ie; /* last seen quiet IE */ + + /* U-APSD */ + uint8_t ni_uapsd; /* U-APSD per-node flags matching WMM STA QoS Info field */ +#endif } #ifdef IEEE80211_SUPPORT_TDMA @@ -403,6 +429,31 @@ _db_show_scan(const struct ieee80211_scan_state *ss, int showprocs) db_printf("\n"); } +static void +_db_show_rate(const struct ieee80211_ratectl *rate, const void *rs, + const int showprocs) +{ + + db_printf("\tiv_rate %p", rate); + db_printf(" iv_rs %p", rs); + db_printf("\n"); + if (showprocs) { + db_printf("\t ir_name %s", rate->ir_name); + db_printf("\n"); + DB_PRINTSYM("\t ", "ir_attach", rate->ir_attach); + DB_PRINTSYM("\t ", "ir_detach", rate->ir_detach); + DB_PRINTSYM("\t ", "ir_init", rate->ir_init); + DB_PRINTSYM("\t ", "ir_deinit", rate->ir_deinit); + DB_PRINTSYM("\t ", "ir_node_init", rate->ir_node_init); + DB_PRINTSYM("\t ", "ir_node_deinit", rate->ir_node_deinit); + DB_PRINTSYM("\t ", "ir_rate", rate->ir_rate); + DB_PRINTSYM("\t ", "ir_tx_complete", rate->ir_tx_complete); + DB_PRINTSYM("\t ", "ir_tx_update", rate->ir_tx_update); + DB_PRINTSYM("\t ", "ir_setinterval", rate->ir_setinterval); + DB_PRINTSYM("\t ", "ir_node_stats", rate->ir_node_stats); + } +} + static void _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) { @@ -569,6 +620,8 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) db_printf(" lastnonerp %d", vap->iv_lastnonerp); db_printf(" lastnonht %d", vap->iv_lastnonht); db_printf("\n"); + if (vap->iv_rate != NULL) + _db_show_rate(vap->iv_rate, vap->iv_rs, showprocs); if (showprocs) { DB_PRINTSYM("\t", "iv_key_alloc", vap->iv_key_alloc); From nobody Wed Nov 29 16:38:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4d1BXjz52xF6; Wed, 29 Nov 2023 16: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 4SgQ4d0JDgz3KS0; Wed, 29 Nov 2023 16:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kOjZqi/akpekDhCbMVirN/ogG9a4cg1yNQC8opHiiV8=; b=P8XXMtBgaZZILI5xAzhaKRoKzsis+5BdF6xlpTsGCgkksme034tBTqE2uA/QGKEhEPh1pH 1V1IHaMNPZT4kz3KApMl4Dp9PxKgBqrH10cdp8arUWqwowQwThTzMLNQZx84vSdWmu3QTJ g880euxWvl6C+STGUMS8OYR31GerbWuPAsFDE/QwA3yWSn+Xe0or4Wxk/SDCPmycYonz/b DykHEs09u3cDxxJW2vxMvW0DviSUauPCqYJt8Bp1cprHydljngKCsomvqcs9vXrXMK3w7Z LeXtDim+peDxZkgMo6b/qhtOdxQAoTZDMv6+XuHDxxNCOhk17E6Twd2ZNe/3Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kOjZqi/akpekDhCbMVirN/ogG9a4cg1yNQC8opHiiV8=; b=jt+n9enHk3i7gxZitjn3wSqOm5PnYHbLzT5gCiM2myuYKC2yEWhhVsIS/qavV8AN7jHd1m wLutTiU3VUgp0o912x5rDezpR8UEOX+Vf3mRND7JTTfOcj5CL351K0lawkv8ljGcPNoGuJ YiWRB4WPeEV6scKmfa+m3ktgek7XeMwmKeSebvu7fw0TzzO/C+S0daae6B9VFGlcJTBoeF qmM7Yr67siAlTcjsT0aho+fUxukc7Afk2zcqKSq6209UquSkVI9My1QPx2cXSz7eoCv+MF 6+3NQktSBaHz/Aagi51Uv9b9FhDr22v87Wa+l1C01qsDrau4tY7TJJmEqTW2nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275921; a=rsa-sha256; cv=none; b=Ex6GIIbrlN/8WjknDdDdWiTbhD6wmCdJR3xeB7iftRKU2CutM+JLnfTKIrUpfR9uUK9NY/ AoAtotYABgs9VCtsF9igX02t0HZJwwUYkGuClUDiv+XQKAHjK49F6yrUx4odT/ceNzMOJQ UCeLIIxgs26YFUddJ7A4R7UQMx+MkmPk6dsvGHvPdmJHGzDyOWu9J1CPaVyKJ9CdkDjk7V 0CitVIykRkmua5o5RfM5NH7jXoW4qdEVd3/Cdo4+1x2/o5++A4RpI8imaBYqa/2BcekHs9 wsz2yhYU9hhTkeIhY18BXceUhLpovRzqWHIGrsrSubPiZDt9BbNuq1Dq4Dy8Yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4c6LZSz1CXr; Wed, 29 Nov 2023 16: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 3ATGceQa046498; Wed, 29 Nov 2023 16: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 3ATGcecH046495; Wed, 29 Nov 2023 16:38:40 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:40 GMT Message-Id: <202311291638.3ATGcecH046495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 357d45eefc9b - stable/13 - net80211 / drivers: remove public use of ieee80211_node_incref() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 357d45eefc9b0ab6c30afb5a364ab0cb66b905c1 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=357d45eefc9b0ab6c30afb5a364ab0cb66b905c1 commit 357d45eefc9b0ab6c30afb5a364ab0cb66b905c1 Author: Bjoern A. Zeeb AuthorDate: 2023-10-02 14:44:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:10 +0000 net80211 / drivers: remove public use of ieee80211_node_incref() ieee80211_node_incref() is the FreeBSD implementation of ieee80211_ref_node(). Not being interested in the node returned it was used as a shortcut in 3 drivers (ath, uath, wpi). Replace the call with the public KPI of ieee80211_ref_node() and ignore the result. This leaves us with the single internal call going ieee80211_ref_node() -> ieee80211_node_incref() and that should help increasing portability but also limiting the places to trace for node reference operations. Sponsored by: The FreeBSD Foundation (cherry picked from commit f156cd892b55c04a39fa06d1899e6e316de77f03) --- sys/dev/ath/if_ath_tx.c | 2 +- sys/dev/usb/wlan/if_uath.c | 2 +- sys/dev/wpi/if_wpi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/ath/if_ath_tx.c b/sys/dev/ath/if_ath_tx.c index 1fd3adef738e..69d0b5c00848 100644 --- a/sys/dev/ath/if_ath_tx.c +++ b/sys/dev/ath/if_ath_tx.c @@ -288,7 +288,7 @@ ath_txfrag_setup(struct ath_softc *sc, ath_bufhead *frags, ath_txfrag_cleanup(sc, frags, ni); break; } - ieee80211_node_incref(ni); + (void) ieee80211_ref_node(ni); TAILQ_INSERT_TAIL(frags, bf, bf_list); } ATH_TXBUF_UNLOCK(sc); diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c index be9354bbe41a..86c7eb6b2bdd 100644 --- a/sys/dev/usb/wlan/if_uath.c +++ b/sys/dev/usb/wlan/if_uath.c @@ -1657,7 +1657,7 @@ uath_txfrag_setup(struct uath_softc *sc, uath_datahead *frags, uath_txfrag_cleanup(sc, frags, ni); break; } - ieee80211_node_incref(ni); + (void) ieee80211_ref_node(ni); STAILQ_INSERT_TAIL(frags, bf, next); } diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c index bbff34ffc61e..93c5bf0a60fd 100644 --- a/sys/dev/wpi/if_wpi.c +++ b/sys/dev/wpi/if_wpi.c @@ -2769,7 +2769,7 @@ wpi_cmd2(struct wpi_softc *sc, struct wpi_buf *buf) ring->pending = 0; sc->sc_update_tx_ring(sc, ring); } else - ieee80211_node_incref(data->ni); + (void) ieee80211_ref_node(data->ni); end: DPRINTF(sc, WPI_DEBUG_TRACE, error ? TRACE_STR_END_ERR : TRACE_STR_END, __func__); From nobody Wed Nov 29 16:38:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4f23lxz52x16; Wed, 29 Nov 2023 16: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 4SgQ4f14jmz3KSS; Wed, 29 Nov 2023 16: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=1701275922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YZnJp/qwrQa2EcrtURDGvd1QfR26ecdaEyLagyp6PIs=; b=gCyllUSZD1Oh0G/48aKf8i8cVcVIozQrdDwOMxpzxnucwH9/+XqP2luXz/oDX741J6bDmj 6DoA0n5sQQ6lpbUFJHVuOf7p0ipaWgXKp16kNXiuMOOzPwjkOo+bHwuixosK3gyc4aMTYL vVuug4ya9ofWQBKESQQhBgaxHIqBg0OtJ1QBa7J0VuY9Lbt1AS71mtTGgv/rMK409fWk6S XuzbpW8fesfbvYpEy77O5Jmcx2ZbBM2sixa7HGTQH69edhthO0f1NDGafKCHtJYtb/SN6E +/U00YZ5RkHEnap474lGr6RHgKE5kDqB/6Nw0qj6uEdUwomOiUyrRWB25N1Ubg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YZnJp/qwrQa2EcrtURDGvd1QfR26ecdaEyLagyp6PIs=; b=OZFd5uj/XhCSWyhf13SFg584dnPk2tD4ptEUgjgSdPgIYQUnrrKzExtavQVIDy/yPcEHe0 E6YB8Il+U9Ks71zBzT7l1/B3J9TNGZrEzdT59aPEh22df0ZxcoCmA9RF9BTS5nAWoWQruv WxaGqTvSXtIpLXAI8Xyztn1PYdq1rumC3Z2IYnImPY8WewnmLRTuGCTc3XQWPi4g+xP43g t/YT80UZGB8hnoS6ldCP4s1b4vmPuu8prIeGRfoq5liiKk4hXQXKKHpEoL0hsLe1uA6Sj0 v6P4byOXwzzFhLNdiYW25rc9aEJ498mvc6cMOszjbYwjxmQ4aH1hNMD+yE2dKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275922; a=rsa-sha256; cv=none; b=J9C1Qpa49KDnogM9Wf+aJOdHVisLqv8ctHYPEZ9+utl/itfq/UL/lhOHrujc1uKXMpKh4c 1GDUmd+9Fb6fbcMZaoQSnujuZj2LcJzgHvbxVnphXlp99OuMAODHpi1o9Ywl1sa7/Zxckk CCYoJk7l0J0Tg2wBK8B2mhy6GSDg7qCv6sD5tTBKKt0rnivc2seDHly06FisRf42pmir28 u5BQ5s6o3uo8Yxj6lMbGx8yReWyb2aMBIClg2tU1hqQ9+6hPFMG1LWxiTCDqq1Ru0gMOFx 0XeKgSJw5NSRbZxYIIpCeYcbseq9S5qf7jQib8IonMby/qzZk2NR103lLabD1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4f03Q1z1Cb3; Wed, 29 Nov 2023 16:38: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 3ATGcfpc046546; Wed, 29 Nov 2023 16: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 3ATGcfCG046543; Wed, 29 Nov 2023 16:38:41 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:41 GMT Message-Id: <202311291638.3ATGcfCG046543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 745bba174efe - stable/13 - LinuxKPI: 802.11: fix re-creation of VAP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 745bba174efe9f6bb4efbeb9643046acd0f6f732 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=745bba174efe9f6bb4efbeb9643046acd0f6f732 commit 745bba174efe9f6bb4efbeb9643046acd0f6f732 Author: Bjoern A. Zeeb AuthorDate: 2023-10-03 21:14:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:10 +0000 LinuxKPI: 802.11: fix re-creation of VAP After dbf7691999abe (as indicated in that commit message) EEXISTS errors may be seen. From current investigation that is due to the single-VAP support in LinuxKPI 802.11 and the related calls to mo_start() and mo_stop() and them being disabled in ic_parent() currently. Calling mo_stop() in lkpi_ic_vap_delete() seems to fix the problem and new VAPs (wlan interfaces) can be created again after being destroyed. Fixes: dbf7691999abe ("improve lkpi_ic_vap_delete()") Sponsored by: The FreeBSD Foundation (cherry picked from commit 6c38c6b1b917957d420902213f318bf0153214f2) --- sys/compat/linuxkpi/common/src/linux_80211.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 85965493e5ef..0a673a313c1e 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2481,6 +2481,9 @@ lkpi_ic_vap_delete(struct ieee80211vap *vap) lkpi_80211_mo_remove_interface(hw, vif); + /* Single VAP, so we can do this here. */ + lkpi_80211_mo_stop(hw); + mtx_destroy(&lvif->mtx); free(lvif, M_80211_VAP); } From nobody Wed Nov 29 16:38:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4g2Th3z52xCB; Wed, 29 Nov 2023 16:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ4g1zclz3KQq; Wed, 29 Nov 2023 16:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y2RYJeQ2oAnO4eqpZBqp0pxI15QfigrTJN+tVjlZItw=; b=F3MYVpHJ+zDUq7YchDrsDltyhphoBiOblJXXX6JKFy6/y1bv/pvvfZ5h2yt2k9bMzgLwW7 JxIa3cTv748tqvzKa8QMwuhKpUij8I6BxmohCqlTjDkwyCgnrQtg1uHditWYwvARmiBR9u Hlf1WYtDLan7Zn2dW6KgqKBh4EL9qxtS0Y6lzPwH7hgakoYglDLySxokKFwhOT+L3doQUV E6aNIG9I+GQBXt/p4VPz/t9sdRCl/t2e9URAd7O9oEi+p8R6puGvxVPGdlua40vdEwKafe znPyOKUoG8o39rqRulfPaWLbrOX6AARqcr21Gvw12dkBi26g8MubEu2YARssSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y2RYJeQ2oAnO4eqpZBqp0pxI15QfigrTJN+tVjlZItw=; b=ZLpCfRb7KFmQPlW2eI30mZgJZeTU0jfY5lVxfUvHDn6hxXnweUghjP5iwltkmEbQRduqdP tCZRMsuIG+dZb7VcPd0yh4U/lsxygF3UHkTiA/5+uUFKtq3qRQsir9VXr6eFeOAUpHQXTH qmtSFio9yz6/ix8AK7mMDi7i9pQO4ypJfRnY0KUfizUz11h7oouudmZ2r30/wPLIs4pJKv l/nwxpwb0s+unINfi2IaDB8c/RdIDtD/ub6EDg4X6uvDGUv1SO4enE2bq7FXFKs6ld3CjF zm6iuJ7kadGNUVQpjE1Uwcg7pbLe9xDRUyMcPrwy/cDRjL6vvZ6y+ilBYm8cBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275923; a=rsa-sha256; cv=none; b=vbyu0RCvSXksY+hQlrsZuuDfq4rfe/T49OtUNiewydEB8SINrnwQ+uaJ4lexpAQiMKyDt5 5ntNJ/Nq5JZM2ojU9K5o69ETlsG4ntftd4+UdbUl6/TsPEYq3aUZGRPv0qAj/UQazsWh8C +ZyrxmWmm4bo1xDrVgo1loYAiuw2iDnO0oBion7kiLUkWIwaQXWImU2R6W17whsNUYX+5D j2IpHYhp/izhvs6Sd9isA51gD9vnhG9N+exgDYLnGy6dXSnqs86uZleXaAecw9Rj+e38dc SfkuvRVO7bLhCwogeSsnUfaKiLO/v4v8NQkcbMyPnviUTGz0XvOvG3zu7fcV2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4g15Gsz1C2K; Wed, 29 Nov 2023 16:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGchJj046601; Wed, 29 Nov 2023 16:38:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGchGe046598; Wed, 29 Nov 2023 16:38:43 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:43 GMT Message-Id: <202311291638.3ATGchGe046598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6b37fa3e1392 - stable/13 - rtw88: Use RF_CFGCH instead of hard coded 0x18 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b37fa3e13928424abe60b6abb79f2162bf0aeed Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6b37fa3e13928424abe60b6abb79f2162bf0aeed commit 6b37fa3e13928424abe60b6abb79f2162bf0aeed Author: Bjoern A. Zeeb AuthorDate: 2023-10-05 14:01:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:10 +0000 rtw88: Use RF_CFGCH instead of hard coded 0x18 While debugging some funky register reads of 0xaeaea from RF_CFGCH resulting in "rtw880: [TXGAPK] unknown channel 234!!" more of these reads came to my attention hidden by using the register index rather than the defined value. Make this more grep-able. (cherry picked from commit 4f3b2bba240b6e0603b5cbb47155fd8215bcbcb3) --- sys/contrib/dev/rtw88/rtw8822c.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/contrib/dev/rtw88/rtw8822c.c b/sys/contrib/dev/rtw88/rtw8822c.c index da58b9ca8e57..a2fda1b36e6c 100644 --- a/sys/contrib/dev/rtw88/rtw8822c.c +++ b/sys/contrib/dev/rtw88/rtw8822c.c @@ -2204,7 +2204,11 @@ static void rtw8822c_set_channel_rf(struct rtw_dev *rtwdev, u8 channel, u8 bw) u32 rf_reg18 = 0; u32 rf_rxbb = 0; +#if defined(__linux__) rf_reg18 = rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK); +#elif defined(__FreeBSD__) + rf_reg18 = rtw_read_rf(rtwdev, RF_PATH_A, RF_CFGCH, RFREG_MASK); +#endif rf_reg18 &= ~(RF18_BAND_MASK | RF18_CHANNEL_MASK | RF18_RFSI_MASK | RF18_BW_MASK); @@ -3277,7 +3281,11 @@ static void rtw8822c_dpk_information(struct rtw_dev *rtwdev) u32 reg; u8 band_shift; +#if defined(__linux__) reg = rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK); +#elif defined(__FreeBSD__) + reg = rtw_read_rf(rtwdev, RF_PATH_A, RF_CFGCH, RFREG_MASK); +#endif band_shift = FIELD_GET(BIT(16), reg); dpk_info->dpk_band = 1 << band_shift; @@ -4158,7 +4166,11 @@ static bool rtw8822c_dpk_reload(struct rtw_dev *rtwdev) dpk_info->is_reload = false; +#if defined(__linux__) channel = (u8)(rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK) & 0xff); +#elif defined(__FreeBSD__) + channel = (u8)(rtw_read_rf(rtwdev, RF_PATH_A, RF_CFGCH, RFREG_MASK) & 0xff); +#endif if (channel == dpk_info->dpk_ch) { rtw_dbg(rtwdev, RTW_DBG_RFK, From nobody Wed Nov 29 16:38:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4h44Llz52x5f; Wed, 29 Nov 2023 16:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ4h2jh6z3KTd; Wed, 29 Nov 2023 16:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xnzpMC1QOXEz+v7BmVxPoDpFr3H6szkTdUL2IGXvwX4=; b=LH0ztqvHegZvc1Ennft517IUUKA7Pv2KFuLEmR4kJo6qXLaN7UXj8VzzVL+N5UdQKlSbbG NEvxU4nzH0T9uvksGIumStl/l5gTAg2v9EDilaA4suGc7OIuvWiW3tojoX43qzIAEtequ2 WAstmIB1KnD3w35DpyPVTRioQYq6HoU7EBWCIl3MEb16DIdHJbyQiM2wR2GAn3JQlbAMO/ TirXjrU4MiGWgBC55z/OLmOts7Y24EhrXMZgMa3V/bvaHMAaBlpsk93ba5i4Tpf9lfaq5S qwyUaczf1P95UvawmEevH+v5Kkx1IffNUhd1saI4lhqJ/6d/SnqKaqFaIZwNkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xnzpMC1QOXEz+v7BmVxPoDpFr3H6szkTdUL2IGXvwX4=; b=GSnvckFJor3TfiRjY6eoiwk83alwxA0w7fPAgCdEtOYfa38ldI7GgflmTEusU08Ge0cgnU MhvZR435SroaIQH6nO6nYp6eZ8AzodPNvoEuyxu0uxMlfxMAjATt5xP3zmcJsPPkRmMprf SFp5jDn8tnz2Agcgxly++7eb+n3zbdH4vgFF3NBwEAbAhx5O65U9uHX1SqkOQBdHDh1S4f rKboyXJA/KLiPlaniJbLLzwp2GsnRbkeWg8fGmt4Edyl9lfaGVl+Ma+5J2n19Myi0mazFr XMBjsry4+XsqJj8wvN4JEnbGeU+4PS3QbKtahWZISihgTsg6aDYQeiegijWGtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275924; a=rsa-sha256; cv=none; b=NHmEqFTJZZY8uHj49GHB0RcAl7z0Ltaaof71pstK7TFlNl0ow2Xm6BnoYq2A7esnOCZ3+H PqtVWNYxeL0jTfjkiXK9inR3RxFV7cRR2Ezc5TAZpwQEvw3HN2UQJ6Je+YwmG2GcEJ3cj3 QRWHjskmYRsdUpw9M728dwIdYN49F76HMEPb6QPRCaNog8wrdF+0BDAByGYx3JswsSa6Dh 9a/30JDQlzwjBuTJ5tA1xXf8QdnokU2zlnjidYpgzEz8IxQDIDxLXTDx3z6nmdrN1nafxG jg/lOuOL+huQZxT9alEcIsEGG/M8D7Q7YWt4/4ORDjn/Bx3g/CAuJCgZmSUHcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4h1qc7z1C7b; Wed, 29 Nov 2023 16:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGciXW046654; Wed, 29 Nov 2023 16:38:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcinu046651; Wed, 29 Nov 2023 16:38:44 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:44 GMT Message-Id: <202311291638.3ATGcinu046651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 60e471befc83 - stable/13 - LinuxKPI: 802.11: hide txq debugging behind checks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 60e471befc83a5e2203b1d45326a5d9ac7ff91d5 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=60e471befc83a5e2203b1d45326a5d9ac7ff91d5 commit 60e471befc83a5e2203b1d45326a5d9ac7ff91d5 Author: Bjoern A. Zeeb AuthorDate: 2023-10-04 20:30:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:10 +0000 LinuxKPI: 802.11: hide txq debugging behind checks Two txq debug messages were left unconditionally. Hide them behind ifdef/if() condition checks for selective debugging only. Sponsored by: The FreeBSD Foundation (cherry picked from commit 0d2cb6a6ecde3b271ede59d77801cb43a8804688) --- sys/compat/linuxkpi/common/src/linux_80211.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 0a673a313c1e..b3aec1e712bd 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -4911,15 +4911,18 @@ linuxkpi_ieee80211_stop_queue(struct ieee80211_hw *hw, int qnum) for (ac = 0; ac < ac_count; ac++) { IMPROVE_TXQ("LOCKING"); if (qnum == vif->hw_queue[ac]) { +#ifdef LINUXKPI_DEBUG_80211 /* * For now log this to better understand * how this is supposed to work. */ - if (lvif->hw_queue_stopped[ac]) + if (lvif->hw_queue_stopped[ac] && + (linuxkpi_debug_80211 & D80211_IMPROVE_TXQ) != 0) ic_printf(lhw->ic, "%s:%d: lhw %p hw %p " "lvif %p vif %p ac %d qnum %d already " "stopped\n", __func__, __LINE__, lhw, hw, lvif, vif, ac, qnum); +#endif lvif->hw_queue_stopped[ac] = true; } } @@ -4966,15 +4969,18 @@ lkpi_ieee80211_wake_queues(struct ieee80211_hw *hw, int hwq) /* XXX-BZ what about software scan? */ +#ifdef LINUXKPI_DEBUG_80211 /* * For now log this to better understand * how this is supposed to work. */ - if (!lvif->hw_queue_stopped[ac]) + if (!lvif->hw_queue_stopped[ac] && + (linuxkpi_debug_80211 & D80211_IMPROVE_TXQ) != 0) ic_printf(lhw->ic, "%s:%d: lhw %p hw %p " "lvif %p vif %p ac %d hw_q not stopped\n", __func__, __LINE__, lhw, hw, lvif, vif, ac); +#endif lvif->hw_queue_stopped[ac] = false; LKPI_80211_LVIF_LOCK(lvif); From nobody Wed Nov 29 16:38:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4j3qRyz52x1F; Wed, 29 Nov 2023 16:38: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 4SgQ4j3KvSz3KFr; Wed, 29 Nov 2023 16:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G+8uQdpYwb6pAvzSzlAnzJenXgYy/h6O9rY7EtFKUgM=; b=Xog/WqJM+az2pgsl0frJJdTRodC3dtNhd3T/acfWQsSuFUQVk6AH+y+ja1QYIKVKgajkGL v0Cdqrfltsn0uLJV6yjvqPi2uEdSgfIVW7sX+mU3b9/xTTcpJ8kU04sEVJzrVs0wUi/nu8 0yLiKVUVWUwBc64PmZq95Bz9Cr81dWsqgjOTR1SC8HdRSehcdCY6MwJ2kehHO3oT/QGDRy JSmfF1Y9QadCelrKP5GfuERVpSJOTWAK87fkxZa2rpOi/6NkUNbQlr43n0cI62VOwnAyGM zdrct8UvhXqYZBHzDvKm5vNYeC/yAdB67eUSwF6aXZgVZyQACuRPS3PI6e4t+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G+8uQdpYwb6pAvzSzlAnzJenXgYy/h6O9rY7EtFKUgM=; b=ZOuFLfzQvChZYpeAS9HHIPuPLLL9OujJ2Wbg98lE4PDqXnON3T0P6EDGxcZJDHJVCGmBh5 lFx5E/aqSe920DDDIqM/wC+uCaNGvZOTQ0h3YZPA1JSwSQ1jv0YVPiyoN1tFxNhWiyOvgS jtRZCJW90jgUk+4xnituaZz1ylYgwj9Be41yP9cYl540Je4uEBg4umcQkMgCfiT3Q9hmhd uwNS3hb9WCeONjMpJhFKRjBIPjmtXWEVQnTVXBc4Pbftq1+mWflVjCQWIYj8ffx36EVajq +MMmzxAhy3ftpFLVbTeQBI32Y5aKgBpdCWWv9KVqz77mHV/ZdcrUno5ZsIezKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275925; a=rsa-sha256; cv=none; b=RiMJCpIPOLGAD0aJyrKmhWnjiaE9xBaCdyleje68LCmmYTLhS4L36O4Dxa/t88q1Fz9UDc 2VhVUbPsNWgxlk9RQJcVRJ8FqY5NUg/NXXiZuQVnmzsBHNY959UeqiO3cyDaYYQUeA3gDN NJtHCNT/UurXkqx8FytsHZf0j57SZW4ntEyCT8+c9aUMq0bmfo+pry1LDXs1rWvqV/+rCR j92LJEuwc1Fz3jJ/t0bwpRbzVFrq0s/9Ikua3lckQhYFYgKubfnDrmqb6FqeQxa9q76RD6 +vorngE/mXK7ZUjXWLSoTPbp3WCHxLraTdr4Auiuca/dHBowZiu3O7lGdR0kPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4j2RL9z1C4B; Wed, 29 Nov 2023 16:38: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 3ATGcjVv046699; Wed, 29 Nov 2023 16:38:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcjMj046696; Wed, 29 Nov 2023 16:38:45 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:45 GMT Message-Id: <202311291638.3ATGcjMj046696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6031b8fd03fa - stable/13 - net80211: MFC _debrefcnt_used List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6031b8fd03fa67851b8e73c9bde8f619fe432f56 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6031b8fd03fa67851b8e73c9bde8f619fe432f56 commit 6031b8fd03fa67851b8e73c9bde8f619fe432f56 Author: Bjoern A. Zeeb AuthorDate: 2023-11-29 01:05:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:10 +0000 net80211: MFC _debrefcnt_used While 4a8e4d15465cbf6f1bc4c6a09f50f97ae2d5bd7d (fix IEEE80211_DEBUG_REFCNT builds) covers more parts, we cannot MFC all due to KPI/KBI stability. We only pick the conditional define of __debrefcnt_used in order to allow commits following the original one to be MFCed more easily. Sponsored by: The FreeBSD Foundation (cherry picked from commit 4a8e4d15465cbf6f1bc4c6a09f50f97ae2d5bd7d) --- sys/net80211/ieee80211_node.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 9d80630a6076..5ac611de9a39 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -57,6 +57,12 @@ #include +#ifdef IEEE80211_DEBUG_REFCNT +#define __debrefcnt_used +#else +#define __debrefcnt_used __unused +#endif + /* * IEEE80211_NODE_HASHSIZE must be a power of 2. */ From nobody Wed Nov 29 16:38:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4k5cthz52x8G; Wed, 29 Nov 2023 16:38: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 4SgQ4k4TZDz3Kfb; Wed, 29 Nov 2023 16:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UdjMowpBGqrZH9M9MtYDU7ihvg0SMs4VGJSahspM2zI=; b=HjeowpKlQMI1LdyLGoQ/12becl80EXQZkJMtKU/nWvyNVgYGifZysHmc3qmbrga9mfby0O yNEhOdqkveWlK1wwzPapi2ZdkQdzVlh9DpS5XM9M/nvlARM+QKRnHKOuOa6g15jXX0PmAx xqDepqPzLIAR6E5rMH6cToKyzn9FRRDrpF1q79Jag755EQpJruuMRviq1PLro+nrXarW1L OqFSA/C8tvLnxLRZdOn9SyxjcmGhiye/MvgmYonhevQPLMxLCCcFD7vsoKf0A1Kg5glGKU 8VUB2ZOKediaEF5j2DK2U1IJ9FY088SJiHc5iiCKz+BwhF/ZoVMuDheKI+SBjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UdjMowpBGqrZH9M9MtYDU7ihvg0SMs4VGJSahspM2zI=; b=tPBPuLXybgxrW/mX4pSs2h40VjVWzL+OqOEz5acxxUqamS1IqAf2SFSwmb4cCvxZjV2dcn jYWFAYqNsLFPcmiux/m6GQbVWskLhUrxAvY9WpJptOZ15OhqHlyaxLb7l27u4F4xSLuon9 152ckTlK2wsp9BPCYpCsUjtgzgUQ4PA6F5P3Pp927RbeDqxpeVF5RFYqxem1GLzRtECw70 qvoRD6CgdIazY+m5ST71cQZrh7yVFo9G2+JrD3Zw5kflDAT3hRMQT2FRNdjsJXuuSX0vOA fXU0gD21ub3jy1J3o7a08c0/8efnn3dAz8k75sQnWLwvrrvM6XcDYcVM9Dm3PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275926; a=rsa-sha256; cv=none; b=SdXPCZvZDJvJQHo6G61LiT0SnCrABztqevR3QvvAaD9VMjQZfQ5tw6tVAXLRf3zhIPfXOt L2wszfSmk1TB3+G0dGEILCJG3lp9h4C1uXvsAo9FZI3OnPpdv6uX5YIwMvkrDXSSdzaDp+ PQK4TGELaoB9tHIViR/AY84vXdYyKbG+J1ZLFqFLE6SuUiUIMjjMnrZl/c+ikwPg+Wt7o/ CRb0/9hG5+y5uYeBsSgRXIO5kTfRZve8xxxXLjjPiiQzEOGd/q4fpRxhl9bGn5roIQwJhe wHemAEWPLK/Hw6l6MyXEqXKXhMa9EQPxJXMzewBDWTVpPv0Us2xSFHLMz5x1tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4k3XvQz1CgV; Wed, 29 Nov 2023 16:38: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 3ATGckNe046750; Wed, 29 Nov 2023 16:38:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGck3h046747; Wed, 29 Nov 2023 16:38:46 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:46 GMT Message-Id: <202311291638.3ATGck3h046747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 848f836a8b8c - stable/13 - net80211: pass __func__, __LINE__ also to ieee80211_alloc_node() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 848f836a8b8ccb5a190c362fe864f814906d5836 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=848f836a8b8ccb5a190c362fe864f814906d5836 commit 848f836a8b8ccb5a190c362fe864f814906d5836 Author: Bjoern A. Zeeb AuthorDate: 2023-10-06 10:38:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:10 +0000 net80211: pass __func__, __LINE__ also to ieee80211_alloc_node() Pass caller information to ieee80211_alloc_node() so that in case IEEE80211_DEBUG_REFCNT is compiled in we can (better) track references, in this case the initial ieee80211_node_initref(). Sponsored by: The FreeBSD Foundation (cherry picked from commit 3a11944bca0f07079a61f10468b704589c52a76f) --- sys/net80211/ieee80211_node.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 5ac611de9a39..b91881a15bc8 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -82,6 +82,9 @@ CTASSERT((IEEE80211_NODE_HASHSIZE & (IEEE80211_NODE_HASHSIZE-1)) == 0); static int ieee80211_sta_join1(struct ieee80211_node *); +static struct ieee80211_node *ieee80211_alloc_node( + struct ieee80211_node_table *, struct ieee80211vap *, + const uint8_t macaddr[IEEE80211_ADDR_LEN], const char *, int); static struct ieee80211_node *node_alloc(struct ieee80211vap *, const uint8_t [IEEE80211_ADDR_LEN]); static int node_init(struct ieee80211_node *); @@ -345,7 +348,8 @@ ieee80211_create_ibss(struct ieee80211vap* vap, struct ieee80211_channel *chan) ieee80211_channel_type_char(chan), chan->ic_flags); - ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->iv_myaddr); + ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->iv_myaddr, + __func__, __LINE__); if (ni == NULL) { /* XXX recovery? */ return; @@ -455,7 +459,8 @@ ieee80211_reset_bss(struct ieee80211vap *vap) /* XXX multi-bss: wrong */ ieee80211_vap_reset_erp(vap); - ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->iv_myaddr); + ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->iv_myaddr, + __func__, __LINE__); KASSERT(ni != NULL, ("unable to setup initial BSS node")); obss = vap->iv_update_bss(vap, ieee80211_ref_node(ni)); if (obss != NULL) { @@ -918,7 +923,8 @@ ieee80211_sta_join(struct ieee80211vap *vap, struct ieee80211_channel *chan, struct ieee80211_node *ni; int do_ht = 0; - ni = ieee80211_alloc_node(&ic->ic_sta, vap, se->se_macaddr); + ni = ieee80211_alloc_node(&ic->ic_sta, vap, se->se_macaddr, + __func__, __LINE__); if (ni == NULL) { /* XXX msg */ return 0; @@ -1398,7 +1404,8 @@ ieee80211_del_node_nt(struct ieee80211_node_table *nt, struct ieee80211_node * ieee80211_alloc_node(struct ieee80211_node_table *nt, - struct ieee80211vap *vap, const uint8_t macaddr[IEEE80211_ADDR_LEN]) + struct ieee80211vap *vap, const uint8_t macaddr[IEEE80211_ADDR_LEN], + const char *func __debrefcnt_used, int line __debrefcnt_used) { struct ieee80211com *ic = nt->nt_ic; struct ieee80211_node *ni; @@ -1415,6 +1422,11 @@ ieee80211_alloc_node(struct ieee80211_node_table *nt, IEEE80211_ADDR_COPY(ni->ni_macaddr, macaddr); ieee80211_node_initref(ni); /* mark referenced */ +#ifdef IEEE80211_DEBUG_REFCNT + IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, + "%s (%s:%u) %p<%s> refcnt %d\n", __func__, func, line, ni, + ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)); +#endif ni->ni_chan = IEEE80211_CHAN_ANYC; ni->ni_authmode = IEEE80211_AUTH_OPEN; ni->ni_txpower = ic->ic_txpowlimit; /* max power */ @@ -1477,6 +1489,12 @@ ieee80211_tmp_node(struct ieee80211vap *vap, IEEE80211_ADDR_COPY(ni->ni_macaddr, macaddr); IEEE80211_ADDR_COPY(ni->ni_bssid, bss->ni_bssid); ieee80211_node_initref(ni); /* mark referenced */ +#ifdef IEEE80211_DEBUG_REFCNT + /* Only one caller so we skip func/line passing into the func. */ + IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, + "%s (%s:%u) %p<%s> refcnt %d\n", __func__, "", -1, ni, + ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)); +#endif /* NB: required by ieee80211_fix_rate */ ieee80211_node_set_chan(ni, bss->ni_chan); ieee80211_crypto_resetkey(vap, &ni->ni_ucastkey, @@ -1510,7 +1528,7 @@ ieee80211_dup_bss(struct ieee80211vap *vap, struct ieee80211com *ic = vap->iv_ic; struct ieee80211_node *ni; - ni = ieee80211_alloc_node(&ic->ic_sta, vap, macaddr); + ni = ieee80211_alloc_node(&ic->ic_sta, vap, macaddr, __func__, __LINE__); if (ni != NULL) { struct ieee80211_node *bss = vap->iv_bss; /* @@ -1538,7 +1556,7 @@ ieee80211_node_create_wds(struct ieee80211vap *vap, struct ieee80211_node *ni; /* XXX check if node already in sta table? */ - ni = ieee80211_alloc_node(&ic->ic_sta, vap, bssid); + ni = ieee80211_alloc_node(&ic->ic_sta, vap, bssid, __func__, __LINE__); if (ni != NULL) { ni->ni_wdsvap = vap; IEEE80211_ADDR_COPY(ni->ni_bssid, bssid); From nobody Wed Nov 29 16:38:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4l602Wz52x5j; Wed, 29 Nov 2023 16:38: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 4SgQ4l5Xssz3Kcp; Wed, 29 Nov 2023 16:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9zip6/yHIMwWf3tpOeg5pjAWD0gY8Qs8iJwz1d6nVjk=; b=QPDe5QnmAgAtafqmDDY2KwK6Hw3WVGJQB0+S10cIysdNgxy+ThpThqaYzQdeLZM9waZgeH ul1DPwU9gQJZ2x9Aa0pddzFv+rxUmqsPYBJAXWgjPQW07f1zu1Vi493Csn8gwsMR8RRYWp Aiv4P7xIzp2fQ54LCeXSsVRLQ8ihPSTfNwhxRrxcW7PilUdcdkep4U1Gi1We56aW82uubf wozh3rzT4Vd+4olHYSZQo9mL9LSzF4uCMvzzVXNxUmdBJvbMjK8oOt3eR5rnOiCagtWmvA 1uezUBdZlyTXHvfW+yv4i3BTWyodfjVlzwwY1MHtnXLyUnhQx5CwUbGdyrSOzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9zip6/yHIMwWf3tpOeg5pjAWD0gY8Qs8iJwz1d6nVjk=; b=MRVbku0H3fv3aOWXQoFjZhIVdL85BHfAa0EXh23EUflECjYsrfF3VoYSO9NwMokKvmbsAm G5uh0rafklt8PCU8rz0zWpsr4OYaLzEdx30IIoyNlrudVGw7bYclEYlL4kypRF74rItzbC Jfq/TNSf46RiSpbN8E5fb4rBIUqTs4BoPqyUvu95ckfJ58VutxeQOulbRORl5a5vXy78XY +yG9WBBeMscr4itMsefCXb9+svakKjagQvy17NpZkXbqwrF5P1xt/AiRNHJWX3IKd2aS8j hBC5PpDeNRJxTVuQ0on36QwcdZg5PnnVPB36my5FpVyOVdCVlMhupMofmrmZlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275927; a=rsa-sha256; cv=none; b=MsvT72PKOyA0YllKgICuuCFcIO8spAO6Ss/Y3TQb5Jyi2+aa26RHnDgCPEilghGT+lmx/7 z/Zeolr1yNFRK5FBkHraSI51jNolfcnw0O7W890uP4o4joRks+2zAdMmMULEQDi34H0OqC rWS5eKFJ3k3TgpID5NOqrlWewizvl4E6DsakPKGGmlT7yybWgXd45FXc3L1OiOvACWo4Zf dP00iQUhdA2KOVOgHnevhkgfesVCkvXStp/mTxPzPmp+seyE7q4B7roSRo8qm8H8UAG++z zvkmk+tvDXWRguTaBb8IUxMu232jIvwnFFjxIknSQR2RAtdlgETtCq8iGydQ7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4l4c1vz1CgW; Wed, 29 Nov 2023 16:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGcl6J046793; Wed, 29 Nov 2023 16:38:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGclQk046790; Wed, 29 Nov 2023 16:38:47 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:47 GMT Message-Id: <202311291638.3ATGclQk046790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 2f8b5e1af04a - stable/13 - net80211: make ieee80211_alloc_node() private List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2f8b5e1af04a948b1d00e70196b38867e46a6157 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2f8b5e1af04a948b1d00e70196b38867e46a6157 commit 2f8b5e1af04a948b1d00e70196b38867e46a6157 Author: Bjoern A. Zeeb AuthorDate: 2023-10-02 13:57:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:10 +0000 net80211: make ieee80211_alloc_node() private Looking through the allocation/free and reference cycle of nodes we have a few (publicly) (almost) unused macros and functions. Start making them private and reducing the amount of entry paths to the same/similar functionality. First is to make ieee80211_alloc_node() static as it is nowhere used in the tree outside this file. Sponsored by: The FreeBSD Foundation (cherry picked from commit db195a523f9bbeb111b621d2c2c7a46d8b921631) --- sys/net80211/ieee80211_node.c | 2 +- sys/net80211/ieee80211_node.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index b91881a15bc8..a44e19f68e7f 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1402,7 +1402,7 @@ ieee80211_del_node_nt(struct ieee80211_node_table *nt, ni->ni_table = NULL; } -struct ieee80211_node * +static struct ieee80211_node * ieee80211_alloc_node(struct ieee80211_node_table *nt, struct ieee80211vap *vap, const uint8_t macaddr[IEEE80211_ADDR_LEN], const char *func __debrefcnt_used, int line __debrefcnt_used) diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index 10599c82c126..0ca7197ab534 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -395,9 +395,6 @@ struct ieee80211_node_table { int nt_inact_init; /* initial node inact setting */ }; -struct ieee80211_node *ieee80211_alloc_node(struct ieee80211_node_table *, - struct ieee80211vap *, - const uint8_t macaddr[IEEE80211_ADDR_LEN]); struct ieee80211_node *ieee80211_tmp_node(struct ieee80211vap *, const uint8_t macaddr[IEEE80211_ADDR_LEN]); struct ieee80211_node *ieee80211_dup_bss(struct ieee80211vap *, From nobody Wed Nov 29 16:38:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4n2t56z52xFN; Wed, 29 Nov 2023 16:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ4m6mG7z3KsN; Wed, 29 Nov 2023 16:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=52ODhGKiwsiL7dsPlZSgfHWok4SZgXoOie9qj1C71YY=; b=v04yEiSCi4KGQjexMyGuD61/NxT4XxAP3Avm8C4tmU8CLwaX9+B6fdYeK7n/Fl0enTRk7g yC3oCJj9t+8cyC/JwjO/nAMctfAJiiMrKe+NRfAFfcb0Czy4AiF9ZJrlQ+F/U0eTqyzRkq CpuPlsrdPYiX2vh85koEk8T3Vms5QM1EDtw4FQdCBsYbOZqMipn+xmnosHmhSvL/U1Yrz+ rUpjKCmdG4VEh1ELPqZyKLfAW/oZDooaz34m2Frf4hHkPfZ9TSDiSdsFjGsE4g3bR5GIlE lJGNvpJpUbojTiLm3xsoyUQ9XrHN5Fvh21rz3LLcVFHpTyLtfkTmu2xX8xZKRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=52ODhGKiwsiL7dsPlZSgfHWok4SZgXoOie9qj1C71YY=; b=RMW7pA8B/U5cr6FngG2i6A/sn41/7H1DURO+idExKdxg4qdR9Lcc2Mc9kfSp7DuvWihmYG d88uE61EKUXfdoxcAx6GWrdKa+GZEsRoYdArIi+yqBktTNVk34uGYOUwfzNe5pfjvN2o3q MtCENxAihBo4m3+GGro2DOkx9Fba599hYCpKuUORdOydPE00R3oGDHnUAUojIvOQwMEXe+ FUQUDyUFzbrshjJLMYN78HIxRssg7hTY+ilI7z19djsJc13gMaevLkMa/6xRXTKWlMjFXb ag9MsAayDjTmzrj7IScktumSkn4U01I9dHDnF7KZyv2S7VaNK49OxWjCXxnvBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275929; a=rsa-sha256; cv=none; b=D0AfvungrGM8VAiMSDWJFpy4xDx6NoHXrP0xh0494i/qTq7nsn3YEtPunjKv5mYxIkNxPf G8ORzQQJyaETtD79CHecqpu+D4e6o8n3VPJMIvOSmU2BmFwISpo6XhUvMCbtDVCBB31S+7 3+Gc5MxYl8uNfCqbnxW9GGlFq3mSm7WSjJ0F5CG5TgB7oakhPZOegaq6RJ5UwmwpreFYUM qsjbYUyl/9BV66eG/7rfxeAdhmAyXOxMTjjuXZR/JMXN5tFqjbZw6duJX9qrcwVVWdUeul Gny+Vd+1TMn7Zsr+hPltR4euoGBev7pNJbQPKZQ5PIIt3ObmPzcW7GGteRq/sQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4m5t4kz1C7c; Wed, 29 Nov 2023 16:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGcmE6046842; Wed, 29 Nov 2023 16:38:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcmma046839; Wed, 29 Nov 2023 16:38:48 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:48 GMT Message-Id: <202311291638.3ATGcmma046839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 2706935c2e46 - stable/13 - LinuxKPI: 802.11: add unconditional error reporting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2706935c2e4661c7e934ea940685cd9ffc93c058 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2706935c2e4661c7e934ea940685cd9ffc93c058 commit 2706935c2e4661c7e934ea940685cd9ffc93c058 Author: Bjoern A. Zeeb AuthorDate: 2023-10-09 19:11:50 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:11 +0000 LinuxKPI: 802.11: add unconditional error reporting Multiple reports have shown missed state transitions in net80211 without major cause obvious (or with a txq warning in iwlwifi). In order to better track down potential problems add unconditional ic_printf calls to any case in the lkpi state machine compat code which would let us return with an error in the hope that it helps us to catch the actual problems. Also remove the debug conditions from ieee80211_{beacon,connection}_loss which can also cause state transitions to have the ic_printf all the time there too. Sponsored by: The FreeBSD Foundation (cherry picked from commit 018d93ece16bd33077021383940d0da5121f0691) --- sys/compat/linuxkpi/common/src/linux_80211.c | 84 +++++++++++++++++++++------- 1 file changed, 64 insertions(+), 20 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index b3aec1e712bd..da88a0e7c150 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1012,6 +1012,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int vif->bss_conf.chandef.center_freq2 = conf->def.center_freq2; } else { + ic_printf(vap->iv_ic, "%s:%d: mo_add_chanctx " + "failed: %d\n", __func__, __LINE__, error); goto out; } @@ -1024,6 +1026,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int if (error == EOPNOTSUPP) error = 0; if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_assign_vif_chanctx " + "failed: %d\n", __func__, __LINE__, error); lkpi_80211_mo_remove_chanctx(hw, conf); lchanctx = CHANCTX_CONF_TO_LCHANCTX(conf); free(lchanctx, M_LKPI80211); @@ -1049,6 +1053,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int lsta = lkpi_lsta_alloc(vap, ni->ni_macaddr, hw, ni); if (lsta == NULL) { error = ENOMEM; + ic_printf(vap->iv_ic, "%s:%d: lkpi_lsta_alloc " + "failed: %d\n", __func__, __LINE__, error); goto out; } lsta->ni = ieee80211_ref_node(ni); @@ -1068,6 +1074,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NONE); if (error != 0) { IMPROVE("do we need to undo the chan ctx?"); + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NONE) " + "failed: %d\n", __func__, __LINE__, error); goto out; } #if 0 @@ -1169,6 +1177,8 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NOTEXIST); if (error != 0) { IMPROVE("do we need to undo the chan ctx?"); + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NOTEXIST) " + "failed: %d\n", __func__, __LINE__, error); goto out; } #if 0 @@ -1247,8 +1257,11 @@ lkpi_sta_auth_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, in KASSERT(lsta->state == IEEE80211_STA_NONE, ("%s: lsta %p state not " "NONE: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_AUTH); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(AUTH) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } /* End mgd_complete_tx. */ if (lsta->in_mgd) { @@ -1386,8 +1399,11 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i /* Call iv_newstate first so we get potential DISASSOC packet out. */ error = lvif->iv_newstate(vap, nstate, arg); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: iv_newstate(%p, %d, %d) " + "failed: %d\n", __func__, __LINE__, vap, nstate, arg, error); goto outni; + } IEEE80211_UNLOCK(vap->iv_ic); LKPI_80211_LHW_LOCK(lhw); @@ -1421,8 +1437,11 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not " "AUTH: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NONE); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NONE) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1442,6 +1461,8 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NOTEXIST); if (error != 0) { IMPROVE("do we need to undo the chan ctx?"); + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NOTEXIST) " + "failed: %d\n", __func__, __LINE__, error); goto out; } @@ -1559,8 +1580,11 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int sta->wme = true; #endif error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_ASSOC); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(ASSOC) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } IMPROVE("wme / conf_tx [all]"); @@ -1634,6 +1658,8 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_AUTHORIZED); if (error != 0) { IMPROVE("undo some changes?"); + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(AUTHORIZED) " + "failed: %d\n", __func__, __LINE__, error); goto out; } @@ -1716,8 +1742,11 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* Call iv_newstate first so we get potential DISASSOC packet out. */ error = lvif->iv_newstate(vap, nstate, arg); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: iv_newstate(%p, %d, %d) " + "failed: %d\n", __func__, __LINE__, vap, nstate, arg, error); goto outni; + } IEEE80211_UNLOCK(vap->iv_ic); LKPI_80211_LHW_LOCK(lhw); @@ -1753,8 +1782,11 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int KASSERT(lsta->state == IEEE80211_STA_AUTHORIZED, ("%s: lsta %p state not " "AUTHORIZED: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_ASSOC); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(ASSOC) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1763,8 +1795,11 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int KASSERT(lsta->state == IEEE80211_STA_ASSOC, ("%s: lsta %p state not " "ASSOC: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_AUTH); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(AUTH) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1829,8 +1864,11 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* Call iv_newstate first so we get potential DISASSOC packet out. */ error = lvif->iv_newstate(vap, nstate, arg); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: iv_newstate(%p, %d, %d) " + "failed: %d\n", __func__, __LINE__, vap, nstate, arg, error); goto outni; + } IEEE80211_UNLOCK(vap->iv_ic); LKPI_80211_LHW_LOCK(lhw); @@ -1864,8 +1902,11 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int KASSERT(lsta->state == IEEE80211_STA_AUTHORIZED, ("%s: lsta %p state not " "AUTHORIZED: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_ASSOC); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(ASSOC) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1874,8 +1915,11 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int KASSERT(lsta->state == IEEE80211_STA_ASSOC, ("%s: lsta %p state not " "ASSOC: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_AUTH); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(AUTH) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1884,8 +1928,11 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not " "AUTH: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NONE); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NONE) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1903,6 +1950,8 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NOTEXIST); if (error != 0) { IMPROVE("do we need to undo the chan ctx?"); + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NOTEXIST) " + "failed: %d\n", __func__, __LINE__, error); goto out; } @@ -4859,10 +4908,8 @@ linuxkpi_ieee80211_connection_loss(struct ieee80211_vif *vif) nstate = IEEE80211_S_INIT; arg = 0; /* Not a valid reason. */ -#ifdef LINUXKPI_DEBUG_80211 - if (linuxkpi_debug_80211 & D80211_TRACE) - ic_printf(vap->iv_ic, "%s: vif %p\n", __func__, vif); -#endif + ic_printf(vap->iv_ic, "%s: vif %p vap %p state %s\n", __func__, + vif, vap, ieee80211_state_name[vap->iv_state]); ieee80211_new_state(vap, nstate, arg); } @@ -4875,11 +4922,8 @@ linuxkpi_ieee80211_beacon_loss(struct ieee80211_vif *vif) lvif = VIF_TO_LVIF(vif); vap = LVIF_TO_VAP(lvif); -#ifdef LINUXKPI_DEBUG_80211 - if (linuxkpi_debug_80211 & D80211_TRACE || vap->iv_state != IEEE80211_S_RUN) - ic_printf(vap->iv_ic, "%s: vif %p vap %p state %s\n", __func__, - vif, vap, ieee80211_state_name[vap->iv_state]); -#endif + ic_printf(vap->iv_ic, "%s: vif %p vap %p state %s\n", __func__, + vif, vap, ieee80211_state_name[vap->iv_state]); ieee80211_beacon_miss(vap->iv_ic); } From nobody Wed Nov 29 16:38:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4p3bXDz52wyH; Wed, 29 Nov 2023 16:38: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 4SgQ4p0xCxz3KqP; Wed, 29 Nov 2023 16:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uLizK+ErfDioiE2ix+CIIKh0Fwi6cq4L+1j119Rb1CM=; b=PZgh0eVZqNj7pLldEBIcbFFAY/wdQgPANzYP6HTxraMxJ2zjBsbY0aYHzCrUXgmDDZD/6j 1OXafYwzorzhzK3Ko/B37fcx27NRr93wSgXO2hQf/al6Va6oNKStCsnQMKOfmeNy5elFvh 6f0s41gAe6bNpYpAOqwgyq6tQIXnZK6o49OD8vRx8bgRR5t7EOYzI8QPyRTS4eZtPm0qTB Bghgo7fYPEYAAAd3WGrG/ZsCR8GI78QvokCl9lsJQFp0Hu12evaKhSEGcURXbPHJR7bJQf jcf/wwOOqu7vORJsEblWPP2qoi1ZSk1OJzgW79a5/xc2dd83hDEftOM3sjolaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uLizK+ErfDioiE2ix+CIIKh0Fwi6cq4L+1j119Rb1CM=; b=QCWBC6EsC8V8m4WEIYokgzSTcG0uxzVezS0PNwqnfXwS7y2wvgVqgiAm31U1VQ1c5aFRoV 0cjv/ym82CusFDejsDLZnYFMIeI3DPpKOTQwC5fsstY1wiV7062r9mMBvhnJXd/6+jyq+c bDW6tz50agJjUD6n8IK1lbZ/tfflJ+XCtE+ekRvmjYsgwqsxwPTPFmWhQ2hKKntxqBXjVK B/sQGSuEH+gCC9iKskvQV9PQvy85IG/3erXBrl2ppDOXlv0pRdM2ChqKu8Aj7zGHScdsGJ ofxwFPRDTKmCcZ4geD85FzkQatO2k5sjdJCI4XkY/EeAFHiGFOlIUV08PDvmwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275930; a=rsa-sha256; cv=none; b=wD2oCVaRumyJfu0HiK0XRWQT7cfDOdofUdyvQc/DQkZcyaDaOiTh7KNCInF2bcupBNINcE U7W3CQaaFrNEM+4sUTUxPRN2Q2ft1umOkLCvjjRV0II3O+xbzxK6VZkzYclDs8OPRsUFts Agi+Fef9cT+lbFX2cwAj7I3AUn+HWlRtDWzZZAQ4YeZgqaqiw0HOm04uemIod5ZloB/skW gE/38oHmJbMJ5xligDP7IFBWfDnRHaBMxat4dKQrY9BT/otBhicI4318cBm96CrXlNE85u NOLADRnyNKtibObootdyhsFYlaSXa00aELVKIW+a5I0oPHVn58R4baYhUmUupA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4p01Stz1Cb4; Wed, 29 Nov 2023 16:38: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 3ATGcnTe046890; Wed, 29 Nov 2023 16:38:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcnoQ046887; Wed, 29 Nov 2023 16:38:49 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:49 GMT Message-Id: <202311291638.3ATGcnoQ046887@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3cd4af3825b5 - stable/13 - iwlwifi: re-enable "Invalid TXQ id" logging List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3cd4af3825b564a6bf249b0f8d2e5dd1368ca49a Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3cd4af3825b564a6bf249b0f8d2e5dd1368ca49a commit 3cd4af3825b564a6bf249b0f8d2e5dd1368ca49a Author: Bjoern A. Zeeb AuthorDate: 2023-10-09 19:47:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:11 +0000 iwlwifi: re-enable "Invalid TXQ id" logging Various reports recently hit the "Invalid TXQ id" in iwlwifi again. Unconditionally enable logging and add a note to report to a specific PR in the log message for now. Along with 018d93ece16b this will hopefully help us to understand what is going on. Sponsored by: The FreeBSD Foundation PR: 274382 (cherry picked from commit ad134f8ab768e3b1d2db203f1cc963bdf0eea857) --- sys/contrib/dev/iwlwifi/mvm/tx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/mvm/tx.c b/sys/contrib/dev/iwlwifi/mvm/tx.c index 2407d0ee832e..da33c1a5cc46 100644 --- a/sys/contrib/dev/iwlwifi/mvm/tx.c +++ b/sys/contrib/dev/iwlwifi/mvm/tx.c @@ -1199,9 +1199,10 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb, if (WARN_ONCE(txq_id == IWL_MVM_INVALID_QUEUE, "Invalid TXQ id")) { #if defined(__FreeBSD__) - IWL_DEBUG_TX(mvm, "fc %#06x tid %u txq_id %u mvm %p " - "skb %p { len %u } info %p sta %p\n", fc, - tid, txq_id, mvm, skb, skb->len, info, sta); + printf("%s:%d: fc %#06x tid %u txq_id %u mvm %p " + "skb %p { len %u } info %p sta %p (if you see this please " + "report to PR 274382)\n", __func__, __LINE__, + fc, tid, txq_id, mvm, skb, skb->len, info, sta); #endif iwl_trans_free_tx_cmd(mvm->trans, dev_cmd); spin_unlock(&mvmsta->lock); From nobody Wed Nov 29 16:38:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4q37cpz52x8R; Wed, 29 Nov 2023 16:38: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 4SgQ4q2P4Hz3Kr1; Wed, 29 Nov 2023 16:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jd4TBSdH/ttzcB1+YPspNJFOCQ3a2LNQah14OkGPmHs=; b=VY69vMbnZBRqQsGh3aG+m/7gbzqvC388C69n/bNbwTPrnXM685ebSZg2DihlyFAVHlpfEy kMEVX8Qp5ZDDjvGbzrsSGYOxI8A74IdLFUxMBY2+bFU0Vy2JySgTDCpIyUAIWWN9/cDzM+ yEiBfG/NtQzK3rBwYcx/5oWLY2tXh6kvy5rB0yHDeUbEubkdUJRZjzS4JHfplNM1MU9w1p YDwRtAf8/vMAGQZgzsbcsCrSDXa3RxgkTPzGRJ8Aw4+ruKm1GiM4aXObik80yUlwN0uimV GoUxJO970+lMT0Pzku9k5dr03bO7NzXOj7eTx4IjQb36b0cUjLMQV6StoEc+5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jd4TBSdH/ttzcB1+YPspNJFOCQ3a2LNQah14OkGPmHs=; b=uwhoPK+4+JzBxA7NMBtliRD02SiOdouG8jHUm8rXn6USxd5IYnyVCUlwyT88CgoyJyUv4c GCCE1Ia47UtE9X6neftUCAn4/xZiver9G+EbQWPuij6BGLbrqCdur1ehx6Q0VRBx+oNAvx wC65Ix0Uu3TnrszX+pNToTuto1tZuggUvlvcDJ20OQ9KMrlExvoKBPFAHR0niSDvgQDL90 Q300khuLjCO+UdFxhi1j+S9qmw9E14bvdpYr6iu9cD3K1TPv+enJvpjzlDGHp2kWbm2CIJ +niImXKia9/Ys05c58+aGHu9wUIeTuATyOD7dkIAfX36xVjbjKUuXhzjfD6hEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275931; a=rsa-sha256; cv=none; b=kYpB2AiwlVp6bkPt4DFvfABJ038AgC+5LZE6wzHYWLG6B4LpoGnhoW29BbzKxzsKT6GCC5 KGHWRARAIMJyE2A4zooPzLm9aF0z/V0NjAXx6cKeqqGzTnVBe8kMyj8e03Jal6c0fEP4YG bsb/5v1cO3dTBMen8/pWZLpSnISAREb/Vnl+N3n8ZSr5F5F6dGI35AJojxbFjRbfPeLEsz FV0LMUXzERGoACf5epevoNoNNwELv1s8lTCd4cYrVP/0ft1ZId5+MqPV4vj2KvzPS/+edE VRAqjmhR7+NHym5gekbexKwdTy15J0WlM6hUlsILQUBwR6PVaHNk4msWh8Ja9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4q1FZwz1C4D; Wed, 29 Nov 2023 16:38: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 3ATGcp8p046949; Wed, 29 Nov 2023 16:38:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcprP046946; Wed, 29 Nov 2023 16:38:51 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:51 GMT Message-Id: <202311291638.3ATGcprP046946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8a7ba52ba201 - stable/13 - LinuxKPI: 802.11: error on state transition failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8a7ba52ba201d9cc62a501feb8da6eb7f1710274 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8a7ba52ba201d9cc62a501feb8da6eb7f1710274 commit 8a7ba52ba201d9cc62a501feb8da6eb7f1710274 Author: Bjoern A. Zeeb AuthorDate: 2023-10-25 22:29:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:11 +0000 LinuxKPI: 802.11: error on state transition failure The state transition failures we were seeing in the early days are solved. If we now experience one stop processing before passing over to net80211 (sta_newstate()) and before updating iv_state on the vap. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42423 (cherry picked from commit 45c27ad5241f5491234afd0b47d13b8005fdb4de) --- sys/compat/linuxkpi/common/src/linux_80211.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index da88a0e7c150..3f0058d639e1 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2137,12 +2137,11 @@ lkpi_iv_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) } if (error != 0) { - /* XXX-BZ currently expected so ignore. */ ic_printf(vap->iv_ic, "%s: error %d during state transition " "%d (%s) -> %d (%s)\n", __func__, error, ostate, ieee80211_state_name[ostate], nstate, ieee80211_state_name[nstate]); - /* return (error); */ + return (error); } #ifdef LINUXKPI_DEBUG_80211 From nobody Wed Nov 29 16:38:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4r3xn3z52x1X; Wed, 29 Nov 2023 16:38: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 4SgQ4r37Qnz3Kxn; Wed, 29 Nov 2023 16:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AeGyxDOfJMvUchqhKDTMOYjlkHeF14KKHImS5eieKKs=; b=jurPaTzh75mHXPiADEqtiGGoyryoqV2L8Pj+eyEyU0NOGXhLtmx2H9r2gDs6CFZQy0Lnrf DIVQGR/ACKq/yk04nxzRt1Dg7EEbfRKybaq8CKw5ee8p+Af4GEymbhwFmTaYFtw4XOuCaz VvSWb0nPyKV6JY6orK4JsB9u6pYbd2dqhI/O1+qLoBjMfFNpJS7hOwnNQYQ9fwC+iQWYOr XjkwxNE2USjRJLty5j/9i5m7qjyZ/ZOEFXqcS/V6R6joMbj/cNbuQdNM/UDYJzS2uKQPxD KqK+Vm8Ymi3fENVChafwmdomL6Wael7DNjclleMho9ahDO8q1phrcUFzXg2/Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AeGyxDOfJMvUchqhKDTMOYjlkHeF14KKHImS5eieKKs=; b=AIvM3mQ9Q8DonNGVAVhzNX/93mYU+rfFOfEiGQ+/IzxDO/UJlACrSip6kaSlG8dfU7SmHR EMN+N1S9YVHRxQ6f3nRPaZEopVq3CjqDYJk1zHdk74JbZe+rzzKvT+dL98IPMrPzM0laCm DCd2PhDD9+fV4a2KEB/2VR4ud8lY6jveqFLPssEDAa0acxGtG30ybqq+TMRUKUL4zG3UXV IxYl4eYTPANPONs+te17xG/FEX5EvqTnUz0anVwC/TkTy7fvxtLr/RR6aXGwpLWNkQDAuB rwkczr4CTpCemCBb4sXkpcxFyh/RyjmSGDB7CutDNjyOEAKvW2liF8egq7iXfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275932; a=rsa-sha256; cv=none; b=Z3xLOovqWZ9LdNG69ZQPdcAfkcQm2bAeyS0FsU1bzazocrDExEUvk/wUYhnpKm5duEUWWl mMMi5lQUNRVXrJWDup5P7Tz8No03iBNeutV0MNwYrkLMEQM6pZpW0ft7xdsMOk8t2zWuFX oScyZG+gbY1qqk4NzoSoyDdu9/V96dRetKsZ4sQLx2KHXiP44hQd54kKl1Ia3Smeo+Fu5g 8kIB5VQhrdr6EAZ72MemTiwbLgtcvf9Xu4b8tulU5qUorkyp1qVQ0XwkRpjFb6uKQkZmBy sOzQvUwE1UOHdGVPiP4RqIBwRZVU8TokrFx5WMu89U9eRJ9Vphm0h1D/vrLVfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4r26svz1CXt; Wed, 29 Nov 2023 16:38: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 3ATGcqc6046994; Wed, 29 Nov 2023 16:38:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcqrb046991; Wed, 29 Nov 2023 16:38:52 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:52 GMT Message-Id: <202311291638.3ATGcqrb046991@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f2411b1342d8 - stable/13 - LinuxKPI: 802.11: fix ieee80211_add_channel_cbw() argument List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f2411b1342d8d30d528576e88f441da1cc9d7cb8 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f2411b1342d8d30d528576e88f441da1cc9d7cb8 commit f2411b1342d8d30d528576e88f441da1cc9d7cb8 Author: Bjoern A. Zeeb AuthorDate: 2023-10-26 00:11:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:11 +0000 LinuxKPI: 802.11: fix ieee80211_add_channel_cbw() argument Fix the last argument passed to ieee80211_add_channel_cbw() in lkpi_ic_getradiocaps() for both 2Ghz and 5Ghz bands. We passed in the unmodified version rather than the adjusted version based on the per-band channel information possibly leaving ieee80211_channel_flags enabled which should not be. So far this should not have made a difference given we did not enable HT or VHT. Sponsored by: The FreeBSD Foundation (cherry picked from commit 5856761fd5f675c3871a82effdbf714a1d1bcc5e) --- sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 3f0058d639e1..2292339ef9ba 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3527,7 +3527,7 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, error = ieee80211_add_channel_cbw(c, maxchan, n, channels[i].hw_value, channels[i].center_freq, channels[i].max_power, - nflags, bands, chan_flags); + nflags, bands, cflags); /* net80211::ENOBUFS: *n >= maxchans */ if (error != 0 && error != ENOBUFS) ic_printf(ic, "%s: Adding chan %u/%u/%#x/%#x/%#x/%#x " @@ -3597,7 +3597,7 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, error = ieee80211_add_channel_cbw(c, maxchan, n, channels[i].hw_value, channels[i].center_freq, channels[i].max_power, - nflags, bands, chan_flags); + nflags, bands, cflags); /* net80211::ENOBUFS: *n >= maxchans */ if (error != 0 && error != ENOBUFS) ic_printf(ic, "%s: Adding chan %u/%u/%#x/%#x/%#x/%#x " From nobody Wed Nov 29 16:38:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4s6YgDz52ww6; Wed, 29 Nov 2023 16:38: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 4SgQ4s4Bhtz3Kwm; Wed, 29 Nov 2023 16:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VuOEM46VV+TAKzt2eoUOXkCBf/mnCeCYarnYR0Eg5zw=; b=OYhU2KJ63Q82ktXUu6Ce5Ie7bobdbV/OSRlJO5kiuR5iN8kQ57KAl08mHZ/3LAmGpjMtto Ns3OXOU7k3hnhnkT/oX3krxUSeM4U+kZzFDahnxM1bvSN8WMp+a5A1bZh6+Daa67gWjCpV TAqz/Skw9uf3Q9L4efhqB+I3aAJpKQGdbM/dl/OmsE7Nj7CWbUVdnqR6cae7F+OYVfodfx C2juIH8i26X15BqEG5FO7oF40i8mWuJRnAeaKakO2JuO/jod+Md4q0xN2bx4FOrv+G9+K+ yTBHWSFLnnBlU+NsPnlyxS4+g/hjhWLnCkdoLy8l8ixjbjaps7vxT5tZNqpzbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VuOEM46VV+TAKzt2eoUOXkCBf/mnCeCYarnYR0Eg5zw=; b=TyF80F3c3K50WHfLtYCQyfJDk+w6EkutMXs0sC2yNaTRil1SXBoFI/8OadaKgbbh8vmMf2 oI4Wlz5yyMXm5j0g7CRgf7prujWpR7JYxYR/YLs3PmIdXSA2gvidL9fib91e42o5vxkwS6 2GZMXr7QjWXVhNHiyL4kK453LfEBo7/LFeY2RgyzjezKj+I1ELvKSKr2RQb+0FcgiS4akO 3AwCMcPn3EG1W1yDYxVEkgjdrUBLbkQFAZ9iQpOf0D+uQNxsJNMzxlQ8x9RxXV5UWJ4N/X A6LddVjzpnJd1ukAwZZJHZ0sofm80XHHNmVFjr9Bu0x1ogk1G8SECyE2yLpLVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275933; a=rsa-sha256; cv=none; b=pv/Z0IMtyg5apeAJjwEZ72DDVwZSRb/JEHDvW2mTEspOJrzR6zZArKSzySSpFXO4Osj6Ip qZPwbDWjPqAp7f5Ag5E0EZOPm/1L+PH48kpzPX3qGTn31uf7n2f5U0YQTj/AKJ8Lkq5OJ3 c/Z9gffqKvBWVMV28qrXUSVZvjYO1Mcjn78uawg0AT42zjm0KPgqCyRKdfeV+cA4IHJ9uj 9UrRzVxzvcQq+9eyy2txqcRd8wCfR9BA3ZNjUNvBIyPYuK15trpWRuGVIokDRO2ahExWeQ jXLhVncC212UN8S2j/pfAY5/vjg40GtaADrpFCsVKScnWZca2IJYU8ZcVWLcdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4s3HDTz1Cd7; Wed, 29 Nov 2023 16:38: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 3ATGcrTn047039; Wed, 29 Nov 2023 16:38:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcr6S047036; Wed, 29 Nov 2023 16:38:53 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:53 GMT Message-Id: <202311291638.3ATGcr6S047036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: d78164c83a67 - stable/13 - LinuxKPI: 802.11: deal with scan_ie_len List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d78164c83a672c000b01f5f5a5a45b782284fea6 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d78164c83a672c000b01f5f5a5a45b782284fea6 commit d78164c83a672c000b01f5f5a5a45b782284fea6 Author: Bjoern A. Zeeb AuthorDate: 2023-10-27 20:41:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:11 +0000 LinuxKPI: 802.11: deal with scan_ie_len We only need to reserve the extra space for DSSS if NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES is set, so add the conditional. Also add checks in case scan_ie_len will grow beyond the maximum. Given this is currently unlikely, leave the cleanup for later as some other restructuring should be done first. Sponsored by: The FreeBSD Foundation (cherry picked from commit 78ca45df310563ca46448a124674e0542aab2e31) --- sys/compat/linuxkpi/common/src/linux_80211.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 2292339ef9ba..b605cb36ad88 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3919,20 +3919,30 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) lhw->scan_ie_len = 2 + IEEE80211_RATE_SIZE; if (lhw->max_rates > IEEE80211_RATE_SIZE) lhw->scan_ie_len += 2 + (lhw->max_rates - IEEE80211_RATE_SIZE); - /* - * net80211 does not seem to support the DSSS Parameter Set but some of - * the drivers insert it so calculate the extra fixed space in. - */ - lhw->scan_ie_len += 2 + 1; + + if (hw->wiphy->features & NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES) { + /* + * net80211 does not seem to support the DSSS Parameter Set but + * some of the drivers insert it so calculate the extra fixed + * space in. + */ + lhw->scan_ie_len += 2 + 1; + } /* Reduce the max_scan_ie_len "left" by the amount we consume already. */ - if (hw->wiphy->max_scan_ie_len > 0) + if (hw->wiphy->max_scan_ie_len > 0) { + if (lhw->scan_ie_len > hw->wiphy->max_scan_ie_len) + goto err; hw->wiphy->max_scan_ie_len -= lhw->scan_ie_len; + } if (bootverbose) ieee80211_announce(ic); return (0); +err: + IMPROVE("TODO FIXME CLEANUP"); + return (-EAGAIN); } void From nobody Wed Nov 29 16:38:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4t6wSNz52ww8; Wed, 29 Nov 2023 16:38: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 4SgQ4t5L7Vz3KyS; Wed, 29 Nov 2023 16:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R8lqEHeweljzMzJIjW8AJm9R1toMmhrfad0q//8esGM=; b=xyWk26YGtMAkzI9IE7fGaq8yxzl8av0qlSbXHhyQ21WPr8sqQ2N5Zxx2dDHUbOu9hwCqyy 8Y65zGaTGO6yFxRSfEX55AGWw+IWdUtMJa93/nqwC55CcXi9J9JdwYWJGAMNcOa/psMsoi fPTb9Y48V8tVQuXonpftw3iM5TKY5nNDaEgL5IX54mgM3pgduUpXACH6j23SXelYDk8pRQ YhJ8DULizUdjdw+bm39R+Fzqept/cOfAD6rkQwh02dvBT+TgvCcC5RcjXWFAvGo7tHkch8 of2Rzft2YnIEHmRxW4o+iej7Ku8F174VDp37l7+iCD2WqcfiIHbPSTgQnZpw+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R8lqEHeweljzMzJIjW8AJm9R1toMmhrfad0q//8esGM=; b=L31rXtr9ctU6d0sJS1WVOuSuL4ykhclRbGUezUzsglPfPgngXRSjAfoHKN0ftKtZgRB9bP eezkqCdKKMb1l/JXAD2/DjfuNxrKicoGybrMDw9+wQXMARr8UjBLK/bzHsuHEvQ61FvICI SsMagrrHKqcCGPWu7zfowK0RGOCiqz9AL4JaqmpvVWcx7Rwf4U+tc4gtYtbqAqka0NJkMt tSu2wmY21YfOVrXaXe2agh8H/XORR2Z6nPSkuQUax8g6o+RfbJSCsA0cPs664sqFlQ4hpo VoJvQj5OWNFXC9Gg5Eygtf/KqAgtoFktVw2ArxZupVUZ2sg5ko2qidmHbsXCYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275934; a=rsa-sha256; cv=none; b=f7aKYmnuYvUajqyQV/+3Y4Hhmm8MV+iNLiELQ0ZjO0aMJI36/tIPj3QZiE5XREMIicFGpF fgbusPyOmi1SB8CCQCOMrsrlFAtxD8o7afskneiXpMez6gvJwj2SLHFnaQvbNhKooNkt+u whl4KwbFirIXOinqe++53Y2A/RjDCRRnuE9ZANoo5zW6fKSSZoP6liPpiesAjs6YwBqULl PoT2BEKdeCZQgu9KBpVV4jiQcaUKqLEphq4e/4GFAp88Buz3HPaw/mUwohhMP2PaRbbuMU DX+lG1cJx1yH3kUBvKC+OQNuDK7gfCFN97k8UP2Wy7FT9fmfuj+ZPF2yebz7Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4t4RQjz1C4F; Wed, 29 Nov 2023 16:38: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 3ATGcssX047089; Wed, 29 Nov 2023 16:38:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcsT9047086; Wed, 29 Nov 2023 16:38:54 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:54 GMT Message-Id: <202311291638.3ATGcsT9047086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9f5f879220ab - stable/13 - LinuxKPI: 802.11: zero-pad debug flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9f5f879220ab309e1315f7e3f2fb0af955458e3e Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9f5f879220ab309e1315f7e3f2fb0af955458e3e commit 9f5f879220ab309e1315f7e3f2fb0af955458e3e Author: Bjoern A. Zeeb AuthorDate: 2023-10-28 18:43:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:11 +0000 LinuxKPI: 802.11: zero-pad debug flags Write the debug flags as full 32bit hex numbers to have a better view on them. No functional changes. Sponsored by: The FreeBSD Foundation (cherry picked from commit 8895b47638ea4d7a13fba97afe8cd9faacfdda83) --- sys/compat/linuxkpi/common/src/linux_80211.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index 93c1e2873206..74dc3c9f9dee 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -45,23 +45,23 @@ /* #define LINUXKPI_DEBUG_80211 */ #ifndef D80211_TODO -#define D80211_TODO 0x1 +#define D80211_TODO 0x00000001 #endif #ifndef D80211_IMPROVE -#define D80211_IMPROVE 0x2 +#define D80211_IMPROVE 0x00000002 #endif -#define D80211_IMPROVE_TXQ 0x4 -#define D80211_TRACE 0x10 -#define D80211_TRACEOK 0x20 -#define D80211_TRACE_TX 0x100 -#define D80211_TRACE_TX_DUMP 0x200 -#define D80211_TRACE_RX 0x1000 -#define D80211_TRACE_RX_DUMP 0x2000 -#define D80211_TRACE_RX_BEACONS 0x4000 +#define D80211_IMPROVE_TXQ 0x00000004 +#define D80211_TRACE 0x00000010 +#define D80211_TRACEOK 0x00000020 +#define D80211_TRACE_TX 0x00000100 +#define D80211_TRACE_TX_DUMP 0x00000200 +#define D80211_TRACE_RX 0x00001000 +#define D80211_TRACE_RX_DUMP 0x00002000 +#define D80211_TRACE_RX_BEACONS 0x00004000 #define D80211_TRACEX (D80211_TRACE_TX|D80211_TRACE_RX) #define D80211_TRACEX_DUMP (D80211_TRACE_TX_DUMP|D80211_TRACE_RX_DUMP) -#define D80211_TRACE_STA 0x10000 -#define D80211_TRACE_MO 0x100000 +#define D80211_TRACE_STA 0x00010000 +#define D80211_TRACE_MO 0x00100000 #define IMPROVE_TXQ(...) \ if (linuxkpi_debug_80211 & D80211_IMPROVE_TXQ) \ From nobody Wed Nov 29 16:38:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4w0phSz52x1h; Wed, 29 Nov 2023 16:38: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 4SgQ4v6XMPz3Kyg; Wed, 29 Nov 2023 16:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sY85u63/vlsF8ffPiFJV90lUwre0dZL361nQzDK3910=; b=QdqJUIjn9fF9XnsrTjUwJpxzIXIaDq82TR6rTft7otm7HnYqWkG3WIFh6kw74QZJLm0x5J 04loAZAUovFCVCLg/My1QEAcdjgMkwpJb5b8cVUPHIdoe5Jr8r3i9W0rdFQXVBHDf83dlE 2mE78evgO2bjBqSO/ZjfOnmJezTNcLOz+o4/qbPPhmR5awdagG8qElwJO1zaw7o/eEPwam GpVipDGSSXW+rCw6M33B01WaGlUzIzcSLrH6QFkmAM4AQnTzXELU4Mf+yOF1l5ZJaHilYw MHl6FPkgQzBK5FVVUY7gJHbQhKuHus4pGpJRQfnx+3UjIDadpfqQBgj/mGHTAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sY85u63/vlsF8ffPiFJV90lUwre0dZL361nQzDK3910=; b=V4iaBymT8XawAi3do47KyCHEC9e00CWAteE417AvA1Gyp+Cct/ixenCvqLSK7O/jUPi8wG icKi+Nkkq9bxx9E7+DZv3wH+SFD6EFOgl2w4GJwu7xDD2VEGEix7229kmYsIUlg+qu2bSM K5vhQVhu1H2Bz35lCdTggu8uASY7fIgWeF+LN0if+8ZKl/nA5gu+6FerJL6yVRf3Y54dhv E8rRbtIqkiBo4Zlit557miESCUdHlGC9b+xq+ZpvW/jQR0KrUoJkvBJZwWeIpDYI7OlIvP Kv9iPC7KlyahPh0/YUcQ6o/YvsnfuaZtx+S+I8tTe4Yt0yfXSoiepDOlw2pmvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275935; a=rsa-sha256; cv=none; b=B3Vzv1nvFrTyuncyUhUPlaJ5RyeW8TAOM68044tOtxII5UQmhjWzD2dgOdvu4JDgMMyH10 w8AjFZlEYwWnC7OHB5b8xzbRfIpnnL9/zg3ZxaYt6bI7fy59K8FQbTxSJs5LkpfOsnJNLT alSerixFgne6YUJdYSed4bqgh8CcwvQKbod3GCGUMOyf4wha4HaYk7wRbPfUsnYvTAEJOp OU6GQ5c6Tml/rsdEupx/4bNcIuGHdViRDWYHKEQG/9EzgvXarKtXTQLrBuvhW/kUbApymY SReHByv6Rf0UcrtZhD1tn5zQ8NddAueJ3OSq0gYbxyrg0Om5ShkeLOn/W31w1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4v5dJgz1C4G; Wed, 29 Nov 2023 16:38: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 3ATGctSC047132; Wed, 29 Nov 2023 16:38:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGct60047128; Wed, 29 Nov 2023 16:38:55 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:55 GMT Message-Id: <202311291638.3ATGct60047128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 73d3c2546007 - stable/13 - net80211: add ieee80211_add_vhtcap_ch() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 73d3c2546007e54fb74cf08e61094a683b89d81d Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=73d3c2546007e54fb74cf08e61094a683b89d81d commit 73d3c2546007e54fb74cf08e61094a683b89d81d Author: Bjoern A. Zeeb AuthorDate: 2023-10-26 20:55:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:11 +0000 net80211: add ieee80211_add_vhtcap_ch() Add an implementation of ieee80211_add_vhtcap() which works based on information derived from the vap (and possibly channel/band but we do not support that yet in net80211). This is needed for scans request information in LinuxKPI at times before we have a BSS. Sponsored by: The FreeBSD Foundation (cherry picked from commit 6c3ae01cc75afdd575f54289b2879a7c98d55bf6) --- sys/net80211/ieee80211_vht.c | 27 +++++++++++++++++++++++++++ sys/net80211/ieee80211_vht.h | 2 ++ 2 files changed, 29 insertions(+) diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index 77611d9704a2..f7a13157150e 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -707,6 +707,33 @@ ieee80211_add_vhtcap(uint8_t *frm, struct ieee80211_node *ni) return (frm); } +/* + * Non-associated probe requests. Add VHT capabilities based on + * the current channel configuration. No BSS yet. + */ +uint8_t * +ieee80211_add_vhtcap_ch(uint8_t *frm, struct ieee80211vap *vap, + struct ieee80211_channel *c) +{ + struct ieee80211_vht_cap *vhtcap; + + memset(frm, 0, 2 + sizeof(*vhtcap)); + frm[0] = IEEE80211_ELEMID_VHT_CAP; + frm[1] = sizeof(*vhtcap); + frm += 2; + + /* 32-bit VHT capability */ + ADDWORD(frm, vap->iv_vht_cap.vht_cap_info); + + /* supp_mcs */ + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.rx_mcs_map); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.rx_highest); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.tx_mcs_map); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.tx_highest); + + return (frm); +} + static uint8_t ieee80211_vht_get_chwidth_ie(struct ieee80211_channel *c) { diff --git a/sys/net80211/ieee80211_vht.h b/sys/net80211/ieee80211_vht.h index a3830ae13ba7..756c2e367485 100644 --- a/sys/net80211/ieee80211_vht.h +++ b/sys/net80211/ieee80211_vht.h @@ -50,6 +50,8 @@ void ieee80211_vht_node_leave(struct ieee80211_node *ni); uint8_t * ieee80211_add_vhtcap(uint8_t *frm, struct ieee80211_node *); uint8_t * ieee80211_add_vhtinfo(uint8_t *frm, struct ieee80211_node *); +uint8_t *ieee80211_add_vhtcap_ch(uint8_t *, struct ieee80211vap *, + struct ieee80211_channel *); void ieee80211_vht_update_cap(struct ieee80211_node *, const uint8_t *, const uint8_t *); From nobody Wed Nov 29 16:38:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4x1mWCz52xCV; Wed, 29 Nov 2023 16:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ4x0qNTz3L7s; Wed, 29 Nov 2023 16:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TSXm9lpxZWj63VvmcWJ+NprasorawQrpbGBl78HP13A=; b=i8iiwA0CllaJnkQoxewaqeQyHhQw+sZhRbkJ10DWi3XAWJr9n9cjuSkWXLh456HPVtyJ3r xshRTbivZO2gcW0JFjXFhLA1zM5086gCP3PQbUp/ZN4j3yKwzH+CdR/ernuGelMQ3GLwIY fq7lDLW1bPd4oW1ARAeAUN4cRUS3Fhk8/zWmuC2JfNxtBtX3IoripkB8Yk51fBBZf1uFyS mrN8cAdV7JbFYZeEvgiga43BWOr7Y0hCwQksWYOWBFUjcA/+0CYtlY0OB1VLmK6jAUBAI7 t2DIV6zxXtH1DkgcdOQg96oNw7Fxhd1dDdFwWVU9Hg6DremsW3hzgusvi0cB8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TSXm9lpxZWj63VvmcWJ+NprasorawQrpbGBl78HP13A=; b=rBzPtzA6L+0G4cbcappPfAtpsRk7CRGNdkkte6EsDNQVnx7TLf58C5w4f5b/NoJ8pgLxV6 naVQ1xDQ2FYBWxci+hHzmu9j2G9La+lO7EK1BSy+tA5btjaF0m8w5iJ9RSgSJpdEpNxICX rOXQRbwGr4BkMPSjcg93S0zBJa07qfStCFRI/Hc3e6FCeo0WXoafCdy8RZkEJdmmmLlQBZ chpnfSwyB3PPb9BRaIo7ZXH+5A6gkxaOZlz0pmRPFGEfSCCAMQTdpM2ULyNspTIHAr+IMn tk5F06M8HvfaMWzEb53sbkSVLKiut3C5OkWwFUhQaJAYP1XHSy189KRVi7hQUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275937; a=rsa-sha256; cv=none; b=ZQVP3Ze2X/51TWLFUzmE3IWy7SwJD8v5ZafPlprSOYq5oUrCK85m718Uz2Po9uvfw5Wssf e4nQN4c2ShvF+XT/li50Wx3+j6thyopqDBFKIyYo6PBA6zGtL+qiBnRlSMsxI2GoGUPax8 PLS7tjd6hesXN8X3yOvxPtEE04BWFlHF6/tkbS3ueve83c9WOq4kH+F4FBFTduoTlu4JHZ VLuHxl6qZbBIdk4egEFIAAh3u2uYYTar5L0vSfVQaBUOpfrwd2RN5C9pJvB71/jmey5cWX IyRrAQhooIoLOVaPCKhWBPSmonyy5h0HHGv7S0soLbChgIzN/qTInSqMeuYoKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4w6lnxz1Cb5; Wed, 29 Nov 2023 16:38: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 3ATGcuAp047182; Wed, 29 Nov 2023 16:38:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcuP8047179; Wed, 29 Nov 2023 16:38:56 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:56 GMT Message-Id: <202311291638.3ATGcuP8047179@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: fec79883cbd1 - stable/13 - net80211: rename iv_flags_vht to iv_vht_flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fec79883cbd126c6f5d99e0b0f275407b6c63f35 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fec79883cbd126c6f5d99e0b0f275407b6c63f35 commit fec79883cbd126c6f5d99e0b0f275407b6c63f35 Author: Bjoern A. Zeeb AuthorDate: 2023-10-27 18:18:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:12 +0000 net80211: rename iv_flags_vht to iv_vht_flags While the flag field is internal start naming it as well as "iv_vht*" so we keep all "VHT" fields together. This breaks with what was done done for HT but with HE, EHT, .. coming one day seems the more logic choice. No functional changes intended. Sponsored by: The FreeBSD Foundation (cherry picked from commit ef48d4fa122d863db11e41608ceea641eec54704) --- sys/net80211/ieee80211.c | 6 +++--- sys/net80211/ieee80211_ht.c | 12 ++++++------ sys/net80211/ieee80211_ioctl.c | 2 +- sys/net80211/ieee80211_node.c | 6 +++--- sys/net80211/ieee80211_output.c | 6 +++--- sys/net80211/ieee80211_scan_sta.c | 8 ++++---- sys/net80211/ieee80211_sta.c | 4 ++-- sys/net80211/ieee80211_var.h | 2 +- sys/net80211/ieee80211_vht.c | 10 +++++----- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 65b28ec15095..084decd4f7ea 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -938,7 +938,7 @@ ieee80211_syncflag_vht_locked(struct ieee80211com *ic, int flag) bit = 0; TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) - if (vap->iv_flags_vht & flag) { + if (vap->iv_vht_flags & flag) { bit = 1; break; } @@ -956,9 +956,9 @@ ieee80211_syncflag_vht(struct ieee80211vap *vap, int flag) IEEE80211_LOCK(ic); if (flag < 0) { flag = -flag; - vap->iv_flags_vht &= ~flag; + vap->iv_vht_flags &= ~flag; } else - vap->iv_flags_vht |= flag; + vap->iv_vht_flags |= flag; ieee80211_syncflag_vht_locked(ic, flag); IEEE80211_UNLOCK(ic); } diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index 9561a546b1e3..d31071ef4b5d 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -1935,12 +1935,12 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) uint32_t vhtflags = 0; vhtflags = 0; - if (ni->ni_flags & IEEE80211_NODE_VHT && vap->iv_flags_vht & IEEE80211_FVHT_VHT) { + if (ni->ni_flags & IEEE80211_NODE_VHT && vap->iv_vht_flags & IEEE80211_FVHT_VHT) { if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_160MHZ) && /* XXX 2 means "160MHz and 80+80MHz", 1 means "160MHz" */ (_IEEE80211_MASKSHIFT(vap->iv_vhtcaps, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) >= 1) && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT160)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT160)) { vhtflags = IEEE80211_CHAN_VHT160; /* Mirror the HT40 flags */ if (htflags == IEEE80211_CHAN_HT40U) { @@ -1952,7 +1952,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) /* XXX 2 means "160MHz and 80+80MHz" */ (_IEEE80211_MASKSHIFT(vap->iv_vhtcaps, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) == 2) && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80P80)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80P80)) { vhtflags = IEEE80211_CHAN_VHT80P80; /* Mirror the HT40 flags */ if (htflags == IEEE80211_CHAN_HT40U) { @@ -1961,7 +1961,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) vhtflags |= IEEE80211_CHAN_HT40D; } } else if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_80MHZ) && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80)) { vhtflags = IEEE80211_CHAN_VHT80; /* Mirror the HT40 flags */ if (htflags == IEEE80211_CHAN_HT40U) { @@ -1979,11 +1979,11 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) * 'ht40' as that flag. */ if ((htflags == IEEE80211_CHAN_HT40U) && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT40)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT40)) { vhtflags = IEEE80211_CHAN_VHT40U | IEEE80211_CHAN_HT40U; } else if (htflags == IEEE80211_CHAN_HT40D && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT40)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT40)) { vhtflags = IEEE80211_CHAN_VHT40D | IEEE80211_CHAN_HT40D; } else if (htflags == IEEE80211_CHAN_HT20) { diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 64cb9f229519..90d5646e9057 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -1155,7 +1155,7 @@ ieee80211_ioctl_get80211(struct ieee80211vap *vap, u_long cmd, ireq->i_val = 1; break; case IEEE80211_IOC_VHTCONF: - ireq->i_val = vap->iv_flags_vht & IEEE80211_FVHT_MASK; + ireq->i_val = vap->iv_vht_flags & IEEE80211_FVHT_MASK; break; default: error = ieee80211_ioctl_getdefault(vap, ireq); diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index a44e19f68e7f..43e8f5995c30 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1015,7 +1015,7 @@ ieee80211_sta_join(struct ieee80211vap *vap, struct ieee80211_channel *chan, */ if (ni->ni_ies.vhtopmode_ie != NULL && ni->ni_ies.vhtcap_ie != NULL && - vap->iv_flags_vht & IEEE80211_FVHT_VHT) { + vap->iv_vht_flags & IEEE80211_FVHT_VHT) { if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) { printf("%s: BSS %6D: 2GHz channel, VHT info; ignoring\n", __func__, @@ -1589,7 +1589,7 @@ ieee80211_node_create_wds(struct ieee80211vap *vap, * ni_chan will be adjusted to an HT channel. */ ieee80211_ht_wds_init(ni); - if (vap->iv_flags_vht & IEEE80211_FVHT_VHT) { + if (vap->iv_vht_flags & IEEE80211_FVHT_VHT) { printf("%s: TODO: vht_wds_init\n", __func__); } } else { @@ -1844,7 +1844,7 @@ ieee80211_init_neighbor(struct ieee80211_node *ni, if ((ni->ni_ies.vhtcap_ie != NULL) && (ni->ni_ies.vhtopmode_ie != NULL) && - (ni->ni_vap->iv_flags_vht & IEEE80211_FVHT_VHT)) { + (ni->ni_vap->iv_vht_flags & IEEE80211_FVHT_VHT)) { do_vht_setup = 1; } } diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 404980bdaa27..288f0c7da2c8 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -2523,12 +2523,12 @@ ieee80211_probereq_ie(struct ieee80211vap *vap, struct ieee80211com *ic, * VHT channel. */ #ifdef notyet - if (vap->iv_flags_vht & IEEE80211_FVHT_VHT) { + if (vap->iv_vht_flags & IEEE80211_FVHT_VHT) { struct ieee80211_channel *c; c = ieee80211_ht_adjust_channel(ic, ic->ic_curchan, vap->iv_flags_ht); - c = ieee80211_vht_adjust_channel(ic, c, vap->iv_flags_vht); + c = ieee80211_vht_adjust_channel(ic, c, vap->iv_vht_flags); frm = ieee80211_add_vhtcap_ch(frm, vap, c); } #endif @@ -2886,7 +2886,7 @@ ieee80211_send_mgmt(struct ieee80211_node *ni, int type, int arg) frm = ieee80211_add_htcap(frm, ni); } - if ((vap->iv_flags_vht & IEEE80211_FVHT_VHT) && + if ((vap->iv_vht_flags & IEEE80211_FVHT_VHT) && IEEE80211_IS_CHAN_VHT(ni->ni_chan) && ni->ni_ies.vhtcap_ie != NULL && ni->ni_ies.vhtcap_ie[0] == IEEE80211_ELEMID_VHT_CAP) { diff --git a/sys/net80211/ieee80211_scan_sta.c b/sys/net80211/ieee80211_scan_sta.c index 9389a7bf53d0..a8159fca6d80 100644 --- a/sys/net80211/ieee80211_scan_sta.c +++ b/sys/net80211/ieee80211_scan_sta.c @@ -1680,7 +1680,7 @@ notfound: chan = ieee80211_ht_adjust_channel(ic, chan, vap->iv_flags_ht); chan = ieee80211_vht_adjust_channel(ic, - chan, vap->iv_flags_vht); + chan, vap->iv_vht_flags); ieee80211_create_ibss(vap, chan); return 1; } @@ -1713,7 +1713,7 @@ notfound: chan = ieee80211_ht_adjust_channel(ic, chan, vap->iv_flags_ht); chan = ieee80211_vht_adjust_channel(ic, - chan, vap->iv_flags_vht); + chan, vap->iv_vht_flags); if (!ieee80211_sta_join(vap, chan, &selbs->base)) goto notfound; return 1; /* terminate scan */ @@ -1866,7 +1866,7 @@ ap_end(struct ieee80211_scan_state *ss, struct ieee80211vap *vap) return 1; } chan = ieee80211_ht_adjust_channel(ic, bestchan, vap->iv_flags_ht); - chan = ieee80211_vht_adjust_channel(ic, chan, vap->iv_flags_vht); + chan = ieee80211_vht_adjust_channel(ic, chan, vap->iv_vht_flags); ieee80211_create_ibss(vap, chan); return 1; @@ -1946,7 +1946,7 @@ notfound: chan = ieee80211_ht_adjust_channel(ic, chan, vap->iv_flags_ht); chan = ieee80211_vht_adjust_channel(ic, - chan, vap->iv_flags_vht); + chan, vap->iv_vht_flags); } } else chan = vap->iv_des_chan; diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c index 50b490641c5a..70079f6bcfcc 100644 --- a/sys/net80211/ieee80211_sta.c +++ b/sys/net80211/ieee80211_sta.c @@ -1523,7 +1523,7 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype, do_ht = 1; } if (scan.vhtcap != NULL && scan.vhtopmode != NULL && - (vap->iv_flags_vht & IEEE80211_FVHT_VHT)) { + (vap->iv_vht_flags & IEEE80211_FVHT_VHT)) { /* XXX state changes? */ ieee80211_vht_updateparams(ni, scan.vhtcap, scan.vhtopmode); @@ -1869,7 +1869,7 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype, ieee80211_ht_updateparams(ni, htcap, htinfo); if ((vhtcap != NULL) && (vhtopmode != NULL) & - (vap->iv_flags_vht & IEEE80211_FVHT_VHT)) { + (vap->iv_vht_flags & IEEE80211_FVHT_VHT)) { /* * Log if we get a VHT assoc/reassoc response. * We aren't ready for 2GHz VHT support. diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index d58acd6a9c9b..751662c36aca 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -423,7 +423,7 @@ struct ieee80211vap { int iv_inact_probe; /* inactive probe time */ /* VHT flags */ - uint32_t iv_flags_vht; /* VHT state flags */ + uint32_t iv_vht_flags; /* VHT state flags */ uint32_t iv_vhtcaps; /* VHT capabilities */ uint32_t iv_vhtextcaps; /* VHT extended capabilities (TODO) */ struct ieee80211_vht_mcs_info iv_vht_mcsinfo; diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index f7a13157150e..32123e7a2815 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -148,14 +148,14 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) vap->iv_vhtextcaps = ic->ic_vhtextcaps; /* XXX assume VHT80 support; should really check vhtcaps */ - vap->iv_flags_vht = + vap->iv_vht_flags = IEEE80211_FVHT_VHT | IEEE80211_FVHT_USEVHT40 | IEEE80211_FVHT_USEVHT80; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(vap->iv_vhtcaps)) - vap->iv_flags_vht |= IEEE80211_FVHT_USEVHT160; + vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT160; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vhtcaps)) - vap->iv_flags_vht |= IEEE80211_FVHT_USEVHT80P80; + vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT80P80; memcpy(&vap->iv_vht_mcsinfo, &ic->ic_vht_mcsinfo, sizeof(struct ieee80211_vht_mcs_info)); @@ -383,10 +383,10 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK); } if ((val2 == 2) && - ((vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80P80) == 0)) + ((vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80P80) == 0)) val2 = 1; if ((val2 == 1) && - ((vap->iv_flags_vht & IEEE80211_FVHT_USEVHT160) == 0)) + ((vap->iv_vht_flags & IEEE80211_FVHT_USEVHT160) == 0)) val2 = 0; val = MIN(val1, val2); new_vhtcap |= _IEEE80211_SHIFTMASK(val, From nobody Wed Nov 29 16:38:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4y2tM0z52x48; Wed, 29 Nov 2023 16:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ4y1wJxz3LDR; Wed, 29 Nov 2023 16:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NaE78smWu/SJoCKBJ6CSrbNdNWp6ANAflKvwlZkPxkw=; b=ruQ+0mdEXn/5Rr8urV7WBJ6e5r9k3nXuzIYXMeUm72Pxkf5qhEnZG/0HHtl0xNzBxqiGQN S6G7jExdBfufI45+oruznWrvvYSGaiC9InZxEKGfEQgftjPj+KRDNysZ8JH7cokNFLo98Z lCicDOzEMZkrZQETnhYpzvJ7cUiiijjyV/sCRaOEUCTzXH5wjwIOj1kIFbUtV48GedzSZj E/WIjXambbzPy9D8BUlCH4q+iX3+vwi8ivunxq/4dshyALn0m3oyBREOgNDKjF73Eh1Gq6 Y7LKKXVUstMTSvoBstL75VVn1oGzqm6HzrGIViSMsc21j+/jFCSlkSHpEcnRwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NaE78smWu/SJoCKBJ6CSrbNdNWp6ANAflKvwlZkPxkw=; b=f4MEkhRe6eR2F2uCOMiG3V/tYbYXfKUbc39qoEBFhKudJIJZg8HU02OYB/HlHW1Ooij+dw SAlnHHUCmMitFPda+q6ESGkAp10Jh0aHYyxO/UNWB/OljP/6ownbGfKWicH0odbh0ARtEE udZLKFf2g3C+2XXqCd0j4uTYjXfwV/baUnnOipUYMvilbOvw9/jGUwkWPNAfmalJziBjN1 sTr2h4E2n0oh3i8vMlrGDPjhMhTlmQAUQvN5ovvzXliFqDlbiehcJEa89hnJO0AieH4P7C Oo1xzfC7ybS4/NXPRm1By50Q2d8qNwSbISLlJsDXiIqSEnqmCPc7fnNhkfvbMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275938; a=rsa-sha256; cv=none; b=AAOTWKTq5K3H5DE0GAv5RYk7t3RIXu6ZvI5kPOJAL+K+TjVX1l8co8n1BbULCkIbXTCs9v hwMYG4fFPYddE/0JJmx3mW59U9gfVSJ6VIKSDjmvXsx53/mbiCUcnuajk7a69VknISe4+D vuU2BmsThwpN9mEZ6bJimLFHHrSAN8trsHj7eOy3dgIbttwoCENwbHzJuts5nHUX5bB7F5 VlT2EbGmrvxZZgnXAJo8nZNsUA2/Y2Nzbey/jKH9uW7UBNGGlZFtsnLC4W5R8NAIUE/VM5 RgLzzgFlW1sskQ2IIawQ0Im7Lm4AbYQAJ6KOzjOdEJgMZ6Awx/wBUFvaiHYqtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4y0ypBz1C4H; Wed, 29 Nov 2023 16:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGcwfW047227; Wed, 29 Nov 2023 16:38:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcwmb047224; Wed, 29 Nov 2023 16:38:58 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:58 GMT Message-Id: <202311291638.3ATGcwmb047224@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 52b28659f399 - stable/13 - net80211: combine iv_vhtcaps and iv_vht_mcsinfo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 52b28659f39947a86c55e622b30645b99150c83f Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=52b28659f39947a86c55e622b30645b99150c83f commit 52b28659f39947a86c55e622b30645b99150c83f Author: Bjoern A. Zeeb AuthorDate: 2023-10-27 18:33:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:12 +0000 net80211: combine iv_vhtcaps and iv_vht_mcsinfo The iv_vhtcaps and iv_vht_mcsinfo fields together form struct ieee80211_vht_cap so combine them into one field in the VAP and keep the information together. While the structure layout changes no other functional changes intended. Sponsored by: The FreeBSD Foundation (cherry picked from commit fbba0d6b636492505dc5878b9ed2c1bbdcd88b91) --- sys/net80211/ieee80211.c | 2 +- sys/net80211/ieee80211_ddb.c | 2 +- sys/net80211/ieee80211_ht.c | 4 ++-- sys/net80211/ieee80211_var.h | 3 +-- sys/net80211/ieee80211_vht.c | 50 ++++++++++++++++++++++---------------------- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 084decd4f7ea..8a8d79f16bdc 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -552,7 +552,7 @@ ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap, vap->iv_htextcaps = ic->ic_htextcaps; /* 11ac capabilities - XXX methodize */ - vap->iv_vhtcaps = ic->ic_vhtcaps; + vap->iv_vht_cap.vht_cap_info = ic->ic_vhtcaps; vap->iv_vhtextcaps = ic->ic_vhtextcaps; vap->iv_opmode = opmode; diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index ae6e20e09da4..cc0bb4b10152 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -490,7 +490,7 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) db_printf("\tflags_ven=%b\n", vap->iv_flags_ven, IEEE80211_FVEN_BITS); db_printf("\tcaps=%b\n", vap->iv_caps, IEEE80211_C_BITS); db_printf("\thtcaps=%b\n", vap->iv_htcaps, IEEE80211_C_HTCAP_BITS); - db_printf("\tvhtcaps=%b\n", vap->iv_vhtcaps, IEEE80211_VHTCAP_BITS); + db_printf("\tvhtcap=%b\n", vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_BITS); _db_show_stats(&vap->iv_stats); diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index d31071ef4b5d..626f6386865c 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -1938,7 +1938,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) if (ni->ni_flags & IEEE80211_NODE_VHT && vap->iv_vht_flags & IEEE80211_FVHT_VHT) { if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_160MHZ) && /* XXX 2 means "160MHz and 80+80MHz", 1 means "160MHz" */ - (_IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + (_IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) >= 1) && (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT160)) { vhtflags = IEEE80211_CHAN_VHT160; @@ -1950,7 +1950,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) } } else if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_80P80MHZ) && /* XXX 2 means "160MHz and 80+80MHz" */ - (_IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + (_IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) == 2) && (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80P80)) { vhtflags = IEEE80211_CHAN_VHT80P80; diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 751662c36aca..1289cf5ccf0b 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -424,9 +424,8 @@ struct ieee80211vap { /* VHT flags */ uint32_t iv_vht_flags; /* VHT state flags */ - uint32_t iv_vhtcaps; /* VHT capabilities */ + struct ieee80211_vht_cap iv_vht_cap; /* VHT capabilities + MCS info */ uint32_t iv_vhtextcaps; /* VHT extended capabilities (TODO) */ - struct ieee80211_vht_mcs_info iv_vht_mcsinfo; uint32_t iv_vht_spare[4]; int iv_des_nssid; /* # desired ssids */ diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index 32123e7a2815..7dd2a6be1d2e 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -144,7 +144,7 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) if (! IEEE80211_CONF_VHT(ic)) return; - vap->iv_vhtcaps = ic->ic_vhtcaps; + vap->iv_vht_cap.vht_cap_info = ic->ic_vhtcaps; vap->iv_vhtextcaps = ic->ic_vhtextcaps; /* XXX assume VHT80 support; should really check vhtcaps */ @@ -152,12 +152,12 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) IEEE80211_FVHT_VHT | IEEE80211_FVHT_USEVHT40 | IEEE80211_FVHT_USEVHT80; - if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(vap->iv_vhtcaps)) + if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(vap->iv_vht_cap.vht_cap_info)) vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT160; - if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vhtcaps)) + if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vht_cap.vht_cap_info)) vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT80P80; - memcpy(&vap->iv_vht_mcsinfo, &ic->ic_vht_mcsinfo, + memcpy(&vap->iv_vht_cap.supp_mcs, &ic->ic_vht_mcsinfo, sizeof(struct ieee80211_vht_mcs_info)); } @@ -366,7 +366,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* Limit MPDU size to the smaller of the two */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_MAX_MPDU_MASK); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -376,7 +376,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_MAX_MPDU_MASK); /* Limit supp channel config */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -393,7 +393,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK); /* RX LDPC */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_RXLDPC); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -403,7 +403,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_RXLDPC); /* Short-GI 80 */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SHORT_GI_80); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -413,7 +413,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_SHORT_GI_80); /* Short-GI 160 */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SHORT_GI_160); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -438,7 +438,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* TX STBC */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_TXSTBC); if (opmode == 1) { /* STA mode - enable it only if node RXSTBC is non-zero */ @@ -452,7 +452,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_TXSTBC); /* RX STBC1..4 */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_RXSTBC_MASK); if (opmode == 1) { /* STA mode - enable it only if node TXSTBC is non-zero */ @@ -483,7 +483,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* SU Beamformer capable */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SU_BEAMFORMER_CAPABLE); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -494,7 +494,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SU_BEAMFORMER_CAPABLE); /* SU Beamformee capable */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SU_BEAMFORMEE_CAPABLE); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -505,7 +505,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SU_BEAMFORMEE_CAPABLE); /* Beamformee STS capability - only if SU beamformee capable */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_BEAMFORMEE_STS_MASK); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -518,7 +518,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_BEAMFORMEE_STS_MASK); /* Sounding dimensions - only if SU beamformer capable */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SOUNDING_DIMENSIONS_MASK); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -533,7 +533,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, * MU Beamformer capable - only if SU BFF capable, MU BFF capable * and STA (not AP) */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_MU_BEAMFORMER_CAPABLE); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -550,7 +550,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, * MU Beamformee capable - only if SU BFE capable, MU BFE capable * and AP (not STA) */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_MU_BEAMFORMEE_CAPABLE); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -564,7 +564,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SU_BEAMFORMEE_CAPABLE); /* VHT TXOP PS */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_VHT_TXOP_PS); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -573,7 +573,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_VHT_TXOP_PS); /* HTC_VHT */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_HTC_VHT); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -583,7 +583,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, /* A-MPDU length max */ /* XXX TODO: we need a userland config knob for this */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -596,7 +596,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, * Link adaptation is only valid if HTC-VHT capable is 1. * Otherwise, always set it to 0. */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_VHT_LINK_ADAPTATION_VHT_MASK); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -613,7 +613,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* RX antenna pattern */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_RX_ANTENNA_PATTERN); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -623,7 +623,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_RX_ANTENNA_PATTERN); /* TX antenna pattern */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_TX_ANTENNA_PATTERN); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -639,9 +639,9 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* MCS set - start with whatever the device supports */ - vhtcap->supp_mcs.rx_mcs_map = vap->iv_vht_mcsinfo.rx_mcs_map; + vhtcap->supp_mcs.rx_mcs_map = vap->iv_vht_cap.supp_mcs.rx_mcs_map; vhtcap->supp_mcs.rx_highest = 0; - vhtcap->supp_mcs.tx_mcs_map = vap->iv_vht_mcsinfo.tx_mcs_map; + vhtcap->supp_mcs.tx_mcs_map = vap->iv_vht_cap.supp_mcs.tx_mcs_map; vhtcap->supp_mcs.tx_highest = 0; vhtcap->vht_cap_info = new_vhtcap; From nobody Wed Nov 29 16:38:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4z4CGrz52wwG; Wed, 29 Nov 2023 16:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ4z34Yxz3LDx; Wed, 29 Nov 2023 16:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+OK678Yu9Tu4Hnik5k5W2ZiSU8+DaiYT5WkcEgQW2v8=; b=MSufW4HiRwD1U+jYYmqiAKGfmxbN9Mcc6mWcDJJ5LS37AgMsIbWkNbjr5swePx6bRRhSHP SW5gZZqycDcMjdSGc00AY4wXF93dQKuX4Rqal52tlAC6ihoIaiby9NQNrztB7pYGU6n7m6 2DsGj9/zpiCFh7RU5cFbdr21InqODDaOsb6qIrTvfHwJV7W5bLFIE2ArmZ5awz8JGeLY4o wBAblp3egxyxZJe2THesSTHc9rrbJdLAdwaFre83VZmh40lqJVQdtVClnoNO3SNX5bBPAH gjIEp2BYXe9n1MkpcEHpUQeXUbUxibuP+aH4AFfkHym2SV4IUtnNPyOLr5jTAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+OK678Yu9Tu4Hnik5k5W2ZiSU8+DaiYT5WkcEgQW2v8=; b=nr0RM0KWRlk6sSF+ezuJBYbBDZ4NnxjEiY0hppvQnxiDvvdExA4tm6lb26fjWp3AVHnrOR j6b3CG07L5au3LK0KkH298DQGjHeb9ZcHMX/6cd48ovxsFdWUiv6X16ycvfXhauSatSK0L o+HyBZsMsHfKs7p6bSN6e2zTdtlVF6TBd/VUVohKL0QwQaYh8bo3y/loBOxv7M+I+JZdmW re0WDFDy9ihWaKLVQAGXxpGOzvIB3UTHt0h4LavYVvc5kyGJ6b7aRrUE7zdEx/Lzh1HCMk xxp0vRr7qtxmh7zrcbL3Ruj9Dy//3IIzjg9ZO+GtKlinaYeDPCONDsrqrYQhgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275939; a=rsa-sha256; cv=none; b=PL9lm0HefjnV/sH7AcBVtSsAYJpMC93VnK1X4x+xopJgX3f/nKDsNYmRJDYcvhZfd3Rwxu LU1M9gAdq5v/jALMHL3OFDKxm2H49zQ1HYiYUk6i7hUleE5GkUO9qJO42VMkoBzRBeJrg/ cOjHKaoVsLHCG50cPqoFMvzr6h00ONczLmiNKm0dgxhl6uj6kRtLkRQGws0gLY5eAllTOs oRLi1TLqF1RxY+JbVzg6MWn5uwQn5tBkcoKM/X2Gh0pCOcco4uvquiM6OeorIFElepu5pM mQiQFySbrRJFuITw7OzjYjCN51/wbO1HGdKwuIIdsbS6CEtIWDPJFl6UWmOkbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4z2BRhz1CXx; Wed, 29 Nov 2023 16:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGcxpQ047272; Wed, 29 Nov 2023 16:38:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcxMO047269; Wed, 29 Nov 2023 16:38:59 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:59 GMT Message-Id: <202311291638.3ATGcxMO047269@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0ba89cbb422b - stable/13 - net80211: migrate ic_vhtcaps, ic_vht_mcsinfo, ic_flags_vht List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0ba89cbb422b8e77344c7fb1a90314d35271b879 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0ba89cbb422b8e77344c7fb1a90314d35271b879 commit 0ba89cbb422b8e77344c7fb1a90314d35271b879 Author: Bjoern A. Zeeb AuthorDate: 2023-10-27 18:44:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:12 +0000 net80211: migrate ic_vhtcaps, ic_vht_mcsinfo, ic_flags_vht Like for the VAP rename ic_flags_vht to ic_vht_flags for consistency to keep "VHT" fields together and merge ic_vhtcaps and ic_vht_mcsinfo into struct ieee80211_vht_cap ic_vht_cap. While the structure layout changes no other functional changes intended. Sponsored by: The FreeBSD Foundation (cherry picked from commit 562adbe1d354377a260e66eedb6072b720a606dc) --- sys/compat/linuxkpi/common/src/linux_80211.c | 6 +++--- sys/net80211/ieee80211.c | 6 +++--- sys/net80211/ieee80211_ddb.c | 2 +- sys/net80211/ieee80211_ioctl.c | 2 +- sys/net80211/ieee80211_node.c | 2 +- sys/net80211/ieee80211_regdomain.c | 4 ++-- sys/net80211/ieee80211_var.h | 5 ++--- sys/net80211/ieee80211_vht.c | 14 +++++++------- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index b605cb36ad88..d3b5cd7a5289 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3556,16 +3556,16 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, if (hw->wiphy->bands[NL80211_BAND_5GHZ]->vht_cap.vht_supported){ ic->ic_flags_ext |= IEEE80211_FEXT_VHT; - ic->ic_vhtcaps = + ic->ic_vht_cap.vht_cap_info = hw->wiphy->bands[NL80211_BAND_5GHZ]->vht_cap.cap; setbit(bands, IEEE80211_MODE_VHT_5GHZ); chan_flags |= NET80211_CBW_FLAG_VHT80; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ( - ic->ic_vhtcaps)) + ic->ic_vht_cap.vht_cap_info)) chan_flags |= NET80211_CBW_FLAG_VHT160; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ( - ic->ic_vhtcaps)) + ic->ic_vht_cap.vht_cap_info)) chan_flags |= NET80211_CBW_FLAG_VHT80P80; } #endif diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 8a8d79f16bdc..2bc85b7ac04a 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -552,7 +552,7 @@ ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap, vap->iv_htextcaps = ic->ic_htextcaps; /* 11ac capabilities - XXX methodize */ - vap->iv_vht_cap.vht_cap_info = ic->ic_vhtcaps; + vap->iv_vht_cap.vht_cap_info = ic->ic_vht_cap.vht_cap_info; vap->iv_vhtextcaps = ic->ic_vhtextcaps; vap->iv_opmode = opmode; @@ -943,9 +943,9 @@ ieee80211_syncflag_vht_locked(struct ieee80211com *ic, int flag) break; } if (bit) - ic->ic_flags_vht |= flag; + ic->ic_vht_flags |= flag; else - ic->ic_flags_vht &= ~flag; + ic->ic_vht_flags &= ~flag; } void diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index cc0bb4b10152..e3464bb16b0a 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -672,7 +672,7 @@ _db_show_com(const struct ieee80211com *ic, int showvaps, int showsta, db_printf("\tcryptocaps=%b\n", ic->ic_cryptocaps, IEEE80211_CRYPTO_BITS); db_printf("\thtcaps=%b\n", ic->ic_htcaps, IEEE80211_HTCAP_BITS); - db_printf("\tvhtcaps=%b\n", ic->ic_vhtcaps, IEEE80211_VHTCAP_BITS); + db_printf("\tvhtcaps=%b\n", ic->ic_vht_cap.vht_cap_info, IEEE80211_VHTCAP_BITS); #if 0 uint8_t ic_modecaps[2]; /* set of mode capabilities */ diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 90d5646e9057..35cfb139dd63 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -710,7 +710,7 @@ ieee80211_ioctl_getdevcaps(struct ieee80211com *ic, dc->dc_drivercaps = ic->ic_caps; dc->dc_cryptocaps = ic->ic_cryptocaps; dc->dc_htcaps = ic->ic_htcaps; - dc->dc_vhtcaps = ic->ic_vhtcaps; + dc->dc_vhtcaps = ic->ic_vht_cap.vht_cap_info; ci = &dc->dc_chaninfo; ic->ic_getradiocaps(ic, maxchans, &ci->ic_nchans, ci->ic_chans); KASSERT(ci->ic_nchans <= maxchans, diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 43e8f5995c30..a70edfa3acc4 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -809,7 +809,7 @@ ieee80211_setupcurchan(struct ieee80211com *ic, struct ieee80211_channel *c) * based on what HT has done; it may further promote the * channel to VHT80 or above. */ - if (ic->ic_vhtcaps != 0) { + if (ic->ic_vht_cap.vht_cap_info != 0) { int flags = getvhtadjustflags(ic); if (flags > ieee80211_vhtchanflags(c)) c = ieee80211_vht_adjust_channel(ic, c, flags); diff --git a/sys/net80211/ieee80211_regdomain.c b/sys/net80211/ieee80211_regdomain.c index a482e1eaad32..3f222dc31a5a 100644 --- a/sys/net80211/ieee80211_regdomain.c +++ b/sys/net80211/ieee80211_regdomain.c @@ -149,10 +149,10 @@ ieee80211_init_channels(struct ieee80211com *ic, if (isset(bands, IEEE80211_MODE_VHT_5GHZ)) { cbw_flags |= NET80211_CBW_FLAG_HT40; /* Make sure this is set; or assert? */ cbw_flags |= NET80211_CBW_FLAG_VHT80; - if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(ic->ic_vhtcaps)) + if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(ic->ic_vht_cap.vht_cap_info)) cbw_flags |= NET80211_CBW_FLAG_VHT160; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ( - ic->ic_vhtcaps)) + ic->ic_vht_cap.vht_cap_info)) cbw_flags |= NET80211_CBW_FLAG_VHT80P80; ieee80211_add_channel_list_5ghz(chans, IEEE80211_CHAN_MAX, nchans, def_chan_5ghz_band1, nitems(def_chan_5ghz_band1), diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 1289cf5ccf0b..868f1886069c 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -240,10 +240,9 @@ struct ieee80211com { uint8_t ic_txstream; /* # TX streams */ /* VHT information */ - uint32_t ic_vhtcaps; /* VHT capabilities */ + uint32_t ic_vht_flags; /* VHT state flags */ + struct ieee80211_vht_cap ic_vht_cap; /* VHT capabilities + MCS info */ uint32_t ic_vhtextcaps; /* VHT extended capabilities (TODO) */ - struct ieee80211_vht_mcs_info ic_vht_mcsinfo; /* Support TX/RX VHT MCS */ - uint32_t ic_flags_vht; /* VHT state flags */ uint32_t ic_vht_spare[3]; /* optional state for Atheros SuperG protocol extensions */ diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index 7dd2a6be1d2e..1561255be101 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -144,7 +144,7 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) if (! IEEE80211_CONF_VHT(ic)) return; - vap->iv_vht_cap.vht_cap_info = ic->ic_vhtcaps; + vap->iv_vht_cap.vht_cap_info = ic->ic_vht_cap.vht_cap_info; vap->iv_vhtextcaps = ic->ic_vhtextcaps; /* XXX assume VHT80 support; should really check vhtcaps */ @@ -157,7 +157,7 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vht_cap.vht_cap_info)) vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT80P80; - memcpy(&vap->iv_vht_cap.supp_mcs, &ic->ic_vht_mcsinfo, + memcpy(&vap->iv_vht_cap.supp_mcs, &ic->ic_vht_cap.supp_mcs, sizeof(struct ieee80211_vht_mcs_info)); } @@ -199,19 +199,19 @@ ieee80211_vht_announce(struct ieee80211com *ic) /* Channel width */ ic_printf(ic, "[VHT] Channel Widths: 20MHz, 40MHz, 80MHz%s%s\n", - (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(ic->ic_vhtcaps)) ? + (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(ic->ic_vht_cap.vht_cap_info)) ? ", 160MHz" : "", - (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(ic->ic_vhtcaps)) ? + (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(ic->ic_vht_cap.vht_cap_info)) ? ", 80+80MHz" : ""); /* Features */ - ic_printf(ic, "[VHT] Features: %b\n", ic->ic_vhtcaps, + ic_printf(ic, "[VHT] Features: %b\n", ic->ic_vht_cap.vht_cap_info, IEEE80211_VHTCAP_BITS); /* For now, just 5GHz VHT. Worry about 2GHz VHT later */ for (i = 0; i < 8; i++) { /* Each stream is 2 bits */ - tx = (ic->ic_vht_mcsinfo.tx_mcs_map >> (2*i)) & 0x3; - rx = (ic->ic_vht_mcsinfo.rx_mcs_map >> (2*i)) & 0x3; + tx = (ic->ic_vht_cap.supp_mcs.tx_mcs_map >> (2*i)) & 0x3; + rx = (ic->ic_vht_cap.supp_mcs.rx_mcs_map >> (2*i)) & 0x3; if (tx == 3 && rx == 3) continue; ic_printf(ic, "[VHT] NSS %d: TX MCS 0..%d, RX MCS 0..%d\n", From nobody Wed Nov 29 17:48:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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:38:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgXl72M3Wz52Hmg for ; Wed, 29 Nov 2023 21:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgXl71lWxz4m2H; Wed, 29 Nov 2023 21:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701293939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8OdV2pigaHsIra8Z7hoYQbGKO/hXbf1hc8UC3KLDJss=; b=tK6zjj8TU3dd3CSKw8LZtrTp6Tmcnycv/1o2bS1l3xaJBQTnJYIiniZNnRIkLe5vE1Ly9/ K2GDjWPskCs7gMY3dhcQSuvwCYdEvDaaoHAEin9T52Ig4fD1nvj+I4vFMUd9L0atQe7GX/ ZHaOj/CaWLB1N46eNJwp9et141EzrCdFSMWm8qWVgnATNfb37uh6TG5vSGNNKIuL4ds3X/ zIAf+Ee8co+b8kZfC55Jl/iwVHmp0O1Pcu3PnJdQ+yV7da84wlbgFo2b969i3oBxYOaZTu YposMKA95pz2CACU2Tl5ZC0TWXRbvJpVPLu26lfrUQDJ6AFeVOCtlAAXkFScaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701293939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8OdV2pigaHsIra8Z7hoYQbGKO/hXbf1hc8UC3KLDJss=; b=oFPS/jSQHbL3sEWh8EVVfjAVAFGZm4eii0SALNvFm/QxdZRjaB06NIqaG9AyrnWAk1cykg KfoBZMPkskUv2GCt0Srg8x8f2JFGmkQrkqXfi8L6g4XYAHWa9KEbnSADNc8ETahw1HlPcQ UAv0AIT2PhP2RkWFDt4vg0cAEveWuQe8kYcy88ZTkPp3sLKjcVDBItNrnJnIDMqSLShTSX 2FkWFmyuSBbFQ8Pk0iwHDFO2akpAwCrMQ5JPLOaSGPL9eKl5Lu65MrKlIBiFIjGrrdcX8i Q51PDZyxFvAIWJr+HVc2CpLgIXbBb46d3e3TPDwqwk4be2M432zAMQIg8kb4ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701293939; a=rsa-sha256; cv=none; b=YTL/qzwvSvTRJ0Xng7TMIrbmOjx1ZjByF9aAVwfZRki9ZQMGw8b489zK/MuLiKpNVdzH3T RqouTQwuyVXwNP5wKL9Rg20cP1bTnC078XxfTm3ZZkgazTGIe+xKcqR/5wIkYmhaCHlnvX ChJedFg5yo8nT1o2xaiDwOdpKG1CEZzL3VglnX1rg3tpXqRlGlRdaSX/GS19ogMBX6bdnf 8R2gJLmVLgYCeT4mFN3IkNlR8MLxtOqgAIYuXtoyUomtQgEcN9QXRL7x89AmsUDeTOgvse mfV89nYIlyJeFANDg50H5TVAyV+TMmMRVuNwRhVw6QXuG+2LOD9Avtm8+3Y/Zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgXl70nzxz7lx; Wed, 29 Nov 2023 21:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATLcx1R049956; Wed, 29 Nov 2023 21:38:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATLcxk1049955; Wed, 29 Nov 2023 21:38:59 GMT (envelope-from git) Date: Wed, 29 Nov 2023 21:38:59 GMT Message-Id: <202311292138.3ATLcxk1049955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 688514e4704b..a03ebd9beec6 - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: a03ebd9beec6243682557fa692c12b1061fc58bd X-Git-Oldrev: 688514e4704bdee4551d25960febd322ac26f297 X-Git-Newrev: a03ebd9beec6243682557fa692c12b1061fc58bd Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=688514e4704b..a03ebd9beec6 b3a985fa42de Linux 6.6 compat: fix configure error with clang (#15558) 4340f69be1f8 module/icp/asm-arm/sha2: auto detect __ARM_ARCH b94ce4e17d51 module/icp/asm-arm/sha2: fix compiling on armv5/6 2a27fd411153 ZIL: Assert record sizes in different places 1c38cdfe989d zdb: fix printf() length for uint64_t devid 7d68900af367 ZTS: get_persistent_disk_name can return truncated names 8adf2e30665c Fix zoneid when USER_NS is disabled a03ebd9beec6 ZIL: Call brt_pending_add() replaying TX_CLONE_RANGE From nobody Wed Nov 29 21:43:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgb2r51RZz52Pll for ; Wed, 29 Nov 2023 23:22:44 +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 4Sgb2r2S29z3FTQ 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-f42.google.com with SMTP id 5b1f17b1804b1-40b31232bf0so2368405e9.1 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=mXdIhNAM2Jf5+qP3WvP6S2ur9AAd8ZiIPTk7eYX4LHHFzeS9CpvrnKxyiUVMZ4lgpu wiww6FM7e4n8eHQrEEuT5YW8V5HfBXlc4uk63sbv0u+UmCfRi4ZMReMbdf9EIPOgLg9p FAXZNkZv+lNrHZMP/deQVdURRlkpatuXsLYA/noq7kQBIJpFHf8Ju2uycn8Xzyq/mNjB 3GBHd/rosKC4hsIcqLAmJK7XsPWm95KM8BrGBMcPNJ6Enmsf+Vo176eRcuC3KI0wEvLD zclBeBKvm1uXq4pr7pY2IWvhUtIkeK+NwUHkc+8mLd67mbypGhtUN8iP0gJ9q5fUkwnj fAFw== X-Gm-Message-State: AOJu0Yyidjl+H5ZYO1n+T8rFd+u6P2YAvkIC9EaC94xK/yYhuGxNPdCM AsVEd96dSDWChkevWqFuVtq5iQ== 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(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: 4Sgb2r2S29z3FTQ 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:04:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgbzL3F52z52SNd; Thu, 30 Nov 2023 00:04: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 4SgbzL2k1Wz3Jg9; Thu, 30 Nov 2023 00:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701302686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8dihIoOSsxch4rce4IGKXpumdYh1jE+LDwfT31+r27s=; b=X1cI/o2Uhme5Ck5dfkMXvxHxWODa2j+hyruy64GdcOWduQO91b4uwseCDwtKTLIGoIdjJ/ usHXboqwfUGRA5Wf7RQ+cBEXRskUmFYoRYLO/O8AMrbBRzMGfRZZ2oktgJFZjQ+O8OKux4 FlALYM+Ojg+80PvUnyt0wAjg9oDwQ2D6BgvrWn5xqIYwHt3Vc6/YijBF1JpInl5FmCAY6m XcSnIEjEhed6pulpQRP9z9VSE6j6vBPCuUKw5hb24EnuuKRs0tK0m5qJgyp9vVtlHoptxY T10+x/xy1g11/laWmHN9BhrcDj7hy3nVtwSUISIu2vqnFgG1TZ3x8FP4F4no7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701302686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8dihIoOSsxch4rce4IGKXpumdYh1jE+LDwfT31+r27s=; b=oepFB96ZNctd2oLipzn80/Oae2LNNm/zLPPOGS/J18hF2WVRW9ua4HZFx4f+hJdtllh6pO G1yUdqeP9oyHcUiXT46Abz5fZrRvbqkudDzhJIwe55OvmoiIT2lOjr3IH3soQJlynOQmAB tf1vo/ixL1JhING2s6rTbS7S/XgDwVMFuUYf0eLx/ytQXS3fZVvrgUABOEsOrShc59SpIj odNGJw7Aghe+RdIo1iSwJ5xud1pusitpKibqkHaQKyZShWoAq+cufiDGRiAkhZXTLurBVB 1ZSuYJtdcgkuTAu5KnLTwDVydiVHgLC9+PUhYlzRxI4MP/Bb1+vRyk/RCNR2Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701302686; a=rsa-sha256; cv=none; b=gnLxRreI5janDf5PznHT6qdP7+zsm7LSSdC0I/QzQmA1GFI4VW8TIGtDoPOzf5Cu66XUUc v7jBvC3e2mQFg4VsEme56xjHqngKWgfe4cA2KclO/iMx6hC7heI1kwjM0HNS5ujqhtnrL2 Kzl+t88bvHrbbWLQbnZZSP/+ShUufBNrgXvXh5OZXZE1vLiiHugLUPVPlhvSF/NJNrEewH Y5G8TMc58Mdu6CWdfrdlCE6NokEs1dJc8B/exPUBnrJq97UhhvrlFCK5JjrAkv/itNeokF tKAqfr6aLOMSD4DpJe4V59gW3Ms+qgGM7h3WkUCRX6QU/f5EwG7PP1UNQvJ+Gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgbzL1myqzCNG; Thu, 30 Nov 2023 00:04: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 3AU04ke6001120; Thu, 30 Nov 2023 00:04:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU04kmM001117; Thu, 30 Nov 2023 00:04:46 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:04:46 GMT Message-Id: <202311300004.3AU04kmM001117@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: c18c5774e022 - stable/14 - fusefs: add more readdir tests for misbehaving servers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c18c5774e022b92296d27c88f30412de455b456b Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=c18c5774e022b92296d27c88f30412de455b456b commit c18c5774e022b92296d27c88f30412de455b456b Author: Alan Somers AuthorDate: 2023-10-05 16:13:05 +0000 Commit: Alan Somers CommitDate: 2023-11-30 00:04:33 +0000 fusefs: add more readdir tests for misbehaving servers Inspired by PR 274268 Sponsored by: Axcient (cherry picked from commit 6a773a0582ba936cc19734b21ee5a7bed49cfdec) --- tests/sys/fs/fusefs/readdir.cc | 87 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/tests/sys/fs/fusefs/readdir.cc b/tests/sys/fs/fusefs/readdir.cc index 5fd8f25e8bb7..6b78e3a70697 100644 --- a/tests/sys/fs/fusefs/readdir.cc +++ b/tests/sys/fs/fusefs/readdir.cc @@ -321,6 +321,50 @@ TEST_F(Readdir, nodots) leakdir(dir); } +/* + * FUSE_READDIR returns a path with an embedded NUL. Obviously illegal, but + * nothing bad should happen. + */ +TEST_F(Readdir, nul) +{ + const char FULLPATH[] = "mountpoint/some_dir"; + const char RELPATH[] = "some_dir"; + uint64_t ino = 42; + DIR *dir; + struct dirent *de; + vector ents(1); + vector empty_ents(0); + const char nul[] = "foo\0bar"; + + expect_lookup(RELPATH, ino); + expect_opendir(ino); + ents[0].d_fileno = 4; + ents[0].d_off = 4000; + ents[0].d_namlen = sizeof(nul); + ents[0].d_type = DT_REG; + strncpy(ents[0].d_name, nul, ents[0].d_namlen); + expect_readdir(ino, 0, ents); + expect_readdir(ino, 4000, empty_ents); + + errno = 0; + dir = opendir(FULLPATH); + ASSERT_NE(nullptr, dir) << strerror(errno); + + errno = 0; + de = readdir(dir); + ASSERT_NE(nullptr, de) << strerror(errno); + EXPECT_EQ(4ul, de->d_fileno); + EXPECT_EQ(DT_REG, de->d_type); + EXPECT_EQ(sizeof(nul), de->d_namlen); + EXPECT_EQ(0, strcmp(nul, de->d_name)); + + ASSERT_EQ(nullptr, readdir(dir)); + ASSERT_EQ(0, errno); + + leakdir(dir); +} + + /* telldir(3) and seekdir(3) should work with fuse */ TEST_F(Readdir, seekdir) { @@ -397,6 +441,49 @@ TEST_F(Readdir, seekdir) leakdir(dir); } +/* + * FUSE_READDIR returns a path with an embedded /. Obviously illegal, but + * nothing bad should happen. + */ +TEST_F(Readdir, slash) +{ + const char FULLPATH[] = "mountpoint/some_dir"; + const char RELPATH[] = "some_dir"; + uint64_t ino = 42; + DIR *dir; + struct dirent *de; + vector ents(1); + vector empty_ents(0); + const char foobar[] = "foo/bar"; + + expect_lookup(RELPATH, ino); + expect_opendir(ino); + ents[0].d_fileno = 4; + ents[0].d_off = 4000; + ents[0].d_namlen = sizeof(foobar); + ents[0].d_type = DT_REG; + strncpy(ents[0].d_name, foobar, ents[0].d_namlen); + expect_readdir(ino, 0, ents); + expect_readdir(ino, 4000, empty_ents); + + errno = 0; + dir = opendir(FULLPATH); + ASSERT_NE(nullptr, dir) << strerror(errno); + + errno = 0; + de = readdir(dir); + ASSERT_NE(nullptr, de) << strerror(errno); + EXPECT_EQ(4ul, de->d_fileno); + EXPECT_EQ(DT_REG, de->d_type); + EXPECT_EQ(sizeof(foobar), de->d_namlen); + EXPECT_EQ(0, strcmp(foobar, de->d_name)); + + ASSERT_EQ(nullptr, readdir(dir)); + ASSERT_EQ(0, errno); + + leakdir(dir); +} + TEST_F(Readdir_7_8, nodots) { const char FULLPATH[] = "mountpoint/some_dir"; From nobody Thu Nov 30 00:22:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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 00:38:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgcjn70q1z52VC4; Thu, 30 Nov 2023 00:38: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 4Sgcjn67nWz3M06; Thu, 30 Nov 2023 00: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=1701304685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=47PbAamz5qujrICJxXz7mB7Wo8t2fsUoHHN44RjL5Q8=; b=bUA99fKVrrbMePmGq/aVKq6zloXvDeL6jAJ6vPC2I3Xfuxdc1pUDL+SdbQT/6D/HGZ0xvF 0XzSo2Hz/Q5oURIDrq0/j6m7Vz9V1CIR4xe3aF1g5MIHSsk4TIThoUMUYO3I4iobGc2hn5 wh1uw0S4q0yvZ/rLpSndxQ9ciboqZdX4a3E7Yx30Bnee3Elyrvel9O9XuJE3RIJo3rfA6f 7OYH4NI05r5h91KjZCHLpvr6vAmnpW7bmKQMjudq99WY8wkDQRsAlCO2VepVZrF0u8nuSE Fcn+bMMWy8JWFM5+BvQB5aLODMTB6FfTIEr62ot78ljzirtiNlxXKSFcfnZ1uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=47PbAamz5qujrICJxXz7mB7Wo8t2fsUoHHN44RjL5Q8=; b=IANia4Qwj12jfv2PcatopvPM/uzrLLeC8riOK/rSamd/LO+Dtt3cpXH0dblDzuvlB04D9x jsDhB42jIJmmdirl8GbysFvINdEgEbUJPQzB1dQU5KNgrVNfaoc68DXHFT3PAPTo3rN1EC WEDzphgsv2KOoZCzSv9Gs7tVCyJ3ThNBgNB2Udq8BIt2Uy+OQE7FjeEasCELBYx2UofVFD aIqQUauTgbszgvU6nWVYAQkJio39u4f9fPFEzeWyVe9FCOiBODRl3tQQrhXRcBQLoZyZBS jJOvO3zghVGDAPeAIVg0xC5CPcBLGbI38W4nBbslN3Ql8j5tHoXCgxa1dnovFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304685; a=rsa-sha256; cv=none; b=xrA6cVmkbrNYsvYe/nNJbQkKV+mAV2Rx54EeEtmvsWAJGcsBsSNfuIKPCcvABDQeHhH+Z7 zaROINPVUGRkiTf//hUz5PeSm+FyT3wMuk8Xt7NUA7ZLpFtCtZ/cLY8gTo4lxob+VFkRd5 IyD7zUQGOjo2ptb0G4aEK+Uh3M99tIyBmryAOMJ5y2A/kMfgzjBaGyPtNsX2YEyT3uSorU MYH5Lqxil6KcL596VloOGco0BVPNdA/ohQfVnpzdIT9yZwFLu3yASUA7iny+Rk7gsYwwQE dPiuBBcm6TExLRTT1K35Bbm1ibLXYS9IkpYsi4YGkkfUV731wtPxkrlv+Kxjkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgcjn5ChMzD8n; Thu, 30 Nov 2023 00: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 3AU0c5Tg051492; Thu, 30 Nov 2023 00: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 3AU0c5dv051489; Thu, 30 Nov 2023 00:38:05 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:05 GMT Message-Id: <202311300038.3AU0c5dv051489@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9197f220d854 - stable/14 - dpaa2: fdt improve detection for dpmac/phys List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9197f220d8541c54d4eb5f804947397e12e2f224 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9197f220d8541c54d4eb5f804947397e12e2f224 commit 9197f220d8541c54d4eb5f804947397e12e2f224 Author: Bjoern A. Zeeb AuthorDate: 2023-11-15 13:13:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:56 +0000 dpaa2: fdt improve detection for dpmac/phys 'pcs-handles' are not mandatory in the device tree here so do not enforce them. This allows us to find dpmac entries needed for phys on the WHLE-LS1 as well. Reviewed by: jceel, dsl Differential Revision: https://reviews.freebsd.org/D42644 (cherry picked from commit 6c46ebb05dccdcee18f64dc122e6685c05180217) --- sys/dev/dpaa2/dpaa2_mc_fdt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/dpaa2/dpaa2_mc_fdt.c b/sys/dev/dpaa2/dpaa2_mc_fdt.c index 24b92e68e2b7..8e9ab10dec9d 100644 --- a/sys/dev/dpaa2/dpaa2_mc_fdt.c +++ b/sys/dev/dpaa2/dpaa2_mc_fdt.c @@ -272,8 +272,6 @@ dpaa2_mc_fdt_attach(device_t dev) continue; if (!OF_hasprop(child, "reg")) continue; - if (!OF_hasprop(child, "pcs-handle")) - continue; if (dpaa2_mc_fdt_probe_child(dev, child) != 0) continue; } From nobody Thu Nov 30 00:38:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgcjq1cw0z52Tyb; Thu, 30 Nov 2023 00: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 4Sgcjq0Z3nz3M5M; Thu, 30 Nov 2023 00:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqUZA8g8uBL6S5dl7nyds1PhPJtxJzGcoo5v3fvBN3U=; b=pNpABGh6VeRMXH+GAK+4N5bT3p1NejPgnAWPUhTSEzmfCiBEk9hBx7pRLoxJZq3+hJ0Nb3 bHYJJZQv2mzTfLkLhzJSv7KYLV+XIGt4822C1GyNXMt7iN6mmmwqAZyLQUv4yQs2zmXmkN lLkGZN/OqyRwcSrwR7WLMlEODVlnoZ2bOhILtl22Wc8Q/2N/sMLxtRXMU7WHITcTCHM9Om Ex6rnCEMatcjvHAd0lM1ObNoEJxGvJcQod1P/YK1K7TwppHO5sNbuh9i+iZ0tz6lQu0FYK uEFLzbozPa7PsaQ9XQW0FlAs9MNHSZFhFrGVUdTLOgExiRdMND9yZGXDz28tpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqUZA8g8uBL6S5dl7nyds1PhPJtxJzGcoo5v3fvBN3U=; b=hg5pm+ZWpM/M3J/ychb7qKyemlRsHMJr9K2SeEwAT0sp96EZgfkQRssR7M/w+ffw8kTprh /UgsV4BZeniTVigcG8sf7GwCmcfMHCA2I1EJsVGw1YJErX3xemKr537nKDf2fw6vsj9uBQ 6p22z1QKkR7/y6j0y8gpwWRmZ5r1naH3fcHFvGD8z80bwMqd4L/FFJWkihvU3sOhkExWO/ sFD7piQrQljTNWUGzIcf/PTkQRUuXOsBanKE/bQujTCH1JU85wx8+I08TdUfIUvhOGDuuj towgINTrPNNNWTFv4JDhzkubjfNWJ34wcffyukF70PbKd2rPL3cO3KaANUS9qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304687; a=rsa-sha256; cv=none; b=L4CZchdP5rqM32o+lNXZzR9HYqsCM5xcRwIB4wPvLZWdMH+WULT2Ui1/waoCw/kkktgmDg P1+N9QJb5qtPftS2K6w027eDMwok70SlBQGjpJskavCID8jbN+S9GD9qGNmugpQKUsxIpF mRsHDbjt/u0dLeN9KuuD5uYVDZW+1fafhlUXhoPXXV24Co21o3IxNjBlZCN+CCk4WO/pL2 gr7xwQuxmB8REmILeyRMSysi7WzG7X6qzY8a8r959JLLSHtFVlcVdSFshF5+NZbXM4m5Ec m7PoXiLlQdaewtABaPBRR9eV2zhlhuUjcDD8NGBgd1qCUUc34Ev2tUC7t/ZF4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgcjp6TFtzDCN; Thu, 30 Nov 2023 00: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 3AU0c6QE051546; Thu, 30 Nov 2023 00: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 3AU0c63H051543; Thu, 30 Nov 2023 00:38:06 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:06 GMT Message-Id: <202311300038.3AU0c63H051543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 91987a959730 - stable/14 - dpaa2: defer link_state updates until we are up List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 91987a959730e051086b6d1ba55b0fa76c2695ef Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=91987a959730e051086b6d1ba55b0fa76c2695ef commit 91987a959730e051086b6d1ba55b0fa76c2695ef Author: Bjoern A. Zeeb AuthorDate: 2023-11-17 00:47:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:56 +0000 dpaa2: defer link_state updates until we are up dpaa2_ni_media_change() was called in early setup stages, before we were fully setup. That lead to internal driver state being all synched and fine but hardware state was lost/never setup corrently. Introduce dpaa2_ni_media_change_locked() so we can avoid reccursive locking and call "dpaa2_ni_media_change()" instead of mii_mediachg() as the latter does not setup our state there either. In order for this all to work, call if_setdrvflagbits() just before rather than after the above. Also remove an unecessary direct call to dpaa2_ni_miibus_statchg() which mii_mediachg() will trigger anyway. This all fixes a problem [1] that one had to lose the link (either unplugging/replugging the cable or using ifconfig media none; ifconfig media auto) to re-trigger the all updates and get the full state programmed when hardware expected. GH-Issue: https://github.com/mcusim/freebsd-src/issues/21 [1] Reviewed by: dsl, dch Differential Revision: https://reviews.freebsd.org/D42643 (cherry picked from commit 964b3408fa872178aacf58f2d84dc43564ec0aa7) --- sys/dev/dpaa2/dpaa2_ni.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index 7cb472f45ee4..c1543ec20881 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -116,6 +116,9 @@ mtx_assert(&(__sc)->lock, MA_OWNED); \ mtx_unlock(&(__sc)->lock); \ } while (0) +#define DPNI_LOCK_ASSERT(__sc) do { \ + mtx_assert(&(__sc)->lock, MA_OWNED); \ +} while (0) #define DPAA2_TX_RING(sc, chan, tc) \ (&(sc)->channels[(chan)]->txc_queue.tx_rings[(tc)]) @@ -2269,6 +2272,16 @@ dpaa2_ni_miibus_statchg(device_t dev) if (sc->fixed_link || sc->mii == NULL) { return; } + if ((if_getdrvflags(sc->ifp) & IFF_DRV_RUNNING) == 0) { + /* + * We will receive calls and adjust the changes but + * not have setup everything (called before dpaa2_ni_init() + * really). This will then setup the link and internal + * sc->link_state and not trigger the update once needed, + * so basically dpmac never knows about it. + */ + return; + } /* * Note: ifp link state will only be changed AFTER we are called so we @@ -2344,23 +2357,33 @@ err_exit: * @brief Callback function to process media change request. */ static int -dpaa2_ni_media_change(if_t ifp) +dpaa2_ni_media_change_locked(struct dpaa2_ni_softc *sc) { - struct dpaa2_ni_softc *sc = if_getsoftc(ifp); - DPNI_LOCK(sc); + DPNI_LOCK_ASSERT(sc); if (sc->mii) { mii_mediachg(sc->mii); sc->media_status = sc->mii->mii_media.ifm_media; } else if (sc->fixed_link) { - if_printf(ifp, "%s: can't change media in fixed mode\n", + if_printf(sc->ifp, "%s: can't change media in fixed mode\n", __func__); } - DPNI_UNLOCK(sc); return (0); } +static int +dpaa2_ni_media_change(if_t ifp) +{ + struct dpaa2_ni_softc *sc = if_getsoftc(ifp); + int error; + + DPNI_LOCK(sc); + error = dpaa2_ni_media_change_locked(sc); + DPNI_UNLOCK(sc); + return (error); +} + /** * @brief Callback function to process media status request. */ @@ -2443,17 +2466,20 @@ dpaa2_ni_init(void *arg) } DPNI_LOCK(sc); + /* Announce we are up and running and can queue packets. */ + if_setdrvflagbits(ifp, IFF_DRV_RUNNING, IFF_DRV_OACTIVE); + if (sc->mii) { - mii_mediachg(sc->mii); + /* + * mii_mediachg() will trigger a call into + * dpaa2_ni_miibus_statchg() to setup link state. + */ + dpaa2_ni_media_change_locked(sc); } callout_reset(&sc->mii_callout, hz, dpaa2_ni_media_tick, sc); - if_setdrvflagbits(ifp, IFF_DRV_RUNNING, IFF_DRV_OACTIVE); DPNI_UNLOCK(sc); - /* Force link-state update to initilize things. */ - dpaa2_ni_miibus_statchg(dev); - (void)DPAA2_CMD_NI_CLOSE(dev, child, DPAA2_CMD_TK(&cmd, ni_token)); (void)DPAA2_CMD_RC_CLOSE(dev, child, DPAA2_CMD_TK(&cmd, rc_token)); return; From nobody Thu Nov 30 00:38:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgcjr2FcDz52Tyc; Thu, 30 Nov 2023 00:38: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 4Sgcjr1R6Qz3MDZ; Thu, 30 Nov 2023 00:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U3WL11svBnYFfNa65AXIuewicGA/jB9x6WqpfEN4rWE=; b=NCEv7kB2z2W+aOS2CXLPcevBFMFeqrf/a2IkaZ6UpDcnYvQI9oiQ0MBo75sOx8pJe3FBgD OWBovhDIDOaYbxIbUbJi1PySfsfBb2n8jqbt7/QohhjTYAILEP6QcLZtTUe7sQx0xOysJ9 UQfAUH5Zn65aN+t6fiMXTcQXxcvsS6CC3I3CIYU0V1uWWjFe1tD1D1+sQ+hmu3I41+HnFl fkIlY282v5ZSqlRohKMUAqMLNlA/EtLo8Yata3RbTtrdsYEME/NxmfEmQzgfMeUHkCsHI2 Dm+kLjG8kYdolz+7N/ISo/Kew22Pu/vrHUUkFdQDdDkTygQ2bA5qFa41fj0Yqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U3WL11svBnYFfNa65AXIuewicGA/jB9x6WqpfEN4rWE=; b=gokEjys7GnBpieGYXJULKBqGAgJod5LQh19FxBvf35mSz+YPtUzv0UoDpNtuQgj8c2Jlpd DpQOefLwMzgq0UknBwcD/Rpz7m7NNe01AQNCMkh1i0VugS/FLFrpnvfEBg1ikqwSAsjy+u CxFSkM3vEc31b2r/WDy69ejWuXQfdpIZeu0K/opUDgA1UyQBmLaaTTT5Iej0sRDdC2K93h gSRfo6uHwd4t0eE32w6sZHflp7ZF1YHg4YTyLrwQje4aFIvQolp8jtTybVMVYE0Upm7K3R rMVlx6sx7FEu0t8aZ5Z1yllhqRg5dXncHVRgKANX2d7EaahI8HzLdIyMris5xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304688; a=rsa-sha256; cv=none; b=ENQKfUnF8E/wJfHrnhTZQ9EHmUYiFusmbOHEPuNZWWPAyEP4PjtsgC4zDm7TzamU+7ua8k zvRROGIJlboWHyu3gXNcdPOPi5IeKHJ75uQ5IuexpDIk6POVprFM5O5DosPlB4RNwAnZRy SrI0pRwpc+Kg5ahVsOd/Vk9lbx5ck19jnrIsS0ooPAAGKQckaUo4eR7Q9nQdAEmeVcncN1 2iT/AjiZkOj3RNnMT6oQBo+Wja3D9nlvp8nlOW/pJqH0cn2NOyywsOJ928Hg2sVJFyT2Ax gF2a3ouMct3XFTw5gfVpzdPZnB2GQMajPrHfuahitwfaaeSZzYsB9XOxuTFhXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgcjr0MqWzDMQ; Thu, 30 Nov 2023 00:38: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 3AU0c7xM051602; Thu, 30 Nov 2023 00:38:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0c7rE051599; Thu, 30 Nov 2023 00:38:07 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:07 GMT Message-Id: <202311300038.3AU0c7rE051599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: e0910cf2d695 - stable/14 - dpaa2: make software VLANs usable on dpni List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e0910cf2d6958e8e4593dd7488eb2c98c603859b Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e0910cf2d6958e8e4593dd7488eb2c98c603859b commit e0910cf2d6958e8e4593dd7488eb2c98c603859b Author: Bjoern A. Zeeb AuthorDate: 2023-11-15 11:46:44 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:56 +0000 dpaa2: make software VLANs usable on dpni dpni announces IFCAP_VLAN_MTU but internally does not increase the maximum frame length. Createing a vlan interface on top of a dpni interface will result in full-sized frames not passing. Extend the maximum frame length by ETHER_VLAN_ENCAP_LEN to allow at least for one layer of (software) vlans for now GH-Issue: https://github.com/mcusim/freebsd-src/issues/22 Reviewed by: dsl Differential Revision: https://reviews.freebsd.org/D42645 (cherry picked from commit 0480dccd3f347da0dbccf5917633435d5ce6cb86) --- sys/dev/dpaa2/dpaa2_ni.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index c1543ec20881..a9e6aa120549 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -2582,7 +2582,7 @@ dpaa2_ni_ioctl(if_t ifp, u_long c, caddr_t data) /* Update maximum frame length. */ error = DPAA2_CMD_NI_SET_MFL(dev, child, &cmd, - mtu + ETHER_HDR_LEN); + mtu + ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN); if (error) { device_printf(dev, "%s: failed to update maximum frame " "length: error=%d\n", __func__, error); From nobody Thu Nov 30 00:38:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgcjs37Lhz52V1f; Thu, 30 Nov 2023 00:38: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 4Sgcjs26RPz3M3x; Thu, 30 Nov 2023 00:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rR3ua+huzzwjAXCz9uVNe329y21XScNR6W/YYnHLdq8=; b=Ij4475tb+nZRPfscIYC/kTATnDbysY2SDsqP9oJtq68SfmVQ6PhXCtUHe6PmVKVxKpdFX6 3p6/jHAKiAnRFjH0Sv74td2wC0RS+ehQzWOunZRnFW7sEXrko+bnb1gPbD/RH5X2Nqi3FS pwF8dzqL1yUp9nK6Ynm9KbjGGLrWvA03QW1XjlnEcSry0rd3owEalgzRG/G4llKEPZe/Do r6YAlDZ2qaMBZQ1nUUg40Cc4KuTR6B7lUs70w017DEZb4V7WaZzcIvbFZbn5vkrGjp/Eef hsdP0jXYvsMeAAHxqT0ekGxNqm1pgIgo4gUVp77a1EdENvYAyhxMzPuaeSulhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rR3ua+huzzwjAXCz9uVNe329y21XScNR6W/YYnHLdq8=; b=BU/84PEgL38MFP8wpmKjJ/VQ2BhK94MvDzMYa9i14YDOu8Rhz99q2nvMCxhr1G95mri65T jnEb9VIqnHo8R4SbafBiJcjdx7yesNFs0clMkNkEb6oh1CN5WVSrFklyJKAYnJjQwmvceW YZX6nrMQe6jCTObsm5CZ6rBnVXCfr9RVo+jBczEHdE6ITEHufFj7MQeapJHHzGJP8H5r8K wVT+Pcp+YGoTTqBSOE7D+GBMhlRao9IrSRu75zb0yV21fjToka0kkrmjYSChE0i/1mNEKy 0bkiH2iHieovMl8OsB/2847rn085LJEF2AQn7+9m725SrzztOKAU31TAlce3PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304689; a=rsa-sha256; cv=none; b=yNMQU96zKuQlyjEgD4kvAu9JpLoF1zhoyser/kmkWW3UrNcbo3GmdaM/xX40DAy3yIfVUN ABWQ8utB1EMPw7lKPIgK9o6r8VDvi1VfUbBTJxb/tNOBvy71U97Coz+qZNhnGXwkI7Wn8c A5KVi7D9J762rqgd51RI8m18rHqVrCLWLV4gezFHkcTctyLl2hSw9DZ5le3XdPvIBXjleL Waokp5lHEjDkNhvQvzFyPHnk5pZU7ujG8RbTHOryQHjQliyg3bHecob/z/EHLbxjhLZdLY YeJGB9tgfhB8dsNvCJFkqmcsg7Do0yQKclSb17wsrP8FlUpYRo0KqHiXI9kSiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgcjs0wcQzDNf; Thu, 30 Nov 2023 00:38: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 3AU0c9sA051660; Thu, 30 Nov 2023 00:38:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0c9pC051657; Thu, 30 Nov 2023 00:38:09 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:09 GMT Message-Id: <202311300038.3AU0c9pC051657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c3216127bcf0 - stable/14 - mii: resort VSC8641 entry in miidevs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c3216127bcf059a38207e0c18a638a3970efcdcf Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c3216127bcf059a38207e0c18a638a3970efcdcf commit c3216127bcf059a38207e0c18a638a3970efcdcf Author: Bjoern A. Zeeb AuthorDate: 2023-11-17 12:26:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:56 +0000 mii: resort VSC8641 entry in miidevs VSC8641 is a ciphy not a vscphy. Sort it with the other entries of ciphy to avoid confusion. (cherry picked from commit 43324ec770f6b598f0ce25487f69a64b3c9822bd) --- sys/dev/mii/miidevs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs index 900fa80546b2..a3776fc5553d 100644 --- a/sys/dev/mii/miidevs +++ b/sys/dev/mii/miidevs @@ -211,6 +211,7 @@ model xxCICADA CS8201A 0x0020 Cicada CS8201 10/100/1000TX PHY model xxCICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY model xxCICADA CS8244 0x002c Cicada CS8244 10/100/1000TX PHY model xxVITESSE VSC8601 0x0002 Vitesse VSC8601 10/100/1000TX PHY +model xxVITESSE VSC8641 0x0003 Vitesse VSC8641 10/100/1000TX PHY /* Davicom Semiconductor PHYs */ /* AMD Am79C873 seems to be a relabeled DM9101 */ @@ -352,7 +353,6 @@ model xxTSC 78Q2121 0x0015 78Q2121 100BASE-TX media interface /* Vitesse Semiconductor (now Microsemi) */ model xxVITESSE VSC8501 0x0013 Vitesse VSC8501 10/100/1000TX PHY model xxVITESSE VSC8504 0x000c Vitesse VSC8504 10/100/1000TX PHY -model xxVITESSE VSC8641 0x0003 Vitesse VSC8641 10/100/1000TX PHY /* XaQti Corp. PHYs */ model xxXAQTI XMACII 0x0000 XaQti Corp. XMAC II gigabit interface From nobody Thu Nov 30 00:38:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgcjt6QDwz52V1l; Thu, 30 Nov 2023 00:38: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 4Sgcjt2PQDz3M29; Thu, 30 Nov 2023 00:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oQzcpWseGvOIRxmOs0hBI3LCkeZZHr+jDlKWa58O5rU=; b=vQPUEqQL8QKM0xzYd/NN18BivWeN45iVt26LhAmo41ft312ZzzlWwzkmj0xt/wid+1Iv4f cO+XH4XO4JWYl01ZP4T0I/zjvrlYbc/oLt1UCDL6YFnmK2N5Ug2H8pQKcTq5dxEm3F9Qiy rudfJdHLvsA39FAvJoYTOj8MJ5kFo1AmC58p7m966mL3sieUQMCspli1V76yicfQvA03m5 +vg8YEq8akLhB4WzaD8b9snuDRYXXS9Akih+4X98S+01oYKe3p3HCDAB4mNfcRcIrhWjL0 0lumy86YEyNOeZQSUnpYJobyLnt3ESqi6/E7pwxI2xHLWvT221yw2LH8zzWYmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oQzcpWseGvOIRxmOs0hBI3LCkeZZHr+jDlKWa58O5rU=; b=qxyFcJlPHH1ptJ0R3TaOkMgMRfZx0FOGgGcCgkIgYD6w2C2fY1znGjxDb8j87Ue7H5J4jb D2ERDI0VwrOEgz/khqkYDBiU1ZVvGeWKzQFC/f7v2rwWV5BT5q+0QOqp9Cps7oG2kQ7Fam 7hYvlL7Mn8N77aDiRlS/WXWxPOWHxf6mz7snzBO3gNy3VImSHk8lWgMqc8GmnjPgK+S4Mn kpaeFBCrAu3rKQb2X2hSDN4bchk2P+5obpIvbpienwde8lMRAmrG2ZdNhir1O/XryvFgQj jfHqui4ecR0r4qIBQw4L/JmVKARf4UuS8l6UcI300reyPMvoB6tZYkajD9KpdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304690; a=rsa-sha256; cv=none; b=pn+/SWwF2JRHpwDZIkYySQkKYmj0zOhfFZeJvoT1GB9RPIjvoJRHHysygubLJWrGP25mLM 8zMHjp9yLlyPvFZ8J2Z6EdiDwztKAx/XE0EVraLZG7jbOu5eZptH4dt2sdOYBnjyfKQVjw H9w0rVLv6HZxzzqIk+6oV4ciamZX4L+/ozrzmLHIxjl/z99O+0ABgablpt1fCDEEsTBVKl iOp+j9ZcTfiS7dyMB5GVtY0PgKFd8uq7qxB4uszmCqRGAeMdMzNlwbSynBTbw6UwVOcWut dTkmCujexsvPs2pjwiPy+vYFl56bp1rRWKkAXJW8E7+OyokMzGGUjBuFwfIPJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgcjt1WDtzCvb; Thu, 30 Nov 2023 00:38: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 3AU0cAQI051704; Thu, 30 Nov 2023 00:38:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cAfg051701; Thu, 30 Nov 2023 00:38:10 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:10 GMT Message-Id: <202311300038.3AU0cAfg051701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 45000447c1a0 - stable/14 - mii: add Vitesse/Microsemi VSC8514 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 45000447c1a08cabc379631c16b519caf26f202a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=45000447c1a08cabc379631c16b519caf26f202a commit 45000447c1a08cabc379631c16b519caf26f202a Author: Bjoern A. Zeeb AuthorDate: 2023-11-17 12:31:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:56 +0000 mii: add Vitesse/Microsemi VSC8514 The VSC8514 Quad-Port 10/100/1000BASE-T PHY seems to match the handling for the VSC8504 (for the little we support of what we could) and while it works with our generic ukphy add it as vscphy for porper display of names in the system message buffer and the like (or in case we decide to implement some extra features). Tested on: Ten64 (cherry picked from commit 1965dd85c3b33ed99cb8ef164dd7c5b20425a85e) --- sys/dev/mii/miidevs | 1 + sys/dev/mii/vscphy.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs index a3776fc5553d..78d1dddba59f 100644 --- a/sys/dev/mii/miidevs +++ b/sys/dev/mii/miidevs @@ -353,6 +353,7 @@ model xxTSC 78Q2121 0x0015 78Q2121 100BASE-TX media interface /* Vitesse Semiconductor (now Microsemi) */ model xxVITESSE VSC8501 0x0013 Vitesse VSC8501 10/100/1000TX PHY model xxVITESSE VSC8504 0x000c Vitesse VSC8504 10/100/1000TX PHY +model xxVITESSE VSC8514 0x0027 Vitesse VSC8514 10/100/1000TX PHY /* XaQti Corp. PHYs */ model xxXAQTI XMACII 0x0000 XaQti Corp. XMAC II gigabit interface diff --git a/sys/dev/mii/vscphy.c b/sys/dev/mii/vscphy.c index 7d4e7fb591f4..1fdee688d70b 100644 --- a/sys/dev/mii/vscphy.c +++ b/sys/dev/mii/vscphy.c @@ -104,6 +104,7 @@ static int vscphy_service(struct mii_softc *, struct mii_data *, int); static const struct mii_phydesc vscphys[] = { MII_PHY_DESC(xxVITESSE, VSC8501), MII_PHY_DESC(xxVITESSE, VSC8504), + MII_PHY_DESC(xxVITESSE, VSC8514), MII_PHY_END }; From nobody Thu Nov 30 00:38:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgcjv6mpcz52V6N; Thu, 30 Nov 2023 00:38: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 4Sgcjv4vVYz3MQY; Thu, 30 Nov 2023 00:38:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YduJLGJwan/hn58yz1/ERoc2EEHu89aOUHQ5lR+Z8q8=; b=jq/2Wm4zfbB2h5ZqgmbmFyuTDRAQygIIlnUtLDplgyA9IcVPmcvNzrAsEIX9ezew/CUO8d Ka3gLNVbomp7tqZuMVl3iK6d8ylnONxoutkkH215xuIwWoZnSVG7MGN3ihP49LUU7FJndG UQjRFo/uOyq+IGDpv7JB8DzRxDptdUueeUEjGl2wnzT0Jpgr1RaSAWfiZDy3uOMQbnmU+Q 4gnAox+9uGdJJ3AoZdBy4CfK3nHUAgHMHb/+mKDZng4twNbN4X4/gDE6h/EBzvfz7CX1Dx y0hxiO37QbrabxEn/YBD7/6QNPKYTX8zcAVU3ns8RjP9FiYmOyNh2CHz/Y4FtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YduJLGJwan/hn58yz1/ERoc2EEHu89aOUHQ5lR+Z8q8=; b=RtOmyNPqsu/ZAeLPIielHnVvkIPxX4NTy8UY05RpIvA02/8amR5mLWPigGkskeMRLcv2Ad RnUuFnE3ItCVA5cWzZL1gkkI6JAc9mMuWpRQlR+RdTV7fmLRj22mtdKF7f9H/ejTnDEDxf z6OWZD21ymG0U7726uRDYDwnBNGNPIz+XkIw11WXjenxnEPNFZfUluJkzYEHh3kSc7Go9g BRylG34io8f5QOay0+5sv0V1q0qdPZpxMVKww7r6Yqo1shsgNMdooT7plcW/2t5e7AH9go /LMxpVjIwo/EBTKKQ/gXZxLyzcS9Pw14rZBj8QxnnoPvGSq8TX2OBUcQYrS9Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304691; a=rsa-sha256; cv=none; b=sdRouyP+xniw+dgnpPQmGqT9pbSNbRBRhFqQaFaTkfRczDjrmeVt/lIG6YeIv1pUZnW8M8 u0BodKgOVQBt1PU64yGlarm6/901Bu5IWmzgk51GN6cuN9bIUcNmXoRWhF6GDb0BvWSYwI pz1DeYdKcSYHfZmCeYfQXcQ+96wSdPqd2SfdyCJoyHkBSr/g80CAGY/JIQYfDjYBEtEwc1 zswlm3VLIm8ckLTsBxUMdt/4ptvvZ7ThwALjD8PiTefjkvnh4kS9ILuj6VQDtBopKXln79 MtOaMEm40ReM00JJzWvoGDfWfIUVSgmXplwtarvcFrHbfYK/v2n2zpwCOZKZlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgcjv2VzYzCkl; Thu, 30 Nov 2023 00:38: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 3AU0cB7H051746; Thu, 30 Nov 2023 00:38:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cBHG051743; Thu, 30 Nov 2023 00:38:11 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:11 GMT Message-Id: <202311300038.3AU0cBHG051743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b50d8a160880 - stable/14 - net80211: make ieee80211_alloc_node() private List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b50d8a1608805dce7e1fa213c87c84a8d772d877 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b50d8a1608805dce7e1fa213c87c84a8d772d877 commit b50d8a1608805dce7e1fa213c87c84a8d772d877 Author: Bjoern A. Zeeb AuthorDate: 2023-10-02 13:57:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:56 +0000 net80211: make ieee80211_alloc_node() private Looking through the allocation/free and reference cycle of nodes we have a few (publicly) (almost) unused macros and functions. Start making them private and reducing the amount of entry paths to the same/similar functionality. First is to make ieee80211_alloc_node() static as it is nowhere used in the tree outside this file. Sponsored by: The FreeBSD Foundation (cherry picked from commit db195a523f9bbeb111b621d2c2c7a46d8b921631) --- sys/net80211/ieee80211_node.c | 5 ++++- sys/net80211/ieee80211_node.h | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 39b411059cf1..b7cdc5090c96 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -82,6 +82,9 @@ CTASSERT((IEEE80211_NODE_HASHSIZE & (IEEE80211_NODE_HASHSIZE-1)) == 0); static int ieee80211_sta_join1(struct ieee80211_node *); +static struct ieee80211_node *ieee80211_alloc_node( + struct ieee80211_node_table *, struct ieee80211vap *, + const uint8_t macaddr[IEEE80211_ADDR_LEN]); static struct ieee80211_node *node_alloc(struct ieee80211vap *, const uint8_t [IEEE80211_ADDR_LEN]); static int node_init(struct ieee80211_node *); @@ -1396,7 +1399,7 @@ ieee80211_del_node_nt(struct ieee80211_node_table *nt, ni->ni_table = NULL; } -struct ieee80211_node * +static struct ieee80211_node * ieee80211_alloc_node(struct ieee80211_node_table *nt, struct ieee80211vap *vap, const uint8_t macaddr[IEEE80211_ADDR_LEN]) { diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index 7c9ff70bcb71..826ecccb1238 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -395,9 +395,6 @@ struct ieee80211_node_table { int nt_inact_init; /* initial node inact setting */ }; -struct ieee80211_node *ieee80211_alloc_node(struct ieee80211_node_table *, - struct ieee80211vap *, - const uint8_t macaddr[IEEE80211_ADDR_LEN]); struct ieee80211_node *ieee80211_tmp_node(struct ieee80211vap *, const uint8_t macaddr[IEEE80211_ADDR_LEN]); struct ieee80211_node *ieee80211_dup_bss(struct ieee80211vap *, From nobody Thu Nov 30 00:38:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgcjw5bdSz52Thc; Thu, 30 Nov 2023 00:38: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 4Sgcjw4tgWz3MG2; Thu, 30 Nov 2023 00:38:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uh5YtTIXWLRiuUxMzoqe0OnTZf+eBdczqODAgODFJVw=; b=jsmeE1qaYA/0+NSgkfo4rtfSknUT4xO+FbdZ67BPvDoib7f/vH8+RESabrf1KyH8UmhvsF sUp8GHT9HbI6mB7RTlBG4YjE/lmkC01j3MCwr0Fb90/RbXhDGkneQlHOAMPIxqr6cEOiKZ hIGZdiFlnrfHDg7xVNaeGztGw1Y0Ijs5ALCq8a/1tKFrwrj9DuaEXzDWpD2ewUmFzNQGlH ynSdKee6PompXbYTYTPAEG3XsuN6VNWg5m51hZLf8KfxTI3sESmaciypMrIAL2Ml77WppD egqntJzSghraLiPzV/eomd4ds8jpVTDD1vE1BltsC+lyAb20hSwB7EbYzkFzVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uh5YtTIXWLRiuUxMzoqe0OnTZf+eBdczqODAgODFJVw=; b=BsXOMSMTWGwM1+b9q+pFx1J2BoAQIafCNm208ELPHaSfKgyf+IDgeg0SAUjQDxnueOAZhu 9A/4pRm2KNtPNvskQKpDfLuO+52LPhwTi+xVWarrxEpcoou5bydzip6VlHnh2ZsLSPJLIF 38bGQVnQ8929qNUjDcq5MC+jjYHssl82yU+XEaoY/DAUvvkJG7QAopnQIsxn7At5/4Nncv mvIn/W8ZLtlU02YKmNfJW9WkAZY/ofiA7XLFYPTCAYp3iF8LSBVAuByVj+ae/ybb3uMhkV cU5qI2qfidL3c6wP2TOKwBGEefqKTP1NGYzywy5+ieFU5RL33nH4ozrezHCs+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304692; a=rsa-sha256; cv=none; b=CI59VsSB342CNYtSUNH8CuX7Ze0+wQVxyoL42abnSSYMRIWCChZKPtfaWjn9hlcbwjd+85 7tAQrKUpq8eymg4UPk4i9wXHp5o9y+0YZGT/fMXpqyqhme5hHkr0j8RNY8mfiQzKXRc3kh N5iWpLgtMzrGuV0pYhMSjZNTpmW7pimE56v3HNsU/k86HwlQ+TgGgxhSNMxu/RNIE7GE8j 08uHXdkmj05RON00gfpSpvUfqEVTcHIDR8sKQOeYyPkv5lUrUQvdwJ49eZE3BxtYpBgwXG y+9aetKKuZay+pEvczZESdPgekJkbcX+Sc4WAjZ3fcr247ftJncD+kTEPlWkoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgcjw3VxKzD42; Thu, 30 Nov 2023 00:38: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 3AU0cCT0051785; Thu, 30 Nov 2023 00:38:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cCjv051782; Thu, 30 Nov 2023 00:38:12 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:12 GMT Message-Id: <202311300038.3AU0cCjv051782@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 24df98cc9d9d - stable/14 - net80211: de-inline ieee80211_ref_node() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 24df98cc9d9dce1b6b3d47d340f9eb77445d2d2c Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=24df98cc9d9dce1b6b3d47d340f9eb77445d2d2c commit 24df98cc9d9dce1b6b3d47d340f9eb77445d2d2c Author: Bjoern A. Zeeb AuthorDate: 2023-10-02 20:20:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:57 +0000 net80211: de-inline ieee80211_ref_node() Make ieee80211_ref_node() a macro so we can pass __func__, __LINE__ in for IEEE80211_DEBUG_REFCNT as we do for other refcount related functions. Add the appropriate IEEE80211_DPRINTF() call to the _ieee80211_ref_node() implementation to support wlandebug(8) +node printf style tracing. As a plus we can now also use Dtrace fbt on the _ieee80211_{ref,free}_node() implementations with futher logic, gathering backtraces, etc. more flexibly. Sponsored by: The FreeBSD Foundation (cherry picked from commit 2188852196151e5f04533eaa928a7ad0896e4bd6) --- sys/net80211/ieee80211_node.c | 14 ++++++++++++++ sys/net80211/ieee80211_node.h | 11 ++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index b7cdc5090c96..88c8ab4eff1c 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -2056,6 +2056,20 @@ _ieee80211_find_txnode(struct ieee80211vap *vap, return ni; } +struct ieee80211_node * +_ieee80211_ref_node(struct ieee80211_node *ni, + const char *func __debrefcnt_used, int line __debrefcnt_used) +{ + +#ifdef IEEE80211_DEBUG_REFCNT + IEEE80211_DPRINTF(ni->ni_vap, IEEE80211_MSG_NODE, + "%s (%s:%u) %p<%s> refcnt %d\n", __func__, func, line, ni, + ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)+1); +#endif + ieee80211_node_incref(ni); + return (ni); +} + static void __ieee80211_free_node(struct ieee80211_node *ni) { diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index 826ecccb1238..67ad4a7c44f6 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -319,13 +319,6 @@ MALLOC_DECLARE(M_80211_NODE_IE); #define IEEE80211_RSSI_GET(x) \ IEEE80211_RSSI_EP_RND(x, IEEE80211_RSSI_EP_MULTIPLIER) -static __inline struct ieee80211_node * -ieee80211_ref_node(struct ieee80211_node *ni) -{ - ieee80211_node_incref(ni); - return ni; -} - static __inline void ieee80211_unref_node(struct ieee80211_node **ni) { @@ -404,6 +397,8 @@ struct ieee80211_node *ieee80211_node_create_wds(struct ieee80211vap *, struct ieee80211_channel *); /* These functions are taking __func__, __LINE__ for IEEE80211_DEBUG_REFCNT */ +struct ieee80211_node *_ieee80211_ref_node(struct ieee80211_node *, + const char *func, int line); void _ieee80211_free_node(struct ieee80211_node *, const char *func, int line); struct ieee80211_node *_ieee80211_find_node_locked( @@ -433,6 +428,8 @@ struct ieee80211_node *_ieee80211_find_rxnode_withkey( struct ieee80211_node *_ieee80211_find_txnode(struct ieee80211vap *, const uint8_t macaddr[IEEE80211_ADDR_LEN], const char *func, int line); +#define ieee80211_ref_node(ni) \ + _ieee80211_ref_node(ni, __func__, __LINE__) #define ieee80211_free_node(ni) \ _ieee80211_free_node(ni, __func__, __LINE__) #define ieee80211_find_node_locked(nt, mac) \ From nobody Thu Nov 30 00:38:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgcjx5xKtz52Thf; Thu, 30 Nov 2023 00:38: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 4Sgcjx5MRtz3MD7; Thu, 30 Nov 2023 00:38:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uMiFGnnG0KhEuwoy0A1y7adLW1KrRln3QSr/Yi9nA4g=; b=IfkOiMoXhj7X1oFIi8Qi1qfAVMylGLsyZCPGINfgNCvky+32KYvm6nKZ/DksDmuwxakGg5 sL05GCIxdnRUN6uZYUffp5/yOZOhFXHwyczDtG/oACERRWlkwbXtY/Sm2gpDQ9KWSW26DG LqkyPnHeeH7TKmvhgaL3eiMbT0Q1RU7wQ3DsRt4cjjxWov6KXnsNy48jkOoOO5e0gyOzRb vCpC1+glXz2nqhuciEO9EM/ACn5EvfmPP7I3h1TZqOqFr7FwjT4Hm2L5SP3EKuwGTQCMqG lMqnWCl7LaI/fyIlWupYKymnE6bJtuo/JBCfOfjTdUhsBbPWyVP2ZGshtxz+nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uMiFGnnG0KhEuwoy0A1y7adLW1KrRln3QSr/Yi9nA4g=; b=YiAK9WcAd/5j/yAxiC/4W6tqxu74QttDqO9YnfmqFH67PGO7CXjet6Vzdp1bRr4iRuphSE YmYJW7QsVrUvmieHBj3vrR9MiUtZNzxz3t8EYTvYYQzZPh3KVa0TyuUr113gziPKQ1L41O d0aFiWEEZte3uo+S0uOPlmhVsbP7JbKiYZJUI3k6vQIg+jf+h/wcgCv2sYU+u09MF0JxzH qdUqZmDGovVBC8Qex4R3Fdkfg7VLJLQnu+v3lnBoAxCoK4oFsE4rVSMlSmSVaLbmxm7Tdf ka01CXMkzaap/N/71kJFwgL1n2qtaHwRIrDfKwKlO4Vgu76+0QcwZsINyTQzTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304693; a=rsa-sha256; cv=none; b=xjv6jQgfpwznyiejQKFje+y0rElA3ao4cTJ6vhh5ud0ditYaVjb0xC0fkSOd8IjV+7y8n5 fyn4e8uG2aJD9k6wkdqwxGnPaZpu7NB13zCPnwbGdbUIKGzM4tKOsmG0vGpEQrVYU/kLfs Y7Z2Vpz6TNwOy1ZohepWeRMCDcFH86Tu2a5rxKAS1+7zjEf38iv03makO1BRSNWVVLstC9 1yhkpNVWXEP2nJrPPmTH8YXsxtP5vJes6SbESKkFrj8lrBcrqMv3Ba1Fq4wRu/xN2p1fB1 7wxSrk0QmUE3oJPfdn5HHVq6IOAz5uY3LsM7Iz68Dqn+/nkMhXI1sziMoZeB3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgcjx4LhWzD8p; Thu, 30 Nov 2023 00:38: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 3AU0cDJo051836; Thu, 30 Nov 2023 00:38:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cDoq051833; Thu, 30 Nov 2023 00:38:13 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:13 GMT Message-Id: <202311300038.3AU0cDoq051833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 02c014aaf266 - stable/14 - net80211: pass __func__, __LINE__ also to ieee80211_alloc_node() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 02c014aaf2662f6a26c4a418b83432ca2c975009 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=02c014aaf2662f6a26c4a418b83432ca2c975009 commit 02c014aaf2662f6a26c4a418b83432ca2c975009 Author: Bjoern A. Zeeb AuthorDate: 2023-10-06 10:38:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:57 +0000 net80211: pass __func__, __LINE__ also to ieee80211_alloc_node() Pass caller information to ieee80211_alloc_node() so that in case IEEE80211_DEBUG_REFCNT is compiled in we can (better) track references, in this case the initial ieee80211_node_initref(). Sponsored by: The FreeBSD Foundation (cherry picked from commit 3a11944bca0f07079a61f10468b704589c52a76f) --- sys/net80211/ieee80211_node.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 88c8ab4eff1c..e451b03d8dac 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -84,7 +84,7 @@ static int ieee80211_sta_join1(struct ieee80211_node *); static struct ieee80211_node *ieee80211_alloc_node( struct ieee80211_node_table *, struct ieee80211vap *, - const uint8_t macaddr[IEEE80211_ADDR_LEN]); + const uint8_t macaddr[IEEE80211_ADDR_LEN], const char *, int); static struct ieee80211_node *node_alloc(struct ieee80211vap *, const uint8_t [IEEE80211_ADDR_LEN]); static int node_init(struct ieee80211_node *); @@ -348,7 +348,8 @@ ieee80211_create_ibss(struct ieee80211vap* vap, struct ieee80211_channel *chan) ieee80211_channel_type_char(chan), chan->ic_flags); - ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->iv_myaddr); + ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->iv_myaddr, + __func__, __LINE__); if (ni == NULL) { /* XXX recovery? */ return; @@ -458,7 +459,8 @@ ieee80211_reset_bss(struct ieee80211vap *vap) /* XXX multi-bss: wrong */ ieee80211_vap_reset_erp(vap); - ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->iv_myaddr); + ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->iv_myaddr, + __func__, __LINE__); KASSERT(ni != NULL, ("unable to setup initial BSS node")); obss = vap->iv_update_bss(vap, ieee80211_ref_node(ni)); if (obss != NULL) { @@ -921,7 +923,8 @@ ieee80211_sta_join(struct ieee80211vap *vap, struct ieee80211_channel *chan, struct ieee80211_node *ni; int do_ht = 0; - ni = ieee80211_alloc_node(&ic->ic_sta, vap, se->se_macaddr); + ni = ieee80211_alloc_node(&ic->ic_sta, vap, se->se_macaddr, + __func__, __LINE__); if (ni == NULL) { /* XXX msg */ return 0; @@ -1401,7 +1404,8 @@ ieee80211_del_node_nt(struct ieee80211_node_table *nt, static struct ieee80211_node * ieee80211_alloc_node(struct ieee80211_node_table *nt, - struct ieee80211vap *vap, const uint8_t macaddr[IEEE80211_ADDR_LEN]) + struct ieee80211vap *vap, const uint8_t macaddr[IEEE80211_ADDR_LEN], + const char *func __debrefcnt_used, int line __debrefcnt_used) { struct ieee80211com *ic = nt->nt_ic; struct ieee80211_node *ni; @@ -1418,6 +1422,11 @@ ieee80211_alloc_node(struct ieee80211_node_table *nt, IEEE80211_ADDR_COPY(ni->ni_macaddr, macaddr); ieee80211_node_initref(ni); /* mark referenced */ +#ifdef IEEE80211_DEBUG_REFCNT + IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, + "%s (%s:%u) %p<%s> refcnt %d\n", __func__, func, line, ni, + ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)); +#endif ni->ni_chan = IEEE80211_CHAN_ANYC; ni->ni_authmode = IEEE80211_AUTH_OPEN; ni->ni_txpower = ic->ic_txpowlimit; /* max power */ @@ -1480,6 +1489,12 @@ ieee80211_tmp_node(struct ieee80211vap *vap, IEEE80211_ADDR_COPY(ni->ni_macaddr, macaddr); IEEE80211_ADDR_COPY(ni->ni_bssid, bss->ni_bssid); ieee80211_node_initref(ni); /* mark referenced */ +#ifdef IEEE80211_DEBUG_REFCNT + /* Only one caller so we skip func/line passing into the func. */ + IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, + "%s (%s:%u) %p<%s> refcnt %d\n", __func__, "", -1, ni, + ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)); +#endif /* NB: required by ieee80211_fix_rate */ ieee80211_node_set_chan(ni, bss->ni_chan); ieee80211_crypto_resetkey(vap, &ni->ni_ucastkey, @@ -1513,7 +1528,7 @@ ieee80211_dup_bss(struct ieee80211vap *vap, struct ieee80211com *ic = vap->iv_ic; struct ieee80211_node *ni; - ni = ieee80211_alloc_node(&ic->ic_sta, vap, macaddr); + ni = ieee80211_alloc_node(&ic->ic_sta, vap, macaddr, __func__, __LINE__); if (ni != NULL) { struct ieee80211_node *bss = vap->iv_bss; /* @@ -1541,7 +1556,7 @@ ieee80211_node_create_wds(struct ieee80211vap *vap, struct ieee80211_node *ni; /* XXX check if node already in sta table? */ - ni = ieee80211_alloc_node(&ic->ic_sta, vap, bssid); + ni = ieee80211_alloc_node(&ic->ic_sta, vap, bssid, __func__, __LINE__); if (ni != NULL) { ni->ni_wdsvap = vap; IEEE80211_ADDR_COPY(ni->ni_bssid, bssid); From nobody Thu Nov 30 00:38:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgcjz0B4Wz52Thj; Thu, 30 Nov 2023 00:38: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 4Sgcjy6Pd1z3McV; Thu, 30 Nov 2023 00:38:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DEZsakfBfjsyrpcl9vdjy/v4fQSyRcWxFuiSzLaHNkU=; b=g/OFSgt1AIsE7Y6W75TrmSJ9KQWH3nB/EkR6mQiuaN75Brcf7496+VI3msF334u70rVBVg N3150HmU7L3mPLNlYiAvWNlAurQZI48GiMzZ89TnX9VYv7QeYUIamfpIPqSLOHqee/yyCi Cz5pRqHqet7n9QI8P3sQsGjN9ykfDoXhooiK8IeoCFELHzerv+rLxrcWf6MmPjlJUU+f+P Wdvd4DphZEvc9wWKETfvrO0NZRCo82F7a0uJRi/DyyqfImnAl3tu8Pxp2CJCDka+nAPYEg qPNXcs95ydn02iDgewiPjZi4epBZs4YzQlE4DQQPX8nfzAr/c/f2pEcHkwu38Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DEZsakfBfjsyrpcl9vdjy/v4fQSyRcWxFuiSzLaHNkU=; b=oj+mgd0ED8DUXiCZZZpXxO2/OpoOQz2plK0H8zsrpqw8SzX14vnEoeWqcX/QuRwMTvwbhr frlBlwUmMaExWc1hK/c1devzlSLZEesEtYo8xONMchItUc4iMJ4mqs0jeKT1NOiO6C3yJA IrYJurSK/QdKwDlcPIVgYH/s1Mmy+ZElrEXGoz4PfB3sQXfwgcFKq895GunEnPirasfFWM YRwB4v59ebGJBRQIitymmoncTBtZ7z4iXoU640ExIImwmGH6TyY8cwzPSZWJkaOPc/TJhi tU9IC1Ghsb5RwbuheCv4igCewjlWAQiZOXkqa6RGpe+4WhdsWaZ4yea/7d2nZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304694; a=rsa-sha256; cv=none; b=mq9n1XH+PHwN8lcRzj1o3tzj1I7qWP9qWiF7klnM6I3Wf23j7+NY9tF0F4BAHlKfu4EjBG nR7eW0UUvpR7ak46plkYI5gZomxuzzUaVLalwZBMnpikPqpY24mGZaVHqXq6Y24XdyZd8t w6JbPpyJfNpM4Rw7OjVJjA4Y6zDa2BvzbLEjCT+I9RmZJhdB+7yl60RhLO3tsf7rOYeurN bEDO/YC7zljFWEP64MTbR8FIdN3JRvjWQiSfzd5SiLqQFOps1e6wk+OHXUYCLsD1jdTFfp LfernynjLsjBWG8UGMO9f8v+No0NW/gBu3cuSKUOAXbm9A6CnujETwrSWnt3fA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgcjy5VtQzCkm; Thu, 30 Nov 2023 00:38: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 3AU0cEqR051890; Thu, 30 Nov 2023 00:38:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cEQp051887; Thu, 30 Nov 2023 00:38:14 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:14 GMT Message-Id: <202311300038.3AU0cEQp051887@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c0398e3323b4 - stable/14 - LinuxKPI: 802.11: add unconditional error reporting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c0398e3323b442cb9670784e686ef8263bd1490a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c0398e3323b442cb9670784e686ef8263bd1490a commit c0398e3323b442cb9670784e686ef8263bd1490a Author: Bjoern A. Zeeb AuthorDate: 2023-10-09 19:11:50 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:57 +0000 LinuxKPI: 802.11: add unconditional error reporting Multiple reports have shown missed state transitions in net80211 without major cause obvious (or with a txq warning in iwlwifi). In order to better track down potential problems add unconditional ic_printf calls to any case in the lkpi state machine compat code which would let us return with an error in the hope that it helps us to catch the actual problems. Also remove the debug conditions from ieee80211_{beacon,connection}_loss which can also cause state transitions to have the ic_printf all the time there too. Sponsored by: The FreeBSD Foundation (cherry picked from commit 018d93ece16bd33077021383940d0da5121f0691) --- sys/compat/linuxkpi/common/src/linux_80211.c | 84 +++++++++++++++++++++------- 1 file changed, 64 insertions(+), 20 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 4a296e2f0fad..e8fb5b4914a6 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1012,6 +1012,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int vif->bss_conf.chandef.center_freq2 = conf->def.center_freq2; } else { + ic_printf(vap->iv_ic, "%s:%d: mo_add_chanctx " + "failed: %d\n", __func__, __LINE__, error); goto out; } @@ -1024,6 +1026,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int if (error == EOPNOTSUPP) error = 0; if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_assign_vif_chanctx " + "failed: %d\n", __func__, __LINE__, error); lkpi_80211_mo_remove_chanctx(hw, conf); lchanctx = CHANCTX_CONF_TO_LCHANCTX(conf); free(lchanctx, M_LKPI80211); @@ -1049,6 +1053,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int lsta = lkpi_lsta_alloc(vap, ni->ni_macaddr, hw, ni); if (lsta == NULL) { error = ENOMEM; + ic_printf(vap->iv_ic, "%s:%d: lkpi_lsta_alloc " + "failed: %d\n", __func__, __LINE__, error); goto out; } lsta->ni = ieee80211_ref_node(ni); @@ -1068,6 +1074,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NONE); if (error != 0) { IMPROVE("do we need to undo the chan ctx?"); + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NONE) " + "failed: %d\n", __func__, __LINE__, error); goto out; } #if 0 @@ -1169,6 +1177,8 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NOTEXIST); if (error != 0) { IMPROVE("do we need to undo the chan ctx?"); + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NOTEXIST) " + "failed: %d\n", __func__, __LINE__, error); goto out; } #if 0 @@ -1247,8 +1257,11 @@ lkpi_sta_auth_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, in KASSERT(lsta->state == IEEE80211_STA_NONE, ("%s: lsta %p state not " "NONE: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_AUTH); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(AUTH) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } /* End mgd_complete_tx. */ if (lsta->in_mgd) { @@ -1386,8 +1399,11 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i /* Call iv_newstate first so we get potential DISASSOC packet out. */ error = lvif->iv_newstate(vap, nstate, arg); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: iv_newstate(%p, %d, %d) " + "failed: %d\n", __func__, __LINE__, vap, nstate, arg, error); goto outni; + } IEEE80211_UNLOCK(vap->iv_ic); LKPI_80211_LHW_LOCK(lhw); @@ -1421,8 +1437,11 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not " "AUTH: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NONE); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NONE) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1442,6 +1461,8 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NOTEXIST); if (error != 0) { IMPROVE("do we need to undo the chan ctx?"); + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NOTEXIST) " + "failed: %d\n", __func__, __LINE__, error); goto out; } @@ -1559,8 +1580,11 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int sta->wme = true; #endif error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_ASSOC); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(ASSOC) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } IMPROVE("wme / conf_tx [all]"); @@ -1634,6 +1658,8 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_AUTHORIZED); if (error != 0) { IMPROVE("undo some changes?"); + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(AUTHORIZED) " + "failed: %d\n", __func__, __LINE__, error); goto out; } @@ -1716,8 +1742,11 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* Call iv_newstate first so we get potential DISASSOC packet out. */ error = lvif->iv_newstate(vap, nstate, arg); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: iv_newstate(%p, %d, %d) " + "failed: %d\n", __func__, __LINE__, vap, nstate, arg, error); goto outni; + } IEEE80211_UNLOCK(vap->iv_ic); LKPI_80211_LHW_LOCK(lhw); @@ -1753,8 +1782,11 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int KASSERT(lsta->state == IEEE80211_STA_AUTHORIZED, ("%s: lsta %p state not " "AUTHORIZED: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_ASSOC); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(ASSOC) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1763,8 +1795,11 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int KASSERT(lsta->state == IEEE80211_STA_ASSOC, ("%s: lsta %p state not " "ASSOC: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_AUTH); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(AUTH) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1829,8 +1864,11 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* Call iv_newstate first so we get potential DISASSOC packet out. */ error = lvif->iv_newstate(vap, nstate, arg); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: iv_newstate(%p, %d, %d) " + "failed: %d\n", __func__, __LINE__, vap, nstate, arg, error); goto outni; + } IEEE80211_UNLOCK(vap->iv_ic); LKPI_80211_LHW_LOCK(lhw); @@ -1864,8 +1902,11 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int KASSERT(lsta->state == IEEE80211_STA_AUTHORIZED, ("%s: lsta %p state not " "AUTHORIZED: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_ASSOC); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(ASSOC) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1874,8 +1915,11 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int KASSERT(lsta->state == IEEE80211_STA_ASSOC, ("%s: lsta %p state not " "ASSOC: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_AUTH); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(AUTH) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1884,8 +1928,11 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not " "AUTH: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NONE); - if (error != 0) + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NONE) " + "failed: %d\n", __func__, __LINE__, error); goto out; + } lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1903,6 +1950,8 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NOTEXIST); if (error != 0) { IMPROVE("do we need to undo the chan ctx?"); + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NOTEXIST) " + "failed: %d\n", __func__, __LINE__, error); goto out; } @@ -4859,10 +4908,8 @@ linuxkpi_ieee80211_connection_loss(struct ieee80211_vif *vif) nstate = IEEE80211_S_INIT; arg = 0; /* Not a valid reason. */ -#ifdef LINUXKPI_DEBUG_80211 - if (linuxkpi_debug_80211 & D80211_TRACE) - ic_printf(vap->iv_ic, "%s: vif %p\n", __func__, vif); -#endif + ic_printf(vap->iv_ic, "%s: vif %p vap %p state %s\n", __func__, + vif, vap, ieee80211_state_name[vap->iv_state]); ieee80211_new_state(vap, nstate, arg); } @@ -4875,11 +4922,8 @@ linuxkpi_ieee80211_beacon_loss(struct ieee80211_vif *vif) lvif = VIF_TO_LVIF(vif); vap = LVIF_TO_VAP(lvif); -#ifdef LINUXKPI_DEBUG_80211 - if (linuxkpi_debug_80211 & D80211_TRACE || vap->iv_state != IEEE80211_S_RUN) - ic_printf(vap->iv_ic, "%s: vif %p vap %p state %s\n", __func__, - vif, vap, ieee80211_state_name[vap->iv_state]); -#endif + ic_printf(vap->iv_ic, "%s: vif %p vap %p state %s\n", __func__, + vif, vap, ieee80211_state_name[vap->iv_state]); ieee80211_beacon_miss(vap->iv_ic); } From nobody Thu Nov 30 00:38:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgck02NCZz52V6S; Thu, 30 Nov 2023 00:38: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 4Sgcjz73q6z3MYZ; Thu, 30 Nov 2023 00:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hWla75ZU7CDt8xgq4F1ALTHtmJLrkQYTnUZwKXMvmaE=; b=gT1vcHL3jbxyMpm/xM/UTalSzirUXbrKmJ/rUt2Gw7i+1kNfjLJ4dCoRXIlMpLfMNcfHaA Q3HRi2aipFH0e513qNJDZrj4bhdfRqWodnvC1o27QVSpE9Hs2rSdtRzL5GguiqYlMwUTle gzp1XIXVo7x+ivk3KyvhC9x2ZkDVfYk4O/HCxBQ2kinttqCnTzTVC4UvMKyZ9VybC6wZZm EsLnMa2mHGMG2SA3Ro9uC6RqXe2ebHXi2ctc7Dc+UmIi+w1hasWUxI6DJoHwxuJaYK22ZX vVW6Wd9I5Ev1y1tV/TizuBtQsy01Cfw9i61qEtQ4GLYTBQlHCLSkvZVtUNW6pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hWla75ZU7CDt8xgq4F1ALTHtmJLrkQYTnUZwKXMvmaE=; b=nIj0zBnhPQsGA8Tp8EOcImnDE2sG8WlkMFn0vjvFikmkP3JD/d0lMBe25U1WraSAF2XtRt SV3r5hsEohGOALuhnTzYKFC/q0CWuBuGNHu0aGvTRVjgKil/SG5lBlzkvHM/spkBeY9DhN YxQEFFlhMDWoqaR1IcVq36vG41v9z9OT7ZCj3ZpguVN2gdB1xE8oikKdZUsw7rQBkoDnT4 Yen8I3/JMnDQ9XJ4b+SaQPCd2xQAcUYMRaOlMYSS4y88f+oa0h4DWMqkqs/ndxOu4Xy2Fg UJ6+/74N4BaOMdOD0LJ+kGmLHIY3vBbRuP4W9khN6cC6zMmHL+7/M1hPhfpo6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304696; a=rsa-sha256; cv=none; b=LjUGbA196v+10vUj1iLzjGHszWptE+lsIVv2Cjtg5lQ7N2eQGv2OcZPExBp4/T2c3ibW+h 0Pnpaha23df8iP1AVen5ODVpQ8y1ojDdOayKVREK8TdGeLD2tnP1tfdziCs7FO23OnW4do pPHmNPQ554YJI7aF33sp/SP/PE0QYPxypJG+ric9l3EP8WXF3sLUm4fsWSSUAyM5OPnOzn tZmyMzXBDyrRs0NYmjrEIjCHU/VibfIKgP0ucnMILl/mS+URcEKMy47nBGPFcyqXTURRDm 4n5g7Fs5Bk5dT41uZMzewbTORb5xWf7J8kTS362AiNHvpklWhS+NghjqNIKTyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgcjz69XwzD8q; Thu, 30 Nov 2023 00:38: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 3AU0cFcq051938; Thu, 30 Nov 2023 00:38:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cF0b051935; Thu, 30 Nov 2023 00:38:15 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:15 GMT Message-Id: <202311300038.3AU0cF0b051935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: d27f3b8c7e64 - stable/14 - iwlwifi: re-enable "Invalid TXQ id" logging List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d27f3b8c7e6486ed0750286d7ec65e61935ce409 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d27f3b8c7e6486ed0750286d7ec65e61935ce409 commit d27f3b8c7e6486ed0750286d7ec65e61935ce409 Author: Bjoern A. Zeeb AuthorDate: 2023-10-09 19:47:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:57 +0000 iwlwifi: re-enable "Invalid TXQ id" logging Various reports recently hit the "Invalid TXQ id" in iwlwifi again. Unconditionally enable logging and add a note to report to a specific PR in the log message for now. Along with 018d93ece16b this will hopefully help us to understand what is going on. Sponsored by: The FreeBSD Foundation PR: 274382 (cherry picked from commit ad134f8ab768e3b1d2db203f1cc963bdf0eea857) --- sys/contrib/dev/iwlwifi/mvm/tx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/mvm/tx.c b/sys/contrib/dev/iwlwifi/mvm/tx.c index 2407d0ee832e..da33c1a5cc46 100644 --- a/sys/contrib/dev/iwlwifi/mvm/tx.c +++ b/sys/contrib/dev/iwlwifi/mvm/tx.c @@ -1199,9 +1199,10 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb, if (WARN_ONCE(txq_id == IWL_MVM_INVALID_QUEUE, "Invalid TXQ id")) { #if defined(__FreeBSD__) - IWL_DEBUG_TX(mvm, "fc %#06x tid %u txq_id %u mvm %p " - "skb %p { len %u } info %p sta %p\n", fc, - tid, txq_id, mvm, skb, skb->len, info, sta); + printf("%s:%d: fc %#06x tid %u txq_id %u mvm %p " + "skb %p { len %u } info %p sta %p (if you see this please " + "report to PR 274382)\n", __func__, __LINE__, + fc, tid, txq_id, mvm, skb, skb->len, info, sta); #endif iwl_trans_free_tx_cmd(mvm->trans, dev_cmd); spin_unlock(&mvmsta->lock); From nobody Thu Nov 30 00:38:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgck11tzpz52Tyy; Thu, 30 Nov 2023 00:38: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 4Sgck114gSz3MpY; Thu, 30 Nov 2023 00:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rvM/2WarlmhI+TmtHh/76+Ng59HGw5s9bPcZVZySoxg=; b=jmGpmFQCiqJkzhx163P5uAV+5kZ9NQJ/MlF7cz0hUbF11HJuz2T4oa7+gC0zp8hKP2PUrH KKCUWuOo7IqSvq/N5dlpqba/qfckzrKefJEmq3Le7quVBU6sRh/otFfTBXJYslL7YLWY8y Wqq7zRUJo1Bm17oHegJSsRlHdIFZ3X0niNwz0+DM04mNwsqCTFnJ8n1pJfQrNQtaj3jyij slF53MyX+S8mHILrP9x+mjFJVTvJxb0ki7tceysmzDPouCJpX+UZqixudIOo3+9SS9kAIV Uh1vaDSV0XF/+H1rkYOu+ptRcIcmsDq4XIWBhZh730AaIo6JZPubCdVVhtXnSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rvM/2WarlmhI+TmtHh/76+Ng59HGw5s9bPcZVZySoxg=; b=Wn7AGMfmWAz8Q0frREUWdcYfM2AD6DJY3R2CC4UlybrLOJMRD/tWb1+Nl2mllaozO+rlED S9LYwHqq+p3r+oTOF7ZaDafTCVq5KN6441C+xouyeqCpg3KiT88oa63u+7o7cS0n73AL4s CXaGu3XBEeKQ7dNtES1re+31XFp8HPggZQiDIrSNPo/S9/j5vXXxrQ2/eGkp6Nyk0As9iY I9x42EdoNwc9UCmGRUAhrALZBUWg/9lGCBL7PPXls51lLTYitOcWm/LZ7MGb2gAMU8zBaf sA/3IbRVr6kA7ggrhYFd455xWDz9PIakUMZvbJqJesIiRM7zMNAhXA4MYclmSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304697; a=rsa-sha256; cv=none; b=W/uDsloJ8dLClmQvbqASYIa1v+6E5F65rjzy7GzGawu6O0GPN67pBkSjTJHoBpBruH6lYY HRKhqmtqoJOT3Tvhes4Qlua1mzAtjGKitSah8n9TXPyBtYusj2Q2BZhCAmb7sJc4upl0xU R52OVhswRYdSv6nN2lib8TZEzanSm7/aLnRJ7Ufz2G5l2TfDm0oEQAj8ntl+k7N3LE+7wc gG578l64iH3YAlgjQmchAMQL+SwZfmF30N7+t8s7GK2+Ex5QF8Jcs3+LD+BFyQYiD5ZL4B CTfg4xZo9vRzqqXAIb9MocGHiDiCWE1/VyGReL5IMZnofqVtE1jNu1gXLG/4wA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgck10BKtzDCP; Thu, 30 Nov 2023 00:38: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 3AU0cGro051989; Thu, 30 Nov 2023 00:38:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cGCP051986; Thu, 30 Nov 2023 00:38:16 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:16 GMT Message-Id: <202311300038.3AU0cGCP051986@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 1d2f963afd83 - stable/14 - LinuxKPI: 802.11: error on state transition failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1d2f963afd83b5b06b2a0c143e480e613dbc8608 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1d2f963afd83b5b06b2a0c143e480e613dbc8608 commit 1d2f963afd83b5b06b2a0c143e480e613dbc8608 Author: Bjoern A. Zeeb AuthorDate: 2023-10-25 22:29:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:57 +0000 LinuxKPI: 802.11: error on state transition failure The state transition failures we were seeing in the early days are solved. If we now experience one stop processing before passing over to net80211 (sta_newstate()) and before updating iv_state on the vap. Sponsored by: The FreeBSD Foundation Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D42423 (cherry picked from commit 45c27ad5241f5491234afd0b47d13b8005fdb4de) --- sys/compat/linuxkpi/common/src/linux_80211.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index e8fb5b4914a6..3da91fa3e0b7 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2137,12 +2137,11 @@ lkpi_iv_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) } if (error != 0) { - /* XXX-BZ currently expected so ignore. */ ic_printf(vap->iv_ic, "%s: error %d during state transition " "%d (%s) -> %d (%s)\n", __func__, error, ostate, ieee80211_state_name[ostate], nstate, ieee80211_state_name[nstate]); - /* return (error); */ + return (error); } #ifdef LINUXKPI_DEBUG_80211 From nobody Thu Nov 30 00:38:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgck235gTz52V1q; Thu, 30 Nov 2023 00:38: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 4Sgck229DMz3Mpy; Thu, 30 Nov 2023 00:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=upZKYeiF/hDzV0NsgYg/SP7zblw5BDOxXg+Qr2VuwDo=; b=kxtp/t3U8t8QDNZo+8mxukFMjfIcsrWzWhMLCHoZFrIUKGjdOykvmhcboqXVMiOGny0PCr Yk4KIHvKPugIofmhUKxLuT02VJR/UMRyoCUlJgY0CJO96dRg+5S4577IQMMzfZWp/ql2nI UUgJ+FjKr08NJ89k/Xo5qEW2HCbq/CsEJmGOSNCDNerXeveoCvOm8XSs9JVdbl8zseyEpT 44ksCBlfLQI3iEjdeaHPa4pJ28WnBKpWSpeoZhwAeosAe1Y0Dy2BbPs0DXOLzogWG9CcDT WZ7qS2esA2bBGb+OaLmBlQFg7EcCX+4+4/Y21NHLZQkRYIwI3DAGJhuMvy2t5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=upZKYeiF/hDzV0NsgYg/SP7zblw5BDOxXg+Qr2VuwDo=; b=nAxonruITItjSeSf9e7uH0u1ChElhI3XFUGVvXN4bUm0Q3Qs89loaOoFZA8y7xDXqZm583 Tq+u4qoippJv1H2sym2J7/QzG0hFEqgp0bz2fSOwb2mi8Rt5elH2NJcHO66NqC4YMYnLrT 5PGi08004u9U0H8NqER8HEbPkpNvuK1ycm/b/+BbRASAXlLdL7TaruMt3oe3jHHCp+s52Z mNGiwCta8co1i5Uys6uS/6HSOuaCukVfwu767MzvIggFHTDi0tKhWakd6xso/bv1gQb7/S NadyiMqVKeMWttC3SmAMqoQtq5OUjLoH4Dafb34yoCJCOBydbQfjgSUQPxIp0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304698; a=rsa-sha256; cv=none; b=WTtuaY/LaA+smjBhcR9oUQ/NCBZ6z/OgsQNYq3bLdj6yyasZ0AGsF9odn3P6wtTw3BapkC 8ejfHPKEjS3osGj98BaRVNpW6MyfO5okbAGaQcN48pVILKccz/RxBk+xzK6EKYcGUfd0Bt z7BPawn3GzqNeE3raWgxluHB2Q++5EAARcMFNqPIsoSxLQGw8zfLC5ZwIrNi56XnQkkWzC YmYFTce0RqhOkb9cxDG1GABfb7fV3F0Pjo32/jCMwpoFZFReC5KsmRRoE5vbtlQK6QnZ10 ToqBMoX2qJa1MOnlBWffF3wm3vUCulllpfXHH/2iEk3yqNx7O8M1GfNCV5Tw0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgck21CwnzDCQ; Thu, 30 Nov 2023 00:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AU0cI0c052034; Thu, 30 Nov 2023 00:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cIi7052031; Thu, 30 Nov 2023 00:38:18 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:18 GMT Message-Id: <202311300038.3AU0cIi7052031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: d425c3c640a3 - stable/14 - LinuxKPI: 802.11: fix ieee80211_add_channel_cbw() argument List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d425c3c640a395654c1e16954c76bcebe6c93cc9 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d425c3c640a395654c1e16954c76bcebe6c93cc9 commit d425c3c640a395654c1e16954c76bcebe6c93cc9 Author: Bjoern A. Zeeb AuthorDate: 2023-10-26 00:11:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:57 +0000 LinuxKPI: 802.11: fix ieee80211_add_channel_cbw() argument Fix the last argument passed to ieee80211_add_channel_cbw() in lkpi_ic_getradiocaps() for both 2Ghz and 5Ghz bands. We passed in the unmodified version rather than the adjusted version based on the per-band channel information possibly leaving ieee80211_channel_flags enabled which should not be. So far this should not have made a difference given we did not enable HT or VHT. Sponsored by: The FreeBSD Foundation Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D42424 (cherry picked from commit 5856761fd5f675c3871a82effdbf714a1d1bcc5e) --- sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 3da91fa3e0b7..aba7e0e961a6 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3527,7 +3527,7 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, error = ieee80211_add_channel_cbw(c, maxchan, n, channels[i].hw_value, channels[i].center_freq, channels[i].max_power, - nflags, bands, chan_flags); + nflags, bands, cflags); /* net80211::ENOBUFS: *n >= maxchans */ if (error != 0 && error != ENOBUFS) ic_printf(ic, "%s: Adding chan %u/%u/%#x/%#x/%#x/%#x " @@ -3597,7 +3597,7 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, error = ieee80211_add_channel_cbw(c, maxchan, n, channels[i].hw_value, channels[i].center_freq, channels[i].max_power, - nflags, bands, chan_flags); + nflags, bands, cflags); /* net80211::ENOBUFS: *n >= maxchans */ if (error != 0 && error != ENOBUFS) ic_printf(ic, "%s: Adding chan %u/%u/%#x/%#x/%#x/%#x " From nobody Thu Nov 30 00:38:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgck33HNkz52VFN; Thu, 30 Nov 2023 00:38: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 4Sgck32jkFz3MsK; Thu, 30 Nov 2023 00:38:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3DIwwxr30V83yHegGsJk0+dwipTwFGZbM8XjxptSDkk=; b=ferMeVsF1DSvUOg0lWmTukJVYuh8cl6pHutWS96nZJGFc4YEmi4DxoxPh3QTvqFFc9ySV0 y9iQ+Ekoybv32ZWKKDdJ5ZJPlQSn4nuUyrN1KBckI95G9+C50OpbiNHPAA/H+HFXom6pCT i4Pgju5Kial7YyIKYTz2qHiWZ0/Vx/BcWB1kHgT13sNE9Lj4mSUnl2Js4ArYOIIhU+RL2j /lo0iASLURtVMaMzPTaOj3/V/dFELcqKlFFXD/LwCX2notZCtTrobE7TYIyig2DSny1+BR 2YfgQUTnL53ybsF9UW+hCOa6+oBOV47vCFBAP6+ZnbVLdn33tyC5jSuPPygK9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3DIwwxr30V83yHegGsJk0+dwipTwFGZbM8XjxptSDkk=; b=IEMhcl0WCXFGMtUxzYrRMkche4tjiRH3al8ZGpLk3MzT5TZu2q18j1tz/iMKGNZyiNadO7 oPMNxUD8pGc4xnKf62BxJQ+lsYaMZpxI6VqoWETPw2IuaLAYAIZekiMoZlKUw1j9kQU8oJ XyndlAiz+b/JAjaxsLbszf+YwIsCWd/kaszHU10borleSezwbDqc41jugXMKQ0Tu0svnDi mS0zqR26a+6kcOZ+d5kGGFSVNgmLId7wlggmLoEslOclKSn1yGvk6VdmFlT+RHQPYyRJ8R pV/gAmfbu2TyCSJMKJl4ONpaAf5PlRx5AmwqGi7U0KysIhwG1EG07U8PDtWMtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304699; a=rsa-sha256; cv=none; b=HaRLkwxnrPZ8ZDo3/MDC6wGX4OWblyEEX8fYP3M4LFmJGEGqRrSYAhZdQ7l5IbVygRZDRk NIYw1xsqUedfPYjCAJmp4VW/76oLAq2JCOFv8uEpsIFatfUwGcr74Jg3VgmjGSzpdlT1+h FppDK3LusSd7JoNMm+Ebf08AOkSP2hKIAg4ckmAUeBTDGGe3VLWwDu/dKvsTPT0O/Heiup IFxfYD0xrNS0ShNvKOKcBThxkfzvg3yfogAWZEIhVyg9IQ1oFjumVgCZWIw7M9tdVFD9xI t5FYMznrjcKEHYR0Z1Ku4Had2g2NjWHpvSf3Mluo7KrpZN717SXxqX1gdtP4rA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgck31pMNzD6M; Thu, 30 Nov 2023 00:38: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 3AU0cJei052079; Thu, 30 Nov 2023 00:38:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cJRr052076; Thu, 30 Nov 2023 00:38:19 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:19 GMT Message-Id: <202311300038.3AU0cJRr052076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 861bf0606a5b - stable/14 - LinuxKPI: 802.11: deal with scan_ie_len List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 861bf0606a5b13ecc796c278c57b5e51830d68ba Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=861bf0606a5b13ecc796c278c57b5e51830d68ba commit 861bf0606a5b13ecc796c278c57b5e51830d68ba Author: Bjoern A. Zeeb AuthorDate: 2023-10-27 20:41:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:57 +0000 LinuxKPI: 802.11: deal with scan_ie_len We only need to reserve the extra space for DSSS if NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES is set, so add the conditional. Also add checks in case scan_ie_len will grow beyond the maximum. Given this is currently unlikely, leave the cleanup for later as some other restructuring should be done first. Sponsored by: The FreeBSD Foundation Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D42425 (cherry picked from commit 78ca45df310563ca46448a124674e0542aab2e31) --- sys/compat/linuxkpi/common/src/linux_80211.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index aba7e0e961a6..ffda3c5693cd 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3919,20 +3919,30 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) lhw->scan_ie_len = 2 + IEEE80211_RATE_SIZE; if (lhw->max_rates > IEEE80211_RATE_SIZE) lhw->scan_ie_len += 2 + (lhw->max_rates - IEEE80211_RATE_SIZE); - /* - * net80211 does not seem to support the DSSS Parameter Set but some of - * the drivers insert it so calculate the extra fixed space in. - */ - lhw->scan_ie_len += 2 + 1; + + if (hw->wiphy->features & NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES) { + /* + * net80211 does not seem to support the DSSS Parameter Set but + * some of the drivers insert it so calculate the extra fixed + * space in. + */ + lhw->scan_ie_len += 2 + 1; + } /* Reduce the max_scan_ie_len "left" by the amount we consume already. */ - if (hw->wiphy->max_scan_ie_len > 0) + if (hw->wiphy->max_scan_ie_len > 0) { + if (lhw->scan_ie_len > hw->wiphy->max_scan_ie_len) + goto err; hw->wiphy->max_scan_ie_len -= lhw->scan_ie_len; + } if (bootverbose) ieee80211_announce(ic); return (0); +err: + IMPROVE("TODO FIXME CLEANUP"); + return (-EAGAIN); } void From nobody Thu Nov 30 00:38:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgck45b5Cz52V6c; Thu, 30 Nov 2023 00:38: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 4Sgck43bw2z3McG; Thu, 30 Nov 2023 00:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EKEr6qm+dm4U/PlMuyTfPXNHPubklElJlt9k4s2YV2g=; b=A1cZvfe9P9DMtFvKDfhXgAYwlKBmWkEWQ8BFRCy64FKoZpnuDfDXEnPWt9xyWzjHulqbUb lYQdxN6J8GGiabhpKwIFBdqoZCt2zJ+H8F04gC8O+WDB2IU852FUtUG6LKRZNaCpfhmORn oAMc4MtpoBnDy6uvoa2sxxDq5F6KiW51rAwr1KP9Ns8nJLX7dfQjiziwkUN6d4mJuPDCGM 9wJ7MuvhdQNFFsMNi1sYAu52WknCbfba52s1nGKnXi0ES/R7b3VAc5stBuhQD5exrjecwq xz0k4CQt5efEPVr8l3w64egzsudv5gCvJ7ntDSJLN6wa6WFytfiR3h7EbxLpQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EKEr6qm+dm4U/PlMuyTfPXNHPubklElJlt9k4s2YV2g=; b=jeelOfNWFqwYiMrudyxiRRgHsN7kBnI/+mGKXWaEyFbzUW2x/+z0kj562ZQ7lQrER10IcV uGUu/mMl6moA1fQTO6mUxollYxkdBcwzkmIS+TJB/VYYalGsdbRVoeLJR/w3hxYX+AdBVO RZVVhL6dqEkZatc7tHSc1OAHMFmwz+LpmJcfCt4YfhIIstRlQdyz1Iak9qI2S+QqpvijRN /QUDnGzGl/l+x9M+PSTdS+nSCkipgD4xMky1hlSAi0ShgNSZindX6SQVnyy9p6dXySWe9q kVTIerGiYC307BrEg5TnyThGozss/LwpkRShIAVEMIjOjyODd2UGb8tMnCBC/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304700; a=rsa-sha256; cv=none; b=op0jCgsF6mNn8Jng6NIX513wTm3GFeH/lwEjLhrKBGZtsfe5fv3Z4L1sysDl+Sxp+HtWJd jf870GbCWuP4hdSRhzjFBJXZ80JI9Sj3CbIkI920W/BLYJr9qEiY+zb3IBVserklM58hnD 3X53d2hCQUerE9E5rEoP/lvrmEdPVxNQjtFPrGroy1OtPkevDLAwYGF/gLRhUgTCo3yx41 IYrIPMRd2kBsHQ2sN1SPhc0eE10T695Dp6E4/TRFDaERnSyt3grX6LZ22ZyFmi6+sBUaMp gA1c8Jqc0erefh9xKZHY4TGKShEUmNR3hhnZcppc470Rbw1IvsHNbuDiRcK8vQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgck42c6ZzDNg; Thu, 30 Nov 2023 00:38: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 3AU0cKLe052128; Thu, 30 Nov 2023 00:38:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cK86052125; Thu, 30 Nov 2023 00:38:20 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:20 GMT Message-Id: <202311300038.3AU0cK86052125@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: bf0d632e4844 - stable/14 - LinuxKPI: 802.11: zero-pad debug flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bf0d632e4844c38ce5b5ee1599e2b4553bfe3322 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bf0d632e4844c38ce5b5ee1599e2b4553bfe3322 commit bf0d632e4844c38ce5b5ee1599e2b4553bfe3322 Author: Bjoern A. Zeeb AuthorDate: 2023-10-28 18:43:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:58 +0000 LinuxKPI: 802.11: zero-pad debug flags Write the debug flags as full 32bit hex numbers to have a better view on them. No functional changes. Sponsored by: The FreeBSD Foundation Reviewed by: cc, emaste Differential Revision: https://reviews.freebsd.org/D42426 (cherry picked from commit 8895b47638ea4d7a13fba97afe8cd9faacfdda83) --- sys/compat/linuxkpi/common/src/linux_80211.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index 93c1e2873206..74dc3c9f9dee 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -45,23 +45,23 @@ /* #define LINUXKPI_DEBUG_80211 */ #ifndef D80211_TODO -#define D80211_TODO 0x1 +#define D80211_TODO 0x00000001 #endif #ifndef D80211_IMPROVE -#define D80211_IMPROVE 0x2 +#define D80211_IMPROVE 0x00000002 #endif -#define D80211_IMPROVE_TXQ 0x4 -#define D80211_TRACE 0x10 -#define D80211_TRACEOK 0x20 -#define D80211_TRACE_TX 0x100 -#define D80211_TRACE_TX_DUMP 0x200 -#define D80211_TRACE_RX 0x1000 -#define D80211_TRACE_RX_DUMP 0x2000 -#define D80211_TRACE_RX_BEACONS 0x4000 +#define D80211_IMPROVE_TXQ 0x00000004 +#define D80211_TRACE 0x00000010 +#define D80211_TRACEOK 0x00000020 +#define D80211_TRACE_TX 0x00000100 +#define D80211_TRACE_TX_DUMP 0x00000200 +#define D80211_TRACE_RX 0x00001000 +#define D80211_TRACE_RX_DUMP 0x00002000 +#define D80211_TRACE_RX_BEACONS 0x00004000 #define D80211_TRACEX (D80211_TRACE_TX|D80211_TRACE_RX) #define D80211_TRACEX_DUMP (D80211_TRACE_TX_DUMP|D80211_TRACE_RX_DUMP) -#define D80211_TRACE_STA 0x10000 -#define D80211_TRACE_MO 0x100000 +#define D80211_TRACE_STA 0x00010000 +#define D80211_TRACE_MO 0x00100000 #define IMPROVE_TXQ(...) \ if (linuxkpi_debug_80211 & D80211_IMPROVE_TXQ) \ From nobody Thu Nov 30 00:38:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgck56bgRz52V2P; Thu, 30 Nov 2023 00:38: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 4Sgck5523Jz3My5; Thu, 30 Nov 2023 00:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zANzdE8U3ZfAQ3Okx8SVShgkyXKGGYD5Di6yo58VGJQ=; b=Ku4/AcPs1ZeYH6HYiA5r8jb2m7iPaKqc3YbaTCubZBoV7Ytr/u+/DsPQBfY59i6EYUAF3j f1qng3TBHBY3zbNkJyczQ8zSXqPo52RehXzdO1r7Ums9qBuednL1q4FGrtZj8m7LvJFn1l xuKSGjEMKaCuBs/nuSTPSnm6gy2frVrDBGkxtMRilAxulpV2WIuit8UIK0PmIOdgiAnRzU 18nqfIHCwihDXHClHd14JiwyIQvWoFj+wVtgBrdB1H8SbIXd16MB8jYRqsT4bBuxSXDtWT bBIOpyyFb/nAGgtbtjwsJ8oAPsnTk6yk5o5IQy6yePrmkUNGLMOjHI0W1K8Tcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zANzdE8U3ZfAQ3Okx8SVShgkyXKGGYD5Di6yo58VGJQ=; b=PiqcL348hexrOklasgwy237+BvIBx7GiKp1fu306rmnM15gctlkUKUwq1FLwGKX5YUM2s+ 8g01RUO6PsJ1Qszp3JRZhXv3mUAG5lG3G3ZKMmFGMcstAdeHruUAMbUFjdZ21x3O9iLli7 v8WMXouygb6Ekn/Nzgz5Yb8R640SU/Nht0Ei/F3jUHR8BKFLt8+BgqVT0gYtlGwLinmn3v Ue/j52ni0z4jkiCNjen1k43F0gifsK5RZSXzCtLebxbpBqr0ldqXZwc6sJcm3cCLvtaTot wkFLkBtkkgaPodg/WOqqw8wyUQeIjm45J/9pkFxD1nQVNH5LRhEEREdvhjWCSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304701; a=rsa-sha256; cv=none; b=jGMskLB+roNRIqbqBZzeuezoJAM229Ca5i4msYqPxstZwzxrbSmFvVO1ij+W08Hoffrz/l uefSNl/H8oVgM0jofpr1Zb/DTB3bKdz4fcSAzNh6EMUYhp1821DdgKvEqjW0HQRHKTk9Pl 4lCUdbqvBGhG6C6uCzkTVHrjYU+rs/DtgB2VTPhS0UqmVlQ3iCdc4VCkVQbDIvEY5ns6z8 nUhSBMvp//vkZvABsyUkJm8wKdCxZdmX8F5+xe73fp0iwT49358NBxkhptaQEQJnbFgNHu Urjz8KudbEKYXmLISxijYQkvpLWdLjhF4bIW/+JI3nLPXM8Zw4HXwPc4bKcX5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgck53fc3zD8r; Thu, 30 Nov 2023 00:38: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 3AU0cLvv052169; Thu, 30 Nov 2023 00:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cLcl052166; Thu, 30 Nov 2023 00:38:21 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:21 GMT Message-Id: <202311300038.3AU0cLcl052166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: bd10aa138e78 - stable/14 - net80211: add ieee80211_add_vhtcap_ch() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bd10aa138e78b621ee82288bc11d7543c33a9a35 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bd10aa138e78b621ee82288bc11d7543c33a9a35 commit bd10aa138e78b621ee82288bc11d7543c33a9a35 Author: Bjoern A. Zeeb AuthorDate: 2023-10-26 20:55:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:58 +0000 net80211: add ieee80211_add_vhtcap_ch() Add an implementation of ieee80211_add_vhtcap() which works based on information derived from the vap (and possibly channel/band but we do not support that yet in net80211). This is needed for scans request information in LinuxKPI at times before we have a BSS. Sponsored by: The FreeBSD Foundation Reviewed by: adrian, cc Differential Revision: https://reviews.freebsd.org/D42422 (cherry picked from commit 6c3ae01cc75afdd575f54289b2879a7c98d55bf6) --- sys/net80211/ieee80211_vht.c | 27 +++++++++++++++++++++++++++ sys/net80211/ieee80211_vht.h | 2 ++ 2 files changed, 29 insertions(+) diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index 77611d9704a2..f7a13157150e 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -707,6 +707,33 @@ ieee80211_add_vhtcap(uint8_t *frm, struct ieee80211_node *ni) return (frm); } +/* + * Non-associated probe requests. Add VHT capabilities based on + * the current channel configuration. No BSS yet. + */ +uint8_t * +ieee80211_add_vhtcap_ch(uint8_t *frm, struct ieee80211vap *vap, + struct ieee80211_channel *c) +{ + struct ieee80211_vht_cap *vhtcap; + + memset(frm, 0, 2 + sizeof(*vhtcap)); + frm[0] = IEEE80211_ELEMID_VHT_CAP; + frm[1] = sizeof(*vhtcap); + frm += 2; + + /* 32-bit VHT capability */ + ADDWORD(frm, vap->iv_vht_cap.vht_cap_info); + + /* supp_mcs */ + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.rx_mcs_map); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.rx_highest); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.tx_mcs_map); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.tx_highest); + + return (frm); +} + static uint8_t ieee80211_vht_get_chwidth_ie(struct ieee80211_channel *c) { diff --git a/sys/net80211/ieee80211_vht.h b/sys/net80211/ieee80211_vht.h index a3830ae13ba7..756c2e367485 100644 --- a/sys/net80211/ieee80211_vht.h +++ b/sys/net80211/ieee80211_vht.h @@ -50,6 +50,8 @@ void ieee80211_vht_node_leave(struct ieee80211_node *ni); uint8_t * ieee80211_add_vhtcap(uint8_t *frm, struct ieee80211_node *); uint8_t * ieee80211_add_vhtinfo(uint8_t *frm, struct ieee80211_node *); +uint8_t *ieee80211_add_vhtcap_ch(uint8_t *, struct ieee80211vap *, + struct ieee80211_channel *); void ieee80211_vht_update_cap(struct ieee80211_node *, const uint8_t *, const uint8_t *); From nobody Thu Nov 30 00:38:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgck66q27z52VCV; Thu, 30 Nov 2023 00:38: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 4Sgck65zGWz3Mtg; Thu, 30 Nov 2023 00:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=75LhgQdVCaFoyCI2jOBMl0cdBUq2IJ61C2sBJPuNp+g=; b=WK12IBKjhzLMN07xIpJfZOBfRpM0IIHzKtzD/A9AdOxpO7sn/WpfraWY15t2OTCn5HVyzi byfjb2BzusnUuh5f3otry9S7kU7iH7xRRBqEKJi8hP9mamHX7g+24fnyOJe6tpfU3wv+js nXLcJxOwY9CRG5/vs8OXIwLB7lgHsqFcxEEDeBQc83kh82M5TptHEjVw1crz6zL5F6XYpR NLuvqI81x4ueasNOm38usOajxpcWtIjM4+LJZlAK5X8Cyn2o+hejGng67pJx7E+mAqNhc1 vvV513hWv4ptvt+H3cVTmK8wvQNWJkPnW75gfsrnxC0eCL4PPWJLYkSrEN2hyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=75LhgQdVCaFoyCI2jOBMl0cdBUq2IJ61C2sBJPuNp+g=; b=PabOCMtXAFVWh1xXL6eQzTBfGipdJ1xWT7yN29rI5LdBRWT5EcS6WgmVtIbNQkzPGjWpby gN7LoiwQaQ/3iIW/g2JWkQGIGqzwLt+rsjtiB53W8PAfFOyrrEgotMkdPDN/MlIwAnMi0k Uq+pWyJ2dCl5UfHxmNihbz/rP+WTmwSumncsIBsXeGu3E6142BMDoJpko5lFK2ElvU6EkS WlrjhmLhJBtmyzDGXpEf8FjpOOh9r4pNf/WIRexFn9Ee9O3ae+2iNL0h0MXj3pehWtuggq fq8zkzAMLynOL0oVfK1Vn+npwscr8Sk66+TauanO5x2U8u+WlQKiT7aER3GZiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304702; a=rsa-sha256; cv=none; b=hsThzIcIovVKgtzOWZCfIJ6Gv0S/fjxrOCiKBmIuo2SbR1/u33VtY5FrH0/O1FxCc1bEhQ d8XIzxy/WLMiE/mYZhBP75XcMx1O+RMB05Vt5MfGtIn2iJJfRuP5WiGu0SHfvIFq0MnVRc 74sOJewjqeH9EYgfLE+2kZG+YQWIj9NnmZUADe+EMPbqw5bcnvEC+8ZV5HvQXzMo6ns5C/ pHuDzHi0U3/Ch0aM4F84wT9vsKrjaGD+BK2LNd9Cvvb1cSoET3fondqNYuMJ1jUAHYpZRO 5a9FLmB0PaDZx0g5lmBVZfExqLjO4zgxRExWjYctPxXi3VASg7k2lEgcVtyWQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgck64wJ9zD6N; Thu, 30 Nov 2023 00:38: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 3AU0cMpQ052214; Thu, 30 Nov 2023 00:38:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cMEj052211; Thu, 30 Nov 2023 00:38:22 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:22 GMT Message-Id: <202311300038.3AU0cMEj052211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5f760ad573d1 - stable/14 - net80211: rename iv_flags_vht to iv_vht_flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5f760ad573d1458b33403cb5ca1b1977c7f7170a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5f760ad573d1458b33403cb5ca1b1977c7f7170a commit 5f760ad573d1458b33403cb5ca1b1977c7f7170a Author: Bjoern A. Zeeb AuthorDate: 2023-10-27 18:18:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:58 +0000 net80211: rename iv_flags_vht to iv_vht_flags While the flag field is internal start naming it as well as "iv_vht*" so we keep all "VHT" fields together. This breaks with what was done done for HT but with HE, EHT, .. coming one day seems the more logic choice. No functional changes intended. Sponsored by: The FreeBSD Foundation Reviewed by: adrian, cc Differential Revision: https://reviews.freebsd.org/D42419 (cherry picked from commit ef48d4fa122d863db11e41608ceea641eec54704) --- sys/net80211/ieee80211.c | 6 +++--- sys/net80211/ieee80211_ht.c | 12 ++++++------ sys/net80211/ieee80211_ioctl.c | 2 +- sys/net80211/ieee80211_node.c | 6 +++--- sys/net80211/ieee80211_output.c | 6 +++--- sys/net80211/ieee80211_scan_sta.c | 8 ++++---- sys/net80211/ieee80211_sta.c | 4 ++-- sys/net80211/ieee80211_var.h | 2 +- sys/net80211/ieee80211_vht.c | 10 +++++----- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 6584e0b6e027..41b743c988f4 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -939,7 +939,7 @@ ieee80211_syncflag_vht_locked(struct ieee80211com *ic, int flag) bit = 0; TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) - if (vap->iv_flags_vht & flag) { + if (vap->iv_vht_flags & flag) { bit = 1; break; } @@ -957,9 +957,9 @@ ieee80211_syncflag_vht(struct ieee80211vap *vap, int flag) IEEE80211_LOCK(ic); if (flag < 0) { flag = -flag; - vap->iv_flags_vht &= ~flag; + vap->iv_vht_flags &= ~flag; } else - vap->iv_flags_vht |= flag; + vap->iv_vht_flags |= flag; ieee80211_syncflag_vht_locked(ic, flag); IEEE80211_UNLOCK(ic); } diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index 0e5a4df04305..34d330f0dd09 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -1935,12 +1935,12 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) uint32_t vhtflags = 0; vhtflags = 0; - if (ni->ni_flags & IEEE80211_NODE_VHT && vap->iv_flags_vht & IEEE80211_FVHT_VHT) { + if (ni->ni_flags & IEEE80211_NODE_VHT && vap->iv_vht_flags & IEEE80211_FVHT_VHT) { if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_160MHZ) && /* XXX 2 means "160MHz and 80+80MHz", 1 means "160MHz" */ (_IEEE80211_MASKSHIFT(vap->iv_vhtcaps, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) >= 1) && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT160)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT160)) { vhtflags = IEEE80211_CHAN_VHT160; /* Mirror the HT40 flags */ if (htflags == IEEE80211_CHAN_HT40U) { @@ -1952,7 +1952,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) /* XXX 2 means "160MHz and 80+80MHz" */ (_IEEE80211_MASKSHIFT(vap->iv_vhtcaps, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) == 2) && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80P80)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80P80)) { vhtflags = IEEE80211_CHAN_VHT80P80; /* Mirror the HT40 flags */ if (htflags == IEEE80211_CHAN_HT40U) { @@ -1961,7 +1961,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) vhtflags |= IEEE80211_CHAN_HT40D; } } else if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_80MHZ) && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80)) { vhtflags = IEEE80211_CHAN_VHT80; /* Mirror the HT40 flags */ if (htflags == IEEE80211_CHAN_HT40U) { @@ -1979,11 +1979,11 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) * 'ht40' as that flag. */ if ((htflags == IEEE80211_CHAN_HT40U) && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT40)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT40)) { vhtflags = IEEE80211_CHAN_VHT40U | IEEE80211_CHAN_HT40U; } else if (htflags == IEEE80211_CHAN_HT40D && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT40)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT40)) { vhtflags = IEEE80211_CHAN_VHT40D | IEEE80211_CHAN_HT40D; } else if (htflags == IEEE80211_CHAN_HT20) { diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 674d163e3e67..d3e4bd1ca561 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -1156,7 +1156,7 @@ ieee80211_ioctl_get80211(struct ieee80211vap *vap, u_long cmd, ireq->i_val = 1; break; case IEEE80211_IOC_VHTCONF: - ireq->i_val = vap->iv_flags_vht & IEEE80211_FVHT_MASK; + ireq->i_val = vap->iv_vht_flags & IEEE80211_FVHT_MASK; break; default: error = ieee80211_ioctl_getdefault(vap, ireq); diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index e451b03d8dac..60230fcec1c5 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1015,7 +1015,7 @@ ieee80211_sta_join(struct ieee80211vap *vap, struct ieee80211_channel *chan, */ if (ni->ni_ies.vhtopmode_ie != NULL && ni->ni_ies.vhtcap_ie != NULL && - vap->iv_flags_vht & IEEE80211_FVHT_VHT) { + vap->iv_vht_flags & IEEE80211_FVHT_VHT) { if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) { printf("%s: BSS %6D: 2GHz channel, VHT info; ignoring\n", __func__, @@ -1589,7 +1589,7 @@ ieee80211_node_create_wds(struct ieee80211vap *vap, * ni_chan will be adjusted to an HT channel. */ ieee80211_ht_wds_init(ni); - if (vap->iv_flags_vht & IEEE80211_FVHT_VHT) { + if (vap->iv_vht_flags & IEEE80211_FVHT_VHT) { printf("%s: TODO: vht_wds_init\n", __func__); } } else { @@ -1824,7 +1824,7 @@ ieee80211_init_neighbor(struct ieee80211_node *ni, if ((ni->ni_ies.vhtcap_ie != NULL) && (ni->ni_ies.vhtopmode_ie != NULL) && - (ni->ni_vap->iv_flags_vht & IEEE80211_FVHT_VHT)) { + (ni->ni_vap->iv_vht_flags & IEEE80211_FVHT_VHT)) { do_vht_setup = 1; } } diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 2358ba009e13..6fc4a1567d8e 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -2524,12 +2524,12 @@ ieee80211_probereq_ie(struct ieee80211vap *vap, struct ieee80211com *ic, * VHT channel. */ #ifdef notyet - if (vap->iv_flags_vht & IEEE80211_FVHT_VHT) { + if (vap->iv_vht_flags & IEEE80211_FVHT_VHT) { struct ieee80211_channel *c; c = ieee80211_ht_adjust_channel(ic, ic->ic_curchan, vap->iv_flags_ht); - c = ieee80211_vht_adjust_channel(ic, c, vap->iv_flags_vht); + c = ieee80211_vht_adjust_channel(ic, c, vap->iv_vht_flags); frm = ieee80211_add_vhtcap_ch(frm, vap, c); } #endif @@ -2887,7 +2887,7 @@ ieee80211_send_mgmt(struct ieee80211_node *ni, int type, int arg) frm = ieee80211_add_htcap(frm, ni); } - if ((vap->iv_flags_vht & IEEE80211_FVHT_VHT) && + if ((vap->iv_vht_flags & IEEE80211_FVHT_VHT) && IEEE80211_IS_CHAN_VHT(ni->ni_chan) && ni->ni_ies.vhtcap_ie != NULL && ni->ni_ies.vhtcap_ie[0] == IEEE80211_ELEMID_VHT_CAP) { diff --git a/sys/net80211/ieee80211_scan_sta.c b/sys/net80211/ieee80211_scan_sta.c index 9389a7bf53d0..a8159fca6d80 100644 --- a/sys/net80211/ieee80211_scan_sta.c +++ b/sys/net80211/ieee80211_scan_sta.c @@ -1680,7 +1680,7 @@ notfound: chan = ieee80211_ht_adjust_channel(ic, chan, vap->iv_flags_ht); chan = ieee80211_vht_adjust_channel(ic, - chan, vap->iv_flags_vht); + chan, vap->iv_vht_flags); ieee80211_create_ibss(vap, chan); return 1; } @@ -1713,7 +1713,7 @@ notfound: chan = ieee80211_ht_adjust_channel(ic, chan, vap->iv_flags_ht); chan = ieee80211_vht_adjust_channel(ic, - chan, vap->iv_flags_vht); + chan, vap->iv_vht_flags); if (!ieee80211_sta_join(vap, chan, &selbs->base)) goto notfound; return 1; /* terminate scan */ @@ -1866,7 +1866,7 @@ ap_end(struct ieee80211_scan_state *ss, struct ieee80211vap *vap) return 1; } chan = ieee80211_ht_adjust_channel(ic, bestchan, vap->iv_flags_ht); - chan = ieee80211_vht_adjust_channel(ic, chan, vap->iv_flags_vht); + chan = ieee80211_vht_adjust_channel(ic, chan, vap->iv_vht_flags); ieee80211_create_ibss(vap, chan); return 1; @@ -1946,7 +1946,7 @@ notfound: chan = ieee80211_ht_adjust_channel(ic, chan, vap->iv_flags_ht); chan = ieee80211_vht_adjust_channel(ic, - chan, vap->iv_flags_vht); + chan, vap->iv_vht_flags); } } else chan = vap->iv_des_chan; diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c index 37f384325970..042f5636be29 100644 --- a/sys/net80211/ieee80211_sta.c +++ b/sys/net80211/ieee80211_sta.c @@ -1524,7 +1524,7 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype, do_ht = 1; } if (scan.vhtcap != NULL && scan.vhtopmode != NULL && - (vap->iv_flags_vht & IEEE80211_FVHT_VHT)) { + (vap->iv_vht_flags & IEEE80211_FVHT_VHT)) { /* XXX state changes? */ ieee80211_vht_updateparams(ni, scan.vhtcap, scan.vhtopmode); @@ -1870,7 +1870,7 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype, ieee80211_ht_updateparams(ni, htcap, htinfo); if ((vhtcap != NULL) && (vhtopmode != NULL) & - (vap->iv_flags_vht & IEEE80211_FVHT_VHT)) { + (vap->iv_vht_flags & IEEE80211_FVHT_VHT)) { /* * Log if we get a VHT assoc/reassoc response. * We aren't ready for 2GHz VHT support. diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 2fd46278d7ea..1208a8b3ab4e 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -423,7 +423,7 @@ struct ieee80211vap { int iv_inact_probe; /* inactive probe time */ /* VHT flags */ - uint32_t iv_flags_vht; /* VHT state flags */ + uint32_t iv_vht_flags; /* VHT state flags */ uint32_t iv_vhtcaps; /* VHT capabilities */ uint32_t iv_vhtextcaps; /* VHT extended capabilities (TODO) */ struct ieee80211_vht_mcs_info iv_vht_mcsinfo; diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index f7a13157150e..32123e7a2815 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -148,14 +148,14 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) vap->iv_vhtextcaps = ic->ic_vhtextcaps; /* XXX assume VHT80 support; should really check vhtcaps */ - vap->iv_flags_vht = + vap->iv_vht_flags = IEEE80211_FVHT_VHT | IEEE80211_FVHT_USEVHT40 | IEEE80211_FVHT_USEVHT80; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(vap->iv_vhtcaps)) - vap->iv_flags_vht |= IEEE80211_FVHT_USEVHT160; + vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT160; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vhtcaps)) - vap->iv_flags_vht |= IEEE80211_FVHT_USEVHT80P80; + vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT80P80; memcpy(&vap->iv_vht_mcsinfo, &ic->ic_vht_mcsinfo, sizeof(struct ieee80211_vht_mcs_info)); @@ -383,10 +383,10 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK); } if ((val2 == 2) && - ((vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80P80) == 0)) + ((vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80P80) == 0)) val2 = 1; if ((val2 == 1) && - ((vap->iv_flags_vht & IEEE80211_FVHT_USEVHT160) == 0)) + ((vap->iv_vht_flags & IEEE80211_FVHT_USEVHT160) == 0)) val2 = 0; val = MIN(val1, val2); new_vhtcap |= _IEEE80211_SHIFTMASK(val, From nobody Thu Nov 30 00:38:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgck772q4z52VJ0; Thu, 30 Nov 2023 00:38: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 4Sgck76ZQYz3N2R; Thu, 30 Nov 2023 00:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z+abk0TzdD4hjBo9Z00FnNm1RjQWr7s58hnzzkd74z4=; b=dHPnOKJdB7XRDqiMsv6l7iZWs4R5OWOZuCZMuD2w0LiG6X/N7dPLrZ1qFTkeOhAOWPSWdf KnCtD3UqBvWLASq2PMi992dM+H+zkhlo0Bl6gxDFyc3GFCqorq9K6SR47xijhF5H9I2Gg7 13qO7VWkHgvG1QFKGnWS8Jz265cmBNVWiuFGzgWK7wSxDOBJ4haZ3Jx8pOwY21Xo9GOmwt 7yO4kd0c4bva7OFKhLMzz36O1+lMjcdrav471jVWYKkBmTXpUB7lcbXclmKbQaLloyREFc mn8+TE8L30gMi9+XD4BmyrY0HMsr3mTL/1paGu9F++ilnqf5QdHGvylvSHdr+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z+abk0TzdD4hjBo9Z00FnNm1RjQWr7s58hnzzkd74z4=; b=QNetCE8CFv/3tuKrwf2S3Zgxq8EGqA8U5rSGtaomaM7rj/OevEgVTho7m2HR+dtLP8BM0J N2jPPBXvQ8HF13hKv4XG8h8WIg9WOOVGT5b/jxbc0jJ/XigIbezvTFyGMcEwdIUwOezHDf IrgE2tUVjM9l9GMJKQ7qn/2ssXubtrC1NePj0mXU4DLXsEVwTWdbjvekDa3VPKsD1pO/uA NNm6zrCvBKqMdR3bvzygBWGVv0e/NuVEfYG+kGU643Phad1+6gtCx1LhjQ5RJy9BvPbgD1 8PmHUO4kzCaZhKhliJm3bdhLTpUEFpitPm0KiwdOGStDFgVeVbfdxHWpgEVqlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304703; a=rsa-sha256; cv=none; b=GwswatSx9QWzqP66ntxTDJVeVsmK63zXK/Tg/nHSyE7Plp4sSNHxRZ2PfFHaCDHnUcC33C mvsYm7TRjFlq11rU5A00IOkbSy4u8Hw1IV7BGQA9xenluCn+SQzA81X49QYef2pFR2Qf0+ ZxojlFC6F0XLUTPiBerZ3DmzVRlVaZrRTnrDGXYfLNj9m86ora4K/UBtjZ6jYxueyblU3w zsYWP3TclFC/ERYvK9jD6ojcTP+Je0lm+uovmQdHQ4Mybteo92ZGEl4G/uM5UGDcp1b4pZ uaLLAXXD5omAOBW4Bo8qIxf0s/JMFcW5PlWFNoirPaeV7OMmUpbDFf/H0ht1vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgck75gHkzDNh; Thu, 30 Nov 2023 00:38: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 3AU0cNdG052263; Thu, 30 Nov 2023 00:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cNF4052257; Thu, 30 Nov 2023 00:38:23 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:23 GMT Message-Id: <202311300038.3AU0cNF4052257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 981462ddddb3 - stable/14 - net80211: combine iv_vhtcaps and iv_vht_mcsinfo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 981462ddddb348c945956fbb015abe7e092a3565 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=981462ddddb348c945956fbb015abe7e092a3565 commit 981462ddddb348c945956fbb015abe7e092a3565 Author: Bjoern A. Zeeb AuthorDate: 2023-10-27 18:33:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:58 +0000 net80211: combine iv_vhtcaps and iv_vht_mcsinfo The iv_vhtcaps and iv_vht_mcsinfo fields together form struct ieee80211_vht_cap so combine them into one field in the VAP and keep the information together. While the structure layout changes no other functional changes intended. Sponsored by: The FreeBSD Foundation Reviewed by: adrian, cc Differential Revision: https://reviews.freebsd.org/D42420 (cherry picked from commit fbba0d6b636492505dc5878b9ed2c1bbdcd88b91) --- sys/net80211/ieee80211.c | 2 +- sys/net80211/ieee80211_ddb.c | 2 +- sys/net80211/ieee80211_ht.c | 4 ++-- sys/net80211/ieee80211_var.h | 3 +-- sys/net80211/ieee80211_vht.c | 50 ++++++++++++++++++++++---------------------- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 41b743c988f4..dcd61e8de43a 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -553,7 +553,7 @@ ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap, vap->iv_htextcaps = ic->ic_htextcaps; /* 11ac capabilities - XXX methodize */ - vap->iv_vhtcaps = ic->ic_vhtcaps; + vap->iv_vht_cap.vht_cap_info = ic->ic_vhtcaps; vap->iv_vhtextcaps = ic->ic_vhtextcaps; vap->iv_opmode = opmode; diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index e4a09a58049b..e3f70fbe3f29 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -490,7 +490,7 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) db_printf("\tflags_ven=%b\n", vap->iv_flags_ven, IEEE80211_FVEN_BITS); db_printf("\tcaps=%b\n", vap->iv_caps, IEEE80211_C_BITS); db_printf("\thtcaps=%b\n", vap->iv_htcaps, IEEE80211_C_HTCAP_BITS); - db_printf("\tvhtcaps=%b\n", vap->iv_vhtcaps, IEEE80211_VHTCAP_BITS); + db_printf("\tvhtcap=%b\n", vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_BITS); _db_show_stats(&vap->iv_stats); diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index 34d330f0dd09..61c57b87c5d7 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -1938,7 +1938,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) if (ni->ni_flags & IEEE80211_NODE_VHT && vap->iv_vht_flags & IEEE80211_FVHT_VHT) { if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_160MHZ) && /* XXX 2 means "160MHz and 80+80MHz", 1 means "160MHz" */ - (_IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + (_IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) >= 1) && (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT160)) { vhtflags = IEEE80211_CHAN_VHT160; @@ -1950,7 +1950,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) } } else if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_80P80MHZ) && /* XXX 2 means "160MHz and 80+80MHz" */ - (_IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + (_IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) == 2) && (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80P80)) { vhtflags = IEEE80211_CHAN_VHT80P80; diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 1208a8b3ab4e..08812c5eb27c 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -424,9 +424,8 @@ struct ieee80211vap { /* VHT flags */ uint32_t iv_vht_flags; /* VHT state flags */ - uint32_t iv_vhtcaps; /* VHT capabilities */ + struct ieee80211_vht_cap iv_vht_cap; /* VHT capabilities + MCS info */ uint32_t iv_vhtextcaps; /* VHT extended capabilities (TODO) */ - struct ieee80211_vht_mcs_info iv_vht_mcsinfo; uint32_t iv_vht_spare[4]; int iv_des_nssid; /* # desired ssids */ diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index 32123e7a2815..7dd2a6be1d2e 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -144,7 +144,7 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) if (! IEEE80211_CONF_VHT(ic)) return; - vap->iv_vhtcaps = ic->ic_vhtcaps; + vap->iv_vht_cap.vht_cap_info = ic->ic_vhtcaps; vap->iv_vhtextcaps = ic->ic_vhtextcaps; /* XXX assume VHT80 support; should really check vhtcaps */ @@ -152,12 +152,12 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) IEEE80211_FVHT_VHT | IEEE80211_FVHT_USEVHT40 | IEEE80211_FVHT_USEVHT80; - if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(vap->iv_vhtcaps)) + if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(vap->iv_vht_cap.vht_cap_info)) vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT160; - if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vhtcaps)) + if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vht_cap.vht_cap_info)) vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT80P80; - memcpy(&vap->iv_vht_mcsinfo, &ic->ic_vht_mcsinfo, + memcpy(&vap->iv_vht_cap.supp_mcs, &ic->ic_vht_mcsinfo, sizeof(struct ieee80211_vht_mcs_info)); } @@ -366,7 +366,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* Limit MPDU size to the smaller of the two */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_MAX_MPDU_MASK); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -376,7 +376,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_MAX_MPDU_MASK); /* Limit supp channel config */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -393,7 +393,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK); /* RX LDPC */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_RXLDPC); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -403,7 +403,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_RXLDPC); /* Short-GI 80 */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SHORT_GI_80); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -413,7 +413,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_SHORT_GI_80); /* Short-GI 160 */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SHORT_GI_160); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -438,7 +438,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* TX STBC */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_TXSTBC); if (opmode == 1) { /* STA mode - enable it only if node RXSTBC is non-zero */ @@ -452,7 +452,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_TXSTBC); /* RX STBC1..4 */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_RXSTBC_MASK); if (opmode == 1) { /* STA mode - enable it only if node TXSTBC is non-zero */ @@ -483,7 +483,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* SU Beamformer capable */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SU_BEAMFORMER_CAPABLE); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -494,7 +494,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SU_BEAMFORMER_CAPABLE); /* SU Beamformee capable */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SU_BEAMFORMEE_CAPABLE); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -505,7 +505,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SU_BEAMFORMEE_CAPABLE); /* Beamformee STS capability - only if SU beamformee capable */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_BEAMFORMEE_STS_MASK); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -518,7 +518,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_BEAMFORMEE_STS_MASK); /* Sounding dimensions - only if SU beamformer capable */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SOUNDING_DIMENSIONS_MASK); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -533,7 +533,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, * MU Beamformer capable - only if SU BFF capable, MU BFF capable * and STA (not AP) */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_MU_BEAMFORMER_CAPABLE); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -550,7 +550,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, * MU Beamformee capable - only if SU BFE capable, MU BFE capable * and AP (not STA) */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_MU_BEAMFORMEE_CAPABLE); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -564,7 +564,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SU_BEAMFORMEE_CAPABLE); /* VHT TXOP PS */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_VHT_TXOP_PS); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -573,7 +573,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_VHT_TXOP_PS); /* HTC_VHT */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_HTC_VHT); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -583,7 +583,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, /* A-MPDU length max */ /* XXX TODO: we need a userland config knob for this */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -596,7 +596,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, * Link adaptation is only valid if HTC-VHT capable is 1. * Otherwise, always set it to 0. */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_VHT_LINK_ADAPTATION_VHT_MASK); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -613,7 +613,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* RX antenna pattern */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_RX_ANTENNA_PATTERN); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -623,7 +623,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_RX_ANTENNA_PATTERN); /* TX antenna pattern */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_TX_ANTENNA_PATTERN); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -639,9 +639,9 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* MCS set - start with whatever the device supports */ - vhtcap->supp_mcs.rx_mcs_map = vap->iv_vht_mcsinfo.rx_mcs_map; + vhtcap->supp_mcs.rx_mcs_map = vap->iv_vht_cap.supp_mcs.rx_mcs_map; vhtcap->supp_mcs.rx_highest = 0; - vhtcap->supp_mcs.tx_mcs_map = vap->iv_vht_mcsinfo.tx_mcs_map; + vhtcap->supp_mcs.tx_mcs_map = vap->iv_vht_cap.supp_mcs.tx_mcs_map; vhtcap->supp_mcs.tx_highest = 0; vhtcap->vht_cap_info = new_vhtcap; From nobody Thu Nov 30 00:38:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgck92Vx1z52VGR; Thu, 30 Nov 2023 00:38: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 4Sgck90Y0cz3N0X; Thu, 30 Nov 2023 00:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Euya1T+PuoEqk52MNe4TMol18M/Mr4PXCX9mKtTCuIg=; b=caU99MsWiIwcVAXk4ZJAbvMCERcbErX0F7XfAUJypp9WJU0743hpHiSXVklW2ANOYzBXEa RXKe2VG8OJUPgKFCVxBEVJk+BhB95ysyHNXri0UhRLsqa0ImImEFy3+0Cr22YULyIZ1ehF LUDsxmChLEgrWogcvRoUcyftWCmTHKxEZnkeko2aNdOd2JxdW2LynpzpV0l/oODR+AoTW1 LaYCbblhx9LEyUwunVZh12Elc4KIGmfHq4I3i7V5junnpQmTo3FwZtBeOecNCdH4vZn6rv W4pZK83KDQcy+q7OI9zo8fse9aIFAQcdj8w6DjwYr2WyjoCFS15o2CbnAtkAlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Euya1T+PuoEqk52MNe4TMol18M/Mr4PXCX9mKtTCuIg=; b=SH73oV05rg1OQQR06CE953GJ5JRizwjHUmIK1S3dL4tcPKMfiRfY9TjGr3egFwLekqJWnJ uMgUMy7HLzsafSRcZN3eDCjVVlM/rMudjMxLX8zsimiRVrSbCXfML2oLFA1+0cmWeAn4Xs 5pZG1IReHvTdcmG2E+4AgiMgjgvkYb0vWbXvfburmLM6WfQyw20g6v9e/MwKv2YRvHtb3c FK8euK2wfEAiZTlDG9a5dPLkdqwNt4xYI+T6WEpHf7RCEAvxkkk5oyTczksnNhgxCAoxjN fsgmg7sqx7zkBgAjaOjxe1yYBTy/Zfg0dZOrJO9lnbFJ7iTle9hiNHQL2mLtKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304705; a=rsa-sha256; cv=none; b=eZ1gBBuxXlG3MoT54x/NozFkZL48rfi8e9MWx/Icjd4Xwp5pDaULoWoB+GPPnVJPK/R5fZ Dtt+piaEum242wm4qvXijPwbql2WFGr6QHV0FDpkFqjvH2IO4jtISmpW7Ai6YeyPe3BNNY Ui4Rq5mtrwSbx4mB33Vd/4sgHB9DgoCuKVVvDXfkVOIs1TN9/fEZMBGCG5PsqDQf8sJDy1 3ny+Y85zp8LscwqiFtpMNX4yZV3AGI6eZ+mJa0CmY69Msec4oNAysLM8n8wdogY77qLSYi us9/uPQGXwrLlIHHC9OcOhQ+l8p3vuaZKSolYcc4N/pob8vrtDv1xlXhkr5Mkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgck86gYKzD6P; Thu, 30 Nov 2023 00:38: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 3AU0cOq7052319; Thu, 30 Nov 2023 00:38:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cOp6052316; Thu, 30 Nov 2023 00:38:24 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:24 GMT Message-Id: <202311300038.3AU0cOp6052316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7019af03949f - stable/14 - net80211: migrate ic_vhtcaps, ic_vht_mcsinfo, ic_flags_vht List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7019af03949f689cab24bc2cbded5ce4be28f90e Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7019af03949f689cab24bc2cbded5ce4be28f90e commit 7019af03949f689cab24bc2cbded5ce4be28f90e Author: Bjoern A. Zeeb AuthorDate: 2023-10-27 18:44:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:58 +0000 net80211: migrate ic_vhtcaps, ic_vht_mcsinfo, ic_flags_vht Like for the VAP rename ic_flags_vht to ic_vht_flags for consistency to keep "VHT" fields together and merge ic_vhtcaps and ic_vht_mcsinfo into struct ieee80211_vht_cap ic_vht_cap. While the structure layout changes no other functional changes intended. Sponsored by: The FreeBSD Foundation Reviewed by: adrian, cc Differential Revision: https://reviews.freebsd.org/D42421 (cherry picked from commit 562adbe1d354377a260e66eedb6072b720a606dc) --- sys/compat/linuxkpi/common/src/linux_80211.c | 6 +++--- sys/net80211/ieee80211.c | 6 +++--- sys/net80211/ieee80211_ddb.c | 2 +- sys/net80211/ieee80211_ioctl.c | 2 +- sys/net80211/ieee80211_node.c | 2 +- sys/net80211/ieee80211_regdomain.c | 4 ++-- sys/net80211/ieee80211_var.h | 5 ++--- sys/net80211/ieee80211_vht.c | 14 +++++++------- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index ffda3c5693cd..42fb7a60ce57 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3556,16 +3556,16 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, if (hw->wiphy->bands[NL80211_BAND_5GHZ]->vht_cap.vht_supported){ ic->ic_flags_ext |= IEEE80211_FEXT_VHT; - ic->ic_vhtcaps = + ic->ic_vht_cap.vht_cap_info = hw->wiphy->bands[NL80211_BAND_5GHZ]->vht_cap.cap; setbit(bands, IEEE80211_MODE_VHT_5GHZ); chan_flags |= NET80211_CBW_FLAG_VHT80; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ( - ic->ic_vhtcaps)) + ic->ic_vht_cap.vht_cap_info)) chan_flags |= NET80211_CBW_FLAG_VHT160; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ( - ic->ic_vhtcaps)) + ic->ic_vht_cap.vht_cap_info)) chan_flags |= NET80211_CBW_FLAG_VHT80P80; } #endif diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index dcd61e8de43a..3809b7e6596c 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -553,7 +553,7 @@ ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap, vap->iv_htextcaps = ic->ic_htextcaps; /* 11ac capabilities - XXX methodize */ - vap->iv_vht_cap.vht_cap_info = ic->ic_vhtcaps; + vap->iv_vht_cap.vht_cap_info = ic->ic_vht_cap.vht_cap_info; vap->iv_vhtextcaps = ic->ic_vhtextcaps; vap->iv_opmode = opmode; @@ -944,9 +944,9 @@ ieee80211_syncflag_vht_locked(struct ieee80211com *ic, int flag) break; } if (bit) - ic->ic_flags_vht |= flag; + ic->ic_vht_flags |= flag; else - ic->ic_flags_vht &= ~flag; + ic->ic_vht_flags &= ~flag; } void diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index e3f70fbe3f29..cd4a4f191745 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -672,7 +672,7 @@ _db_show_com(const struct ieee80211com *ic, int showvaps, int showsta, db_printf("\tcryptocaps=%b\n", ic->ic_cryptocaps, IEEE80211_CRYPTO_BITS); db_printf("\thtcaps=%b\n", ic->ic_htcaps, IEEE80211_HTCAP_BITS); - db_printf("\tvhtcaps=%b\n", ic->ic_vhtcaps, IEEE80211_VHTCAP_BITS); + db_printf("\tvhtcaps=%b\n", ic->ic_vht_cap.vht_cap_info, IEEE80211_VHTCAP_BITS); #if 0 uint8_t ic_modecaps[2]; /* set of mode capabilities */ diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index d3e4bd1ca561..170cdc416276 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -711,7 +711,7 @@ ieee80211_ioctl_getdevcaps(struct ieee80211com *ic, dc->dc_drivercaps = ic->ic_caps; dc->dc_cryptocaps = ic->ic_cryptocaps; dc->dc_htcaps = ic->ic_htcaps; - dc->dc_vhtcaps = ic->ic_vhtcaps; + dc->dc_vhtcaps = ic->ic_vht_cap.vht_cap_info; ci = &dc->dc_chaninfo; ic->ic_getradiocaps(ic, maxchans, &ci->ic_nchans, ci->ic_chans); KASSERT(ci->ic_nchans <= maxchans, diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 60230fcec1c5..f277293ceb14 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -809,7 +809,7 @@ ieee80211_setupcurchan(struct ieee80211com *ic, struct ieee80211_channel *c) * based on what HT has done; it may further promote the * channel to VHT80 or above. */ - if (ic->ic_vhtcaps != 0) { + if (ic->ic_vht_cap.vht_cap_info != 0) { int flags = getvhtadjustflags(ic); if (flags > ieee80211_vhtchanflags(c)) c = ieee80211_vht_adjust_channel(ic, c, flags); diff --git a/sys/net80211/ieee80211_regdomain.c b/sys/net80211/ieee80211_regdomain.c index a482e1eaad32..3f222dc31a5a 100644 --- a/sys/net80211/ieee80211_regdomain.c +++ b/sys/net80211/ieee80211_regdomain.c @@ -149,10 +149,10 @@ ieee80211_init_channels(struct ieee80211com *ic, if (isset(bands, IEEE80211_MODE_VHT_5GHZ)) { cbw_flags |= NET80211_CBW_FLAG_HT40; /* Make sure this is set; or assert? */ cbw_flags |= NET80211_CBW_FLAG_VHT80; - if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(ic->ic_vhtcaps)) + if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(ic->ic_vht_cap.vht_cap_info)) cbw_flags |= NET80211_CBW_FLAG_VHT160; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ( - ic->ic_vhtcaps)) + ic->ic_vht_cap.vht_cap_info)) cbw_flags |= NET80211_CBW_FLAG_VHT80P80; ieee80211_add_channel_list_5ghz(chans, IEEE80211_CHAN_MAX, nchans, def_chan_5ghz_band1, nitems(def_chan_5ghz_band1), diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 08812c5eb27c..f42ebb4fa261 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -240,10 +240,9 @@ struct ieee80211com { uint8_t ic_txstream; /* # TX streams */ /* VHT information */ - uint32_t ic_vhtcaps; /* VHT capabilities */ + uint32_t ic_vht_flags; /* VHT state flags */ + struct ieee80211_vht_cap ic_vht_cap; /* VHT capabilities + MCS info */ uint32_t ic_vhtextcaps; /* VHT extended capabilities (TODO) */ - struct ieee80211_vht_mcs_info ic_vht_mcsinfo; /* Support TX/RX VHT MCS */ - uint32_t ic_flags_vht; /* VHT state flags */ uint32_t ic_vht_spare[3]; /* optional state for Atheros SuperG protocol extensions */ diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index 7dd2a6be1d2e..1561255be101 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -144,7 +144,7 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) if (! IEEE80211_CONF_VHT(ic)) return; - vap->iv_vht_cap.vht_cap_info = ic->ic_vhtcaps; + vap->iv_vht_cap.vht_cap_info = ic->ic_vht_cap.vht_cap_info; vap->iv_vhtextcaps = ic->ic_vhtextcaps; /* XXX assume VHT80 support; should really check vhtcaps */ @@ -157,7 +157,7 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vht_cap.vht_cap_info)) vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT80P80; - memcpy(&vap->iv_vht_cap.supp_mcs, &ic->ic_vht_mcsinfo, + memcpy(&vap->iv_vht_cap.supp_mcs, &ic->ic_vht_cap.supp_mcs, sizeof(struct ieee80211_vht_mcs_info)); } @@ -199,19 +199,19 @@ ieee80211_vht_announce(struct ieee80211com *ic) /* Channel width */ ic_printf(ic, "[VHT] Channel Widths: 20MHz, 40MHz, 80MHz%s%s\n", - (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(ic->ic_vhtcaps)) ? + (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(ic->ic_vht_cap.vht_cap_info)) ? ", 160MHz" : "", - (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(ic->ic_vhtcaps)) ? + (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(ic->ic_vht_cap.vht_cap_info)) ? ", 80+80MHz" : ""); /* Features */ - ic_printf(ic, "[VHT] Features: %b\n", ic->ic_vhtcaps, + ic_printf(ic, "[VHT] Features: %b\n", ic->ic_vht_cap.vht_cap_info, IEEE80211_VHTCAP_BITS); /* For now, just 5GHz VHT. Worry about 2GHz VHT later */ for (i = 0; i < 8; i++) { /* Each stream is 2 bits */ - tx = (ic->ic_vht_mcsinfo.tx_mcs_map >> (2*i)) & 0x3; - rx = (ic->ic_vht_mcsinfo.rx_mcs_map >> (2*i)) & 0x3; + tx = (ic->ic_vht_cap.supp_mcs.tx_mcs_map >> (2*i)) & 0x3; + rx = (ic->ic_vht_cap.supp_mcs.rx_mcs_map >> (2*i)) & 0x3; if (tx == 3 && rx == 3) continue; ic_printf(ic, "[VHT] NSS %d: TX MCS 0..%d, RX MCS 0..%d\n", From nobody Thu Nov 30 00:38:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgckB3ylzz52V9Z; Thu, 30 Nov 2023 00:38: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 4SgckB1Mvtz3N9p; Thu, 30 Nov 2023 00:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tAsBAigxpv5+fHLuGurxQb3Rpk797wuPT8xSTVoLa8U=; b=LDCV6467SS1deJNUr3kgMvAuDoRo0yAG57w6KobMUUnir/ebRKowfmFoj9qze7IkK4yQi7 nfu61qisVSF8TKKbjfUst7jq8W3Z0Ge+pFusQz6dK6HN+vye21GO0GUzKfE8S76C87Sjv9 t4j4jYCH438hT6ZUH0BL7YDf6gkVvejGrIxR+u7HyvgpyWoGakzucFHWK8zEhFs//gQ4hQ Tywb57qSAqARpEM+YQVMs2FHuq5sz18S2KNb58MElfcEYjdVHwqXVINa3foSaWthHbp1f7 37sZ1h/JUbLyDyehsaNJ8p6a6zFkE6HyQccNjOp/pTnYoZjlSRaJh8HaHUyZpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tAsBAigxpv5+fHLuGurxQb3Rpk797wuPT8xSTVoLa8U=; b=Pv534YznZB+On/8nQnS7dunAW4WIKYxniNypIhGe8OkgZuTPBdNCIDKS5HG2E2+yojvSNn K8YWxzqZm3Qy8VGa2rd4Hk7bW4Gk+xBVelDXhfYgUkR8W9jQjsNdECga9ltddeI8dZjfgK DjyOwLmiShXjgH+enADXiZKR6PGAJYfjyU9JhYu0HB4XBfHMyHx0bPelsh7MpMShZZa8Du W5WHY2arBZ4Mvyb7zp27j3vc67UGhxCU1PAzsuFBVNZ6i53iu7CfWztzAFdi05sVCvoDCy uDJTiXrNpsJpteCzx5a683Aj/TQKexUrip2OdgfeZ2rvMR5+DMbC4xnGi4C6aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304706; a=rsa-sha256; cv=none; b=BjcQG1SCsvSyJfbDri3ZvLlRwcjje4l//BZlveUJUDJ88s0mdjKxsATAKmyIl5ISEbhdlI HOkDXFGiyRR3tZKCCeL6A1OQ5x7e4/RUrR2dT3woYe6qpYaIfM2exApMBcfmeBgRivbs1m 7SFQvk2MiJPnl7uLIw1ZIrWRH7/DlpMcLoauinAf0MTX2Erd/DSMgIvtcFgVfBRIkVlfhN JA/An3URnmj2aAqxkRqY5jW4UYwtEQouzEv2LVAhJJr3WdXlWRkDzIvBhskhuzGQsM4qt0 MSs3GzSuTi1Fa3LBvo7AsfcEOx+CRXLkwdQeKQId9AxiJurjipy5wwRtv2PPuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgckB0TbbzD8s; Thu, 30 Nov 2023 00:38: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 3AU0cPlY052363; Thu, 30 Nov 2023 00:38:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cPHb052359; Thu, 30 Nov 2023 00:38:25 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:25 GMT Message-Id: <202311300038.3AU0cPHb052359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a8c36fd7a3e8 - stable/14 - net80211: remove ieee80211_unref_node() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a8c36fd7a3e8af322bdb06886e40a79d1a614ac6 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a8c36fd7a3e8af322bdb06886e40a79d1a614ac6 commit a8c36fd7a3e8af322bdb06886e40a79d1a614ac6 Author: Bjoern A. Zeeb AuthorDate: 2023-10-02 14:30:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:58 +0000 net80211: remove ieee80211_unref_node() ieee80211_unref_node() was only used in two error cases in ieee80211_send_nulldata(). There we do not need to guard against ni pointer reuse after decrementing the refcount of the ni as we only update the stats and return. Update the man page and remove the link for the now gone function. Note: the last uses of the function were removed in 493d6255434ce. Sponsored by: The FreeBSD Foundation Reviewed by: adrian, emaste Differential Revision: https://reviews.freebsd.org/D42035 (cherry picked from commit 1137943b1c5b225e30b82350ff7fb12c258ea90f) --- ObsoleteFiles.inc | 3 +++ share/man/man9/Makefile | 3 +-- share/man/man9/ieee80211_node.9 | 15 ++++----------- sys/net80211/ieee80211_node.h | 7 ------- sys/net80211/ieee80211_output.c | 4 ++-- 5 files changed, 10 insertions(+), 22 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 32a044706e51..49ba0898132e 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -54,6 +54,9 @@ # 20231006: rename tcp6_v4unmapped_bind_test OLD_FILES+=usr/tests/sys/netinet/tcp6_v4unmapped_bind_test +# 20231005: Remove man page link for now gone net80211 function. +OLD_FILES+=usr/share/man/man9/ieee80211_unref_node.9.gz + # 20231013: Man pages renamed to match the actual functions OLD_FILES+=usr/share/man/man9/cr_seeothergids.9.gz OLD_FILES+=usr/share/man/man9/cr_seeotheruids.9.gz diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 2122f8d6ea8c..c82ce254f681 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1212,8 +1212,7 @@ MLINKS+=ieee80211_node.9 ieee80211_dump_node.9 \ ieee80211_node.9 ieee80211_find_rxnode_withkey.9 \ ieee80211_node.9 ieee80211_free_node.9 \ ieee80211_node.9 ieee80211_iterate_nodes.9 \ - ieee80211_node.9 ieee80211_ref_node.9 \ - ieee80211_node.9 ieee80211_unref_node.9 + ieee80211_node.9 ieee80211_ref_node.9 MLINKS+=ieee80211_output.9 ieee80211_process_callback.9 \ ieee80211_output.9 M_SEQNO_GET.9 \ ieee80211_output.9 M_WME_GETAC.9 diff --git a/share/man/man9/ieee80211_node.9 b/share/man/man9/ieee80211_node.9 index 8340b4762b67..6dd492e3b33d 100644 --- a/share/man/man9/ieee80211_node.9 +++ b/share/man/man9/ieee80211_node.9 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 28, 2010 +.Dd October 2, 2023 .Dt IEEE80211_NODE 9 .Os .Sh NAME @@ -50,9 +50,6 @@ .Fn ieee80211_ref_node "struct ieee80211_node *" .\" .Ft void -.Fn ieee80211_unref_node "struct ieee80211_node *" -.\" -.Ft void .Fn ieee80211_free_node "struct ieee80211_node *" .\" .Ft void @@ -106,14 +103,10 @@ Routines that lookup a table entry return a (i.e. a pointer to a table entry with the reference count incremented). The .Fn ieee80211_ref_node -and -.Fn ieee80211_unref_node -calls explicitly increment/decrement the reference count of a node, -but are rarely used. -Instead most callers use +call explicitly increments the reference count of a node. .Fn ieee80211_free_node -to release a reference and, if the count goes to zero, reclaim the -table entry. +decrements the reference count of a node and if the count goes to zero +reclaims the table entry. .Pp The station table and its entries are exposed to drivers in several ways. Each frame transmitted to a station includes a reference to the diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index 67ad4a7c44f6..954e8e03563f 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -319,13 +319,6 @@ MALLOC_DECLARE(M_80211_NODE_IE); #define IEEE80211_RSSI_GET(x) \ IEEE80211_RSSI_EP_RND(x, IEEE80211_RSSI_EP_MULTIPLIER) -static __inline void -ieee80211_unref_node(struct ieee80211_node **ni) -{ - ieee80211_node_decref(*ni); - *ni = NULL; /* guard against use */ -} - void ieee80211_node_attach(struct ieee80211com *); void ieee80211_node_lateattach(struct ieee80211com *); void ieee80211_node_detach(struct ieee80211com *); diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 6fc4a1567d8e..a5fad2462598 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -1104,7 +1104,7 @@ ieee80211_send_nulldata(struct ieee80211_node *ni) if (vap->iv_state == IEEE80211_S_CAC) { IEEE80211_NOTE(vap, IEEE80211_MSG_OUTPUT | IEEE80211_MSG_DOTH, ni, "block %s frame in CAC state", "null data"); - ieee80211_unref_node(&ni); + ieee80211_node_decref(ni); vap->iv_stats.is_tx_badstate++; return EIO; /* XXX */ } @@ -1122,7 +1122,7 @@ ieee80211_send_nulldata(struct ieee80211_node *ni) m = ieee80211_getmgtframe(&frm, ic->ic_headroom + hdrlen, 0); if (m == NULL) { /* XXX debug msg */ - ieee80211_unref_node(&ni); + ieee80211_node_decref(ni); vap->iv_stats.is_tx_nobuf++; return ENOMEM; } From nobody Thu Nov 30 01:29:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-branches@FreeBSD.org From: Alan Somers Subject: git: 60314995efa0 - stable/14 - libc/libc/rpc: refactor some global variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 60314995efa05b81839556fb31ed036703885d84 Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=60314995efa05b81839556fb31ed036703885d84 commit 60314995efa05b81839556fb31ed036703885d84 Author: Alan Somers AuthorDate: 2023-11-09 22:58:56 +0000 Commit: Alan Somers CommitDate: 2023-11-30 03:16:16 +0000 libc/libc/rpc: refactor some global variables * Combine dg_fd_locks and dg_cv into one array. * Similarly for vc_fd_locks and vc_cv * Turn some macros into inline functions This is a mostly cosmetic change to make refactoring these strutures in a future commit easier. Sponsored by: Axcient Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42597 (cherry picked from commit a5c2f4e939430f0048136c39fb9fa6093d401905) lib/libc/rpc: switch the per-fd structs in clnt_{dg,vc}.c to RB Trees This saves oodles of memory, especially when "ulimit -n" is large. It also prevents a buffer overflow if getrlimit should fail. Also replace per-fd condvars with mutexes to simplify the code. PR: 274968 Sponsored by: Axcient Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42597 (cherry picked from commit 24938f9311c9c9acc1ce747f4e6a088c2dbc967d) --- include/rpc/rpc_com.h | 1 - lib/libc/rpc/clnt_dg.c | 170 +++++++++++++++++++++--------------------- lib/libc/rpc/clnt_vc.c | 179 ++++++++++++++++++++++----------------------- lib/libc/rpc/rpc_com.h | 1 - lib/libc/rpc/rpc_generic.c | 23 ------ sys/rpc/rpc_com.h | 1 - 6 files changed, 168 insertions(+), 207 deletions(-) diff --git a/include/rpc/rpc_com.h b/include/rpc/rpc_com.h index a98e3f73bac8..a0a8c8872efa 100644 --- a/include/rpc/rpc_com.h +++ b/include/rpc/rpc_com.h @@ -58,7 +58,6 @@ __BEGIN_DECLS extern u_int __rpc_get_a_size(int); -extern int __rpc_dtbsize(void); extern int _rpc_dtablesize(void); extern struct netconfig * __rpcgettp(int); extern int __rpc_get_default_domain(char **); diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c index 40511f30135e..c2a45b9d037f 100644 --- a/lib/libc/rpc/clnt_dg.c +++ b/lib/libc/rpc/clnt_dg.c @@ -48,13 +48,17 @@ static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro"; #include #include #include +#include #include #include #include +#include #include +#include #include #include #include +#include #include #include #include "un-namespace.h" @@ -89,28 +93,65 @@ static void clnt_dg_destroy(CLIENT *); * This machinery implements per-fd locks for MT-safety. It is not * sufficient to do per-CLIENT handle locks for MT-safety because a * user may create more than one CLIENT handle with the same fd behind - * it. Therefore, we allocate an array of flags (dg_fd_locks), protected - * by the clnt_fd_lock mutex, and an array (dg_cv) of condition variables - * similarly protected. Dg_fd_lock[fd] == 1 => a call is active on some - * CLIENT handle created for that fd. - * The current implementation holds locks across the entire RPC and reply, - * including retransmissions. Yes, this is silly, and as soon as this - * code is proven to work, this should be the first thing fixed. One step - * at a time. + * it. Therefore, we allocate an associative array of flags and condition + * variables (dg_fd). The flags and the array are protected by the + * clnt_fd_lock mutex. dg_fd[fd].lock == 1 => a call is active on some + * CLIENT handle created for that fd. The current implementation holds + * locks across the entire RPC and reply, including retransmissions. Yes, + * this is silly, and as soon as this code is proven to work, this should + * be the first thing fixed. One step at a time. */ -static int *dg_fd_locks; -static cond_t *dg_cv; -#define release_fd_lock(fd, mask) { \ - mutex_lock(&clnt_fd_lock); \ - dg_fd_locks[fd] = 0; \ - mutex_unlock(&clnt_fd_lock); \ - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); \ - cond_signal(&dg_cv[fd]); \ +struct dg_fd { + RB_ENTRY(dg_fd) dg_link; + int fd; + mutex_t mtx; +}; +static inline int +cmp_dg_fd(struct dg_fd *a, struct dg_fd *b) +{ + if (a->fd > b->fd) { + return (1); + } else if (a->fd < b->fd) { + return (-1); + } else { + return (0); + } +} +RB_HEAD(dg_fd_list, dg_fd); +RB_PROTOTYPE(dg_fd_list, dg_fd, dg_link, cmp_dg_fd); +RB_GENERATE(dg_fd_list, dg_fd, dg_link, cmp_dg_fd); +struct dg_fd_list dg_fd_head = RB_INITIALIZER(&dg_fd_head); + +/* + * Find the lock structure for the given file descriptor, or initialize it if + * it does not already exist. The clnt_fd_lock mutex must be held. + */ +static struct dg_fd * +dg_fd_find(int fd) +{ + struct dg_fd key, *elem; + + key.fd = fd; + elem = RB_FIND(dg_fd_list, &dg_fd_head, &key); + if (elem == NULL) { + elem = calloc(1, sizeof(*elem)); + elem->fd = fd; + mutex_init(&elem->mtx, NULL); + RB_INSERT(dg_fd_list, &dg_fd_head, elem); + } + return (elem); +} + +static void +release_fd_lock(struct dg_fd *elem, sigset_t mask) +{ + mutex_unlock(&elem->mtx); + thr_sigsetmask(SIG_SETMASK, &mask, NULL); } static const char mem_err_clnt_dg[] = "clnt_dg_create: out of memory"; -/* VARIABLES PROTECTED BY clnt_fd_lock: dg_fd_locks, dg_cv */ +/* VARIABLES PROTECTED BY clnt_fd_lock: dg_fd */ #define MCALL_MSG_SIZE 24 @@ -168,47 +209,9 @@ clnt_dg_create(int fd, const struct netbuf *svcaddr, rpcprog_t program, struct cu_data *cu = NULL; /* private data */ struct timeval now; struct rpc_msg call_msg; - sigset_t mask; - sigset_t newmask; struct __rpc_sockinfo si; int one = 1; - sigfillset(&newmask); - thr_sigsetmask(SIG_SETMASK, &newmask, &mask); - mutex_lock(&clnt_fd_lock); - if (dg_fd_locks == (int *) NULL) { - int cv_allocsz; - size_t fd_allocsz; - int dtbsize = __rpc_dtbsize(); - - fd_allocsz = dtbsize * sizeof (int); - dg_fd_locks = (int *) mem_alloc(fd_allocsz); - if (dg_fd_locks == (int *) NULL) { - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - goto err1; - } else - memset(dg_fd_locks, '\0', fd_allocsz); - - cv_allocsz = dtbsize * sizeof (cond_t); - dg_cv = (cond_t *) mem_alloc(cv_allocsz); - if (dg_cv == (cond_t *) NULL) { - mem_free(dg_fd_locks, fd_allocsz); - dg_fd_locks = (int *) NULL; - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - goto err1; - } else { - int i; - - for (i = 0; i < dtbsize; i++) - cond_init(&dg_cv[i], 0, (void *) 0); - } - } - - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - if (svcaddr == NULL) { rpc_createerr.cf_stat = RPC_UNKNOWNADDR; return (NULL); @@ -329,25 +332,21 @@ clnt_dg_call(CLIENT *cl, rpcproc_t proc, xdrproc_t xargs, void *argsp, struct timespec ts; struct kevent kv; struct sockaddr *sa; + struct dg_fd *elem; sigset_t mask; sigset_t newmask; socklen_t salen; ssize_t recvlen = 0; - int kin_len, n, rpc_lock_value; + int kin_len, n; u_int32_t xid; outlen = 0; sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[cu->cu_fd]) - cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock); - if (__isthreaded) - rpc_lock_value = 1; - else - rpc_lock_value = 0; - dg_fd_locks[cu->cu_fd] = rpc_lock_value; + elem = dg_fd_find(cu->cu_fd); mutex_unlock(&clnt_fd_lock); + mutex_lock(&elem->mtx); if (cu->cu_total.tv_usec == -1) { timeout = utimeout; /* use supplied timeout */ } else { @@ -601,7 +600,7 @@ out: if (cu->cu_kq >= 0) _close(cu->cu_kq); cu->cu_kq = -1; - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (cu->cu_error.re_status); } @@ -617,6 +616,7 @@ static bool_t clnt_dg_freeres(CLIENT *cl, xdrproc_t xdr_res, void *res_ptr) { struct cu_data *cu = (struct cu_data *)cl->cl_private; + struct dg_fd *elem; XDR *xdrs = &(cu->cu_outxdrs); bool_t dummy; sigset_t mask; @@ -625,13 +625,12 @@ clnt_dg_freeres(CLIENT *cl, xdrproc_t xdr_res, void *res_ptr) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[cu->cu_fd]) - cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock); + elem = dg_fd_find(cu->cu_fd); + mutex_lock(&elem->mtx); xdrs->x_op = XDR_FREE; dummy = (*xdr_res)(xdrs, res_ptr); mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &mask, NULL); - cond_signal(&dg_cv[cu->cu_fd]); + release_fd_lock(elem, mask); return (dummy); } @@ -646,41 +645,36 @@ clnt_dg_control(CLIENT *cl, u_int request, void *info) { struct cu_data *cu = (struct cu_data *)cl->cl_private; struct netbuf *addr; + struct dg_fd *elem; sigset_t mask; sigset_t newmask; - int rpc_lock_value; sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[cu->cu_fd]) - cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock); - if (__isthreaded) - rpc_lock_value = 1; - else - rpc_lock_value = 0; - dg_fd_locks[cu->cu_fd] = rpc_lock_value; + elem = dg_fd_find(cu->cu_fd); mutex_unlock(&clnt_fd_lock); + mutex_lock(&elem->mtx); switch (request) { case CLSET_FD_CLOSE: cu->cu_closeit = TRUE; - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (TRUE); case CLSET_FD_NCLOSE: cu->cu_closeit = FALSE; - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (TRUE); } /* for other requests which use info */ if (info == NULL) { - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } switch (request) { case CLSET_TIMEOUT: if (time_not_ok((struct timeval *)info)) { - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } cu->cu_total = *(struct timeval *)info; @@ -694,7 +688,7 @@ clnt_dg_control(CLIENT *cl, u_int request, void *info) break; case CLSET_RETRY_TIMEOUT: if (time_not_ok((struct timeval *)info)) { - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } cu->cu_wait = *(struct timeval *)info; @@ -714,7 +708,7 @@ clnt_dg_control(CLIENT *cl, u_int request, void *info) case CLSET_SVC_ADDR: /* set to new address */ addr = (struct netbuf *)info; if (addr->len < sizeof cu->cu_raddr) { - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } (void) memcpy(&cu->cu_raddr, addr->buf, addr->len); @@ -777,10 +771,10 @@ clnt_dg_control(CLIENT *cl, u_int request, void *info) cu->cu_connect = *(int *)info; break; default: - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (TRUE); } @@ -788,6 +782,7 @@ static void clnt_dg_destroy(CLIENT *cl) { struct cu_data *cu = (struct cu_data *)cl->cl_private; + struct dg_fd *elem; int cu_fd = cu->cu_fd; sigset_t mask; sigset_t newmask; @@ -795,8 +790,8 @@ clnt_dg_destroy(CLIENT *cl) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[cu_fd]) - cond_wait(&dg_cv[cu_fd], &clnt_fd_lock); + elem = dg_fd_find(cu_fd); + mutex_lock(&elem->mtx); if (cu->cu_closeit) (void)_close(cu_fd); if (cu->cu_kq >= 0) @@ -809,8 +804,7 @@ clnt_dg_destroy(CLIENT *cl) mem_free(cl->cl_tp, strlen(cl->cl_tp) +1); mem_free(cl, sizeof (CLIENT)); mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &mask, NULL); - cond_signal(&dg_cv[cu_fd]); + release_fd_lock(elem, mask); } static struct clnt_ops * diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c index 25cd5a273531..7a155d0f918b 100644 --- a/lib/libc/rpc/clnt_vc.c +++ b/lib/libc/rpc/clnt_vc.c @@ -60,6 +60,7 @@ static char sccsid3[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro"; #include #include #include +#include #include #include @@ -68,7 +69,9 @@ static char sccsid3[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro"; #include #include #include +#include #include +#include #include #include #include @@ -120,22 +123,60 @@ struct ct_data { * This machinery implements per-fd locks for MT-safety. It is not * sufficient to do per-CLIENT handle locks for MT-safety because a * user may create more than one CLIENT handle with the same fd behind - * it. Therefore, we allocate an array of flags (vc_fd_locks), protected - * by the clnt_fd_lock mutex, and an array (vc_cv) of condition variables - * similarly protected. Vc_fd_lock[fd] == 1 => a call is active on some - * CLIENT handle created for that fd. - * The current implementation holds locks across the entire RPC and reply. - * Yes, this is silly, and as soon as this code is proven to work, this - * should be the first thing fixed. One step at a time. + * it. Therefore, we allocate an associative array of flags and condition + * variables (vc_fd). The flags and the array are protected by the + * clnt_fd_lock mutex. vc_fd_lock[fd] == 1 => a call is active on some + * CLIENT handle created for that fd. The current implementation holds + * locks across the entire RPC and reply. Yes, this is silly, and as soon + * as this code is proven to work, this should be the first thing fixed. + * One step at a time. */ -static int *vc_fd_locks; -static cond_t *vc_cv; -#define release_fd_lock(fd, mask) { \ - mutex_lock(&clnt_fd_lock); \ - vc_fd_locks[fd] = 0; \ - mutex_unlock(&clnt_fd_lock); \ - thr_sigsetmask(SIG_SETMASK, &(mask), (sigset_t *) NULL); \ - cond_signal(&vc_cv[fd]); \ +struct vc_fd { + RB_ENTRY(vc_fd) vc_link; + int fd; + mutex_t mtx; +}; +static inline int +cmp_vc_fd(struct vc_fd *a, struct vc_fd *b) +{ + if (a->fd > b->fd) { + return (1); + } else if (a->fd < b->fd) { + return (-1); + } else { + return (0); + } +} +RB_HEAD(vc_fd_list, vc_fd); +RB_PROTOTYPE(vc_fd_list, vc_fd, vc_link, cmp_vc_fd); +RB_GENERATE(vc_fd_list, vc_fd, vc_link, cmp_vc_fd); +struct vc_fd_list vc_fd_head = RB_INITIALIZER(&vc_fd_head); + +/* + * Find the lock structure for the given file descriptor, or initialize it if + * it does not already exist. The clnt_fd_lock mutex must be held. + */ +static struct vc_fd * +vc_fd_find(int fd) +{ + struct vc_fd key, *elem; + + key.fd = fd; + elem = RB_FIND(vc_fd_list, &vc_fd_head, &key); + if (elem == NULL) { + elem = calloc(1, sizeof(*elem)); + elem->fd = fd; + mutex_init(&elem->mtx, NULL); + RB_INSERT(vc_fd_list, &vc_fd_head, elem); + } + return (elem); +} + +static void +release_fd_lock(struct vc_fd *elem, sigset_t mask) +{ + mutex_unlock(&elem->mtx); + thr_sigsetmask(SIG_SETMASK, &mask, NULL); } static const char clnt_vc_errstr[] = "%s : %s"; @@ -169,8 +210,6 @@ clnt_vc_create(int fd, const struct netbuf *raddr, const rpcprog_t prog, struct timeval now; struct rpc_msg call_msg; static u_int32_t disrupt; - sigset_t mask; - sigset_t newmask; struct sockaddr_storage ss; socklen_t slen; struct __rpc_sockinfo si; @@ -188,39 +227,6 @@ clnt_vc_create(int fd, const struct netbuf *raddr, const rpcprog_t prog, goto err; } ct->ct_addr.buf = NULL; - sigfillset(&newmask); - thr_sigsetmask(SIG_SETMASK, &newmask, &mask); - mutex_lock(&clnt_fd_lock); - if (vc_fd_locks == (int *) NULL) { - int cv_allocsz, fd_allocsz; - int dtbsize = __rpc_dtbsize(); - - fd_allocsz = dtbsize * sizeof (int); - vc_fd_locks = (int *) mem_alloc(fd_allocsz); - if (vc_fd_locks == (int *) NULL) { - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - goto err; - } else - memset(vc_fd_locks, '\0', fd_allocsz); - - assert(vc_cv == (cond_t *) NULL); - cv_allocsz = dtbsize * sizeof (cond_t); - vc_cv = (cond_t *) mem_alloc(cv_allocsz); - if (vc_cv == (cond_t *) NULL) { - mem_free(vc_fd_locks, fd_allocsz); - vc_fd_locks = (int *) NULL; - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - goto err; - } else { - int i; - - for (i = 0; i < dtbsize; i++) - cond_init(&vc_cv[i], 0, (void *) 0); - } - } else - assert(vc_cv != (cond_t *) NULL); /* * XXX - fvdl connecting while holding a mutex? @@ -231,19 +237,16 @@ clnt_vc_create(int fd, const struct netbuf *raddr, const rpcprog_t prog, rpc_createerr.cf_stat = RPC_SYSTEMERROR; rpc_createerr.cf_error.re_errno = errno; mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); goto err; } if (_connect(fd, (struct sockaddr *)raddr->buf, raddr->len) < 0){ rpc_createerr.cf_stat = RPC_SYSTEMERROR; rpc_createerr.cf_error.re_errno = errno; mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); goto err; } } mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); if (!__rpc_fd2sockinfo(fd, &si)) goto err; @@ -318,12 +321,12 @@ clnt_vc_call(CLIENT *cl, rpcproc_t proc, xdrproc_t xdr_args, void *args_ptr, struct ct_data *ct = (struct ct_data *) cl->cl_private; XDR *xdrs = &(ct->ct_xdrs); struct rpc_msg reply_msg; + struct vc_fd *elem; u_int32_t x_id; u_int32_t *msg_x_id = &ct->ct_u.ct_mcalli; /* yuk */ bool_t shipnow; int refreshes = 2; sigset_t mask, newmask; - int rpc_lock_value; bool_t reply_stat; assert(cl != NULL); @@ -331,14 +334,9 @@ clnt_vc_call(CLIENT *cl, rpcproc_t proc, xdrproc_t xdr_args, void *args_ptr, sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[ct->ct_fd]) - cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock); - if (__isthreaded) - rpc_lock_value = 1; - else - rpc_lock_value = 0; - vc_fd_locks[ct->ct_fd] = rpc_lock_value; + elem = vc_fd_find(ct->ct_fd); mutex_unlock(&clnt_fd_lock); + mutex_lock(&elem->mtx); if (!ct->ct_waitset) { /* If time is not within limits, we ignore it. */ if (time_not_ok(&timeout) == FALSE) @@ -362,7 +360,7 @@ call_again: if (ct->ct_error.re_status == RPC_SUCCESS) ct->ct_error.re_status = RPC_CANTENCODEARGS; (void)xdrrec_endofrecord(xdrs, TRUE); - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } } else { @@ -373,23 +371,23 @@ call_again: if (ct->ct_error.re_status == RPC_SUCCESS) ct->ct_error.re_status = RPC_CANTENCODEARGS; (void)xdrrec_endofrecord(xdrs, TRUE); - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } } if (! xdrrec_endofrecord(xdrs, shipnow)) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status = RPC_CANTSEND); } if (! shipnow) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (RPC_SUCCESS); } /* * Hack to provide rpc-based message passing */ if (timeout.tv_sec == 0 && timeout.tv_usec == 0) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return(ct->ct_error.re_status = RPC_TIMEDOUT); } @@ -403,14 +401,14 @@ call_again: reply_msg.acpted_rply.ar_results.where = NULL; reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; if (! xdrrec_skiprecord(xdrs)) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } /* now decode and validate the response header */ if (! xdr_replymsg(xdrs, &reply_msg)) { if (ct->ct_error.re_status == RPC_SUCCESS) continue; - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } if (reply_msg.rm_xid == x_id) @@ -451,7 +449,7 @@ call_again: if (refreshes-- && AUTH_REFRESH(cl->cl_auth, &reply_msg)) goto call_again; } /* end of unsuccessful completion */ - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } @@ -471,6 +469,7 @@ static bool_t clnt_vc_freeres(CLIENT *cl, xdrproc_t xdr_res, void *res_ptr) { struct ct_data *ct; + struct vc_fd *elem; XDR *xdrs; bool_t dummy; sigset_t mask; @@ -484,14 +483,13 @@ clnt_vc_freeres(CLIENT *cl, xdrproc_t xdr_res, void *res_ptr) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[ct->ct_fd]) - cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock); + elem = vc_fd_find(ct->ct_fd); + mutex_lock(&elem->mtx); xdrs->x_op = XDR_FREE; dummy = (*xdr_res)(xdrs, res_ptr); - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - cond_signal(&vc_cv[ct->ct_fd]); + mutex_unlock(&clnt_fd_lock); + release_fd_lock(elem, mask); return dummy; } @@ -519,10 +517,10 @@ static bool_t clnt_vc_control(CLIENT *cl, u_int request, void *info) { struct ct_data *ct; + struct vc_fd *elem; void *infop = info; sigset_t mask; sigset_t newmask; - int rpc_lock_value; assert(cl != NULL); @@ -531,23 +529,18 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[ct->ct_fd]) - cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock); - if (__isthreaded) - rpc_lock_value = 1; - else - rpc_lock_value = 0; - vc_fd_locks[ct->ct_fd] = rpc_lock_value; + elem = vc_fd_find(ct->ct_fd); mutex_unlock(&clnt_fd_lock); + mutex_lock(&elem->mtx); switch (request) { case CLSET_FD_CLOSE: ct->ct_closeit = TRUE; - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (TRUE); case CLSET_FD_NCLOSE: ct->ct_closeit = FALSE; - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (TRUE); default: break; @@ -555,13 +548,13 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) /* for other requests which use info */ if (info == NULL) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } switch (request) { case CLSET_TIMEOUT: if (time_not_ok((struct timeval *)info)) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } ct->ct_wait = *(struct timeval *)infop; @@ -581,7 +574,7 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) *(struct netbuf *)info = ct->ct_addr; break; case CLSET_SVC_ADDR: /* set to new address */ - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (FALSE); case CLGET_XID: /* @@ -625,10 +618,10 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) break; default: - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (TRUE); } @@ -637,6 +630,7 @@ static void clnt_vc_destroy(CLIENT *cl) { struct ct_data *ct = (struct ct_data *) cl->cl_private; + struct vc_fd *elem; int ct_fd = ct->ct_fd; sigset_t mask; sigset_t newmask; @@ -648,8 +642,8 @@ clnt_vc_destroy(CLIENT *cl) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[ct_fd]) - cond_wait(&vc_cv[ct_fd], &clnt_fd_lock); + elem = vc_fd_find(ct_fd); + mutex_lock(&elem->mtx); if (ct->ct_closeit && ct->ct_fd != -1) { (void)_close(ct->ct_fd); } @@ -662,8 +656,7 @@ clnt_vc_destroy(CLIENT *cl) mem_free(cl->cl_tp, strlen(cl->cl_tp) +1); mem_free(cl, sizeof(CLIENT)); mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - cond_signal(&vc_cv[ct_fd]); + release_fd_lock(elem, mask); } /* diff --git a/lib/libc/rpc/rpc_com.h b/lib/libc/rpc/rpc_com.h index ce386e540f07..40fd81499165 100644 --- a/lib/libc/rpc/rpc_com.h +++ b/lib/libc/rpc/rpc_com.h @@ -59,7 +59,6 @@ __BEGIN_DECLS extern u_int __rpc_get_a_size(int); -extern int __rpc_dtbsize(void); extern struct netconfig * __rpcgettp(int); extern int __rpc_get_default_domain(char **); diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c index 99e3c1263c18..5195c0dc2ac0 100644 --- a/lib/libc/rpc/rpc_generic.c +++ b/lib/libc/rpc/rpc_generic.c @@ -104,29 +104,6 @@ static char *strlocase(char *); #endif static int getnettype(const char *); -/* - * Cache the result of getrlimit(), so we don't have to do an - * expensive call every time. - */ -int -__rpc_dtbsize(void) -{ - static int tbsize; - struct rlimit rl; - - if (tbsize) { - return (tbsize); - } - if (getrlimit(RLIMIT_NOFILE, &rl) == 0) { - return (tbsize = (int)rl.rlim_max); - } - /* - * Something wrong. I'll try to save face by returning a - * pessimistic number. - */ - return (32); -} - /* * Find the appropriate buffer size diff --git a/sys/rpc/rpc_com.h b/sys/rpc/rpc_com.h index 0206971dde2a..facd36c26a39 100644 --- a/sys/rpc/rpc_com.h +++ b/sys/rpc/rpc_com.h @@ -70,7 +70,6 @@ __BEGIN_DECLS #ifndef _KERNEL extern u_int __rpc_get_a_size(int); -extern int __rpc_dtbsize(void); extern struct netconfig * __rpcgettp(int); extern int __rpc_get_default_domain(char **); From nobody Thu Nov 30 11:24:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgv3g4Brpz53CCN; Thu, 30 Nov 2023 11:24: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 4Sgv3g3l3Tz3NFd; Thu, 30 Nov 2023 11:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701343471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BktOj9je+17nG9k5PdKFkp6jpLPM2bi6Wlg4MgloJu0=; b=B6Fg1nWaRyg2H6jQS6HQ3uohxWaw77neZwKHE1Q7macLHXxyZbqtkE9SjFYgaDceOdO1QF iDEJruwEAQqjCjlcj5yOlUIuuBwc22b+j/xZIQwnsJX8aBjBdDsWRb9F6p0JOxxEAR5uVf OoaQ8KgPgaTsdnkfr+jdPOG3eP2CeEs7GkfFdQYsrxK00f20I7fIvMSvJb0ikgWE0GqOLX GwkimSCqYlnXT7IjJ7BEwXVy9VC5O12oMI7yzNoKGlpOEko7J89iw9mcpAbbLt5Gc+tNkv F8Dp6eB49WUrwMwtc00bk4oz+nGZMb9qrtUOxCAg0SE8g5G/YKijLm3q7P8biw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701343471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BktOj9je+17nG9k5PdKFkp6jpLPM2bi6Wlg4MgloJu0=; b=dtt30uhK6bEEwZ1QI9Ido/9RcccZdS9V9hGMVFAGI84xePVqEeifcFLGmNVMXqur2bsNkk mgBIZdXPXite7qLVGMSGUMuDtnNSriDw8jYFhNRyVjLEAPuHvyzrwG4zEELU9LagDmtXNw WjzmDM6cmHaTBRL+Yjx25NIICPbuWgKeB/BtFr9zyCpfsFhUBznR4UdiDPqdcT2TufZ6il Hd1u72e+5ZUWn3iMECo4UpIJg6E0RcziCiaAEeAkHSn+oQZ+lCJdAogR4z0TCZLPe2rZti GaR4dRp5qV4uspJORiZSCgPRYJzmQ69hF1h/WrZXdQ211bUvTn5g62fDWtN6pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701343471; a=rsa-sha256; cv=none; b=V71IuRWTnsdhfoKJ7rnIR8PBYg2CoNEpXi5SfgOKzjtfUnPMwPM4BVAaoegbHx9xy6K+4s 9fOrf0SUKHiq2CqbfyqlGhm05SW9Fz2DburwQG1CAc30oOcPR2LUNPNofe3pA32pHJjWmH VqssSYZ/HD12SokSyIG1FSKJEY+q2cEf4AIOwwwGinPPgWnNVMDkRo+p8xz+NDF+imtOnd sB+xq47p08oLVEBESUJ1p0VXOWGf4hPUrBZlDPZ1A8HSpGE6yuexnCtjRi6nNM6Jmbrpzu maL793AS9yONNWCF8YWd9G3hNKMoGNOhcqRnRSPq0XsJXHOgMpdbkgdv3kj8ig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgv3g2q2dzns6; Thu, 30 Nov 2023 11:24: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 3AUBOVbr037281; Thu, 30 Nov 2023 11:24:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUBOVhd037278; Thu, 30 Nov 2023 11:24:31 GMT (envelope-from git) Date: Thu, 30 Nov 2023 11:24:31 GMT Message-Id: <202311301124.3AUBOVhd037278@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: 8daee410d2c1 - main - vm: Use vmem_xalloc in kva_alloc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 12:31:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgwXm6Vqpz53GWf; Thu, 30 Nov 2023 12:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgwXm63YYz3Vqg; Thu, 30 Nov 2023 12:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701347480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=piL6QEVUDW5a2pAUMjGF6arVKypEXL93ugaFTikitwI=; b=MwatO2CPNxumdvQbOBfDRzJF+EYlopAdHtexneiQN9BxMGt7wntlz3ESBPN5t1hPG6jNsR jehw3wasAxFYwDXjEUwF5Sv4wMdhqSnWWAFgY4y+iFP8h3t/w5Eou6W4btebPDz4oObeDO d0Gv7LtK/xuBD8fblbIQhQnKQ6C2y8U4w1aydiaypoD9JWjuZvYTtlap9sZrj6IUnZDNsD 4Ar/bjKAwn/bou9IzYh1JkqaGQd0dWFdAQ/kTsKOhpajS+UF17vmjtac0qm6njV8tuqfyx lvLFu0PjJqLTMUIeASfG1vHoft0aJ+tb9Fy+3kGEJ0Mrw58WEFqaadPgi98DYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701347480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=piL6QEVUDW5a2pAUMjGF6arVKypEXL93ugaFTikitwI=; b=W9sYJxgZKZIvJS43SARzoHCwtPe8iHeECdxIu3J4zf+FAslrAYESEizSMAVWQHyTgSVfRU AUWCqv8yMe/H9ARe19pA8MgX2cCshdBNGJOajmGxJNP/GiPq/nc+wo8h/ie8IpnMalFH3Z w78ubq1YZgpnbpQqeLLM3nV+f7SRfrbv0iIXlD7ocKufRg4q7Gr4WV8zC/HFncofRH+6Kr iRwCAY6qLDclnt2hl4C/L+oWpwh9DHKjFqxOPe2x2mjaMzQhIf8/f4/tl4Qa7MIuMAZuU7 7yEFUp/6IkteIVPrJmoNuJ0d9WGOlsLJSEggK8Yy548lXPsCct8Kc0GPTPcQkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701347480; a=rsa-sha256; cv=none; b=jL/IgGypK4e5BdFlsTiwQ0Ekz2yRCfwIhSuqxaDzJOhw7U34rvOrA0xJl7KlpnE1IRds85 19jB6O4fAjZEU5dL0Vxbh3gtmik6ezAHblprlEsaoB2OyL3JJfhtr2t5LqbbryQXvedNAi 1oRBuvTTHfMSykYpUZZj4ZNXcBTSd6N5RPHIerDG61xTzriyfVOYrh24/VUKk9Mdgsv5Uc v4pzylXpP3OXEzaE+ZqDeD1kNQH9J48/cwC6AnNadYKqzpg7un8z1ycXEHHOK7u+T/Ns07 rtcV5WQIOxg9v7QH/nEyBviJ6g0vKMcPpZQYtAJvJSVTycdhTp1c0wbdp+bhEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgwXm56XRzq96; Thu, 30 Nov 2023 12:31: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 3AUCVK5B048633; Thu, 30 Nov 2023 12:31:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUCVK7E048630; Thu, 30 Nov 2023 12:31:20 GMT (envelope-from git) Date: Thu, 30 Nov 2023 12:31:20 GMT Message-Id: <202311301231.3AUCVK7E048630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 7aaf39f6b3b0 - stable/13 - nfsd: Fix NFS access to .zfs/snapshot snapshots List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7aaf39f6b3b0bc5cc171eac7ca118d17460ea5db Auto-Submitted: auto-generated The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=7aaf39f6b3b0bc5cc171eac7ca118d17460ea5db commit 7aaf39f6b3b0bc5cc171eac7ca118d17460ea5db Author: Rick Macklem AuthorDate: 2023-11-23 15:23:33 +0000 Commit: Rick Macklem CommitDate: 2023-11-30 12:28:50 +0000 nfsd: Fix NFS access to .zfs/snapshot snapshots When a process attempts to access a snapshot under //.zfs/snapshot, the snapshot is automounted. However, without this patch, the automount does not set mnt_exjail, which results in the snapshot not being accessible over NFS. This patch defines a new function called vfs_exjail_clone() which sets mnt_exjail from another mount point and then uses that function to set mnt_exjail in the snapshot automount. A separate patch that is currently a pull request for OpenZFS, calls this function to fix the problem. PR: 275200 (cherry picked from commit f5f277728adec4c5b3e840a1fb16bd16f8cc956d) --- sys/kern/vfs_mount.c | 35 +++++++++++++++++++++++++++++++++++ sys/sys/mount.h | 4 ++++ 2 files changed, 39 insertions(+) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 4597ae09a831..cefadf75a3a8 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -2824,6 +2824,41 @@ suspend_all_fs(void) mtx_unlock(&mountlist_mtx); } +/* + * Clone the mnt_exjail field to a new mount point. + */ +void +vfs_exjail_clone(struct mount *inmp, struct mount *outmp) +{ + struct ucred *cr; + struct prison *pr; + + MNT_ILOCK(inmp); + cr = inmp->mnt_exjail; + if (cr != NULL) { + crhold(cr); + MNT_IUNLOCK(inmp); + pr = cr->cr_prison; + sx_slock(&allprison_lock); + if (!prison_isalive(pr)) { + sx_sunlock(&allprison_lock); + crfree(cr); + return; + } + MNT_ILOCK(outmp); + if (outmp->mnt_exjail == NULL) { + outmp->mnt_exjail = cr; + atomic_add_int(&pr->pr_exportcnt, 1); + cr = NULL; + } + MNT_IUNLOCK(outmp); + sx_sunlock(&allprison_lock); + if (cr != NULL) + crfree(cr); + } else + MNT_IUNLOCK(inmp); +} + void resume_all_fs(void) { diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 2d9ee8d78bdd..9c1862956812 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -947,6 +947,9 @@ vfs_statfs_t __vfs_statfs; * exported vnode operations */ +/* Define this to indicate that vfs_exjail_clone() exists for ZFS to use. */ +#define VFS_SUPPORTS_EXJAIL_CLONE 1 + int dounmount(struct mount *, int, struct thread *); int kernel_mount(struct mntarg *ma, uint64_t flags); @@ -984,6 +987,7 @@ int vfs_setpublicfs /* set publicly exported fs */ (struct mount *, struct netexport *, struct export_args *); void vfs_periodic(struct mount *, int); int vfs_busy(struct mount *, int); +void vfs_exjail_clone(struct mount *, struct mount *); int vfs_export /* process mount export info */ (struct mount *, struct export_args *, int); void vfs_free_addrlist(struct netexport *); From nobody Thu Nov 30 12:57:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgx7V5fTPz53Hc4; Thu, 30 Nov 2023 12:57: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 4Sgx7V5B88z3YBJ; Thu, 30 Nov 2023 12:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701349078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6puKfbQxbvqaQv5d404juJz8SUb0gmdsyQonp1j9Vfc=; b=WtNrXclcZocndHF2LHOEgADXd4lr6ouccx/FZax0lVyGRiTMc6Ib3ELrdG2+Tt1KbCLpx9 IpEXQWSxI1KBvRel0up3z+OjY1D9LHixVyXsjqK5xbrHNLRYQexNjwc8n5c6lbi2D384Ki 5CgoBl4G0IVwzsL7ZYOIRCCqKHPgyTwEHKTiCvVOPT/662nwruSJN5D8rXvaj6EAaHKtw8 GHQlolb86M+3UmAdYHG5gzU5IV8+4zJqX9AxkNo6+P9fdLAe5XUeGupENCamfr9Nqgho9S UUobPRPysluqKwXe+jQ0Zl4HXW2MwkgcFovRZDcztXBHP84mZKNfqrSJ7+8qCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701349078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6puKfbQxbvqaQv5d404juJz8SUb0gmdsyQonp1j9Vfc=; b=jFE6+K2kx4hkFLu/Kyz1Q5RRsEtHGrdWQvddY+zBwfbiHBXfKjfmoRaa2fiAwML2Nr2PjZ w5ReJNyJK+F3OFfOTle/ezlDkdq00015/Tx8QSy98COvS87HjqlK9DocUayQmNiafr2PgT 7rvQFXsdRcmvtb60fQvKq6YZUnXrHHgRuDD3dpx5pBxnfbr/0sy254VFkruwYC9TU8VMvJ AqZAKBurAx4NXkMxUVQS8p+SuPmpaxr+ajvbc0AVBzjKdUYmb4duc7EeLAherWsdkoQeB+ iUoYeiuatUEbQX2i3y9OkXDdVRQiyWjWnrCWXnR+6FM3ukRJFf/6lDm2TcW9hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701349078; a=rsa-sha256; cv=none; b=UPrfsgW7TUkPO5NSx9iTeQ3j2jLK3uZ6KD4Wd2oBw1KJFzN3uXhPFq46NjFGF9Wtc02yfE aNNufpJB6ff3/Q5VADIuqgvVqIhuwwHO+ihM+6Y+9S6ADlpo04AIxpUsG0suMe+i4Dg4IO vJECIfFBPAQ0NeZQy+wXcG24kEHJhpotyI26UgL/8aZfer8E5lKNNCUBHl28pfmmV3nS2F gEH2NQemaC5jcIlB6mclqDto8lD0IYyKFdTnaMh9C5H2cNM2E38s5zi3fccI+fW8eGGKPu NZlKMlBonkev+0JQ4Zhrk4VPnuClBoOWXWTSIg9RjMcFOsaTowKbvR4OFdRmpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgx7V4Ds1zqMk; Thu, 30 Nov 2023 12:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AUCvwEX088425; Thu, 30 Nov 2023 12:57:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUCvwNG088422; Thu, 30 Nov 2023 12:57:58 GMT (envelope-from git) Date: Thu, 30 Nov 2023 12:57:58 GMT Message-Id: <202311301257.3AUCvwNG088422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 895905635225 - stable/12 - dnode_is_dirty: check dnode and its data for dirtiness List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8959056352256e79a63ba6327f0a0ee4236d3e7f Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8959056352256e79a63ba6327f0a0ee4236d3e7f commit 8959056352256e79a63ba6327f0a0ee4236d3e7f Author: Rob Norris AuthorDate: 2023-11-30 05:14:13 +0000 Commit: Ed Maste CommitDate: 2023-11-30 05:28:33 +0000 dnode_is_dirty: check dnode and its data for dirtiness Over its history this the dirty dnode test has been changed between checking for a dnodes being on `os_dirty_dnodes` (`dn_dirty_link`) and `dn_dirty_record`. It turns out both are actually required. In the case of appending data to a newly created file, the dnode proper is dirtied (at least to change the blocksize) and dirty records are added. Thus, a single logical operation is represented by separate dirty indicators, and must not be separated. The incorrect dirty check becomes a problem when the first block of a file is being appended to while another process is calling lseek to skip holes. There is a small window where the dnode part is undirtied while there are still dirty records. In this case, `lseek(fd, 0, SEEK_DATA)` would not know that the file is dirty, and would go to `dnode_next_offset()`. Since the object has no data blocks yet, it returns `ESRCH`, indicating no data found, which results in `ENXIO` being returned to `lseek()`'s caller. This change simply updates the dirty check to check both types of dirty. If there's anything dirty at all, we immediately go to the "wait for sync" stage, It doesn't really matter after that; both changes are on disk, so the dirty fields should be correct. Sponsored by: Klara, Inc. Sponsored by: Wasabi Technology, Inc. --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c index 45ac4b796fd2..bd78daf5d517 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c @@ -2557,7 +2557,8 @@ dmu_object_wait_synced(objset_t *os, uint64_t object) } for (i = 0; i < TXG_SIZE; i++) { - if (list_link_active(&dn->dn_dirty_link[i])) { + if (list_link_active(&dn->dn_dirty_link[i]) || + !list_is_empty(&dn->dn_dirty_records[i])) { break; } } From nobody Thu Nov 30 15:30:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-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:02:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh2YB3G9Rz52JJB; Thu, 30 Nov 2023 17:02: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 4Sh2YB2jG6z4Z5t; Thu, 30 Nov 2023 17:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701363726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1rpr44Oxi382RO6+7ajIqS/fcK5/m4A+0vp/8OhA2fw=; b=FdRdWtjU+/3B7w72gheLgoGOxS4RW6ZqAC+3rMD34+O2uOTGbZR06YCbnLAiQmQYXUb3sQ 16iGA5MStoMZRAhKZW+hJIilat4Ib4CYgH6prvIep5saUwIwYZ+158UsSjCOU5jxej3GYY 3dz0jWJIPRHdVlSMUoOqZcfYdWX2eqBvDXwQC6yIKvncNni6Z3q0WniCHJJ6ADVH1w4HI2 HIhba6XY8SePIlMneZFLZqZBSfR22ik1D+AS4AMRY+22lTiv1Gwi6jsRV82+f1/8tPWN9k CNXhovFimVaSSYQiv7caC9iPtAEDXSUmpmgL8hCpC1olgo7CgdPbIw0rbtnVrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701363726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1rpr44Oxi382RO6+7ajIqS/fcK5/m4A+0vp/8OhA2fw=; b=RD9LWoZMbUBeBNhjGpjdlTxTAAU/TzV6cI7Lk81opO8DoLI2CuiIiwn3R6HEGU317FMdRs /AZBnDrlJDu0dpfh8iFN3uNTP0Tttf06MaWw+kYFd3vIhOrlWVYD+h2BTzbWVEDf1NXy9B xMrPiJNaZ+7mIlXjy04d992vuI3srmDwSjhk0lK2Hwn5lTKwMfNVVKpPmXSsq0hlItnn6H lsKrp2SjQKVaWx2tHlrCidLImxBfES38VIJirRHFyCXgSBxYBWH/y9zacrBSfbYXpO2VXl RSg4Z5ZakMU6bBQSd0Jl/UqxrRSF38D+G3sppLV/KZOMIY4qPnC83sFa2DpXdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701363726; a=rsa-sha256; cv=none; b=nw/gy8ljFkWivhorEnmO1Q/1sCiHXxNWkqmZMz9F7hsIJGwWid3+yG/cagdhsCtMQOksKq iO294I1aLXaxxEF5mr5OxNCOhfG+mCd7IXKpqXow2z7juOZtRf0ACrJruZQvmnf3mI/bmK NTfHTF81xzr9jDEcumDJmVJoOeVymutQkUTwzCNsXdYjW5SN97XreL8jdWCfdCKLIY5nuO FVO8mxhYTEovU0+r705ef6dYJ9o33c9JNBif2oAQ3vL00OoDfemaKvF8F2UdCOhrOmBHMF D/ECMZ/XPQW2yG7fI3mE35ESFaKCEOXRRsZxkWilJTiswxtezq0U3qL6w5iwuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sh2YB1nvPzyKX; Thu, 30 Nov 2023 17:02: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 3AUH26B2005520; Thu, 30 Nov 2023 17:02:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUH26BE005518; Thu, 30 Nov 2023 17:02:06 GMT (envelope-from git) Date: Thu, 30 Nov 2023 17:02:06 GMT Message-Id: <202311301702.3AUH26BE005518@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: 09f4b840bd7c - stable/14 - ng_ksocket: fix upcall clearing on node shutdown List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 09f4b840bd7cb6427af2a28a10bd839da6dd76d5 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=09f4b840bd7cb6427af2a28a10bd839da6dd76d5 commit 09f4b840bd7cb6427af2a28a10bd839da6dd76d5 Author: Gleb Smirnoff AuthorDate: 2023-11-17 17:23:58 +0000 Commit: Gleb Smirnoff CommitDate: 2023-11-30 17:01:39 +0000 ng_ksocket: fix upcall clearing on node shutdown Note: imho, the proper solution would be to guarantee that upcalls won't ever be called after soclose(), but this isn't the case, yet. This change at least makes the node work the way it always worked. Reviewed by: afedorov Differential Revision: https://reviews.freebsd.org/D42636 PR: 272319 PR: 275106 Fixes: 779f106aa169256b7010a1d8f963ff656b881e92 (cherry picked from commit efad7cbfdc06e92bcc589a6c0cae2f3bea0d5cb9) --- sys/netgraph/ng_ksocket.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index 7e5be8c211ae..337248789473 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -929,17 +929,24 @@ static int ng_ksocket_shutdown(node_p node) { const priv_p priv = NG_NODE_PRIVATE(node); + struct socket *so = priv->so; priv_p embryo; /* Close our socket (if any) */ if (priv->so != NULL) { - SOCKBUF_LOCK(&priv->so->so_rcv); - soupcall_clear(priv->so, SO_RCV); - SOCKBUF_UNLOCK(&priv->so->so_rcv); - SOCKBUF_LOCK(&priv->so->so_snd); - soupcall_clear(priv->so, SO_SND); - SOCKBUF_UNLOCK(&priv->so->so_snd); - soclose(priv->so); + if (SOLISTENING(so)) { + SOLISTEN_LOCK(so); + solisten_upcall_set(so, NULL, NULL); + SOLISTEN_UNLOCK(so); + } else { + SOCK_RECVBUF_LOCK(so); + soupcall_clear(so, SO_RCV); + SOCK_RECVBUF_UNLOCK(so); + SOCK_SENDBUF_LOCK(so); + soupcall_clear(so, SO_SND); + SOCK_SENDBUF_UNLOCK(so); + } + soclose(so); priv->so = NULL; } From nobody Thu Nov 30 17:02:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh2YC4yZnz52JJJ; Thu, 30 Nov 2023 17:02: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 4Sh2YC44Vmz4Z3x; Thu, 30 Nov 2023 17:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701363727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jSVODnjvQYGCKlNY+t12ll5CPHFbV8vwwO8I1ornLP0=; b=duJ/SoM0pT4eHOvdrBkSUCpDiLx3WmgnMP4dNfVBhOJCZ5GK7ZnYMtgogFGhNotRtFhWRw C2OwoTF1e5U/h5E6ahCJcMrtQm8Ed6AY5lzW9blAhvLqgM6bmNeNCH9lxvYTRL3hA5PPBI PJVm7eyznxJ0UlJAnJcFoABSJdlk1rxeSeBk9F/xyWnnvVqXTVyrvoc882Ar20xAR6oJpo aszvdidrG8FQak+G+whGCBPScZqKdZuYQxSgIcq9dGCO7+Zht3YqfoES/ZUFJNdCAG64/R f2qSnJxscM5GTeJw9R0jyGkdH3cpq8QTOMERLO07h40I4JcJtCReL6AcyiZ6Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701363727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jSVODnjvQYGCKlNY+t12ll5CPHFbV8vwwO8I1ornLP0=; b=pHOjeMpkh/SyTzxAubfVDGIi3D6KdpLmEAzp45SWvVhbSDYwo/8kFlLIf1+TyKfHWHyewE efvv9QTW5ixVxM72P19UbXCv5JCUMn/DsvH2c7M9h36i1a+wy23hpIeqRODBd25rpymKP8 IIS8Jzoei5/tozv7bX4mJci1xO8HKCoxL807hXqpC+zlkl9tD8irS/Yx52Yu5bO7KRuONd e8W6KOUKQh8gVAyAqkJ6InfHLHny2YHz/8AzsIP+hSbkmDtbwZymJA+udtxW5j/lgaoWBs suMD5KMtnuNqTG1t1uo7L7wr66A5UXfjju6QtR3ZW6m15mq7UDps4OQB9rIc4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701363727; a=rsa-sha256; cv=none; b=UYSmk2YGZogK1tYfixpMp2fAQt0WfPfJ95cxtXGBK3bKBTg11JZ4cCoFMb0hdqTtvvW1WP xHCm2oKnyXVhKBA+ziNcq3IVEx3aB5byOz19kjf9MTGvKy2SZqZwyvV3eLwqBwPSS/DtxP NPkMj2lN13n//wHVhrQ2aCTI3+280NtYkCRuTgGALWf6SiXjp06mMEW74e6aJ2dxiJIBWY hEj5Pb692cylw65NQ6HbpbWat/CBbsSMrvytnfh2n/OnQwjwtvhyzjmql1CHt2dvt2e/0I yWdW210u5kxq0gZtH1+HhzuPapAdHfTlwp2EiNO8/0IG4B/uOGt70sX1AVo6cA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sh2YC30gjzy5d; Thu, 30 Nov 2023 17:02: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 3AUH27tW005557; Thu, 30 Nov 2023 17:02:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUH27iH005554; Thu, 30 Nov 2023 17:02:07 GMT (envelope-from git) Date: Thu, 30 Nov 2023 17:02:07 GMT Message-Id: <202311301702.3AUH27iH005554@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: ae3c8991cf0d - stable/14 - ng_ksocket: fix accept(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae3c8991cf0db9beff762f90b55e8995326eb894 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ae3c8991cf0db9beff762f90b55e8995326eb894 commit ae3c8991cf0db9beff762f90b55e8995326eb894 Author: Gleb Smirnoff AuthorDate: 2023-11-17 17:24:30 +0000 Commit: Gleb Smirnoff CommitDate: 2023-11-30 17:01:40 +0000 ng_ksocket: fix accept(2) - Provide listen upcall and set it on NGM_KSOCKET_LISTEN - Mask EWOULDBLOCK on NGM_KSOCKET_ACCEPT Reviewed by: afedorov Differential Revision: https://reviews.freebsd.org/D42637 PR: 272319 PR: 275106 Fixes: 779f106aa169256b7010a1d8f963ff656b881e92 (cherry picked from commit 43f7e21668105cc5a3c66eae5ecef0203c2df62f) --- sys/netgraph/ng_ksocket.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index 337248789473..777f3261356d 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -152,6 +152,10 @@ static const struct ng_ksocket_alias ng_ksocket_protos[] = { /* Helper functions */ static int ng_ksocket_accept(priv_p); +static int ng_ksocket_listen_upcall(struct socket *so, void *arg, + int waitflag); +static void ng_ksocket_listen_upcall2(node_p node, hook_p hook, + void *arg1, int arg2); static int ng_ksocket_incoming(struct socket *so, void *arg, int waitflag); static int ng_ksocket_parse(const struct ng_ksocket_alias *aliases, const char *s, int family); @@ -695,6 +699,12 @@ ng_ksocket_rcvmsg(node_p node, item_p item, hook_p lasthook) /* Listen */ so->so_state |= SS_NBIO; error = solisten(so, *((int32_t *)msg->data), td); + if (error == 0) { + SOLISTEN_LOCK(so); + solisten_upcall_set(so, + ng_ksocket_listen_upcall, priv); + SOLISTEN_UNLOCK(so); + } break; } @@ -715,11 +725,15 @@ ng_ksocket_rcvmsg(node_p node, item_p item, hook_p lasthook) /* * If a connection is already complete, take it. * Otherwise let the upcall function deal with - * the connection when it comes in. + * the connection when it comes in. Don't return + * EWOULDBLOCK, per ng_ksocket(4) documentation. */ error = ng_ksocket_accept(priv); - if (error != 0 && error != EWOULDBLOCK) + if (error == EWOULDBLOCK) + error = 0; + if (error != 0) ERROUT(error); + priv->response_token = msg->header.token; priv->response_addr = NGI_RETADDR(item); break; @@ -1064,10 +1078,6 @@ ng_ksocket_incoming2(node_p node, hook_p hook, void *arg1, int arg2) } } - /* Check whether a pending accept operation has completed */ - if (priv->flags & KSF_ACCEPTING) - (void )ng_ksocket_accept(priv); - /* * If we don't have a hook, we must handle data events later. When * the hook gets created and is connected, this upcall function @@ -1250,6 +1260,25 @@ out: return (0); } +static int +ng_ksocket_listen_upcall(struct socket *so, void *arg, int waitflag) +{ + priv_p priv = arg; + int wait = ((waitflag & M_WAITOK) ? NG_WAITOK : 0) | NG_QUEUE; + + ng_send_fn1(priv->node, NULL, &ng_ksocket_listen_upcall2, priv, 0, + wait); + return (SU_OK); +} + +static void +ng_ksocket_listen_upcall2(node_p node, hook_p hook, void *arg1, int arg2) +{ + const priv_p priv = NG_NODE_PRIVATE(node); + + (void )ng_ksocket_accept(priv); +} + /* * Parse out either an integer value or an alias. */ From nobody Thu Nov 30 17:51:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh6RV3FZfz52Ty3 for ; Thu, 30 Nov 2023 19:57:26 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (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 4Sh6RV092xz3MZc for ; Thu, 30 Nov 2023 19:57:26 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-54b0c7987easo1541436a12.3 for ; Thu, 30 Nov 2023 11:57:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701374244; x=1701979044; 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=ZI1mENQ+OkEOuqnx1YGTuykHKRAUnhgK8MFQqgU7BsNhdRLTVkeM61AVIjS0+7xZpm fiqhc+5CrPgb7BjhKqXE1Txgwz/Xx3RZkP5bbtAIPBCpJzApdts8pHMnquW8Xp2IhtPL GTAtLgufRNKHQxOCbAXj2pTnOy9P3NPyi5WFbwvvWAQM8CO8SY17hcvfb2/4hpMC3b2j Ars1oxMtUBsXCiU2PVi8gKsftD+5BPyYjAYfm4fZ8T6XLANtzFj8fraphFwB/nc+cLCf 8GH8qNvejTlWvy9HAgw/2TTQzzCw5rr53VRkD2MT8swhv0EssALgvd/UE6V7LfKanjT5 O0Pg== X-Gm-Message-State: AOJu0Yyl/JnKG3q/NNyrS5cnSIH09GFkyBvQFmHXmxbTiuTY0mcup11p acuj/RaEPEj0S1qDF/nySFC7vhQhzEY0qDpLLRU= 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(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: 4Sh6RV092xz3MZc 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:00:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh6WY6QfVz52TkS for ; Thu, 30 Nov 2023 20:00: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 4Sh6WY60Zrz3NGg; Thu, 30 Nov 2023 20:00:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701374457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vnb4QSHB83obTxgwfj7qantTCecol0h52mo3fM/BlN0=; b=DdWTRlVrkMTYqCMHmb02BeLuRrdglyMbbWiUvQoC/poW+AzZbSIRiKG4lcLeoMB4QWZ6pq NvRR/FBFJ1cdZXyyG+Si05C2Twziyd8R3QLnc9xFoZ6Qx8Wkt9XOpdNlKQKnTOYxxm+z3i UlP/sCCAkZQEaN0D334uilweipLO7grmmqfSA+S5KBrE7u6NzAmHZ7WcDmKuxHx28zRGsI ehAUGDhTeZuMKN1W1f6Gvyx5tmcWxyRGrGguKa7oZqYzQU3W+ZFvAw3sfAghayarvwxcZW JwHAAHUhNSQ2sDiD+y942R5ppJQn9TEM6KWTC48Qj1SAZcQS9CYtsyhDJQuzVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701374457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vnb4QSHB83obTxgwfj7qantTCecol0h52mo3fM/BlN0=; b=sUgfQ5WJ2rBWdHx5CnF3NSqwjfvJPz9jT8y3JAxhOeywGdRFr3j9QLmtMHlZ5tKtPmJjjp ixUPLLVpjrbe2QxymAJNyh9ipAVvKx2pUC2EBUcf7ksyfImrF/ZHRqPBibrXm0gGgBfvjs Z6V9Lij68YtWbm4NfjpSnfssXpgoBgVuVorOHly3YvTB9KeYCYOUPOo5A85bj4aSuU0kZf 8tNCJgHKkA/J7b96eKhKOlS+v6dRM26/9ha87Hhk+3p5g3WgeZHHEauH7ZMgmw0Bfweaa7 wQH4VlcHnijnUdCCSkrxlQWzcnFEw1HN43pWeAUv0JUfL01t5wNfoWIuz9HFMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701374457; a=rsa-sha256; cv=none; b=TlgL8p+UkqRj8Lu360nuAPjnWtQO2j7/02Lsvuix101tD3IJmP/ApjQMR0jupg5/B4Hg/g Sj114tZLxdDwEuAh2f61p37/urzEDTiBHvRPxneR5uAPufzb91+GbvfPCC5oLjajn3rBww a6zSlyiYoF/8Ixeq1iZuTpxRTmw2j8aMHwl35pDx8RE9nSB0dDfB5ADOgOBXciGNmW5FMZ O78Tw3NEU8q3uupZP5CgkZJ2/5C9ZSUlpNEn1GmUebq5L+76ltgsHSawEBnpspA4jxOp1X LOCDZk5xgnM2t7QgYe2xyDwPUN6gmFoVEgsD7gP/ctC2LCmKuOjnot+tCEaZgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sh6WY53x3z12tw; Thu, 30 Nov 2023 20:00: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 3AUK0vqw000724; Thu, 30 Nov 2023 20:00:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUK0vZV000712; Thu, 30 Nov 2023 20:00:57 GMT (envelope-from git) Date: Thu, 30 Nov 2023 20:00:57 GMT Message-Id: <202311302000.3AUK0vZV000712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: c515b4cef4eb - Create tag vendor/llvm-project/llvmorg-17.0.6-0-g6009708b4367 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/tags/vendor/llvm-project/llvmorg-17.0.6-0-g6009708b4367 X-Git-Reftype: annotated tag X-Git-Commit: c515b4cef4eb152426d16bb62f585c549ce9c67f Auto-Submitted: auto-generated The annotated tag vendor/llvm-project/llvmorg-17.0.6-0-g6009708b4367 has been created by dim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/llvm-project/llvmorg-17.0.6-0-g6009708b4367 tag vendor/llvm-project/llvmorg-17.0.6-0-g6009708b4367 Tagger: Dimitry Andric TaggerDate: 2023-11-30 20:00:33 +0000 Tag llvm-project branch release/17.x llvmorg-17.0.6-0-g6009708b4367. commit 703029dbba788f300e679f7512b73257f79499d4 Author: Dimitry Andric AuthorDate: 2023-11-30 20:00:16 +0000 Commit: Dimitry Andric CommitDate: 2023-11-30 20:00:16 +0000 Vendor import of llvm-project branch release/17.x llvmorg-17.0.6-0-g6009708b4367. From nobody Thu Nov 30 20:00:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh6WY6TWbz52V1r for ; Thu, 30 Nov 2023 20:00: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 4Sh6WY5vbVz3NJk; Thu, 30 Nov 2023 20:00:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701374457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nXbAoYsRgAiwwABmPaknD+JeeLYMEWzzriTMvUjuiUE=; b=fAGfKz3cx9535lGNR8PqWyWi/0NOsA8Do3iNeXIbI4u+KmChzSddEOwaiJLikxx/FP7q8I YRzNXcCjXnuWR5pJExx7inaWGeCuELeSbdeakkseYG6XBdXPIPJNPpc/aJX9EmbVpQGJX5 fyiWBstOdxrjrJuXADJ82GjbjRUW89S4qLY+0yJduTjTf3RXq46w5EVHfkWcFkUsN79DyQ 5iSkfjQIUi1P7Fv8+Qvg2HyQ6Cj8oKA6XJYIsh3djwQSUgaKU1pi2oAH/FUWtVCdITBgiP KhaImNNEAn3VSZCWbAc6sMvU4R1StXws7CJL6v6ykRYp39df74uFLifLPsignQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701374457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nXbAoYsRgAiwwABmPaknD+JeeLYMEWzzriTMvUjuiUE=; b=kNBRRtFC1J9VQPTfFKKxkUZSKhoYUOeF5Omg3UniONZ+w03XPc33lg7nUqIW87KBzztv/G jhOJFL9XDAj3Mchd2LMKwEaFu1+vJaUjcEhgj8SP46zqVnU5R5D+kI7pYjuD0CP5BPliFu BTw8R/O4RVmtOnk204QqkSQQDNJN0T/Bd+upjfE9yFMWPj+TKCL1ixQWxzzNhIFl4Lqk0c cPOjzF5706VXPdwDJM2Cm9yBo5dUZnfc4AH5Fm9JignBof4xS8lv7bGOxag8IwHiQlb+Af jKiuoKZWm27CcKkJXawy0t3KVJfju5WzsQa3Z4So+hWzftA3yz+FFXlgo++Vbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701374457; a=rsa-sha256; cv=none; b=vx4aZ/QXeEtN1hfM0NNXZ398vO9Sr3EK7GKVBmP216QC4Qgfd8YGzXDNkca33bM7pHjndb fBzYwpPGIGy1HcphD52uSPdseIKBPwrYnd9vNSKw58nm/TacirLaNxuSfAWMY55detDd4f Q7E8AmJuJA1+5wcAWuO0j+nPaoEtYXlrQBEdDoHLmB7XRM7U1gGddvoFy7/iXRYgq8yN4V LIadbxxLUR+ootLhkVbB1nSGDgEg2lGsXAJYnkU10/EiejtUtVMSOzTz+2RGU1J7z7OKCJ sR5YYxQJbhUZp2CL3ecBca6Q9naOBlq+N+fqB2SHPUuMPBuOezBhI5GEx3As/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 4Sh6WY4dzJz136W; Thu, 30 Nov 2023 20:00: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 3AUK0v7b000610; Thu, 30 Nov 2023 20:00:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUK0vNX000591; Thu, 30 Nov 2023 20:00:57 GMT (envelope-from git) Date: Thu, 30 Nov 2023 20:00:57 GMT Message-Id: <202311302000.3AUK0vNX000591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: fc0a8108a55a..703029dbba78 - vendor/llvm-project/release-17.x - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/vendor/llvm-project/release-17.x X-Git-Reftype: branch X-Git-Commit: 703029dbba788f300e679f7512b73257f79499d4 X-Git-Oldrev: fc0a8108a55ae5db3aa0e71a9877bd56f0581728 X-Git-Newrev: 703029dbba788f300e679f7512b73257f79499d4 Auto-Submitted: auto-generated The branch vendor/llvm-project/release-17.x has been updated by dim: URL: https://cgit.FreeBSD.org/src/log/?id=fc0a8108a55a..703029dbba78 703029dbba78 Vendor import of llvm-project branch release/17.x llvmorg-17.0.6-0-g6009708b4367. From nobody Thu Nov 30 20:38:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh7Ll5ZnNz52Wy4; Thu, 30 Nov 2023 20:38: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 4Sh7Ll569Lz3S6N; Thu, 30 Nov 2023 20:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701376703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sfh06W0+fdA12VynNOZVKe3Bgc7WT1EP8PBLhpLiSNo=; b=HDaSd7ejRxuCmwyKQWDjdfO3r6l0Djy8Z8p9ScM8VPXjbQ20wLGOgZRyRSV7uhNeZ89PlT AAYcwbtRFNlA3Dyq6MHeoPUAc/ggl4KWT4qtNXkOJZfS81GnsJHL3TfQXrC0kKjLUSToQQ eEag5rOBjmIuWbTHcPgpxEnUnplQAf47LOXjy+6QvQ5gtwUV920B+u6qxcnoTQZGpmMEU3 XTzJ1QSLSc2rqB4yKstJ9q74ukD1SNnJP4izd2kcUcCrxFBQoW5srjg2IJeVJBr6oerVPM +HLQxyj5q5NjCZD6Nb0zXLur4/BD23c73xKnymX6pG3UQ7qiY1L/+6ECQXmJ1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701376703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sfh06W0+fdA12VynNOZVKe3Bgc7WT1EP8PBLhpLiSNo=; b=EISIbQuLDX2b6cgrAe4ZwEq/bvDeiJnYQgvoGTN0a/qX29CslTpFqkjrwmdBJk92nzdtw6 x29ps5hfiVP/CUJHyXLYoFKkiBw9UwYghRzXR8BjEFT8jrGDjvmKigu8XFGO/APFaJh20W 7O18jaKFNaUUlUXLjoNTjO2EyMDW733gT1f2lm3KpRMBkckIK4PhbhipRwUcue7Q7iNtVU nUStJ1dG/sxSIavpUKmayhMRQoZl11LbppvrfSCLTE6blMDqjOiI66cM/7KobUIhQKP6lu Gz88f6aGFY0Fmfb0wyPp4Nyx0LIX+/TPxGVEsatWEPDpzxqcZv0Vm7yaeayvFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701376703; a=rsa-sha256; cv=none; b=Jzmgomda3m/sBD/kzA1vHmOndQS6l/UKLh6AXbsis9gLmmwiIYZMSLQMj24y88cx0QWTqv XQjRS2WaBDIGxhpXxOQ1qvBD2Z+uyIPaHinF0kSjDlVKyBhLEWh3A1C39Ii7273cdBEBnA 740X+kirVtuS//tVDZbARZOYoXs+gOjzWcF5Ge2NBNKp1/TvJfrv8yPi1/JdyihvpcOHlH lw3jg4mwfUf43FijR44fCttWeXMgO7BB8MYu9K/3R4xZezEiBDRbYVO8hZhGVsdiiJ4h4+ GG+OxLFYetfU5nFm35xHdHfDT67w08OErFtoJplCSTzY5Zl/Yzsf2lFHRQ+Igw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sh7Ll48jkz145h; Thu, 30 Nov 2023 20:38: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 3AUKcNZw056361; Thu, 30 Nov 2023 20:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUKcNQT056358; Thu, 30 Nov 2023 20:38:23 GMT (envelope-from git) Date: Thu, 30 Nov 2023 20:38:23 GMT Message-Id: <202311302038.3AUKcNQT056358@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: f23f9941f149 - stable/14 - aio_read.2: correct the description of aio_buf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f23f9941f1497af60c46d7525fb13508c1c27286 Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=f23f9941f1497af60c46d7525fb13508c1c27286 commit f23f9941f1497af60c46d7525fb13508c1c27286 Author: Alan Somers AuthorDate: 2023-11-15 17:31:24 +0000 Commit: Alan Somers CommitDate: 2023-11-30 20:38:09 +0000 aio_read.2: correct the description of aio_buf Looks like a copypasta from aio_write.2. [skip ci] Reported by: Paul Floyd Sponsored by: Axcient Reviewed by: jilles (manpages) Differential Revision: https://reviews.freebsd.org/D42621 (cherry picked from commit 04cfe6c12ccc75624dc87ab8f44c4852b16f0c4f) --- lib/libc/sys/aio_read.2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/aio_read.2 b/lib/libc/sys/aio_read.2 index 1470c70438a3..c6f062fa406d 100644 --- a/lib/libc/sys/aio_read.2 +++ b/lib/libc/sys/aio_read.2 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 2, 2021 +.Dd November 15, 2023 .Dt AIO_READ 2 .Os .Sh NAME @@ -51,7 +51,7 @@ beginning at the offset .Fn aio_read will read .Fa iocb->aio_nbytes -from the buffer pointed to by +into the buffer pointed to by .Fa iocb->aio_buf , whereas .Fn aio_readv From nobody Thu Nov 30 20:40:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 Thu Nov 30 23:48:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShCZR34CWz52yfv; Thu, 30 Nov 2023 23:48: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 4ShCZR2SQrz3gdF; Thu, 30 Nov 2023 23:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701388127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpFZtcvD6JXPRO3IhoHJAKf2ddvru8xsh9MIuu9LZww=; b=bqi7yJkORikNskP7n/3tZ+gs23ckSEadrVb3QoFOAQ3D9yo177axGLhRTN3BrEhEkA6Jpk TQ/2599+SjXUB22ZQ2MF3jQCp2XganHDmjgwxveu4gUeZME0YDH4bMalwKBUD4v6Xtsz5/ Rlkg6nHdVq/VKSnRvemQfsI7/ZnoC/Tu5U1R8r+riJKP7NxB8XHYu7VIY1gXNxo25od9KD TASi5J1qJzzU+7fFw2bBO9inIfta8pIY/3eoPUt+5nAvtSFP7Yh3xSvBlL/KNRk2dXQOh3 UTpGQRwAIXT+pfGbhHOmUL6xdGSetT66Lqswa7aWlFnCPn5dVT6kT1hw/xiHOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701388127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpFZtcvD6JXPRO3IhoHJAKf2ddvru8xsh9MIuu9LZww=; b=S8XTtP89Kzilxg4jaEE+pvE2OEV/8Kvt9DAFZywsNSCFzP9xr5JLoQoeFgBEhafQUWv5Eg gMLWQGHdiFB5pbs7SnewpC6QJlmxS/0/z4uR2ZovuhI9+WBHaxLfpcODzwsA1FzaI2yAEB ss3kT7x428O4X35yViSvcVC3xDenBwQYn4nW06/hHjt3VcSEmxZxWD9cW6R9pIM9nKOBVZ 4q4ZjVM4JrdFYBjdKRGRy0Rz63K2BI029pvjwHJOsynRdXiX0v4E/Hw9hTugz9gp54R+KK D3p/007cbFVzcZe8ZBjocMIWa9WOXIYxGVOzZ6WaqXyVBU44t8f8nVvo+5Nhzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701388127; a=rsa-sha256; cv=none; b=MYkrPPIsRJoTLGR/OwOE1b+Wvl0XkH7NrNrcAVd/ioWbGWe53S1r632E0KNjTqUba+oNUv le2tXszRagLp8iRReua9k2+28giQnMHpROoyMhUn1cRGdvM7wwSejlWvwlHrZEs/srE3A2 Lbe2JRJ0h3OoqRGsVO0DgqNf/xJBk4kCYxghI2aG31/WOgfn6EGiUHVRhbFcwuuqFO/Qap RVoxCm6P1TAF3TbH4CkIzPlgRCCVZ9wgjvERAZF++lI0E1elsOjTU55wLI3T2pLuOQtkA7 UxxyKalNRqTueKH0WKVQxjY4ogPyGerGN7pCa/nhitfF5dLMlYipmMuJYmpcfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShCZR1TbGz19Mk; Thu, 30 Nov 2023 23:48: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 3AUNmlQ0072987; Thu, 30 Nov 2023 23:48:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUNml49072984; Thu, 30 Nov 2023 23:48:47 GMT (envelope-from git) Date: Thu, 30 Nov 2023 23:48:47 GMT Message-Id: <202311302348.3AUNml49072984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: e8dd46ee96c8 - stable/13 - fusefs: add more readdir tests for misbehaving servers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e8dd46ee96c82ed06e5d79f503203a40719fb8d8 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=e8dd46ee96c82ed06e5d79f503203a40719fb8d8 commit e8dd46ee96c82ed06e5d79f503203a40719fb8d8 Author: Alan Somers AuthorDate: 2023-10-05 16:13:05 +0000 Commit: Alan Somers CommitDate: 2023-11-30 20:41:53 +0000 fusefs: add more readdir tests for misbehaving servers Inspired by PR 274268 Sponsored by: Axcient (cherry picked from commit 6a773a0582ba936cc19734b21ee5a7bed49cfdec) --- tests/sys/fs/fusefs/readdir.cc | 87 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/tests/sys/fs/fusefs/readdir.cc b/tests/sys/fs/fusefs/readdir.cc index 5fd8f25e8bb7..6b78e3a70697 100644 --- a/tests/sys/fs/fusefs/readdir.cc +++ b/tests/sys/fs/fusefs/readdir.cc @@ -321,6 +321,50 @@ TEST_F(Readdir, nodots) leakdir(dir); } +/* + * FUSE_READDIR returns a path with an embedded NUL. Obviously illegal, but + * nothing bad should happen. + */ +TEST_F(Readdir, nul) +{ + const char FULLPATH[] = "mountpoint/some_dir"; + const char RELPATH[] = "some_dir"; + uint64_t ino = 42; + DIR *dir; + struct dirent *de; + vector ents(1); + vector empty_ents(0); + const char nul[] = "foo\0bar"; + + expect_lookup(RELPATH, ino); + expect_opendir(ino); + ents[0].d_fileno = 4; + ents[0].d_off = 4000; + ents[0].d_namlen = sizeof(nul); + ents[0].d_type = DT_REG; + strncpy(ents[0].d_name, nul, ents[0].d_namlen); + expect_readdir(ino, 0, ents); + expect_readdir(ino, 4000, empty_ents); + + errno = 0; + dir = opendir(FULLPATH); + ASSERT_NE(nullptr, dir) << strerror(errno); + + errno = 0; + de = readdir(dir); + ASSERT_NE(nullptr, de) << strerror(errno); + EXPECT_EQ(4ul, de->d_fileno); + EXPECT_EQ(DT_REG, de->d_type); + EXPECT_EQ(sizeof(nul), de->d_namlen); + EXPECT_EQ(0, strcmp(nul, de->d_name)); + + ASSERT_EQ(nullptr, readdir(dir)); + ASSERT_EQ(0, errno); + + leakdir(dir); +} + + /* telldir(3) and seekdir(3) should work with fuse */ TEST_F(Readdir, seekdir) { @@ -397,6 +441,49 @@ TEST_F(Readdir, seekdir) leakdir(dir); } +/* + * FUSE_READDIR returns a path with an embedded /. Obviously illegal, but + * nothing bad should happen. + */ +TEST_F(Readdir, slash) +{ + const char FULLPATH[] = "mountpoint/some_dir"; + const char RELPATH[] = "some_dir"; + uint64_t ino = 42; + DIR *dir; + struct dirent *de; + vector ents(1); + vector empty_ents(0); + const char foobar[] = "foo/bar"; + + expect_lookup(RELPATH, ino); + expect_opendir(ino); + ents[0].d_fileno = 4; + ents[0].d_off = 4000; + ents[0].d_namlen = sizeof(foobar); + ents[0].d_type = DT_REG; + strncpy(ents[0].d_name, foobar, ents[0].d_namlen); + expect_readdir(ino, 0, ents); + expect_readdir(ino, 4000, empty_ents); + + errno = 0; + dir = opendir(FULLPATH); + ASSERT_NE(nullptr, dir) << strerror(errno); + + errno = 0; + de = readdir(dir); + ASSERT_NE(nullptr, de) << strerror(errno); + EXPECT_EQ(4ul, de->d_fileno); + EXPECT_EQ(DT_REG, de->d_type); + EXPECT_EQ(sizeof(foobar), de->d_namlen); + EXPECT_EQ(0, strcmp(foobar, de->d_name)); + + ASSERT_EQ(nullptr, readdir(dir)); + ASSERT_EQ(0, errno); + + leakdir(dir); +} + TEST_F(Readdir_7_8, nodots) { const char FULLPATH[] = "mountpoint/some_dir"; From nobody Thu Nov 30 23:48:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShCZS41Xrz52yjN; Thu, 30 Nov 2023 23: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 4ShCZS3Rgyz3gvL; Thu, 30 Nov 2023 23: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=1701388128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LOQUeDpdxw9UjKzj3E9zwkkpfBe7vQITvM3sCR9efW8=; b=NiPImWMdzpqYpF/tY86Bulma/qKIcTA/238SuhrFf9ORASTHLmaqVKU944KSGCuQ1mkWRB /J1yliCft2nFDG5KlUIi8CbOqbJHG1Id7dxYavovG8naI6AKwf9qhLZhFFzl65A+N7Lcsx OkHNZarfPGf/PP6LOKNAw7/IBZEvmZjaMyxo+BiljG7ONmpilVNrm8/LX656X5yZEOQGOl U4yHspKrxXve6JP09b1h4A0W7BTaExxpIcmCcOgW7n2NLHvvrVSD57fyovBemFsZim/kRZ dvu94bGkXFPNLU/IMuz9u+biDBMIlmHwN7NQTjVVNWfuNQOwQXB9qqnAsnIosA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701388128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LOQUeDpdxw9UjKzj3E9zwkkpfBe7vQITvM3sCR9efW8=; b=uRj9wpRFKGq7LYTo1fk7MQRnCygE6ncoTpGtSTW3+V2CZtOTdOpN/ai6XA8BP+/V17sN9y FfOUG6PIZFVRqjZyGU61XJ4X3Ma2X2R0qD0FjAcdWe+Th4od0VJoTOqr4ZABk4oLdQSODP Wh4j0znhKP3ew1cd8fmkmmFpboLJ5KhEY5u3BFHs6fdiO51OstxehiujEouYZp3UfmOot1 lYnxBomr0PaUq/LCr73NEc2UpI6NsNG6WuLLr2vC+M8a6SxhRF785SCuElUns+Iu4AmRCa BSZD/fqDCZFIfLe2SCXjlyMCl+rG21gjNiCgJkNUEiF/3q/V9gqDm02R+qqgcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701388128; a=rsa-sha256; cv=none; b=gq3j1hQ88gZ3iiaJpOD78OGy/ZKBYEZzChEa7OIB3voeg6q/OQrKKR/zqtoFjPYrx7PQj8 VLhbS+iVu10ZZ08It0W3JUqyJYTBdC87QBbpxY0zCfeKI6WwfqdJaT459wgukCDheYh/Dx c8WNqTbOyLcn6OX/Giz2qu86lAaUwMGs5Gb9/d8IRViob6s98zxS/MMA+KAuWzKJ1xYmro CN25GUWcRiBRaXK8/Rkiznx9cifPqo0ThcXG0IZXkBqToioerlrDDIu0zZufW/bVpnD8pv lbfOrxPVFIWpfrMAnIy4ij8GCbbgZo4RtKzsohLsxNA/JYJvN0t+aEI8OILg7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShCZS2Rgrz18N0; Thu, 30 Nov 2023 23: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 3AUNmmne073032; Thu, 30 Nov 2023 23: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 3AUNmmFf073029; Thu, 30 Nov 2023 23:48:48 GMT (envelope-from git) Date: Thu, 30 Nov 2023 23:48:48 GMT Message-Id: <202311302348.3AUNmmFf073029@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 8b7963aeb576 - stable/13 - Fix intermittency in the sys.fs.fusefs.mknod.main test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8b7963aeb576a78214f11358113d2a159fccf1b3 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=8b7963aeb576a78214f11358113d2a159fccf1b3 commit 8b7963aeb576a78214f11358113d2a159fccf1b3 Author: Alan Somers AuthorDate: 2023-10-06 19:46:42 +0000 Commit: Alan Somers CommitDate: 2023-11-30 20:42:46 +0000 Fix intermittency in the sys.fs.fusefs.mknod.main test In the Mknod.parent_inode test case, the kernel sends an extra FUSE_FORGET message. But because it gets sent asynchronously with the failing syscall, it doesn't always get received before the test ends. So we never setup an expectation for it. And 90+% of the time the test would exit successfully. Fix the intermittency by always waiting to receive the FUSE_FORGET message. Sponsored by: Axcient (cherry picked from commit 86885b18689889e9b9142fd31d8c67f21334ba32) Fix intermittency in the sys.fs.fusefs.symlink.main test This change is identical to 86885b18689 but for symlink instead of mknod. The kernel sends a FUSE_FORGET asynchronously with the final syscall. The lack of an expectation caused this test to occasionally fail. Also, remove a sleep that accidentally snuck into a different test. Sponsored by: Axcient (cherry picked from commit 8399d764c929a4b2fa98dbfae0ca7359810e4668) --- tests/sys/fs/fusefs/mkdir.cc | 1 - tests/sys/fs/fusefs/mknod.cc | 7 +++++++ tests/sys/fs/fusefs/symlink.cc | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/sys/fs/fusefs/mkdir.cc b/tests/sys/fs/fusefs/mkdir.cc index 48453ff8bb8a..f020feb94ed8 100644 --- a/tests/sys/fs/fusefs/mkdir.cc +++ b/tests/sys/fs/fusefs/mkdir.cc @@ -241,7 +241,6 @@ TEST_F(Mkdir, parent_inode) ASSERT_EQ(-1, mkdir(FULLPATH, mode)); ASSERT_EQ(EIO, errno); - usleep(100000); } TEST_F(Mkdir_7_8, ok) diff --git a/tests/sys/fs/fusefs/mknod.cc b/tests/sys/fs/fusefs/mknod.cc index 223d38f8acb1..1fb855f44f29 100644 --- a/tests/sys/fs/fusefs/mknod.cc +++ b/tests/sys/fs/fusefs/mknod.cc @@ -32,6 +32,7 @@ extern "C" { #include #include #include +#include } #include "mockfs.hh" @@ -255,14 +256,18 @@ TEST_F(Mknod, parent_inode) const char RELPATH[] = "some_node"; mode_t mode = S_IFSOCK | 0755; struct sockaddr_un sa; + sem_t sem; int fd; dev_t rdev = -1; /* Really it's a don't care */ uint64_t ino = 42; + ASSERT_EQ(0, sem_init(&sem, 0, 0)) << strerror(errno); + expect_lookup(PPATH, ino, S_IFDIR | 0755, 0, 1); EXPECT_LOOKUP(ino, RELPATH) .WillOnce(Invoke(ReturnErrno(ENOENT))); expect_mknod(ino, RELPATH, ino, mode, rdev); + expect_forget(ino, 1, &sem); fd = socket(AF_UNIX, SOCK_STREAM, 0); ASSERT_LE(0, fd) << strerror(errno); @@ -273,6 +278,8 @@ TEST_F(Mknod, parent_inode) ASSERT_EQ(EIO, errno); leak(fd); + sem_wait(&sem); + sem_destroy(&sem); } /* diff --git a/tests/sys/fs/fusefs/symlink.cc b/tests/sys/fs/fusefs/symlink.cc index 19286a446fc3..bd355497a8bd 100644 --- a/tests/sys/fs/fusefs/symlink.cc +++ b/tests/sys/fs/fusefs/symlink.cc @@ -29,6 +29,7 @@ */ extern "C" { +#include #include } @@ -174,15 +175,22 @@ TEST_F(Symlink, parent_ino) const char PPATH[] = "parent"; const char RELPATH[] = "src"; const char dst[] = "dst"; + sem_t sem; const uint64_t ino = 42; + ASSERT_EQ(0, sem_init(&sem, 0, 0)) << strerror(errno); + expect_lookup(PPATH, ino, S_IFDIR | 0755, 0, 1); EXPECT_LOOKUP(ino, RELPATH) .WillOnce(Invoke(ReturnErrno(ENOENT))); expect_symlink(ino, dst, RELPATH); + expect_forget(ino, 1, &sem); EXPECT_EQ(-1, symlink(dst, FULLPATH)); EXPECT_EQ(EIO, errno); + + sem_wait(&sem); + sem_destroy(&sem); } TEST_F(Symlink_7_8, ok) From nobody Thu Nov 30 23:48:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShCZT4b78z52ypR; Thu, 30 Nov 2023 23:48: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 4ShCZT43Jrz3ghW; Thu, 30 Nov 2023 23:48:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701388129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TGAhXaNvnPJtTWqrpAkCu7gEb/8GiiD5KKuOaFjD5w8=; b=wqUU+MH6i/crQ8Sdxy+uL1HGnAgKHY+yHKsNNqnoDMW7KmpUscHUNEhRPubBVd4x8jIGL4 8NYkNHoGPQiAQo8f+HN6EslufQYutdsvnVdW8wD03eLJabHN6ea+7JOdNN5Zjwt0QQeI7e ScSVeecDpwcP/gylve+Wu+ddX/qJGni+N3W8CFxEE0EODK5RvOYldtH7S+RGoxkSwVZMbr Y9s7ZHgeprinkkoRnP/b9gcUJu5T+AepFoLh+/o0K9RsqruGxBWWaCRcb+hJCFTvwMc4to gmEDJ6xyeBCHgM9elkTfRPq6+DEmFG13YtaxlFIx1vO/PgaDb4OOpiGtieiesg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701388129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TGAhXaNvnPJtTWqrpAkCu7gEb/8GiiD5KKuOaFjD5w8=; b=RpHJiugNQA7au11HuqpFcXR8xlQvsOb60H1+jn3ADZheC27QwQwVJ/lrF+VbGg/fC7xZVs X0QzrlaHluX+/zRiU2QMqgCYSuIZqU2dl3WfxW94VFKO7Y3OpoxrD9f4Z6gXpy/PiAkOQa 8GoZ6bmB9zJQV/w505/tbN5wONyOTy4KAolKqKMnbg+bxMBozuNyo1m31moFrou8CWtJAp QrAg6di95H415P0ovgi+MyD0Dkbmhmfd0z3DLoiifVL6F832ouHtoOs6RfmeUUmkyFlu+r MEuUk0iGImPI05Ua3TbfxEgRegvquri3xXuWaarVKMKS9kKI0kK0VP5FTCDqnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701388129; a=rsa-sha256; cv=none; b=tKKl628WXiK8b5oTGSFA3oNvllIKOqhR8cKHeIbHiLq6LWGU6FMvmXaYi6T0a2jTu+PFzg t1MW29If1inL+OqRukVHDMzfggTPkGF13Xi0Oir6Y2CjgprCIWFDk+XUoEFU+fZM1aYKsZ pPB5NahjUBdgdkjqJPsQ9RR+hhAkmwm+P0rvpf4LvGvlXBAhNZ9/+7SZIG1XFaKyLk3Wfb 6SLVjSsUosGNPLCQO5Td5CmahS/ufUo5zwC4PA231SosKQrUsgxDrhdgsOj4X9t0d2JoI5 NZXXOT7RBLZ15QM4BtMZiZcJeZp9hIPAmpttJtT/d7H8le/lBP38ku9hjjm2NA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShCZT335Yz193S; Thu, 30 Nov 2023 23:48: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 3AUNmngX073077; Thu, 30 Nov 2023 23:48:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUNmnPp073074; Thu, 30 Nov 2023 23:48:49 GMT (envelope-from git) Date: Thu, 30 Nov 2023 23:48:49 GMT Message-Id: <202311302348.3AUNmnPp073074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: ad8b59ffe7b8 - stable/13 - libc/libc/rpc: refactor some global variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ad8b59ffe7b84cae35dd19b4285863b4b506efa9 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=ad8b59ffe7b84cae35dd19b4285863b4b506efa9 commit ad8b59ffe7b84cae35dd19b4285863b4b506efa9 Author: Alan Somers AuthorDate: 2023-11-09 22:58:56 +0000 Commit: Alan Somers CommitDate: 2023-11-30 20:42:55 +0000 libc/libc/rpc: refactor some global variables * Combine dg_fd_locks and dg_cv into one array. * Similarly for vc_fd_locks and vc_cv * Turn some macros into inline functions This is a mostly cosmetic change to make refactoring these strutures in a future commit easier. Sponsored by: Axcient Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42597 (cherry picked from commit a5c2f4e939430f0048136c39fb9fa6093d401905) lib/libc/rpc: switch the per-fd structs in clnt_{dg,vc}.c to RB Trees This saves oodles of memory, especially when "ulimit -n" is large. It also prevents a buffer overflow if getrlimit should fail. Also replace per-fd condvars with mutexes to simplify the code. PR: 274968 Sponsored by: Axcient Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42597 (cherry picked from commit 24938f9311c9c9acc1ce747f4e6a088c2dbc967d) --- include/rpc/rpc_com.h | 1 - lib/libc/rpc/clnt_dg.c | 170 +++++++++++++++++++++--------------------- lib/libc/rpc/clnt_vc.c | 179 ++++++++++++++++++++++----------------------- lib/libc/rpc/rpc_com.h | 1 - lib/libc/rpc/rpc_generic.c | 23 ------ sys/rpc/rpc_com.h | 1 - 6 files changed, 168 insertions(+), 207 deletions(-) diff --git a/include/rpc/rpc_com.h b/include/rpc/rpc_com.h index a98e3f73bac8..a0a8c8872efa 100644 --- a/include/rpc/rpc_com.h +++ b/include/rpc/rpc_com.h @@ -58,7 +58,6 @@ __BEGIN_DECLS extern u_int __rpc_get_a_size(int); -extern int __rpc_dtbsize(void); extern int _rpc_dtablesize(void); extern struct netconfig * __rpcgettp(int); extern int __rpc_get_default_domain(char **); diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c index d6b9698bf4db..a65b01c09aac 100644 --- a/lib/libc/rpc/clnt_dg.c +++ b/lib/libc/rpc/clnt_dg.c @@ -49,13 +49,17 @@ static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro"; #include #include #include +#include #include #include #include +#include #include +#include #include #include #include +#include #include #include #include "un-namespace.h" @@ -90,28 +94,65 @@ static void clnt_dg_destroy(CLIENT *); * This machinery implements per-fd locks for MT-safety. It is not * sufficient to do per-CLIENT handle locks for MT-safety because a * user may create more than one CLIENT handle with the same fd behind - * it. Therefore, we allocate an array of flags (dg_fd_locks), protected - * by the clnt_fd_lock mutex, and an array (dg_cv) of condition variables - * similarly protected. Dg_fd_lock[fd] == 1 => a call is active on some - * CLIENT handle created for that fd. - * The current implementation holds locks across the entire RPC and reply, - * including retransmissions. Yes, this is silly, and as soon as this - * code is proven to work, this should be the first thing fixed. One step - * at a time. + * it. Therefore, we allocate an associative array of flags and condition + * variables (dg_fd). The flags and the array are protected by the + * clnt_fd_lock mutex. dg_fd[fd].lock == 1 => a call is active on some + * CLIENT handle created for that fd. The current implementation holds + * locks across the entire RPC and reply, including retransmissions. Yes, + * this is silly, and as soon as this code is proven to work, this should + * be the first thing fixed. One step at a time. */ -static int *dg_fd_locks; -static cond_t *dg_cv; -#define release_fd_lock(fd, mask) { \ - mutex_lock(&clnt_fd_lock); \ - dg_fd_locks[fd] = 0; \ - mutex_unlock(&clnt_fd_lock); \ - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); \ - cond_signal(&dg_cv[fd]); \ +struct dg_fd { + RB_ENTRY(dg_fd) dg_link; + int fd; + mutex_t mtx; +}; +static inline int +cmp_dg_fd(struct dg_fd *a, struct dg_fd *b) +{ + if (a->fd > b->fd) { + return (1); + } else if (a->fd < b->fd) { + return (-1); + } else { + return (0); + } +} +RB_HEAD(dg_fd_list, dg_fd); +RB_PROTOTYPE(dg_fd_list, dg_fd, dg_link, cmp_dg_fd); +RB_GENERATE(dg_fd_list, dg_fd, dg_link, cmp_dg_fd); +struct dg_fd_list dg_fd_head = RB_INITIALIZER(&dg_fd_head); + +/* + * Find the lock structure for the given file descriptor, or initialize it if + * it does not already exist. The clnt_fd_lock mutex must be held. + */ +static struct dg_fd * +dg_fd_find(int fd) +{ + struct dg_fd key, *elem; + + key.fd = fd; + elem = RB_FIND(dg_fd_list, &dg_fd_head, &key); + if (elem == NULL) { + elem = calloc(1, sizeof(*elem)); + elem->fd = fd; + mutex_init(&elem->mtx, NULL); + RB_INSERT(dg_fd_list, &dg_fd_head, elem); + } + return (elem); +} + +static void +release_fd_lock(struct dg_fd *elem, sigset_t mask) +{ + mutex_unlock(&elem->mtx); + thr_sigsetmask(SIG_SETMASK, &mask, NULL); } static const char mem_err_clnt_dg[] = "clnt_dg_create: out of memory"; -/* VARIABLES PROTECTED BY clnt_fd_lock: dg_fd_locks, dg_cv */ +/* VARIABLES PROTECTED BY clnt_fd_lock: dg_fd */ #define MCALL_MSG_SIZE 24 @@ -169,47 +210,9 @@ clnt_dg_create(int fd, const struct netbuf *svcaddr, rpcprog_t program, struct cu_data *cu = NULL; /* private data */ struct timeval now; struct rpc_msg call_msg; - sigset_t mask; - sigset_t newmask; struct __rpc_sockinfo si; int one = 1; - sigfillset(&newmask); - thr_sigsetmask(SIG_SETMASK, &newmask, &mask); - mutex_lock(&clnt_fd_lock); - if (dg_fd_locks == (int *) NULL) { - int cv_allocsz; - size_t fd_allocsz; - int dtbsize = __rpc_dtbsize(); - - fd_allocsz = dtbsize * sizeof (int); - dg_fd_locks = (int *) mem_alloc(fd_allocsz); - if (dg_fd_locks == (int *) NULL) { - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - goto err1; - } else - memset(dg_fd_locks, '\0', fd_allocsz); - - cv_allocsz = dtbsize * sizeof (cond_t); - dg_cv = (cond_t *) mem_alloc(cv_allocsz); - if (dg_cv == (cond_t *) NULL) { - mem_free(dg_fd_locks, fd_allocsz); - dg_fd_locks = (int *) NULL; - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - goto err1; - } else { - int i; - - for (i = 0; i < dtbsize; i++) - cond_init(&dg_cv[i], 0, (void *) 0); - } - } - - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - if (svcaddr == NULL) { rpc_createerr.cf_stat = RPC_UNKNOWNADDR; return (NULL); @@ -330,25 +333,21 @@ clnt_dg_call(CLIENT *cl, rpcproc_t proc, xdrproc_t xargs, void *argsp, struct timespec ts; struct kevent kv; struct sockaddr *sa; + struct dg_fd *elem; sigset_t mask; sigset_t newmask; socklen_t salen; ssize_t recvlen = 0; - int kin_len, n, rpc_lock_value; + int kin_len, n; u_int32_t xid; outlen = 0; sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[cu->cu_fd]) - cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock); - if (__isthreaded) - rpc_lock_value = 1; - else - rpc_lock_value = 0; - dg_fd_locks[cu->cu_fd] = rpc_lock_value; + elem = dg_fd_find(cu->cu_fd); mutex_unlock(&clnt_fd_lock); + mutex_lock(&elem->mtx); if (cu->cu_total.tv_usec == -1) { timeout = utimeout; /* use supplied timeout */ } else { @@ -602,7 +601,7 @@ out: if (cu->cu_kq >= 0) _close(cu->cu_kq); cu->cu_kq = -1; - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (cu->cu_error.re_status); } @@ -618,6 +617,7 @@ static bool_t clnt_dg_freeres(CLIENT *cl, xdrproc_t xdr_res, void *res_ptr) { struct cu_data *cu = (struct cu_data *)cl->cl_private; + struct dg_fd *elem; XDR *xdrs = &(cu->cu_outxdrs); bool_t dummy; sigset_t mask; @@ -626,13 +626,12 @@ clnt_dg_freeres(CLIENT *cl, xdrproc_t xdr_res, void *res_ptr) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[cu->cu_fd]) - cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock); + elem = dg_fd_find(cu->cu_fd); + mutex_lock(&elem->mtx); xdrs->x_op = XDR_FREE; dummy = (*xdr_res)(xdrs, res_ptr); mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &mask, NULL); - cond_signal(&dg_cv[cu->cu_fd]); + release_fd_lock(elem, mask); return (dummy); } @@ -647,41 +646,36 @@ clnt_dg_control(CLIENT *cl, u_int request, void *info) { struct cu_data *cu = (struct cu_data *)cl->cl_private; struct netbuf *addr; + struct dg_fd *elem; sigset_t mask; sigset_t newmask; - int rpc_lock_value; sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[cu->cu_fd]) - cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock); - if (__isthreaded) - rpc_lock_value = 1; - else - rpc_lock_value = 0; - dg_fd_locks[cu->cu_fd] = rpc_lock_value; + elem = dg_fd_find(cu->cu_fd); mutex_unlock(&clnt_fd_lock); + mutex_lock(&elem->mtx); switch (request) { case CLSET_FD_CLOSE: cu->cu_closeit = TRUE; - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (TRUE); case CLSET_FD_NCLOSE: cu->cu_closeit = FALSE; - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (TRUE); } /* for other requests which use info */ if (info == NULL) { - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } switch (request) { case CLSET_TIMEOUT: if (time_not_ok((struct timeval *)info)) { - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } cu->cu_total = *(struct timeval *)info; @@ -695,7 +689,7 @@ clnt_dg_control(CLIENT *cl, u_int request, void *info) break; case CLSET_RETRY_TIMEOUT: if (time_not_ok((struct timeval *)info)) { - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } cu->cu_wait = *(struct timeval *)info; @@ -715,7 +709,7 @@ clnt_dg_control(CLIENT *cl, u_int request, void *info) case CLSET_SVC_ADDR: /* set to new address */ addr = (struct netbuf *)info; if (addr->len < sizeof cu->cu_raddr) { - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } (void) memcpy(&cu->cu_raddr, addr->buf, addr->len); @@ -778,10 +772,10 @@ clnt_dg_control(CLIENT *cl, u_int request, void *info) cu->cu_connect = *(int *)info; break; default: - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (TRUE); } @@ -789,6 +783,7 @@ static void clnt_dg_destroy(CLIENT *cl) { struct cu_data *cu = (struct cu_data *)cl->cl_private; + struct dg_fd *elem; int cu_fd = cu->cu_fd; sigset_t mask; sigset_t newmask; @@ -796,8 +791,8 @@ clnt_dg_destroy(CLIENT *cl) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[cu_fd]) - cond_wait(&dg_cv[cu_fd], &clnt_fd_lock); + elem = dg_fd_find(cu_fd); + mutex_lock(&elem->mtx); if (cu->cu_closeit) (void)_close(cu_fd); if (cu->cu_kq >= 0) @@ -810,8 +805,7 @@ clnt_dg_destroy(CLIENT *cl) mem_free(cl->cl_tp, strlen(cl->cl_tp) +1); mem_free(cl, sizeof (CLIENT)); mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &mask, NULL); - cond_signal(&dg_cv[cu_fd]); + release_fd_lock(elem, mask); } static struct clnt_ops * diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c index d3c96945d25a..c78d2e9f0daf 100644 --- a/lib/libc/rpc/clnt_vc.c +++ b/lib/libc/rpc/clnt_vc.c @@ -61,6 +61,7 @@ static char sccsid3[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro"; #include #include #include +#include #include #include @@ -69,7 +70,9 @@ static char sccsid3[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro"; #include #include #include +#include #include +#include #include #include #include @@ -121,22 +124,60 @@ struct ct_data { * This machinery implements per-fd locks for MT-safety. It is not * sufficient to do per-CLIENT handle locks for MT-safety because a * user may create more than one CLIENT handle with the same fd behind - * it. Therefore, we allocate an array of flags (vc_fd_locks), protected - * by the clnt_fd_lock mutex, and an array (vc_cv) of condition variables - * similarly protected. Vc_fd_lock[fd] == 1 => a call is active on some - * CLIENT handle created for that fd. - * The current implementation holds locks across the entire RPC and reply. - * Yes, this is silly, and as soon as this code is proven to work, this - * should be the first thing fixed. One step at a time. + * it. Therefore, we allocate an associative array of flags and condition + * variables (vc_fd). The flags and the array are protected by the + * clnt_fd_lock mutex. vc_fd_lock[fd] == 1 => a call is active on some + * CLIENT handle created for that fd. The current implementation holds + * locks across the entire RPC and reply. Yes, this is silly, and as soon + * as this code is proven to work, this should be the first thing fixed. + * One step at a time. */ -static int *vc_fd_locks; -static cond_t *vc_cv; -#define release_fd_lock(fd, mask) { \ - mutex_lock(&clnt_fd_lock); \ - vc_fd_locks[fd] = 0; \ - mutex_unlock(&clnt_fd_lock); \ - thr_sigsetmask(SIG_SETMASK, &(mask), (sigset_t *) NULL); \ - cond_signal(&vc_cv[fd]); \ +struct vc_fd { + RB_ENTRY(vc_fd) vc_link; + int fd; + mutex_t mtx; +}; +static inline int +cmp_vc_fd(struct vc_fd *a, struct vc_fd *b) +{ + if (a->fd > b->fd) { + return (1); + } else if (a->fd < b->fd) { + return (-1); + } else { + return (0); + } +} +RB_HEAD(vc_fd_list, vc_fd); +RB_PROTOTYPE(vc_fd_list, vc_fd, vc_link, cmp_vc_fd); +RB_GENERATE(vc_fd_list, vc_fd, vc_link, cmp_vc_fd); +struct vc_fd_list vc_fd_head = RB_INITIALIZER(&vc_fd_head); + +/* + * Find the lock structure for the given file descriptor, or initialize it if + * it does not already exist. The clnt_fd_lock mutex must be held. + */ +static struct vc_fd * +vc_fd_find(int fd) +{ + struct vc_fd key, *elem; + + key.fd = fd; + elem = RB_FIND(vc_fd_list, &vc_fd_head, &key); + if (elem == NULL) { + elem = calloc(1, sizeof(*elem)); + elem->fd = fd; + mutex_init(&elem->mtx, NULL); + RB_INSERT(vc_fd_list, &vc_fd_head, elem); + } + return (elem); +} + +static void +release_fd_lock(struct vc_fd *elem, sigset_t mask) +{ + mutex_unlock(&elem->mtx); + thr_sigsetmask(SIG_SETMASK, &mask, NULL); } static const char clnt_vc_errstr[] = "%s : %s"; @@ -170,8 +211,6 @@ clnt_vc_create(int fd, const struct netbuf *raddr, const rpcprog_t prog, struct timeval now; struct rpc_msg call_msg; static u_int32_t disrupt; - sigset_t mask; - sigset_t newmask; struct sockaddr_storage ss; socklen_t slen; struct __rpc_sockinfo si; @@ -189,39 +228,6 @@ clnt_vc_create(int fd, const struct netbuf *raddr, const rpcprog_t prog, goto err; } ct->ct_addr.buf = NULL; - sigfillset(&newmask); - thr_sigsetmask(SIG_SETMASK, &newmask, &mask); - mutex_lock(&clnt_fd_lock); - if (vc_fd_locks == (int *) NULL) { - int cv_allocsz, fd_allocsz; - int dtbsize = __rpc_dtbsize(); - - fd_allocsz = dtbsize * sizeof (int); - vc_fd_locks = (int *) mem_alloc(fd_allocsz); - if (vc_fd_locks == (int *) NULL) { - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - goto err; - } else - memset(vc_fd_locks, '\0', fd_allocsz); - - assert(vc_cv == (cond_t *) NULL); - cv_allocsz = dtbsize * sizeof (cond_t); - vc_cv = (cond_t *) mem_alloc(cv_allocsz); - if (vc_cv == (cond_t *) NULL) { - mem_free(vc_fd_locks, fd_allocsz); - vc_fd_locks = (int *) NULL; - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - goto err; - } else { - int i; - - for (i = 0; i < dtbsize; i++) - cond_init(&vc_cv[i], 0, (void *) 0); - } - } else - assert(vc_cv != (cond_t *) NULL); /* * XXX - fvdl connecting while holding a mutex? @@ -232,19 +238,16 @@ clnt_vc_create(int fd, const struct netbuf *raddr, const rpcprog_t prog, rpc_createerr.cf_stat = RPC_SYSTEMERROR; rpc_createerr.cf_error.re_errno = errno; mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); goto err; } if (_connect(fd, (struct sockaddr *)raddr->buf, raddr->len) < 0){ rpc_createerr.cf_stat = RPC_SYSTEMERROR; rpc_createerr.cf_error.re_errno = errno; mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); goto err; } } mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); if (!__rpc_fd2sockinfo(fd, &si)) goto err; @@ -319,12 +322,12 @@ clnt_vc_call(CLIENT *cl, rpcproc_t proc, xdrproc_t xdr_args, void *args_ptr, struct ct_data *ct = (struct ct_data *) cl->cl_private; XDR *xdrs = &(ct->ct_xdrs); struct rpc_msg reply_msg; + struct vc_fd *elem; u_int32_t x_id; u_int32_t *msg_x_id = &ct->ct_u.ct_mcalli; /* yuk */ bool_t shipnow; int refreshes = 2; sigset_t mask, newmask; - int rpc_lock_value; bool_t reply_stat; assert(cl != NULL); @@ -332,14 +335,9 @@ clnt_vc_call(CLIENT *cl, rpcproc_t proc, xdrproc_t xdr_args, void *args_ptr, sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[ct->ct_fd]) - cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock); - if (__isthreaded) - rpc_lock_value = 1; - else - rpc_lock_value = 0; - vc_fd_locks[ct->ct_fd] = rpc_lock_value; + elem = vc_fd_find(ct->ct_fd); mutex_unlock(&clnt_fd_lock); + mutex_lock(&elem->mtx); if (!ct->ct_waitset) { /* If time is not within limits, we ignore it. */ if (time_not_ok(&timeout) == FALSE) @@ -363,7 +361,7 @@ call_again: if (ct->ct_error.re_status == RPC_SUCCESS) ct->ct_error.re_status = RPC_CANTENCODEARGS; (void)xdrrec_endofrecord(xdrs, TRUE); - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } } else { @@ -374,23 +372,23 @@ call_again: if (ct->ct_error.re_status == RPC_SUCCESS) ct->ct_error.re_status = RPC_CANTENCODEARGS; (void)xdrrec_endofrecord(xdrs, TRUE); - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } } if (! xdrrec_endofrecord(xdrs, shipnow)) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status = RPC_CANTSEND); } if (! shipnow) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (RPC_SUCCESS); } /* * Hack to provide rpc-based message passing */ if (timeout.tv_sec == 0 && timeout.tv_usec == 0) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return(ct->ct_error.re_status = RPC_TIMEDOUT); } @@ -404,14 +402,14 @@ call_again: reply_msg.acpted_rply.ar_results.where = NULL; reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; if (! xdrrec_skiprecord(xdrs)) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } /* now decode and validate the response header */ if (! xdr_replymsg(xdrs, &reply_msg)) { if (ct->ct_error.re_status == RPC_SUCCESS) continue; - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } if (reply_msg.rm_xid == x_id) @@ -452,7 +450,7 @@ call_again: if (refreshes-- && AUTH_REFRESH(cl->cl_auth, &reply_msg)) goto call_again; } /* end of unsuccessful completion */ - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } @@ -472,6 +470,7 @@ static bool_t clnt_vc_freeres(CLIENT *cl, xdrproc_t xdr_res, void *res_ptr) { struct ct_data *ct; + struct vc_fd *elem; XDR *xdrs; bool_t dummy; sigset_t mask; @@ -485,14 +484,13 @@ clnt_vc_freeres(CLIENT *cl, xdrproc_t xdr_res, void *res_ptr) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[ct->ct_fd]) - cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock); + elem = vc_fd_find(ct->ct_fd); + mutex_lock(&elem->mtx); xdrs->x_op = XDR_FREE; dummy = (*xdr_res)(xdrs, res_ptr); - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - cond_signal(&vc_cv[ct->ct_fd]); + mutex_unlock(&clnt_fd_lock); + release_fd_lock(elem, mask); return dummy; } @@ -520,10 +518,10 @@ static bool_t clnt_vc_control(CLIENT *cl, u_int request, void *info) { struct ct_data *ct; + struct vc_fd *elem; void *infop = info; sigset_t mask; sigset_t newmask; - int rpc_lock_value; assert(cl != NULL); @@ -532,23 +530,18 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[ct->ct_fd]) - cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock); - if (__isthreaded) - rpc_lock_value = 1; - else - rpc_lock_value = 0; - vc_fd_locks[ct->ct_fd] = rpc_lock_value; + elem = vc_fd_find(ct->ct_fd); mutex_unlock(&clnt_fd_lock); + mutex_lock(&elem->mtx); switch (request) { case CLSET_FD_CLOSE: ct->ct_closeit = TRUE; - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (TRUE); case CLSET_FD_NCLOSE: ct->ct_closeit = FALSE; - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (TRUE); default: break; @@ -556,13 +549,13 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) /* for other requests which use info */ if (info == NULL) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } switch (request) { case CLSET_TIMEOUT: if (time_not_ok((struct timeval *)info)) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } ct->ct_wait = *(struct timeval *)infop; @@ -582,7 +575,7 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) *(struct netbuf *)info = ct->ct_addr; break; case CLSET_SVC_ADDR: /* set to new address */ - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (FALSE); case CLGET_XID: /* @@ -626,10 +619,10 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) break; default: - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (TRUE); } @@ -638,6 +631,7 @@ static void clnt_vc_destroy(CLIENT *cl) { struct ct_data *ct = (struct ct_data *) cl->cl_private; + struct vc_fd *elem; int ct_fd = ct->ct_fd; sigset_t mask; sigset_t newmask; @@ -649,8 +643,8 @@ clnt_vc_destroy(CLIENT *cl) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[ct_fd]) - cond_wait(&vc_cv[ct_fd], &clnt_fd_lock); + elem = vc_fd_find(ct_fd); + mutex_lock(&elem->mtx); if (ct->ct_closeit && ct->ct_fd != -1) { (void)_close(ct->ct_fd); } @@ -663,8 +657,7 @@ clnt_vc_destroy(CLIENT *cl) mem_free(cl->cl_tp, strlen(cl->cl_tp) +1); mem_free(cl, sizeof(CLIENT)); mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - cond_signal(&vc_cv[ct_fd]); + release_fd_lock(elem, mask); } /* diff --git a/lib/libc/rpc/rpc_com.h b/lib/libc/rpc/rpc_com.h index 67e47af3f454..25c09ff0aa18 100644 --- a/lib/libc/rpc/rpc_com.h +++ b/lib/libc/rpc/rpc_com.h @@ -60,7 +60,6 @@ __BEGIN_DECLS extern u_int __rpc_get_a_size(int); -extern int __rpc_dtbsize(void); extern struct netconfig * __rpcgettp(int); extern int __rpc_get_default_domain(char **); diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c index 967fb6e0932c..ab8d0948771e 100644 --- a/lib/libc/rpc/rpc_generic.c +++ b/lib/libc/rpc/rpc_generic.c @@ -105,29 +105,6 @@ static char *strlocase(char *); #endif static int getnettype(const char *); -/* - * Cache the result of getrlimit(), so we don't have to do an - * expensive call every time. - */ -int -__rpc_dtbsize(void) -{ - static int tbsize; - struct rlimit rl; - - if (tbsize) { - return (tbsize); - } - if (getrlimit(RLIMIT_NOFILE, &rl) == 0) { - return (tbsize = (int)rl.rlim_max); - } - /* - * Something wrong. I'll try to save face by returning a - * pessimistic number. - */ - return (32); -} - /* * Find the appropriate buffer size diff --git a/sys/rpc/rpc_com.h b/sys/rpc/rpc_com.h index 0206971dde2a..facd36c26a39 100644 --- a/sys/rpc/rpc_com.h +++ b/sys/rpc/rpc_com.h @@ -70,7 +70,6 @@ __BEGIN_DECLS #ifndef _KERNEL extern u_int __rpc_get_a_size(int); -extern int __rpc_dtbsize(void); extern struct netconfig * __rpcgettp(int); extern int __rpc_get_default_domain(char **); From nobody Thu Nov 30 23:50:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShCbr5P8Yz52yg7; Thu, 30 Nov 2023 23:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ShCbr4tQJz4DPq; Thu, 30 Nov 2023 23:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701388200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ASP/MnPxAlYV2htge4OakBmyS7mMDD3RoYEEEmwfUTY=; b=Kwk51wce2SAiwXj5gur7zMEw5Nk5DaeBIBlK21idzrw3QOH91KmepNE24ald2U6UXYRSGx KOT2OS0EFY2xJy457UYxUacs1A0scOMLrMQo7hBNOhTYIg/TVmFSBAr7cXqoThnstXJWjF ktL6IJFleQ5EzkoyXUNmh6JnScxlQo43vL9GYlJDvwvRaG6LpeZpqxcV6DQPfMK8gk6d0T WtFJdQdv0DI8d3GhRRJaFSp8hE7T0yPRVohkGYMoEUl4IdBneBpJoKzHe1sjWpfMh967GO 2j1Ljam+TtKy9MKPsHnAn1Dtl6pS9TTAg/2DIDNKvydTgz/nKaobr1dxk5h//g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701388200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ASP/MnPxAlYV2htge4OakBmyS7mMDD3RoYEEEmwfUTY=; b=YA97w2WbOKuVmZiknDVUokqGQ55UjAcrnyO3yYjMEqqJA6KtZhTKgHGnxCiTL7/PA+1y57 XoLInD6tXP+XGYlfxK1Mi/7G0tlJylWvc5u/D6vOFw4fFe7KlY6mdQVfhSSf47eZVBL27o 3Q6uOEYNn68NX7SbVaEYCI8d7/7TBKY83DXO8/IQAKuNq+W4lUw1fm6fSQDpX0m6E+vaJX AByh407K0UB+AyKFse4QQlzzxcfjl5lojTisnVyBsW0+vF0Z0Xk+4y6NQ5uH1fAgE+Mb/U bSirGp63HR3AbS+NSKbN988vd6y7dN8urnR4M8nEL2roepeswy8Ikn7758Fh7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701388200; a=rsa-sha256; cv=none; b=msVL/Ab/2Xp5unNkzI+tA82zhKazwPhWzH4hvjxm1j/2/qlzZarMq1m5xqcCpno/krrezB PfKOVavOkp9s0nawty+hZltOysySQL8eCrA0JCvJqT5Ca7yL1hoY4DseP9A9O2Hkvq1lBM bNZkT1n5Nbubqw6LYzlyc+0m1JEGPUxfkqVcW27DD0RHylCPbmH5UUc1DWb33G44fGbmZ3 CtL/OVp9XObIWt4Zlu25qNj6J8vr7WiTfwaVvCC2OfKB9yVO86BEgu1Jy1ME3vD9g6u+Dq 2D5rdUhhyrEwe6j61n1BAwBVpz8ZH74VP4GrnGNdp3nBf5UPN9d/e0lHJi+MeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShCbr3xjdz19N1; Thu, 30 Nov 2023 23:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AUNo0vH074092; Thu, 30 Nov 2023 23:50:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUNo02H074072; Thu, 30 Nov 2023 23:50:00 GMT (envelope-from git) Date: Thu, 30 Nov 2023 23:50:00 GMT Message-Id: <202311302350.3AUNo02H074072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 1bb2a240232e - stable/13 - aio_read.2: correct the description of aio_buf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1bb2a240232ea5b8cc3a63e61b30243e87acbdf2 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1bb2a240232ea5b8cc3a63e61b30243e87acbdf2 commit 1bb2a240232ea5b8cc3a63e61b30243e87acbdf2 Author: Alan Somers AuthorDate: 2023-11-15 17:31:24 +0000 Commit: Alan Somers CommitDate: 2023-11-30 23:49:52 +0000 aio_read.2: correct the description of aio_buf Looks like a copypasta from aio_write.2. [skip ci] Reported by: Paul Floyd Sponsored by: Axcient Reviewed by: jilles (manpages) Differential Revision: https://reviews.freebsd.org/D42621 (cherry picked from commit 04cfe6c12ccc75624dc87ab8f44c4852b16f0c4f) --- lib/libc/sys/aio_read.2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/aio_read.2 b/lib/libc/sys/aio_read.2 index 1470c70438a3..c6f062fa406d 100644 --- a/lib/libc/sys/aio_read.2 +++ b/lib/libc/sys/aio_read.2 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 2, 2021 +.Dd November 15, 2023 .Dt AIO_READ 2 .Os .Sh NAME @@ -51,7 +51,7 @@ beginning at the offset .Fn aio_read will read .Fa iocb->aio_nbytes -from the buffer pointed to by +into the buffer pointed to by .Fa iocb->aio_buf , whereas .Fn aio_readv From nobody Fri Dec 1 00:31:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 78b4c762b20b - releng/14.0 - compiler-rt: avoid segfaults when re-exec'ing with ASLR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 78b4c762b20b188cd7bc65999ed44e431a8882ff Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=78b4c762b20b188cd7bc65999ed44e431a8882ff commit 78b4c762b20b188cd7bc65999ed44e431a8882ff Author: Dimitry Andric AuthorDate: 2023-11-22 18:23:06 +0000 Commit: Gordon Tetlow CommitDate: 2023-11-30 21:24:58 +0000 compiler-rt: avoid segfaults when re-exec'ing with ASLR After 930a7c2ac67e ("compiler-rt: re-exec with ASLR disabled when necessary") and 96fe7c8ab0f6 ("compiler-rt: support ReExec() on FreeBSD"), binaries linked against the sanitizer libraries may segfault due to procctl(2) being intercepted. Instead, the non-intercepted internal_procctl() should be called. Similarly, the ReExec() function that re-executes the binary after turning off ASLR should not call elf_aux_info(3) and realpath(3), since these will also be intercepted. Instead, loop directly over the elf aux info vector to find the executable path, and avoid calling realpath(3) since it is actually unwanted for this use case. Fixes: 930a7c2ac67e, 96fe7c8ab0f6 MFC after: 3 days Approved by: so Security: FreeBSD-EN-23:15.sanitizer (cherry picked from commit 4c9a0adad18263ec8725d9bfc5f560c6ad1da8bd) (cherry picked from commit 1e4798e9677f17a7cdc9a1873a0c6e008fc620d8) --- .../compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp | 2 +- .../lib/sanitizer_common/sanitizer_linux_libcdep.cpp | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp index 3f544623c6fb..ebbd14eca72f 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp @@ -2323,7 +2323,7 @@ void CheckASLR() { "and binaries compiled with PIE\n" "ASLR will be disabled and the program re-executed.\n"); int aslr_ctl = PROC_ASLR_FORCE_DISABLE; - CHECK_NE(procctl(P_PID, 0, PROC_ASLR_CTL, &aslr_ctl), -1); + CHECK_NE(internal_procctl(P_PID, 0, PROC_ASLR_CTL, &aslr_ctl), -1); ReExec(); } # elif SANITIZER_PPC64V2 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 ff62fc4af430..58310e05b359 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 @@ -56,6 +56,7 @@ // that, it was never implemented. So just define it to zero. #undef MAP_NORESERVE #define MAP_NORESERVE 0 +extern const Elf_Auxinfo *__elf_aux_vector; #endif #if SANITIZER_NETBSD @@ -947,11 +948,11 @@ void ReExec() { const char *pathname = "/proc/self/exe"; #if SANITIZER_FREEBSD - char exe_path[PATH_MAX]; - if (elf_aux_info(AT_EXECPATH, exe_path, sizeof(exe_path)) == 0) { - char link_path[PATH_MAX]; - if (realpath(exe_path, link_path)) - pathname = link_path; + for (const auto *aux = __elf_aux_vector; aux->a_type != AT_NULL; aux++) { + if (aux->a_type == AT_EXECPATH) { + pathname = static_cast(aux->a_un.a_ptr); + break; + } } #elif SANITIZER_NETBSD static const int name[] = { From nobody Fri Dec 1 00:38:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShDgw670Nz531nT; Fri, 1 Dec 2023 00: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 4ShDgw5fcHz4LV1; Fri, 1 Dec 2023 00: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=1701391116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nhKN3jSXZdT1Tz7nvjzPjVNf6oWO1ysyVQ+nStbzf1g=; b=Zv4aSXmGMNFGVyaTW80xh/I6pOCDtqn31YeGN3Z5MV8PINH0v2oOQITfWiu7BG/h2sK5MT 7SWDunxZLMSVpSGfcYNrEETKpnoUGXwl8jcZQBW75vP7CY+NaOjYwKlj8oCu/IuSQvkH5r oqA0gefuNXIPHU9gFmOUEW9Fb05topT/AY0TKpUsxdWiHmbOAIsTNR36BS3IJv2SkRpoSx giGgI44DiixCeKJeMvBLPiqUHBfx6bKhOvVR1WSO6BGPBbqAJvaTFo0bkpk9vxuwjvXMUz VkswHJpgNrs93SKQ3GUp6qHZzjy0RD0h5Eo5KO7NY21c5t9TZgeDJG2MhwNavw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nhKN3jSXZdT1Tz7nvjzPjVNf6oWO1ysyVQ+nStbzf1g=; b=T7tBQATGcBwYUJKNknCAbiMQCmk1fXa0LgY32WS+pmuAu9u1NRObiCMEYu/KcDdlsDewZ2 ZrfpsUGcIowREmyl6piZvU0boQYIyPccb9aZjDkilFcIchVWzDx1Qym5p1PYfuBfNtU4xh Myn6xZUOyVkdjGLtMCXOb4gEXFN5ad2d9mHqSnYE+2V+GPNHox0KybwF1jppblXgaOkr+r FQmqQe6m8eY0Eryuk4EKvhL31t9dEpkuJPGDbjEyEdQk9nxdMdaDrNWv8UpNf/Nt95Hnwo Hijbf8yaLZH+i+SDSh7L7L45c0Zbsoq/MuGvu3rZZ+CrxIMelinFn+XRO2+HLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701391116; a=rsa-sha256; cv=none; b=X/1it/HgM2P+hBYnWr1pOHd9MQU/lp76UMYms58fjrOpFkMGhZZMO8NikIvkALzCQ69PtW MFKzEdc4zShDk9o4Gbg8SgleSx/m6p85ug7oZ1wNhr65lNal8eGIbvfXrETCUKHylq3RWx wVmJWm4kDyese+3w4yAnptbZqW6GXoH77MdET3cMhPRKj4kzTivvjeI78IPMR4GdMxD1qE bb3cN2lPfJQk5YWnjd03I7edyU59nXwQifDg9UU5dh7KxriCE34j4hg9Tj3PF9ZUOlsZdO b3vFq5oybPoSwsbBxxR3c9gxTVMDVkP4Y6a9pDM7ywCET5ImiFtLm7aqrCiyAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShDgw4hdNz1BQ1; Fri, 1 Dec 2023 00: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 3B10cage056662; Fri, 1 Dec 2023 00: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 3B10caIC056659; Fri, 1 Dec 2023 00:38:36 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:38:36 GMT Message-Id: <202312010038.3B10caIC056659@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 8c25d614b8c9 - releng/14.0 - zfs: cherry-pick commit from master List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 8c25d614b8c95cb4dfe46d6903b8bb764a30c788 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=8c25d614b8c95cb4dfe46d6903b8bb764a30c788 commit 8c25d614b8c95cb4dfe46d6903b8bb764a30c788 Author: Rob N AuthorDate: 2023-11-28 17:07:57 +0000 Commit: Gordon Tetlow CommitDate: 2023-11-30 21:30:04 +0000 zfs: cherry-pick commit from master #15571 30d581121 dnode_is_dirty: check dnode and its data for dirtiness Obtained from: OpenZFS Approved by: so Security: FreeBSD-EN-23:16.openzfs (cherry picked from commit 30d581121bb122c90959658e7b28b1672d342897) (cherry picked from commit d92e0d62c9e38058fd46c97beb08764538878592) --- sys/contrib/openzfs/module/zfs/dnode.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/contrib/openzfs/module/zfs/dnode.c b/sys/contrib/openzfs/module/zfs/dnode.c index 7cf03264dce2..ad9988366ada 100644 --- a/sys/contrib/openzfs/module/zfs/dnode.c +++ b/sys/contrib/openzfs/module/zfs/dnode.c @@ -1764,7 +1764,14 @@ dnode_try_claim(objset_t *os, uint64_t object, int slots) } /* - * Checks if the dnode contains any uncommitted dirty records. + * Checks if the dnode itself is dirty, or is carrying any uncommitted records. + * It is important to check both conditions, as some operations (eg appending + * to a file) can dirty both as a single logical unit, but they are not synced + * out atomically, so checking one and not the other can result in an object + * appearing to be clean mid-way through a commit. + * + * Do not change this lightly! If you get it wrong, dmu_offset_next() can + * detect a hole where there is really data, leading to silent corruption. */ boolean_t dnode_is_dirty(dnode_t *dn) @@ -1772,7 +1779,8 @@ dnode_is_dirty(dnode_t *dn) mutex_enter(&dn->dn_mtx); for (int i = 0; i < TXG_SIZE; i++) { - if (multilist_link_active(&dn->dn_dirty_link[i])) { + if (multilist_link_active(&dn->dn_dirty_link[i]) || + !list_is_empty(&dn->dn_dirty_records[i])) { mutex_exit(&dn->dn_mtx); return (B_TRUE); } From nobody Fri Dec 1 00:38:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShDgx72yNz5329r; Fri, 1 Dec 2023 00: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 4ShDgx6FDmz4LbM; Fri, 1 Dec 2023 00: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=1701391117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fs9BOcArZO23u9texM4ksfADVvWWL0KsfOEjBAj6Av8=; b=aA57uq8zsOApO0eN+FNlOU6dY3xGrL6NcGOWl1vdLwhC2e91sgIdrG9EGK5iJ4z3j6a/A3 S4gHdLO6oMW+PB1mXcrgpPniIHOSIQwHScPGiwqRE3qL0jMRlZRPz0Ej7EqW4AtGKVZO9X tjjGmtu3XPJLjTySMmdGXfcR1VCN6VtsuwRrFncBu9NY7SUvfX3Gc590QgmJNUYrhsBHrH cruSJcRWf0F762FBwJDBqhdL/btDaDd5YrjZxwOI4hcAeexFXpk6EIXvfenoRk793AoJ53 nhYqNwLjGRLEwMTtRcqWEXjXTZdQcpaEtUmlc2oS/8K3/h1Th6GPyKItNK+OBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fs9BOcArZO23u9texM4ksfADVvWWL0KsfOEjBAj6Av8=; b=kPQx1KjI9L2+eC184MONRqKaNIxvJls3UzWku28QwKYv/gBpYagRXgA8CN1dkylLdEVOj/ B+dxR9ndLSIkhwTghyF0D68tZYRVv5NoYQ6PJHcTSUXsGcm6Wmqefhk6Pm0Ce9xJ9jSBCb dXr2vtshvH9oll/OS/+u7N4+KU8GLRYkTg28qsjnRP2VEVYQzzKJeC4ekkPcYq/SSc7K+A b4sKLCnM+MLF75fKt37UvxWNg/8OTRTjo9k02/GO3HK1l/ZyblNgg4CR+V05pD8QZs01yX papNLmrBtHzRjiCV2yzMFq2HEwse9n8dwKiZcb3hBhVlTatGII2TY3zjfxf8tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701391117; a=rsa-sha256; cv=none; b=Wfz0klbCi5IoWVjL+W6HW0HNR5vRrGcQGpnnC+eLN00KyRoYXFmdTE2OoAu4y7KVBgAe38 mlgp0zLKiMOs1PTAUU3f118GhK5DJ7kAr/UcxeYT8NVpT29PAFgQ9cClxVdCVpWvRI5T0I 7Qnq5vYpmWC50Pgv0ufL8Co1X+V6EZm9NkMcAbjacRphfPmU8SrR6ywSW2m8dNE9Jj13B4 JmTf1VcN5frQZ/HOgugQxVgIeSojj3ENdB5+2QFWnf+98qQJw3fcuV83qw88d3Ui71sjLR OLHSqpGfMfsAx75ah5XWqoHpamcTw9NcSwsNmEvhAaLQmF+tmjhvENMguwT1tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShDgx5KLcz1BhY; Fri, 1 Dec 2023 00: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 3B10cb2q056707; Fri, 1 Dec 2023 00: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 3B10cbGm056704; Fri, 1 Dec 2023 00:38:37 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:38:37 GMT Message-Id: <202312010038.3B10cbGm056704@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 36f4f90efb02 - releng/14.0 - zfs: cherry-pick commit from master List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 36f4f90efb027847d6e4b7a940afbee2ad7b3b7e Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=36f4f90efb027847d6e4b7a940afbee2ad7b3b7e commit 36f4f90efb027847d6e4b7a940afbee2ad7b3b7e Author: Alexander Motin AuthorDate: 2023-11-19 01:01:03 +0000 Commit: Gordon Tetlow CommitDate: 2023-11-30 21:32:41 +0000 zfs: cherry-pick commit from master #15543 27d8c23c5 ZIL: Do not encrypt block pointers in lr_clone_range_t Obtained from: OpenZFS Approved by: so Security: FreeBSD-EN-23:16.openzfs (cherry picked from commit 27d8c23c582056a23509a7b80844a1b6435750b0) (cherry picked from commit 1b910e43b0216b284bddc83dbdb1322f8d76062c) --- sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c | 13 +++++++++++++ sys/contrib/openzfs/module/os/linux/zfs/zio_crypt.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c index fdbe13dbb5e9..024a931d7816 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c @@ -1364,6 +1364,19 @@ zio_crypt_init_uios_zil(boolean_t encrypt, uint8_t *plainbuf, vec++; total_len += crypt_len; } + } else if (txtype == TX_CLONE_RANGE) { + const size_t o = offsetof(lr_clone_range_t, lr_nbps); + crypt_len = o - sizeof (lr_t); + dst_iovecs[vec].iov_base = (char *)dlrp + sizeof (lr_t); + dst_iovecs[vec].iov_len = crypt_len; + + /* copy the bps now since they will not be encrypted */ + memcpy(dlrp + o, slrp + o, lr_len - o); + memcpy(aadp, slrp + o, lr_len - o); + aadp += lr_len - o; + aad_len += lr_len - o; + vec++; + total_len += crypt_len; } else { crypt_len = lr_len - sizeof (lr_t); dst_iovecs[vec].iov_base = (char *)dlrp + diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zio_crypt.c b/sys/contrib/openzfs/module/os/linux/zfs/zio_crypt.c index 55554d09ee43..775ab8efbcdf 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/zio_crypt.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/zio_crypt.c @@ -1543,6 +1543,21 @@ zio_crypt_init_uios_zil(boolean_t encrypt, uint8_t *plainbuf, nr_iovecs++; total_len += crypt_len; } + } else if (txtype == TX_CLONE_RANGE) { + const size_t o = offsetof(lr_clone_range_t, lr_nbps); + crypt_len = o - sizeof (lr_t); + src_iovecs[nr_iovecs].iov_base = slrp + sizeof (lr_t); + src_iovecs[nr_iovecs].iov_len = crypt_len; + dst_iovecs[nr_iovecs].iov_base = dlrp + sizeof (lr_t); + dst_iovecs[nr_iovecs].iov_len = crypt_len; + + /* copy the bps now since they will not be encrypted */ + memcpy(dlrp + o, slrp + o, lr_len - o); + memcpy(aadp, slrp + o, lr_len - o); + aadp += lr_len - o; + aad_len += lr_len - o; + nr_iovecs++; + total_len += crypt_len; } else { crypt_len = lr_len - sizeof (lr_t); src_iovecs[nr_iovecs].iov_base = slrp + sizeof (lr_t); From nobody Fri Dec 1 00:38:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShDgz2JV6z5328B; Fri, 1 Dec 2023 00:38: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 4ShDgz0LzYz4Lpr; Fri, 1 Dec 2023 00: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=1701391119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GMqqI3LUxlTJKHuWYaGuOBg/J7Gdn0QSpSRLiFps4BU=; b=qpFL3KP+Lrt0Phi6/W5tCEneag2jbKee6R/ObQHSKza6SCmcQCWoRpxWP4FPhPSNBtmsAB aHJy7w3l3gbee6vld04p9j680WsbB37Ufoa8pVz0DrH6AIPK0jydlsix/A2WBE9Z77bLSU P/kGLrc2/9KY/4rz8LG63DE2D247f0FmjfzWpsz62tGoU/xaprW8JApjQhvLRBJ+oOzKTC O8M42sBo28x14/4wu09SJbKDd8s/+Aw+7KRe52rKS9G3qiR3f83pa3KmaK3p3BjmO93QQt GZ8xvOxvO0jrbkPAXQ6jAqU5TM+fb1N3+CVWuj70kuTmtJ88+fRBxI/VRkV2RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GMqqI3LUxlTJKHuWYaGuOBg/J7Gdn0QSpSRLiFps4BU=; b=nZtNuTfUQIQ1XlluGSNGAUNW/2r06yiyozttRVt2dVd7lJpOYSfth9njBb0xYJuQ5WWOs9 f9e1fAmjzZYiEnOK5a7ofKrHgezAI8WFaZ8QT+Ou4Xmr7wIdM5W20SIoTStX20Gav23lSZ dmrDenjS9SnQnO3T87KRlvkMSRYnAjv/jq3lrbE96e6CpOryHkpiUFRi6sTqjUeUFr7+10 rIajPfx+46fXOVHi1cni2UDBuM+cfzUwtQLgSxsWOMmG4tZ5H1Ujw42LEHpod2gW7K3zp1 arrqo/Y68HURJMK+9ZHEIjHEsjYEv4CFubkwjT+flkoUKkQiDPYFMBGBTRwqeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701391119; a=rsa-sha256; cv=none; b=NChiIXaDpZX6vPKEHeDQSIBhuhMl5N4jsCF+UKcntzRsYIWRcMpSXgB136GjLuiRWIqdWz Shfy9f5yCdukVrgQxZSEQgyH2Aqe2uvC5nLxM9RKdilZxbgd3vuxCBHecH8ItpTRKp/TTA wmReDvakWT6Fmke/VqnYG7Taox1U0zm1kwW+72p4PXnyDlOggcfP6mpIUwU504os33ZToE CNNxcHg2fRcEXnTjr+OkcBX3OwJ9UYTHIztesbEcLZGlbSiKuKwXshNiA2moXnF5Nt0af/ ruI00/jpHXgx/FiyWeyjYCsY61+Hd6suWZYo50ItyArS9OU4ey8vjwpx1w8cuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShDgy6Z5Sz1BQ2; Fri, 1 Dec 2023 00: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 3B10ccgq056749; Fri, 1 Dec 2023 00: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 3B10cctp056746; Fri, 1 Dec 2023 00:38:38 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:38:38 GMT Message-Id: <202312010038.3B10cctp056746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 154870526943 - releng/14.0 - zfs: cherry-pick commit from master List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 1548705269435e980c5984ba87a554d4b329d176 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=1548705269435e980c5984ba87a554d4b329d176 commit 1548705269435e980c5984ba87a554d4b329d176 Author: Rob N AuthorDate: 2023-11-28 17:53:04 +0000 Commit: Gordon Tetlow CommitDate: 2023-11-30 21:34:08 +0000 zfs: cherry-pick commit from master #15566 688514e47 dmu_buf_will_clone: fix race in transition back to NOFILL Obtained from: OpenZFS Approved by: so Security: FreeBSD-EN-23:16.openzfs (cherry picked from commit 688514e4704bdee4551d25960febd322ac26f297) (cherry picked from commit 99385ec7c2962c2b5e54161aca6ec57546229cb2) --- sys/contrib/openzfs/module/zfs/dbuf.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/zfs/dbuf.c b/sys/contrib/openzfs/module/zfs/dbuf.c index f2831a0e8abf..5a7fe42b602a 100644 --- a/sys/contrib/openzfs/module/zfs/dbuf.c +++ b/sys/contrib/openzfs/module/zfs/dbuf.c @@ -2700,15 +2700,23 @@ dmu_buf_will_clone(dmu_buf_t *db_fake, dmu_tx_t *tx) * writes and clones into this block. */ mutex_enter(&db->db_mtx); + DBUF_VERIFY(db); VERIFY(!dbuf_undirty(db, tx)); ASSERT3P(dbuf_find_dirty_eq(db, tx->tx_txg), ==, NULL); if (db->db_buf != NULL) { arc_buf_destroy(db->db_buf, db); db->db_buf = NULL; + dbuf_clear_data(db); } + + db->db_state = DB_NOFILL; + DTRACE_SET_STATE(db, "allocating NOFILL buffer for clone"); + + DBUF_VERIFY(db); mutex_exit(&db->db_mtx); - dmu_buf_will_not_fill(db_fake, tx); + dbuf_noread(db); + (void) dbuf_dirty(db, tx); } void From nobody Fri Dec 1 00:38:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShDh02HJWz5329v; Fri, 1 Dec 2023 00: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 4ShDh01MmKz4LsQ; Fri, 1 Dec 2023 00: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=1701391120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=awxCAa9BSOuhObHGHUFNrekY+OSieSYKUTIL2Vdnmu4=; b=ALPqjpM6Jvb1E+ieVTUbYO5cqAsBHsTNZs7DnGnhshdSbHrmDgu/xtSsfJ6QS1aiccfSVn g2386S7AhMCCD1P/oCXL1Wp7QZZcVIc/a+gY8G0DvHFNh90BjNP94E4KSBNapNNnL9WGwi Not0LDc5Sv9El0KByuQjr6MxQSi37Jn3nmsi/viDFz5GRm0gKlUZMqmlHHlCsnr4GIk5TK mI4eNb4mrtr4xCzQFor2gctzha08/kwWQSePFbZhWcS+DmYRF9Bh/CGzIdWwDC3p/OnbVW 154yQKDWz7AP1j+fCJmwE90IHXNy/1g657dwAqU6bn53vOQ7ZcCgNaAJx9Fmbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=awxCAa9BSOuhObHGHUFNrekY+OSieSYKUTIL2Vdnmu4=; b=QNZ2BDSMGHwS4EC39PEYQ+8SIfr/y3CpPrZiLLDOKLdQNY3Mn5iFjbsNLvsF+IDCNDuYkv vfoaV7vGKcE2wIOwG14O+7UR7aJgs7d5rIV8em/cbyDZH25YmoKQyFKnhgYhMY8kxJCuYt M7FXjt/A9IsDX1bb8FcBpZ1QSSvrGaHvOLGq7Jo5rtNgnvWy2U6kNsDsbRhikOv6cd6k9x 3qprKj4ti5kXIQii6xvU9Y2vMUSesBVc9iygsvgQBabCfjSKrCyW3Sp96X9OwZPrZ9Fk0B xXIBNViJWFUMjMp3HYM6NDEfG08ZU14hh7HjR54Z0MSABE6OnmtINLgTIcNPlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701391120; a=rsa-sha256; cv=none; b=Cs1ikDKigY1fFa9pcgcj6/SFLv9Z3+385DCn+mkpOrR0p3LJBeM11ATQHrX69QmIunI2VA OJfHQ7XCIuJBR9vwDfWf7rZ1G+MjpEmfhkzCU6pYIxCnsJgLBsPGUSS4naUzMfCZfXH0zI x1W8/Y7JP9pZDERHTZ5xr4Ahegeh34u2x22dsnLXs5/CGP218LHUsNeZCTCizH9mijOZ5Q qAGtM6p2nUNx8BHVd6rGnhnXyJU6z3g65yvGav3f4G7SXZC+CxEyIFPfQ9qiL2NJ3jrIGw xHUMoVIJF3Manj1qL68QJ7L9vjFuYedbfHbvwQI2wKXobRNN2KbIoNSI0CForg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShDh00S7Nz1BhZ; Fri, 1 Dec 2023 00: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 3B10cdRK056801; Fri, 1 Dec 2023 00: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 3B10cd1a056798; Fri, 1 Dec 2023 00:38:39 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:38:39 GMT Message-Id: <202312010038.3B10cd1a056798@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 305be1f36b3e - releng/14.0 - Add UPDATING entries and bump version. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 305be1f36b3e7ec1e4ca3cb34f1704c00b1c8321 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=305be1f36b3e7ec1e4ca3cb34f1704c00b1c8321 commit 305be1f36b3e7ec1e4ca3cb34f1704c00b1c8321 Author: Gordon Tetlow AuthorDate: 2023-11-30 21:51:17 +0000 Commit: Gordon Tetlow CommitDate: 2023-11-30 21:51:17 +0000 Add UPDATING entries and bump version. Approved by: so --- UPDATING | 8 ++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index c32c3b7ec940..996c5744405d 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20231130: + 14.0-RELEASE-p1 EN-23:15.sanitizer + EN-23:16.openzfs + + Fix clang sanitizer failure with ASLR enabled [EN-23:15.sanitizer] + + OpenZFS data corruption [EN-23:16.openzfs] + 20231114: FreeBSD 14.0-RELEASE. diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index a2b89f3caca7..3ba43dc02fe4 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="RELEASE" +BRANCH="RELEASE-p1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Dec 1 00:38:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShDh725dkz5328D; Fri, 1 Dec 2023 00:38: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 4ShDh71gJtz4MF9; Fri, 1 Dec 2023 00:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxoRYYuMwRja6UstxGU5NWL4hz0IXMDKV2WRBp2fPWU=; b=yJ0kqzUW/hJ4k8C6PFArFuBnpiSLBrVrYMM8a4fYmDprHBeQP53GCAlydtzigGGESmTuGG /G0b6tqZcDMoVhP7eSZfmFGXMZdz/tFIageedWnLhS4FGqFS3r0d/aPoYkXAXj+UnD91n3 ph7zOS5pd325BXBbe7aw8rQxCGOHHcvJFVRBb7LAtFb6olAHl1Epo/wfXWlQJi6ExwtHc9 v9+xQw/hAj3NviXFwvPsd84IeqgCRzsBKZw48BaIuypqO1wkeg0Jtts53PhRRyLmyvrLto jEDdhGBn++uNNNuF7N5Ar8V+X9yzh9eWo5H4geNjtrQKE8tLpIL7NajGQvQybQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxoRYYuMwRja6UstxGU5NWL4hz0IXMDKV2WRBp2fPWU=; b=FsB6B+/5C7N9dHqxpBBFq9aI1OM7+DjCF4P+170ev5JFeVv0zj6sMDt6gmGGp5ILnGVxMp 3ExBOOR0a1vhEBUo66q3iyNkJzvDOn8l93BSccNkJ9tBHb0ZNvLu35qfPuwNlzFFnpMXYk KQMH1MNDkCevF9fFnMA6K0B9MVypXrkbGZi3ZYw7z+lROrxhRqDdGrpeSIoFFEXu3szEBh 8BhhYrM+mGd6WBaqyvnSsoPWH1xrAXlPlT9KPSZR1RoHmlY02YAdZ32cA6myh1YVhVFoet rcqbkfbMHRxsVe3Qp8KeM9SW00Y+O2IuVN9TrYMNWA5AsrqPlVYpfdAPPADA/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701391127; a=rsa-sha256; cv=none; b=wmyyX9GpmzhVhOQgNZk0mEeFlPVBgwVzReNrmxM6cRxPNleoPKOVcVF+DVrQMVbuxhDoF8 KMD2eo5dbvmIpF/rY6rSPTN2Pv+KunnbZJhy/b/3dzq9JuNvEkiEB+mO3ZLBydhcQEUXUb r7W3VCPCVFE17J5aQtNkA7TGu/HE2NXXUBuOOBVpurdXkyZqNrIAmCZ4cv1i089s2NZyrD jL8RA5n8kvk2nCrp3TufJdy06uUe05TCo1JyCPVQrXr+CLSbSPSZN+nybnE5LLXSwJSkEX mTHFaVpEBsRf0PexeH1Lb6jx0BPydz7zNHf4b8szzan1Y8TW59Z9i9F6j4hd3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShDh70jGhz1BQ3; Fri, 1 Dec 2023 00:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B10cl8T056971; Fri, 1 Dec 2023 00:38:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B10clb5056968; Fri, 1 Dec 2023 00:38:47 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:38:47 GMT Message-Id: <202312010038.3B10clb5056968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 0bb76997ce58 - releng/13.2 - zfs: cherry-pick commit from master List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 0bb76997ce5888e8c72aa3fdf036387f85eb240c Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=0bb76997ce5888e8c72aa3fdf036387f85eb240c commit 0bb76997ce5888e8c72aa3fdf036387f85eb240c Author: Rob N AuthorDate: 2023-11-28 17:07:57 +0000 Commit: Gordon Tetlow CommitDate: 2023-11-30 21:40:52 +0000 zfs: cherry-pick commit from master #15571 30d581121 dnode_is_dirty: check dnode and its data for dirtiness Obtained from: OpenZFS Approved by: so Security: FreeBSD-EN-23:16.openzfs (cherry picked from commit 30d581121bb122c90959658e7b28b1672d342897) (cherry picked from commit 5858f93a8b66aa6331d99bed6aad68bc7e9648ba) --- sys/contrib/openzfs/module/zfs/dnode.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/contrib/openzfs/module/zfs/dnode.c b/sys/contrib/openzfs/module/zfs/dnode.c index 8e55d5447975..d9a26de5c47a 100644 --- a/sys/contrib/openzfs/module/zfs/dnode.c +++ b/sys/contrib/openzfs/module/zfs/dnode.c @@ -1646,7 +1646,14 @@ dnode_try_claim(objset_t *os, uint64_t object, int slots) } /* - * Checks if the dnode contains any uncommitted dirty records. + * Checks if the dnode itself is dirty, or is carrying any uncommitted records. + * It is important to check both conditions, as some operations (eg appending + * to a file) can dirty both as a single logical unit, but they are not synced + * out atomically, so checking one and not the other can result in an object + * appearing to be clean mid-way through a commit. + * + * Do not change this lightly! If you get it wrong, dmu_offset_next() can + * detect a hole where there is really data, leading to silent corruption. */ boolean_t dnode_is_dirty(dnode_t *dn) @@ -1654,7 +1661,8 @@ dnode_is_dirty(dnode_t *dn) mutex_enter(&dn->dn_mtx); for (int i = 0; i < TXG_SIZE; i++) { - if (multilist_link_active(&dn->dn_dirty_link[i])) { + if (multilist_link_active(&dn->dn_dirty_link[i]) || + !list_is_empty(&dn->dn_dirty_records[i])) { mutex_exit(&dn->dn_mtx); return (B_TRUE); } From nobody Fri Dec 1 00:38:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShDh83VNDz5322n; Fri, 1 Dec 2023 00:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ShDh82czNz4MNM; Fri, 1 Dec 2023 00:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C52FNOhLTvVyIjkY/5N50Nb07+IVG6SCkw9hg8aH9r4=; b=oJj2AbBwPYuFzTTN6RR5/B5KgIAxJA5gy25fQWe5ZOAxDjGmXAIWeThT1hltouolbalSZz LFOgzNsZql3WJsU0Z46mY2mikvIICVAFqnuyGFRi+n8lRB/n2NA0pGFkTisM7I4sg51/f2 ytYwMTgH3bVDRbl/cBpq+wDRmpj22g1SrFzOxrNvHKYBfaDhOvHt+pBKklwr3zWnyyvYR7 W2CiNQMgxAkSurlIV1c7qJBPpQeIYaz3BKdQeobNJsvN8SpDwmU0RBtqaeB3YGUzI9em+K jS3DHBIzXRaEvDkHNDkOLSqaJNtJPCVg1D+FLJEzReeYY1qCLTvecfHp8ZHhCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C52FNOhLTvVyIjkY/5N50Nb07+IVG6SCkw9hg8aH9r4=; b=YZgMEfiCg786GFpxPWjUwL8h5gY6S2mjH9g6GNLlXs5PE2WbCwNnUCu0tqTTIDQ4lDh/Pz 4oPjofavq6InxgtDV9K1f0feJiHiFhzJeabZba2REHK7Eji+joPonflYuqwlY434Yg++JK 959iCGIfL7rVBbrA1Cr4qUt53ToqDwBfLXkVRoBeUtAjwXf+NwEGisT7zdouQhHOb9lAD2 JNZTkgZZGw8v7WIh2AoUXdGmplACNWq1j6rZhGN8sj1Z0bS2cetNeyK5KhsknUFDEkXkOX eFn+D+uNn4NMaTIl/fFvKXwRaw+20DVcb6R2Hod4qbmMTduqbzGVPQb53SZttA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701391128; a=rsa-sha256; cv=none; b=Tgdy0V3fpW0jgRdcAnFQPVsgvP0G1nwhMJ9OngoNtlY4Aelxm0e1P5Sp/Jr69g/mAJGojM 5wAb9rFZBxA3My7ITt4yx/kF9aL2U75c1IOle5+yrqjsAbcAvRUO1mMPRDeN/aUHuQnT0d qY6/L5Rgx5LlSt8hByq+LVcWBHMhS+cxneQ2JDCieOvBxvOWHYupBcZE6IJjVxcRFojpOD NsIJJUZQkQRxzialh7I/6NDiDgz3FNaso1cqduhdQ0jSJrYSeFWp5lHxbSGL75rt6U7SH3 /wz2yFYM8gqAf/8/oaer8ZfRIsbT48H14wihN4VCCt6uzo7uCSGU8LirB5poXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShDh81jnrz1B0p; Fri, 1 Dec 2023 00:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B10cmJE057016; Fri, 1 Dec 2023 00:38:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B10cmsw057013; Fri, 1 Dec 2023 00:38:48 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:38:48 GMT Message-Id: <202312010038.3B10cmsw057013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 08225c10315a - releng/13.2 - Add UPDATING entries and bump version. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 08225c10315a038983baea3e0dd3009fda068ac5 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=08225c10315a038983baea3e0dd3009fda068ac5 commit 08225c10315a038983baea3e0dd3009fda068ac5 Author: Gordon Tetlow AuthorDate: 2023-11-30 21:51:02 +0000 Commit: Gordon Tetlow CommitDate: 2023-11-30 21:51:02 +0000 Add UPDATING entries and bump version. Approved by: so --- UPDATING | 5 +++++ sys/conf/newvers.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 180f20d04fd5..9e997c89f59b 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20231130: + 13.2-RELEASE-p6 EN-23:16.openzfs + + OpenZFS data corruption [EN-23:16.openzfs] + 20231108: 13.2-RELEASE-p5 EN-23:13.freebsd-update EN-23:14.regcomp diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index c2780964a97b..9e399bc19d20 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="13.2" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Dec 1 00:38:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShDhJ0M6Sz5320V; Fri, 1 Dec 2023 00:38: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 4ShDhH6k9dz4Mpm; Fri, 1 Dec 2023 00:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w4gZB+2GZlPIJY6Fwialws3Uz6g80otqKBsc3gcw7aY=; b=CtwzCKEZYfK0Wtp0OSdrnFKwjJ8v7MMr576eyP0Ok2/Ln3bTaPARyAzHQEXRy2Zzg0gKbu glhTfb0B+yFZd4pAy6jyHsn28dajcfMr70fGDt8iG7Y4i3zUTe5fj70WNa8YWFVmLM0geN QrkoGLc7w5/uDVRuXiFzqA9ftPAYnYwM8321Id6tS/G+EqCiG1UYP7Ab1/Ci407h0MCpsj IKX/zMcwNomFRbgI8PBtAD3Xwy5hNghkAMFtxLvpt5OEzEcK3tF5HOqeaKEaFrIDbodsby X3s+EVXxdoArJFirvpmuRgyNcM6/Vpe7dPbVgb6XOiW6AlHYz5qe3yFgjJdLag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w4gZB+2GZlPIJY6Fwialws3Uz6g80otqKBsc3gcw7aY=; b=WubeMzW6yfKrTxqdK4W47ALPelJtUT1jOg/rlEzgIIsvDvXJJQ2Xp5POHpA7ueV8R80FJQ D7blZLJoHJ208CKgTz5yXT16hF7Wo+4m0A/aPoaB8Mx6jK0vw9wuDC5iGMQYVUmxifbJ0W jjAXcFwMw4janz7RPHLMN+KhJyPYOL8wIML5mOcwve+u3UcyxhrzUBWZTxXNy49ZMlDrww PSKuLsH5vbdbst4FIa05CF1pTJwF2XCgJMdCO6WfkVnEMvYSqh1ryMZocYxQ2xxbLrRVF/ cukFuF26k+tKPB5ASt8lGEu7xlBvHbTQpb9lZfILvpgVsgoprs1rA+CrX+oH3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701391135; a=rsa-sha256; cv=none; b=skFxK1sHqibBjY4jh4gnk/aNLNwejDYmLUaIpFjJBgdu8+JN2jMi2ogKbcW0fZLW+dSzF2 FrSFt7fL43lon/YCW9KkTFk05K1JtGwCKFd3zYanxDINtZ7LU8+T6ET6OKCr2cl7uuq4Bu Eyhb4Vn6eVtwflyXQpM+3JakcD2eaYG44UH/DjRyOBb3+H/NeB/o34ammfIb3ys7ZsbiOY AA310AEDJaR9YT2w5sWkVNJodfruLdjzL6WzrvCz9aormUXC9UmOnaCRBc6bryYDPCintJ l6Z6s6m3Qmw/jMqfEj3RYlRXxd3xqHZ3jBBq2xlV+LfyyAGwdVGYY8jQlWPmSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShDhH5m7tz1BbZ; Fri, 1 Dec 2023 00:38: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 3B10ctWp057184; Fri, 1 Dec 2023 00:38:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B10ctNZ057181; Fri, 1 Dec 2023 00:38:55 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:38:55 GMT Message-Id: <202312010038.3B10ctNZ057181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 7769487a50ff - releng/12.4 - dnode_is_dirty: check dnode and its data for dirtiness List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 7769487a50ff81a31c313538d914f0dc8deb5ea1 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=7769487a50ff81a31c313538d914f0dc8deb5ea1 commit 7769487a50ff81a31c313538d914f0dc8deb5ea1 Author: Rob Norris AuthorDate: 2023-11-30 05:14:13 +0000 Commit: Gordon Tetlow CommitDate: 2023-11-30 21:46:13 +0000 dnode_is_dirty: check dnode and its data for dirtiness Over its history this the dirty dnode test has been changed between checking for a dnodes being on `os_dirty_dnodes` (`dn_dirty_link`) and `dn_dirty_record`. It turns out both are actually required. In the case of appending data to a newly created file, the dnode proper is dirtied (at least to change the blocksize) and dirty records are added. Thus, a single logical operation is represented by separate dirty indicators, and must not be separated. The incorrect dirty check becomes a problem when the first block of a file is being appended to while another process is calling lseek to skip holes. There is a small window where the dnode part is undirtied while there are still dirty records. In this case, `lseek(fd, 0, SEEK_DATA)` would not know that the file is dirty, and would go to `dnode_next_offset()`. Since the object has no data blocks yet, it returns `ESRCH`, indicating no data found, which results in `ENXIO` being returned to `lseek()`'s caller. This change simply updates the dirty check to check both types of dirty. If there's anything dirty at all, we immediately go to the "wait for sync" stage, It doesn't really matter after that; both changes are on disk, so the dirty fields should be correct. Sponsored by: Klara, Inc. Sponsored by: Wasabi Technology, Inc. Approved by: so Security: FreeBSD-EN-23:16.openzfs (cherry picked from commit 8959056352256e79a63ba6327f0a0ee4236d3e7f) --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c index 45ac4b796fd2..bd78daf5d517 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c @@ -2557,7 +2557,8 @@ dmu_object_wait_synced(objset_t *os, uint64_t object) } for (i = 0; i < TXG_SIZE; i++) { - if (list_link_active(&dn->dn_dirty_link[i])) { + if (list_link_active(&dn->dn_dirty_link[i]) || + !list_is_empty(&dn->dn_dirty_records[i])) { break; } } From nobody Fri Dec 1 00:38:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShDhK1qwDz531lQ; Fri, 1 Dec 2023 00:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ShDhK0zL1z4Mmw; Fri, 1 Dec 2023 00:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/7GJxb7+L+dU6Ehsu75qbmp2Kcc+VWWP4jF1FyxHQ7U=; b=QMXn+Sqdt5wB+oLBdhvTHArXan6DrjfjUhReebJn4SnVKPKuigid7J5lWT1SSgYE+k+rrI fqE+gM6kWEj7gD6bDbAQm6BnQQ/8ggs24GY4gOUwxwoSbh3xowhnW3M3+p3gV2zp3xblAY JB5l7qiIKiMQJxP7vuL1aOOrAd8P1Fx9C2CZOkfi6ZOfeQTIMaOTZfZWS5fB7v/o4h1ZP9 +eT3Q5sgIk1mPFmXnnYf42X6tb96JPk8GKBGWB8bxMjz2xmTt3lkT+SGveBb4tL5wNldmM Q6Xw35TIKHwJwrg9MHT23U8wQOUOuRXKi5i0QrH0f2MC/V13IGkuin/SrhqdSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701391137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/7GJxb7+L+dU6Ehsu75qbmp2Kcc+VWWP4jF1FyxHQ7U=; b=NV6MoFcQLs9TtKO49UUNEF8BQZTGPqt8pPjAXCpCnZWNQwVazQfIrOOhfob4k4ePoqFMuC 2Y+q+x6x6xeo13P9K2qVQACHifazIu0lahbnIXI3MJxWaGN0hXnqURJXNzTLADK4Kmcxg8 3bzr6ze+CI0QCRA6KaxkykbjnBUUbRr+RiL5yRaROSxcS8JRVWnooYGyP3YDOQbXzyhHru hOT5UOwNcsmcAPd2mxNZ2ssRFtOxuKaZ10IUjueXQG3AH10TLRQdgvWwAmbLyyY/aoPS79 wT5TKdi+RE5A366HN8FRF798JV2Wft5dwZVZgD75Wh2uiEBy1tYLiwUzV0R89w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701391137; a=rsa-sha256; cv=none; b=G6ebLVnQcCqnXLrgO3m4youxWL2vn/ZLHMNI/mq16BqrkQAFaum4uCIqrJ42RlV+HuFCzj hPfAPP4VomEZwubSn7XITtqfsXTv2LbTpUkqwKJHfpQRAHIwqUyMLCGHo2pts4qoL860lV tyxAzUkLpQZ5VEVTWbBLLJTzElgmYqfULBqPmtZPJ/SxIWa7ZzHlxP6CYF0wiDYjzeT44L /0YqXFYyM8EbouM/FZdiSABIp09YcXANpI56CpFm+NvxkqgApG4hJo5uEbnXwWNROurbqP OfMcQMrHrtVvWhQRsfs2WmsB2rYj6W21/oXnmVK9ZaXsuBA3h/CmMS6bDdlo0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShDhJ71qyz1Bhb; Fri, 1 Dec 2023 00:38: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 3B10cuXd057232; Fri, 1 Dec 2023 00:38:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B10cu8Y057229; Fri, 1 Dec 2023 00:38:56 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:38:56 GMT Message-Id: <202312010038.3B10cu8Y057229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 1f71f08e3b18 - releng/12.4 - Add UPDATING entries and bump version. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 1f71f08e3b18ea0d92054bcb5b70f2b3be9318c8 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=1f71f08e3b18ea0d92054bcb5b70f2b3be9318c8 commit 1f71f08e3b18ea0d92054bcb5b70f2b3be9318c8 Author: Gordon Tetlow AuthorDate: 2023-11-30 21:50:16 +0000 Commit: Gordon Tetlow CommitDate: 2023-11-30 21:50:16 +0000 Add UPDATING entries and bump version. Approved by: so --- UPDATING | 5 +++++ sys/conf/newvers.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 21d537fdb85d..b951bf259ed6 100644 --- a/UPDATING +++ b/UPDATING @@ -17,6 +17,11 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20231130: + 12.4-RELEASE-p8 EN-23:16.openzfs + + OpenZFS data corruption [EN-23:16.openzfs] + 20231108: 12.4-RELEASE-p7 EN-23:13.freebsd-update EN-23:14.regcomp diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index f255e0441e13..a264cb661e72 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -49,7 +49,7 @@ TYPE="FreeBSD" REVISION="12.4" -BRANCH="RELEASE-p7" +BRANCH="RELEASE-p8" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Dec 1 00:56:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShF403TTbz532pk; Fri, 1 Dec 2023 00:56: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 4ShF402zXJz4Pvq; Fri, 1 Dec 2023 00:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QLuRoUaWWjJ8kUZ27IUd9UIHClElUs+z9HU8JN/FM6M=; b=nsPPURoTd1eg4pnKVGS8sAiEj3vllhlAVtBMmBIuynHSIZ1XePQoK9+JHKY6AiKJMorahV YUS9oxwkpggiDlddW/Uwpd/i+zx76cUd2rwmCDE5Lu5Y8r4/PfyByHcg84eQNsEfULNlvH yGO/n7w093iATOMXjbdKweWae2ouA/3bUc4/icE5ie+H8HzrqckME6q8c6WfM1XbHuz93K cNsx2X22zuHaiYYShyYUk092sU4dDDBR/J1xAt4YOps0IjZf5kIbD0KC3xwz5WYs9k9Pvu M1Kphs+/Z0rc8+1jTo7uf3iTM6MD4DRuf5/7Lg5ZFMi6wI6Ll3QN5vP9m8eThA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QLuRoUaWWjJ8kUZ27IUd9UIHClElUs+z9HU8JN/FM6M=; b=krZVO74okdcJo021mpMd+mdYNPrIB81i72/6cN8U7gPQwfuzVloWf5raJOYIRpE0saT5KP 0s2pr6bPRSCPe3httCT3QzN8aqbafkRAszZ+52pa/f9q9iQJ2ZHb/2MDL25TEp41NLj/rC lngHDPrZn9XJ4uowk+mA28vacUJ+r+NEyckczZDWuMb4KhKecOwbeuAZsZTjsEKnHL/dPA eCFC9jLBngJ2tt0SDhqDLOPrg0ARzD3WhYS2Dv2YgD0OgoEWe/7sTFv25xiok1ztdlxxaz NuOzioYQ/pS+aMR6N6MRtZWFrX9auv9Wyq3oMqeUFgMkE/967ceXB9+kWhYBEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701392160; a=rsa-sha256; cv=none; b=NgTKBRz7HvJyHVZNi/gH6KmOUiupGZ4gMqg37uaS79ooYNQvA9sq8EWtSe3f2WiVmnTzZV QGEGuC3UHQ2skIYUysecCNBXNe9NBzhmh+V0kJkhrhT+zP2//Psmffyk/k9/4UmXct4MEc K3xRptKxNdR3rCfZ/iJG+JPOOhRDhKjhjxuWbCG2gI/iBlgrrGYRkkleRuS+qVT0C0J9AJ 71eMbqc2Dd2xsfP2oaFTbH4mcp8A6qpAZKlJnyX/4WvzO75RqLnkgrXwBYecMLwi9D8490 jnb7BCDhSUpGRp5mo2ZJWELc9fXhV9Q8vdxLMcufZNoxLdzRoqCb/rfl6vV99g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShF4021tLz1C5x; Fri, 1 Dec 2023 00:56: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 3B10u0ZD090428; Fri, 1 Dec 2023 00:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B10u0pe090425; Fri, 1 Dec 2023 00:56:00 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:56:00 GMT Message-Id: <202312010056.3B10u0pe090425@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: de607e3c230b - main - net80211: move net_epoch into net80211 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShGWT4MtMz536JS for ; Fri, 1 Dec 2023 02:01:25 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 4ShGWT2mK4z4Ygv 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-f54.google.com with SMTP id 5b1f17b1804b1-40b4a8db331so15270055e9.3 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=aVSvYMnZ8+eskAdeqbCQ3ntRNO4MJYL/3qMv6PcfDHGXH9oShb+fz+OXEvqwij9xih iZTwkeyIFsX3jvsUl3DDUXYPtxgZrJ3lSh6Zpf+Yydr4W+2cR4JcEfWB+Nsrs+lxtcyV GMH2GJHaZxZcmxFgFhC8LaiuwVWgP13YHrvwnW0BOKixoRHuBCSWZONC+XDhO3ucZmsZ luEvCl3SxsqOkdFrL378Yi7EXE8MDwOmJdZ3JtEqNgmaXGwI9A4ziybe1G74HUK5qwHG nUYqP9/sdGDuMw98Hz22Vg3czeOl9aGZYdV04wnBJkXD36FXOU1M96KOpO+/efOPIjKH nxqw== X-Gm-Message-State: AOJu0YxVQ5KL25Q3MbP5O5MUdQUwIw23sPLI4+CneP5bCqwIkATOsVjv a5rjMCIvI38oINqoObaW0DB1sQ== 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(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: 4ShGWT2mK4z4Ygv 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 07:16:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShPVf0tvbz52BrM; Fri, 1 Dec 2023 07: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 4ShPVd74Qxz3g1Y; Fri, 1 Dec 2023 07: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=1701414970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hM6nCiauPmJihVX6MMESpl3xyz/aJvUdru+4/LXGgiU=; b=I4SjzywO7Ic4DtdqGsLks6qKIY3vQfajtj59wYO2pK2u2qftcbrRgGXq6FEuLgSEaWlhxA EFXhH5bNnnk3hKgedXRU8H/0FGHkM8/ZHFIDA1UlqQLXL4PWvxR4hvkKp0AIWknKg0Oelt KmwBDxcqeMeKSQGk5TKgtD3aJqXHmbvzxNs3kL7FkifPct7/AbO5J5KKtyLobSiUzxVN6N K9g1veCzxwYvV6dR5zEQo3YrPaMj/snvtnhhMHpCL89dOJHPYOfwbIMQyHSCdrw3u78NKL sMxNnNGLCoiD0D0kDwoWo4wHOGGW0ZESxze4ZnkCtpUIYz3dZQJDJ3otOc7C2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701414970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hM6nCiauPmJihVX6MMESpl3xyz/aJvUdru+4/LXGgiU=; b=o1+jgqyhIj8lwxkCwL07IsvK+BeApVMClcM0n19JIE50wdsDIQ3Z0IOO6QkRF5/qAnJv6C HQnvHZmwzboL64eo5afK75Q0esdp8kzvQHNCMRBzQIH3gGbJpiCEiej95PYJ4jmrXJ6Sk2 PSlxxTkWdFFTK1pDEOmgU6Ex4ziWJqPf3iP+7WARbqWUCKlFhN6v2YFEARw7TWn9h6hCI8 hiobT6nc/RBbgrCjfBYrOmuXCKD7GVms2awIwtCThAfpjrRFRuDiGw3uvGGfxuPGsHdsXo QWxgecLrcTi0tsFuPsPf9dm30bAUmqt5LDJph6VuG68dU/dkvOCRMdQZxFbGKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701414970; a=rsa-sha256; cv=none; b=gfW4yZNUe0BjXF0eJcHxyGwMpe7FXWGPyzXPwMNH6QwTBZrijxlw4GcNvlOZtG+/5vkogh +L0556MFXfm2nB0SDVJwF4AOGXqANO13uQB+iC0+E4jlixLx1VQBGyPvidDcBUmQC9JedF kFfm+bRi4P2l7MnKfhxVbh0AXqN/D+DSiOyHohPwyB+K4md+9e3ZDQTzRr5rWemWn4DkDO By4UkJMliWUFvQP/PQnp2aQ+CSRyeQWe9F6zfJt0Fm7wjqxFEdmeaoZTsKIQIF8iuvjuh3 JHWqtnqpq5bWHShOngUchgmairZvm9r4IFKMbdUfN9N+GfAFlFZVsYxPoIRktw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShPVd65sxz90Y; Fri, 1 Dec 2023 07: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 3B17G9G4027213; Fri, 1 Dec 2023 07: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 3B17G9K8027210; Fri, 1 Dec 2023 07:16:09 GMT (envelope-from git) Date: Fri, 1 Dec 2023 07:16:09 GMT Message-Id: <202312010716.3B17G9K8027210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: c9ceff3c1fa6 - stable/14 - Fix /root permissions after 'make installworld' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c9ceff3c1fa6854627427235db4e9c6a7c583965 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c9ceff3c1fa6854627427235db4e9c6a7c583965 commit c9ceff3c1fa6854627427235db4e9c6a7c583965 Author: Thomas Eberhardt AuthorDate: 2023-11-16 09:59:38 +0000 Commit: Gordon Bergling CommitDate: 2023-12-01 07:15:25 +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 (cherry picked from commit a6ed8c9593031abf6fa73661be55c226caa362d6) --- 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= csh ETC= csh.cshrc csh.login csh.logout ROOT= dot.cshrc dot.login ROOTDIR= /root +ROOTDIR_MODE= 0750 ROOTNAME_dot.cshrc= .cshrc ROOTNAME_dot.login= .login TCSHDIR= ${SRCTOP}/contrib/tcsh diff --git a/bin/sh/Makefile b/bin/sh/Makefile index f8c853cec6c7..48b6d2852444 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -6,6 +6,7 @@ CONFGROUPS= ETC ROOT ETC= profile ROOT= dot.shrc dot.profile ROOTDIR= /root +ROOTDIR_MODE= 0750 ROOTNAME_dot.shrc= .shrc ROOTNAME_dot.profile= .profile PACKAGE=runtime From nobody Fri Dec 1 07:16:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShPWY03L6z52Bd0; Fri, 1 Dec 2023 07:16: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 4ShPWX619Sz3gj7; Fri, 1 Dec 2023 07:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701415016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AyTXPbtdsTA+aFUwotth00hd8dgN7h610yrrHzRCNLk=; b=o8rnHZwWvW/ofAJodD5eSs8Z76urhfEEMXZAyeUPEzQc3K0ZKIM3qR6w9mpDkXEb1+KCSE 6A5jh1VsRSgUr/hajLlPM2aFgmBjhicoDkZXRZ9mCzzWJTahYQMKe+6kAXgHCp+T0+RJ3R XQfe4IG/Z5wgHiqs3Oo2R9iNUqn65FcIS0MVrM3vgluqkxUQcoEwxgX54lWXSIvdxecY6j bKijYx0o9yMO1HTb86Oxt2q//yRM+tSmp+ogQUuj+BX1Hv6cbTHCDla9Ow/Y+iq3D8ca2+ /hfLxsBP1zEvWCwIdcqm9Qi4oGQblOe3gdQGZkjjkwteM+mde0hqXcDLWbfinQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701415016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AyTXPbtdsTA+aFUwotth00hd8dgN7h610yrrHzRCNLk=; b=TOqTjyB6PZ5ZTg8G9c0cw5mLiQ5vbOWmkejwV/oyHouj6cWEnd5WchHuhy6cUfT94Q2TF+ ZhixdpVMFt33VIWFx1QzCs+P1uP1E8xAtYbxoR623s2JKRKV3XSxaMgIqTMu0OMLRozoqJ /wPU1XPEBNhfX08leeBvuRZmlkk2yC0YWLMurl5BwDcfuAoAWbc9aT+dOhXU8HFoJlj9BG fEiLNp/jkPQLXeI7IXgbKdydVmVs90I8QeI+LehZs9SL5S1EjNBXhjEOS3axCBm49HvNiv 9qelxig5JH6PvaGVS84+XnTt5TrSeNNLLIAB04Jo0J/QU7x9qbwiVyiWAUFY6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701415016; a=rsa-sha256; cv=none; b=jsxVJHFcgHXIs04vI+Ml1e0UIda65WGfOji3JzpK9QTbOUdyMGwwzTH7dQwQPRksi7ocEi Dl0S4CbqCN4GlY/J5eb8SrARwZ+z+UvR737abj6b0nBqnpvTrlq4b8rXh3lryhzspRWyYQ idqgo1jVUy8ENHh29DaeiSiCjO6WbTqcqVTuHA7hiTzxpvmRlPVIfnwwQhyOJE0y0o1d9E VZ/mgpur+ICHP+p66Vfbdvt4Vx0M1oQrWFwfIXNK6qI9DH4wefkKvRmBld4oEyDiHkpBnh JbUgAmwo3ysBHICvTWXDIggH4vHQ/iKUXqNgok285F99+yq3T0wl4KkklSqKYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShPWX53txz8Zl; Fri, 1 Dec 2023 07:16: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 3B17GuQG027481; Fri, 1 Dec 2023 07:16:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B17Gusj027478; Fri, 1 Dec 2023 07:16:56 GMT (envelope-from git) Date: Fri, 1 Dec 2023 07:16:56 GMT Message-Id: <202312010716.3B17Gusj027478@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 1023abd5b60f - stable/13 - Fix /root permissions after 'make installworld' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1023abd5b60f82360ea9f09b9af06dd30d6d8c18 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1023abd5b60f82360ea9f09b9af06dd30d6d8c18 commit 1023abd5b60f82360ea9f09b9af06dd30d6d8c18 Author: Thomas Eberhardt AuthorDate: 2023-11-16 09:59:38 +0000 Commit: Gordon Bergling CommitDate: 2023-12-01 07:16: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 (cherry picked from commit a6ed8c9593031abf6fa73661be55c226caa362d6) --- bin/csh/Makefile | 1 + bin/sh/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/bin/csh/Makefile b/bin/csh/Makefile index d7049cf99918..d7d4ea8038fe 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -11,6 +11,7 @@ CONFGROUPS= ETC ROOT ETC= csh.cshrc csh.login csh.logout ROOT= dot.cshrc dot.login ROOTDIR= /root +ROOTDIR_MODE= 0750 ROOTNAME_dot.cshrc= .cshrc ROOTNAME_dot.login= .login PACKAGE=runtime diff --git a/bin/sh/Makefile b/bin/sh/Makefile index e34471da8835..5f0138e693a0 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -6,6 +6,7 @@ CONFGROUPS= ETC ROOT ETC= profile ROOT= dot.shrc dot.profile ROOTDIR= /root +ROOTDIR_MODE= 0750 ROOTNAME_dot.shrc= .shrc ROOTNAME_dot.profile= .profile PACKAGE=runtime From nobody Fri Dec 1 09:37:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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 11:19:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShVvH48Dzz52TLm; Fri, 1 Dec 2023 11:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ShVvH3g1tz4VqF; Fri, 1 Dec 2023 11:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701429563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dMwvwRHKce45juVE/hhBUoxyS2cVB4LSv5Zasmm2XPM=; b=ryvVE0Dt7CaEZun4AcFCsoNMIf2EE9UVPC1o5NSpKHYgqjv10plMZNGTcGeqJON+D6GoR2 2c9dAUGGEJ5XSMDIwrWaQd3R4panYnsRxe/Z/eEU8RWHINzq/A9vNca8lq9eTV42Iz5wpH +uIqVnFhNVLslif4FpypM4iU8B4uAZEwJ9MchVe8rZepmOQfitOuBhBdOJ/VrGkuVoe70K LlpV7i9TAWinfHVHdzZ1xwoZVJR5wk8OdJmoDkxSrYO6pQW2iWJu9PiYis+DInDlxFf0ci 23T9hn2JiOf3II9EGvQIHx59rOxw2IPMga686/4ODVaQC0bZ/Qsp3SdO5IJL/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701429563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dMwvwRHKce45juVE/hhBUoxyS2cVB4LSv5Zasmm2XPM=; b=ajlL1QNzFxD74JjCldZtxN2mRwawjeShpSE/xZXYkT/dxZ7dZwXwYkuW4KWAjldZVS2+mv MZzuXlkh8Iov2eZ6yrgwx5zLsA8bP7JBhprnLq48iTqd2Af0Eoww4kxjjJMUMm5T/j1V0f OPjMcczzbfA3mcOz34EE9rxePE9Z7UK6RTK5fsnBRJs4YLFHotH1D8icz8F927dcXNM7Ac 4fUq3ey1DgEVflUlmrAzoxay0jrudiHAu7nmi4NVh4kjz3csGJmnKFlkg6+15tSxS3Awg/ J6LVty2nwGfpWT2oYLaU6Khet05NrLirR4A5/4oQVDtOZTy4Lm94jZPAKa5Ogg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701429563; a=rsa-sha256; cv=none; b=eIam7nbtZEuuSJlGRVDEWfCJhmnEQ0zivLeDpHAt9PRMO4aR2818dlTR3Ljihf+O6043lt dubWhB5fdF2CrhEHayTQJ1asCc3uuY64KBPSKlDwyRL8XNRLjGw6tu8g5gQtGEZMsbxAKM KBIeJfbgfp0xqU/ApW7xruMw+ValBa6MV8W1jsDGOdOID9/tmlksjvlPX9puZ1LLtypaTl +jbhSXT/PnyX7/cDONvgCYBBzBVAqpNRdkkPCt8JwoHZl0bR5YDd6yHzjpCmf5Bil+e3eF eZMBzbIFqhY20D6+WwhBsBxWg9sR5kPbGvh2fRXVV09wYs9M0R1bWVXkgfedfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShVvH2mX2zXCZ; Fri, 1 Dec 2023 11:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B1BJNub028102; Fri, 1 Dec 2023 11:19:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1BJNkC028099; Fri, 1 Dec 2023 11:19:23 GMT (envelope-from git) Date: Fri, 1 Dec 2023 11:19:23 GMT Message-Id: <202312011119.3B1BJNkC028099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: f0ff0ca25855 - stable/14 - tail.1: Lint with mandoc(1) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: f0ff0ca25855bb4256dbf837f625c3d6db3ac37c Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=f0ff0ca25855bb4256dbf837f625c3d6db3ac37c commit f0ff0ca25855bb4256dbf837f625c3d6db3ac37c Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-11-28 16:10:12 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-12-01 11:19:02 +0000 tail.1: Lint with mandoc(1) MFC after: 3 days Sponsored by: Klara, Inc. (cherry picked from commit 51c27021b2818cc626500d7723dc82291e3eecaa) --- 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 4c16c61ca314..810773b78d90 100644 --- a/usr.bin/tail/tail.1 +++ b/usr.bin/tail/tail.1 @@ -30,7 +30,7 @@ .\" .\" @(#)tail.1 8.1 (Berkeley) 6/6/93 .\" -.Dd July 12, 2022 +.Dd November 28, 2023 .Dt TAIL 1 .Os .Sh NAME @@ -115,7 +115,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 @@ -134,7 +134,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 Fri Dec 1 11:19:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShVvJ5K80z52TZW; Fri, 1 Dec 2023 11:19: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 4ShVvJ4HkGz4VyL; Fri, 1 Dec 2023 11:19:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701429564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hK9ldjL7Fb4czW/k8PB9EQYXRLTwkX6F0uJ9WsJrsfU=; b=uEzUF937pRaCawH8pTtobCgGIl9t+yZK/bqXlBxg3hj5c/RETkQVWrvw4uCZH8Cfs8VAkw u8t8q/nXhhxpsrGZ+XOull/aXNPC9XmyDp2pZ7uwdfD+/yhWrRT+h3VGErte/VJWPvILGR AUMJ9YS33LkDvrcSECLcTQCtEa0AWAJwuXzyRI+AL7lpL53m4OLSIeL6T93pH12Y8Z88LE vOReG0Fw0uOLOE6lI2HO/BIviwpru0MyNHNFlkTwt0geJFln5ZfLsbjwbE6UeKIINGfEU1 TdvvYWqZjXnaL010alZgybWS7XQpDhMm9qw2SIKpNL6YxKPmsdgFNcnOEm8/uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701429564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hK9ldjL7Fb4czW/k8PB9EQYXRLTwkX6F0uJ9WsJrsfU=; b=C6+vriXh+gkOSvMb6e9mHx0OqXc8w/bTyrX92L7DrhcUko6BWxqy7XmE30iJihJ7lniEfR JZT1tIFBdHLm9Kr2c6Vv8r1betsw9Qce8xfGJXNR6wriNeIbKQVd88pLqg/cOQ3PuKVQMY b6I4clblxS/WZCaCfPgRKiPTTRQ7Vg6IL0+eD69UUeqBfMhOfhiwmadAbiRKVHIvrxmXC4 RfVCYKAkNWy9jhORNpfHycm0MLE30MwoDSlnFmMy7CmHmnK1salEHla3rdm3/Eo2KRt6N6 0UNjw8zyw8NkvhJI/LQxoIzjFP8A4Dpsk+FqueemjTOkf9TTcjTbOWKSyXSrjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701429564; a=rsa-sha256; cv=none; b=t/ps0QmoWFYbs9Dv6hh+TIOu82wHmP2opOJjwdqOMX7yymBE5V4HepBplve8CQ981ytDdz nD1BT44neEVx9WFZMc/21/CWTBzHJTm8ph6GEWL/lW1hRQ6v1WRVfBIB+MmOFOvjcHTncA QojxL5CYCJ9p6bJwX56YySX7cLohzohbQnXBekei9nczO1Vk8WjxzpxUTscXl24mqEkYZ0 suTzzEPENr0GkntFM4CTw9MBirGOlg6BGOupwL5JBtn4hB8bWULW094HdZ6I8RWJhQ6ZBH s8o+u08I2K//RWBO/N1Imn26TZYGea5RrclcfTyF6iBrg8gyXaSu3jRA+Nq5DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShVvJ36KszX3R; Fri, 1 Dec 2023 11:19: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 3B1BJOa4028157; Fri, 1 Dec 2023 11:19:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1BJOTi028154; Fri, 1 Dec 2023 11:19:24 GMT (envelope-from git) Date: Fri, 1 Dec 2023 11:19:24 GMT Message-Id: <202312011119.3B1BJOTi028154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: b46a05cfa6a7 - stable/14 - tail.1: Add an example for +n 1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: b46a05cfa6a7194a63a0ef196c6914b3fd2109b6 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=b46a05cfa6a7194a63a0ef196c6914b3fd2109b6 commit b46a05cfa6a7194a63a0ef196c6914b3fd2109b6 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-11-28 16:52:11 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-12-01 11:19:04 +0000 tail.1: Add an example for +n 1 MFC after: 3 days Sponsored by: Klara, Inc. (cherry picked from commit 9f20787fe89e2a912a9e5dd2d3da56087722e8c2) --- 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 810773b78d90..a76f754b18b9 100644 --- a/usr.bin/tail/tail.1 +++ b/usr.bin/tail/tail.1 @@ -157,7 +157,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 @@ -167,6 +167,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 Fri Dec 1 11:20:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShVwn59HFz52Tfs; Fri, 1 Dec 2023 11:20: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 4ShVwn4T74z4WQF; Fri, 1 Dec 2023 11:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701429641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVkbSzwG66nwiIAN40uujqeoSbMSQZRgDca4WlBeeW4=; b=VTPsuc2WTtUJcBQ2XGooIlw7857L+guVBizfRt+gqJHwKSci8WwPTb5gAjLdHSEdKOfgJj bzGNbVfDjpcqeLqZdjEY51+YwbrzmKWYgiunVhidJbGxMUDC3PXF8GLA+AiVkC4ACJqFjE tQigRm19WEdcYMXhmwLhEztWm9W24x5/lv+EClz7x/wwMVDgx82DRccBvYFpkoCj7kus9Y 2KH5p8JICgy2O/wKhLaBpNJSsDeTygwr50TkXb2cgp24YYCNf+uWyDm8sIzHPLWH3sjwBE mMtqnxDxPBp5Ls1K7xiumvEFXxdU8hWhV8AKZ4DZ85jaN8GQpi1jb2Qte9UM6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701429641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVkbSzwG66nwiIAN40uujqeoSbMSQZRgDca4WlBeeW4=; b=sZY3BqpSFi9dV3XBIvmsIUwUTkVXoHTsiKqYWrQmORViZhkxAHuOz91SXmAjCPmXS+ZUeP Hl6+ozbZ+RKBlU0hYAQey7cCKv4rx02vhTxoUeLvYgfo6EAWj3p7Lzen/YzfUcD/l9Clgy JiKJVBJVRxPofrRm3s2++PSVz0CYGHzHfM1p5Nk0GwnUL8pCyzjmuJ/VSmeou+BQyz/+4A dXvs+CZ4qJTtDB3mklDn863dAq+dcFzbtY47GqqJHRN1pTfmL5yi1Q/NmiMFUADO/AQKnt xrv9/emwxnPOI3xKtUIPZdHLh3+EMfqIIMWkfeXL2dYiPBi+0lMLmzBlJ+fG/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701429641; a=rsa-sha256; cv=none; b=DQyCwT1Xdf0/ufgoIxL4LDtgzuYSNBNfx06vWMFfTH4nfXQFmhdNOTtg/PKAM1OUiecBIZ MSewR4wVAt5kZ36x258jE+3gmnNKOu9wwxteOF6P1SRQAxXTE3gi6AtrNWzCguHqAN/WQb wGRymbc70wa56cJvz3/wohNJ1/s6wnKoUIqukWs5Jw53H8/u+SbP/7Byeuj+rb4ldt/gaJ 6vBfLaPnWSG2UwGPMiWV5Xt/Y4OuvcuYRV7UM8O2ac4pqYlzHxRAKfqnyFzfcL5vwZ0IB/ FORzoc+tB6pLZ736Ld2tRHNiNBFoxQyciGGW5ToTNenV4WeKJ4w6ymjsFRiKaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShVwn3WW3zX6X; Fri, 1 Dec 2023 11:20: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 3B1BKfVK036954; Fri, 1 Dec 2023 11:20:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1BKfuU036951; Fri, 1 Dec 2023 11:20:41 GMT (envelope-from git) Date: Fri, 1 Dec 2023 11:20:41 GMT Message-Id: <202312011120.3B1BKfuU036951@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 29cdffb68a58 - stable/13 - tail.1: Add an example for +n 1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 29cdffb68a5845ec597742c8b2238b9ff1643867 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=29cdffb68a5845ec597742c8b2238b9ff1643867 commit 29cdffb68a5845ec597742c8b2238b9ff1643867 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-11-28 16:52:11 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-12-01 11:20:25 +0000 tail.1: Add an example for +n 1 MFC after: 3 days Sponsored by: Klara, Inc. (cherry picked from commit 9f20787fe89e2a912a9e5dd2d3da56087722e8c2) --- 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 25fa26655ac0..19c4046b6683 100644 --- a/usr.bin/tail/tail.1 +++ b/usr.bin/tail/tail.1 @@ -147,7 +147,7 @@ flag is specified. .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 @@ -157,6 +157,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 Fri Dec 1 11:21:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShVxG2hSmz52T98 for ; Fri, 1 Dec 2023 11:21: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 4ShVxG1t2tz4Wm3; Fri, 1 Dec 2023 11:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701429666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NJ01nO7Sd8c+zzgEuy+7+JVlF71VYhOh5JvN76Dl0Oc=; b=VKccLNPWAvsRdPUQ55vLJPb/KPTqKt6V8kyNoQ5nPEJl0SAgrhPMF3XtH+/tw2dPz+i+At j9JeCErojV6HPjDDSRgAJQR6FvsPfFSuPXrwwkQn6vsaX4rOQrt4ntq7xza2gjFKHoe+ua ZmnDQaOuyrkQuIcTpfglCPcQV6sx075q5ODdp/DvYc8ukXSVn2k9TTQVJasCho+CdEVe6s D0UC3TlmIh85KJAW4rGp4QbMtAgHyHrqZQPrOGLBlVkCSPR8ZJp3EjnYNVc3Zdk4eccyfp BAZmaa1wuaRvBokGd+8CHTiKsAA+07T/zJqJtr2GJUqJxYaGSvtMW9UdVB/V1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701429666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NJ01nO7Sd8c+zzgEuy+7+JVlF71VYhOh5JvN76Dl0Oc=; b=Cle8giDY40HyAvYnFacUhUYowZEIAZtNtEdUcvGaVol6IEx44z1PWlai/5aNNtNau0DgM0 wdGS0Od0sOHWyxWMoNriZ47JP5/rJnDit7cw2mjPEjo6dV2pguFvaNoRLJzE62SIoqDjtN 5gr+sUx1DHYvIRdtry2z0jFjfNZjloR8Zx+JnUUFHADqEA5Zz6y6Ozc6B7EqlCwdvxHIge YWFE7H4Ttz2KVE4TXDe5LMPXWesr4Cwygto5cFwx8DyQbXOlEIgSJ/MaOTi50g+GKomeOK cY4r9m/Kwoisc+gzdVZtiZMDiqT7zaB+Lk16hc6bxnIKvII25JFhXSsMlxBiDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701429666; a=rsa-sha256; cv=none; b=BFPo3NZsvC15gMGhUe7bYd8oNdhVSGM+jIF/8XrUZ2wa5Ebp7AmdM7tu+SMqaedFit0ScM EqXeUP40O1fIjKvCHWT8H3youjz8srKvFHl6+26XmJQHzKY2X7KnuHfPOGN7dBaOjX8UKe zrwibYD0pmdsLEkiWt7/uoKYRtKho3o7+i1kNUBEPiXyF2yzik2jxgVUlhMWK0GYkZWYER zzqgl0Us+aISc8jw46IhAtKpoZPhEcqT60mU3ljd2zZwYiuSG6tLCN24UYxzwtkKMzSWQx auy3yyc4AsGutD2UHhQORlvVSCB1WJsuhl1LpYPTKGtHziDgtINfnUL8cXGB0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShVxG0wk3zWyj; Fri, 1 Dec 2023 11:21: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 3B1BL6gW038057; Fri, 1 Dec 2023 11:21:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1BL6kb038056; Fri, 1 Dec 2023 11:21:06 GMT (envelope-from git) Date: Fri, 1 Dec 2023 11:21:06 GMT Message-Id: <202312011121.3B1BL6kb038056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 55dd24c4ccee..494aaaed89cb - vendor/openzfs/zfs-2.2-release - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/zfs-2.2-release X-Git-Reftype: branch X-Git-Commit: 494aaaed89cb9fe9f2da3b6c6f465a4bc9f6a7e1 X-Git-Oldrev: 55dd24c4ccee2da61d5396289ef560f9b7bc6a68 X-Git-Newrev: 494aaaed89cb9fe9f2da3b6c6f465a4bc9f6a7e1 Auto-Submitted: auto-generated The branch vendor/openzfs/zfs-2.2-release has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=55dd24c4ccee..494aaaed89cb 89fcb8c6f969 Revert "Tune zio buffer caches and their alignments" 9b9b09f452a4 dnode_is_dirty: check dnode and its data for dirtiness 56a2a0981ed7 ZIL: Do not encrypt block pointers in lr_clone_range_t 41c4599cba75 ZTS: Fix zfs_load-key failures on F39 d702f86eaf5a brt: lift internal definitions into _impl header e96675a7b131 zdb: show BRT statistics and dump its contents e4985bf5a158 zdb: Fix zdb '-O|-r' options with -e/exported zpool 2a953e0ac928 dmu_buf_will_clone: fix race in transition back to NOFILL 349fb77f1167 FreeBSD: Fix the build on FreeBSD 12 3b267e72de6f zfs-dkms: fix shell-init error message d813aa85309a Linux 6.6 compat: fix configure error with clang (#15558) eb34de04d78b zdb: fix printf() length for uint64_t devid a8c256046b04 ZIL: Call brt_pending_add() replaying TX_CLONE_RANGE 522414da3b28 FreeBSD: Fix ZFS so that snapshots under .zfs/snapshot are NFS visible 494aaaed89cb Tag zfs-2.2.2 From nobody Fri Dec 1 13:27:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShYl4629bz52cp3; Fri, 1 Dec 2023 13:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ShYl45c0kz3GC1; Fri, 1 Dec 2023 13:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701437248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tNarWkO4Ge1HzYJ1tJxZvUmVv2De4mozuYG99MDh3rs=; b=ozM3JiDmvhVr8Xukiv4dVCDJUYtbkHq8OsOjixUFj0KYUuVxSzQQVKpYtItim+kwDSpXrh 2zBQGzE3trzVEJ6F2HV5T1vLeGLLpiSXIwyj4bb6UEnb4CWEE7n6zP2PFcJTNTx8bLf8VX +JW5KFoUviPqQEzqfIOTL7isT4I1VVpznTPtEYkC6L5AO/tFZ0X/iPz+meU5oNdR2swlV5 /JCZqfkrM3DtyH9DkZtHnzltcwviVlvyyCRvrCOlJFPEgAXkeFE85wnx2mgra8mjPBbKsc tEr0F3G/ez+PONDqd9K/eqmqGmPx5U1ODsPWSqwdsmKnfcBtP6ZpLjgu4o54XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701437248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tNarWkO4Ge1HzYJ1tJxZvUmVv2De4mozuYG99MDh3rs=; b=Jj+gKU6ELwClxTVec7vH5jS/jT8eQCSLcRY+igwI05PT2zB5VkMisyUmuTvHY56ioewSbV tX1chwTIVZ0Al/HEzu87RotChOhq94xobDJslTTob4ZXrvCBv5BOsfIonJMBcIbn3bFZ/n 6VH79gONb8vtsHvqhEKybfaOekj57+iThwdrgshk9QYqcfNMqUsnJ63vBFocYNSXuAB/3T mShEDWqR1shF+QsVQh1E9aSFO8tIxtYSg6/fiIBUDvanfeYfhaIygrQQoijuuD2i01S17b U7eTjZvajbX4vQG6wLtP3DxAfjwCIGQNIv7VpyVjnoBaycoFfRoYndQ+NZv1PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701437248; a=rsa-sha256; cv=none; b=TMo5gQxnuyzxsgfVjPwgc+PdhJRb5XklxYtRaQhZJnhpMw4jEo8gLyzxxadMz5Q/4karmV RLClg7qXBiIgWIshiaXKan78zdb7ce9CWH6u8KMLyiBn7i4OWArXMlAHtx+6DJM2OoP1DW kPERJUhZjn1eAKUPwQqOOoiNZ21TEs/tC9yGirZ08hQl4SD6UBM4zWjRq54gO7BsNOC3/B Q9LNMXniO1J1d0AjwrmUZXR0Dzs75coDveRLKScxd4nqBskFycoQvilOQyjRqiIG8ELzBe GRTgyH095Plf9WB4EeYj1HLfx+JLIMQQ88Id1AJNPjFdCMMV4e+l4usPbdMeQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShYl44XfnzZqX; Fri, 1 Dec 2023 13:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B1DRSLn045222; Fri, 1 Dec 2023 13:27:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1DRSDh045219; Fri, 1 Dec 2023 13:27:28 GMT (envelope-from git) Date: Fri, 1 Dec 2023 13:27:28 GMT Message-Id: <202312011327.3B1DRSDh045219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 62304a0c3b8b - stable/14 - zfs: merge openzfs/zfs@494aaaed8 (zfs-2.2-release) into stable/14 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 62304a0c3b8b241441d134e7174b89d3bed87c5a Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=62304a0c3b8b241441d134e7174b89d3bed87c5a commit 62304a0c3b8b241441d134e7174b89d3bed87c5a Merge: b46a05cfa6a7 494aaaed89cb Author: Martin Matuska AuthorDate: 2023-12-01 11:23:10 +0000 Commit: Martin Matuska CommitDate: 2023-12-01 11:31:24 +0000 zfs: merge openzfs/zfs@494aaaed8 (zfs-2.2-release) into stable/14 OpenZFS release 2.2.2 Notable upstream pull request merges: #15532 e4985bf5a zdb: Fix zdb '-O|-r' options with -e/exported zpool #15533 89fcb8c6f Revert "Tune zio buffer caches and their alignments" #15541 d702f86ea brt: lift internal definitions into _impl header #15543 56a2a0981 ZIL: Do not encrypt block pointers in lr_clone_range_t #15551 349fb77f1 FreeBSD: Fix the build on FreeBSD 12 #15563 522414da3 FreeBSD: Fix ZFS so that snapshots under .zfs/snapshot are NFS visible #15566 2a953e0ac dmu_buf_will_clone: fix race in transition back to NOFILL #15571 9b9b09f45 dnode_is_dirty: check dnode and its data for dirtiness #15603 a8c256046 ZIL: Call brt_pending_add() replaying TX_CLONE_RANGE Obtained from: OpenZFS OpenZFS commit: 494aaaed89cb9fe9f2da3b6c6f465a4bc9f6a7e1 OpenZFS tag: zfs-2.2.2 sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/README.md | 2 +- sys/contrib/openzfs/cmd/zdb/zdb.c | 129 +++++++++++-- sys/contrib/openzfs/config/kernel-inode-times.m4 | 2 +- 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/include/sys/dmu.h | 3 +- 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 + sys/contrib/openzfs/module/zfs/brt.c | 178 +----------------- sys/contrib/openzfs/module/zfs/dmu.c | 6 +- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 4 +- sys/contrib/openzfs/module/zfs/zio.c | 89 +++++---- 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 | 6 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 24 files changed, 432 insertions(+), 257 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/modules/zfs/zfs_config.h index 02f5116f3eb3,000000000000..8fc8a9541740 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 */ + *** 285 LINES SKIPPED *** From nobody Fri Dec 1 14:36:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShbGv0t2Hz52h1H; Fri, 1 Dec 2023 14:36: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 4ShbGv0R0zz3Kyj; Fri, 1 Dec 2023 14:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701441399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rt0KLxrlZT1w3qWB2I1StmW+Dpppcizwb93S57Lv6/4=; b=U+hJR31gezhuWdDu6hO4JdrLnVEkQvBGeheUxPMSEd4nj4JAZJm4CrrzS9h/0PJ2kavZhd Bl8RzEL9npadv8bXrZ8AkiSCcaHNfjTkGJJEtW1nDJGVQ1hUeKoOOx6F4u4oUD9v8Buj7X z08fNICcP06+7TPbOdtq45cueEBUerk1sFVpPpR1OCVInu/qNMguzhXAhxckV1pvVdTiwE Pgaie06SnEFNN/r5EXIWcBbouasXPsmKXrZ8Hr7IqSTYcjbGHOAuQo5OQSDz6+hme2E8KF Np5mnvgpJtRymvVpGOJ/n0EkKQGiYdWAW+Io4lJj5BZBfJ56p1psOtpsWxEVHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701441399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rt0KLxrlZT1w3qWB2I1StmW+Dpppcizwb93S57Lv6/4=; b=vH9SwQ5jyP7siOHotNgz3yl3A5+qsmAQljDuaO0mVOpSjM4MLGYzXYtdCMpDLnJPypyHdl LST8QfLxjN1TSO0QFEwv/2xQG3bU/dIzgI6OCXa8nnPTGyMrZ3mCBXJRxzEzRWFeAwwCmH MZNd5uUry1CIaLGBBj+BI88f7BRdxejyVPuu75ZYXIhYeqjfNHuSpoLBiCZkZ12QDgMBxN HfB1O7ycinD1lzZ0277kF/BQoAnazIkswLcPFl/CqjBTSxZC/tk5lxu2oPNJu9qXdVZcLe 3uv6ZceKS/t1o4RWqss2+elJSWsMJXJoy0OAi6j/FhQ1Af7fjLCgjmAWo/kOtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701441399; a=rsa-sha256; cv=none; b=nPxBvovd8pgrtWHFzx5WvAkuTxmePNZHQl59876/v6IDPmUHuaWNy0LPUS6ZGBabX9yosD g+q7H4PU2P0FjlQschySknj9vh5YaFmIKMzYN2C/v7mfE45RwicOfCvHvF6EINbuqrGeP8 KFywX2CT6vDvnC0L6pifQOMMeP8Y+Rf23Zgj5Kvqrd1KBQ1mE58GfTVVLNtKVhslMrmvlK dDIslNoN7FncLNvbSwxuKkNq4EIB4hZjPlSCPk2iUZrXMase76A3Mn2xF+Yp0YWk0wcFFJ /IVa08ast2r7hUX0hYE3RtuOYIgxHVbKacf9UdLCxit/IgmNRvVwvFSgTI1SXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShbGt6c50zd1w; Fri, 1 Dec 2023 14:36: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 3B1Eac5Y061422; Fri, 1 Dec 2023 14:36:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1Eac5U061419; Fri, 1 Dec 2023 14:36:38 GMT (envelope-from git) Date: Fri, 1 Dec 2023 14:36:38 GMT Message-Id: <202312011436.3B1Eac5U061419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 24cd42aeb623 - stable/14 - ossl: Fix handling of separate AAD buffers in ossl_aes_gcm() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 24cd42aeb6232b4678f45dc6d242e8982dbea8e6 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=24cd42aeb6232b4678f45dc6d242e8982dbea8e6 commit 24cd42aeb6232b4678f45dc6d242e8982dbea8e6 Author: Mark Johnston AuthorDate: 2023-11-28 19:35:49 +0000 Commit: Mark Johnston CommitDate: 2023-12-01 14:36:27 +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 (cherry picked from commit 87826c87c63b2995cb69e9c1a624c7e20dd70fcd) --- 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 84d694a7199f..40162b6943df 100644 --- a/sys/crypto/openssl/ossl_aes.c +++ b/sys/crypto/openssl/ossl_aes.c @@ -199,14 +199,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 Fri Dec 1 15:01:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 19:24:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShjgD43pCz530Fb for ; Fri, 1 Dec 2023 19: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 4ShjgD3QLWz4JkN; Fri, 1 Dec 2023 19: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=1701458680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2QlAGsjU4GeiHdNcRVR16qogv4S7lEX0rWXRmArcv1o=; b=DoUSdgUySI1HYkZ7m26oqztK/vUXjIfevE9aZhMF77PVFCwcgXuFKrbIy9jl2wY+LKe/Fb 4sdqxtNaFmQKB1maUsgVEHQo5pXfgJQsVEgr9BOEJ2rWy4wQu1ZJQKy3CLg0sB3Dq+2Epj iPdAMJ9ymDoNyZWAaqHCCRsHkyDsUgW+NWJB5eSDD2IprpfN3K/jTln9UrMB3d8ZsiRcVq GCfXrMtu7A6BJ+ZqC0COGaRU3uSrIUUkQDKs+H+YHFEuPf8zG1T834BPT6frFhRU2K504n 1h2+PIHzQmMYQWrbVF879clHtS2pqaQS1q85s+ZGLkEReiaG3oc+VOunclzuow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701458680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2QlAGsjU4GeiHdNcRVR16qogv4S7lEX0rWXRmArcv1o=; b=PEfoKIgZ8XJftCiR92Nno5U0w7LBleBQ4tUVECvgJ8wcWQtwP7/fyh+DR/WPXXKQPZkA0A +TotHHmZCC9rLZUztLEENz/Z9NuKMQSw2ubSVjmS0VfamKacIebE659TXRWUJi7f8u0FD2 2FLTI6obK2k1pGgYAQcl8MEnOrrEB17PMr4NJr1pXdaoXNlKAW45q9PJJBUNP0iOvNQLvL ybZWOuLzK8oAjbMqWXXXR6y4o4XZK4r/teSf7DXeN80+IG7AQvJ40wapqo8Yf++/I5Y5L2 r3r3naSyEhe+Jb05H8FnjtpGLnc+ujZKP1+A0EIJP9Xwwdus0JAmlKUV5h1fcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701458680; a=rsa-sha256; cv=none; b=E8M9pSoKcpI7qbPsFhzvpxw5wy1CfiDaQCznJGGVoT3Vvs8LiqIJtiuhlBriSrzKRWn1gq GZGMq9DssaBGdxxC9Z6xDuPJWMWDf2m6Ud5TXogp6Tqj/Zxo0+Vj4cR2Cy7kFHNO63aqVj A/Nmh36MZ6cWtnNv3JRoBAfAoGe8aWPGI0aD1QA+MD4Yfw7ATqNDNV3o8Vt67v86JpKxVn lkoa3FoluJoCVaamw1Af4PXi83wQaTgYFMRxrNIqhcH3DoDeSBPKz8QmfjiVFZKUmW+Eds 29RtxNIoJMtwXdXN4573kaQnpxCYwO5HnZwvWEy/Dk3uhM/CJda2rZQJtpdj3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShjgD2NDhzm2r; Fri, 1 Dec 2023 19:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B1JOeaV046426; Fri, 1 Dec 2023 19:24:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1JOeEr046423; Fri, 1 Dec 2023 19:24:40 GMT (envelope-from git) Date: Fri, 1 Dec 2023 19:24:40 GMT Message-Id: <202312011924.3B1JOeEr046423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: John Baldwin Subject: git: 86a7d9432819 - internal/admin - mentors: Trim stale entries for reaped commit bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: 86a7d9432819e73defe9fdbc42da0a87d162983e Auto-Submitted: auto-generated The branch internal/admin has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=86a7d9432819e73defe9fdbc42da0a87d162983e commit 86a7d9432819e73defe9fdbc42da0a87d162983e Author: John Baldwin AuthorDate: 2023-12-01 19:21:25 +0000 Commit: John Baldwin CommitDate: 2023-12-01 19:22:54 +0000 mentors: Trim stale entries for reaped commit bits Approved by: core (implicit) --- mentors | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mentors b/mentors index ef088a260558..c0e729429b62 100644 --- a/mentors +++ b/mentors @@ -12,24 +12,16 @@ # Mentee Mentor Optional comment afedorov vmaffione Co-mentor: jhb akiyano cperciva -anish jhb brd allanjude Co-mentor: bapt bryanv grehan def oshogbo dsl bz gordon delphij Co-mentor: emaste -jceel trasz jfree imp Co-mentor: markj -jkh rwatson -kadesai ken Co-mentor: scottl, ambrisko -mjoras rstone -nick philip Co-mentor: kp oh manu pjd allanjude Co-mentor: oshogbo -rajeshasp gallatin Co-mentor: vmaffione ram ken Co-mentor: mav rcm kp -sam emaste ssaxena imp theraven markj wosch cem From nobody Fri Dec 1 19:24:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShjgF4Tq3z530Wl for ; Fri, 1 Dec 2023 19: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 4ShjgF42wvz4Jh8; Fri, 1 Dec 2023 19: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=1701458681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q8PcPrSDuWm/pnkIQBtETtckYIRGlRx0QpoTtxrvliQ=; b=XZi7lz/ioBguBs7ghInqmMpYh2gTyQ5Q+ec7Wh/3xmKMm24fQO142i9yREF/H4+H26p4Jt CWlT/4vnEH5iiheBt1auh+OoOLUPqWw4+DzeTO5X1SoCiFKOm5WjWF+gqmuy5dQ/HAoFYj PGbRM1tL7VEKsX43jdtbYdzVoz1SDp7fmgNOUPbrYBmPE3sNRA2BPBML12x3+OLIjSaR7s 05hH9i0kAxg8mmnOJCckpqt27GT39rj71VEAMnTH1Sdtp1exeGQp5s64DJU07Lbp2YXRQH 0eZuh+6M/didpF25R53s9sFEUdncgr1yLY2bDFOZGT52/UxXpEQD1RqDfhOjpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701458681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q8PcPrSDuWm/pnkIQBtETtckYIRGlRx0QpoTtxrvliQ=; b=o8PqwEisNJitaN5zEbm4d9HM/tBW0bH9FSNK8SqirNIasz4kLtpAYHtIM9iUai2osuHGKw 9UBoFp2ZrQUJkGr7l4ojxpii9c9GepoJS467VO6WrykFlhfQy4ahybqC3HX/LAjyUezXaS HJdckiQv+Pma08xmqH7JLF2EpwbHO6NoDdQos9cOKlXXWx/Q6zqFagsbGPiPwHu2lGjg72 hC7I4W9UTt5gnMzIYIxKaqS7PTCAI2YLvAgFetq2p4Ey/Gwz6ctdt2V4xO0PXY2lriuhc6 CZcTy8ebdtQrFPW+Ofo46aXP1qxRBGSPht8mVrAcCTtF63PcqSyQqiHDM8XddQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701458681; a=rsa-sha256; cv=none; b=g65U8aufy6fhpADLOZ2T3jbq+tcxNUoDSV/+K98VV7o6dDB59ezmlfEpKS09Gy9cip7LnH dn1Ux2/ZWE0aUR7BJXY8ox3068ZWv55iAkbmgWThiZ5zgXepRHlX8RBexfCnns0XrrpYjW pLEzlEmgAKgwWVcF9OFFz9eITwDzdF3psypUrUzzXhWD0slGZyWfJpH8PPOnFnloledUaU x9JUoa30x8e+xH4bbW6TYyNsp7bCY8TdnmVs9xLfp+0DuLHkecC7HNNO7TuBK90MP9AQWt RTjNMfL/97jA8puUQNxESZF82PDPHY5z6yF9P6vdhb7b4Ln2+J0sbGcP2slAUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShjgF36WwzlRP; Fri, 1 Dec 2023 19: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 3B1JOfUC046471; Fri, 1 Dec 2023 19: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 3B1JOfHk046468; Fri, 1 Dec 2023 19:24:41 GMT (envelope-from git) Date: Fri, 1 Dec 2023 19:24:41 GMT Message-Id: <202312011924.3B1JOfHk046468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: John Baldwin Subject: git: 862231bc18e8 - internal/admin - Trim a couple of $FreeBSD$ stragglers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: 862231bc18e8c4f3ef6e42d7fa7fdb978337a225 Auto-Submitted: auto-generated The branch internal/admin has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=862231bc18e8c4f3ef6e42d7fa7fdb978337a225 commit 862231bc18e8c4f3ef6e42d7fa7fdb978337a225 Author: John Baldwin AuthorDate: 2023-12-01 19:24:01 +0000 Commit: John Baldwin CommitDate: 2023-12-01 19:24:01 +0000 Trim a couple of $FreeBSD$ stragglers Approved by: core (implicit) --- access.doc | 2 -- mentors | 2 -- 2 files changed, 4 deletions(-) diff --git a/access.doc b/access.doc index 16aaaaa4a174..d155709923b6 100644 --- a/access.doc +++ b/access.doc @@ -1,5 +1,3 @@ -# $FreeBSD$ -# # This is for folks who are doc committers, but who work on docs in # the src/ tree as well. # diff --git a/mentors b/mentors index c0e729429b62..694046ed0e88 100644 --- a/mentors +++ b/mentors @@ -1,5 +1,3 @@ -# $FreeBSD$ - # A list of current mentee login names and their mentors. This list is not # used for anything, but serves as a place to commit to in order to # "release" a mentee from mentorship since svn cannot do forced commits. From nobody Fri Dec 1 19:30:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shjp62994z530TR for ; Fri, 1 Dec 2023 19:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Shjp61h9jz4L62; Fri, 1 Dec 2023 19:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701459038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tdbtpk7mIbUlchWLF0Jj9zamHDj5QFm3ADw30I9jJjY=; b=f55KUrJcYJ04zo5vJ3eeayz9I3Xu+5Z9/u1qUhWXvjHqQ2i409aJIpgirLcQ/Dns4OVGbL ZKEskYA/Ix7FweoX8X0A+zfLVXZFfivlTk+wca+qmpk4b96GVUjdMXCb3HckIrMyNdiZie /fF1t+Llut6+NCtp+nnRS6ROFo5gvsZT7d8PDv5XTeW8ohOsFADkmb0Vmpvjrg4rPNUwMa 6WqKFk+6cUDH8XptYs4o31r1kwn1kmuj5WIGvVtIEYjoZtxnxryjZIiaZOA+9+jBEgLIrr l5cFaGwrExOlqbr//daP89vSdyEGd5k8qNs5/uMihhAaX2JoX+E+omYqDOQObA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701459038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tdbtpk7mIbUlchWLF0Jj9zamHDj5QFm3ADw30I9jJjY=; b=DdELhyopp5s8ZqpfV6x9iLSCgE+kVV7R21p4kiNPh32pXOx7eXHXNGBEigDK5G4kNwIzmL P3m7Vr2U6tQv33u8G5LxKaqxXKsy00SWyfPUN3srQT+S2+Muv0h0SJWUhVOycIgCTPKS7N N5fY57HCspGWFsvegESTILe//Oa5cLmaDtrbZsI8rDFGqGmbSfA+yr5ZSNpqfFWEcDdxFt JnNyBWDdgQq673QASzhV/97F5mEC2kor10LbIF1VkDWtekLgrOIrT7Cb6U93OL2NZaGiNA ROBgSz81B73+R7XpnAU6UhaR0rwlAWy3K4MqrZrjNZmH+7ujcokULEwF5ZlBKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701459038; a=rsa-sha256; cv=none; b=qQmzqglmE4RUH7kbuP6tfHqYnvw9Dx4jkqxcQjIjKPQFKaD4w5MV90X9UZOfyIKVBLy+Kc UHDxyYjLj9nDhqCrLC1R9WU7AjubtdZzqhFvqyegyJ4zbCGlOoJr3HwtPrJ3pR56bHac4G 1rGtbyztoaHau+KX4z19aL5kDa8LukXgn5Tda5ZwvY21grEDIU3z9tYOGRvjMCYjU8tuc/ BLfwV3rVKqjqfcTGEU2jjG9gRg/GRm+6jsl6eh+puuQ4hrzwDPf23xpWqxS8PMcpQI11+w M827y8dqlgAiaUXJH/0Fzp8H+x6bHObRSXJlzeNbQgBuFOcHBdV2h8BLxBkvZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shjp60mHyzlsc; Fri, 1 Dec 2023 19:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B1JUcZA055863; Fri, 1 Dec 2023 19:30:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1JUcTM055860; Fri, 1 Dec 2023 19:30:38 GMT (envelope-from git) Date: Fri, 1 Dec 2023 19:30:38 GMT Message-Id: <202312011930.3B1JUcTM055860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: John Baldwin Subject: git: 672ee20c3ac5 - internal/admin - Take gjb's commit bit in for safekeeping at his request List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: 672ee20c3ac50a9653eea04b46959e73cc884fd8 Auto-Submitted: auto-generated The branch internal/admin has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=672ee20c3ac50a9653eea04b46959e73cc884fd8 commit 672ee20c3ac50a9653eea04b46959e73cc884fd8 Author: John Baldwin AuthorDate: 2023-12-01 19:30:00 +0000 Commit: John Baldwin CommitDate: 2023-12-01 19:30:00 +0000 Take gjb's commit bit in for safekeeping at his request Approved by: core (implicit) --- access | 1 - 1 file changed, 1 deletion(-) diff --git a/access b/access index 4a239636673e..a96a59cdc895 100644 --- a/access +++ b/access @@ -66,7 +66,6 @@ fsu gad gallatin ganbold -gjb glebius gnn gordon From nobody Fri Dec 1 20:01:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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:17:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shm9W1YNCz53CXD; Fri, 1 Dec 2023 21:17: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 4Shm9W0Tdtz4Y8K; Fri, 1 Dec 2023 21:17:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701465455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HAEaYsYM+H/YZW91w8JObKYz48D65e3Aox7T4a7J6+Y=; b=JJ5HYzJHJ2QMnw8Wnc7GsayAS+LvTfjZVBOPHS4mP7yaCxevnjRlha+KeEatNB5sCH3cEN bdz01KztXfbjr7heRjnJok4bjP5cvO0lWAxJ6Fpl24zmg1hrScgZ/JuAts/WWHuYO7iJ9S rMk4whXxLho6byd1/sfiQep31OyYVlecbELojR8A0DIQRKpf3EyY0Pt0a65YUKuIHkAdvb ZM7NIJiwVNng+esiIdAJKAHJEbLRpS3G8pQSQG7Y5AXF3k4w18yx8s3g6H1VT2u4O9qH98 p4l75EmbOWj/CGV7jZwS++qAso1ds8v/epRDM9P+suSWareMe5EObBVsibwk6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701465455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HAEaYsYM+H/YZW91w8JObKYz48D65e3Aox7T4a7J6+Y=; b=TAgDs1ww62iwWYVD0dbGH55hdWcMBmfGzSXHAVxa3FJE2dEeH6TRs1fOBxbxjlEZgbWTrX 7jU+/XDYl/7a0g4qquJOMh/H/7OC11y42i/pXjOSd9UwHVpJ84Fsj7dbSMODKdcOWix3ee jCm7EaLCdwsS+L1dztgDYsDxHYEcW9r8XqDpExGqcSyCHDld8pZViFw7G2wYbzwqC7Pd58 hjvcNJjxhncxzNn/fgBNaB4AldOJ63zH17TRjc2cVrNnSnqYxzvDbj8ZPZEW5LFuVnNio/ /IB8pPy6HFIRBcSDBTYB/KsR3LVX5B28WwdNM7ouJ/snbZsaRweNcwEqg5UrGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701465455; a=rsa-sha256; cv=none; b=mK6dKCU0WkAG85wjxiGaoC1tW9vETc/N4tuSmt6NVJlb+7qCo/0R70nQRAfKhOyBvFLQ+Y 5H+WUuFAO+NVgtQ+YDARF6AlBKJ1OmwDzOyHs8UOr8ItnafbQZ81GA6W6zDanCPDxblldv hIU0k8r2zIlsBAiZOdi3yx/UpqDOpdh7KY/Ze98GZCES+20FLnaXT28slroVjcy8NQR3EV 5xrD6V1uzKKM04a0OpmMq+KM8gyEpUlOH3sJR1xeDVn5YChgJw8Fjp/sHzGvNAGC3ZibGn yyONBWZUXu8eP8iTz64UFdo/inS6TT0PIVVAq1+Tf5K3YoxKY24Fq5vHpXnlZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shm9V6g76zpgS; Fri, 1 Dec 2023 21: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 3B1LHYLl031842; Fri, 1 Dec 2023 21: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 3B1LHY8q031839; Fri, 1 Dec 2023 21:17:34 GMT (envelope-from git) Date: Fri, 1 Dec 2023 21:17:34 GMT Message-Id: <202312012117.3B1LHY8q031839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: c7d8a572acb2 - stable/12 - libc/libc/rpc: refactor some global variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c7d8a572acb2bcdf824a75af3e97b24e36463a34 Auto-Submitted: auto-generated The branch stable/12 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=c7d8a572acb2bcdf824a75af3e97b24e36463a34 commit c7d8a572acb2bcdf824a75af3e97b24e36463a34 Author: Alan Somers AuthorDate: 2023-11-09 22:58:56 +0000 Commit: Alan Somers CommitDate: 2023-12-01 21:15:45 +0000 libc/libc/rpc: refactor some global variables * Combine dg_fd_locks and dg_cv into one array. * Similarly for vc_fd_locks and vc_cv * Turn some macros into inline functions This is a mostly cosmetic change to make refactoring these strutures in a future commit easier. Sponsored by: Axcient Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42597 (cherry picked from commit a5c2f4e939430f0048136c39fb9fa6093d401905) lib/libc/rpc: switch the per-fd structs in clnt_{dg,vc}.c to RB Trees This saves oodles of memory, especially when "ulimit -n" is large. It also prevents a buffer overflow if getrlimit should fail. Also replace per-fd condvars with mutexes to simplify the code. PR: 274968 Sponsored by: Axcient Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42597 (cherry picked from commit 24938f9311c9c9acc1ce747f4e6a088c2dbc967d) --- include/rpc/rpc_com.h | 1 - lib/libc/rpc/clnt_dg.c | 170 +++++++++++++++++++++--------------------- lib/libc/rpc/clnt_vc.c | 179 ++++++++++++++++++++++----------------------- lib/libc/rpc/rpc_com.h | 1 - lib/libc/rpc/rpc_generic.c | 23 ------ sys/rpc/rpc_com.h | 1 - 6 files changed, 168 insertions(+), 207 deletions(-) diff --git a/include/rpc/rpc_com.h b/include/rpc/rpc_com.h index dd331e2601f6..a1f51171c314 100644 --- a/include/rpc/rpc_com.h +++ b/include/rpc/rpc_com.h @@ -59,7 +59,6 @@ __BEGIN_DECLS extern u_int __rpc_get_a_size(int); -extern int __rpc_dtbsize(void); extern int _rpc_dtablesize(void); extern struct netconfig * __rpcgettp(int); extern int __rpc_get_default_domain(char **); diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c index 26bf34633623..006ba3009d97 100644 --- a/lib/libc/rpc/clnt_dg.c +++ b/lib/libc/rpc/clnt_dg.c @@ -51,13 +51,17 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include +#include #include +#include #include #include #include +#include #include #include #include "un-namespace.h" @@ -92,28 +96,65 @@ static void clnt_dg_destroy(CLIENT *); * This machinery implements per-fd locks for MT-safety. It is not * sufficient to do per-CLIENT handle locks for MT-safety because a * user may create more than one CLIENT handle with the same fd behind - * it. Therefore, we allocate an array of flags (dg_fd_locks), protected - * by the clnt_fd_lock mutex, and an array (dg_cv) of condition variables - * similarly protected. Dg_fd_lock[fd] == 1 => a call is active on some - * CLIENT handle created for that fd. - * The current implementation holds locks across the entire RPC and reply, - * including retransmissions. Yes, this is silly, and as soon as this - * code is proven to work, this should be the first thing fixed. One step - * at a time. + * it. Therefore, we allocate an associative array of flags and condition + * variables (dg_fd). The flags and the array are protected by the + * clnt_fd_lock mutex. dg_fd[fd].lock == 1 => a call is active on some + * CLIENT handle created for that fd. The current implementation holds + * locks across the entire RPC and reply, including retransmissions. Yes, + * this is silly, and as soon as this code is proven to work, this should + * be the first thing fixed. One step at a time. */ -static int *dg_fd_locks; -static cond_t *dg_cv; -#define release_fd_lock(fd, mask) { \ - mutex_lock(&clnt_fd_lock); \ - dg_fd_locks[fd] = 0; \ - mutex_unlock(&clnt_fd_lock); \ - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); \ - cond_signal(&dg_cv[fd]); \ +struct dg_fd { + RB_ENTRY(dg_fd) dg_link; + int fd; + mutex_t mtx; +}; +static inline int +cmp_dg_fd(struct dg_fd *a, struct dg_fd *b) +{ + if (a->fd > b->fd) { + return (1); + } else if (a->fd < b->fd) { + return (-1); + } else { + return (0); + } +} +RB_HEAD(dg_fd_list, dg_fd); +RB_PROTOTYPE(dg_fd_list, dg_fd, dg_link, cmp_dg_fd); +RB_GENERATE(dg_fd_list, dg_fd, dg_link, cmp_dg_fd); +struct dg_fd_list dg_fd_head = RB_INITIALIZER(&dg_fd_head); + +/* + * Find the lock structure for the given file descriptor, or initialize it if + * it does not already exist. The clnt_fd_lock mutex must be held. + */ +static struct dg_fd * +dg_fd_find(int fd) +{ + struct dg_fd key, *elem; + + key.fd = fd; + elem = RB_FIND(dg_fd_list, &dg_fd_head, &key); + if (elem == NULL) { + elem = calloc(1, sizeof(*elem)); + elem->fd = fd; + mutex_init(&elem->mtx, NULL); + RB_INSERT(dg_fd_list, &dg_fd_head, elem); + } + return (elem); +} + +static void +release_fd_lock(struct dg_fd *elem, sigset_t mask) +{ + mutex_unlock(&elem->mtx); + thr_sigsetmask(SIG_SETMASK, &mask, NULL); } static const char mem_err_clnt_dg[] = "clnt_dg_create: out of memory"; -/* VARIABLES PROTECTED BY clnt_fd_lock: dg_fd_locks, dg_cv */ +/* VARIABLES PROTECTED BY clnt_fd_lock: dg_fd */ #define MCALL_MSG_SIZE 24 @@ -171,47 +212,9 @@ clnt_dg_create(int fd, const struct netbuf *svcaddr, rpcprog_t program, struct cu_data *cu = NULL; /* private data */ struct timeval now; struct rpc_msg call_msg; - sigset_t mask; - sigset_t newmask; struct __rpc_sockinfo si; int one = 1; - sigfillset(&newmask); - thr_sigsetmask(SIG_SETMASK, &newmask, &mask); - mutex_lock(&clnt_fd_lock); - if (dg_fd_locks == (int *) NULL) { - int cv_allocsz; - size_t fd_allocsz; - int dtbsize = __rpc_dtbsize(); - - fd_allocsz = dtbsize * sizeof (int); - dg_fd_locks = (int *) mem_alloc(fd_allocsz); - if (dg_fd_locks == (int *) NULL) { - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - goto err1; - } else - memset(dg_fd_locks, '\0', fd_allocsz); - - cv_allocsz = dtbsize * sizeof (cond_t); - dg_cv = (cond_t *) mem_alloc(cv_allocsz); - if (dg_cv == (cond_t *) NULL) { - mem_free(dg_fd_locks, fd_allocsz); - dg_fd_locks = (int *) NULL; - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - goto err1; - } else { - int i; - - for (i = 0; i < dtbsize; i++) - cond_init(&dg_cv[i], 0, (void *) 0); - } - } - - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - if (svcaddr == NULL) { rpc_createerr.cf_stat = RPC_UNKNOWNADDR; return (NULL); @@ -332,25 +335,21 @@ clnt_dg_call(CLIENT *cl, rpcproc_t proc, xdrproc_t xargs, void *argsp, struct timespec ts; struct kevent kv; struct sockaddr *sa; + struct dg_fd *elem; sigset_t mask; sigset_t newmask; socklen_t salen; ssize_t recvlen = 0; - int kin_len, n, rpc_lock_value; + int kin_len, n; u_int32_t xid; outlen = 0; sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[cu->cu_fd]) - cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock); - if (__isthreaded) - rpc_lock_value = 1; - else - rpc_lock_value = 0; - dg_fd_locks[cu->cu_fd] = rpc_lock_value; + elem = dg_fd_find(cu->cu_fd); mutex_unlock(&clnt_fd_lock); + mutex_lock(&elem->mtx); if (cu->cu_total.tv_usec == -1) { timeout = utimeout; /* use supplied timeout */ } else { @@ -604,7 +603,7 @@ out: if (cu->cu_kq >= 0) _close(cu->cu_kq); cu->cu_kq = -1; - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (cu->cu_error.re_status); } @@ -620,6 +619,7 @@ static bool_t clnt_dg_freeres(CLIENT *cl, xdrproc_t xdr_res, void *res_ptr) { struct cu_data *cu = (struct cu_data *)cl->cl_private; + struct dg_fd *elem; XDR *xdrs = &(cu->cu_outxdrs); bool_t dummy; sigset_t mask; @@ -628,13 +628,12 @@ clnt_dg_freeres(CLIENT *cl, xdrproc_t xdr_res, void *res_ptr) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[cu->cu_fd]) - cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock); + elem = dg_fd_find(cu->cu_fd); + mutex_lock(&elem->mtx); xdrs->x_op = XDR_FREE; dummy = (*xdr_res)(xdrs, res_ptr); mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &mask, NULL); - cond_signal(&dg_cv[cu->cu_fd]); + release_fd_lock(elem, mask); return (dummy); } @@ -649,41 +648,36 @@ clnt_dg_control(CLIENT *cl, u_int request, void *info) { struct cu_data *cu = (struct cu_data *)cl->cl_private; struct netbuf *addr; + struct dg_fd *elem; sigset_t mask; sigset_t newmask; - int rpc_lock_value; sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[cu->cu_fd]) - cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock); - if (__isthreaded) - rpc_lock_value = 1; - else - rpc_lock_value = 0; - dg_fd_locks[cu->cu_fd] = rpc_lock_value; + elem = dg_fd_find(cu->cu_fd); mutex_unlock(&clnt_fd_lock); + mutex_lock(&elem->mtx); switch (request) { case CLSET_FD_CLOSE: cu->cu_closeit = TRUE; - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (TRUE); case CLSET_FD_NCLOSE: cu->cu_closeit = FALSE; - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (TRUE); } /* for other requests which use info */ if (info == NULL) { - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } switch (request) { case CLSET_TIMEOUT: if (time_not_ok((struct timeval *)info)) { - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } cu->cu_total = *(struct timeval *)info; @@ -697,7 +691,7 @@ clnt_dg_control(CLIENT *cl, u_int request, void *info) break; case CLSET_RETRY_TIMEOUT: if (time_not_ok((struct timeval *)info)) { - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } cu->cu_wait = *(struct timeval *)info; @@ -717,7 +711,7 @@ clnt_dg_control(CLIENT *cl, u_int request, void *info) case CLSET_SVC_ADDR: /* set to new address */ addr = (struct netbuf *)info; if (addr->len < sizeof cu->cu_raddr) { - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } (void) memcpy(&cu->cu_raddr, addr->buf, addr->len); @@ -780,10 +774,10 @@ clnt_dg_control(CLIENT *cl, u_int request, void *info) cu->cu_connect = *(int *)info; break; default: - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } - release_fd_lock(cu->cu_fd, mask); + release_fd_lock(elem, mask); return (TRUE); } @@ -791,6 +785,7 @@ static void clnt_dg_destroy(CLIENT *cl) { struct cu_data *cu = (struct cu_data *)cl->cl_private; + struct dg_fd *elem; int cu_fd = cu->cu_fd; sigset_t mask; sigset_t newmask; @@ -798,8 +793,8 @@ clnt_dg_destroy(CLIENT *cl) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[cu_fd]) - cond_wait(&dg_cv[cu_fd], &clnt_fd_lock); + elem = dg_fd_find(cu_fd); + mutex_lock(&elem->mtx); if (cu->cu_closeit) (void)_close(cu_fd); if (cu->cu_kq >= 0) @@ -812,8 +807,7 @@ clnt_dg_destroy(CLIENT *cl) mem_free(cl->cl_tp, strlen(cl->cl_tp) +1); mem_free(cl, sizeof (CLIENT)); mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &mask, NULL); - cond_signal(&dg_cv[cu_fd]); + release_fd_lock(elem, mask); } static struct clnt_ops * diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c index ebd4e303916f..0c8ef1f73141 100644 --- a/lib/libc/rpc/clnt_vc.c +++ b/lib/libc/rpc/clnt_vc.c @@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -71,7 +72,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include +#include #include #include #include @@ -123,22 +126,60 @@ struct ct_data { * This machinery implements per-fd locks for MT-safety. It is not * sufficient to do per-CLIENT handle locks for MT-safety because a * user may create more than one CLIENT handle with the same fd behind - * it. Therefore, we allocate an array of flags (vc_fd_locks), protected - * by the clnt_fd_lock mutex, and an array (vc_cv) of condition variables - * similarly protected. Vc_fd_lock[fd] == 1 => a call is active on some - * CLIENT handle created for that fd. - * The current implementation holds locks across the entire RPC and reply. - * Yes, this is silly, and as soon as this code is proven to work, this - * should be the first thing fixed. One step at a time. + * it. Therefore, we allocate an associative array of flags and condition + * variables (vc_fd). The flags and the array are protected by the + * clnt_fd_lock mutex. vc_fd_lock[fd] == 1 => a call is active on some + * CLIENT handle created for that fd. The current implementation holds + * locks across the entire RPC and reply. Yes, this is silly, and as soon + * as this code is proven to work, this should be the first thing fixed. + * One step at a time. */ -static int *vc_fd_locks; -static cond_t *vc_cv; -#define release_fd_lock(fd, mask) { \ - mutex_lock(&clnt_fd_lock); \ - vc_fd_locks[fd] = 0; \ - mutex_unlock(&clnt_fd_lock); \ - thr_sigsetmask(SIG_SETMASK, &(mask), (sigset_t *) NULL); \ - cond_signal(&vc_cv[fd]); \ +struct vc_fd { + RB_ENTRY(vc_fd) vc_link; + int fd; + mutex_t mtx; +}; +static inline int +cmp_vc_fd(struct vc_fd *a, struct vc_fd *b) +{ + if (a->fd > b->fd) { + return (1); + } else if (a->fd < b->fd) { + return (-1); + } else { + return (0); + } +} +RB_HEAD(vc_fd_list, vc_fd); +RB_PROTOTYPE(vc_fd_list, vc_fd, vc_link, cmp_vc_fd); +RB_GENERATE(vc_fd_list, vc_fd, vc_link, cmp_vc_fd); +struct vc_fd_list vc_fd_head = RB_INITIALIZER(&vc_fd_head); + +/* + * Find the lock structure for the given file descriptor, or initialize it if + * it does not already exist. The clnt_fd_lock mutex must be held. + */ +static struct vc_fd * +vc_fd_find(int fd) +{ + struct vc_fd key, *elem; + + key.fd = fd; + elem = RB_FIND(vc_fd_list, &vc_fd_head, &key); + if (elem == NULL) { + elem = calloc(1, sizeof(*elem)); + elem->fd = fd; + mutex_init(&elem->mtx, NULL); + RB_INSERT(vc_fd_list, &vc_fd_head, elem); + } + return (elem); +} + +static void +release_fd_lock(struct vc_fd *elem, sigset_t mask) +{ + mutex_unlock(&elem->mtx); + thr_sigsetmask(SIG_SETMASK, &mask, NULL); } static const char clnt_vc_errstr[] = "%s : %s"; @@ -172,8 +213,6 @@ clnt_vc_create(int fd, const struct netbuf *raddr, const rpcprog_t prog, struct timeval now; struct rpc_msg call_msg; static u_int32_t disrupt; - sigset_t mask; - sigset_t newmask; struct sockaddr_storage ss; socklen_t slen; struct __rpc_sockinfo si; @@ -191,39 +230,6 @@ clnt_vc_create(int fd, const struct netbuf *raddr, const rpcprog_t prog, goto err; } ct->ct_addr.buf = NULL; - sigfillset(&newmask); - thr_sigsetmask(SIG_SETMASK, &newmask, &mask); - mutex_lock(&clnt_fd_lock); - if (vc_fd_locks == (int *) NULL) { - int cv_allocsz, fd_allocsz; - int dtbsize = __rpc_dtbsize(); - - fd_allocsz = dtbsize * sizeof (int); - vc_fd_locks = (int *) mem_alloc(fd_allocsz); - if (vc_fd_locks == (int *) NULL) { - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - goto err; - } else - memset(vc_fd_locks, '\0', fd_allocsz); - - assert(vc_cv == (cond_t *) NULL); - cv_allocsz = dtbsize * sizeof (cond_t); - vc_cv = (cond_t *) mem_alloc(cv_allocsz); - if (vc_cv == (cond_t *) NULL) { - mem_free(vc_fd_locks, fd_allocsz); - vc_fd_locks = (int *) NULL; - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - goto err; - } else { - int i; - - for (i = 0; i < dtbsize; i++) - cond_init(&vc_cv[i], 0, (void *) 0); - } - } else - assert(vc_cv != (cond_t *) NULL); /* * XXX - fvdl connecting while holding a mutex? @@ -234,19 +240,16 @@ clnt_vc_create(int fd, const struct netbuf *raddr, const rpcprog_t prog, rpc_createerr.cf_stat = RPC_SYSTEMERROR; rpc_createerr.cf_error.re_errno = errno; mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); goto err; } if (_connect(fd, (struct sockaddr *)raddr->buf, raddr->len) < 0){ rpc_createerr.cf_stat = RPC_SYSTEMERROR; rpc_createerr.cf_error.re_errno = errno; mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); goto err; } } mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); if (!__rpc_fd2sockinfo(fd, &si)) goto err; @@ -321,12 +324,12 @@ clnt_vc_call(CLIENT *cl, rpcproc_t proc, xdrproc_t xdr_args, void *args_ptr, struct ct_data *ct = (struct ct_data *) cl->cl_private; XDR *xdrs = &(ct->ct_xdrs); struct rpc_msg reply_msg; + struct vc_fd *elem; u_int32_t x_id; u_int32_t *msg_x_id = &ct->ct_u.ct_mcalli; /* yuk */ bool_t shipnow; int refreshes = 2; sigset_t mask, newmask; - int rpc_lock_value; bool_t reply_stat; assert(cl != NULL); @@ -334,14 +337,9 @@ clnt_vc_call(CLIENT *cl, rpcproc_t proc, xdrproc_t xdr_args, void *args_ptr, sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[ct->ct_fd]) - cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock); - if (__isthreaded) - rpc_lock_value = 1; - else - rpc_lock_value = 0; - vc_fd_locks[ct->ct_fd] = rpc_lock_value; + elem = vc_fd_find(ct->ct_fd); mutex_unlock(&clnt_fd_lock); + mutex_lock(&elem->mtx); if (!ct->ct_waitset) { /* If time is not within limits, we ignore it. */ if (time_not_ok(&timeout) == FALSE) @@ -365,7 +363,7 @@ call_again: if (ct->ct_error.re_status == RPC_SUCCESS) ct->ct_error.re_status = RPC_CANTENCODEARGS; (void)xdrrec_endofrecord(xdrs, TRUE); - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } } else { @@ -376,23 +374,23 @@ call_again: if (ct->ct_error.re_status == RPC_SUCCESS) ct->ct_error.re_status = RPC_CANTENCODEARGS; (void)xdrrec_endofrecord(xdrs, TRUE); - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } } if (! xdrrec_endofrecord(xdrs, shipnow)) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status = RPC_CANTSEND); } if (! shipnow) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (RPC_SUCCESS); } /* * Hack to provide rpc-based message passing */ if (timeout.tv_sec == 0 && timeout.tv_usec == 0) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return(ct->ct_error.re_status = RPC_TIMEDOUT); } @@ -406,14 +404,14 @@ call_again: reply_msg.acpted_rply.ar_results.where = NULL; reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; if (! xdrrec_skiprecord(xdrs)) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } /* now decode and validate the response header */ if (! xdr_replymsg(xdrs, &reply_msg)) { if (ct->ct_error.re_status == RPC_SUCCESS) continue; - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } if (reply_msg.rm_xid == x_id) @@ -454,7 +452,7 @@ call_again: if (refreshes-- && AUTH_REFRESH(cl->cl_auth, &reply_msg)) goto call_again; } /* end of unsuccessful completion */ - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (ct->ct_error.re_status); } @@ -474,6 +472,7 @@ static bool_t clnt_vc_freeres(CLIENT *cl, xdrproc_t xdr_res, void *res_ptr) { struct ct_data *ct; + struct vc_fd *elem; XDR *xdrs; bool_t dummy; sigset_t mask; @@ -487,14 +486,13 @@ clnt_vc_freeres(CLIENT *cl, xdrproc_t xdr_res, void *res_ptr) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[ct->ct_fd]) - cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock); + elem = vc_fd_find(ct->ct_fd); + mutex_lock(&elem->mtx); xdrs->x_op = XDR_FREE; dummy = (*xdr_res)(xdrs, res_ptr); - mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - cond_signal(&vc_cv[ct->ct_fd]); + mutex_unlock(&clnt_fd_lock); + release_fd_lock(elem, mask); return dummy; } @@ -522,10 +520,10 @@ static bool_t clnt_vc_control(CLIENT *cl, u_int request, void *info) { struct ct_data *ct; + struct vc_fd *elem; void *infop = info; sigset_t mask; sigset_t newmask; - int rpc_lock_value; assert(cl != NULL); @@ -534,23 +532,18 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[ct->ct_fd]) - cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock); - if (__isthreaded) - rpc_lock_value = 1; - else - rpc_lock_value = 0; - vc_fd_locks[ct->ct_fd] = rpc_lock_value; + elem = vc_fd_find(ct->ct_fd); mutex_unlock(&clnt_fd_lock); + mutex_lock(&elem->mtx); switch (request) { case CLSET_FD_CLOSE: ct->ct_closeit = TRUE; - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (TRUE); case CLSET_FD_NCLOSE: ct->ct_closeit = FALSE; - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (TRUE); default: break; @@ -558,13 +551,13 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) /* for other requests which use info */ if (info == NULL) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } switch (request) { case CLSET_TIMEOUT: if (time_not_ok((struct timeval *)info)) { - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } ct->ct_wait = *(struct timeval *)infop; @@ -584,7 +577,7 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) *(struct netbuf *)info = ct->ct_addr; break; case CLSET_SVC_ADDR: /* set to new address */ - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (FALSE); case CLGET_XID: /* @@ -628,10 +621,10 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info) break; default: - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (FALSE); } - release_fd_lock(ct->ct_fd, mask); + release_fd_lock(elem, mask); return (TRUE); } @@ -640,6 +633,7 @@ static void clnt_vc_destroy(CLIENT *cl) { struct ct_data *ct = (struct ct_data *) cl->cl_private; + struct vc_fd *elem; int ct_fd = ct->ct_fd; sigset_t mask; sigset_t newmask; @@ -651,8 +645,8 @@ clnt_vc_destroy(CLIENT *cl) sigfillset(&newmask); thr_sigsetmask(SIG_SETMASK, &newmask, &mask); mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[ct_fd]) - cond_wait(&vc_cv[ct_fd], &clnt_fd_lock); + elem = vc_fd_find(ct_fd); + mutex_lock(&elem->mtx); if (ct->ct_closeit && ct->ct_fd != -1) { (void)_close(ct->ct_fd); } @@ -665,8 +659,7 @@ clnt_vc_destroy(CLIENT *cl) mem_free(cl->cl_tp, strlen(cl->cl_tp) +1); mem_free(cl, sizeof(CLIENT)); mutex_unlock(&clnt_fd_lock); - thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - cond_signal(&vc_cv[ct_fd]); + release_fd_lock(elem, mask); } /* diff --git a/lib/libc/rpc/rpc_com.h b/lib/libc/rpc/rpc_com.h index c0c144fc589d..a8b6092f4e9d 100644 --- a/lib/libc/rpc/rpc_com.h +++ b/lib/libc/rpc/rpc_com.h @@ -62,7 +62,6 @@ __BEGIN_DECLS extern u_int __rpc_get_a_size(int); -extern int __rpc_dtbsize(void); extern struct netconfig * __rpcgettp(int); extern int __rpc_get_default_domain(char **); diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c index 6fbeaf77a7e7..e884eb2febe2 100644 --- a/lib/libc/rpc/rpc_generic.c +++ b/lib/libc/rpc/rpc_generic.c @@ -107,29 +107,6 @@ static char *strlocase(char *); #endif static int getnettype(const char *); -/* - * Cache the result of getrlimit(), so we don't have to do an - * expensive call every time. - */ -int -__rpc_dtbsize(void) -{ - static int tbsize; - struct rlimit rl; - - if (tbsize) { - return (tbsize); - } - if (getrlimit(RLIMIT_NOFILE, &rl) == 0) { - return (tbsize = (int)rl.rlim_max); - } - /* - * Something wrong. I'll try to save face by returning a - * pessimistic number. - */ - return (32); -} - /* * Find the appropriate buffer size diff --git a/sys/rpc/rpc_com.h b/sys/rpc/rpc_com.h index 70d4214f54e8..439d9764c833 100644 --- a/sys/rpc/rpc_com.h +++ b/sys/rpc/rpc_com.h @@ -72,7 +72,6 @@ __BEGIN_DECLS #ifndef _KERNEL extern u_int __rpc_get_a_size(int); -extern int __rpc_dtbsize(void); extern struct netconfig * __rpcgettp(int); extern int __rpc_get_default_domain(char **); From nobody Fri Dec 1 21:46:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 00:01:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShqpP2lfSz52bHf; Sat, 2 Dec 2023 00:01: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 4ShqpP2CjDz4Wj9; Sat, 2 Dec 2023 00:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701475277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3fNtnXOYPktap/wTTqkceHFehRdkwuINqstP/UFzBKI=; b=AsqAiwI4mV9GbJGTzEEf6QyX91zaq9TF/QJnk7WkG2ijWs+iV8vIcNdkcYeEYSbnrhN5cp 36B9yKaOJOkqJxTxjU2QSO6/lquYE/xdxKXyRsNNnG7IIajF2ZriHt3x7XXNNHjIOc0Ixe z/tDG2ljbMB83k6BSlrnJR5YKIe/U3V04+NvbsqEBF9lkBPGaB8m/zz3pHMqlXXTMX5q8m YyHB+6ZLtPPTEj3aq33L0LnJzTtfv2ek35qHR4S3j67RYuDOgLchUteLi/Ths3jnTNYiYW xa1Vm4dtOaGD26BCDL8bzDu865vqWsvRf08sk64sd5zsEjfCY9UxpEVr5tSmqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701475277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3fNtnXOYPktap/wTTqkceHFehRdkwuINqstP/UFzBKI=; b=rBjvFTFVy6jLoFwV9qGfYEluTfVwYUy/Y7vZgtCPh0ujWMPkKnJkXjQC9xkBOXkTaQpESi dPQImhTr+FXydgrkME5zaf7AwipIyQmQtkDW9OCCnGqtNcMCR5elAfvFAsX/8crkwX2/hx Jds3uyspTvGYPxL3shQRMKmDifduiHmjoobKxq97LqCiDIhNID+uQDze6UNruhy3Ku3gbH FIJdIImEf0yg+9JAAF7/Dz/BsGP4Nqlf9svZzWvMY8JgphJ0n62zPJuLMRjG7DoYK7MsOZ GSx1pxtT72mpN6frTMWVM2P4Cz/UyRN+weUL5wMS7G+t/ZIQiqXT0+uh0qpvDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701475277; a=rsa-sha256; cv=none; b=ciDKL6XoBjzCSF52P2nnuhghw87O0YXyN8DDozrPJbt9phmHDU1Uk81xJNlDMF+xx6m9HJ ujhWLhm0Pv0iEAvU4YzVH8OH9ZiFkXgmt+82NTNrSst13qV2Km0XKkyAKgq62rB1rfbBTD +aRQkK/iDVh3FgLFVY43gT4q1D291zSSCxUL/iBeVnzV0nvxrUlelsZXaocFxA2dESqLwM H4UVKblF0x+OYtIp0cLjdyp6SV2O/a1+9ScXLi/WCzwhKrxr2P0cph4qSr9BLJ6AoSPUYZ GUrejdDrJv2+BMFFzMb6HuuEH8WWYcDKBLWL3M5FR3tvPVjQtT1iP7/u7dITug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShqpP1HGRztk2; Sat, 2 Dec 2023 00:01: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 3B201H55037000; Sat, 2 Dec 2023 00:01:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B201HE9036998; Sat, 2 Dec 2023 00:01:17 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:01:17 GMT Message-Id: <202312020001.3B201HE9036998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: faedeaf7377b - stable/13 - param.h: Bump __FreeBSD_version to 1302509 for commit 7aaf39f6b3b0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: faedeaf7377ba7253c281cf3315b17e0cb979075 Auto-Submitted: auto-generated The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=faedeaf7377ba7253c281cf3315b17e0cb979075 commit faedeaf7377ba7253c281cf3315b17e0cb979075 Author: Rick Macklem AuthorDate: 2023-12-02 00:00:06 +0000 Commit: Rick Macklem CommitDate: 2023-12-02 00:00:06 +0000 param.h: Bump __FreeBSD_version to 1302509 for commit 7aaf39f6b3b0 Commit 7aaf39f6b3b0 a new VFS function called vfs_exjail_clone(), which will be used by the ZFS module. Bump the version for this change. --- 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 ba64cfa4b5df..6a76245c08a9 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -59,7 +59,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1302508 /* Master, propagated to newvers */ +#define __FreeBSD_version 1302509 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sat Dec 2 00:09:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shr060ZK0z52cg7 for ; Sat, 2 Dec 2023 00:09: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 4Shr0603Hmz4XvW; Sat, 2 Dec 2023 00:09:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701475782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cxkZDSdM/VhmI4ImiL53mH+K7bS6KP4MsbKq1cvzT84=; b=lO9qddeuIThQCqM3KApRlw2vjHBKJw1O40gh5QV6ORLWN4X8xUbU9Z/FkVbg4t+J1059Yt j0iXfHdAzgQHOh0SKqybKH7qloKMwh2yAlEILn6kzLE7J/gZcACmlbiDX3gNaJpW/DpA1M cjbkSKm6n5H3Gx3cXIi98Tmw0R2z4ZHCDsk41wmkuLwK+HY+HMH2vhQ3zmOymAGkRS0OeP XJ9Zv2ZgE3pGQ6Min6pSitTu4MoLIFsM3DFtZI8T7QibXem6qE2vME17erXuPb7j7Q+5UK 7gbXQtfZj7Zyay99Q3a5FvSsr9jlHgeVMaqeXwdC96GH1WgywkWYundJ9k1OvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701475782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cxkZDSdM/VhmI4ImiL53mH+K7bS6KP4MsbKq1cvzT84=; b=K16RBqbKOk0RQOqtzaRi6PNeM+pxZkOvXbiHh5iU3LRRxmSE6moiSiy+3vpi3VXgZkpbpT Dv7xHpM6HtIIwLN0qNpWLfzq97yr7GhvysZQzyuSolegApVpSHMGWX1AEbJJanpjLPYq/0 KdhGYSAaGVRvZzcAcy6rUZM4nN1zTUGiYXRknmNO15ta4sDw/b2Vbo/b0FWuGwOc/a2fVK KPQXLLEuHM1SYPMxG0PmQK23ieYaEF2lVz+HOdsgEcXVk3Ipt91V6Wm+5VTgWiOFO0Zb3Y aBjCnhd/X3GkxGOW0E51rTjjmoG8r49LPcPFC9c+7NkekHrhWGb+o2RZcnKyhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701475782; a=rsa-sha256; cv=none; b=MtABNhS2Crye0MHX+0Wm7l4VDOswGIpC+Y0MgRv9n36xhbF1ZQNe2iRTIaOADjPuma9H0U Y3vIHqeUK9Dudg6JrFZjC/uoy8GPs5MV1QGVJPoykUKPBPzun+UA+3AVhttjAekGK/EOND NDp4LAkQ0WkPPQAHa2PekKJ+IEvs7XdkCIImA/R2iVbYxwVCO0TpX++BVUZtNzrq7eNvuR /7slRxeYBaJgI4+YHnJQXJJXAfb1yB0T7K9lf5zjgHgp5w4Wy2SlXN4VOjISP7naBxAEEq TbdB+isFq6FCjsTmb8uSvFrHCU+jP7uA3Z5kWtM9U35hzLdo+NGVyGiqiXlUZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shr0568tBzv35; Sat, 2 Dec 2023 00:09: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 3B209f2J042446; Sat, 2 Dec 2023 00:09:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B209fwf042445; Sat, 2 Dec 2023 00:09:41 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:09:41 GMT Message-Id: <202312020009.3B209fwf042445@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: eb62221ff0f9..d99134be8375 - vendor/openzfs/zfs-2.1-release - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/zfs-2.1-release X-Git-Reftype: branch X-Git-Commit: d99134be83753266b5f7a79738aeab5b08db1e35 X-Git-Oldrev: eb62221ff0f9efbc2ab826ec6f1388c5f05fb664 X-Git-Newrev: d99134be83753266b5f7a79738aeab5b08db1e35 Auto-Submitted: auto-generated The branch vendor/openzfs/zfs-2.1-release has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=eb62221ff0f9..d99134be8375 77b0c6f0403b dnode_is_dirty: check dnode and its data for dirtiness 1ca531971f17 Zpool can start allocating from metaslab before TRIMs have completed a339bd791ac2 copy-builtin: add hooks with sed/>> d99134be8375 Tag zfs-2.1.14 From nobody Sat Dec 2 00:21:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShrFV3Htmz52fkR; Sat, 2 Dec 2023 00:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ShrFV34Swz4YsW; Sat, 2 Dec 2023 00:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701476478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y5R9gjsR9r0RlMukoNUWLwNpLL3cTmj8w6sGr+JU8vM=; b=KP3tT8TSJhpe6lyaQuKzp6GnrKcGwvRTEorZALKSkLVpZX9ca5gEPLOEFmhTklroKrd9fJ AYi6EO5/frZxR5v14K6F4bV4pWBgIU5OKbmm+w2cE3QKcvX1fXCni2kBpkG1tGMv03Pf8a g3rswaleMlVhM27UujRIlAifHy3Uy6057RAT3yy5D9SMZ/P4+6hkMv6EUfmt0qp6Mmb5gp 9V4oVnSQW2kUzCbaHKIcA++41LYoIiQbge4rUpm1ePM7tyPIFIs/3HN/8aZ75k6Kj6w3B8 mDtGOVaS+lvUofiH46jZ4VUUMiXTHzp8erqlS2kq49oGgPKBej+kjCr2zPvisg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701476478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y5R9gjsR9r0RlMukoNUWLwNpLL3cTmj8w6sGr+JU8vM=; b=R02ArSWGVaQLpDarP0/jqc5bWXxcl4yjeAMZu9Ms6kCgRE3zqItqkMw1zkbJAVQhpHTbFW 5kTbB7DjIaA0lxtmdAYoyHIvdkZNdCGPS5tsdH4fkUuxfvnzh77po1wPhL/hu4u5QfYBJv EV7glmE/Mx9yW+zJ1azVW9G1lF/7xEZbpFsYJzf1q1TN2DnA3RMx0MYbct73S6l2IszNiZ LJR9Jt826eNwmwyGAf5v/tuw5c0Od2JXOEVsYdW/kXqRcvN3gW2lG7Eo/IxaZz+NpD8vzJ Z50BKIhfCkQZh6UlCWELSLQnYaQ9ewb3LnxawecmfIAJ22FPll57+08u+L5OmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701476478; a=rsa-sha256; cv=none; b=yhWseeTT3JdkD20TCn3nD+S2Lr2twNxQtctwpoiuOcs3/4XgcsY6t94gKWzMQpRltNIDRF M0wm5QXTjHq9jfNTYjkDMQQV1rJJ7/cFESGOpObvo//NLMkOFY/JzaVlOmL4qc0l6XV/ZS H8Mg1MmLAhSHnRfrD7cQd14yKPNSUVP19my5ox9K5yf1pduuen4IRwdAJ0Z7kVPi24gAS5 wmQKdkwAwtD2je8jEql51wiVv+4YcAF++cp/9IlyBLcf7nS1XkVaCd1d2hM6D2vczKzr4+ dI/XNfeH1SzOHqbn+UAGbvSnVbBB7gKWs6QLtrOVsZz7Qlg1s04vO5wuAcCB6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShrFV23RKzvfR; Sat, 2 Dec 2023 00:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B20LIE3071564; Sat, 2 Dec 2023 00:21:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20LC01071546; Sat, 2 Dec 2023 00:21:12 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:21:12 GMT Message-Id: <202312020021.3B20LC01071546@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: f5eac6541278 - stable/13 - zfs: merge openzfs/zfs@d99134be8 (zfs-2.1-release) into stable/13 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f5eac65412786da4c764f86eb1514817889e9764 Auto-Submitted: auto-generated The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=f5eac65412786da4c764f86eb1514817889e9764 commit f5eac65412786da4c764f86eb1514817889e9764 Merge: faedeaf7377b d99134be8375 Author: Martin Matuska AuthorDate: 2023-12-02 00:11:25 +0000 Commit: Martin Matuska CommitDate: 2023-12-02 00:16:27 +0000 zfs: merge openzfs/zfs@d99134be8 (zfs-2.1-release) into stable/13 OpenZFS release 2.1.14 Notable upstream pull request merges: #15395 1ca531971 Zpool can start allocating from metaslab before TRIMs have completed #15571 77b0c6f04 dnode_is_dirty: check dnode and its data for dirtiness Obtained from: OpenZFS OpenZFS tag: zfs-2.1.14 OpenZFS commit: d99134be83753266b5f7a79738aeab5b08db1e35 sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/copy-builtin | 28 ++-------------------------- sys/contrib/openzfs/module/zfs/vdev_trim.c | 28 +++++++++++++++++++--------- sys/modules/zfs/zfs_config.h | 6 +++--- sys/modules/zfs/zfs_gitrev.h | 2 +- 5 files changed, 26 insertions(+), 40 deletions(-) diff --cc sys/modules/zfs/zfs_config.h index 95886fc74c39,000000000000..ac4d2c79268f mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1082 -1,0 +1,1082 @@@ +/* + */ + +/* 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 + +#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 */ + +/* 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 */ + +/* 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 */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* 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 */ + +/* 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 */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #define HAVE_IMPLICIT_FALLTHROUGH 1 */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* 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_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->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 */ + +/* kernel has asm/fpu/xcr.h */ +/* #undef HAVE_KERNEL_FPU_XCR_HEADER */ + +/* kernel fpu and XSAVE internal */ +/* #undef HAVE_KERNEL_FPU_XSAVE_INTERNAL */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* 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->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 */ + +/* 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 */ + +/* iops->getattr() takes a vfsmount */ +/* #undef HAVE_VFSMOUNT_IOPS_GETATTR */ + +/* 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 */ + +/* 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 */ +/* #undef HAVE_VFS_READ_FOLIO */ + +/* fops->read/write_iter() are available */ +/* #undef HAVE_VFS_RW_ITERATE */ + +/* __set_page_dirty_nobuffers exists */ +/* #undef HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS */ + +/* __vmalloc page flags exists */ +/* #undef HAVE_VMALLOC_PAGE_KERNEL */ + +/* yes */ +/* #undef HAVE_WAIT_ON_BIT_ACTION */ + +/* wait_queue_entry_t exists */ +/* #undef HAVE_WAIT_QUEUE_ENTRY_T */ + +/* wq_head->head and wq_entry->entry exist */ +/* #undef HAVE_WAIT_QUEUE_HEAD_ENTRY */ + +/* int (*writepage_t)() takes struct folio* */ +/* #undef HAVE_WRITEPAGE_T_FOLIO */ + +/* xattr_handler->get() wants dentry */ +/* #undef HAVE_XATTR_GET_DENTRY */ + +/* xattr_handler->get() wants both dentry and inode */ +/* #undef HAVE_XATTR_GET_DENTRY_INODE */ + +/* xattr_handler->get() wants dentry and inode and flags */ +/* #undef HAVE_XATTR_GET_DENTRY_INODE_FLAGS */ + +/* xattr_handler->get() wants xattr_handler */ +/* #undef HAVE_XATTR_GET_HANDLER */ + +/* xattr_handler has name */ +/* #undef HAVE_XATTR_HANDLER_NAME */ + +/* xattr_handler->list() wants dentry */ +/* #undef HAVE_XATTR_LIST_DENTRY */ + +/* xattr_handler->list() wants xattr_handler */ +/* #undef HAVE_XATTR_LIST_HANDLER */ + +/* xattr_handler->list() wants simple */ +/* #undef HAVE_XATTR_LIST_SIMPLE */ + +/* xattr_handler->set() wants dentry */ +/* #undef HAVE_XATTR_SET_DENTRY */ + +/* xattr_handler->set() wants both dentry and inode */ +/* #undef HAVE_XATTR_SET_DENTRY_INODE */ + +/* xattr_handler->set() wants xattr_handler */ +/* #undef HAVE_XATTR_SET_HANDLER */ + +/* xattr_handler->set() takes mnt_idmap */ +/* #undef HAVE_XATTR_SET_IDMAP */ + +/* xattr_handler->set() takes user_namespace */ +/* #undef HAVE_XATTR_SET_USERNS */ + +/* Define if host toolchain supports XSAVE */ +#define HAVE_XSAVE 1 + +/* Define if host toolchain supports XSAVEOPT */ +#define HAVE_XSAVEOPT 1 + +/* Define if host toolchain supports XSAVES */ +#define HAVE_XSAVES 1 + +/* ZERO_PAGE() is GPL-only */ +/* #undef HAVE_ZERO_PAGE_GPL_ONLY */ *** 144 LINES SKIPPED *** From nobody Sat Dec 2 00:54:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shs080YLrz52nRv; Sat, 2 Dec 2023 00:54: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 4Shs0805rGz4g4b; Sat, 2 Dec 2023 00:54:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9wqFBLOfCTWM3TF1lE5QLRcH/fTjVH4I6BoSlEkE4TY=; b=AwtAVMeJ677oG4aMgd+kmeOXyXv5UpTy983EyIkPxDlpnV+B1xXNQIdrGQiEjKfWm9mar4 SW2KB7K1NhJpAv3FoYGjk94s55yTsdvh/jSwo4MDjwliO1ns6lapU+n/EA/IvmRamkaz4T G7giK+Y39O+fqXSAazYhuYI0mjDfF5AByG92txdr/SwA/qu+/GxWOFCwZeKV+2RilIgA0Q 3quh8CD4WOxWDhW+mqBgQIjCTO5RM793hK/CkpxkzJ30ionx3sYas6/4TpQFwv8Kf68oe1 dDxrw16Nge1e/+pg8uvOstuI/cvgg5TocYuRp8SO1m6kPpBabPeJZT4c6DYnQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9wqFBLOfCTWM3TF1lE5QLRcH/fTjVH4I6BoSlEkE4TY=; b=inBohuYcbcqnuKvWVg6scrfn/z1H0wUcN6cRSPTwUAYGn1nw6NnXyBPTZU95AVGcSTn5FJ Cx8P52D4WTMoboqFPvevOlRcVJfB3uSojZqMQDkUsnYx99RHvM8uyspZDEkxxLABP6Q6vn FUUdUMNAzA4VReOEnUuPM2FWyEcTK7al8av/SwiRPFAJXNiVznWkLkc7Bvn4PXaf8+rkTL nNXzfQl5gTLg5Im3xK2o5EvU2rNJi0YeYWSQo3RSYprB1Uef5aUFAwIzEH39gi+5/m4/+6 UI/Jc4qgWw9ljW6Nss2MTxJ3TAjVVT9iYoPAnbTA+kyB2Sy6IAwrPS8mZ4cA0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478488; a=rsa-sha256; cv=none; b=RwNuxI0t+bG4kqDouJPtdL1yHVTE7kWFiGu7xvuopfngHnjd81J4VH488J9/wMA5PyM5fp eDFmMbNGLCw0jvIlX6HJ37Ah9duzeby7l1Tpn654djzaA7HNMlDMrMA69kmmpM5hQtx9my OHN0ABl7Pr02hU7rmCcAHHm8KKHcc1DeNt8ttlgPuMZa3W8mRT+tw6ZseCUvH6YSoD15Os JAxolhTadPd3qGReLhXg8lMYSFNaFwjgXEUputXH/+sdTq+m1xR1XHRgd2ezIDyAr5NEQO qtFnY6RZpi3dRRDQjWBNjgDUtIPk8yyl6fduVTxXgcIQROZ+hRjyowRmnwTEQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shs076Gkvzw0L; Sat, 2 Dec 2023 00:54: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 3B20sl7v024697; Sat, 2 Dec 2023 00:54:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20slm0024694; Sat, 2 Dec 2023 00:54:47 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:47 GMT Message-Id: <202312020054.3B20slm0024694@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 1c63aa2989d3 - stable/14 - procctl.2: improve phrasing for ASLR disable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1c63aa2989d3ca5df3d6a1485b68fac1bda9526f Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=1c63aa2989d3ca5df3d6a1485b68fac1bda9526f commit 1c63aa2989d3ca5df3d6a1485b68fac1bda9526f Author: Brooks Davis AuthorDate: 2023-10-26 17:38:14 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:03:25 +0000 procctl.2: improve phrasing for ASLR disable Reported by: jrtc27 Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42364 (cherry picked from commit 4894205482555447c6b3372598c7589a66596724) --- lib/libc/sys/procctl.2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libc/sys/procctl.2 b/lib/libc/sys/procctl.2 index e269edb8acaa..cb5234b6e40c 100644 --- a/lib/libc/sys/procctl.2 +++ b/lib/libc/sys/procctl.2 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 15, 2023 +.Dd October 26, 2023 .Dt PROCCTL 2 .Os .Sh NAME @@ -85,8 +85,8 @@ Controls the Address Space Layout Randomization (ASLR) in the program images created by .Xr execve 2 -in the specified process or its descendants that did not changed -the control nor modified it by other means. +in the specified process or its descendants that do not either change +the control or modify it by other means. The .Fa data parameter must point to the integer variable holding one of the following From nobody Sat Dec 2 00:54:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shs091Cfmz52nPX; Sat, 2 Dec 2023 00:54: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 4Shs090gXmz4g9S; Sat, 2 Dec 2023 00:54:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QWSw1vt+Rk+t+qS716vPryRWiVI3bgeJVhuoOnPhXL4=; b=fsY5H5PjQS4LIj0Tm292jISQhai3WM8w8bxcKJhtbT0uvGCojeMGQRpEB2K2MyU45aqHJf TxMhoLiRyYL6g6NcL1x7JkyINC0P7eCyYGTXzlZKksY8y5d14euARScj3ZR5dQWmXa7pRG nxVPgTyQRQKcRFt3RV/CcvkqDPzkt8YjqYV8ycsx2RGr3gukCxm6bKpd3wj40GC9KTI+fH jeEdjHbIK6webGzjeLkTdsfUOLftEevWcqaFF/4ObH8wuey8XxXYMwA8HMbH/WVcUlEn0Z Wkq6zNKUcqbkwebgmuw7p8DFcGaGPUzahUSML4TmHRb+Zhei772CUQPRM29+CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QWSw1vt+Rk+t+qS716vPryRWiVI3bgeJVhuoOnPhXL4=; b=hnUbxtQb/g5FynqXWr65/xEHbhklgGP9PfiwL+uCBx0q8V6TryYbI+APBzMKu90bORrLYQ vrXd2RMJChefymPS6R+leskI3uFMWLXr4nHdim7wIUKfnJB6UrEcz3m9/CfABTjXiOptS8 6h5NiI7XJf78joEVRlmk1yi6YTfQOXYyZ1BC7nZt7HwwHGBZfBkiESUlKlKjE88P7IWs/P n0lJ5lCjOOPKTmvZCyYtt73YEHiiIa9OXEQUooLUU4rOCJ69qWXVzkbRU5qt4HPdVRNFew NyxLIV1ny7LhNyWvcg+Pp/+jkVRotSXvVPSjgdX1Q5BQhpIY9KXKcWfk7+UIQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478489; a=rsa-sha256; cv=none; b=nEfp1abwnlq6tU8lrsskT9BZK0HoLRcV4V2eCgNVyT0ws63neY+XkFoPOfAQM+TlSM+c4x TtZqDr5cgiEz2qZoDY6/vU5FLvXl0LAxgdpkr4IHTSTUZB7/deNKxC9XK1m1HSHI83gShI F6m1gmHZ8BneTMTds5jggxdalJoQRZsoYn0nFzk8WYCEZ4aEHiINKyL2Teg6cCW3xB2pf8 FmOCpPuez/ZeuBmtG7PKncC8hDL1Vvkw6RcUXjLNUa6HrsifLdfxGXZfK1gP+z6Oouj7R9 mGQ3aoFvSgerB7fAIqWGl4FoMZz3DaNFvj6pa0O9bkEdjRXOs7GYW5eCX/H07Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shs086sxhzw0M; Sat, 2 Dec 2023 00:54: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 3B20smvc024736; Sat, 2 Dec 2023 00:54:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20sm6D024733; Sat, 2 Dec 2023 00:54:48 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:48 GMT Message-Id: <202312020054.3B20sm6D024733@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 01df34767177 - stable/14 - auxv: make AT_BSDFLAGS unsigned List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 01df3476717730b22caafc87d31f1780a746c9ba Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=01df3476717730b22caafc87d31f1780a746c9ba commit 01df3476717730b22caafc87d31f1780a746c9ba Author: Brooks Davis AuthorDate: 2023-10-26 17:38:35 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:03:25 +0000 auxv: make AT_BSDFLAGS unsigned AT_BSDFLAGS shouldn't be sign extended on 64-bit systems so use a uint32_t instead of an int. Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D42365 (cherry picked from commit 326bf5089ca788d5ff1951eed7a9067281a2b65e) --- sys/kern/imgact_elf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 4ebd08082545..dfa874e307e5 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1434,7 +1434,8 @@ __elfN(freebsd_copyout_auxargs)(struct image_params *imgp, uintptr_t base) Elf_Auxinfo *argarray, *pos; struct vmspace *vmspace; rlim_t stacksz; - int error, bsdflags, oc; + int error, oc; + uint32_t bsdflags; argarray = pos = malloc(AT_COUNT * sizeof(*pos), M_TEMP, M_WAITOK | M_ZERO); From nobody Sat Dec 2 00:54:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shs0B2nrRz52nB3; Sat, 2 Dec 2023 00:54: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 4Shs0B22gTz4gJN; Sat, 2 Dec 2023 00:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bZnTIiaKL83t1pEQ4IWzb3rPyx253lCEBKvb2EcjX2c=; b=Ocj+PKquGSgVmV1zxfYttjpis36nwLnf9KYIVk0k2DJZqpuN1tyNohj95+kR0Si7eU1/O/ eNo4lKY8+Ym4FYwqdYvWvh94CbP96xHPQSHJIYpBdI7oypoeEMk5b3ZFFMlDMuaTZPVvpt Sk/6IwqofMSmM5YxF55zFf9/WJRpxszHPy3NFICFLYMQqQkf4TryU3DCb8eM+nykpp+Gpo cnGSL/neNTnkZxmNChkosqLzERXEPpP7x9GEH8blBk0LXxp0EyXP/S/O7HXX+N7cjExUef paJSXs1sSbmTE+mwtMdB31ZifYl95yig7xq17SdHJws1Du+5tDNV1z/U6XFmZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bZnTIiaKL83t1pEQ4IWzb3rPyx253lCEBKvb2EcjX2c=; b=Di6b9dMdRJ7228W89JY6TBywKaLY62RitHItFlyqnCFkp+2+y7EMt3+twlRzgAvBdIzGxp bpMEIjkni65irPl/8VeZEWgoJaedSxakX5V8pIkLUxIrjgyt4i0OgQqgJ6mEKeX0UYP6fY RDqDJTB0+BxYxyZpb9IE+o5iEIT01+UPaeYFj+CRVubIstINeaTocamMm5cO+Ly/6whjAn Ofrqe94U57eqJou2wCwZDVIqhDHIU7ydNXmW4kjMDxXfF1066lxf+Wn7AUGjKKuyphKHCM UxzT4y/BGkTMTvMaeGTakyhwfhBUUF0aMdCcYNIXr3HVq2sZ0rqu9xNTlA8CAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478490; a=rsa-sha256; cv=none; b=E2nI0RTJkfTJaOiZZp3pbHBMFq47ig/QEH2ypp1dmJZLapoa7wSlt2nlgP3QrOhwd/nSto tGjR7tWFsm8/L735mUaQ+BVFJeJeqW+fLFxddVZx8Den6c5Nwfu5L0Pv3/LxqX+tgayFnd eJPs6AgvzFPWyw6ybz6dxIu1HFby2ZQC6ZQ8BqCzZTsNxZfH9e68Lu33rS5kOveyKZfRP8 2Uo8JM+vXSJTtPeE1R44x69FvXfvc2Tdp8wiHX+aYhr5rPGfSAL8d3Ni8iByepvzKJ4OzI vMGRwcjJ2gcp+xD84Cw+IVzHH4spBo3vjqKwy1tW95VqrY/HegoQ9dNYqZJTaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shs0B0nYQzvwy; Sat, 2 Dec 2023 00:54: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 3B20so9i024791; Sat, 2 Dec 2023 00:54:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20soM6024788; Sat, 2 Dec 2023 00:54:50 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:50 GMT Message-Id: <202312020054.3B20soM6024788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: b67fd157b2f6 - stable/14 - tzsetup: make UTC the first (default) region List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: b67fd157b2f66a8ddf057378406940708597ca95 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b67fd157b2f66a8ddf057378406940708597ca95 commit b67fd157b2f66a8ddf057378406940708597ca95 Author: Brooks Davis AuthorDate: 2023-10-30 23:33:14 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:03:25 +0000 tzsetup: make UTC the first (default) region Many sysadmins prefer to configure their systems to UTC and it's a reasonable default when installing, making it easier to get a usable system by just hitting repeatidly. Renumber UTC to 0 to preserve the finger memory of those selecting a region by shortcut. Reviewed by: jrtc27, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42383 (cherry picked from commit 6f7c45056f6911b02e7c07011e3602775edad22d) --- usr.sbin/tzsetup/tzsetup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c index 4279f888a33f..f6440a0ea736 100644 --- a/usr.sbin/tzsetup/tzsetup.c +++ b/usr.sbin/tzsetup/tzsetup.c @@ -171,6 +171,7 @@ static struct continent_names { const char *name; struct continent *continent; } continent_names[] = { + { "UTC", &utc }, { "Africa", &africa }, { "America", &america }, { "Antarctica", &antarctica }, @@ -181,13 +182,13 @@ static struct continent_names { { "Europe", &europe }, { "Indian", &indian }, { "Pacific", &pacific }, - { "UTC", &utc } }; static struct continent_items { char prompt[3]; char title[30]; } continent_items[] = { + { "0", "UTC" }, { "1", "Africa" }, { "2", "America -- North and South" }, { "3", "Antarctica" }, @@ -198,14 +199,13 @@ static struct continent_items { { "8", "Europe" }, { "9", "Indian Ocean" }, { "10", "Pacific Ocean" }, - { "11", "UTC" } }; #define NCONTINENTS \ (int)((sizeof(continent_items)) / (sizeof(continent_items[0]))) static dialogMenuItem continents[NCONTINENTS]; -#define OCEANP(x) ((x) == 3 || (x) == 5 || (x) == 8 || (x) == 9) +#define OCEANP(x) ((x) == 4 || (x) == 6 || (x) == 9 || (x) == 10) static int continent_country_menu(dialogMenuItem *continent) From nobody Sat Dec 2 00:54:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shs0C3WbLz52nDV; Sat, 2 Dec 2023 00:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Shs0C2pnmz3BmH; Sat, 2 Dec 2023 00:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=03rF5OMcbfjRC30gnO11TL83jJAh3Jf9e9tv/ZYXFjg=; b=YycM720onHtq9YrdCWHnUZx4U76a5Ba4Tg3ogeUc98FKrCa8ZYrl1wFMvijoWAQ38DnNnD cH9i5e/4OptTZks2Q3yro5tHyxeDVgcPO8TXb1XhzoukN6KtgfosIFmV8jF7uY+QL1Bdyk vB01SCLARG9MMttmyPInDTpDsgSEVg21opDkYlfQmLwmiaT3kc1KISPLWyP2y1WDn/uBnB LJY0BZTk8aDl5dhYglCUm55Tk+01IvZhzN06pPSajv1ddkZgX8WWlCIoAHqdg+3eb9PNBj K/Tj7WUaWoorFSEWSi9IZfoBIBrzCoEprVFhNtQMLHHe2f1/vhRuLyYIaS71Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=03rF5OMcbfjRC30gnO11TL83jJAh3Jf9e9tv/ZYXFjg=; b=b0i3ca5vm+2T+G7GwUbcd80Pi9f4W/SadzA4dsq1kh7uOU7e6qwEByaf2s6pgZ2wfIyDUr 21But+Cs0CUsQymsLDbbvlf0IWxIpN8qBMCjQTOedd8R4ph/VHy+xsRVOV9MRQeDqc5B1H /GkVZYhAI8vpyqg4O2d/DrETwAdgdT2yG02d0c7dbBzThk8H4pMJdDnGN3BALgzJKOrdAj aV1rQDM1Ii/bIBiMVwdxxPtU85i1k2MaDuKAkSI8j8krQrMEuwBGULZHrXd0n1jLmn6Ty8 H1dIRWn7plTWo+vRs9eBq+7e2mKhA+rUOeG2l4x5OOJq5SmvxdXA99goPdnjkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478491; a=rsa-sha256; cv=none; b=JZGihWyWtLE4dmNtk9i1Eid7H3S+VVy4yejlzJxrwyrpPxhT2qcHRUOMUIjDgpBJs8uHEC FI0uuBwsh2zqydvzOGwypUTT9B2ypZjtTs5NKORAegGUpCD1dQQzkfEEf5zBsf8mR/lZYu YXebOYjdU7cyT3vIm8mBBVWn3B4RRBLJwC8LULyaL/wMu5l3BgoANglpy/p7sRWp/klIKN fCYSCETr/gH1WfrjbXVHdhTRbth2ALZpLL/N67MBsCeQeSLY+1v/ZwIOf5XaEIyj40VFax XhYqQ5LWjzfogsPpRgypscgXFt47zBZUACFXzjbi7ZZjkKm5z49OofO9Xz+JZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shs0C1qf9zwcY; Sat, 2 Dec 2023 00:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B20spGb024837; Sat, 2 Dec 2023 00:54:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20spfe024834; Sat, 2 Dec 2023 00:54:51 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:51 GMT Message-Id: <202312020054.3B20spfe024834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 19a185085516 - stable/14 - Sort MK_BSD_CPIO before MK_BSDINSTALL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 19a18508551685628bc725039896b1ac0737dce2 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=19a18508551685628bc725039896b1ac0737dce2 commit 19a18508551685628bc725039896b1ac0737dce2 Author: Brooks Davis AuthorDate: 2023-11-09 00:54:22 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:11:30 +0000 Sort MK_BSD_CPIO before MK_BSDINSTALL Using sort(1) order makes verification of the sort easier. Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 (cherry picked from commit 4ca5df80393e1f2bf6ac26af42fc7246acb59f71) --- tools/build/mk/OptionalObsoleteFiles.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index b782f8d102b0..56faed2a27f3 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -400,13 +400,6 @@ OLD_FILES+=usr/sbin/bootptest OLD_FILES+=usr/share/man/man8/bootptest.8.gz .endif -.if ${MK_BSD_CPIO} == no -OLD_FILES+=usr/bin/bsdcpio -OLD_FILES+=usr/bin/cpio -OLD_FILES+=usr/share/man/man1/bsdcpio.1.gz -OLD_FILES+=usr/share/man/man1/cpio.1.gz -.endif - .if ${MK_BSDINSTALL} == no OLD_FILES+=usr/libexec/bsdinstall/adduser OLD_FILES+=usr/libexec/bsdinstall/auto @@ -445,6 +438,13 @@ OLD_FILES+=usr/share/man/man8/sade.8.gz OLD_DIRS+=usr/libexec/bsdinstall .endif +.if ${MK_BSD_CPIO} == no +OLD_FILES+=usr/bin/bsdcpio +OLD_FILES+=usr/bin/cpio +OLD_FILES+=usr/share/man/man1/bsdcpio.1.gz +OLD_FILES+=usr/share/man/man1/cpio.1.gz +.endif + .if ${MK_BSNMP} == no OLD_FILES+=etc/snmpd.config OLD_FILES+=etc/rc.d/bsnmpd From nobody Sat Dec 2 00:54:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shs0D4kVYz52nKB; Sat, 2 Dec 2023 00:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Shs0D3WZ2z3BvQ; Sat, 2 Dec 2023 00:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J5O0yHiY751O6Xa/UcXkRmJgN6bvX7dtE/Ropvy67O8=; b=thGx0GsJBsUgSsQmGqIvsx67rKBJs8TaK9Qv+f/herddE7xoHw7mgg8p/3eZp0AfWM93WL RvWxbx095sig4oPlRoQL9vErZ+1JyrpEdC96XUgqkpMg0gdFzpkudFSM1fwaZF64K1VRDW 6JUYHUfMEqNJG+2UNxwPeMTXbUNDqOGSCmAyiv/jVfHDGskEQsbfODMoP558u3CibASeBn URpgSpRl7Z3U4sa58LEecqW/7/cylqDDWD9M+5PIel17tOdnwSoWotYVXOSYUz28W0hNFi Uy7fyeV3x/B8N6xZM81TZ0SVQ5Bi30iZAdYFpFU+xj5AsunWewG7XVN2NHKISg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J5O0yHiY751O6Xa/UcXkRmJgN6bvX7dtE/Ropvy67O8=; b=RC2ybtX8qTQertQm1E/VTgmpHZh34FM/wYhrDVXMgNTH3c63ZVHM6Guj9mtaCDU37qVOKg yhcESjr96/WybQF0J0+qhYnqoTWaZrJGDXPRWr6akJT+3dfDXOzy49WCMJlOYw0fZahrUM 00JiEe54xPw+2F7BeLoOeqzy7CX8rJKn3so8CBLC+Rsn8L1sOnKERuYPrXY6UQ9IIJhUoJ VVEvKWekmwtIUQ5YzshZG9aufG47RgG7aLbGITygR5vdCOjly8ntt8raNKIYGYAN3ewDSv PjKdCtD/I24VwmUlUi0LudD4+4hSHPgvPMDPtFWAYfFYatw/x/bXAFeaBetc2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478492; a=rsa-sha256; cv=none; b=trXla7lXuKM2wSxsmKJ+dpVoVwnBghf0maXmCRvpTrOM7Fpq4tjjHjzGASB9ZK3D418U32 5mJyu/xE2uTHfmppJIE4+IB9A+ktISUv3fyoV/Rq9RRYgVznByytfOZBar+yFmQKeHp9TB QIeXmH/vh8EODdhqO1dcjuBs0g9kfJbKsA2demna2aKOZql72s4ZRMzc7MZZUxZfT/ShKX zU34/UCAnx4gX+4zvgNc3QJVa2HtxH+QfNLcE/2pFgHE81BLT+bhU9sGi/1QNELfx+YjgN oGBBaCbtsPpUbVliHxXCACTbSzvI5ZD7EqCyAruxTfWAv4btApPZ3+FMqBUhhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shs0D2Y1szwHV; Sat, 2 Dec 2023 00:54: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 3B20sqtr024875; Sat, 2 Dec 2023 00:54:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20sq8x024872; Sat, 2 Dec 2023 00:54:52 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:52 GMT Message-Id: <202312020054.3B20sq8x024872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 298dcc251b6e - stable/14 - Sort MK_HYPERV option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 298dcc251b6e075c48e96eac1aec12de9fadf1b5 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=298dcc251b6e075c48e96eac1aec12de9fadf1b5 commit 298dcc251b6e075c48e96eac1aec12de9fadf1b5 Author: Brooks Davis AuthorDate: 2023-11-09 01:08:20 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:11:30 +0000 Sort MK_HYPERV option Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 (cherry picked from commit e70ad278f45d72a8209e61a312481910d3e03b45) --- tools/build/mk/OptionalObsoleteFiles.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 56faed2a27f3..0efe377435d1 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2462,6 +2462,16 @@ OLD_FILES+=usr/share/doc/ntp/release.html OLD_FILES+=usr/share/doc/ntp/tickadj.html .endif +.if ${MK_HYPERV} == no +OLD_FILES+=etc/devd/hyperv.conf +OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig +OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info +OLD_FILES+=usr/libexec/hyperv/hv_get_dhcp_info +OLD_FILES+=usr/sbin/hv_kvp_daemon +OLD_FILES+=usr/sbin/hv_vss_daemon +OLD_FILES+=usr/share/man/man8/hv_kvp_daemon.8.gz +.endif + .if ${MK_ICONV} == no OLD_FILES+=usr/bin/iconv OLD_FILES+=usr/bin/mkcsmapper @@ -9174,16 +9184,6 @@ OLD_FILES+=usr/share/snmp/defs/wlan_tree.def OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt .endif -.if ${MK_HYPERV} == no -OLD_FILES+=etc/devd/hyperv.conf -OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig -OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info -OLD_FILES+=usr/libexec/hyperv/hv_get_dhcp_info -OLD_FILES+=usr/sbin/hv_kvp_daemon -OLD_FILES+=usr/sbin/hv_vss_daemon -OLD_FILES+=usr/share/man/man8/hv_kvp_daemon.8.gz -.endif - .if ${MK_ZONEINFO} == no OLD_FILES+=usr/share/zoneinfo/Africa/Abidjan OLD_FILES+=usr/share/zoneinfo/Africa/Accra From nobody Sat Dec 2 00:54:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shs0F6rknz52nB9; Sat, 2 Dec 2023 00:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Shs0F4Fgnz4gKd; Sat, 2 Dec 2023 00:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xSTMtJg0NI+kQ7cB0hiGIUu5xkjUXGMwvv8HTaWJWbI=; b=gTHV39r9j6vLjFDjAl9xmtjNX55p6dYkZmDJPMV8YJFK+LbfCSoC/tFy5/SeDpX288cpjz uyWDUHKKkONwkYnvmg4IeMlHQm7DLWqMtBJmORrlZPktdJ8z313DzUw4NCClUxWChYyWs6 RL1+k9YodBW3ljBPkzb4m9Mj9ppM26Z+fzFYHT9FAXiBNH4s6HDYVkokXgC792fAaYqJXm 1KUpNlq8yRpMkXNOn0AA0ZR7lZ00sWJh3Un+TNkINSOFg1pMmxVjQYxNbsM1l+xjeYtHHl Ic8i1s1Q4kmojUYG02Vx76f62zUXTxCPy3BPQ1hVV90494nrnkFJR0wY/uoM2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xSTMtJg0NI+kQ7cB0hiGIUu5xkjUXGMwvv8HTaWJWbI=; b=P6Dsa6jzr/cyiEoIxYUD6AM7o1cH4RAzzsil9t9/U/mnqpRQhvxdNPM0SYuZNtjG6/nxjK ZzoRzjgN/pFzkRCJzIhcPRM/d8Zf7XocsV9q7s7NQuqZQQx7TxMLKM8e6NrW4I/GfjhpSq 5XPHha5fLWsy0B9VB9EfBGQZ1PL9DW3LsCvV+riksfMNnFIlEzyaeMHEwBQMNXJ1+06J4P kbEAA6gKX5MBBgrLajY0L0kvwim+m7wD3bij29xnUXnn87OigElZgvW/2p5cjKSzyTIG2O 6GTsEuG5Qfi43RBoRNAhLkj2dVUxM8S13sZc6uHvWKkoW3nW5H08nT0n4RIquQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478493; a=rsa-sha256; cv=none; b=BBXAMsZeyl/youXQpclRQhrLHSwCNz2+5uotHuUadqZ71uMLKYPrmVL+WUVU3WcRFIBe83 l9cs1dWEzbPVVt19ST8LOlfvckzTMD8rLu7jNR9VSunMntdW1xhtAH7CVRaWYPUrRf13jq 3IStFMFEJR13D0SF66Ph5UvJJlF5mjfhk5QNYe7kFUN3uWn2864+/inimOdJ6Ty5DEA4cc 1IDZ1tFytDs3teWvLr9wsscD7V/SiBl2EVIQ8hMEdK/dQTrD5/15XSNTgjL/JooC/Mj+GZ v59fNM/2RWP1JjbQh7sNaCJMTtDCK+iMpcjS7UPEeuWU9lXDup5Idb2GTy52Tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shs0F3MTqzwHW; Sat, 2 Dec 2023 00:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B20srqj024917; Sat, 2 Dec 2023 00:54:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20srY1024914; Sat, 2 Dec 2023 00:54:53 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:53 GMT Message-Id: <202312020054.3B20srY1024914@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: e4f8bc4dbef6 - stable/14 - Sort MK_DTRACE and MK_ZFS options List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e4f8bc4dbef667c96b57190da4c2bc662c28c7b5 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e4f8bc4dbef667c96b57190da4c2bc662c28c7b5 commit e4f8bc4dbef667c96b57190da4c2bc662c28c7b5 Author: Brooks Davis AuthorDate: 2023-11-09 00:55:59 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:11:31 +0000 Sort MK_DTRACE and MK_ZFS options Presumably these were under MK_CDDL at some point, but these days src.opts.mk takes care of setting them to "no" when MK_CDDL is. Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 (cherry picked from commit a62cefbb5c835eb17057bca98106f325b13bdead) --- tools/build/mk/OptionalObsoleteFiles.inc | 540 +++++++++++++++---------------- 1 file changed, 270 insertions(+), 270 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 0efe377435d1..d6c1d2ba0a22 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -874,266 +874,6 @@ OLD_FILES+=usr/share/man/man4/ccd.4.gz OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz .endif -.if ${MK_DTRACE} == no -OLD_LIBS+=lib/libctf.so.2 -OLD_LIBS+=lib/libdtrace.so.2 -OLD_FILES+=usr/bin/ctfconvert -OLD_FILES+=usr/bin/ctfdump -OLD_FILES+=usr/bin/ctfmerge -OLD_FILES+=usr/lib/dtrace/drti.o -OLD_FILES+=usr/lib/dtrace/errno.d -OLD_FILES+=usr/lib/dtrace/io.d -OLD_FILES+=usr/lib/dtrace/ip.d -OLD_FILES+=usr/lib/dtrace/ipfw.d -OLD_FILES+=usr/lib/dtrace/mbuf.d -OLD_FILES+=usr/lib/dtrace/psinfo.d -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" -OLD_FILES+=usr/lib/dtrace/regs_x86.d -.endif -OLD_FILES+=usr/lib/dtrace/sctp.d -OLD_FILES+=usr/lib/dtrace/siftr.d -OLD_FILES+=usr/lib/dtrace/signal.d -OLD_FILES+=usr/lib/dtrace/socket.d -OLD_FILES+=usr/lib/dtrace/tcp.d -OLD_FILES+=usr/lib/dtrace/udp.d -OLD_FILES+=usr/lib/dtrace/udplite.d -OLD_FILES+=usr/lib/dtrace/unistd.d -OLD_FILES+=usr/lib/libctf.a -OLD_FILES+=usr/lib/libctf.so -OLD_FILES+=usr/lib/libctf_p.a -OLD_FILES+=usr/lib/libdtrace.a -OLD_FILES+=usr/lib/libdtrace.so -OLD_FILES+=usr/lib/libdtrace_p.a -OLD_LIBS+=lib/libdtrace.so.2 -OLD_FILES+=usr/libexec/dwatch/chmod -OLD_FILES+=usr/libexec/dwatch/errno -OLD_FILES+=usr/libexec/dwatch/fchmodat -OLD_FILES+=usr/libexec/dwatch/io -OLD_FILES+=usr/libexec/dwatch/io-done -OLD_FILES+=usr/libexec/dwatch/io-start -OLD_FILES+=usr/libexec/dwatch/ip -OLD_FILES+=usr/libexec/dwatch/ip-receive -OLD_FILES+=usr/libexec/dwatch/ip-send -OLD_FILES+=usr/libexec/dwatch/kill -OLD_FILES+=usr/libexec/dwatch/lchmod -OLD_FILES+=usr/libexec/dwatch/nanosleep -OLD_FILES+=usr/libexec/dwatch/open -OLD_FILES+=usr/libexec/dwatch/openat -OLD_FILES+=usr/libexec/dwatch/proc -OLD_FILES+=usr/libexec/dwatch/proc-create -OLD_FILES+=usr/libexec/dwatch/proc-exec -OLD_FILES+=usr/libexec/dwatch/proc-exec-failure -OLD_FILES+=usr/libexec/dwatch/proc-exec-success -OLD_FILES+=usr/libexec/dwatch/proc-exit -OLD_FILES+=usr/libexec/dwatch/proc-signal -OLD_FILES+=usr/libexec/dwatch/proc-signal-clear -OLD_FILES+=usr/libexec/dwatch/proc-signal-discard -OLD_FILES+=usr/libexec/dwatch/proc-signal-send -OLD_FILES+=usr/libexec/dwatch/proc-status -OLD_FILES+=usr/libexec/dwatch/read -OLD_FILES+=usr/libexec/dwatch/recv -OLD_FILES+=usr/libexec/dwatch/recvfrom -OLD_FILES+=usr/libexec/dwatch/recvmsg -OLD_FILES+=usr/libexec/dwatch/rw -OLD_FILES+=usr/libexec/dwatch/sched -OLD_FILES+=usr/libexec/dwatch/sched-change-pri -OLD_FILES+=usr/libexec/dwatch/sched-cpu -OLD_FILES+=usr/libexec/dwatch/sched-dequeue -OLD_FILES+=usr/libexec/dwatch/sched-enqueue -OLD_FILES+=usr/libexec/dwatch/sched-exec -OLD_FILES+=usr/libexec/dwatch/sched-lend-pri -OLD_FILES+=usr/libexec/dwatch/sched-load-change -OLD_FILES+=usr/libexec/dwatch/sched-off-cpu -OLD_FILES+=usr/libexec/dwatch/sched-on-cpu -OLD_FILES+=usr/libexec/dwatch/sched-preempt -OLD_FILES+=usr/libexec/dwatch/sched-pri -OLD_FILES+=usr/libexec/dwatch/sched-queue -OLD_FILES+=usr/libexec/dwatch/sched-remain-cpu -OLD_FILES+=usr/libexec/dwatch/sched-sleep -OLD_FILES+=usr/libexec/dwatch/sched-surrender -OLD_FILES+=usr/libexec/dwatch/sched-tick -OLD_FILES+=usr/libexec/dwatch/sched-wakeup -OLD_FILES+=usr/libexec/dwatch/send -OLD_FILES+=usr/libexec/dwatch/sendmsg -OLD_FILES+=usr/libexec/dwatch/sendrecv -OLD_FILES+=usr/libexec/dwatch/sendto -OLD_FILES+=usr/libexec/dwatch/systop -OLD_FILES+=usr/libexec/dwatch/tcp -OLD_FILES+=usr/libexec/dwatch/tcp-accept -OLD_FILES+=usr/libexec/dwatch/tcp-accept-established -OLD_FILES+=usr/libexec/dwatch/tcp-accept-refused -OLD_FILES+=usr/libexec/dwatch/tcp-connect -OLD_FILES+=usr/libexec/dwatch/tcp-connect-established -OLD_FILES+=usr/libexec/dwatch/tcp-connect-refused -OLD_FILES+=usr/libexec/dwatch/tcp-connect-request -OLD_FILES+=usr/libexec/dwatch/tcp-established -OLD_FILES+=usr/libexec/dwatch/tcp-init -OLD_FILES+=usr/libexec/dwatch/tcp-io -OLD_FILES+=usr/libexec/dwatch/tcp-receive -OLD_FILES+=usr/libexec/dwatch/tcp-refused -OLD_FILES+=usr/libexec/dwatch/tcp-send -OLD_FILES+=usr/libexec/dwatch/tcp-state-change -OLD_FILES+=usr/libexec/dwatch/tcp-status -OLD_FILES+=usr/libexec/dwatch/udp -OLD_FILES+=usr/libexec/dwatch/udp-receive -OLD_FILES+=usr/libexec/dwatch/udp-send -OLD_FILES+=usr/libexec/dwatch/udplite -OLD_FILES+=usr/libexec/dwatch/udplite-receive -OLD_FILES+=usr/libexec/dwatch/udplite-send -OLD_FILES+=usr/libexec/dwatch/vop_create -OLD_FILES+=usr/libexec/dwatch/vop_lookup -OLD_FILES+=usr/libexec/dwatch/vop_mkdir -OLD_FILES+=usr/libexec/dwatch/vop_mknod -OLD_FILES+=usr/libexec/dwatch/vop_readdir -OLD_FILES+=usr/libexec/dwatch/vop_remove -OLD_FILES+=usr/libexec/dwatch/vop_rename -OLD_FILES+=usr/libexec/dwatch/vop_rmdir -OLD_FILES+=usr/libexec/dwatch/vop_symlink -OLD_FILES+=usr/libexec/dwatch/write -OLD_FILES+=usr/sbin/dtrace -OLD_FILES+=usr/sbin/dwatch -OLD_FILES+=usr/sbin/lockstat -OLD_FILES+=usr/sbin/plockstat -OLD_FILES+=usr/share/man/man1/dtrace.1.gz -OLD_FILES+=usr/share/man/man1/dtruss.1.gz -OLD_FILES+=usr/share/man/man1/lockstat.1.gz -OLD_FILES+=usr/share/man/man1/plockstat.1.gz -OLD_FILES+=usr/share/dtrace/blocking -OLD_FILES+=usr/share/dtrace/disklatency -OLD_FILES+=usr/share/dtrace/disklatencycmd -OLD_FILES+=usr/share/dtrace/hotopen -OLD_FILES+=usr/share/dtrace/nfsattrstats -OLD_FILES+=usr/share/dtrace/nfsclienttime -OLD_FILES+=usr/share/dtrace/siftr -OLD_FILES+=usr/share/dtrace/toolkit/execsnoop -OLD_FILES+=usr/share/dtrace/toolkit/hotkernel -OLD_FILES+=usr/share/dtrace/toolkit/hotuser -OLD_FILES+=usr/share/dtrace/toolkit/opensnoop -OLD_FILES+=usr/share/dtrace/toolkit/procsystime -OLD_FILES+=usr/share/dtrace/tcpconn -OLD_FILES+=usr/share/dtrace/tcpdebug -OLD_FILES+=usr/share/dtrace/tcpstate -OLD_FILES+=usr/share/dtrace/tcptrack -OLD_FILES+=usr/share/dtrace/udptrack -OLD_FILES+=usr/share/man/man1/dtrace.1.gz -OLD_DIRS+=usr/lib/dtrace -. for libcompat in ${_ALL_libcompats} -OLD_DIRS+=usr/lib${libcompat}/dtrace -. endfor -OLD_DIRS+=usr/libexec/dwatch -OLD_DIRS+=usr/share/dtrace/toolkit -OLD_DIRS+=usr/share/dtrace -.endif - -.if ${MK_ZFS} == no -OLD_FILES+=boot/gptzfsboot -OLD_FILES+=boot/zfsboot -OLD_FILES+=boot/zfsloader -OLD_FILES+=etc/rc.d/zfs -OLD_FILES+=etc/rc.d/zfsbe -OLD_FILES+=etc/rc.d/zfsd -OLD_FILES+=etc/rc.d/zfskeys -OLD_FILES+=etc/rc.d/zvol -OLD_FILES+=etc/devd/zfs.conf -OLD_FILES+=etc/periodic/daily/404.status-zfs -OLD_FILES+=etc/periodic/daily/800.scrub-zfs -OLD_FILES+=etc/zfs/exports -OLD_DIRS+=etc/zfs -OLD_LIBS+=lib/libavl.so.2 -OLD_LIBS+=lib/libnvpair.so.2 -OLD_LIBS+=lib/libumem.so.2 -OLD_LIBS+=lib/libuutil.so.2 -OLD_LIBS+=lib/libzfs.so.2 -OLD_LIBS+=lib/libzfs.so.3 -OLD_LIBS+=lib/libzfs_core.so.2 -OLD_LIBS+=lib/libzpool.so.2 -OLD_FILES+=rescue/zdb -OLD_FILES+=rescue/zfs -OLD_FILES+=rescue/zpool -OLD_FILES+=sbin/bectl -OLD_FILES+=sbin/zfs -OLD_FILES+=sbin/zpool -OLD_FILES+=sbin/zfsbootcfg -OLD_FILES+=usr/bin/zinject -OLD_FILES+=usr/bin/zstreamdump -OLD_FILES+=usr/bin/ztest -OLD_FILES+=usr/lib/libbe.a -OLD_FILES+=usr/lib/libbe_p.a -OLD_FILES+=usr/lib/libbe.so -OLD_LIBS+=lib/libbe.so.1 -OLD_FILES+=usr/lib/libavl.a -OLD_FILES+=usr/lib/libavl.so -OLD_FILES+=usr/lib/libavl_p.a -OLD_FILES+=usr/lib/libnvpair.a -OLD_FILES+=usr/lib/libnvpair.so -OLD_FILES+=usr/lib/libnvpair_p.a -OLD_FILES+=usr/lib/libumem.a -OLD_FILES+=usr/lib/libumem.so -OLD_FILES+=usr/lib/libumem_p.a -OLD_FILES+=usr/lib/libuutil.a -OLD_FILES+=usr/lib/libuutil.so -OLD_FILES+=usr/lib/libuutil_p.a -OLD_FILES+=usr/lib/libzfs.a -OLD_FILES+=usr/lib/libzfs.so -OLD_FILES+=usr/lib/libzfs_core.a -OLD_FILES+=usr/lib/libzfs_core.so -OLD_FILES+=usr/lib/libzfs_core_p.a -OLD_FILES+=usr/lib/libzfs_p.a -OLD_FILES+=usr/lib/libzpool.a -OLD_FILES+=usr/lib/libzpool.so -OLD_LIBS+=usr/lib/libzpool.so.2 -OLD_FILES+=usr/sbin/zfsd -OLD_FILES+=usr/sbin/zhack -OLD_FILES+=usr/sbin/zdb -OLD_FILES+=usr/share/man/man3/be_activate.3.gz -OLD_FILES+=usr/share/man/man3/be_active_name.3.gz -OLD_FILES+=usr/share/man/man3/be_active_path.3.gz -OLD_FILES+=usr/share/man/man3/be_create_depth.3.gz -OLD_FILES+=usr/share/man/man3/be_create_from_existing_snap.3.gz -OLD_FILES+=usr/share/man/man3/be_create_from_existing.3.gz -OLD_FILES+=usr/share/man/man3/be_create.3.gz -OLD_FILES+=usr/share/man/man3/be_deactivate.3.gz -OLD_FILES+=usr/share/man/man3/be_destroy.3.gz -OLD_FILES+=usr/share/man/man3/be_exists.3.gz -OLD_FILES+=usr/share/man/man3/be_export.3.gz -OLD_FILES+=usr/share/man/man3/be_get_bootenv_props.3.gz -OLD_FILES+=usr/share/man/man3/be_get_dataset_props.3.gz -OLD_FILES+=usr/share/man/man3/be_get_dataset_snapshots.3.gz -OLD_FILES+=usr/share/man/man3/be_import.3.gz -OLD_FILES+=usr/share/man/man3/be_is_auto_snapshot_name.3.gz -OLD_FILES+=usr/share/man/man3/be_mount.3.gz -OLD_FILES+=usr/share/man/man3/be_mounted_at.3.gz -OLD_FILES+=usr/share/man/man3/be_nextboot_name.3.gz -OLD_FILES+=usr/share/man/man3/be_nextboot_path.3.gz -OLD_FILES+=usr/share/man/man3/be_nicenum.3.gz -OLD_FILES+=usr/share/man/man3/be_prop_list_alloc.3.gz -OLD_FILES+=usr/share/man/man3/be_prop_list_free.3.gz -OLD_FILES+=usr/share/man/man3/be_rename.3.gz -OLD_FILES+=usr/share/man/man3/be_root_concat.3.gz -OLD_FILES+=usr/share/man/man3/be_root_path.3.gz -OLD_FILES+=usr/share/man/man3/be_snapshot.3.gz -OLD_FILES+=usr/share/man/man3/be_unmount.3.gz -OLD_FILES+=usr/share/man/man3/be_validate_name.3.gz -OLD_FILES+=usr/share/man/man3/be_validate_snap.3.gz -OLD_FILES+=usr/share/man/man3/libbe_close.3.gz -OLD_FILES+=usr/share/man/man3/libbe_errno.3.gz -OLD_FILES+=usr/share/man/man3/libbe_error_description.3.gz -OLD_FILES+=usr/share/man/man3/libbe_init.3.gz -OLD_FILES+=usr/share/man/man3/libbe_print_on_error.3.gz -OLD_FILES+=usr/share/man/man3/libbe.3.gz -OLD_FILES+=usr/share/man/man5/zpool-features.5.gz -OLD_FILES+=usr/share/man/man8/bectl.8.gz -OLD_FILES+=usr/share/man/man8/gptzfsboot.8.gz -OLD_FILES+=usr/share/man/man8/zdb.8.gz -OLD_FILES+=usr/share/man/man8/zfs-program.8.gz -OLD_FILES+=usr/share/man/man8/zfs.8.gz -OLD_FILES+=usr/share/man/man8/zfsboot.8.gz -OLD_FILES+=usr/share/man/man8/zfsbootcfg.8.gz -OLD_FILES+=usr/share/man/man8/zfsd.8.gz -OLD_FILES+=usr/share/man/man8/zfsloader.8.gz -OLD_FILES+=usr/share/man/man8/zpool.8.gz -.endif - .if ${MK_CLANG} == no && ${MK_LLVM_BINUTILS} == no OLD_FILES+=usr/bin/llvm-addr2line OLD_FILES+=usr/bin/llvm-ar @@ -1674,16 +1414,167 @@ OLD_FILES+=usr/share/dict/web2a OLD_FILES+=usr/share/dict/words OLD_DIRS+=usr/share/dict .endif - -.if ${MK_DMAGENT} == no -OLD_FILES+=etc/dma/dma.conf -OLD_DIRS+=etc/dma -OLD_FILES+=usr/libexec/dma -OLD_FILES+=usr/libexec/dma-mbox-create -OLD_FILES+=usr/share/man/man8/dma.8.gz -OLD_FILES+=usr/share/examples/dma/auth.conf -OLD_FILES+=usr/share/examples/dma/mailer.conf -OLD_DIRS+=usr/share/examples/dma + +.if ${MK_DMAGENT} == no +OLD_FILES+=etc/dma/dma.conf +OLD_DIRS+=etc/dma +OLD_FILES+=usr/libexec/dma +OLD_FILES+=usr/libexec/dma-mbox-create +OLD_FILES+=usr/share/man/man8/dma.8.gz +OLD_FILES+=usr/share/examples/dma/auth.conf +OLD_FILES+=usr/share/examples/dma/mailer.conf +OLD_DIRS+=usr/share/examples/dma +.endif + +.if ${MK_DTRACE} == no +OLD_LIBS+=lib/libctf.so.2 +OLD_LIBS+=lib/libdtrace.so.2 +OLD_FILES+=usr/bin/ctfconvert +OLD_FILES+=usr/bin/ctfdump +OLD_FILES+=usr/bin/ctfmerge +OLD_FILES+=usr/lib/dtrace/drti.o +OLD_FILES+=usr/lib/dtrace/errno.d +OLD_FILES+=usr/lib/dtrace/io.d +OLD_FILES+=usr/lib/dtrace/ip.d +OLD_FILES+=usr/lib/dtrace/ipfw.d +OLD_FILES+=usr/lib/dtrace/mbuf.d +OLD_FILES+=usr/lib/dtrace/psinfo.d +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/lib/dtrace/regs_x86.d +.endif +OLD_FILES+=usr/lib/dtrace/sctp.d +OLD_FILES+=usr/lib/dtrace/siftr.d +OLD_FILES+=usr/lib/dtrace/signal.d +OLD_FILES+=usr/lib/dtrace/socket.d +OLD_FILES+=usr/lib/dtrace/tcp.d +OLD_FILES+=usr/lib/dtrace/udp.d +OLD_FILES+=usr/lib/dtrace/udplite.d +OLD_FILES+=usr/lib/dtrace/unistd.d +OLD_FILES+=usr/lib/libctf.a +OLD_FILES+=usr/lib/libctf.so +OLD_FILES+=usr/lib/libctf_p.a +OLD_FILES+=usr/lib/libdtrace.a +OLD_FILES+=usr/lib/libdtrace.so +OLD_FILES+=usr/lib/libdtrace_p.a +OLD_LIBS+=lib/libdtrace.so.2 +OLD_FILES+=usr/libexec/dwatch/chmod +OLD_FILES+=usr/libexec/dwatch/errno +OLD_FILES+=usr/libexec/dwatch/fchmodat +OLD_FILES+=usr/libexec/dwatch/io +OLD_FILES+=usr/libexec/dwatch/io-done +OLD_FILES+=usr/libexec/dwatch/io-start +OLD_FILES+=usr/libexec/dwatch/ip +OLD_FILES+=usr/libexec/dwatch/ip-receive +OLD_FILES+=usr/libexec/dwatch/ip-send +OLD_FILES+=usr/libexec/dwatch/kill +OLD_FILES+=usr/libexec/dwatch/lchmod +OLD_FILES+=usr/libexec/dwatch/nanosleep +OLD_FILES+=usr/libexec/dwatch/open +OLD_FILES+=usr/libexec/dwatch/openat +OLD_FILES+=usr/libexec/dwatch/proc +OLD_FILES+=usr/libexec/dwatch/proc-create +OLD_FILES+=usr/libexec/dwatch/proc-exec +OLD_FILES+=usr/libexec/dwatch/proc-exec-failure +OLD_FILES+=usr/libexec/dwatch/proc-exec-success +OLD_FILES+=usr/libexec/dwatch/proc-exit +OLD_FILES+=usr/libexec/dwatch/proc-signal +OLD_FILES+=usr/libexec/dwatch/proc-signal-clear +OLD_FILES+=usr/libexec/dwatch/proc-signal-discard +OLD_FILES+=usr/libexec/dwatch/proc-signal-send +OLD_FILES+=usr/libexec/dwatch/proc-status +OLD_FILES+=usr/libexec/dwatch/read +OLD_FILES+=usr/libexec/dwatch/recv +OLD_FILES+=usr/libexec/dwatch/recvfrom +OLD_FILES+=usr/libexec/dwatch/recvmsg +OLD_FILES+=usr/libexec/dwatch/rw +OLD_FILES+=usr/libexec/dwatch/sched +OLD_FILES+=usr/libexec/dwatch/sched-change-pri +OLD_FILES+=usr/libexec/dwatch/sched-cpu +OLD_FILES+=usr/libexec/dwatch/sched-dequeue +OLD_FILES+=usr/libexec/dwatch/sched-enqueue +OLD_FILES+=usr/libexec/dwatch/sched-exec +OLD_FILES+=usr/libexec/dwatch/sched-lend-pri +OLD_FILES+=usr/libexec/dwatch/sched-load-change +OLD_FILES+=usr/libexec/dwatch/sched-off-cpu +OLD_FILES+=usr/libexec/dwatch/sched-on-cpu +OLD_FILES+=usr/libexec/dwatch/sched-preempt +OLD_FILES+=usr/libexec/dwatch/sched-pri +OLD_FILES+=usr/libexec/dwatch/sched-queue +OLD_FILES+=usr/libexec/dwatch/sched-remain-cpu +OLD_FILES+=usr/libexec/dwatch/sched-sleep +OLD_FILES+=usr/libexec/dwatch/sched-surrender +OLD_FILES+=usr/libexec/dwatch/sched-tick +OLD_FILES+=usr/libexec/dwatch/sched-wakeup +OLD_FILES+=usr/libexec/dwatch/send +OLD_FILES+=usr/libexec/dwatch/sendmsg +OLD_FILES+=usr/libexec/dwatch/sendrecv +OLD_FILES+=usr/libexec/dwatch/sendto +OLD_FILES+=usr/libexec/dwatch/systop +OLD_FILES+=usr/libexec/dwatch/tcp +OLD_FILES+=usr/libexec/dwatch/tcp-accept +OLD_FILES+=usr/libexec/dwatch/tcp-accept-established +OLD_FILES+=usr/libexec/dwatch/tcp-accept-refused +OLD_FILES+=usr/libexec/dwatch/tcp-connect +OLD_FILES+=usr/libexec/dwatch/tcp-connect-established +OLD_FILES+=usr/libexec/dwatch/tcp-connect-refused +OLD_FILES+=usr/libexec/dwatch/tcp-connect-request +OLD_FILES+=usr/libexec/dwatch/tcp-established +OLD_FILES+=usr/libexec/dwatch/tcp-init +OLD_FILES+=usr/libexec/dwatch/tcp-io +OLD_FILES+=usr/libexec/dwatch/tcp-receive +OLD_FILES+=usr/libexec/dwatch/tcp-refused +OLD_FILES+=usr/libexec/dwatch/tcp-send +OLD_FILES+=usr/libexec/dwatch/tcp-state-change +OLD_FILES+=usr/libexec/dwatch/tcp-status +OLD_FILES+=usr/libexec/dwatch/udp +OLD_FILES+=usr/libexec/dwatch/udp-receive +OLD_FILES+=usr/libexec/dwatch/udp-send +OLD_FILES+=usr/libexec/dwatch/udplite +OLD_FILES+=usr/libexec/dwatch/udplite-receive +OLD_FILES+=usr/libexec/dwatch/udplite-send +OLD_FILES+=usr/libexec/dwatch/vop_create +OLD_FILES+=usr/libexec/dwatch/vop_lookup +OLD_FILES+=usr/libexec/dwatch/vop_mkdir +OLD_FILES+=usr/libexec/dwatch/vop_mknod +OLD_FILES+=usr/libexec/dwatch/vop_readdir +OLD_FILES+=usr/libexec/dwatch/vop_remove +OLD_FILES+=usr/libexec/dwatch/vop_rename +OLD_FILES+=usr/libexec/dwatch/vop_rmdir +OLD_FILES+=usr/libexec/dwatch/vop_symlink +OLD_FILES+=usr/libexec/dwatch/write +OLD_FILES+=usr/sbin/dtrace +OLD_FILES+=usr/sbin/dwatch +OLD_FILES+=usr/sbin/lockstat +OLD_FILES+=usr/sbin/plockstat +OLD_FILES+=usr/share/man/man1/dtrace.1.gz +OLD_FILES+=usr/share/man/man1/dtruss.1.gz +OLD_FILES+=usr/share/man/man1/lockstat.1.gz +OLD_FILES+=usr/share/man/man1/plockstat.1.gz +OLD_FILES+=usr/share/dtrace/blocking +OLD_FILES+=usr/share/dtrace/disklatency +OLD_FILES+=usr/share/dtrace/disklatencycmd +OLD_FILES+=usr/share/dtrace/hotopen +OLD_FILES+=usr/share/dtrace/nfsattrstats +OLD_FILES+=usr/share/dtrace/nfsclienttime +OLD_FILES+=usr/share/dtrace/siftr +OLD_FILES+=usr/share/dtrace/toolkit/execsnoop +OLD_FILES+=usr/share/dtrace/toolkit/hotkernel +OLD_FILES+=usr/share/dtrace/toolkit/hotuser +OLD_FILES+=usr/share/dtrace/toolkit/opensnoop +OLD_FILES+=usr/share/dtrace/toolkit/procsystime +OLD_FILES+=usr/share/dtrace/tcpconn +OLD_FILES+=usr/share/dtrace/tcpdebug +OLD_FILES+=usr/share/dtrace/tcpstate +OLD_FILES+=usr/share/dtrace/tcptrack +OLD_FILES+=usr/share/dtrace/udptrack +OLD_FILES+=usr/share/man/man1/dtrace.1.gz +OLD_DIRS+=usr/lib/dtrace +. for libcompat in ${_ALL_libcompats} +OLD_DIRS+=usr/lib${libcompat}/dtrace +. endfor +OLD_DIRS+=usr/libexec/dwatch +OLD_DIRS+=usr/share/dtrace/toolkit +OLD_DIRS+=usr/share/dtrace .endif .if ${MK_EE} == no @@ -9184,6 +9075,115 @@ OLD_FILES+=usr/share/snmp/defs/wlan_tree.def OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt .endif +.if ${MK_ZFS} == no +OLD_FILES+=boot/gptzfsboot +OLD_FILES+=boot/zfsboot +OLD_FILES+=boot/zfsloader +OLD_FILES+=etc/rc.d/zfs +OLD_FILES+=etc/rc.d/zfsbe +OLD_FILES+=etc/rc.d/zfsd +OLD_FILES+=etc/rc.d/zfskeys +OLD_FILES+=etc/rc.d/zvol +OLD_FILES+=etc/devd/zfs.conf +OLD_FILES+=etc/periodic/daily/404.status-zfs +OLD_FILES+=etc/periodic/daily/800.scrub-zfs +OLD_FILES+=etc/zfs/exports +OLD_DIRS+=etc/zfs +OLD_LIBS+=lib/libavl.so.2 +OLD_LIBS+=lib/libnvpair.so.2 +OLD_LIBS+=lib/libumem.so.2 +OLD_LIBS+=lib/libuutil.so.2 +OLD_LIBS+=lib/libzfs.so.2 +OLD_LIBS+=lib/libzfs.so.3 +OLD_LIBS+=lib/libzfs_core.so.2 +OLD_LIBS+=lib/libzpool.so.2 +OLD_FILES+=rescue/zdb +OLD_FILES+=rescue/zfs +OLD_FILES+=rescue/zpool +OLD_FILES+=sbin/bectl +OLD_FILES+=sbin/zfs +OLD_FILES+=sbin/zpool +OLD_FILES+=sbin/zfsbootcfg +OLD_FILES+=usr/bin/zinject +OLD_FILES+=usr/bin/zstreamdump +OLD_FILES+=usr/bin/ztest +OLD_FILES+=usr/lib/libbe.a +OLD_FILES+=usr/lib/libbe_p.a +OLD_FILES+=usr/lib/libbe.so +OLD_LIBS+=lib/libbe.so.1 +OLD_FILES+=usr/lib/libavl.a +OLD_FILES+=usr/lib/libavl.so +OLD_FILES+=usr/lib/libavl_p.a +OLD_FILES+=usr/lib/libnvpair.a +OLD_FILES+=usr/lib/libnvpair.so +OLD_FILES+=usr/lib/libnvpair_p.a +OLD_FILES+=usr/lib/libumem.a +OLD_FILES+=usr/lib/libumem.so +OLD_FILES+=usr/lib/libumem_p.a +OLD_FILES+=usr/lib/libuutil.a +OLD_FILES+=usr/lib/libuutil.so +OLD_FILES+=usr/lib/libuutil_p.a +OLD_FILES+=usr/lib/libzfs.a +OLD_FILES+=usr/lib/libzfs.so +OLD_FILES+=usr/lib/libzfs_core.a +OLD_FILES+=usr/lib/libzfs_core.so +OLD_FILES+=usr/lib/libzfs_core_p.a +OLD_FILES+=usr/lib/libzfs_p.a +OLD_FILES+=usr/lib/libzpool.a +OLD_FILES+=usr/lib/libzpool.so +OLD_LIBS+=usr/lib/libzpool.so.2 +OLD_FILES+=usr/sbin/zfsd +OLD_FILES+=usr/sbin/zhack +OLD_FILES+=usr/sbin/zdb +OLD_FILES+=usr/share/man/man3/be_activate.3.gz +OLD_FILES+=usr/share/man/man3/be_active_name.3.gz +OLD_FILES+=usr/share/man/man3/be_active_path.3.gz +OLD_FILES+=usr/share/man/man3/be_create_depth.3.gz +OLD_FILES+=usr/share/man/man3/be_create_from_existing_snap.3.gz +OLD_FILES+=usr/share/man/man3/be_create_from_existing.3.gz +OLD_FILES+=usr/share/man/man3/be_create.3.gz +OLD_FILES+=usr/share/man/man3/be_deactivate.3.gz +OLD_FILES+=usr/share/man/man3/be_destroy.3.gz +OLD_FILES+=usr/share/man/man3/be_exists.3.gz +OLD_FILES+=usr/share/man/man3/be_export.3.gz +OLD_FILES+=usr/share/man/man3/be_get_bootenv_props.3.gz +OLD_FILES+=usr/share/man/man3/be_get_dataset_props.3.gz +OLD_FILES+=usr/share/man/man3/be_get_dataset_snapshots.3.gz +OLD_FILES+=usr/share/man/man3/be_import.3.gz +OLD_FILES+=usr/share/man/man3/be_is_auto_snapshot_name.3.gz +OLD_FILES+=usr/share/man/man3/be_mount.3.gz +OLD_FILES+=usr/share/man/man3/be_mounted_at.3.gz +OLD_FILES+=usr/share/man/man3/be_nextboot_name.3.gz +OLD_FILES+=usr/share/man/man3/be_nextboot_path.3.gz +OLD_FILES+=usr/share/man/man3/be_nicenum.3.gz +OLD_FILES+=usr/share/man/man3/be_prop_list_alloc.3.gz +OLD_FILES+=usr/share/man/man3/be_prop_list_free.3.gz +OLD_FILES+=usr/share/man/man3/be_rename.3.gz +OLD_FILES+=usr/share/man/man3/be_root_concat.3.gz +OLD_FILES+=usr/share/man/man3/be_root_path.3.gz +OLD_FILES+=usr/share/man/man3/be_snapshot.3.gz +OLD_FILES+=usr/share/man/man3/be_unmount.3.gz +OLD_FILES+=usr/share/man/man3/be_validate_name.3.gz +OLD_FILES+=usr/share/man/man3/be_validate_snap.3.gz +OLD_FILES+=usr/share/man/man3/libbe_close.3.gz +OLD_FILES+=usr/share/man/man3/libbe_errno.3.gz +OLD_FILES+=usr/share/man/man3/libbe_error_description.3.gz +OLD_FILES+=usr/share/man/man3/libbe_init.3.gz +OLD_FILES+=usr/share/man/man3/libbe_print_on_error.3.gz +OLD_FILES+=usr/share/man/man3/libbe.3.gz +OLD_FILES+=usr/share/man/man5/zpool-features.5.gz +OLD_FILES+=usr/share/man/man8/bectl.8.gz +OLD_FILES+=usr/share/man/man8/gptzfsboot.8.gz +OLD_FILES+=usr/share/man/man8/zdb.8.gz +OLD_FILES+=usr/share/man/man8/zfs-program.8.gz +OLD_FILES+=usr/share/man/man8/zfs.8.gz +OLD_FILES+=usr/share/man/man8/zfsboot.8.gz +OLD_FILES+=usr/share/man/man8/zfsbootcfg.8.gz +OLD_FILES+=usr/share/man/man8/zfsd.8.gz +OLD_FILES+=usr/share/man/man8/zfsloader.8.gz +OLD_FILES+=usr/share/man/man8/zpool.8.gz +.endif + .if ${MK_ZONEINFO} == no OLD_FILES+=usr/share/zoneinfo/Africa/Abidjan OLD_FILES+=usr/share/zoneinfo/Africa/Accra From nobody Sat Dec 2 00:54:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shs0G5x1nz52n7s; Sat, 2 Dec 2023 00:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Shs0G545Yz3ByV; Sat, 2 Dec 2023 00:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dfeqO4RoyKfhw1ubvk9NROff2WkeVHxdrHwvYzk4mAY=; b=Xkdy8/xtGonLAp7xir1MHhk+csrKDPsAaYTUpR+r1TN22RDDDkM6m0723F6WRgYDI9TNu4 MOeadWr0sq/eBW5XmvHIVR82wTcpUFf79UsjpSsIavk+CumE2YCAC7/nFz6xGkxkJZfB6t 6hbFM+ygz/cGVGIS7joqvtZoxyImdHSYr8ecVXHIXEj4XxmtJZITUryIhj+K0gwVfjvgS3 Vpx7gga7+62twSn9r4H4T4Fa0f+gO5oCEy2HZnf2KADd491cCDciD/YaA0N0rCJSKbv18R aT2UpvFLTRD/U26uNVRpnyS1WLBM2W6CwxTMP1S02yp8/2/mSWJ1oKZb152rDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dfeqO4RoyKfhw1ubvk9NROff2WkeVHxdrHwvYzk4mAY=; b=Y6yv/HlyWkq52NKeonCKXcukfO6R8+ehQnicFw5X6beqiafBu+0t/id5bB7MudGmi4BsKk lkfkLfjKpriabsoXXT8jIblG8dhhx2LwDPGNERyJFTwxAlV+AoEkYViHL3eEt/5vJSrSj3 6y+iYJ+lB6dKcdLWhBO7TesecAdSy+xmIBJbNmZV+XN1qLPeoAucBs7Uaf8H5IUPfPnQfj YiLEvsrZ8FhNRIfJ4c/81JBvPHlsVlEz4H1Seh32/U+0n6S4hzxU17ihQcX/KqrD2uyhdP LEWmIlxWEU+DLrQKYN+hYgmCa/DM0ExaoE2UAv1UaQrgUX8ntIUfEMUiNH5ubw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478494; a=rsa-sha256; cv=none; b=Vk7ASzsivbuQebC4ysICpGrIQHLyzKIR1hhi1e+yfPnV9q+ZEEriWN9nPrSgUJo6nJPvdk KOX37tcvbz2Np45RCb+Q9F0+nmQjCWmojDEUP7E3arhPt2dK0q+bx4TAqoHvu7T+1O3g24 KYDo5S0TRCxRfDj2BVA86xrxLMSPM+Vg6eJOLu0Qo0mkLj7Az+4r04oS8oPGtEXpNQ1l0Q XcSFlC2V/avvLDO+fqbjDPNylIlpWJlagV7INpYxyzYTf5lYrRLLNpMk5atP+inENSUA/w pWJIm4iGNQdI0+UcKW+jUv25YsqHKHT71TDa+jtQOnrktnj1xAbu033kcGDgfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shs0G49vzzwSd; Sat, 2 Dec 2023 00:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B20ssfV024959; Sat, 2 Dec 2023 00:54:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20sseP024956; Sat, 2 Dec 2023 00:54:54 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:54 GMT Message-Id: <202312020054.3B20sseP024956@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: cd9af23a9cc8 - stable/14 - Sort MK_EFI and MK_FTP options List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cd9af23a9cc8a3fe77ecaafdd349209fabc3042c Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=cd9af23a9cc8a3fe77ecaafdd349209fabc3042c commit cd9af23a9cc8a3fe77ecaafdd349209fabc3042c Author: Brooks Davis AuthorDate: 2023-11-09 00:59:43 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:11:31 +0000 Sort MK_EFI and MK_FTP options Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 (cherry picked from commit 16743f0e0b1567b38e5071814d61c04b557bcaa0) --- tools/build/mk/OptionalObsoleteFiles.inc | 52 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index d6c1d2ba0a22..f9867f8814a0 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1379,32 +1379,6 @@ OLD_DIRS+=usr/share/bsdconfig/timezone OLD_DIRS+=usr/share/bsdconfig/usermgmt .endif -.if ${MK_EFI} == no -OLD_FILES+=usr/sbin/efibootmgr -OLD_FILES+=usr/sbin/efidp -OLD_FILES+=usr/sbin/efivar -OLD_FILES+=usr/sbin/uefisign -OLD_FILES+=usr/share/examples/uefisign/uefikeys -.endif - -.if ${MK_FTP} == no -OLD_FILES+=etc/ftpusers -OLD_FILES+=etc/newsyslog.conf.d/ftp.conf -OLD_FILES+=etc/pam.d/ftp -OLD_FILES+=etc/pam.d/ftpd -OLD_FILES+=etc/rc.d/ftpd -OLD_FILES+=etc/syslog.d/ftp.conf -OLD_FILES+=usr/bin/ftp -OLD_FILES+=usr/bin/gate-ftp -OLD_FILES+=usr/bin/pftp -OLD_FILES+=usr/libexec/ftpd -OLD_FILES+=usr/share/man/man1/ftp.1.gz -OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz -OLD_FILES+=usr/share/man/man1/pftp.1.gz -OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz -OLD_FILES+=usr/share/man/man8/ftpd.8.gz -.endif - .if ${MK_DICT} == no OLD_FILES+=usr/share/dict/README OLD_FILES+=usr/share/dict/freebsd @@ -1594,6 +1568,14 @@ OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat .endif +.if ${MK_EFI} == no +OLD_FILES+=usr/sbin/efibootmgr +OLD_FILES+=usr/sbin/efidp +OLD_FILES+=usr/sbin/efivar +OLD_FILES+=usr/sbin/uefisign +OLD_FILES+=usr/share/examples/uefisign/uefikeys +.endif + .if ${MK_EXAMPLES} == no OLD_FILES+=usr/share/examples/BSD_daemon/FreeBSD.pfa OLD_FILES+=usr/share/examples/BSD_daemon/README @@ -1954,6 +1936,24 @@ OLD_FILES+=usr/libexec/phttpget OLD_FILES+=usr/share/man/man8/phttpget.8.gz .endif +.if ${MK_FTP} == no +OLD_FILES+=etc/ftpusers +OLD_FILES+=etc/newsyslog.conf.d/ftp.conf +OLD_FILES+=etc/pam.d/ftp +OLD_FILES+=etc/pam.d/ftpd +OLD_FILES+=etc/rc.d/ftpd +OLD_FILES+=etc/syslog.d/ftp.conf +OLD_FILES+=usr/bin/ftp +OLD_FILES+=usr/bin/gate-ftp +OLD_FILES+=usr/bin/pftp +OLD_FILES+=usr/libexec/ftpd +OLD_FILES+=usr/share/man/man1/ftp.1.gz +OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz +OLD_FILES+=usr/share/man/man1/pftp.1.gz +OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz +OLD_FILES+=usr/share/man/man8/ftpd.8.gz +.endif + .if ${MK_GAMES} == no OLD_FILES+=usr/bin/caesar OLD_FILES+=usr/bin/factor From nobody Sat Dec 2 00:54:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shs0J0KZ4z52n7y; Sat, 2 Dec 2023 00:54: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 4Shs0H6d0zz3BxH; Sat, 2 Dec 2023 00:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LZKGjiOeCj4P7r/LUJl3CkB5G/jj6AJf+svw7QEFYM8=; b=e/zt7Hl7fIObIe3klzgSGH/BBXRXIKt8LLcujx2BonbukJ5Oll4qtnjOoV6xorDNAEPf1O lzi8L4UWqvRg+/pKxuY/wpxWrbedGhuZPytLA8ayWvpCZX00aahH6ss3PHxldfR8Q5Fplw we1hKfPFU4clZ6IlPapmuGJx+VKjs6PDj5cd/A9I2oky3CtxpoqWWKr4zdM2KuYqYcqgLo rJuVCnWTxMo3gSPZmwBAQ5mySMUSEzaRLyRW5dPRyQnf94C1lgab0PDdmLg7GasEs2Whpw SRA1XnZCC5C2piKgXNcfn6528d3IN82KPdZeADZRCLdUdpi1o51kyGs1zF/n+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LZKGjiOeCj4P7r/LUJl3CkB5G/jj6AJf+svw7QEFYM8=; b=NGZgc1/r9kwYgejW8F0D4q8twgQSvWp3V1+rz5zjSwdriAWOXaH0hZhVmoUHK3Tnybh4Bx gwx6jGuy5k4j7HPFgfF/TXkUkeE1eKUhyJwVLIR8WH+7W4oFQTIDIg6oNB+pxBxGkJwtd7 E9o+BBfHd7F0Ob0MBlV1TgXW3JMP0unq2d4cjCw4JGHIRjTZD4ABFRHzPV/o/GMxPfhxqv 4Hq4jsnL4B75a9FGKD8Y7mcjDSp9X4UKK9shvQQxo/6OxzLSeoUeN8OWkj6CojFXluIE8m 2gq6Rs1bU8kx/m75rhGn1YUXDZ18GhNjhBQ412Qr4LEvtO6/QWwd5xZ6BX6yZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478496; a=rsa-sha256; cv=none; b=hE6INW5GioP6ssuxdlEunE6HoPC9xgnGqrHM3VJKw6s5NIDIdMsQVdUMpFaWAjOoMtqUEu KACjYyL85I9waZKeLYwhZEfkQl+7Wdg3yBQF0VJclaaawADm80bw1OpTqmw2TJoAEXbEF7 C2sK0eZt/sE218DuIf123r/I9Cm6zRSnu39k6CUKST4iby1dqY3ZdV7NnByCkOGpNGUnt5 vPvfYQZVzzvgC9eJGm7EgsXNTzFXA4oYq5JxEsM2p+FTQgT1FTscY/mKVOZ20MMcyGE5ga C2puKJ2z9hUizhQp/Tcpf/47XRpEi3sH1WFIA7pNUsMI+xInW94gNO+V+yglKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shs0H5QypzwfF; Sat, 2 Dec 2023 00:54: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 3B20stUY024998; Sat, 2 Dec 2023 00:54:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20stUC024995; Sat, 2 Dec 2023 00:54:55 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:55 GMT Message-Id: <202312020054.3B20stUC024995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: b35fc7c31542 - stable/14 - Combine and sort MK_LLVM_COV List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: b35fc7c315426e9d339a7911c18ecba0edb888e3 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b35fc7c315426e9d339a7911c18ecba0edb888e3 commit b35fc7c315426e9d339a7911c18ecba0edb888e3 Author: Brooks Davis AuthorDate: 2023-11-09 01:00:36 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:11:32 +0000 Combine and sort MK_LLVM_COV These used to be grouped with MK_GCOV option or the like. Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 (cherry picked from commit fb173fc89e9c6908426bf60b1a449f1ff19d51df) --- tools/build/mk/OptionalObsoleteFiles.inc | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index f9867f8814a0..f3122cfb1981 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1999,18 +1999,6 @@ OLD_FILES+=usr/share/man/man8/strfile.8.gz OLD_FILES+=usr/share/man/man8/unstr.8.gz .endif -.if ${MK_LLVM_COV} == no -OLD_FILES+=usr/bin/gcov -OLD_FILES+=usr/share/man/man1/gcov.1.gz -.endif - -.if ${MK_LLVM_COV} == no -OLD_FILES+=usr/bin/llvm-cov -OLD_FILES+=usr/bin/llvm-profdata -OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz -OLD_FILES+=usr/share/man/man1/llvm-profdata.1.gz -.endif - .if ${MK_GH_BC} == no OLD_FILES+=usr/share/misc/bc.library OLD_FILES+=usr/tests/usr.bin/dc/Kyuafile @@ -3634,6 +3622,15 @@ OLD_FILES+=usr/share/man/man1/lldb-server.1.gz OLD_FILES+=usr/share/man/man1/lldb.1.gz .endif +.if ${MK_LLVM_COV} == no +OLD_FILES+=usr/bin/gcov +OLD_FILES+=usr/bin/llvm-cov +OLD_FILES+=usr/bin/llvm-profdata +OLD_FILES+=usr/share/man/man1/gcov.1.gz +OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz +OLD_FILES+=usr/share/man/man1/llvm-profdata.1.gz +.endif + .if ${MK_LOCALES} == no OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-15 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE From nobody Sat Dec 2 00:54:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shs0K29Gbz52nSb; Sat, 2 Dec 2023 00:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Shs0K0RgGz3C96; Sat, 2 Dec 2023 00:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2NV3twhtfz4YOwmsLIRmCZn4viPw6RplA/DvCGGvjMM=; b=sXn55NOsmVSy6M80epQD4emc2Mesf5w99tRpWda4tIBgMSWYGAfwSeatmAJ45lqdVGFJvf +tpLzSv+YoEuS5JWsHTbAf0NCwUOHTafFXR74F9ULfsAEDbq/mRqlNq9atrfifzbeRM7PN leesOhXdiSfBeYXFcXguF+gZrUo2RlKvlILDk7DRKfkW5FLs8YoKl6NpjwrbIp9Ljfc/dw zKxG2YTQHytsnbOztj89CbSV+zCokJN17dTh6C2DmajfIvQNzpM4uaR3cGozMAQa1mdKcd tQCt15UcZbbLglmuGGBIxpX+nsLYsS6PNYOUQfQJYSASonBYDQj4QDvJL5cRlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2NV3twhtfz4YOwmsLIRmCZn4viPw6RplA/DvCGGvjMM=; b=oFXC72s++OcdXOn4i1FfXTeFjFdDBP7k8VSQ1AEWJZEtdpCwrK2LLuGz4De+MEKGgiExaI Bi16NqAiwqeCsmmTTw0oP2W+9S8xcPkcjz3mBer5Ht+3QXlh5bHuwkCcJWM+rJMAa5//Ee 4mHRJaP/WfoDdaohuLMUmenNLmqwyae+1S0BmSJbhkOFznM2LKt0A1qsHUw6U4bNTVcqS9 3YST6Dokc4ty8qL+MLUX9EG8X3zpI+RX6LvDqBTQulNwWuR3wfOFhw1elKoq06fpbw+fGM 7EPoSpQimXHm7s9aptqivKo7MoXZQrvKInEy0v3d+xfCs/kM904enXzJr+tF2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478497; a=rsa-sha256; cv=none; b=J/5kxPct+oRCSjBTOnRQmpey17Nuf1Vk7Mp2/UgvgU2xcdSImk+41IZZkGp0EPSx0a2NyN OKi893ujZiS9eI5dV7Ge5K+CS06L2IN4R+hA+opRZtKkt4BfDG7EWlUUnfmfyySRi2MjtJ me7hUqnV671UXZp0obwnWQQzvtdESYfLbJCNrol94wLmwtvqjl8UVE3i6o1nLCCbHM4uXG 5WIW/gGGTJnQOSVdNoBXeMElVeqth/CcItzoSPN3/jhtioaSDPhNEtghOJGFo94B4s0coa zsDtW/E1uV6m75/vqfPb2PW3I9vS8FOtgTDGIic5hw8gMKguGxIBdyBttc8WVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shs0J6R1ZzwHX; Sat, 2 Dec 2023 00:54: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 3B20suPZ025040; Sat, 2 Dec 2023 00:54:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20suhr025037; Sat, 2 Dec 2023 00:54:56 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:56 GMT Message-Id: <202312020054.3B20suhr025037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 084cbd8c7283 - stable/14 - Sort MK_GNU_DIFF option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 084cbd8c7283952d68f2c40e27e900fe0af5d97e Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=084cbd8c7283952d68f2c40e27e900fe0af5d97e commit 084cbd8c7283952d68f2c40e27e900fe0af5d97e Author: Brooks Davis AuthorDate: 2023-11-09 01:01:44 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:11:32 +0000 Sort MK_GNU_DIFF option Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 (cherry picked from commit 2b3bf27da41f1481b2025445c6adf27f0d50de99) --- tools/build/mk/OptionalObsoleteFiles.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index f3122cfb1981..41464fd75082 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2007,6 +2007,11 @@ OLD_FILES+=usr/tests/usr.bin/dc/inout OLD_DIRS+=usr/tests/usr.bin/dc .endif +.if ${MK_GNU_DIFF} == no +OLD_FILES+=usr/bin/diff3 +OLD_FILES+=usr/share/man/man1/diff3.1.gz +.endif + .if ${MK_GOOGLETEST} == no OLD_FILES+=usr/include/private/gmock/gmock-actions.h OLD_FILES+=usr/include/private/gmock/gmock-cardinalities.h @@ -2162,11 +2167,6 @@ OLD_FILES+=usr/share/man/man3/gpio_pin_tristate.3.gz OLD_FILES+=usr/share/man/man8/gpioctl.8.gz .endif -.if ${MK_GNU_DIFF} == no -OLD_FILES+=usr/bin/diff3 -OLD_FILES+=usr/share/man/man1/diff3.1.gz -.endif - .if ${MK_GSSAPI} == no OLD_FILES+=usr/include/gssapi/gssapi.h OLD_DIRS+=usr/include/gssapi From nobody Sat Dec 2 00:54:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shs0L1wdsz52nKS; Sat, 2 Dec 2023 00:54: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 4Shs0L0sWjz3C4l; Sat, 2 Dec 2023 00:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j9xiHgOIDZTEETt2Jx0Teo+rpFx723vkoFNnrfxRCSs=; b=iaUvnPLNwLsCTICT2+2mft4P/RCLYpfvNweV696Opz7R6FMUOIjztfXmqQwtrqZSfmV2pu KIsD4gJDDCr927TQo54H+tujnLgvbFPltldP448aCNBSR2XvaD+Zx4hxNpxHdTJv+/Paka zgWmUr1vmSpPaz5qQOTfR6/IwgM/HiTMzXeaQYcplz3qeSHKPkh0hUZ8YDb4Yx2OUuKVe1 5MyagYlDyF4KLHDwb7qpVYOYxQf4byTWsTebN0To7FTXU9PhrMXWlF2Zr/l/+/AVQzErtf vQ3GvHE7bQ3c/2+hnIhfr39x9MathZv87lmgr6sv+wfVm7J6NjO0tTUbCjVk+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j9xiHgOIDZTEETt2Jx0Teo+rpFx723vkoFNnrfxRCSs=; b=v3di0AhMPeCfHsRwgehnetzuUao/UOHxwNUsbqy75GlLgy+/F154MxN3K31YA1Yi04OHfn CwlAHmzrFKNE/jHBK2KIG9vTA6MQUf2kENixET71iQ+S0A7H8tcEYZ6CbAFWWqGL31g2+R +ngTtB7ZKMnXPt9k9VpQKEbcC1GW20gyvj//sH8umcg0iqtQAqwVJeSWNjvmWUjYBSBADC tmZ1Ec71qW21VP2oKLmBU/poNBrTt7+4vpcoCPuM3vxjY8y/97aLOtKevUxDtDUSep1Ucg QKugDH/qfXuo8Yq1L+9KPODDJB9fjH2rvkjV7ZJT8/mysJsLWRWRr+mTTUivBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478498; a=rsa-sha256; cv=none; b=Z9PsOhn7Aq5CpLw9H80qzkjp3rJGa/k8dLv5qU7riflBZVOtgsul/jtHDCFfvYIzn4uuEQ ClmGXqUqUwbIiVP9lGITo/5jzjtjpMpn0LbiqaENvezSTm28rG3sgY2fq++qt2Q7dzzBa/ VCK5oE39DFKtLv3vhYoFZQwlD70sb1R9u0nP23s8Ts2gaqqNTbqG/QeCq8ul3ZHuomuh+R NkgoOWE+cU4g/wfnRxk+iSNDicCJCMGBpahUdmHw1BKYgYmXm1eXgzewX1nz8Tsb20kMQ9 QHtezDkG0VsaednS7LVNrTk4vPrC3RI2pikpjztbnzUIEwGYjbjQXoffn+QMxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shs0K75D8zwcZ; Sat, 2 Dec 2023 00:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B20svdE025076; Sat, 2 Dec 2023 00:54:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20svIU025073; Sat, 2 Dec 2023 00:54:57 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:57 GMT Message-Id: <202312020054.3B20svIU025073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: e027fb0ee8d7 - stable/14 - Sort MK_NETLINK option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e027fb0ee8d767f577a1c6f73506128beb6384ef Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e027fb0ee8d767f577a1c6f73506128beb6384ef commit e027fb0ee8d767f577a1c6f73506128beb6384ef Author: Brooks Davis AuthorDate: 2023-11-09 01:03:46 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:11:33 +0000 Sort MK_NETLINK option Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 (cherry picked from commit c90d0600ee000e7874a55e3015953bd670574093) --- tools/build/mk/OptionalObsoleteFiles.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 41464fd75082..51434e07774a 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -5501,6 +5501,11 @@ OLD_FILES+=usr/share/snmp/defs/netgraph_tree.def OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt .endif +.if ${MK_NETLINK} == no +OLD_FILES+=usr.bin/genl +OLD_FILES+=usr/share/man/man1/genl.1.gz +.endif + .if ${MK_NIS} == no OLD_FILES+=etc/rc.d/ypbind OLD_FILES+=etc/rc.d/ypldap @@ -5565,11 +5570,6 @@ OLD_FILES+=var/yp/Makefile.dist OLD_DIRS+=var/yp .endif -.if ${MK_NETLINK} == no -OLD_FILES+=usr.bin/genl -OLD_FILES+=usr/share/man/man1/genl.1.gz -.endif - .if ${MK_NLS} == no OLD_DIRS+=usr/share/nls/ OLD_DIRS+=usr/share/nls/C From nobody Sat Dec 2 00:54:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shs0M25xwz52nDw; Sat, 2 Dec 2023 00:54: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 4Shs0M1ghQz3C7j; Sat, 2 Dec 2023 00:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hvF7Bt5g9tDMOPMIX1D/pW1s8w90ZiJAt8g0Zw4b6NM=; b=pSwU7gPrEc7rPsqPjW1pnD8X7h4rwbKumDqIM9K2OyR7cnt/sXyPozaQLkrtECBgbMd7eo m9ffVX8CGwA+IiVz8ji6UwXf6Ecc6t4Qckj2XFb/UQP+sq9pauMUOmuYbWUEHMTaTqmO9D LCjMDbhTpDow3PaeOdbGkWsv4QBDOug9CcfotVrRhsMSuTsjcQbVsHOe/d42gt1Hhsifli 2RWgR/glXVCq34HovATlLEj/avBbgCeun1+dC7ZXRmyJNmV/l7lETCFrLm/MLlRdMaPBHj qnqqQK4S91pLQC6QCUnx/V/eJu5Q/TcYOeZTmj6ZesopeI20rcrZvbrHjyUrmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hvF7Bt5g9tDMOPMIX1D/pW1s8w90ZiJAt8g0Zw4b6NM=; b=ci9pvj8scQiphVByNpuQ3vgA0QR71hUXQ9mtuwNu5Iz9FBzm2E4zgmRd2OLvuCMcXTl2LS mOyggkDet9w2zcLCUdIzALTyHRv1sgql2nWN68QgpAp4dm3bC6uQveONx2jT1QaA2o7+co FO4zWYkWOlKBHbXxXc1bC9AZxfHlfiJV7hJmpqMkbHcUzugFc3kj4eVYmLWYyY/lE47r1M cJ6z83MLFd0F311Jbk5t3cpMKkK8gxa4ddNfu0rmKoWHXeE5BGFHkyvZA+/9jygGDZ7z1A QriKb956klUWO25Y2TXqioTPRfn/c7Q1PieHOuu1lIa7C/pirAnWKFiCrFaYQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478499; a=rsa-sha256; cv=none; b=yxrl0dTqvNSAAqqACHWHyiJvFXyul1GXmRe1cBFn3ykg7+vnRyOB6RMxhmiYbstLO8JmuH EumGHe+vEn36Nho+mEDI15ZtUSmwarvsUwlYXZBUNXAVodEed1J82+GFvogICHtuFQ7mJ/ Qej8TGoMNrJn+K9CJlXVEwc/ld5xpxdFpjB+fHOugfF9lUZbXOp3kdaojIVsJ0KjxC9qlq WbvhvtY+lr0Dj82exJOzmUtz64jX6+63ACV4CYOtk1FkG8bgKrkqKqpTvJ8bmsfhHjeuuz S5gV86molfGoGP1bI9pIrwoBomHzIozmS2AraL7j/JzNQeVcChzWIeBJ8iOz0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shs0M0cmLzwHY; Sat, 2 Dec 2023 00:54: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 3B20sxDR025115; Sat, 2 Dec 2023 00:54:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20sxUS025112; Sat, 2 Dec 2023 00:54:59 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:59 GMT Message-Id: <202312020054.3B20sxUS025112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: d5aedf850d5b - stable/14 - OptionalObsoleteFiles.inc: document block order List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: d5aedf850d5b55c0f523994c96561210dfca1b08 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d5aedf850d5b55c0f523994c96561210dfca1b08 commit d5aedf850d5b55c0f523994c96561210dfca1b08 Author: Brooks Davis AuthorDate: 2023-11-13 23:13:03 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:12:02 +0000 OptionalObsoleteFiles.inc: document block order Options should be in sort(1) order by primary option (usually, but not always, first in the if statement). Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 (cherry picked from commit 4cd0f014a1285c1b57e583b260282ca433a8ccdd) --- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 51434e07774a..11e7f9cbb868 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3,6 +3,8 @@ # This file adds support for the WITHOUT_* and WITH_* knobs in src.conf(5) to # the check-old* and delete-old* targets. # +# Blocks should be in sort(1) order by primary option. +# .if ${MK_ACCT} == no OLD_FILES+=etc/rc.d/accounting From nobody Sat Dec 2 00:57:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shs3R6XcPz52nn7; Sat, 2 Dec 2023 00:57: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 4Shs3R3Cgkz3FM4; Sat, 2 Dec 2023 00:57:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uHmC6Y2Vprp3m4OU4h3GfIpCNPKl3R9r8AnrFd8WJdw=; b=aoFWwQcu55Q58HJV3me7hDvBT9gNbDMxalxvVTf5AhoRAzPwQvM9+vlBvlxRnxUA1Efsrk KVJoUP95Scyj1QYRC/2VPYmzXRApTtRMgomvStGh/zXnsKwdEgFDD0xbFOlWMPelmwY3NZ 3ApjSb/pbQPRNHo1Q7bzqT6NHXtywT0SS4O4VEQ2gLxw/ZDXt04Z0aWq17cNqG3yKyc4tJ faMR2JJ/9yDnSSRVYPFvV3TLZSh2gIA0FnFTaVGh1UMDXtQWGUGpxDU7e8T7VsBjTSaoPG o2NkAL0RfcPNnbYu1QvE+f7vvAudlWZXbTyAw7s+MTHXJ1U/zCit+O9sZRpqYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uHmC6Y2Vprp3m4OU4h3GfIpCNPKl3R9r8AnrFd8WJdw=; b=XMc/M0WXWhrGT1ZkAmTkU9fKCF9OpwiylGzrJIrCLM7Yx3UgUN42XHshz41V0kaGg1rSDb /AdZaIOMXxiOw+pxOd6NtUaEfMlu1HZsbFm69O9x5lsaTPHpKVC4xIt+6SCMSisXyVFLzx Lw2mL/kn1hV5xZEFELhUCHyWN8pYvRiJOMkjFIuUKP7d1ZsOmHPA3Fbq4az1u4RDDgTFKW Oz+MEML9akC6zRAavuHvSmXljBqmjsoS67+D8jz9VhK35W8Up3p+MdwR0a3sKgk4qzERTB yL1EXN5eCZ5nIKJJcJ3Pmx4D1dPPv3eMirYX/bWDUs+aI+cz4AxkfrKuO8YXZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478659; a=rsa-sha256; cv=none; b=s0TX4oHbyEYt8ooR94stfJeudIr36JTfgUjFWyScczcRdrlmA2CTWa1qQR5+K3itE7l59n t6eQ14DevLnsmQpyJbCJJVowTK0cBkOUBThxu+PdOHn5kVHvoK7MRaZ7r2rmaWkCo6bPKU T/XvS70CQxThkSj+mkPOo+Amr+AxFCSyAKx8C8e9txTS2E2xXiimNLblrCDCi5563ky/kA 9q3D1l9lPwo/JTQaRsvOSbPY1XcZZVATzwF+mACBhAVcU8D85356jjGzgWfIfl5biYeVO6 2WV40Vc3egaYIrBNChCTqBgG4O9njkMitNXPfB5JfWXiHpsb7cFjA7FbYO8BHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shs3R2JLMzvx1; Sat, 2 Dec 2023 00:57: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 3B20vdu1025667; Sat, 2 Dec 2023 00:57:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20vd7U025664; Sat, 2 Dec 2023 00:57:39 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:57:39 GMT Message-Id: <202312020057.3B20vd7U025664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 4c5aab64441b - stable/14 - Sort .git-blame-ignore-revs by commit order List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 4c5aab64441bc08fcecf74a0be54eb0d0876c584 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=4c5aab64441bc08fcecf74a0be54eb0d0876c584 commit 4c5aab64441bc08fcecf74a0be54eb0d0876c584 Author: Brooks Davis AuthorDate: 2023-11-15 17:46:57 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:55:10 +0000 Sort .git-blame-ignore-revs by commit order This makes it easier to add blocks of commits such as 4ca5df80393e1f2..c90d0600ee000e78 which do a single thing over the course of multiple commits. Sorting by hash would require manually inserting each one with a comment. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42601 (cherry picked from commit afe1e6ba860bb3733d9aae9083ce2622597cabfc) --- .git-blame-ignore-revs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 2a4ab51f89c1..356201cef3c9 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -6,11 +6,11 @@ # `git config --global blame.ignoreRevsFile .git-blame-ignore-revs`. GitHub's # blame view also uses this by default. # -# For consistency this file is sorted by hash. +# This file is sorted in git log order (newest commits first). +# elfctl whitespace +828e50092ac84f50247fb3f400027fc7510d8141 # regen syscall files after d51198d63b63 2c9764f36b6f20e9a6c71ce64a21988a394050b6 # Remove whitespace at EOL. 7ebcc426efefea9cd16ac6f565e72030c608f7a4 -# elfctl whitespace -828e50092ac84f50247fb3f400027fc7510d8141 From nobody Sat Dec 2 00:57:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shs3S4zgSz52nnD; Sat, 2 Dec 2023 00:57: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 4Shs3S4BHcz3FMH; Sat, 2 Dec 2023 00:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5C2u6FDzevJArTLPNV69RVCxe16S8DSXHraMUVpuFIo=; b=D4Sz9GiiRjoWlXvucvDCt8rz9ORaVeSvL7mGc5ag76bjRg8LQ7wUricXBd6vrpae0zSGSb h7iL7BqlUWu0yRgVHRje41d9Go2xNH8pbgiZWsvysoulLOG3IDXVpXHPPYdbrB7BNsdmhE 1tXw9KnUebyIMPZ2cASLfymwgCltJ5LzcpuHrzrkmRG7MUenTMTSGZaQ6oln26casKNkO/ 2hwtJmVxxaUx1M1AV0+gFOCQ9H94KnKXVXhsRAFl2kmwh7K4TG06FxDjrzVGcl0PvpEQ5/ knAxdnByqCQA+xUmxalxTU32B2gfLv3KI0bC9cINGZbeI8YlmCR5+JxXQJxdTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5C2u6FDzevJArTLPNV69RVCxe16S8DSXHraMUVpuFIo=; b=bwpRk2af8JLxzrOcm7emaxPY8jFn3jQUpvTdFiRnj0OQt8BTM3IlgQi+X2qo7qvrD8bK9I peUU1jzRJFZZ3GO96SWIG03FIZ1Z7Og+YrpUkUFUUjTNbEFOMptUfwhThz5DV4OLBQRf8l 66d8bvNLuARJS3cHwMMy0dTSVla2XVLTQII8x0Q1xagkqpTacJzIzo4nTziQqTRIzyo405 XM5xZaNnGJrGe6HujozFJOhLXkNoOSx3qh0wxlrbxJZx0ZCuYkg650zSwZFaIIq/oZ3FRi I2M8wqf9ncQnmcB+QglJH3g1sumpCD8e0xdzLqrqkglvtR8fKc8xNjZ6CaM6HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478660; a=rsa-sha256; cv=none; b=lQKpska9m/b7XnciTDxvy977tbwdR6Po8nJy1s4KajMSMc+8XAwtK5YrbgIkzy+acvCzps o0AuReJuDE7Yedn8tD509+nAP4k2h9hmAAOpauDtH6L8KEpHgaGxvIdAua6IKvTTfDvHUo aaKCRoZDZkNE9rFh79ub0jkqOaEpuVJpRXSIunlLspFnMQ4lDdHn45ytUeeN8prGu7R2R/ k8ufGVNUBDaxX+TGbO++gNos30JLsQbN7Y1uF80R5vjoRlNyVm9eUsNOUsY6ix7WdObFzC b69xDzPgOCaAp/9Lii/xLMjwEmeBCusygP4AvRq3AscFNgTXJLnHIgeKu7hQBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shs3S30dYzvx2; Sat, 2 Dec 2023 00:57: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 3B20venY025711; Sat, 2 Dec 2023 00:57:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20vemG025708; Sat, 2 Dec 2023 00:57:40 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:57:40 GMT Message-Id: <202312020057.3B20vemG025708@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: b20f052de759 - stable/14 - git-blame-ignore-revs: OptionalObsoleteFiles.inc sorting commits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: b20f052de75923b6ea056a0e06c774536e709a3d Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b20f052de75923b6ea056a0e06c774536e709a3d commit b20f052de75923b6ea056a0e06c774536e709a3d Author: Brooks Davis AuthorDate: 2023-11-15 17:47:02 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:56:40 +0000 git-blame-ignore-revs: OptionalObsoleteFiles.inc sorting commits Add sorting commits. This causes (suitably configured) git blame to ignore the moving of blocks, correcting the associated commit for ~300 lines. Hashes are updated to match MFC commits. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42602 (cherry picked from commit b146e5e68abd92fa59b6c032edc3c7b134c4e155) --- .git-blame-ignore-revs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 356201cef3c9..97b07758db4d 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -8,6 +8,14 @@ # # This file is sorted in git log order (newest commits first). +# sort OptionalObsoleteFiles.inc blocks +e027fb0ee8d767f577a1c6f73506128beb6384ef +084cbd8c7283952d68f2c40e27e900fe0af5d97e +b35fc7c315426e9d339a7911c18ecba0edb888e3 +cd9af23a9cc8a3fe77ecaafdd349209fabc3042c +e4f8bc4dbef667c96b57190da4c2bc662c28c7b5 +298dcc251b6e075c48e96eac1aec12de9fadf1b5 +19a18508551685628bc725039896b1ac0737dce2 # elfctl whitespace 828e50092ac84f50247fb3f400027fc7510d8141 # regen syscall files after d51198d63b63 From nobody Sat Dec 2 01:15:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShsRm0c5Cz52rkc; Sat, 2 Dec 2023 01:15: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 4ShsRm00ylz3KNT; Sat, 2 Dec 2023 01:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701479716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WeSKFaeqrfXADnDJVX3ZGZ6D3XDDBgcFEBAj24oTYLU=; b=ra/DOFMFv93p8wHdxvBCKoWtaBjZSZr0m3sNVD4gLWc9uJfJ6BnmZlOYbvEAGaPurZU7S0 N9GuA33jcOqECSJjQX4Gk7EaJnohBCwv6VoOXzTcf+wRKE5JYhF/L9ezxodOK0OKvnWKi/ Dgy/indScXPBgIr/qJq/b+lBA/N3Fo+dmpD2Ao9GHcweyl9uhf8wORVGaq0ZRGkh510tPv xbYqkLxSIUP70GkxrCHcWFwPzuS/FhzuM+VgN97c2gkSi0zOMKBdspqH8l1aSArup8b2qM 6lBx1St1gwe0thdx2QyM7LINZcVgQAO967BLYDVy11XqrU3iOtwGJOZqHYXaaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701479716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WeSKFaeqrfXADnDJVX3ZGZ6D3XDDBgcFEBAj24oTYLU=; b=SMVqXfW0VAM5DgECILmooi59h2NgS95XavHcvNX5079Llq8p6bK9zIlk8E12vqiDjoY6RV ihfJUzUBtW3Y7Ei1zoMdQuwZHxW8+DTIGbZdcTn6e3VVLDUxY6yZtzBGydzRKo0P2shGO7 p98FA3SPIKhXwUmc2IvaVFheX5D/m4G/jmje6rPDUAiuur+W9CbSV9HQw1v8Dm0fxzp47q CB6CrGwCgVddhDkXQYG6LRRVz+ipJcHD5o7RLdYKymI8h08GkaN773cfdWL8MK3UaE07oY rc64oCxWgjt5hQth5vfZHU4T0Tcc3wsVKtMx1SY5p98ccyZMqaQdDazMTKNKfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701479716; a=rsa-sha256; cv=none; b=aQcOlIOp+8jvrP96aeKAB27hRazbbFSBnZgqIn3QuIvJnSWGU94uP0zFoYZVED1cQEy1mS ViIV6oYl+7EPtd3MVzDFuzvsK8riC4YFEM/EIQewcr1BopphQDgZ549XfamKtjgTOxK+xH cVglIe6rHkugOhRkOg4ZLBNNgQOsaiqrDcT8V7ob/URHzkzwJ9xRGoIDr3RAx+98J8nyWh nCViin0cKAAJJzERO01JvUXX0pDEsduCbRcIMcVFQt/QaBGWEZ4JGebmGXHpk1+e9hpVyK vdRqd41zy3JMnqao/z6tgEgt3kRfAXta1i05RyCFpbMTj8PrE/WqOCkDE4wPuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShsRl69zqzwV7; Sat, 2 Dec 2023 01:15: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 3B21FFVB060500; Sat, 2 Dec 2023 01:15:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B21FFfg060497; Sat, 2 Dec 2023 01:15:15 GMT (envelope-from git) Date: Sat, 2 Dec 2023 01:15:15 GMT Message-Id: <202312020115.3B21FFfg060497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8645e7c83db5 - stable/14 - Set installed kernel and driver files access modes using KMODMODE var List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8645e7c83db590863deff3f417ac84f59cdf395b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8645e7c83db590863deff3f417ac84f59cdf395b commit 8645e7c83db590863deff3f417ac84f59cdf395b Author: Konstantin Belousov AuthorDate: 2023-11-25 13:28:34 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-02 01:14:52 +0000 Set installed kernel and driver files access modes using KMODMODE var (cherry picked from commit d3849ec3c9e700956a8a1d03f7755d586934f225) --- sys/conf/kern.post.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index a4eb2e94a47b..f42ec4a9564b 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -421,22 +421,22 @@ kernel-install: .PHONY fi .endif mkdir -p ${DESTDIR}${KODIR} - ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}/ + ${INSTALL} -p -m ${KMODMODE} -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}/ .if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no" mkdir -p ${DESTDIR}${KERN_DEBUGDIR}${KODIR} - ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.debug ${DESTDIR}${KERN_DEBUGDIR}${KODIR}/ + ${INSTALL} -p -m ${KMODMODE} -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.debug ${DESTDIR}${KERN_DEBUGDIR}${KODIR}/ .endif .if defined(KERNEL_EXTRA_INSTALL) - ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_EXTRA_INSTALL} ${DESTDIR}${KODIR}/ + ${INSTALL} -p -m ${KMODMODE} -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_EXTRA_INSTALL} ${DESTDIR}${KODIR}/ .endif kernel-reinstall: @-chflags -R noschg ${DESTDIR}${KODIR} - ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}/ + ${INSTALL} -p -m ${KMODMODE} -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}/ .if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no" - ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.debug ${DESTDIR}${KERN_DEBUGDIR}${KODIR}/ + ${INSTALL} -p -m ${KMODMODE} -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.debug ${DESTDIR}${KERN_DEBUGDIR}${KODIR}/ .endif config.o env.o hints.o vers.o vnode_if.o: From nobody Sat Dec 2 01:15:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShsRn26XSz52s3C; Sat, 2 Dec 2023 01:15: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 4ShsRn1Rbqz3KZL; Sat, 2 Dec 2023 01:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701479717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2VsSk0CdAApwBi1tsnIXmelPj/7Mi+CHEt68SMvpPVI=; b=BkCNlvXajjgrQdDLNRLOlvWQvdPgC72KBDN/zekn1N6lI/vnXPuZ+IO9jNGM3U8+nTigsm DTtEHQz1DyLmsTfHl+97PMZUoSMF+C24PtCL33BoWmZcDmF+tJc9qx+vKRlHNEaduS0lKz Yu43Dt4/dsj0pkz7bNnIyAPLbKCy7b6ssgyVTKfHEfPYJtrlRwY/fwb+Qkjus3P/PdX6HE zRhlBgRJQJQVVnVwA+/uPEy7LPezzbnRX4P6mJuJhmq9zIIyQoj5qhfa5SckPiyZp1Alul SAfA0KryeQ2Rv9TWq8EhwUg7b+Ge79lIruoYXG1Akq3GlTh6PQf5FhI3QD32LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701479717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2VsSk0CdAApwBi1tsnIXmelPj/7Mi+CHEt68SMvpPVI=; b=iPgKa1Arah9HUEL/5k9INdfyrUFIcea3GMAUUq5EWa7ElugiNECmIeeNki7R37xUksV3/T yTywfIgzcpMq7JFB6qMAS0vxCXgTsKch0CdPwDngu6kPhcoEmeU5fDsLfHn4KyR+x49Rdv rdTTrbSZS66P8T19NwYne6o3ZGTjPt7x2naT3yWonyFllLQHDy51ALBWQTSw3j+FiWX8wn FvTNHZd5khxQ71ED6BSe6ZJ2LEqM5nMIuVILckinZun/KZ2hzN4/bEryVy/FhYSgHYQKps OsgmOKxTa+jPtZiALUDb5rnKlNEbnp425ELuHH6Yf4ki21z5GbEKg+Q4nxN8/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701479717; a=rsa-sha256; cv=none; b=twOhPcJZ/4Pj2k939dlq9G3CkdyUHFoB0pHGY91ocuTF0iINzxz2u+h7d19NAdeiyLanoN LZgmDICTVeivTY0Y6JR/7sXQXOpGjnt3U0aVD2GuafhvNV+zUntfTLu6vtSMrAFeB2HedB JYsNWZ6R2bPL15FwEM/Ok207XIrill3fScsdvDvnJLOAYS8rOrjnSOHBvifCCFI1J63umU FJQYD7dlscqaHx+VGzi5oltuV4NI/iWFNrVv1pFOyv1OfRhDCToGuEaRy/sj6RkNcqak1L ubojzNHT6uR7TtArq+I4I8R/RbUEJoKTn/+yuF+4avZLZ/CsN2khUuax05pkKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShsRn0M0MzwvG; Sat, 2 Dec 2023 01:15: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 3B21FGCA060564; Sat, 2 Dec 2023 01:15:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B21FGZw060561; Sat, 2 Dec 2023 01:15:16 GMT (envelope-from git) Date: Sat, 2 Dec 2023 01:15:16 GMT Message-Id: <202312020115.3B21FGZw060561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ef60d8076f97 - stable/14 - Do not install kernel and modules with executable access bit set List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ef60d8076f9710a824cd0664a17f350ae9c9077c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ef60d8076f9710a824cd0664a17f350ae9c9077c commit ef60d8076f9710a824cd0664a17f350ae9c9077c Author: Konstantin Belousov AuthorDate: 2023-11-25 13:30:06 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-02 01:14:53 +0000 Do not install kernel and modules with executable access bit set (cherry picked from commit a9758e46473babc03bfe06edfec35e0c71fa7780) --- share/mk/bsd.own.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 6205faf61a2f..aec88d64850f 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -171,7 +171,7 @@ NOBINMODE?= 444 KMODDIR?= /boot/modules KMODOWN?= ${BINOWN} KMODGRP?= ${BINGRP} -KMODMODE?= ${BINMODE} +KMODMODE?= ${NOBINMODE} DTBDIR?= /boot/dtb DTBODIR?= /boot/dtb/overlays DTBOWN?= root From nobody Sat Dec 2 01:15:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShsSP72Cwz52rkv; Sat, 2 Dec 2023 01:15: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 4ShsSP6SP3z3L5t; Sat, 2 Dec 2023 01:15:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701479749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tJzuh6RtJ6zJ0myqgqpn/FGE2PDF9UgKylMWazwr7aI=; b=RebATUnfwBeucRnml+F7ECm7PDhZr/X2GG2y+OcvIdM79M1kuMMNsst+SKNoQTWp6MNynY BSKqiUd9PZR2cL/dTrh0XhH4Xee35QexqeQq+0wupZdUnoetrehT9oB2RJG1VCLget0ZW7 0iLi+kDWhWpXCXG2TE2qrnUj24tqEsN7uA3S2eenM96I0QwbH9cIeuWUvU6vHDwge3GIJY ELKs7XZz4dYIRnSCaMjIeUehn+cvyVZqtABv3iOEazBGuMIjHhX5fAaqu7iEoSz2ItPNOf S/g2QGTU0mlgVEHtDJ3vbIz9RW/aDbmERhRTAmaNuwnh1jIyL9mutyeQXiR6vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701479749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tJzuh6RtJ6zJ0myqgqpn/FGE2PDF9UgKylMWazwr7aI=; b=eqGXPiGNQsyxk8ywqQaNP0YWu74vakk/lUKPaDKk/W2p6Az/tRf6jd1YDXXJ7Zc1nq90vr Ame0t2o/+07ZZAzSmuAdvPU3CoC99jytuQ6fxG+7n82bv1MnoXCnHlniYN63eYGxuHBY84 8uWgit7uvEQatAvwUh/uHMWPEiaP6xZ+YxKzkFFqZOydgOerYSQIvyP1eH39Ae4RJMqrD8 pExd7XnoNJQJAdm2sHFAgu/oA86AB+a0zmw9XjClRbT2tGPx95VVfE0PmhTP3blmquLvSZ u3L0e5LCBhj7oTM8A17oyD3Bj0p7gy7++Ahn8JmxMXr9VDWrWFAZOkTRhjBjag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701479749; a=rsa-sha256; cv=none; b=h0YXQlmi2SDf6K+bXtv55M5FGfDZLNCBKrsjPgNaGhjrkn7WNtGFW0VhOP72cWuYxuKeS8 W6ogDVLH33DlQpRkshkO/UaYig3I/rfZvLCanJ4913RAbsbzRL67gl2+CzN/V9Hf5F4J2J b/C9SPuUosMAid72ID8lgIXtVAezNLRmbC0hP/gvY6nOjMs4llP9F1b8tY4dJBcc3PsSH+ +UuQkmaOX2kCS+eso3O33NBoDAVFvxbwoj8q9DfNhpv77SGM6TWapyw3SIKjIdu72ZnLzB 9Ai8nUhhmfqnGkSNgREzAULftvmwMTggW6ALZz/QrPOmI4M/Ha//+EtuDvtEpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShsSP5W4Jzwrf; Sat, 2 Dec 2023 01:15: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 3B21FnrS060759; Sat, 2 Dec 2023 01:15:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B21FnIl060756; Sat, 2 Dec 2023 01:15:49 GMT (envelope-from git) Date: Sat, 2 Dec 2023 01:15:49 GMT Message-Id: <202312020115.3B21FnIl060756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 36d8a4846414 - stable/13 - Set installed kernel and driver files access modes using KMODMODE var List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 36d8a4846414f543595bc9c37d713ab352383258 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=36d8a4846414f543595bc9c37d713ab352383258 commit 36d8a4846414f543595bc9c37d713ab352383258 Author: Konstantin Belousov AuthorDate: 2023-11-25 13:28:34 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-02 01:15:25 +0000 Set installed kernel and driver files access modes using KMODMODE var (cherry picked from commit d3849ec3c9e700956a8a1d03f7755d586934f225) --- sys/conf/kern.post.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 76cf4616783e..4e22c07ef8d8 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -414,22 +414,22 @@ kernel-install: .PHONY fi .endif mkdir -p ${DESTDIR}${KODIR} - ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}/ + ${INSTALL} -p -m ${KMODMODE} -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}/ .if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no" mkdir -p ${DESTDIR}${KERN_DEBUGDIR}${KODIR} - ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.debug ${DESTDIR}${KERN_DEBUGDIR}${KODIR}/ + ${INSTALL} -p -m ${KMODMODE} -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.debug ${DESTDIR}${KERN_DEBUGDIR}${KODIR}/ .endif .if defined(KERNEL_EXTRA_INSTALL) - ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_EXTRA_INSTALL} ${DESTDIR}${KODIR}/ + ${INSTALL} -p -m ${KMODMODE} -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_EXTRA_INSTALL} ${DESTDIR}${KODIR}/ .endif kernel-reinstall: @-chflags -R noschg ${DESTDIR}${KODIR} - ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}/ + ${INSTALL} -p -m ${KMODMODE} -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}/ .if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no" - ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.debug ${DESTDIR}${KERN_DEBUGDIR}${KODIR}/ + ${INSTALL} -p -m ${KMODMODE} -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.debug ${DESTDIR}${KERN_DEBUGDIR}${KODIR}/ .endif config.o env.o hints.o vers.o vnode_if.o: From nobody Sat Dec 2 01:15:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShsSR1F5dz52s8R; Sat, 2 Dec 2023 01:15: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 4ShsSR0q0qz3LFB; Sat, 2 Dec 2023 01:15:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701479751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nxItYjePZZS6/UNCQG02jNMv/Y3FEXTv9wQCPGIzx4g=; b=Y+3c7/dkhciRwM8lNoTDGgS48zVhBws6Vprjckwyu3Nb1qWtQdlmg6odhvkf7gqE4ynKZn aPkY2GIoZmsTINga0s5tVPe6UzPbCNdmMAw+6sj39Ka2E6WfAP69C8I/Rp522uyJIDOQNv 07d6bBMzPEH0wAEYuUCsMM7g74jAtZRAC9MXhIP9tmwT1S4jv03WswVhcLZkMrahEtqlxZ t5QBA+4WmtpMTBKsUhqibfIQHsE0LMypupO0W+0fJ0BYq6XVLtDNeAbtBv7ez/uQCcjqzv KQvZ3Vi753p3qXZH7ix9cT+TLkjC6KFZVSh7OP72VQawPAE8q9TEgmOuMarGug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701479751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nxItYjePZZS6/UNCQG02jNMv/Y3FEXTv9wQCPGIzx4g=; b=N8Ixv0v39VgEy9JuTWBXzn/T4lzKGNyHPVWPWBYTwAhzUUHdNVPMChmoa9BXBx5HzX3c7p cKi/O5OhgV3hq95nsMGdY9U0RLVnp65aonEPKJI7qPt/xBWpT8bwltwej9PlRovqOdvRaz 5QE06HTo6rEGO/b1D6uJa8PUQP4/2bXne2gCAfUvguSxGVGNstcM2vKwnn1I2VFYiu0nqk vof4Ah52Lu46IBFaJgI0KZdqOC513VFBAmlfRNa0Qa4rB6lS9b4LnIVRS97iMvZ/F2SoOr VHsdBJgp0qP8Cz4GJLT9RNQr5pdBEzpi7bpjcq7+RySpEsjvPbFT1n9SQH23zQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701479751; a=rsa-sha256; cv=none; b=p64KCU4x/he6S4qClQg0Fbjwc4Nt2gSOdCM+nb8X56zj0gui7/OAqUCJqpkNldI7e3SdV6 P4Kt0nfrvB9g0Bea/VuxqWyS+BneN4S+DbDlznPTC5Tz+MuFNLWqJIZ6D8e8Da6A6l3t7p KkscrDJ8tmlsqsnCneNfB+CVAy/1l+ui8yU1YLhtGT9P0im8BePBwzvXEHZ+TVjtYZh0js 7YfeRJoMMCvAOyBIP9tASCAcQYvPizVjzuYW4gzro8qPzdwXHHvHgo6qwaUjnJb0L9j3DM ++BD5FxVHYKmdQiQUA0yYLdRvLhDMmhUvj9cSC7OB41WO2XXvOhBMlWNyOTMXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShsSQ6qHKzwq9; Sat, 2 Dec 2023 01:15: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 3B21Fod8060819; Sat, 2 Dec 2023 01:15:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B21FoHm060816; Sat, 2 Dec 2023 01:15:50 GMT (envelope-from git) Date: Sat, 2 Dec 2023 01:15:50 GMT Message-Id: <202312020115.3B21FoHm060816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e45074b6b8e0 - stable/13 - Do not install kernel and modules with executable access bit set List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e45074b6b8e0609f80aaa72c36c6c051d3717e10 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e45074b6b8e0609f80aaa72c36c6c051d3717e10 commit e45074b6b8e0609f80aaa72c36c6c051d3717e10 Author: Konstantin Belousov AuthorDate: 2023-11-25 13:30:06 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-02 01:15:25 +0000 Do not install kernel and modules with executable access bit set (cherry picked from commit a9758e46473babc03bfe06edfec35e0c71fa7780) --- share/mk/bsd.own.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 239c8b71e175..f1b5bebca257 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -171,7 +171,7 @@ NOBINMODE?= 444 KMODDIR?= /boot/modules KMODOWN?= ${BINOWN} KMODGRP?= ${BINGRP} -KMODMODE?= ${BINMODE} +KMODMODE?= ${NOBINMODE} DTBDIR?= /boot/dtb DTBODIR?= /boot/dtb/overlays DTBOWN?= root From nobody Sat Dec 2 05:56:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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 08:06:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj2Yy42wTz53K11; Sat, 2 Dec 2023 08:06: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 4Sj2Yy3Xynz3L0J; Sat, 2 Dec 2023 08:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701504374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oHgZI/lkYzFs2Ri8B90O7gdlKDveh6xeWBXLkDQu8+I=; b=xr1hEftKqkpdJnqEMaItYTu+7m4XtTZsryicDJ0z3qvijXXr3WrsQQkkWNIPvn+600Vu+p v1rp38NSGVi7bMFsh6bKqXyJkSiHc/HzdC56Z0KDdAt3TVLgYWwcxkr47rE1lgG+PRdWMu zdLAzQ4qktkUgQHNQqHR+GtiZWCPwXtAyMVTvHdaYE9JrQFMs5odTHYAoMJge4NW4QZY+k 0L6g9IL2eR1WLq9pyUHJ4UX8+l9l1ao5akfrEI01LZMzMYwfJQdB54y9QYfbRn9yx/f9g1 gRL8LT5xo3UTGE/htn/zDRODSAZquSYXIqcM4m5yJXfv+ErWlTAAkH1xwh/EuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701504374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oHgZI/lkYzFs2Ri8B90O7gdlKDveh6xeWBXLkDQu8+I=; b=Sb7eg5uVdThkVs7efuxY3adSP5pm117F6P+u6yXCRAkfrgmMyssHphIEWti+K+jRwSphpf 69UDOyGlvGrCzRjHZEpl7m8ZNNIbd8Ys2g5MniRaXeldx7Ppqxnuq6AoT21HIvTYYFhITt JkNy4oTk3EDVK4IeYQIyB62X5/NqS658s1Ilppn/kJxfPHzqIabcLr1wW4vjHkQUZMsBcF C8jbSxzsu2GjV+vRilMAfTQXhaAeKiY259560TK8d7xAwXkz16Y+Oqwb0y+PjJjftw9RHd 6Gniph9t9RLVe9juu6hqMojcJRobMDf3PRrXqsXiUjaahQhVCQngYg3FpFzNRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701504374; a=rsa-sha256; cv=none; b=p+ttP7HgAuQmZh5EoJArzIAL/F/iYe9EdvFbqfzXaCZJrBk7PK7uzLNadnW7DK5GziD5Df gBraGJnZwPdndPJ4ECX9f/r+bb/dN28oloGTY+PhxVecDwW05BRfQ8N2UVo3rBrByIhJuE z+o+NVJvegQGaWFqG+wLlv717A9P4r+iOKEzYMwFB2DUVMTX2HOqrKgZ6AXvioN6xoXYaz P3i9uZZDf+CDgL9YCUSvyIZY0vC84J/FFZpOueMtDS3cH6wcDeBk0d4e5rF9+Ja0KfkheV KarH+rPgAo7wp8ptBK/6RJXPcSjqE4hq6Hxrk8lfO9bhYNMIxfFqJMtrtBkEew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj2Yy2WNjz18BM; Sat, 2 Dec 2023 08:06: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 3B286E4Y045113; Sat, 2 Dec 2023 08:06:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B286EXd045110; Sat, 2 Dec 2023 08:06:14 GMT (envelope-from git) Date: Sat, 2 Dec 2023 08:06:14 GMT Message-Id: <202312020806.3B286EXd045110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: ed36613e65ab - stable/13 - rc: add ${name}_setup script support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ed36613e65ab59ba8e9c2ca73ca8188457b51d01 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=ed36613e65ab59ba8e9c2ca73ca8188457b51d01 commit ed36613e65ab59ba8e9c2ca73ca8188457b51d01 Author: Franco Fichtner AuthorDate: 2022-08-15 14:41:31 +0000 Commit: Eugene Grosbein CommitDate: 2023-12-02 08:03:49 +0000 rc: add ${name}_setup script support Run a service-based setup script before running the start command. Useful for automatic configuration file generation. Reviewed by: https://reviews.freebsd.org/D36006 --- libexec/rc/rc.subr | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 032d7b261bc2..2f9ce7f54bef 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -803,6 +803,8 @@ startmsg() # # ${name}_prepend n Command added before ${command}. # +# ${name}_setup n Command executed before ${command}. +# # ${name}_login_class n Login class to use, else "daemon". # # ${name}_limits n limits(1) to apply to ${command}. @@ -987,8 +989,8 @@ run_rc_command() _group=\$${name}_group _groups=\$${name}_groups \ _fib=\$${name}_fib _env=\$${name}_env \ _prepend=\$${name}_prepend _login_class=\${${name}_login_class:-daemon} \ - _limits=\$${name}_limits _oomprotect=\$${name}_oomprotect \ - _env_file=\$${name}_env_file + _limits=\$${name}_limits _oomprotect=\$${name}_oomprotect \ + _setup=\$${name}_setup _env_file=\$${name}_env_file if [ -n "$_env_file" ] && [ -r "${_env_file}" ]; then # load env from file set -a @@ -1144,6 +1146,12 @@ $command $rc_flags $command_args" fi fi + if [ -n "$_setup" ]; then + if ! _run_rc_doit "$_setup"; then + warn "failed to setup ${name}" + fi + fi + # Prepend default limits _doit="$_cd limits -C $_login_class $_limits $_doit" @@ -2160,7 +2168,7 @@ check_kern_features() # check_namevarlist var # Return "0" if ${name}_var is reserved in rc.subr. -_rc_namevarlist="program chroot chdir env flags fib nice user group groups prepend" +_rc_namevarlist="program chroot chdir env flags fib nice user group groups prepend setup" check_namevarlist() { local _v From nobody Sat Dec 2 08:16:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj2nQ6Gt2z53LXy; Sat, 2 Dec 2023 08: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 4Sj2nQ5rFZz3Mb2; Sat, 2 Dec 2023 08: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=1701504970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HqmHJQRillvh9nurUUw1X+S0apHDIXgjYvlN0h5h6iY=; b=Y7YAZETA4ECWECT9/W156guuKOKzRwQZDxo0iP1QVRe31x8pHv9ME7qOYQGNXqFZMa1PEA X2Kslov9WK3lWy03Z6IAtus8qrp3h2dWxda7xG6yDOnwGDycBrDMuG91wW1i33dbJIIWde GtuTZP59iNb2stC5nL1ZbiesZCVVtZV7olsGhEG2sPl5FrrGpAn9J+rVtE7dxIz18HygFB c2EfWgG2fabQrYQ7NV4QMCnec+uZwuRi4RghoVmB6BgIb9yrcSZX+F9Yv6872QhhJOPNh0 /IiH4RAAEGwqgV6ksnj00RQxmTJlDdtvvx3iUR641H1ndA35e4ud5UZq/JBa0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701504970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HqmHJQRillvh9nurUUw1X+S0apHDIXgjYvlN0h5h6iY=; b=UYPGfG5eLopJq7/mm4GhR6CLnw9wSdyeiVHT2nDswga1g3RG6MNkiS+jF7t91OVxWFNELH Zy7tKF/0oYfd3K0PO+wVmG7P+qVZxiB1bhYxv9gqwr6S14SNYKyfC/Ex8KfKJCqYcMJd2V sta1VaegF0topwlEOFou8NvtT14HHVhTfoLseReVvePRpwbNquCsPMOWbSULmc5x6kzqX8 X+LHPW4DR6uAUzIZE7R8aHhdN0gcEBl7g45BEWNK3ieStMz2cqtAdAf73DTdfO8inKaalV 8bCLINOaMzhPnWHkGWHaiOh6JgkwF30HVI9oqBw7X9MDdq2eNqCPYvJ/1buG+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701504970; a=rsa-sha256; cv=none; b=gmhXKnZoXAUu22ORGyse58AtghGSwTz/lPcVpECdIKjlFFzjAT35sas/oqsSR1SnTGaJXs xpd/JdopgxKCU/zGcqYEDerT85f8rXnfNg0EWiEMsksb1xkvPWH6TIVIZx9kNoxbkZBoOX ARN8j20qj9HDKZR6PEHS1KkdG2AWJOR+bnOFGPc1ZqgPR8awgu1bpydukvtVoFLiDp7E3G LVsQpp2MzqC5lo+qgp4MWezffL1XNLGYnPAxW4pZFOLgk0Ya85JwPMP5jctutmRSu4gfpC eyB0v27EE1rvycIYHkOXKx75jFe6xnvHB9Y3ZSH9TpZvYQEwj/KPKJWQ6cs1NQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj2nQ4nKFz18F6; Sat, 2 Dec 2023 08: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 3B28GAWO061513; Sat, 2 Dec 2023 08: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 3B28GA33061510; Sat, 2 Dec 2023 08:16:10 GMT (envelope-from git) Date: Sat, 2 Dec 2023 08:16:10 GMT Message-Id: <202312020816.3B28GA33061510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 2d6a03dd43c7 - stable/13 - rc.conf(5): add _umask to run the service using this value List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2d6a03dd43c758cdd7c7dd9590459d1aa77d4333 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=2d6a03dd43c758cdd7c7dd9590459d1aa77d4333 commit 2d6a03dd43c758cdd7c7dd9590459d1aa77d4333 Author: Eugene Grosbein AuthorDate: 2022-08-28 05:45:23 +0000 Commit: Eugene Grosbein CommitDate: 2023-12-02 08:15:52 +0000 rc.conf(5): add _umask to run the service using this value None of tools working with login classes change umask(1) and we had no ways to specify non-default umask for a service not touching its startup script. This change makes in possible. Some file-sharing services that create new files may benefit from it. Differential: https://reviews.freebsd.org/D36309 (cherry picked from commit 160a2f2cdda806e104c0d3194bfb84b208ad1ae8) --- libexec/rc/rc.subr | 10 +++++++++- share/man/man5/rc.conf.5 | 8 +++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 2f9ce7f54bef..04b30cac40a7 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -790,6 +790,8 @@ startmsg() # # ${name}_oomprotect n Don't kill ${command} when swap space is exhausted. # +# ${name}_umask n The file creation mask to run ${command} with. +# # ${name}_user n User to run ${command} as, using su(1) if not # using ${name}_chroot. # Requires /usr to be mounted. @@ -990,7 +992,8 @@ run_rc_command() _fib=\$${name}_fib _env=\$${name}_env \ _prepend=\$${name}_prepend _login_class=\${${name}_login_class:-daemon} \ _limits=\$${name}_limits _oomprotect=\$${name}_oomprotect \ - _setup=\$${name}_setup _env_file=\$${name}_env_file + _setup=\$${name}_setup _env_file=\$${name}_env_file \ + _umask=\$${name}_umask if [ -n "$_env_file" ] && [ -r "${_env_file}" ]; then # load env from file set -a @@ -1352,9 +1355,14 @@ _run_rc_postcmd() _run_rc_doit() { + local _m + debug "run_rc_command: doit: $*" + _m=$(umask) + ${_umask:+umask ${_umask}} eval "$@" _return=$? + umask ${_m} # If command failed and force isn't set, request exit. if [ $_return -ne 0 ] && [ -z "$rc_force" ]; then diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 666ccbbc6b6e..8f105e679b55 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 18, 2023 +.Dd December 2, 2023 .Dt RC.CONF 5 .Os .Sh NAME @@ -237,6 +237,11 @@ such as PostgreSQL will not inherit the OOM killer protection. .Pp This variable has no effect on services running within a .Xr jail 8 . +.It Ao Ar name Ac Ns Va _umask +.Pq Vt int +Run the service using this +.Xr umask 1 +value. .It Ao Ar name Ac Ns Va _user .Pq Vt str Run the service under this user account. @@ -4730,6 +4735,7 @@ The default is 10. .Xr limits 1 , .Xr protect 1 , .Xr sh 1 , +.Xr umask 1 , .Xr vi 1 , .Xr vidcontrol 1 , .Xr bridge 4 , From nobody Sat Dec 2 08:39:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj3Hm3BjPz52SLm; Sat, 2 Dec 2023 08:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sj3Hm2cKbz3QGN; Sat, 2 Dec 2023 08:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701506340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+MoP0hHt27BLqPElWJwLvuGJFU63Yop1CU7Y8ElDcxE=; b=YCEvNDHciXkdJ5eGT6N5IXTnqfhN1UzPYeiMgwkISEVvK0ChF31od+OaR2lE/6lz1Pd7dc ueNaqWMbhWtrU8Uliec0Nm7/1D+OVWWjYUuExK3/pkjSXzaO8yka6k5llZVEY0T2pay6sG VI7H7PLb7FahfNMbHSLMVQ0inBAt5uZ0L4SOGPu7AQqCdA5jvR7HBAbNDemHd67U7/L5SA LK/S/4U/CsO6OGdcisx4kJDjOdw7k+RB2yGjaQ27lNOPU+hpYZ/5CtS3A8U1dmzCVyGJxh tnqNv9EGiLcmuCkL+RCQYpHcYwAZX7st4+IzBaOVngVD5qv7iSwFJ/z4MDmv9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701506340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+MoP0hHt27BLqPElWJwLvuGJFU63Yop1CU7Y8ElDcxE=; b=H59ECV+H+YKXPh5AsCXZiCOAdxNLqLerJ+5bqj0PGcE8kaA6jyCSVCyvqXEC6Hqqgzx9Zs NypcasfmXbnrvWmcXyvrIeE/pMRtl5BCm9z/auxMzkZfCiNFnZ7xKmXUGXBZr/cquPaTy5 aoOFrgYngDv+ioUefNRno+0FMVrNCGDtOp8aQu/q7qudDv08kVkiCutK4k0sDBqv2Lhdpr GD40fKGdt+gPVqaYPvt9p0m3H3S2jLb0sqgoOAEX731sgJMytMNRwo9J10jjEkVoV58pwU +Im9p0eBnaWi0IsX/mo75N1dvwyTHAZxQXTRYnbGGbCSIKisnILizUZY15wjxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701506340; a=rsa-sha256; cv=none; b=LVGEo8MmnvTfBEC3hpNSlz0Y+S+9lxmDDZqR/o8NTQGQIBZnhU99fEmywjrQTce+SQRdFL SUu10vNqnkv7d9fuQLn0AMqjx5q+HcPLTuZywV2+bMeIyH1Vo3sNHa0nyyQVIfBx7pUHm8 EIArXRRuWJKUsA0beK1bux25b/tLrQzoiLmSycRb3t1Y69bPVivGGRF7oZ8Oh2a0Kg19bd 1RpNX8k+7ZZOXakYCd9/lftk18pqxKSaQM86DItlut0a/Y/sznnBN099UHf+bn0jn4ycyx 55VspXYbwwWTAh9KQn3PbqwYxj56NykGiSACBBfSr6AbJ6o/RM54uxNQwvoibg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj3Hm1YK4z18GV; Sat, 2 Dec 2023 08:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B28d0kr095196; Sat, 2 Dec 2023 08:39:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B28d0bs095193; Sat, 2 Dec 2023 08:39:00 GMT (envelope-from git) Date: Sat, 2 Dec 2023 08:39:00 GMT Message-Id: <202312020839.3B28d0bs095193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: b1e0b0cb7ce1 - stable/12 - rc: add ${name}_setup script support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b1e0b0cb7ce100b317cf69ec5180660d31e25c3c Auto-Submitted: auto-generated The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=b1e0b0cb7ce100b317cf69ec5180660d31e25c3c commit b1e0b0cb7ce100b317cf69ec5180660d31e25c3c Author: Franco Fichtner AuthorDate: 2022-08-15 14:41:31 +0000 Commit: Eugene Grosbein CommitDate: 2023-12-02 08:20:40 +0000 rc: add ${name}_setup script support Run a service-based setup script before running the start command. Useful for automatic configuration file generation. Reviewed by: https://reviews.freebsd.org/D36006 (cherry picked from commit c9be47b34dd847da1d4ab0feee4a6100b2c5ea0d) --- libexec/rc/rc.subr | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index c64186608aa2..e9a2feeb6d1a 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -783,6 +783,8 @@ check_startmsgs() # # ${name}_prepend n Command added before ${command}. # +# ${name}_setup n Command executed before ${command}. +# # ${name}_login_class n Login class to use, else "daemon". # # ${name}_limits n limits(1) to apply to ${command}. @@ -967,8 +969,8 @@ run_rc_command() _group=\$${name}_group _groups=\$${name}_groups \ _fib=\$${name}_fib _env=\$${name}_env \ _prepend=\$${name}_prepend _login_class=\${${name}_login_class:-daemon} \ - _limits=\$${name}_limits _oomprotect=\$${name}_oomprotect \ - _env_file=\$${name}_env_file + _limits=\$${name}_limits _oomprotect=\$${name}_oomprotect \ + _setup=\$${name}_setup _env_file=\$${name}_env_file if [ -n "$_env_file" ] && [ -r "${_env_file}" ]; then # load env from file set -a @@ -1123,6 +1125,12 @@ $command $rc_flags $command_args" fi fi + if [ -n "$_setup" ]; then + if ! _run_rc_doit "$_setup"; then + warn "failed to setup ${name}" + fi + fi + # Prepend default limits _doit="$_cd limits -C $_login_class $_limits $_doit" @@ -2139,7 +2147,7 @@ check_kern_features() # check_namevarlist var # Return "0" if ${name}_var is reserved in rc.subr. -_rc_namevarlist="program chroot chdir env flags fib nice user group groups prepend" +_rc_namevarlist="program chroot chdir env flags fib nice user group groups prepend setup" check_namevarlist() { local _v From nobody Sat Dec 2 08:44:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj3Pq27rdz52TcH; Sat, 2 Dec 2023 08:44: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 4Sj3Pq0BPzz3RDv; Sat, 2 Dec 2023 08:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701506655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IOOWnK9Wqh4FASgFIEWk9OOnEK5DfGR7WtdYpfks+fM=; b=ENigqqeykQ1zi87Od2T1dudrwPdWSJeNj416oZ74VuiPGG0EMEuvMT2aVeFZ5GexXW4ffp SwaVFa6ak1TGCW6ywASfbDAAwJ+dlnV2m8dSDVHUa5OWgL4vvZBPPSVR6cGnOI9sgowZij 16es0KFa3NILg3SyhHDLYviAZrXKt0TQ68THzHTGJE0bQDgevooGNOOmDJzj5Eho0Ezgnr GykxIk7XfD2Suif5pPWk02H4YnUcZQhTrZOQZ1mh4MkgCGnJERINo3Rmv4KlEqyrTRLn6S qVBUbrAtNwGi+zlMZhEL1OSa7bzpF7v8ShTyZb2Pz07gga6RPOFtQ0pGMwJOxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701506655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IOOWnK9Wqh4FASgFIEWk9OOnEK5DfGR7WtdYpfks+fM=; b=GBlbUCwVWsNWeKzyCS6WZylw+6qz8+1KtP1j9npWFu5vvTeakt6r9nIOjl8ahXzVe8w6Jl if+mPWEcawSXsvwO0bsyzTof1ApZRplIAo/ZByG53B6LPUn1e30BZvLZWH5kch4gq2xWe7 9Qfh/S/KwRS4H3u7z1MP7rSQOJ/JOMq6yoQMzh+gAxMED5P56VeJyf5mpdw6gzs/eUqyJB r9jpwUYxCfXWkhTGw2ceVm94X/DaNaxFuIwo4BcyYyOI6g3/WTnSWYtnpW41OX3UlzdLsw RBmAzoleagZVJxd5GpLoHhAdzIIwWsT1ZKDY5ofD72FDaiTxe64autRB6LjKaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701506655; a=rsa-sha256; cv=none; b=IGMZRQuwdnm9gias5v/zvs2l+LFng2z5mBqUPc9JAjVOGJSjh/0rIazEs4Y9oG2e300RL0 uapBKPqNmczd77AyLCRiwBmmIYy4ic72cH+gWdQ86S7oxSyUn/ussukn2gUy4BMao8ymg6 P8f93vkOudEDayasIAgSV9FxXQIJq/SzqUs7yZIj2mabjEINbVd0rGUnI6FPDILsYgDlKH sY4+6L6z+eQbGct0btzTJ0X7DpAPqeMmZ3r49hWTXrkbQiTxV5pSZ/XtJ+nXNyTYgfV2nu 98eru2DYnosbZxPLFwtCiKFiQJ9rvB8i6ZQqOxh3kgoWFYVlRefaWMNxFwYnWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj3Pp6Mx5z18Sm; Sat, 2 Dec 2023 08:44: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 3B28iEIr010950; Sat, 2 Dec 2023 08:44:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B28iEsv010947; Sat, 2 Dec 2023 08:44:14 GMT (envelope-from git) Date: Sat, 2 Dec 2023 08:44:14 GMT Message-Id: <202312020844.3B28iEsv010947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 2e6541b943ef - stable/12 - rc.conf(5): add _umask to run the service using this value List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2e6541b943efb785aa6e04957e511a83b452b240 Auto-Submitted: auto-generated The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=2e6541b943efb785aa6e04957e511a83b452b240 commit 2e6541b943efb785aa6e04957e511a83b452b240 Author: Eugene Grosbein AuthorDate: 2022-08-28 05:45:23 +0000 Commit: Eugene Grosbein CommitDate: 2023-12-02 08:40:59 +0000 rc.conf(5): add _umask to run the service using this value None of tools working with login classes change umask(1) and we had no ways to specify non-default umask for a service not touching its startup script. This change makes in possible. Some file-sharing services that create new files may benefit from it. Differential: https://reviews.freebsd.org/D36309 (cherry picked from commit 160a2f2cdda806e104c0d3194bfb84b208ad1ae8) --- libexec/rc/rc.subr | 10 +++++++++- share/man/man5/rc.conf.5 | 8 +++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index e9a2feeb6d1a..846965d9a8e6 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -770,6 +770,8 @@ check_startmsgs() # # ${name}_oomprotect n Don't kill ${command} when swap space is exhausted. # +# ${name}_umask n The file creation mask to run ${command} with. +# # ${name}_user n User to run ${command} as, using su(1) if not # using ${name}_chroot. # Requires /usr to be mounted. @@ -970,7 +972,8 @@ run_rc_command() _fib=\$${name}_fib _env=\$${name}_env \ _prepend=\$${name}_prepend _login_class=\${${name}_login_class:-daemon} \ _limits=\$${name}_limits _oomprotect=\$${name}_oomprotect \ - _setup=\$${name}_setup _env_file=\$${name}_env_file + _setup=\$${name}_setup _env_file=\$${name}_env_file \ + _umask=\$${name}_umask if [ -n "$_env_file" ] && [ -r "${_env_file}" ]; then # load env from file set -a @@ -1331,9 +1334,14 @@ _run_rc_postcmd() _run_rc_doit() { + local _m + debug "run_rc_command: doit: $*" + _m=$(umask) + ${_umask:+umask ${_umask}} eval "$@" _return=$? + umask ${_m} # If command failed and force isn't set, request exit. if [ $_return -ne 0 ] && [ -z "$rc_force" ]; then diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 0f82a5df93c6..23f24bc349a8 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 7, 2022 +.Dd August 28, 2022 .Dt RC.CONF 5 .Os .Sh NAME @@ -234,6 +234,11 @@ such as PostgreSQL will not inherit the OOM killer protection. .Pp This variable has no effect on services running within a .Xr jail 8 . +.It Ao Ar name Ac Ns Va _umask +.Pq Vt int +Run the service using this +.Xr umask 1 +value. .It Ao Ar name Ac Ns Va _user .Pq Vt str Run the service under this user account. @@ -4672,6 +4677,7 @@ files. .Xr limits 1 , .Xr protect 1 , .Xr sh 1 , +.Xr umask 1 , .Xr vi 1 , .Xr vidcontrol 1 , .Xr bridge 4 , From nobody Sat Dec 2 09:19:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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 09:45:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj4mV6NB2z52hgr; Sat, 2 Dec 2023 09:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sj4mV5xg8z3YCJ; Sat, 2 Dec 2023 09:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E0szUKK0vyIhT2JpdxzQ/MyibzEhtO3NZgOvT5JRVAs=; b=MlhEaGD6fVy9bnSpM/FBKF3o5ze/in2Jeuj/vDWf8xpnFegj8GJwyH6UIE1cSfpyK28nSd Aqps36ikaSLevrh/U5TB8SCUtBaRFLQjkjChhMQmW2PM7rzkGah4CzmXlMn/g/p9qZnLJi 95OjFqc5JuZmgGEnph1WbKFfTyXUQJAvSbAa8YQD3MUV8yyTnoirL5wbbmAh9U6RBZt73M ZdkbRVnzGfRGUcC6w9GKlAk+L6bKhXew2XtO7TSN3tI1RFytPZ13Bxwlm+VM/KisMpsrA5 TjPdCLZjzlBVvY5P0TUw0W8NcoVOxbOe4qf5cBNMjIOL1vb9cAjlr2sqiwtLJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E0szUKK0vyIhT2JpdxzQ/MyibzEhtO3NZgOvT5JRVAs=; b=erb/qWVF4/k0SXSbXGTQLZaGXEyfzPsHx5gZMgr11yiVBDikmQwO5Rq1FKcxFELU6c1acz GiXa+MBvf3FuA8Tvu+j1NY0IRYxrWs2Tn9k2MMjxXAjODBpeUk68jKVNUH8/QRVIzn1WQQ yfdZAJ7twKFf5NkUXKn4a6brGlf6vkXJgJfFtS9CCGDIMF4sdrNIasyDFxCenxTVFijhpI UWFAw1zQb08zz0dZVHnLuu7Ry1y5K/ivieiapCNJ7dA21JmGpMdOf7KA/CKCj10It6y104 fFD8zpRuiMBUJsBhipbc/EIpwQeMuzUjtZE5v7E6VDvsBkgM3UAKRkBUgS53OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701510330; a=rsa-sha256; cv=none; b=kzQ0slZiZYaBiD8Cu8lnjbuND9bmwRiE66tXFlNe2AankSVbJIRxBslr1Pdomfz9HYWNDM vxU61xM1k+qSx02joe9IPXuPgJR39MXVQWrz3aMQzApw45MOmRQmi66jYU1upQVqlsMsSp SiLVKuldsKHml9QWdvf0kDLPG0OnJOh0RTED6au7lxdgBJGvJOlVib5QIyxLCvPcfPA/dQ 52KDoEtsASxRWl78G5/x89zavvCOcxxLsd29/8zn8NK8IPxXdcUdXjNgzBvAn+KJukt5Fg lANB45/qZv5TNLkxslB0WFjkRWi+BhYljNnitCsFGagR5qhQHHio8NjtzkmbmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj4mV50pNz1B5Z; Sat, 2 Dec 2023 09:45: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 3B29jUXm011412; Sat, 2 Dec 2023 09:45:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B29jUSZ011409; Sat, 2 Dec 2023 09:45:30 GMT (envelope-from git) Date: Sat, 2 Dec 2023 09:45:30 GMT Message-Id: <202312020945.3B29jUSZ011409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 7cedaf50721b - stable/14 - pkgbase: set the prefix of debug files and macros to /usr/src List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7cedaf50721b125b5c46f8e974806248356787bf Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=7cedaf50721b125b5c46f8e974806248356787bf commit 7cedaf50721b125b5c46f8e974806248356787bf Author: Baptiste Daroussin AuthorDate: 2023-11-13 17:18:58 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-02 09:44:04 +0000 pkgbase: set the prefix of debug files and macros to /usr/src When the macro PACKAGE_BUILDING is set, then consider we are building package for pkgbase, this has already been used in Makefile.inc1 and reuse the PACKAGE_BUILDING macros already used for that purpose in the ports tree In the future this should be tied to REPRODUCIBLE_BUILD MFC After: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42569 (cherry picked from commit 030af1b62d7b9a86f5ecdceff5a1fa23e9570be1) --- share/mk/src.sys.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk index edf369638d9d..d5c2af0c559d 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -38,6 +38,9 @@ __postrcconf_${var}:= ${MK_${var}:U-}${WITHOUT_${var}:Uno:Dyes}${WITH_${var}:Uno # default over to -fno-common, making this redundant. CFCOMMONFLAG?= -fno-common CFLAGS+= ${CFCOMMONFLAG} +.if defined(PACKAGE_BUILDING) +CFLAGS+= -fmacro-prefix-map=${SRCTOP}=/usr/src -fdebug-prefix-map=${SRCTOP}=/usr/src +.endif DEFAULTWARNS= 6 From nobody Sat Dec 2 09:45:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj4mX0NGSz52hbZ; Sat, 2 Dec 2023 09:45: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 4Sj4mW6jV0z3YP2; Sat, 2 Dec 2023 09:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=akyzHaR7NZFmTBwNRxJ8olh0eJfrCFlFsSsrz2xIJIw=; b=hJyDvcPKmw/Fw3k+9tg0k8bUtcOImi7um0dt0msEVQR1KEBLNs9nq2GlLB9uJoDLhRxk+y oNbboMZRyOkVWJAm79Yis9ulua+q2V3Yh98M4ltpktzFsflTDBdvRloGVTiPtbFW7XZfRu cqRKEJayUFxr9866M+hFXvdtQib80S7IaJV2HOs21HzQmV0M3tUndNJwtIHzOK2pMAq4uo wHyr7WGJPaIBqDRqVCRp46BciHrnuHdmZsWYM4gle6qZt2dL5pAr4nXcj93f8lyGTk+cF5 N7KkvLVU6oZW66yqHKtQ/ZYAcdF3UjhosAFAht8eBz9GhHVX6JcqlDaBaIxRkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=akyzHaR7NZFmTBwNRxJ8olh0eJfrCFlFsSsrz2xIJIw=; b=qkVTDbAtrKfXcBia9J2U4ONOYEs/vp3LyRYHhcmU/O/MboSY2s3zabVd0OSCNJeP5rRy99 cSv/yLHkmadzVYc+HSk1WyRL8hdnRZTCositHCiRV9D2WYPLJp7OW4GUzBdpAylFDPtgib +xUNcStM/ClmHXoePuKeJwSp0xlMiTccXLww1qTsmIxCJvj0wP63wj/Qd+3nQwfSQWzlZp VhDC6FARCzNXC48Q2JcLO4yDsLyybxPR8bnRA30VG14WIVJZC9H7hs8d7/77wbMth/xwcF 8cjpV3mdakwGvUhDyn17pnhCR9fUkNQOf2FKnVKl//+EMt5spUrfsm3CH2bQyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701510332; a=rsa-sha256; cv=none; b=W8lpgxRThChDDrNEubZp9xlydkJXANIpQlj7QCOtggydZvqwzI7ZfHxSLs3XfsFf4bLbaS wSlMRx0Vor+RCIwlNXcSkqiIV8iz1P04sLrBHv5KjfDWqNfU+xBMYag/6pGByRRbEzgge/ ks/N4/IhCCUBAPI3tPdj6nRvIVc2T2+W+oF4BGiRHoHM//bLdqP+kaJvBkqsA3XXLfjlGQ bztFa8966wlcJBhj5OqfGwjQ7YvXeRjkTbAvzwZSSfXPTtqtlEVleuFZ+5snPJiP1aa2bx YXBthMwneHiTOKbiUtpQ9Lbkh7L1GeeTHrEUJEMbzqaq1n95PKW7IzcSSQDoZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj4mW5jx0z1B5b; Sat, 2 Dec 2023 09:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B29jVqQ011461; Sat, 2 Dec 2023 09:45:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B29jVqH011458; Sat, 2 Dec 2023 09:45:31 GMT (envelope-from git) Date: Sat, 2 Dec 2023 09:45:31 GMT Message-Id: <202312020945.3B29jVqH011458@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: eac828bc8973 - stable/14 - pkgbase: compress packages with zstandard List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eac828bc8973cc0ae417337d9ec4020c6533ccaf Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=eac828bc8973cc0ae417337d9ec4020c6533ccaf commit eac828bc8973cc0ae417337d9ec4020c6533ccaf Author: Baptiste Daroussin AuthorDate: 2023-10-26 20:34:00 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-02 09:44:55 +0000 pkgbase: compress packages with zstandard MFC After: 3 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42375 (cherry picked from commit 820fbcf25bb2c7f1c570c0d408b2ab7d05bd771c) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 46663e72750b..9f3f15a3194a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1944,7 +1944,7 @@ PORTSDIR?= /usr/ports WSTAGEDIR?= ${OBJTOP}/worldstage KSTAGEDIR?= ${OBJTOP}/kernelstage REPODIR?= ${OBJROOT}repo -PKG_FORMAT?= txz +PKG_FORMAT?= tzst PKG_REPO_SIGNING_KEY?= # empty PKG_OUTPUT_DIR?= ${PKG_VERSION} From nobody Sat Dec 2 09:45:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj4mY1fTbz52hh3; Sat, 2 Dec 2023 09:45: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 4Sj4mY0rcqz3YPn; Sat, 2 Dec 2023 09:45:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vPra+atJel/iGNB6NoXXPmCFvps3uDRJxcVT0KWv9lw=; b=XkTI+s3sqj4otGOOuuDvgx1uXHS3Nx1S9yv9CiAgj31IC1ZP1A5u1SY7Wg70TR+sjEb5w7 AhP3KGYHvHmUrFofJVgb40slcBdg525qjG84ge9w/+dVQaLrR7nCA11hk5slEk+4u2DOkn TEGAgve/6bXmZ3doJtoOesPCik9deVBlq+vBo4kUjS8AFd4rWjmTVim2rlmq+LZ24fbAJH MprCamCQdcg+bRb8DaEFMRb3hBlUaDjSEx4WRsmVZAN9e65d/m7WVXq0zpgAXVOEUW9nIr ApWnt7qqALRfWJ62O645/jMcULuBFaoMV+j2IXc9er5dg2D7TsBY3cfEDwGNsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vPra+atJel/iGNB6NoXXPmCFvps3uDRJxcVT0KWv9lw=; b=lv674YpRYh5BWzzbHIh+JnHg99/a5gZFwEReU47IlQwdZOwGeT0kgnI3UU3wAAUNpr1oyG 4yr2VXAbJ78rIL6lmP9VnnBL7gUWjqgc0u7JriVJuMeALgyuqlWHEhSeuAfhiK2SefKRHB bld0lavKXK5f9SufoeBkCJDaEbmC3mZayULV+Ipj0gqM9I12javOdmLn4WoyOUlBcHxXLx eE/Srdh8kKYu4lWFEaG3lx+GnUcf17q5mzDGbCRnozJJ0/XMOAJy4YcDFMjkZYd3GAstTx uVNrT9H2ZLBIE36RO4m7aoO46uo/Ib+dqlCFyywCJUPbbuNnllfhOdH3RGizWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701510333; a=rsa-sha256; cv=none; b=EoVaIOhy74zROXhvjH5FRzW7lqnqC5+a97jxh2TRp8W3TRstGPVig1S4JjQTbQC7BOhYNc vSvUIqqFgHnd7EkbGdh0KfOrLzsylU4E/XFX9NM+VCaKsQI2YMaF4GCvvmTBEdzTsu3rWL xrdPD29PQDRhsxs/atRZpDfuABJJk31tFVyP10CuP6ViYyu1urQ3H7TKI0RnrKV1n5eh8v r0eWTPIk1vh0ZNgrMw2rzbBIg0UpWMR/+MOLIh7TtgIjlB/e8eDMFGDXUa4mAfsjk7wd9v zmCeBxnfJC8ar2KL9JP3rAmktJW9WLGO4wNCPLPRYN0BEzxqVMhUKOqU2qjeaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj4mX71PNz1B2M; Sat, 2 Dec 2023 09:45: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 3B29jWFV011518; Sat, 2 Dec 2023 09:45:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B29jWSQ011515; Sat, 2 Dec 2023 09:45:32 GMT (envelope-from git) Date: Sat, 2 Dec 2023 09:45:32 GMT Message-Id: <202312020945.3B29jWSQ011515@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 181cc65dc462 - stable/14 - pkgbase: set a default set of kernel for when PACKAGE_BUILDING=1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 181cc65dc4625ee114a89786d72ec07366c39873 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=181cc65dc4625ee114a89786d72ec07366c39873 commit 181cc65dc4625ee114a89786d72ec07366c39873 Author: Baptiste Daroussin AuthorDate: 2023-11-02 13:20:11 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-02 09:44:58 +0000 pkgbase: set a default set of kernel for when PACKAGE_BUILDING=1 PACKAGE_BUILDING is already known in the ports tree as a variable use to defined when the packages is being actually built in an automation process, reuse that variable to define the default set of kernel we plan to build for the default pkgbase. Reviewed by: manu, jrtc27 Accepted by: manu MFC After: 1 week Differential Revision: https://reviews.freebsd.org/D42444 (cherry picked from commit df6e7e11c5f660cbd5381819718e3c947325fa2e) --- Makefile.inc1 | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 9f3f15a3194a..7e62894405df 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1678,15 +1678,10 @@ NO_KERNELOBJ= t KERNCONF=${KERNFAST} .endif .endif -.if ${TARGET_ARCH} == "powerpc64" -KERNCONF?= GENERIC64 -.elif ${TARGET_ARCH} == "powerpc64le" -KERNCONF?= GENERIC64LE -.elif ${TARGET_ARCH} == "powerpcspe" -KERNCONF?= MPC85XXSPE -.else -KERNCONF?= GENERIC -.endif +GENERIC_KERNCONF_SUFX_powerpc64= 64 +GENERIC_KERNCONF_SUFX_powerpc64le= 64LE +GENERIC_KERNCONF_powerpcspe= MPC85XXSPE +GENERIC_KERNCONF?= ${GENERIC_KERNCONF_${TARGET_ARCH}:UGENERIC${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}}} INSTKERNNAME?= kernel KERNSRCDIR?= ${.CURDIR}/sys @@ -1694,6 +1689,23 @@ KRNLCONFDIR= ${KERNSRCDIR}/${TARGET}/conf KRNLOBJDIR= ${OBJTOP}${KERNSRCDIR:C,^${.CURDIR},,} KERNCONFDIR?= ${KRNLCONFDIR} +.for _k in ${GENERIC_KERNCONF} MINIMAL${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}} ${GENERIC_KERNCONF}-MMCCAM +.if exists(${KERNCONFDIR}/${_k}) +PKG_KERNCONF+= ${_k} +.for _dbg in NODEBUG DEBUG +.if exists(${KERNCONFDIR}/${_k}-${_dbg}) +PKG_KERNCONF+= ${_k}-${_dbg} +.endif +.endfor +.endif +.endfor + +.if defined(PACKAGE_BUILDING) +KERNCONF?= ${PKG_KERNCONF} +.else +KERNCONF?= ${GENERIC_KERNCONF} +.endif + BUILDKERNELS= INSTALLKERNEL= .if defined(NO_INSTALLKERNEL) From nobody Sat Dec 2 09:45:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj4mZ3zJ4z52hdc; Sat, 2 Dec 2023 09:45: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 4Sj4mZ1gtGz3YjP; Sat, 2 Dec 2023 09:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pTyVhc2Xw+nSZFj074bT1P3i34DTO2tOovZQotN3HpM=; b=fw2L2GFWYMBmBg47/M5bnhjaxxHuoVrohkPPvJbFfJy5VDdm5Ft2RvWKj4OaQZdBdnxBlJ 1MpaseawdYK3MAnFJVcqwbvRugrn5ucSlIQEcxH6PSMDHa2t3cqnkmkSVbEIDfrYC5ETph bwfkBwPWZHlY/QcIos3F26UscytXqCYQQu7cVSf/yYcQBlGpfE9jsVYv9dDSo2uRck2On/ dfOEJnpSfuAGrG+KypxvoAaY32ymmP2npZECirbwvTFukHboLRoPVkAUHhvuM8WGGJVY3N xxTtx3HzC2Nb4X6c5NyPCB2mU/5udP2d96zz+6JOMtKxODjgRV+fdI/mI9rSFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pTyVhc2Xw+nSZFj074bT1P3i34DTO2tOovZQotN3HpM=; b=U9KDk42CYT/emQCW7oIknSNbd4uAP6mJj+ls8AJ7OjTIOSJudh1Od5I12/p1N2akq1pVHR b+/M1MDDLFA3JrKF92DO8F9FitsXhGnmuVbE769nIe+1z4pk1YLtUFiRYFEIQBk7g77x1x NyCrmK9YDC9Yz3en0UmYi5Yhj6fF487N+N/mLo7EdTY7zNS0O/V1F1V5klc+0xEQs4Hk0/ fIFeHuTpI2RYeJ4+/tRPJYZn1dyaBSZ6+BqzJHNGUQG5cUeK8P+W1/Ngo92B4Mt24MzCqw ZLriBLEcjiAM3DwWKcSP/FISeQ3oqENWJ60VyeifuncYt1rZqPRFJqd9yzGXZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701510334; a=rsa-sha256; cv=none; b=cayM+3qNgqXEnth4QyQjBvyuxTRL0zSNAuxa6/XwEJZNNbJpXMR/rpbiiF3uOGuPgSgEul tCQ8AtM4JB1KEdQsqBlQNREYMUnxlEH6oYFWOqwuLrtDp7LcJNi40fy0Kmq5ZQjFn1g6RP 13bm+NPymGcwXP0Q4s87rlhgXzfNNHBijcnMMqDMctCMlyXzcPKfTaJmavXF7zHFupPhG9 F5Yaif5PZpkaVQAtohOKO018PX2GEDq8uiZgR+nNxFq3jiH1csrGJQ3XUBuByuglH8v7F4 F+hOdjh8WV028bx3ClASxbmUpLyARVQriSQiM0AumAUTRXEDN+ePztpHv+ChuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj4mZ0kq4z1BK6; Sat, 2 Dec 2023 09:45: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 3B29jYpC011554; Sat, 2 Dec 2023 09:45:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B29jY6G011551; Sat, 2 Dec 2023 09:45:34 GMT (envelope-from git) Date: Sat, 2 Dec 2023 09:45:34 GMT Message-Id: <202312020945.3B29jY6G011551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: a7fb33b94683 - stable/14 - pkgbase: force OSVERSION List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a7fb33b9468362416db157cdbcc1dbaa4665be2f Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=a7fb33b9468362416db157cdbcc1dbaa4665be2f commit a7fb33b9468362416db157cdbcc1dbaa4665be2f Author: Baptiste Daroussin AuthorDate: 2023-11-03 08:29:23 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-02 09:44:59 +0000 pkgbase: force OSVERSION This is used to the package annotation helping pkg to know about backward compatibility is set to the version of the packages not the version of the host building the packages (cherry picked from commit 188fe88ec50eac7c10e1d8350bf1180f8c16e463) --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 7e62894405df..67fe06aa1135 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2193,6 +2193,7 @@ sign-packages: _pkgbootstrap .PHONY @[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest" ] && \ unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest ; \ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname repo \ + -o OSVERSION="${OSRELDATE}" \ -m ${WSTAGEDIR}/meta \ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ From nobody Sat Dec 2 09:45:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj4mc0BJpz52hW6; Sat, 2 Dec 2023 09:45: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 4Sj4mb2h85z3YYD; Sat, 2 Dec 2023 09:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTYiWWwWnUDBVdGdtpI5DhIc0u5AE+/XS2sZwQBRGCs=; b=xy18DDXrEFzT++FTV+/JRDPq1W+UZqlxl8ryVCM/RzQqgY5pTJXsQO3tov9Drp84ws+h+I tEjlmhrd5zqd32bCTKGqid+BYf4toFgHNSQU1l36QkrieU4t6UycxSv52zrxtENbq9pped HB1Ik0Roj8SW+vgtQHer1g/Waecg9HZWYOi7HqtaF/EVefGwSJqYs9w8Uy57NiW6U+sAZK xp3/t4/LS7wfCid+iYLsBG4Yi2Fi9sGfdPyQnOBkW4Eo6ZSNGF3uHKFv9Jrj2v3OkVjVMm Ng+LnCKn5w3j0w4llqkLGf+LC5oiXT8bxJX/uJr8SNly2yHBuWnfdF9CI7Gv9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTYiWWwWnUDBVdGdtpI5DhIc0u5AE+/XS2sZwQBRGCs=; b=tHZAn0+EVHKPY44kF6BKNWKtGazLroGg/SSToYaqTzoBblhjC1Vb8Xn7wHwKM9DBO4D1Z5 6fQX33tpTWGJ1ch3+uRGNEVI+oaFomSvAwttQPM6JZPx2c5eEy2UPHKxsdBw/X7rKpcJb1 r/TUBH6nt/P9yo52ZonN+XqbIrQPSioDiBj19WzQcCGkS13dZqEOjmXRKmYz5HVhNBB20u YnSuhQ91byL8bUVa10KUi35Omov6n07Y6MN3cbdIYTnU6uyc6OE1wxtlcmARXK8ZC7TY8L FdfKsiOqzK35yRLhdSokva5brtPGAW2X7sSPEIvUj09Zd28cxnB5qbgphWT6aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701510335; a=rsa-sha256; cv=none; b=wokJ4alglHn0/4pgrBZzce2eLu2gTrY5qXpnfYbrUiV/dYHic1PvQPhqEw3eC/Yvbh4ip2 eYuvkmv4+Qufos9VGi/Y4u0eyG+1L13ZEtzxZYrzUMLgDDhdQMFUlfH6MR8noGeAsV6R3w SW7j5rrRgMVU54eoawzuRiz9NhDS2xSp3HCnjy6ZxxFshxigQLJMwDlbBGy+zs+/bxsEIT QgCZgPhXAnyftRSvs5QA2RIjA8FDxw1sAjXD8W3Pne5gq8UN/lSlXb/hWnij4/34U4164V h/6b70mGK0poJkB/pfXAYqZ+4A8+l1iA1VEGSuImIbV4yjJ5yS4aiVUbDi/d3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj4mb1pRQz1B2N; Sat, 2 Dec 2023 09:45: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 3B29jZK4011608; Sat, 2 Dec 2023 09:45:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B29jZgx011605; Sat, 2 Dec 2023 09:45:35 GMT (envelope-from git) Date: Sat, 2 Dec 2023 09:45:35 GMT Message-Id: <202312020945.3B29jZgx011605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: a3b809c0c815 - stable/14 - pkgbase: create package with SRCRELDATE not OSRELDATE as OSVERSION List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a3b809c0c81590b05a145db99e98426418a2420b Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=a3b809c0c81590b05a145db99e98426418a2420b commit a3b809c0c81590b05a145db99e98426418a2420b Author: Baptiste Daroussin AuthorDate: 2023-11-14 07:41:47 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-02 09:45:01 +0000 pkgbase: create package with SRCRELDATE not OSRELDATE as OSVERSION In 188fe88ec50eac7c10e1d8350bf1180f8c16e463 OSVERSION has been set to OSRELDATE which is the RELDATE of the building OS while we wanted to use SRCRELDATE which is the RELDATE of the target system (cherry picked from commit 051d69d6f8b51dc1d7bba58af99be76185312222) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 67fe06aa1135..b73b464be2a9 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2193,7 +2193,7 @@ sign-packages: _pkgbootstrap .PHONY @[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest" ] && \ unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest ; \ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname repo \ - -o OSVERSION="${OSRELDATE}" \ + -o OSVERSION="${SRCRELDATE}" \ -m ${WSTAGEDIR}/meta \ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ From nobody Sat Dec 2 11:26:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj71931G2z535BY; Sat, 2 Dec 2023 11:26: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 4Sj7192VF2z4MxG; Sat, 2 Dec 2023 11:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701516397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mXuN9Bm3gvshYoizuxa9TM7aBAPZPh26a6/j9yBl4oM=; b=Y6WgPYhB+kEdsqwsBPdd/Rgq2OCWKh6wouq3Sjwec21wVYhnaB2lJIQnrqZrcYxzI1qFDg SidKf/teBi029WqMCMA57VURGa5wFhica4TkHWYJBluztQaS6Gir7NpDVrEgVXHmd6Nl9F vrb1OzOvPVzD3nmvyLmxwcMgZUpMJdrP6uBIegdNSNGgpUsj0TebiAQ4uTCE+W+83B2xhD RP1qwI/fUotsF6hp1K7xgQtjdX2JVkfWrnm+W/PBB0FsGepu9vI7NHgMP/6TcMit6mGgpV FqQSIaer05Zb4y+WUAVstfBMonENFh9HuiJDfBsSeylr+jg21o3eCGVuKMWiTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701516397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mXuN9Bm3gvshYoizuxa9TM7aBAPZPh26a6/j9yBl4oM=; b=hKo4hHoCsXZeWDhUhMHN9/847c+qz96gXelE1oukRwzu6vRsH6DJZyn9kGYsx1/lwEYeVl Lf1lJ5rCmP5Zu2vhVIrX35yO/zPvLgn+X9wTzciMpdzkdd65v9Mxxk/pU650unGCfXjC/P C7o4Uyw6fzGMuSiDuDzWniAifL4xpwviyV1FhCveFyizhN/wZin88F0WMHdNbKdYZPAw09 5kWU/jcDE+WxcQzTtQCdDLzVnMgaKhkhruHvdIJDWkLLhP5Tv1iSeV/lO8/g9TkwVPlKAN VBb25UOi8nWzX2GfqawilC9SIjKr/4dnAmUY3phalq00ouejRYTspFp20ihvxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701516397; a=rsa-sha256; cv=none; b=xDWqyyLy15hpsxj+LAAERvInLkri2oGFTj8gg2LkDlh4HluB8Khg1pCCKD+aVcLwF59GNl a073uRzKm6/fxLF/XA9/Q6tVwJhlne1WwxR59bGCXsJxI99TYjUo4OAJSucUTwO6Ou4jRL /5omr8xCWvzU8VSrL0dfyXY5WtfHvjPz1wFksiDDJZmNdee+ec8WFgocsjA46dyUkuu/yC iNqoiJqh2UiTcDvpM3dMt9OayAMwJPOBtMKVPdwiFkoNdEyGL3sf2Y2fwlSbd/K/QndWVb 8ptO7D1WJxRI+RJLlLRLqdT8HxRMBJLlwZvnUoujS5i69kEItnsXB6nNG31lzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj7191RC0z10t; Sat, 2 Dec 2023 11:26: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 3B2BQbvR080018; Sat, 2 Dec 2023 11:26:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2BQbt3080015; Sat, 2 Dec 2023 11:26:37 GMT (envelope-from git) Date: Sat, 2 Dec 2023 11:26:37 GMT Message-Id: <202312021126.3B2BQbt3080015@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 289f6bfe0a21 - stable/14 - compiler-rt: remove unnecessary include List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 289f6bfe0a212efc875cde4abcb38b53b8e9afdd Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=289f6bfe0a212efc875cde4abcb38b53b8e9afdd commit 289f6bfe0a212efc875cde4abcb38b53b8e9afdd Author: Dimitry Andric AuthorDate: 2023-11-28 18:17:36 +0000 Commit: Dimitry Andric CommitDate: 2023-12-02 11:16:32 +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 (cherry picked from commit d2033021a73db7b8d910c1ffc52f4d1d0def7162) --- .../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 Sat Dec 2 11:27:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj71f2QJ3z535N0; Sat, 2 Dec 2023 11:27: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 4Sj71f1mRkz4Mwn; Sat, 2 Dec 2023 11:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701516422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B0bxoskGctLEIFdEDL90f+zlYXUjQrbj2PDXvuMj2DY=; b=EwiTpb4nJYfuwDT9CSGfsvobF/N1LHEW4XYgw5q7//ep+LekpssYhssY4T916xLmhpPX94 vUNDHPhG+8dPrEeq7gcv1/wXokOvE6pSM7t7F9ASH9KvKP3CFm9A01a39aJ1m1IyZJIvyo GzDp5LthA0PAKfnX6tnD4tLW21+3aznFoZsd63b99MBjGIQHlnfTcAlpcgF4iYGHvLL7zX qqLCZCG5YUsL5UeKyg2oFCDrtlYcAp8gkbhIfoGfcQvf06LIZJvutC0MgFgUm1ue9CTRub q0CrOQO/QRJXu5OUF+r0Rvww/SrMjiLDGde21KoFmjUQAtCMqDwBnIdhIHLqXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701516422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B0bxoskGctLEIFdEDL90f+zlYXUjQrbj2PDXvuMj2DY=; b=IP+19rL2/VxvYuwywid/qUfH9hfWa5BYGggh6k5UcKNVeljyeW5456hosczw5Rp2jrWqK4 pxvTdSTesphcn6C75N5biPRHYdeJNxyQQRPLC2S7tH3ots5HsZNenoB9SGFKbSaezw/4z4 7AXXDCPrXUDLpxkY9F7nT3bMNjcbDSE+HuyPjregGMn9AkeLG9txx00UUi2qoU2lJAA6d3 mPENV89+2gWDtmjo0Wru6o18xcrHCmochNmOKsffTnCRLjjZF8LuwMgqnGurvpOOcqaa4K XbYx6a7pbehUdtE5lvPui1h16g0v/xI9xGJgvGMxhy1KM/t3tCYfGiNwZQ0ZTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701516422; a=rsa-sha256; cv=none; b=dm/2JmIqI/6i0xgGRYZKA5MlsMYyTuKWn6iJu+b2FZUOKRD3IhjYl0dGtzxvtSvtMUrJvk z8IRUJtAaCswMEigRSvnERZc/6bbOy8f7kOpIqkVmpVbjmmzFHu/ikMRO/UzwJ0Z2MgoO3 ZnoWDMHdA+xns7xbBeOG/3UHJjqJWSGYl4XJOHSTVIePZNgAwOJo2mOBCUoyCXj0+ypslV EmsTQ+JPIdOMgcu03u7RV5VWUBsxiVOvuw6v/0Wnd4Jve8kqULMFJ9WqC8F3krtuadQ8EK ClbgDxGAT50kmixxs4KecTytIlH4RFVcM1S5rzkypytfFjsq0XD4rOCRugHEXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj71f0TXpzbv; Sat, 2 Dec 2023 11:27: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 3B2BR1uZ080211; Sat, 2 Dec 2023 11:27:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2BR1Zm080208; Sat, 2 Dec 2023 11:27:01 GMT (envelope-from git) Date: Sat, 2 Dec 2023 11:27:01 GMT Message-Id: <202312021127.3B2BR1Zm080208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 336d8c4a79e9 - stable/13 - compiler-rt: remove unnecessary include List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 336d8c4a79e905ab44382fe1695580de44a68c6c Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=336d8c4a79e905ab44382fe1695580de44a68c6c commit 336d8c4a79e905ab44382fe1695580de44a68c6c Author: Dimitry Andric AuthorDate: 2023-11-28 18:17:36 +0000 Commit: Dimitry Andric CommitDate: 2023-12-02 11:17:05 +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 (cherry picked from commit d2033021a73db7b8d910c1ffc52f4d1d0def7162) --- .../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 Sat Dec 2 11:51:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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 19:28:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SjKjC1Q9fz53VH7; Sat, 2 Dec 2023 19:28: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 4SjKjC0zbjz4Sx0; Sat, 2 Dec 2023 19:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701545311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lfmkPBBBbSlwNKef6iJcR1tmYXB3383LLVODhWIEFi4=; b=UlCg2of31sQR1V9Ynm4zhHX61eL1GgnRXqfJvp3IL5pfcoNVSfCo9Hf18QVSK8Xmq48P8w SGe3StOjiDEWKPtuSIzJ/TgJW3iKIzS/zY+eMA25FbZa4mkH8ikPI9gq0ONguM7T0IoNV7 OlAZq1lEMH5ULT4TZun83HcMAjsE6NfPVlc02O3Jd+Yiys0JSXNSWImUhfJjdoB9goECxS YG85bwHQQuVROB9Q4jidsy7dbyYgqS6AY+rzDc2W4K0I35nX0gkhRrMBFukmX0rrvujpum AT3XaHkW9nJ50lut19iHORLJciUUTiOywFKQq8ZghJYLNZpRQFJUEwkEJ1fRDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701545311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lfmkPBBBbSlwNKef6iJcR1tmYXB3383LLVODhWIEFi4=; b=iRzonHo/fomQJIVAFE7knDVsa47x9UpeJX3iQYFx+qPjfCfMgqUOrCBX4stNxIMQNg5FnW rSQy7xB5PsZf5gxBOfrbBI6W4DlbNr91tjOvYn4ePsCbqNSwbN2vLlCCqiinvowdDWhRgJ +n94HrS3VPNSOvoIJgjnEPtt6sbtQLGlTzBtkej6LswvR2ehOPByrS26fzX8h4dPQePX0G zNTAQTF12vRvSLcQAftl04+iWORU0admHXAjZuN8980B2yCj4HceWIJiPgf00QYrNfzCOV G0wzpSV5eJ5tZZqub7qPoEAyQEVPP47qo6BL17S6h8gV8QIDiJHs9OmAw0dfZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701545311; a=rsa-sha256; cv=none; b=FCk1EMPaZF2FpL5ak5D4NN58XS2zMLV6gBDrsWOqGdFpmARI2SyhQW/oEpZxRMrzY3G7M0 onBOhRG6VWFc0ilZrQ2gW1gX9oMnGJxs8iC1Br4zvRY0eQrdRKTfgCEzL1Dgn2AJPVgV51 4MNYSb3YSae4gbbjbGKxBDckfCDkRyrnw+DTX0YxnuL1v81L6Ougjy/JYMuusw2vtpZuFn D0iP0O1xz5udU6YQmfQvYcAX9kjthq5h6xWqWzA2SQcmoIaTBqeq+RfVh1KdFxWO0c9Yi7 PT3RI8BhAhIP2tIeVw7On2MKpGNU1ujupCfhQ14nyOVaFNPafFzn/8qy4KstqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SjKjC02pWzTyD; Sat, 2 Dec 2023 19:28: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 3B2JSUuE084956; Sat, 2 Dec 2023 19:28:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2JSUdC084953; Sat, 2 Dec 2023 19:28:30 GMT (envelope-from git) Date: Sat, 2 Dec 2023 19:28:30 GMT Message-Id: <202312021928.3B2JSUdC084953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 84ef0a84ecaa - stable/14 - ossl: Keep mutable AES-GCM state on the stack List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 84ef0a84ecaa4f5d9bcfed3ce10c288953491e7e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=84ef0a84ecaa4f5d9bcfed3ce10c288953491e7e commit 84ef0a84ecaa4f5d9bcfed3ce10c288953491e7e Author: Mark Johnston AuthorDate: 2023-11-29 17:51:55 +0000 Commit: Mark Johnston CommitDate: 2023-12-02 19:25:42 +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 (cherry picked from commit 5c0dac0b7a012f326edab06ad85aee5ad68ff120) --- 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 40162b6943df..800518e51205 100644 --- a/sys/crypto/openssl/ossl_aes.c +++ b/sys/crypto/openssl/ossl_aes.c @@ -168,10 +168,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; @@ -183,24 +182,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); @@ -209,7 +209,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); } @@ -230,10 +230,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); } @@ -243,18 +243,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 Sat Dec 2 19:28:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SjKjD5Zdhz53V7N; Sat, 2 Dec 2023 19:28: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 4SjKjD1v4vz4T7V; Sat, 2 Dec 2023 19:28:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701545312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RynA8COGHREymDgz1la+VFUoFL/UCocWyoDNrJivP5c=; b=g2jOAFEGmA8bZV4IANnPYg5023eJ8/lAyv1d4HDHbqZA5YvonCtR4T/d9V8YSeljFil5EP oIA8gwIXKM6CyYDjRa7o+mRdojJFy7P4MtldAa6UuSn3ocbriFGl9qSbjYfB9Hlre1oeCV tNWm2e7e6b5cSaDzkjv/Hr6fbCXK6QjgaXRvnJzCudalHmwZv4u6OBhfVeyPGi7+4wjNZl ZUxtY8BmiY6qd7wGYWttKe8UR9hPTCzuFrLNh63nijdEOrSCyEolCFnyWrKEViZCWq+P6g zLbPSQJylwzvrLuql6qDmM7eFqcWkdJI6MgAg0HV1sJJkdvlqFCh4ajLThGCkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701545312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RynA8COGHREymDgz1la+VFUoFL/UCocWyoDNrJivP5c=; b=nUt1uNvOf61An9Dk6KUpc3xkcLmhq1yW3TxWbFEvqS/eYLB/FRJC7FzKwqNcSLpmC0NZNm 00Do5IF+3mGbQ29I6gUSFO8bhhlSeB4n0h7/25HgIVmyNX9JG4ab+jZeHehzKuokieri8O acOm4zx7Dqcyg/ak6DvOVkWrP7/dm4XeEzLbCdSj+3h02kOGIfFH9K43F90XCknR/7IlqC 0qtHzGk7AqG0fys1kEouVCH+Uml31mxwPpcRGHpcyr20lnR46df6K7QHZ812DIpkq5iR8X bc7gOwPJ6PI69ViHNnrm11Xq55uiipuTp6Ah2RWzP9udEsfHF0Cwu2HM3R1s6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701545312; a=rsa-sha256; cv=none; b=qO3/3ySq7bcKrCFgpUKuZwzvQ1zhGdZ++M6w/sXZeb3GjStaVbg4RHX67yZOY9uoAcIo8V 4fWRkF7KejcW6fzxyIT8wsIpZOTYfd19FMtVNiN/h5A9uU4HocWqpLMLvqUv22BXyLcm/n wbiSWri6pW6FM36q91Re+LukDjeGuhUjVxiH7xA04i+8WE2EuOpeP+yrZ+DKxuTmCze3HP eqJOZ5plaMWc1Y9oSF8av751+U0JQm2l8csbE7ghgiqLQpecbkdC3FrKu4ZYZARviUy19w 3OYITBpbhCLBdsJUPMueM95Kg6vh6b8S8/y/FRbLbEmIR9Mrx68kjMNEt9wlmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SjKjD0z2vzDQq; Sat, 2 Dec 2023 19:28: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 3B2JSW58084995; Sat, 2 Dec 2023 19:28:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2JSW5K084992; Sat, 2 Dec 2023 19:28:32 GMT (envelope-from git) Date: Sat, 2 Dec 2023 19:28:32 GMT Message-Id: <202312021928.3B2JSW5K084992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8f269234b700 - stable/14 - graid3: Fix teardown races List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f269234b7003d5cb8ddcd574f10896a2364e2c8 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8f269234b7003d5cb8ddcd574f10896a2364e2c8 commit 8f269234b7003d5cb8ddcd574f10896a2364e2c8 Author: Mark Johnston AuthorDate: 2023-11-02 18:35:37 +0000 Commit: Mark Johnston CommitDate: 2023-12-02 19:25:51 +0000 graid3: Fix teardown races Port commit dc399583ba09 from g_mirror, which has an effectively identical startup sequence. This fixes a race that was occasionally causing panics during GEOM test suite runs on riscv. MFC after: 1 month (cherry picked from commit 33cb9b3c3a2260cc273713b0adcd95016ff8b675) --- sys/geom/raid3/g_raid3.c | 80 ++++++++++++++++++++++++++---------------------- sys/geom/raid3/g_raid3.h | 1 + 2 files changed, 45 insertions(+), 36 deletions(-) diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 79bfd690a35e..0d4ecb704aa5 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -104,6 +104,7 @@ static int g_raid3_destroy_geom(struct gctl_req *req, struct g_class *mp, static g_taste_t g_raid3_taste; static void g_raid3_init(struct g_class *mp); static void g_raid3_fini(struct g_class *mp); +static void g_raid3_providergone(struct g_provider *pp); struct g_class g_raid3_class = { .name = G_RAID3_CLASS_NAME, @@ -112,7 +113,8 @@ struct g_class g_raid3_class = { .taste = g_raid3_taste, .destroy_geom = g_raid3_destroy_geom, .init = g_raid3_init, - .fini = g_raid3_fini + .fini = g_raid3_fini, + .providergone = g_raid3_providergone, }; static void g_raid3_destroy_provider(struct g_raid3_softc *sc); @@ -605,6 +607,34 @@ g_raid3_destroy_disk(struct g_raid3_disk *disk) disk->d_state = G_RAID3_DISK_STATE_NODISK; } +static void +g_raid3_free_device(struct g_raid3_softc *sc) +{ + KASSERT(sc->sc_refcnt == 0, + ("%s: non-zero refcount %u", __func__, sc->sc_refcnt)); + + if (!g_raid3_use_malloc) { + uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_64K].sz_zone); + uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_16K].sz_zone); + uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_4K].sz_zone); + } + mtx_destroy(&sc->sc_queue_mtx); + mtx_destroy(&sc->sc_events_mtx); + sx_xunlock(&sc->sc_lock); + sx_destroy(&sc->sc_lock); + free(sc->sc_disks, M_RAID3); + free(sc, M_RAID3); +} + +static void +g_raid3_providergone(struct g_provider *pp) +{ + struct g_raid3_softc *sc = pp->private; + + if (--sc->sc_refcnt == 0) + g_raid3_free_device(sc); +} + static void g_raid3_destroy_device(struct g_raid3_softc *sc) { @@ -649,16 +679,9 @@ g_raid3_destroy_device(struct g_raid3_softc *sc) g_wither_geom(sc->sc_sync.ds_geom, ENXIO); G_RAID3_DEBUG(0, "Device %s destroyed.", gp->name); g_wither_geom(gp, ENXIO); + if (--sc->sc_refcnt == 0) + g_raid3_free_device(sc); g_topology_unlock(); - if (!g_raid3_use_malloc) { - uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_64K].sz_zone); - uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_16K].sz_zone); - uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_4K].sz_zone); - } - mtx_destroy(&sc->sc_queue_mtx); - mtx_destroy(&sc->sc_events_mtx); - sx_xunlock(&sc->sc_lock); - sx_destroy(&sc->sc_lock); } static void @@ -1049,7 +1072,7 @@ g_raid3_scatter(struct bio *pbp) off_t atom, cadd, padd, left; int first; - sc = pbp->bio_to->geom->softc; + sc = pbp->bio_to->private; bp = NULL; if ((pbp->bio_pflags & G_RAID3_BIO_PFLAG_NOPARITY) == 0) { /* @@ -1118,7 +1141,7 @@ g_raid3_gather(struct bio *pbp) struct bio *xbp, *fbp, *cbp; off_t atom, cadd, padd, left; - sc = pbp->bio_to->geom->softc; + sc = pbp->bio_to->private; /* * Find bio for which we have to calculate data. * While going through this path, check if all requests @@ -1284,7 +1307,7 @@ g_raid3_regular_request(struct bio *cbp) g_topology_assert_not(); pbp = cbp->bio_parent; - sc = pbp->bio_to->geom->softc; + sc = pbp->bio_to->private; cbp->bio_from->index--; if (cbp->bio_cmd == BIO_WRITE) sc->sc_writes--; @@ -1431,7 +1454,7 @@ g_raid3_start(struct bio *bp) { struct g_raid3_softc *sc; - sc = bp->bio_to->geom->softc; + sc = bp->bio_to->private; /* * If sc == NULL or there are no valid disks, provider's error * should be set and g_raid3_start() should not be called at all. @@ -1780,7 +1803,7 @@ g_raid3_register_request(struct bio *pbp) int round_robin, verify; ndisks = 0; - sc = pbp->bio_to->geom->softc; + sc = pbp->bio_to->private; if ((pbp->bio_cflags & G_RAID3_BIO_CFLAG_REGSYNC) != 0 && sc->sc_syncdisk == NULL) { g_io_deliver(pbp, EIO); @@ -2008,9 +2031,7 @@ g_raid3_try_destroy(struct g_raid3_softc *sc) sc->sc_worker = NULL; } else { g_topology_unlock(); - g_raid3_destroy_device(sc); - free(sc->sc_disks, M_RAID3); - free(sc, M_RAID3); + g_raid3_free_device(sc); } return (1); } @@ -2344,6 +2365,8 @@ g_raid3_launch_provider(struct g_raid3_softc *sc) } pp->stripesize *= sc->sc_ndisks - 1; pp->stripeoffset *= sc->sc_ndisks - 1; + pp->private = sc; + sc->sc_refcnt++; sc->sc_provider = pp; g_error_provider(pp, 0); g_topology_unlock(); @@ -3089,9 +3112,7 @@ g_raid3_access(struct g_provider *pp, int acr, int acw, int ace) G_RAID3_DEBUG(2, "Access request for %s: r%dw%de%d.", pp->name, acr, acw, ace); - sc = pp->geom->softc; - if (sc == NULL && acr <= 0 && acw <= 0 && ace <= 0) - return (0); + sc = pp->private; KASSERT(sc != NULL, ("NULL softc (provider=%s).", pp->name)); dcr = pp->acr + acr; @@ -3160,6 +3181,7 @@ g_raid3_create(struct g_class *mp, const struct g_raid3_metadata *md) sc->sc_idle = 1; sc->sc_last_write = time_uptime; sc->sc_writes = 0; + sc->sc_refcnt = 1; for (n = 0; n < sc->sc_ndisks; n++) { sc->sc_disks[n].d_softc = sc; sc->sc_disks[n].d_no = n; @@ -3215,18 +3237,8 @@ g_raid3_create(struct g_class *mp, const struct g_raid3_metadata *md) if (error != 0) { G_RAID3_DEBUG(1, "Cannot create kernel thread for %s.", sc->sc_name); - if (!g_raid3_use_malloc) { - uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_64K].sz_zone); - uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_16K].sz_zone); - uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_4K].sz_zone); - } - g_destroy_geom(sc->sc_sync.ds_geom); - mtx_destroy(&sc->sc_events_mtx); - mtx_destroy(&sc->sc_queue_mtx); - sx_destroy(&sc->sc_lock); g_destroy_geom(sc->sc_geom); - free(sc->sc_disks, M_RAID3); - free(sc, M_RAID3); + g_raid3_free_device(sc); return (NULL); } @@ -3252,8 +3264,6 @@ g_raid3_destroy(struct g_raid3_softc *sc, int how) struct g_provider *pp; g_topology_assert_not(); - if (sc == NULL) - return (ENXIO); sx_assert(&sc->sc_lock, SX_XLOCKED); pp = sc->sc_provider; @@ -3302,8 +3312,6 @@ g_raid3_destroy(struct g_raid3_softc *sc, int how) G_RAID3_DEBUG(4, "%s: Woken up %p.", __func__, &sc->sc_worker); sx_xlock(&sc->sc_lock); g_raid3_destroy_device(sc); - free(sc->sc_disks, M_RAID3); - free(sc, M_RAID3); return (0); } diff --git a/sys/geom/raid3/g_raid3.h b/sys/geom/raid3/g_raid3.h index 2b5c897867fd..3eecc02798a9 100644 --- a/sys/geom/raid3/g_raid3.h +++ b/sys/geom/raid3/g_raid3.h @@ -219,6 +219,7 @@ struct g_raid3_softc { int sc_idle; /* DIRTY flags removed. */ time_t sc_last_write; u_int sc_writes; + u_int sc_refcnt; /* Number of softc references. */ TAILQ_HEAD(, g_raid3_event) sc_events; struct mtx sc_events_mtx; From nobody Sat Dec 2 20:38:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-all@mlmmj.nyi.freebsd.org 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 From nobody Sat Dec 2 21:55:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SjNzK1Pw8z52nnv; Sat, 2 Dec 2023 21:55: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 4SjNzK0zL2z4plb; Sat, 2 Dec 2023 21:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SGRStjCWjuE+dVFmKPgA8DPgcPQ4BJQtTB0JtmUfu/8=; b=rFn3seHkIe1GwLEMgGo/kOMhwUlTDrQ+lRN7L3+9qHOwdEbHFHYTYFWmZTDofTDsN6OcEn W3nhJ66MX4RoFGPl6drBOQeweiD/zS6lmJNoHzvVDx01WzCqeu8MI73EQPQtmDSErbWAS9 BLkLEK2wIQexCtLgZg1JvGJ58V+9ZQWrjHtyJoq6f7Y7umgFCTKl+36aVrCjUw+oRrbN49 qN20og9JJxx33+USJqi2LjJm/WotmBwlRX1NAYs7Y8D7+ZiTGmBC4w/pxC8n2EboxrpeDM SwQiO8bmZoso5d35G4fe0HmlRCOI3o8+ysvrKWe1T0xpgwxg7p37ODNrCmM5Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SGRStjCWjuE+dVFmKPgA8DPgcPQ4BJQtTB0JtmUfu/8=; b=xFhpR6JObnPNlksCuRYBV1wG0jKiNFuVrxZI3T9DsG159xhL36RuNS/5/QFWQeArWAg3SX 4oLklXsRl9OtpntuZHrVE8DDxD0CoJJ56we5dGAT+v1KhOfOKDQRbG1flyrh+d13t3Ar5p sk+uFK1ip4FAXni7ym/r43okZIi69Huox/lVV5W5vlHVwDV3jJfktUoFeHD6zttju6e6ln YluG3mB7K6vfehcIPW2pIPyZAjAxaom07QPEmYyXWCWeL+povE0p8Nax4i7EgVln5evChR HqOA33M9H5lZrPsggTbI8+/UMrR6zq7wuU/ipMVgajm3yRUbHA8ChQ/HXU17Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701554157; a=rsa-sha256; cv=none; b=WJg2XUXoeCp6NzMmq7HqipRJb2OC7Pb7cKYgJLDBXe4ng31H0NhCowsP8uFTg3KrpdE7Xv pqUDK5gNo6rflDSrkxtUD9qluzXcja+papuUsq8aw5z+boMELODgTex0f1IRSGjNxChekN FJu36GaZvmRCyZh/7pGeN59+RR1odQ0HtE0tVJcAY5mMrVGg9asRe7pnm6dp0iuyaltw/8 szJ5K/WNyvnejZmr1IwoGBzJvNEUr9nhdYzzmSoJ+aoqZfMifc+AFpga6EjLWwC9qDpxXl dmEwh1C2rnYeEQHB6thqdfYPHQxNAFeT/SnmJWiZ2R5E7h0F8SpxZD/GBM2fcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SjNzK02sJzZ2m; Sat, 2 Dec 2023 21:55: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 3B2Ltu6i034670; Sat, 2 Dec 2023 21:55:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2LtukL034667; Sat, 2 Dec 2023 21:55:56 GMT (envelope-from git) Date: Sat, 2 Dec 2023 21:55:56 GMT Message-Id: <202312022155.3B2LtukL034667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8c88d17fa5c4 - stable/14 - riscv: Port improvements from arm64/amd64 pmaps, part 1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8c88d17fa5c49a835966091acc9c41d19b1f3692 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8c88d17fa5c49a835966091acc9c41d19b1f3692 commit 8c88d17fa5c49a835966091acc9c41d19b1f3692 Author: Mark Johnston AuthorDate: 2023-11-02 18:33:37 +0000 Commit: Mark Johnston CommitDate: 2023-12-02 21:54:32 +0000 riscv: Port improvements from arm64/amd64 pmaps, part 1 - When promoting, do not require that all PTEs all have PTE_A set. Instead, record whether they did and store this information in the PTP's valid bits. - Synchronize some comments in pmap_promote_l2(). - Make pmap_promote_l2() scan starting from the end of the 2MB range instead of the beginning. See the commit log for 9d1b7fa31f510 for justification of this, which I believe applies here as well. Reviewed by: kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D42288 (cherry picked from commit 7703ac2e983bcd44ba93878f52eb30355cbc4821) --- sys/riscv/include/pte.h | 2 +- sys/riscv/riscv/pmap.c | 66 ++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/sys/riscv/include/pte.h b/sys/riscv/include/pte.h index 2cede135ebae..da7bd051e122 100644 --- a/sys/riscv/include/pte.h +++ b/sys/riscv/include/pte.h @@ -80,7 +80,7 @@ typedef uint64_t pn_t; /* page number */ #define PTE_RWX (PTE_R | PTE_W | PTE_X) #define PTE_RX (PTE_R | PTE_X) #define PTE_KERN (PTE_V | PTE_R | PTE_W | PTE_A | PTE_D) -#define PTE_PROMOTE (PTE_V | PTE_RWX | PTE_D | PTE_A | PTE_G | PTE_U | \ +#define PTE_PROMOTE (PTE_V | PTE_RWX | PTE_D | PTE_G | PTE_U | \ PTE_SW_MANAGED | PTE_SW_WIRED) /* Bits 63 - 54 are reserved for future use. */ diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 1d1d0fc839ca..716f00b36005 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -1188,14 +1188,26 @@ pmap_add_delayed_free_list(vm_page_t m, struct spglist *free, * for mapping a distinct range of virtual addresses. The pmap's collection is * ordered by this virtual address range. * - * If "promoted" is false, then the page table page "ml3" must be zero filled. + * If "promoted" is false, then the page table page "mpte" must be zero filled; + * "mpte"'s valid field will be set to 0. + * + * If "promoted" is true and "all_l3e_PTE_A_set" is false, then "mpte" must + * contain valid mappings with identical attributes except for PTE_A; + * "mpte"'s valid field will be set to 1. + * + * If "promoted" and "all_l3e_PTE_A_set" are both true, then "mpte" must contain + * valid mappings with identical attributes including PTE_A; "mpte"'s valid + * field will be set to VM_PAGE_BITS_ALL. */ static __inline int -pmap_insert_pt_page(pmap_t pmap, vm_page_t ml3, bool promoted) +pmap_insert_pt_page(pmap_t pmap, vm_page_t ml3, bool promoted, + bool all_l3e_PTE_A_set) { PMAP_LOCK_ASSERT(pmap, MA_OWNED); - ml3->valid = promoted ? VM_PAGE_BITS_ALL : 0; + KASSERT(promoted || !all_l3e_PTE_A_set, + ("a zero-filled PTP can't have PTE_A set in every PTE")); + ml3->valid = promoted ? (all_l3e_PTE_A_set ? VM_PAGE_BITS_ALL : 1) : 0; return (vm_radix_insert(&pmap->pm_root, ml3)); } @@ -2163,7 +2175,7 @@ pmap_remove_kernel_l2(pmap_t pmap, pt_entry_t *l2, vm_offset_t va) * If this page table page was unmapped by a promotion, then it * contains valid mappings. Zero it to invalidate those mappings. */ - if (ml3->valid != 0) + if (vm_page_any_valid(ml3)) pagezero((void *)PHYS_TO_DMAP(ml3pa)); /* @@ -2224,7 +2236,7 @@ pmap_remove_l2(pmap_t pmap, pt_entry_t *l2, vm_offset_t sva, } else { ml3 = pmap_remove_pt_page(pmap, sva); if (ml3 != NULL) { - KASSERT(ml3->valid == VM_PAGE_BITS_ALL, + KASSERT(vm_page_any_valid(ml3), ("pmap_remove_l2: l3 page not promoted")); pmap_resident_count_dec(pmap, 1); KASSERT(ml3->ref_count == Ln_ENTRIES, @@ -2697,7 +2709,7 @@ pmap_demote_l2_locked(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, * If the page table page is not leftover from an earlier promotion, * initialize it. */ - if (mpte->valid == 0) { + if (!vm_page_all_valid(mpte)) { for (i = 0; i < Ln_ENTRIES; i++) pmap_store(firstl3 + i, newl3 + (i << PTE_PPN0_S)); } @@ -2706,8 +2718,7 @@ pmap_demote_l2_locked(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, "addresses")); /* - * If the mapping has changed attributes, update the page table - * entries. + * If the mapping has changed attributes, update the PTEs. */ if ((pmap_load(firstl3) & PTE_PROMOTE) != (newl3 & PTE_PROMOTE)) for (i = 0; i < Ln_ENTRIES; i++) @@ -2746,7 +2757,7 @@ static void pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, struct rwlock **lockp) { - pt_entry_t *firstl3, firstl3e, *l3, l3e; + pt_entry_t all_l3e_PTE_A, *firstl3, firstl3e, *l3, l3e; vm_paddr_t pa; PMAP_LOCK_ASSERT(pmap, MA_OWNED); @@ -2754,6 +2765,11 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, KASSERT((pmap_load(l2) & PTE_RWX) == 0, ("pmap_promote_l2: invalid l2 entry %p", l2)); + /* + * Examine the first L3E in the specified PTP. Abort if this L3E is + * ineligible for promotion or does not map the first 4KB physical page + * within a 2MB page. + */ firstl3 = (pt_entry_t *)PHYS_TO_DMAP(PTE_TO_PHYS(pmap_load(l2))); firstl3e = pmap_load(firstl3); pa = PTE_TO_PHYS(firstl3e); @@ -2781,8 +2797,14 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, } } - pa += PAGE_SIZE; - for (l3 = firstl3 + 1; l3 < firstl3 + Ln_ENTRIES; l3++) { + /* + * Examine each of the other PTEs in the specified PTP. Abort if this + * PTE maps an unexpected 4KB physical page or does not have identical + * characteristics to the first PTE. + */ + all_l3e_PTE_A = firstl3e & PTE_A; + pa += L2_SIZE - PAGE_SIZE; + for (l3 = firstl3 + Ln_ENTRIES - 1; l3 > firstl3; l3--) { l3e = pmap_load(l3); if (PTE_TO_PHYS(l3e) != pa) { CTR2(KTR_PMAP, @@ -2804,14 +2826,28 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, atomic_add_long(&pmap_l2_p_failures, 1); return; } - pa += PAGE_SIZE; + all_l3e_PTE_A &= l3e; + pa -= PAGE_SIZE; } + /* + * Unless all PTEs have PTE_A set, clear it from the superpage + * mapping, so that promotions triggered by speculative mappings, + * such as pmap_enter_quick(), don't automatically mark the + * underlying pages as referenced. + */ + firstl3e &= ~PTE_A | all_l3e_PTE_A; + + /* + * Save the page table page in its current state until the L2 + * mapping the superpage is demoted by pmap_demote_l2() or + * destroyed by pmap_remove_l3(). + */ if (ml3 == NULL) ml3 = PHYS_TO_VM_PAGE(PTE_TO_PHYS(pmap_load(l2))); KASSERT(ml3->pindex == pmap_l2_pindex(va), ("pmap_promote_l2: page table page's pindex is wrong")); - if (pmap_insert_pt_page(pmap, ml3, true)) { + if (pmap_insert_pt_page(pmap, ml3, true, all_l3e_PTE_A != 0)) { CTR2(KTR_PMAP, "pmap_promote_l2: failure for va %#lx pmap %p", va, pmap); atomic_add_long(&pmap_l2_p_failures, 1); @@ -3223,7 +3259,7 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, * leave the kernel page table page zero filled. */ mt = PHYS_TO_VM_PAGE(PTE_TO_PHYS(pmap_load(l2))); - if (pmap_insert_pt_page(pmap, mt, false)) + if (pmap_insert_pt_page(pmap, mt, false, false)) panic("pmap_enter_l2: trie insert failed"); } else KASSERT(pmap_load(l2) == 0, @@ -3841,7 +3877,7 @@ pmap_remove_pages_pv(pmap_t pmap, vm_page_t m, pv_entry_t pv, } mpte = pmap_remove_pt_page(pmap, pv->pv_va); if (mpte != NULL) { - KASSERT(mpte->valid == VM_PAGE_BITS_ALL, + KASSERT(vm_page_any_valid(mpte), ("pmap_remove_pages: pte page not promoted")); pmap_resident_count_dec(pmap, 1); KASSERT(mpte->ref_count == Ln_ENTRIES, From nobody Sat Dec 2 21:55:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SjNzL5JH9z52nYw; Sat, 2 Dec 2023 21:55: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 4SjNzL1qcFz4pql; Sat, 2 Dec 2023 21:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tvzu8uzDJ8uf0dSeEM85PvfMA5i1Yemj42XT9r4IJH0=; b=hqep9K1B1XTVUdCeRqkkky+u9ugRlw06MKM2kKjJfRnrDaluWxUr8nVIao52vDqUefjeFq XlKXbt3R0uiHc+kIrGDNJ74ykFKhkvjYZ7Ina6/xF2CHxqCN/M948F4pQXGKpYiToWpAQu 6Gsp5ODofFii0Cb+bVfytjm7sYcR1f+Ta6y/i7xJH6LsZqd/CuaE/SaU7c6nDHlQLS2Ool /1wG0d9NLXHa9tmR911rET+bclDT0DA6bFLhivenMJB1adCMQJCD1leXZ0W5+BFvn9PCYO fvkoLAgh2Uw/a1euOAypPq+wFjf2i5K+rrhWJgAX3l9GahhuPj6LJZmqf1UZCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tvzu8uzDJ8uf0dSeEM85PvfMA5i1Yemj42XT9r4IJH0=; b=oXzwDMTm3mP8WWNAA/k2s1Kh8yAja6Emmfs5jVmoW1FzrQv/330hoZGoDIiaH8iEIhk29Z LbFaJGNTnO81v+whaTQClCf1Izgo4BO9brUQAzvoFn8WeiRDuwGf1IyDhp71Df1Lc2tWdm C0EwDphlG1np05PLd3sTF/eIgTulQWojRHPwd7Uyepiq14UASKOBL3C/tMjQH90Mf8f1e1 vqhX7CnbmDQ25p+okJ1zZ0J3Q3nQ9hLmbrmDGanHimY0rVnE50+8psL7zc8ecGgvZf8LAj Pk2S1E9yxWG4j1tN/cV7o6YDMUEh0FcPrqsy3ojsPrQRgJQqIlqaVf6xWo/lXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701554158; a=rsa-sha256; cv=none; b=U3GUcfIBROk0LS7DvMFQyBUR6niS36HAy1lvztzaQum70OWLDz3V8mXL4+kGwpEEwF+1XQ rQ2AyJ6KGkvrPXyBy+no4hZFkpH28EPe+3bYQTV0hGiIkvM7NWYydh+ZHaBgT3zJksxqMI tZfn6Ik6wB1yh4lo+W3yjJYbIPdBKmqhEaPs0nB/LISyuT5VlUPCUbFE0zOip8Buv8+RAc CaJgMYVwHh8GJ/Z2yhS3P7J4keK/ALnqBllR/4RmUFtPWjm8NVowDr4vXO5NOtPIUKn9Od MBTM64ykznYq1dXDh8phR/ERjgI7F8K38MrgXUz6BC1L4gUzdKL39qZ2dT7f9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SjNzL0kZwzYVq; Sat, 2 Dec 2023 21:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B2LtwGi034723; Sat, 2 Dec 2023 21:55:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2Ltw4c034720; Sat, 2 Dec 2023 21:55:58 GMT (envelope-from git) Date: Sat, 2 Dec 2023 21:55:58 GMT Message-Id: <202312022155.3B2Ltw4c034720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 284ed592f06d - stable/14 - riscv: Port improvements from arm64/amd64 pmaps, part 2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 284ed592f06ddb8a79ebd6256322c46ece24fd79 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=284ed592f06ddb8a79ebd6256322c46ece24fd79 commit 284ed592f06ddb8a79ebd6256322c46ece24fd79 Author: Mark Johnston AuthorDate: 2023-11-02 18:33:55 +0000 Commit: Mark Johnston CommitDate: 2023-12-02 21:54:34 +0000 riscv: Port improvements from arm64/amd64 pmaps, part 2 - Give pmap_promote_l2() a return value indicating whether or not promotion succeeded. - Check pmap_ps_enabled() in pmap_promote_l2() rather than making callers do it. - Annotate superpages_enabled with __read_frequently. Reviewed by: kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D42289 (cherry picked from commit 3c4f46b0d57b76d304f8a94862c6ba9be0273565) --- sys/riscv/riscv/pmap.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 716f00b36005..376027c8be8e 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -256,7 +256,7 @@ CTASSERT(VM_EARLY_DTB_ADDRESS < (VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE) static struct rwlock_padalign pvh_global_lock; static struct mtx_padalign allpmaps_lock; -static int superpages_enabled = 1; +static int __read_frequently superpages_enabled = 1; SYSCTL_INT(_vm_pmap, OID_AUTO, superpages_enabled, CTLFLAG_RDTUN, &superpages_enabled, 0, "Enable support for transparent superpages"); @@ -2753,7 +2753,7 @@ pmap_demote_l2_locked(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, } #if VM_NRESERVLEVEL > 0 -static void +static bool pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, struct rwlock **lockp) { @@ -2761,6 +2761,8 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, vm_paddr_t pa; PMAP_LOCK_ASSERT(pmap, MA_OWNED); + if (!pmap_ps_enabled(pmap)) + return (false); KASSERT((pmap_load(l2) & PTE_RWX) == 0, ("pmap_promote_l2: invalid l2 entry %p", l2)); @@ -2777,7 +2779,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, CTR2(KTR_PMAP, "pmap_promote_l2: failure for va %#lx pmap %p", va, pmap); atomic_add_long(&pmap_l2_p_failures, 1); - return; + return (false); } /* @@ -2811,7 +2813,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, "pmap_promote_l2: failure for va %#lx pmap %p", va, pmap); atomic_add_long(&pmap_l2_p_failures, 1); - return; + return (false); } while ((l3e & (PTE_W | PTE_D)) == PTE_W) { if (atomic_fcmpset_64(l3, &l3e, l3e & ~PTE_W)) { @@ -2824,7 +2826,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, "pmap_promote_l2: failure for va %#lx pmap %p", va, pmap); atomic_add_long(&pmap_l2_p_failures, 1); - return; + return (false); } all_l3e_PTE_A &= l3e; pa -= PAGE_SIZE; @@ -2851,7 +2853,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, CTR2(KTR_PMAP, "pmap_promote_l2: failure for va %#lx pmap %p", va, pmap); atomic_add_long(&pmap_l2_p_failures, 1); - return; + return (false); } if ((firstl3e & PTE_SW_MANAGED) != 0) @@ -2862,6 +2864,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, atomic_add_long(&pmap_l2_promotions, 1); CTR2(KTR_PMAP, "pmap_promote_l2: success for va %#lx in pmap %p", va, pmap); + return (true); } #endif @@ -3127,10 +3130,9 @@ validate: #if VM_NRESERVLEVEL > 0 if (mpte != NULL && mpte->ref_count == Ln_ENTRIES && - pmap_ps_enabled(pmap) && (m->flags & PG_FICTITIOUS) == 0 && vm_reserv_level_iffullpop(m) == 0) - pmap_promote_l2(pmap, l2, va, mpte, &lock); + (void)pmap_promote_l2(pmap, l2, va, mpte, &lock); #endif rv = KERN_SUCCESS; From nobody Sat Dec 2 21:55:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SjNzM3NkNz52n15; Sat, 2 Dec 2023 21:55: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 4SjNzM2xYGz4pnl; Sat, 2 Dec 2023 21:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=emrHU9k9OQkByFQdqtja6B2VLt9GkLCYWB8/B9hiLaE=; b=wrtltIhrhQPIz7MOYC/a0cbY+9TCIk1yeQjaJ+y2KkYJbOk85HaleqxusopHYJfrB4K6QV 2tKR9/wyMQMKK+zx5zlpdkxBRtQ2Sz7OXW0hAPr0tHov5f+IPZZhKKI6/xeJm+fUmNucc9 iwIbUiOQYLbLxBdJ3ygV46bW/Wpa3e46v/d+KMSPXHtnRZ11rDfAwwx9M0XfDKSQGN733R iXi8Sy2yRYhWBsj4bOng+ysIuAzk4hr1egcl6YZLOBGx65x/HyRSKpeACNcWW3RNaH2pbP wgsLW0J/bBN0fyx15fVEWv2MomEUnEQU7r+mYv6vb5193JwGBrpEmem+I+ivZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=emrHU9k9OQkByFQdqtja6B2VLt9GkLCYWB8/B9hiLaE=; b=PbwxjYbJLD4DqEGX4gtkpNiS6PR+5Bd7dnH4taeABjiOzYmtVf9faOqUSc/Z8wKTxu8cuq PKcSoqXqCnf1eWTO6B90hbJoqKdvlggjUMgcr5ETMeH9tw03Vn9Z4qB0HIZ/wwO1qWBYhH qox2OOBm1P0CW7mQrOU+tVrsDin/N3j8YHtb7yRorHB/Nr7uRfwsEIbAWw3fx7Dkibq0JI E17B0R2VIbIltZf+QH6xIvwlTnl/07FYjqB3/5TfLWS8qVArBTuYAKKXAQyLxZc/txuG56 8pSpSAf15fpgWN/LoWiPh91SJjSJM2PqpvLLIZknxxsiSJ4NG/eG1Ly/2j0fCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701554159; a=rsa-sha256; cv=none; b=Fp3shXpuRYPbA0QCnYb+LOYheO3EBXB29isie3PmI/nsYhiTVTbJSzPwscJP2d1/Sa50xD m3pWcbPuku/EEvl/fulGXmbHy1qzjOYM5dMzD5EWk7bb7ItYXBniOzNCAeyHUUq6uf6N5I nq/C4ESKVK4HcljkG6/ZJoCoExDmpJrjyQ/4rKpHjUiiWQA5ICIWdeShBSeJjJO4ETVqcv 2hqGo7wIVZ/EKDJKzwnoiU/yn18GY5M8qOeNpjIEOqzyFIgPuSIT4b3225T6FnqdRwU8sl +T83WoYhm1Cgvt1st/AEkPW0aRPOg7FD+e9QTcEzyJB473eKg+fq/UPkx5U0+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 4SjNzM1n0NzYjv; Sat, 2 Dec 2023 21:55: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 3B2Ltx2U034780; Sat, 2 Dec 2023 21:55:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2LtxNZ034777; Sat, 2 Dec 2023 21:55:59 GMT (envelope-from git) Date: Sat, 2 Dec 2023 21:55:59 GMT Message-Id: <202312022155.3B2LtxNZ034777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0a13f4d7934f - stable/14 - riscv: Port improvements from arm64/amd64 pmaps, part 3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0a13f4d7934fe1af776f5ec60d5159a59a1a5575 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0a13f4d7934fe1af776f5ec60d5159a59a1a5575 commit 0a13f4d7934fe1af776f5ec60d5159a59a1a5575 Author: Mark Johnston AuthorDate: 2023-11-02 18:34:07 +0000 Commit: Mark Johnston CommitDate: 2023-12-02 21:54:35 +0000 riscv: Port improvements from arm64/amd64 pmaps, part 3 - Let pmap_enter_quick_locked() trigger superpage promotions. Reviewed by: kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D42290 (cherry picked from commit 0b8372b707a50c2deeaf66d4c55fec51007cec44) --- sys/riscv/riscv/pmap.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 376027c8be8e..79248c4c1fcd 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -3399,6 +3399,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, ("pmap_enter_quick_locked: managed mapping within the clean submap")); rw_assert(&pvh_global_lock, RA_LOCKED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); + l2 = NULL; CTR2(KTR_PMAP, "pmap_enter_quick_locked: %p %lx", pmap, va); /* @@ -3497,6 +3498,26 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, pmap_store(l3, newl3); +#if VM_NRESERVLEVEL > 0 + /* + * If both the PTP and the reservation are fully populated, then attempt + * promotion. + */ + if ((mpte == NULL || mpte->ref_count == Ln_ENTRIES) && + (m->flags & PG_FICTITIOUS) == 0 && + vm_reserv_level_iffullpop(m) == 0) { + if (l2 == NULL) + l2 = pmap_l2(pmap, va); + + /* + * If promotion succeeds, then the next call to this function + * should not be given the unmapped PTP as a hint. + */ + if (pmap_promote_l2(pmap, l2, va, mpte, lockp)) + mpte = NULL; + } +#endif + pmap_invalidate_page(pmap, va); return (mpte); } From nobody Sat Dec 2 21:56:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SjNzN4M4Bz52nZ0; Sat, 2 Dec 2023 21:56: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 4SjNzN3TGnz4px3; Sat, 2 Dec 2023 21:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d2sNrYyXcDNrMR+XTCXHF36L2YykvwQHgwqCNZJjPWw=; b=C3OfCYAf2JhEgPEw/W2myyjBk+cg2RPN6J65XNR8z3ZNyB1Iaszu71hw6yvwIiEJN+iZwt +UHUDe1WVc3znigHlrl7NLIKy05wJj953DUOZmDPn1Oi4EpzH60grtThGCB/vFlm8i5SeO UnBMoA8RQSrw62AlPQfXnpwOxUHYiJjZVkAiEGDCld8CU6ZLy8rx5dyPtJqOvXZ36Oq9LB 127KuG1HakNYhXLXfAVOGG/RlUvmN1ufLvfZWtyEk6D1erhIyqYyq1x6JBszs3fVmaOexl ueQrjzwFlrYokw6IlQ5h1DwwD6U7tNzO6j2tiX19snn27Jr/fx9tMXfFSTR+5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d2sNrYyXcDNrMR+XTCXHF36L2YykvwQHgwqCNZJjPWw=; b=stFIY7+kjzOqgO5UW/fRbgHTMzbBE2Ffr0g7/9+fmYcJvNJZLgB5bI4h+VZ6i0HkW18Yhp vxfyFUvCoW2FALMqQ88CO45JMCRZkeX+gWv43xxypo0D6bd/4F2cA1NVe7igTxZgBvsoVQ Ez6xpJdHNEgYACOmWWVPY7g3QT+aXqOeDl93WzhEHeQOUZUie5hmih9ykJI5uLh32TVZtp S+gtqBazVP88EaNmaZ4Nwe+rgeMLImTqvXXR038cbFSW4omILm6OLACqD4FhH62lUl8h+v x8F65b+j+VbPSAGriBWyqxlWWGmC8yKfDE1bX5SPG0YSajfIkJcP4J4bH0x4YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701554160; a=rsa-sha256; cv=none; b=x8kl3eX/DaWowDPQFNUPbJGnxmPEMrvLkpaSSjWl2nsAGLa3yfIcngv9h0FySH0PJnYh46 j9QS3mWEnRJ04fqg+xbYSE632vFu2DS/C32uP2dEzmsUA9ru3zTtBOTPTVEDc6atwzMl4R 6SNeB3xYXHa32tUaN8qnFd/E6NetlVLp/x4+O3oGpGGrfmUa80f5nZkdh1V8zn/jbWSJ75 YHjO9BKwHBUiG/Xtn2XhLuAAptfpfuDCTmYKxw/pS4lYnjaZZMvC9lyTHvrhZuS/RJHxwG 0+EuXc03KyP5NixOgtBGlxDmqwcS1FPS2M8MNPYMOhKQqFySNQvr09axivLrrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SjNzN2bMrzZ44; Sat, 2 Dec 2023 21:56: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 3B2Lu0n3034834; Sat, 2 Dec 2023 21:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2Lu0lh034831; Sat, 2 Dec 2023 21:56:00 GMT (envelope-from git) Date: Sat, 2 Dec 2023 21:56:00 GMT Message-Id: <202312022156.3B2Lu0lh034831@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d246ba035960 - stable/14 - riscv: Remove unnecessary invalidations in pmap_enter_quick_locked() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d246ba0359609e9d9f2b54f2ceeaf41152a5c32e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d246ba0359609e9d9f2b54f2ceeaf41152a5c32e commit d246ba0359609e9d9f2b54f2ceeaf41152a5c32e Author: Mark Johnston AuthorDate: 2023-11-02 18:34:26 +0000 Commit: Mark Johnston CommitDate: 2023-12-02 21:54:36 +0000 riscv: Remove unnecessary invalidations in pmap_enter_quick_locked() This function always overwrites an invalid PTE, so if pmap_try_insert_pv_entry() fails it is certainly not necessary to invalidate anything, because the PTE has not yet been written by that point. It should also not be necessary to invalidate TLBs after overwriting an invalid entry. In principle the TLB could cache negative entries, but then the worst case scenario is a spurious fault. Since pmap_enter() does not bother issuing an sfence.vma, pmap_enter_quick_locked() should behave similarly. Reviewed by: kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D42291 (cherry picked from commit 71b77a7172c26783a9d2181d3bed27cf62974200) --- sys/riscv/riscv/pmap.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 79248c4c1fcd..7dce0cd9f5be 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -3452,11 +3452,9 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, if (l3 == NULL) panic("pmap_enter_quick_locked: No l3"); if (pmap_load(l3) != 0) { - if (mpte != NULL) { + if (mpte != NULL) mpte->ref_count--; - mpte = NULL; - } - return (mpte); + return (NULL); } /* @@ -3466,13 +3464,10 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, !pmap_try_insert_pv_entry(pmap, va, m, lockp)) { if (mpte != NULL) { SLIST_INIT(&free); - if (pmap_unwire_ptp(pmap, va, mpte, &free)) { - pmap_invalidate_page(pmap, va); + if (pmap_unwire_ptp(pmap, va, mpte, &free)) vm_page_free_pages_toq(&free, false); - } - mpte = NULL; } - return (mpte); + return (NULL); } /* @@ -3518,7 +3513,6 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, } #endif - pmap_invalidate_page(pmap, va); return (mpte); } From nobody Sat Dec 2 21:56:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SjNzP5XVdz52nrF; Sat, 2 Dec 2023 21: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 4SjNzP55VJz4q5S; Sat, 2 Dec 2023 21: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=1701554161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x+43g+Thu0qVkkpgUj/IdRgo7OBJSLTaTBk1ZrJRPi0=; b=N2zl8Pk11ryjQA4uKvtRZnCGcKNjmHzvPqM2FJblpNPjxf2IOVF2jyzlnSKQ1JzsNGeh8j uEv3ffoDOdCDSCnx7oxY3SsxC/CXGPqc70DaC0ncTQdbeP8jw9KPTUzsbCNbVPOKfs9bQF zSlaPYCLhxB1JSa5IsSuKvGIx3u+U5INKYijaQriYLIjOSb3Xd7ffzXAncqZgZCnhsAd33 Mgt76WuGcgYYwAOpxDc70pbG7QEqQQKU/WkC518HVYQBvklELGyyc4JDZVknS/csjyEfi1 +BqBP8b+lr/gomIpmfH+sW8SSPOgdnRV+EmKXte2hF54mP8PRrLyon4avGLaTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x+43g+Thu0qVkkpgUj/IdRgo7OBJSLTaTBk1ZrJRPi0=; b=mnLToSrlK4EPx//rK9SUdj1/WrRwD6DVl0B1dusTp9UUG5TSLDFA6QIJ70VBGJpfPmHs5B Ab1Zwb/bBVT9SjDKcG6B/+tvOlTCcz14oQkVACGmWG+ADBgbBYhgkj65cuFjhXoHSTV+MI cgM0PBDFotc852BVhNjYCEcjcuzQP+/3jZ9e7u6jEywSGID6B2hQOn60lzlGBU5OeCnpHp BkIEFSuR4jGPlYCzP5GAX59tGy75gY2bdIUf0AfQXKnf6BVv+dz+a8AZCnoKA1TAXnCdpJ 2z/gNM9OzEFcANoNmxR4cFkRMfWynIsNt6fSf4vZl/9oZuE5B/4SNq2xPbXkRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701554161; a=rsa-sha256; cv=none; b=GZHJsIipY3YP7wcwuumOu68/+ub+2Eq3ulBm6+JSowZy787zi0ko93EzmyA9FH7cZofs9l rtIkJeB+CfOxtpuGG/FXmi5TqHt+bNs7musXihgsFUDcbL9GSs86feOKiymkII9jC+muhv CxnsS3LbHyuTZkTQEr+3ScAM9nCEsjTyrI5dRvf0V+WP6IAjWTL+LNch963Br1tp6LINfP TdaPeqqh2LeeJou/da8aO3U9lBw9GuMw+0hEvOy2oQNBTxDsoaeyG5pyzo0S+fdkOlmjCg NC8H4I5o/Uh56bPlVAt87kHf4dsucSoQPQ7TQVgQ8kwyNqlfBb4/XU1CrNBNEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SjNzP3hCtzYVr; Sat, 2 Dec 2023 21: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 3B2Lu13X034888; Sat, 2 Dec 2023 21: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 3B2Lu1T1034885; Sat, 2 Dec 2023 21:56:01 GMT (envelope-from git) Date: Sat, 2 Dec 2023 21:56:01 GMT Message-Id: <202312022156.3B2Lu1T1034885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 04e48937f1bf - stable/14 - riscv: Update a variable name to match a comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 04e48937f1bfff2f2a984e719556527c8b44dd45 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=04e48937f1bfff2f2a984e719556527c8b44dd45 commit 04e48937f1bfff2f2a984e719556527c8b44dd45 Author: Mark Johnston AuthorDate: 2023-11-03 13:34:11 +0000 Commit: Mark Johnston CommitDate: 2023-12-02 21:54:36 +0000 riscv: Update a variable name to match a comment This makes pmap_insert_pt_page() consistent with arm64 and amd64. No functional change intended. Reported by: alc Fixes: 7703ac2e983b ("riscv: Port improvements from arm64/amd64 pmaps, part 1") (cherry picked from commit 368b97361a0379acaec4a385c5c9d83ba6edc5a2) --- sys/riscv/riscv/pmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 7dce0cd9f5be..8bd5b5e9374d 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -1200,15 +1200,15 @@ pmap_add_delayed_free_list(vm_page_t m, struct spglist *free, * field will be set to VM_PAGE_BITS_ALL. */ static __inline int -pmap_insert_pt_page(pmap_t pmap, vm_page_t ml3, bool promoted, +pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte, bool promoted, bool all_l3e_PTE_A_set) { PMAP_LOCK_ASSERT(pmap, MA_OWNED); KASSERT(promoted || !all_l3e_PTE_A_set, ("a zero-filled PTP can't have PTE_A set in every PTE")); - ml3->valid = promoted ? (all_l3e_PTE_A_set ? VM_PAGE_BITS_ALL : 1) : 0; - return (vm_radix_insert(&pmap->pm_root, ml3)); + mpte->valid = promoted ? (all_l3e_PTE_A_set ? VM_PAGE_BITS_ALL : 1) : 0; + return (vm_radix_insert(&pmap->pm_root, mpte)); } /* From nobody Sat Dec 2 21:56:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SjNzQ61P3z52npH; Sat, 2 Dec 2023 21: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 4SjNzQ5TCnz4q81; Sat, 2 Dec 2023 21: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=1701554162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tsgoK/ZieH9eg5dkmk78P3yGdWK9JMu8C5GTjHlV59U=; b=KHp9RRuzcb3q0zWm+iFYyTZb/zuF3JQd7/vwE/f9D9u9mvwdyQaxFXGvwHOZDG+rbLXrtT ZvJ7CtL2f+A0BEG/PmuiLEtO4DPCqBoWZxACbBuuyC/alOrMJ9iZHhpvq7lL9OMaO2rkwN ec/KBcWHEBF3bnZE4WcwX75Ff2d38RSV8P3Izh3yydDBkPjUF1DX24L9g2X90EGQMK/130 8TZOq5O8fWr7YhTRV4lhRUuINvzTfb+bNrcrB3dBumTBR8/SxK/tCCUim/OcQVYkPvf2p+ NmJpsxSI1WPwCNOC8BhFCkeukH/sm91kwrzkXtb+6P2z+VZkzJUY+e8pQdgTAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tsgoK/ZieH9eg5dkmk78P3yGdWK9JMu8C5GTjHlV59U=; b=wSGNDNej1l9Tgypwt/ElcK73i9IkWYI6fIBK8Qx7gOvFnCfGHva9Y0SDqf0qq6WRJoKjtF hKLtoS8Acr4YHOe/7OTAXkqhAPyjVBCkwRmvQvU9rH+T0FPB06IhWEL229aDuWU4wMoF8i V/wHQuMh3vezLq4NHClf9beeOrUnKXsNiW2aqx2qI/GT5PHN5lqePmxZ5B83yvI3sFERrl 7vhQN8fQ2U5wdDjBQAm/wPyLoxJ1IiJelHyYHX7xWX1NhALm44WCqC0viVYfKvDKgsUOHi EnUxWZR7QmaKxwS7NaFOQXtbldrQz37iuL98EsuSA7jhpkivqBtSrU8hENhhfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701554162; a=rsa-sha256; cv=none; b=QfkdC6pLcmVrFTaeADK80g4FbfTQ9qJTaFEphSOB7/TCM+7ejSu4p7IGW9dxTaQaxNIm6L 86cB6ys0bu5UbkV7f1m9HDIM4hcNw76RCNzqRTp0nfLSDf4xfTGUA+Dgbnn8tmDErrZuAp 0oSH49n+Saty9ohs+mi9ga5S/AVJkrHjJx6mgJyRfvwGEnagdyYQHmEb/nyzW/XteFYALj +wBt/05Jq1rMK2Ei0PCozr1jbUvdtV7E5NfxKzYLTL4VvvY07FskhAPYxdhfCoOK4BPmTY ABATDZ0NxwhNQFaEElrdyC9VOCaJnpKRqJurVDai0xzoD+kx3tIh3tILch5zrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SjNzQ4W4MzZ8c; Sat, 2 Dec 2023 21: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 3B2Lu2VC034950; Sat, 2 Dec 2023 21: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 3B2Lu2vF034947; Sat, 2 Dec 2023 21:56:02 GMT (envelope-from git) Date: Sat, 2 Dec 2023 21:56:02 GMT Message-Id: <202312022156.3B2Lu2vF034947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 998d0babdde6 - stable/14 - riscv: Add a leaf PTP when pmap_enter(psind=1) creates a wired mapping List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 998d0babdde6e58e2675487cd12da97f4d625d9d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=998d0babdde6e58e2675487cd12da97f4d625d9d commit 998d0babdde6e58e2675487cd12da97f4d625d9d Author: Bojan Novković AuthorDate: 2023-11-08 10:20:06 +0000 Commit: Mark Johnston CommitDate: 2023-12-02 21:54:37 +0000 riscv: Add a leaf PTP when pmap_enter(psind=1) creates a wired mapping Let pmap_enter_l2() create wired mappings. In particular, allocate a leaf PTP for use during demotion. This is the last pmap which requires such a change ahead of reverting commit 64087fd7f372. Reviewed by: markj Sponsored by: Google, Inc. (GSoC 2023) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41633 (cherry picked from commit d0941ed9b5c39d92d0aa75bc253506cb59a2e9a1) --- sys/riscv/riscv/pmap.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 8bd5b5e9374d..8ddc31bed81c 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -2679,6 +2679,8 @@ pmap_demote_l2_locked(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, ("pmap_demote_l2_locked: oldl2 is not a leaf entry")); if ((oldl2 & PTE_A) == 0 || (mpte = pmap_remove_pt_page(pmap, va)) == NULL) { + KASSERT((oldl2 & PTE_SW_WIRED) == 0, + ("pmap_demote_l2_locked: page table page for a wired mapping is missing")); if ((oldl2 & PTE_A) == 0 || (mpte = vm_page_alloc_noobj( (VIRT_IN_DMAP(va) ? VM_ALLOC_INTERRUPT : 0) | VM_ALLOC_WIRED)) == NULL) { @@ -3211,6 +3213,7 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, pd_entry_t *l2, *l3, oldl2; vm_offset_t sva; vm_page_t l2pg, mt; + vm_page_t uwptpg; PMAP_LOCK_ASSERT(pmap, MA_OWNED); @@ -3268,6 +3271,24 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, ("pmap_enter_l2: non-zero L2 entry %p", l2)); } + /* + * Allocate leaf ptpage for wired userspace pages. + */ + uwptpg = NULL; + if ((new_l2 & PTE_SW_WIRED) != 0 && pmap != kernel_pmap) { + uwptpg = vm_page_alloc_noobj(VM_ALLOC_WIRED); + if (uwptpg == NULL) { + return (KERN_RESOURCE_SHORTAGE); + } + uwptpg->pindex = pmap_l2_pindex(va); + if (pmap_insert_pt_page(pmap, uwptpg, true, false)) { + vm_page_unwire_noq(uwptpg); + vm_page_free(uwptpg); + return (KERN_RESOURCE_SHORTAGE); + } + pmap_resident_count_inc(pmap, 1); + uwptpg->ref_count = Ln_ENTRIES; + } if ((new_l2 & PTE_SW_MANAGED) != 0) { /* * Abort this mapping if its PV entry could not be created. @@ -3284,6 +3305,16 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, pmap_invalidate_page(pmap, va); vm_page_free_pages_toq(&free, true); } + if (uwptpg != NULL) { + mt = pmap_remove_pt_page(pmap, va); + KASSERT(mt == uwptpg, + ("removed pt page %p, expected %p", mt, + uwptpg)); + pmap_resident_count_dec(pmap, 1); + uwptpg->ref_count = 1; + vm_page_unwire_noq(uwptpg); + vm_page_free(uwptpg); + } CTR2(KTR_PMAP, "pmap_enter_l2: failed to create PV entry" " for va %#lx in pmap %p", va, pmap);