From nobody Sat Apr 15 06:48:12 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pz3mY23vFz44k5V; Sat, 15 Apr 2023 06:48: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 4Pz3mY0GwTz3t2T; Sat, 15 Apr 2023 06:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681541293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PH03PhPwPMM+9n5vjKIlCeZd+UkX2TmaOfecHsnit48=; b=tEBkajFMDBLZb0A7qlCYw1jJJgei/ZAhm6jCnrgl32+7d3Mqm/0gdX2p9UK78cNv9zmEee 5u6i48bEechJuXyywYrkzBj7b8UeOxeXF5nFcrYe5qIvrDG4+fPJ6cPHxDCwNVbK2g7WrU mR9TQbuXPg1gE1Ag6rlrzkDIzgRixG4N5tLp6H+OGGFif3TOpot4TI1KfTJsUauaREOvxt BCBgfzE1DXk2XwF/Ix6Vw3jL4Y0fQk3IwzLMCaN23YeCY8P9h82FiK5vEhqV/1AsOmCT+o z53Wd2UWPGohCYaoGf0OJEriH+dfUAPOtJfbh+6A93x5Ry9XLz4AmbFydbVyMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681541293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PH03PhPwPMM+9n5vjKIlCeZd+UkX2TmaOfecHsnit48=; b=WFgDI7qNTATm4DM6JpFXmr4stPdFalG//DPpSsXjq2Jw36LlwkfWxonUSTwpA068nIAqp/ MhW7cuSF/VmtFXv3erLkDRrIscj0A71e8OjQzowHAdIfwyWY7SzcpsqyfvppALDYOKniyu rQd0WfW5AClW5Eq33lGBogwUOM4AacwwnnS+JJij+z3Od4BNMQCVwOF6oO0QlTzbT6mAWt iqcaSp932dF8ej/63OZW5Iq1SUlI2mfLk8EPx/L9VTyz/XNnkuQ3O5GzD2+bjzfvrMyQzm 3ubqWoCH4KoF5ANRKfMQg4xQlCol0G/fKJPjsEi6kN3R9eAxckX0n9w5vDAR1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681541293; a=rsa-sha256; cv=none; b=xAUMfo4cG/1ZIxX0KKAbuZ8XMtrt8mwORoKIPSCwsBKi/aMmLrMK6tFiu2eU7Jw/trs9jD KOf71hVdDA82uGEHCbrJD8rHtZp7wbhCAsz0Pz0H69j57/Ra32/c1Vs+Tr9uc4UBg4iMyL MqgvetC9OhMz74MSgFWzJ+6j+/+/cF+0PaVjjwpcrqW7Vvm3arLAh5t2ZnkSeikZb/JfME 8BOgkCuBIPQQDOG1at5od+7gbT75FfOcHf58T5X6NgV3UAGuO0KpJczfelbEt8pB54al0l OXxHLxznGaa0ysW+0cKBL114lWpxxAlpOv7zifneeKAUjS5DyLtIGFTufRb6+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 4Pz3mX6SR1zwrT; Sat, 15 Apr 2023 06:48:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33F6mC9F038638; Sat, 15 Apr 2023 06:48:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33F6mCn1038637; Sat, 15 Apr 2023 06:48:12 GMT (envelope-from git) Date: Sat, 15 Apr 2023 06:48:12 GMT Message-Id: <202304150648.33F6mCn1038637@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: 134e7beec0e2 - stable/13 - arcmsr(4): Fix reading buffer empty length error. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 134e7beec0e29a6f571d81edfe9a315a93e70c0f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=134e7beec0e29a6f571d81edfe9a315a93e70c0f commit 134e7beec0e29a6f571d81edfe9a315a93e70c0f Author: 黃清隆 AuthorDate: 2023-04-01 05:43:43 +0000 Commit: Xin LI CommitDate: 2023-04-15 06:47:33 +0000 arcmsr(4): Fix reading buffer empty length error. (cherry picked from commit 285d85f4f96bf3b5aecccad865a8855724241c32) --- sys/dev/arcmsr/arcmsr.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c index 6a21a91fda58..987e9ecd9047 100644 --- a/sys/dev/arcmsr/arcmsr.c +++ b/sys/dev/arcmsr/arcmsr.c @@ -87,6 +87,7 @@ ** scatter-gather count large than some number ** 1.50.00.03 05/04/2021 Ching Huang Fixed doorbell status arrived late on ARC-1886 ** 1.50.00.04 12/08/2021 Ching Huang Fixed boot up hung under ARC-1886 with no volume created +** 1.50.00.05 03/23/2023 Ching Huang Fixed reading buffer empty length error ****************************************************************************************** */ @@ -144,7 +145,7 @@ __FBSDID("$FreeBSD$"); #define arcmsr_callout_init(a) callout_init(a, /*mpsafe*/1); -#define ARCMSR_DRIVER_VERSION "arcmsr version 1.50.00.04 2021-12-08" +#define ARCMSR_DRIVER_VERSION "arcmsr version 1.50.00.05 2023-03-23" #include /* ************************************************************************** @@ -1561,8 +1562,10 @@ static void arcmsr_iop2drv_data_wrote_handle(struct AdapterControlBlock *acb) /*check this iop data if overflow my rqbuffer*/ ARCMSR_LOCK_ACQUIRE(&acb->qbuffer_lock); prbuffer = arcmsr_get_iop_rqbuffer(acb); - my_empty_len = (acb->rqbuf_lastindex - acb->rqbuf_firstindex - 1) & - (ARCMSR_MAX_QBUFFER-1); + if (acb->rqbuf_lastindex >= acb->rqbuf_firstindex) + my_empty_len = (ARCMSR_MAX_QBUFFER - 1) - (acb->rqbuf_lastindex - acb->rqbuf_firstindex); + else + my_empty_len = acb->rqbuf_firstindex - acb->rqbuf_lastindex - 1; if(my_empty_len >= prbuffer->data_len) { if(arcmsr_Read_iop_rqbuffer_data(acb, prbuffer) == 0) acb->acb_flags |= ACB_F_IOPDATA_OVERFLOW; From nobody Sun Apr 16 02:53:22 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzZW66xN1z45cFV; Sun, 16 Apr 2023 02:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzZW62vSWz46Kh; Sun, 16 Apr 2023 02:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681613602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dql0xB4mJngmYk1zzyF+jQ9w6TFlNYal2kFygFxlXno=; b=In/m8iK+SLbMU0kJl4lL0QotIZhkjEMx3h6QF/DfNsmbKqSZprJR07VK4w/Skw8oVPOeFW 5TG2CS2ZEN42KHdJTVvzetHpBJ6hPLFGzNPgJgyE1T1hyUwtIHmEmjhnhGN1TLHiyYej+q RBX2AZ1PSyi102sMHEQ1M/xcm/DPi1J2mpi3ERrDauobLqvZCp4aSs7cc9ucw6VPfsIq45 IMBh8ghrdC4vprokRltX32OCvwH1erKSwqoPYzutYsGJbbpwGYJe+4kxNWfRkgZ9pLYv6H vyYYQXTiyKcLQePIh+8XYtFx0WmSlsFluwMIccgOoOVcdOWawzXZbOpYjJ6FxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681613602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dql0xB4mJngmYk1zzyF+jQ9w6TFlNYal2kFygFxlXno=; b=bO7OBp6UFvvLAJVaLY00MF2H+zeiTKSYhjPrG8Y1vsW1OBtdlulF+JHPqPJsLyf/6GFqS9 o+EjTU99RLHteRUjrXdTPILW8VLpUfWSo9YVG5T/5lwj7JJqhevOIt44SYLQyOMq6uRhrp /ET8jLh/0AiXxacmzKc0WVqhlhHX6e0ydruIy/GRAFSQZCibas3l8E0jqCIVOSb4oJS1Bs 98txZEdcfwcn2vId3SZgaq7gyRMANxPdlHkTIWqwrjMn+cBRBxWTs7SAaQV/pMQrWhvGU3 n2j3OO3KQMrujKjBiCBH1zZ4+AY10nz6xHLvI1xRBUiiivfcKWaxRCIgYTo4Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681613602; a=rsa-sha256; cv=none; b=ZCAh9wDUUEjoJoxdNoxFDhqKB0GGPkl7ndj5JiL5e8dJ8PCmvatTQxRKCeAw0pcpvF+Bt8 ZHbwuybXeqPHM8X9I2cpfPC+G91l/8DP6Y8fQ63kH1uk6Y0AkZfg2PEdHok7MyozIfRYFa vEZLyv9RdyotyqIv3qdhT+WH29P7r4wwF9hb+l77QifJG6xpS2XvnSmbvcFobrjw+VL56S gUkiqx0Hx5++0VDCJK6b29JiR0Evjs3b2RrRcc135Y0es+qyoM9yG4ECGzt1MlNaEMqSFz GvgSEbyzb+hwT2jXAZlbsYdQh/TT7PsavFdISuVS2Gnu94yKK6CT2TH15eEmYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PzZW61wLhzWVS; Sun, 16 Apr 2023 02:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33G2rMfa029524; Sun, 16 Apr 2023 02:53:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33G2rMtd029523; Sun, 16 Apr 2023 02:53:22 GMT (envelope-from git) Date: Sun, 16 Apr 2023 02:53:22 GMT Message-Id: <202304160253.33G2rMtd029523@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Simon J. Gerraty" Subject: git: c1ca6b7ba3de - stable/13 - Merge bearssl-20220418 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c1ca6b7ba3de3a9a50f1c53cba79e321fab37990 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c1ca6b7ba3de3a9a50f1c53cba79e321fab37990 commit c1ca6b7ba3de3a9a50f1c53cba79e321fab37990 Author: Simon J. Gerraty AuthorDate: 2022-04-18 21:47:09 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-16 02:50:10 +0000 Merge bearssl-20220418 Main change is a callback for checking validity period of certificates. Merge commit 'f6acb9b9f81c96ae7c9592bee1bb89c4357cc3e5' Add -DHAVE_BR_X509_TIME_CHECK to libsecureboot/Makefile.inc (cherry picked from commit cc9e6590773dba57440750c124173ed531349a06) --- contrib/bearssl/.gitignore | 6 + contrib/bearssl/T0Comp.exe | Bin 72704 -> 73216 bytes contrib/bearssl/flist | 459 +++++++++++++++ contrib/bearssl/inc/bearssl_ec.h | 2 +- contrib/bearssl/inc/bearssl_hash.h | 4 +- contrib/bearssl/inc/bearssl_ssl.h | 8 +- contrib/bearssl/inc/bearssl_x509.h | 83 ++- contrib/bearssl/src/config.h | 22 +- contrib/bearssl/src/ec/ec_c25519_m64.c | 4 - contrib/bearssl/src/ec/ec_p256_m15.c | 22 +- contrib/bearssl/src/ec/ec_p256_m31.c | 22 +- contrib/bearssl/src/ec/ec_p256_m62.c | 2 +- contrib/bearssl/src/ec/ec_p256_m64.c | 67 ++- contrib/bearssl/src/ec/ec_prime_i15.c | 10 +- contrib/bearssl/src/ec/ec_prime_i31.c | 13 +- contrib/bearssl/src/inner.h | 26 +- contrib/bearssl/src/rand/sysrng.c | 88 ++- contrib/bearssl/src/rsa/rsa_i15_keygen.c | 6 +- contrib/bearssl/src/rsa/rsa_i15_modulus.c | 2 +- contrib/bearssl/src/rsa/rsa_i31_keygen_inner.c | 6 +- contrib/bearssl/src/rsa/rsa_i31_modulus.c | 2 +- contrib/bearssl/src/ssl/ssl_engine.c | 15 + contrib/bearssl/src/ssl/ssl_rec_cbc.c | 2 +- contrib/bearssl/src/x509/asn1.t0 | 2 +- contrib/bearssl/src/x509/skey_decoder.c | 2 +- contrib/bearssl/src/x509/skey_decoder.t0 | 2 +- contrib/bearssl/src/x509/x509_minimal.c | 751 +++++++++++++------------ contrib/bearssl/src/x509/x509_minimal.t0 | 80 ++- contrib/bearssl/test/test_crypto.c | 4 +- contrib/bearssl/test/test_x509.c | 210 ++++--- contrib/bearssl/tools/sslio.c | 2 +- lib/libsecureboot/Makefile.inc | 2 + lib/libsecureboot/vets.c | 2 +- 33 files changed, 1358 insertions(+), 570 deletions(-) diff --git a/contrib/bearssl/.gitignore b/contrib/bearssl/.gitignore new file mode 100644 index 000000000000..7da362eddc00 --- /dev/null +++ b/contrib/bearssl/.gitignore @@ -0,0 +1,6 @@ +/build/ +/libbearssl.a +/brssl +/testcrypto +/testspeed +/testx509 diff --git a/contrib/bearssl/T0Comp.exe b/contrib/bearssl/T0Comp.exe index 67eba109800e..de2364d69e07 100755 Binary files a/contrib/bearssl/T0Comp.exe and b/contrib/bearssl/T0Comp.exe differ diff --git a/contrib/bearssl/flist b/contrib/bearssl/flist new file mode 100644 index 000000000000..9751ad231065 --- /dev/null +++ b/contrib/bearssl/flist @@ -0,0 +1,459 @@ +T0/BlobWriter.cs +T0/CPU.cs +T0/CodeElement.cs +T0/CodeElementJump.cs +T0/CodeElementUInt.cs +T0/CodeElementUIntExpr.cs +T0/CodeElementUIntInt.cs +T0/CodeElementUIntUInt.cs +T0/ConstData.cs +T0/Opcode.cs +T0/OpcodeCall.cs +T0/OpcodeConst.cs +T0/OpcodeGetLocal.cs +T0/OpcodeJump.cs +T0/OpcodeJumpIf.cs +T0/OpcodeJumpIfNot.cs +T0/OpcodeJumpUncond.cs +T0/OpcodePutLocal.cs +T0/OpcodeRet.cs +T0/SType.cs +T0/T0Comp.cs +T0/TPointerBase.cs +T0/TPointerBlob.cs +T0/TPointerExpr.cs +T0/TPointerNull.cs +T0/TPointerXT.cs +T0/TValue.cs +T0/Word.cs +T0/WordBuilder.cs +T0/WordData.cs +T0/WordInterpreted.cs +T0/WordNative.cs +T0/kern.t0 +conf/Unix.mk +conf/Unix32.mk +conf/UnixClang.mk +conf/Win.mk +conf/samd20.mk +inc/bearssl.h +inc/bearssl_aead.h +inc/bearssl_block.h +inc/bearssl_ec.h +inc/bearssl_hash.h +inc/bearssl_hmac.h +inc/bearssl_kdf.h +inc/bearssl_pem.h +inc/bearssl_prf.h +inc/bearssl_rand.h +inc/bearssl_rsa.h +inc/bearssl_ssl.h +inc/bearssl_x509.h +mk/Defaults.mk +mk/NMake.mk +mk/Rules.mk +mk/SingleUnix.mk +mk/mkT0.cmd +mk/mkT0.sh +mk/mkrules.sh +samples/README.txt +samples/cert-ee-ec+rsa.pem +samples/cert-ee-ec.pem +samples/cert-ee-rsa.pem +samples/cert-ica-ec.pem +samples/cert-ica-rsa.pem +samples/cert-root-ec.pem +samples/cert-root-rsa.pem +samples/chain-ec+rsa.h +samples/chain-ec.h +samples/chain-rsa.h +samples/client_basic.c +samples/custom_profile.c +samples/key-ec.h +samples/key-ee-ec.pem +samples/key-ee-rsa.pem +samples/key-ica-ec.pem +samples/key-ica-rsa.pem +samples/key-root-ec.pem +samples/key-root-rsa.pem +samples/key-rsa.h +samples/server_basic.c +src/aead/ccm.c +src/aead/eax.c +src/aead/gcm.c +src/codec/ccopy.c +src/codec/dec16be.c +src/codec/dec16le.c +src/codec/dec32be.c +src/codec/dec32le.c +src/codec/dec64be.c +src/codec/dec64le.c +src/codec/enc16be.c +src/codec/enc16le.c +src/codec/enc32be.c +src/codec/enc32le.c +src/codec/enc64be.c +src/codec/enc64le.c +src/codec/pemdec.c +src/codec/pemdec.t0 +src/codec/pemenc.c +src/config.h +src/ec/ec_all_m15.c +src/ec/ec_all_m31.c +src/ec/ec_c25519_i15.c +src/ec/ec_c25519_i31.c +src/ec/ec_c25519_m15.c +src/ec/ec_c25519_m31.c +src/ec/ec_c25519_m62.c +src/ec/ec_c25519_m64.c +src/ec/ec_curve25519.c +src/ec/ec_default.c +src/ec/ec_keygen.c +src/ec/ec_p256_m15.c +src/ec/ec_p256_m31.c +src/ec/ec_p256_m62.c +src/ec/ec_p256_m64.c +src/ec/ec_prime_i15.c +src/ec/ec_prime_i31.c +src/ec/ec_pubkey.c +src/ec/ec_secp256r1.c +src/ec/ec_secp384r1.c +src/ec/ec_secp521r1.c +src/ec/ecdsa_atr.c +src/ec/ecdsa_default_sign_asn1.c +src/ec/ecdsa_default_sign_raw.c +src/ec/ecdsa_default_vrfy_asn1.c +src/ec/ecdsa_default_vrfy_raw.c +src/ec/ecdsa_i15_bits.c +src/ec/ecdsa_i15_sign_asn1.c +src/ec/ecdsa_i15_sign_raw.c +src/ec/ecdsa_i15_vrfy_asn1.c +src/ec/ecdsa_i15_vrfy_raw.c +src/ec/ecdsa_i31_bits.c +src/ec/ecdsa_i31_sign_asn1.c +src/ec/ecdsa_i31_sign_raw.c +src/ec/ecdsa_i31_vrfy_asn1.c +src/ec/ecdsa_i31_vrfy_raw.c +src/ec/ecdsa_rta.c +src/hash/dig_oid.c +src/hash/dig_size.c +src/hash/ghash_ctmul.c +src/hash/ghash_ctmul32.c +src/hash/ghash_ctmul64.c +src/hash/ghash_pclmul.c +src/hash/ghash_pwr8.c +src/hash/md5.c +src/hash/md5sha1.c +src/hash/mgf1.c +src/hash/multihash.c +src/hash/sha1.c +src/hash/sha2big.c +src/hash/sha2small.c +src/inner.h +src/int/i15_add.c +src/int/i15_bitlen.c +src/int/i15_decmod.c +src/int/i15_decode.c +src/int/i15_decred.c +src/int/i15_encode.c +src/int/i15_fmont.c +src/int/i15_iszero.c +src/int/i15_moddiv.c +src/int/i15_modpow.c +src/int/i15_modpow2.c +src/int/i15_montmul.c +src/int/i15_mulacc.c +src/int/i15_muladd.c +src/int/i15_ninv15.c +src/int/i15_reduce.c +src/int/i15_rshift.c +src/int/i15_sub.c +src/int/i15_tmont.c +src/int/i31_add.c +src/int/i31_bitlen.c +src/int/i31_decmod.c +src/int/i31_decode.c +src/int/i31_decred.c +src/int/i31_encode.c +src/int/i31_fmont.c +src/int/i31_iszero.c +src/int/i31_moddiv.c +src/int/i31_modpow.c +src/int/i31_modpow2.c +src/int/i31_montmul.c +src/int/i31_mulacc.c +src/int/i31_muladd.c +src/int/i31_ninv31.c +src/int/i31_reduce.c +src/int/i31_rshift.c +src/int/i31_sub.c +src/int/i31_tmont.c +src/int/i32_add.c +src/int/i32_bitlen.c +src/int/i32_decmod.c +src/int/i32_decode.c +src/int/i32_decred.c +src/int/i32_div32.c +src/int/i32_encode.c +src/int/i32_fmont.c +src/int/i32_iszero.c +src/int/i32_modpow.c +src/int/i32_montmul.c +src/int/i32_mulacc.c +src/int/i32_muladd.c +src/int/i32_ninv32.c +src/int/i32_reduce.c +src/int/i32_sub.c +src/int/i32_tmont.c +src/int/i62_modpow2.c +src/kdf/hkdf.c +src/kdf/shake.c +src/mac/hmac.c +src/mac/hmac_ct.c +src/rand/aesctr_drbg.c +src/rand/hmac_drbg.c +src/rand/sysrng.c +src/rsa/rsa_default_keygen.c +src/rsa/rsa_default_modulus.c +src/rsa/rsa_default_oaep_decrypt.c +src/rsa/rsa_default_oaep_encrypt.c +src/rsa/rsa_default_pkcs1_sign.c +src/rsa/rsa_default_pkcs1_vrfy.c +src/rsa/rsa_default_priv.c +src/rsa/rsa_default_privexp.c +src/rsa/rsa_default_pss_sign.c +src/rsa/rsa_default_pss_vrfy.c +src/rsa/rsa_default_pub.c +src/rsa/rsa_default_pubexp.c +src/rsa/rsa_i15_keygen.c +src/rsa/rsa_i15_modulus.c +src/rsa/rsa_i15_oaep_decrypt.c +src/rsa/rsa_i15_oaep_encrypt.c +src/rsa/rsa_i15_pkcs1_sign.c +src/rsa/rsa_i15_pkcs1_vrfy.c +src/rsa/rsa_i15_priv.c +src/rsa/rsa_i15_privexp.c +src/rsa/rsa_i15_pss_sign.c +src/rsa/rsa_i15_pss_vrfy.c +src/rsa/rsa_i15_pub.c +src/rsa/rsa_i15_pubexp.c +src/rsa/rsa_i31_keygen.c +src/rsa/rsa_i31_keygen_inner.c +src/rsa/rsa_i31_modulus.c +src/rsa/rsa_i31_oaep_decrypt.c +src/rsa/rsa_i31_oaep_encrypt.c +src/rsa/rsa_i31_pkcs1_sign.c +src/rsa/rsa_i31_pkcs1_vrfy.c +src/rsa/rsa_i31_priv.c +src/rsa/rsa_i31_privexp.c +src/rsa/rsa_i31_pss_sign.c +src/rsa/rsa_i31_pss_vrfy.c +src/rsa/rsa_i31_pub.c +src/rsa/rsa_i31_pubexp.c +src/rsa/rsa_i32_oaep_decrypt.c +src/rsa/rsa_i32_oaep_encrypt.c +src/rsa/rsa_i32_pkcs1_sign.c +src/rsa/rsa_i32_pkcs1_vrfy.c +src/rsa/rsa_i32_priv.c +src/rsa/rsa_i32_pss_sign.c +src/rsa/rsa_i32_pss_vrfy.c +src/rsa/rsa_i32_pub.c +src/rsa/rsa_i62_keygen.c +src/rsa/rsa_i62_oaep_decrypt.c +src/rsa/rsa_i62_oaep_encrypt.c +src/rsa/rsa_i62_pkcs1_sign.c +src/rsa/rsa_i62_pkcs1_vrfy.c +src/rsa/rsa_i62_priv.c +src/rsa/rsa_i62_pss_sign.c +src/rsa/rsa_i62_pss_vrfy.c +src/rsa/rsa_i62_pub.c +src/rsa/rsa_oaep_pad.c +src/rsa/rsa_oaep_unpad.c +src/rsa/rsa_pkcs1_sig_pad.c +src/rsa/rsa_pkcs1_sig_unpad.c +src/rsa/rsa_pss_sig_pad.c +src/rsa/rsa_pss_sig_unpad.c +src/rsa/rsa_ssl_decrypt.c +src/settings.c +src/ssl/prf.c +src/ssl/prf_md5sha1.c +src/ssl/prf_sha256.c +src/ssl/prf_sha384.c +src/ssl/ssl_ccert_single_ec.c +src/ssl/ssl_ccert_single_rsa.c +src/ssl/ssl_client.c +src/ssl/ssl_client_default_rsapub.c +src/ssl/ssl_client_full.c +src/ssl/ssl_engine.c +src/ssl/ssl_engine_default_aescbc.c +src/ssl/ssl_engine_default_aesccm.c +src/ssl/ssl_engine_default_aesgcm.c +src/ssl/ssl_engine_default_chapol.c +src/ssl/ssl_engine_default_descbc.c +src/ssl/ssl_engine_default_ec.c +src/ssl/ssl_engine_default_ecdsa.c +src/ssl/ssl_engine_default_rsavrfy.c +src/ssl/ssl_hashes.c +src/ssl/ssl_hs_client.c +src/ssl/ssl_hs_client.t0 +src/ssl/ssl_hs_common.t0 +src/ssl/ssl_hs_server.c +src/ssl/ssl_hs_server.t0 +src/ssl/ssl_io.c +src/ssl/ssl_keyexport.c +src/ssl/ssl_lru.c +src/ssl/ssl_rec_cbc.c +src/ssl/ssl_rec_ccm.c +src/ssl/ssl_rec_chapol.c +src/ssl/ssl_rec_gcm.c +src/ssl/ssl_scert_single_ec.c +src/ssl/ssl_scert_single_rsa.c +src/ssl/ssl_server.c +src/ssl/ssl_server_full_ec.c +src/ssl/ssl_server_full_rsa.c +src/ssl/ssl_server_mine2c.c +src/ssl/ssl_server_mine2g.c +src/ssl/ssl_server_minf2c.c +src/ssl/ssl_server_minf2g.c +src/ssl/ssl_server_minr2g.c +src/ssl/ssl_server_minu2g.c +src/ssl/ssl_server_minv2g.c +src/symcipher/aes_big_cbcdec.c +src/symcipher/aes_big_cbcenc.c +src/symcipher/aes_big_ctr.c +src/symcipher/aes_big_ctrcbc.c +src/symcipher/aes_big_dec.c +src/symcipher/aes_big_enc.c +src/symcipher/aes_common.c +src/symcipher/aes_ct.c +src/symcipher/aes_ct64.c +src/symcipher/aes_ct64_cbcdec.c +src/symcipher/aes_ct64_cbcenc.c +src/symcipher/aes_ct64_ctr.c +src/symcipher/aes_ct64_ctrcbc.c +src/symcipher/aes_ct64_dec.c +src/symcipher/aes_ct64_enc.c +src/symcipher/aes_ct_cbcdec.c +src/symcipher/aes_ct_cbcenc.c +src/symcipher/aes_ct_ctr.c +src/symcipher/aes_ct_ctrcbc.c +src/symcipher/aes_ct_dec.c +src/symcipher/aes_ct_enc.c +src/symcipher/aes_pwr8.c +src/symcipher/aes_pwr8_cbcdec.c +src/symcipher/aes_pwr8_cbcenc.c +src/symcipher/aes_pwr8_ctr.c +src/symcipher/aes_pwr8_ctrcbc.c +src/symcipher/aes_small_cbcdec.c +src/symcipher/aes_small_cbcenc.c +src/symcipher/aes_small_ctr.c +src/symcipher/aes_small_ctrcbc.c +src/symcipher/aes_small_dec.c +src/symcipher/aes_small_enc.c +src/symcipher/aes_x86ni.c +src/symcipher/aes_x86ni_cbcdec.c +src/symcipher/aes_x86ni_cbcenc.c +src/symcipher/aes_x86ni_ctr.c +src/symcipher/aes_x86ni_ctrcbc.c +src/symcipher/chacha20_ct.c +src/symcipher/chacha20_sse2.c +src/symcipher/des_ct.c +src/symcipher/des_ct_cbcdec.c +src/symcipher/des_ct_cbcenc.c +src/symcipher/des_support.c +src/symcipher/des_tab.c +src/symcipher/des_tab_cbcdec.c +src/symcipher/des_tab_cbcenc.c +src/symcipher/poly1305_ctmul.c +src/symcipher/poly1305_ctmul32.c +src/symcipher/poly1305_ctmulq.c +src/symcipher/poly1305_i15.c +src/x509/asn1.t0 +src/x509/asn1enc.c +src/x509/encode_ec_pk8der.c +src/x509/encode_ec_rawder.c +src/x509/encode_rsa_pk8der.c +src/x509/encode_rsa_rawder.c +src/x509/skey_decoder.c +src/x509/skey_decoder.t0 +src/x509/x509_decoder.c +src/x509/x509_decoder.t0 +src/x509/x509_knownkey.c +src/x509/x509_minimal.c +src/x509/x509_minimal.t0 +src/x509/x509_minimal_full.c +test/test_crypto.c +test/test_math.c +test/test_speed.c +test/test_x509.c +test/x509/alltests.txt +test/x509/dn-ee.der +test/x509/dn-ica1.der +test/x509/dn-ica2.der +test/x509/dn-root-new.der +test/x509/dn-root.der +test/x509/ee-badsig1.crt +test/x509/ee-badsig2.crt +test/x509/ee-cp1.crt +test/x509/ee-cp2.crt +test/x509/ee-cp3.crt +test/x509/ee-cp4.crt +test/x509/ee-dates.crt +test/x509/ee-md5.crt +test/x509/ee-names.crt +test/x509/ee-names2.crt +test/x509/ee-names3.crt +test/x509/ee-names4.crt +test/x509/ee-p256-sha1.crt +test/x509/ee-p256-sha224.crt +test/x509/ee-p256-sha256.crt +test/x509/ee-p256-sha384.crt +test/x509/ee-p256-sha512.crt +test/x509/ee-p256.crt +test/x509/ee-p384.crt +test/x509/ee-p521.crt +test/x509/ee-sha1.crt +test/x509/ee-sha224.crt +test/x509/ee-sha384.crt +test/x509/ee-sha512.crt +test/x509/ee-trailing.crt +test/x509/ee.crt +test/x509/ica1-1016.crt +test/x509/ica1-1017.crt +test/x509/ica1-4096.crt +test/x509/ica1-p256.crt +test/x509/ica1-p384.crt +test/x509/ica1-p521.crt +test/x509/ica1.crt +test/x509/ica2-1016.crt +test/x509/ica2-1017.crt +test/x509/ica2-4096.crt +test/x509/ica2-notCA.crt +test/x509/ica2-p256.crt +test/x509/ica2-p384.crt +test/x509/ica2-p521.crt +test/x509/ica2.crt +test/x509/junk.crt +test/x509/names.crt +test/x509/root-p256.crt +test/x509/root-p384.crt +test/x509/root-p521.crt +test/x509/root.crt +tools/brssl.c +tools/brssl.h +tools/certs.c +tools/chain.c +tools/client.c +tools/errors.c +tools/files.c +tools/impl.c +tools/keys.c +tools/names.c +tools/server.c +tools/skey.c +tools/sslio.c +tools/ta.c +tools/twrch.c +tools/vector.c +tools/verify.c +tools/xmem.c diff --git a/contrib/bearssl/inc/bearssl_ec.h b/contrib/bearssl/inc/bearssl_ec.h index f954309eb6c1..acd3a2bf5a55 100644 --- a/contrib/bearssl/inc/bearssl_ec.h +++ b/contrib/bearssl/inc/bearssl_ec.h @@ -108,7 +108,7 @@ extern "C" { * * - The multipliers (integers) MUST be lower than the subgroup order. * If this property is not met, then the result is indeterminate, - * but an error value is not ncessearily returned. + * but an error value is not necessarily returned. * * * ## ECDSA diff --git a/contrib/bearssl/inc/bearssl_hash.h b/contrib/bearssl/inc/bearssl_hash.h index 3b15ba7ca487..ca4fa26cc4aa 100644 --- a/contrib/bearssl/inc/bearssl_hash.h +++ b/contrib/bearssl/inc/bearssl_hash.h @@ -724,7 +724,7 @@ void br_sha256_update(br_sha256_context *ctx, const void *data, size_t len); */ void br_sha256_out(const br_sha256_context *ctx, void *out); -#if BR_DOXYGEN_IGNORE +#ifdef BR_DOXYGEN_IGNORE /** * \brief Save SHA-256 running state. * @@ -742,7 +742,7 @@ uint64_t br_sha256_state(const br_sha256_context *ctx, void *out); #define br_sha256_state br_sha224_state #endif -#if BR_DOXYGEN_IGNORE +#ifdef BR_DOXYGEN_IGNORE /** * \brief Restore SHA-256 running state. * diff --git a/contrib/bearssl/inc/bearssl_ssl.h b/contrib/bearssl/inc/bearssl_ssl.h index 8c8c86bdb50a..e91df4755690 100644 --- a/contrib/bearssl/inc/bearssl_ssl.h +++ b/contrib/bearssl/inc/bearssl_ssl.h @@ -1250,8 +1250,8 @@ static inline void br_ssl_engine_set_versions(br_ssl_engine_context *cc, unsigned version_min, unsigned version_max) { - cc->version_min = version_min; - cc->version_max = version_max; + cc->version_min = (uint16_t)version_min; + cc->version_max = (uint16_t)version_max; } /** @@ -1324,7 +1324,7 @@ br_ssl_engine_set_protocol_names(br_ssl_engine_context *ctx, const char **names, size_t num) { ctx->protocol_names = names; - ctx->protocol_names_num = num; + ctx->protocol_names_num = (uint16_t)num; } /** @@ -2102,7 +2102,7 @@ void br_ssl_engine_sendapp_ack(br_ssl_engine_context *cc, size_t len); /** * \brief Get buffer for received application data. * - * If the engine has received application data from the peer, hen this + * If the engine has received application data from the peer, then this * call returns a pointer to the buffer from where such data shall be * read, and its length is written in `*len`. Otherwise, `*len` is set * to 0 and `NULL` is returned. diff --git a/contrib/bearssl/inc/bearssl_x509.h b/contrib/bearssl/inc/bearssl_x509.h index 49d2fba0d5bc..7668e1de53a2 100644 --- a/contrib/bearssl/inc/bearssl_x509.h +++ b/contrib/bearssl/inc/bearssl_x509.h @@ -625,6 +625,52 @@ typedef struct { } br_name_element; +/** + * \brief Callback for validity date checks. + * + * The function receives as parameter an arbitrary user-provided context, + * and the notBefore and notAfter dates specified in an X.509 certificate, + * both expressed as a number of days and a number of seconds: + * + * - Days are counted in a proleptic Gregorian calendar since + * January 1st, 0 AD. Year "0 AD" is the one that preceded "1 AD"; + * it is also traditionally known as "1 BC". + * + * - Seconds are counted since midnight, from 0 to 86400 (a count of + * 86400 is possible only if a leap second happened). + * + * Each date and time is understood in the UTC time zone. The "Unix + * Epoch" (January 1st, 1970, 00:00 UTC) corresponds to days=719528 and + * seconds=0; the "Windows Epoch" (January 1st, 1601, 00:00 UTC) is + * days=584754, seconds=0. + * + * This function must return -1 if the current date is strictly before + * the "notBefore" time, or +1 if the current date is strictly after the + * "notAfter" time. If neither condition holds, then the function returns + * 0, which means that the current date falls within the validity range of + * the certificate. If the function returns a value distinct from -1, 0 + * and +1, then this is interpreted as an unavailability of the current + * time, which normally ends the validation process with a + * `BR_ERR_X509_TIME_UNKNOWN` error. + * + * During path validation, this callback will be invoked for each + * considered X.509 certificate. Validation fails if any of the calls + * returns a non-zero value. + * + * The context value is an abritrary pointer set by the caller when + * configuring this callback. + * + * \param tctx context pointer. + * \param not_before_days notBefore date (days since Jan 1st, 0 AD). + * \param not_before_seconds notBefore time (seconds, at most 86400). + * \param not_after_days notAfter date (days since Jan 1st, 0 AD). + * \param not_after_seconds notAfter time (seconds, at most 86400). + * \return -1, 0 or +1. + */ +typedef int (*br_x509_time_check)(void *tctx, + uint32_t not_before_days, uint32_t not_before_seconds, + uint32_t not_after_days, uint32_t not_after_seconds); + /** * \brief The "minimal" X.509 engine structure. * @@ -647,8 +693,8 @@ typedef struct { uint32_t *rp; const unsigned char *ip; } cpu; - uint32_t dp_stack[32]; - uint32_t rp_stack[32]; + uint32_t dp_stack[31]; + uint32_t rp_stack[31]; int err; /* Server name to match with the SAN / CN of the EE certificate. */ @@ -723,6 +769,12 @@ typedef struct { br_name_element *name_elts; size_t num_name_elts; + /* + * Callback function (and context) to get the current date. + */ + void *itime_ctx; + br_x509_time_check itime; + /* * Public key cryptography implementations (signature verification). */ @@ -853,7 +905,10 @@ void br_x509_minimal_init_full(br_x509_minimal_context *ctx, * - Seconds are counted since midnight, from 0 to 86400 (a count of * 86400 is possible only if a leap second happened). * - * The validation date and time is understood in the UTC time zone. + * The validation date and time is understood in the UTC time zone. The + * "Unix Epoch" (January 1st, 1970, 00:00 UTC) corresponds to days=719528 + * and seconds=0; the "Windows Epoch" (January 1st, 1601, 00:00 UTC) is + * days=584754, seconds=0. * * If the validation date and time are not explicitly set, but BearSSL * was compiled with support for the system clock on the underlying @@ -871,6 +926,28 @@ br_x509_minimal_set_time(br_x509_minimal_context *ctx, { ctx->days = days; ctx->seconds = seconds; + ctx->itime = 0; +} + +/** + * \brief Set the validity range callback function for the X.509 + * "minimal" engine. + * + * The provided function will be invoked to check whether the validation + * date is within the validity range for a given X.509 certificate; a + * call will be issued for each considered certificate. The provided + * context pointer (itime_ctx) will be passed as first parameter to the + * callback. + * + * \param tctx context for callback invocation. + * \param cb callback function. + */ +static inline void +br_x509_minimal_set_time_callback(br_x509_minimal_context *ctx, + void *itime_ctx, br_x509_time_check itime) +{ + ctx->itime_ctx = itime_ctx; + ctx->itime = itime; } /** diff --git a/contrib/bearssl/src/config.h b/contrib/bearssl/src/config.h index 8ea4d8af8d61..94627a23c038 100644 --- a/contrib/bearssl/src/config.h +++ b/contrib/bearssl/src/config.h @@ -109,9 +109,27 @@ #define BR_RDRAND 1 */ +/* + * When BR_USE_GETENTROPY is enabled, the SSL engine will use the + * getentropy() function to obtain quality randomness for seeding its + * internal PRNG. On Linux and FreeBSD, getentropy() is implemented by + * the standard library with the system call getrandom(); on OpenBSD, + * getentropy() is the system call, and there is no getrandom() wrapper, + * hence the use of the getentropy() function for maximum portability. + * + * If the getentropy() call fails, and BR_USE_URANDOM is not explicitly + * disabled, then /dev/urandom will be used as a fallback mechanism. On + * FreeBSD and OpenBSD, this does not change much, since /dev/urandom + * will block if not enough entropy has been obtained since last boot. + * On Linux, /dev/urandom might not block, which can be troublesome in + * early boot stages, which is why getentropy() is preferred. + * +#define BR_USE_GETENTROPY 1 + */ + /* * When BR_USE_URANDOM is enabled, the SSL engine will use /dev/urandom - * to automatically obtain quality randomness for seedings its internal + * to automatically obtain quality randomness for seeding its internal * PRNG. * #define BR_USE_URANDOM 1 @@ -120,7 +138,7 @@ /* * When BR_USE_WIN32_RAND is enabled, the SSL engine will use the Win32 * (CryptoAPI) functions (CryptAcquireContext(), CryptGenRandom()...) to - * automatically obtain quality randomness for seedings its internal PRNG. + * automatically obtain quality randomness for seeding its internal PRNG. * * Note: if both BR_USE_URANDOM and BR_USE_WIN32_RAND are defined, the * former takes precedence. diff --git a/contrib/bearssl/src/ec/ec_c25519_m64.c b/contrib/bearssl/src/ec/ec_c25519_m64.c index 7e7f12f7e3ad..df4883467d4a 100644 --- a/contrib/bearssl/src/ec/ec_c25519_m64.c +++ b/contrib/bearssl/src/ec/ec_c25519_m64.c @@ -158,10 +158,6 @@ f255_add(uint64_t *d, const uint64_t *a, const uint64_t *b) /* * Subtraction. - * On input, limbs must fit on 60 bits each. On output, result is - * partially reduced, with max value 2^255+19456; moreover, all - * limbs will fit on 51 bits, except the low limb, which may have - * value up to 2^51+19455. */ static inline void f255_sub(uint64_t *d, const uint64_t *a, const uint64_t *b) diff --git a/contrib/bearssl/src/ec/ec_p256_m15.c b/contrib/bearssl/src/ec/ec_p256_m15.c index 8d68d1d21bdb..05800d87f46a 100644 --- a/contrib/bearssl/src/ec/ec_p256_m15.c +++ b/contrib/bearssl/src/ec/ec_p256_m15.c @@ -2039,12 +2039,13 @@ api_mul(unsigned char *G, size_t Glen, p256_jacobian P; (void)curve; + if (Glen != 65) { + return 0; + } r = p256_decode(&P, G, Glen); p256_mul(&P, x, xlen); - if (Glen >= 65) { - p256_to_affine(&P); - p256_encode(G, &P); - } + p256_to_affine(&P); + p256_encode(G, &P); return r; } @@ -2059,16 +2060,6 @@ api_mulgen(unsigned char *R, p256_to_affine(&P); p256_encode(R, &P); return 65; - - /* - const unsigned char *G; - size_t Glen; - - G = api_generator(curve, &Glen); - memcpy(R, G, Glen); - api_mul(R, Glen, x, xlen, curve); - return Glen; - */ } static uint32_t @@ -2081,6 +2072,9 @@ api_muladd(unsigned char *A, const unsigned char *B, size_t len, int i; (void)curve; + if (len != 65) { + return 0; + } r = p256_decode(&P, A, len); p256_mul(&P, x, xlen); if (B == NULL) { diff --git a/contrib/bearssl/src/ec/ec_p256_m31.c b/contrib/bearssl/src/ec/ec_p256_m31.c index d57ef7b097ff..b185937e1606 100644 --- a/contrib/bearssl/src/ec/ec_p256_m31.c +++ b/contrib/bearssl/src/ec/ec_p256_m31.c @@ -1384,12 +1384,13 @@ api_mul(unsigned char *G, size_t Glen, p256_jacobian P; (void)curve; + if (Glen != 65) { + return 0; + } r = p256_decode(&P, G, Glen); p256_mul(&P, x, xlen); - if (Glen >= 65) { - p256_to_affine(&P); - p256_encode(G, &P); - } + p256_to_affine(&P); + p256_encode(G, &P); return r; } @@ -1404,16 +1405,6 @@ api_mulgen(unsigned char *R, p256_to_affine(&P); p256_encode(R, &P); return 65; - - /* - const unsigned char *G; - size_t Glen; - - G = api_generator(curve, &Glen); - memcpy(R, G, Glen); - api_mul(R, Glen, x, xlen, curve); - return Glen; - */ } static uint32_t @@ -1426,6 +1417,9 @@ api_muladd(unsigned char *A, const unsigned char *B, size_t len, int i; (void)curve; + if (len != 65) { + return 0; + } r = p256_decode(&P, A, len); p256_mul(&P, x, xlen); if (B == NULL) { diff --git a/contrib/bearssl/src/ec/ec_p256_m62.c b/contrib/bearssl/src/ec/ec_p256_m62.c index 3bcb95b5b19b..a4317905204d 100644 --- a/contrib/bearssl/src/ec/ec_p256_m62.c +++ b/contrib/bearssl/src/ec/ec_p256_m62.c @@ -580,7 +580,7 @@ f256_final_reduce(uint64_t *a) w = t[2] - cc; t[2] = w & MASK52; cc = w >> 63; - w = t[3] - BIT(36); + w = t[3] - BIT(36) - cc; t[3] = w & MASK52; cc = w >> 63; t[4] -= cc; diff --git a/contrib/bearssl/src/ec/ec_p256_m64.c b/contrib/bearssl/src/ec/ec_p256_m64.c index 5a7ea177408b..71a527c36955 100644 --- a/contrib/bearssl/src/ec/ec_p256_m64.c +++ b/contrib/bearssl/src/ec/ec_p256_m64.c @@ -99,6 +99,9 @@ f256_add(uint64_t *d, const uint64_t *a, const uint64_t *b) unsigned __int128 w; uint64_t t; + /* + * Do the addition, with an extra carry in t. + */ w = (unsigned __int128)a[0] + b[0]; d[0] = (uint64_t)w; w = (unsigned __int128)a[1] + b[1] + (w >> 64); @@ -110,7 +113,7 @@ f256_add(uint64_t *d, const uint64_t *a, const uint64_t *b) t = (uint64_t)(w >> 64); /* - * 2^256 = 2^224 - 2^192 - 2^96 + 1 in the field. + * Fold carry t, using: 2^256 = 2^224 - 2^192 - 2^96 + 1 mod p. */ w = (unsigned __int128)d[0] + t; d[0] = (uint64_t)w; @@ -119,8 +122,22 @@ f256_add(uint64_t *d, const uint64_t *a, const uint64_t *b) /* Here, carry "w >> 64" can only be 0 or -1 */ w = (unsigned __int128)d[2] - ((w >> 64) & 1); d[2] = (uint64_t)w; - /* Again, carry is 0 or -1 */ - d[3] += (uint64_t)(w >> 64) + (t << 32) - t; + /* Again, carry is 0 or -1. But there can be carry only if t = 1, + in which case the addition of (t << 32) - t is positive. */ + w = (unsigned __int128)d[3] - ((w >> 64) & 1) + (t << 32) - t; + d[3] = (uint64_t)w; + t = (uint64_t)(w >> 64); + + /* + * There can be an extra carry here, which we must fold again. + */ + w = (unsigned __int128)d[0] + t; + d[0] = (uint64_t)w; + w = (unsigned __int128)d[1] + (w >> 64) - (t << 32); + d[1] = (uint64_t)w; + w = (unsigned __int128)d[2] - ((w >> 64) & 1); + d[2] = (uint64_t)w; + d[3] += (t << 32) - t - (uint64_t)((w >> 64) & 1); #elif BR_UMUL128 @@ -140,6 +157,15 @@ f256_add(uint64_t *d, const uint64_t *a, const uint64_t *b) cc = _addcarry_u64(cc, d[0], 0, &d[0]); cc = _addcarry_u64(cc, d[1], -(t << 32), &d[1]); cc = _addcarry_u64(cc, d[2], -t, &d[2]); + cc = _addcarry_u64(cc, d[3], (t << 32) - (t << 1), &d[3]); + + /* + * We have to do it again if there still is a carry. + */ + t = cc; + cc = _addcarry_u64(cc, d[0], 0, &d[0]); + cc = _addcarry_u64(cc, d[1], -(t << 32), &d[1]); + cc = _addcarry_u64(cc, d[2], -t, &d[2]); (void)_addcarry_u64(cc, d[3], (t << 32) - (t << 1), &d[3]); #endif @@ -167,6 +193,7 @@ f256_sub(uint64_t *d, const uint64_t *a, const uint64_t *b) t = (uint64_t)(w >> 64) & 1; /* + * If there is a borrow (t = 1), then we must add the modulus * p = 2^256 - 2^224 + 2^192 + 2^96 - 1. */ w = (unsigned __int128)d[0] - t; @@ -177,6 +204,20 @@ f256_sub(uint64_t *d, const uint64_t *a, const uint64_t *b) w = (unsigned __int128)d[2] + (w >> 64); d[2] = (uint64_t)w; /* Again, carry is 0 or +1 */ + w = (unsigned __int128)d[3] + (w >> 64) - (t << 32) + t; + d[3] = (uint64_t)w; + t = (uint64_t)(w >> 64) & 1; + + /* + * There may be again a borrow, in which case we must add the + * modulus again. + */ + w = (unsigned __int128)d[0] - t; + d[0] = (uint64_t)w; + w = (unsigned __int128)d[1] + (t << 32) - ((w >> 64) & 1); + d[1] = (uint64_t)w; + w = (unsigned __int128)d[2] + (w >> 64); + d[2] = (uint64_t)w; d[3] += (uint64_t)(w >> 64) - (t << 32) + t; #elif BR_UMUL128 @@ -190,13 +231,23 @@ f256_sub(uint64_t *d, const uint64_t *a, const uint64_t *b) *** 1822 LINES SKIPPED *** From nobody Sun Apr 16 09:28:58 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzlHb0311z450CR; Sun, 16 Apr 2023 09:28: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 4PzlHZ5cn3z3kbK; Sun, 16 Apr 2023 09:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681637338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B136H5OjUTpW9PwHSzzSUlwwHAfyW2/9Jl/1mMYwYUI=; b=ZwjQ0tAhdxiG+pDYsLQXLD+cE5q/1God3O6hKBmQHTK9ZAY+3Jrcmm8xjqAf1hAXD3omKB 6pW7l8WcLVc0zgW8q859hKBqHM/juwPZmQBw98ciHAPa/qt2GEKAweWu1iOeUrPTp75Bhm ddVaK+GtrPVxW/whZfgRLYblN4/utC4H2MSJsP8kWIdJvnXgQ5+yvBwjEcIjdum0f1SLlg 8E5Mr/EIFp8GOnhYls8jROPfxmYmIqUVNqk4TW09aB8WcwHjnSTZMgQYO/SxhvQ2h6RKtu YeXxS/3tk7Y4bJ8zorMMvs41ALh/TIUEKU+4LOUNtFApoCLO/jMWyl9vJ1rwtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681637338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B136H5OjUTpW9PwHSzzSUlwwHAfyW2/9Jl/1mMYwYUI=; b=jxhsX1G5va0TGM7J7SI74485Jj5ekKn11Pt28ulAAyeZiDji0Z4aEtikxaMr+z48Nq6VHy 4kGkQuZsBPHTh443NQ/Ag466vA3LxJ4joa0HQPGlGMivYzCxwEgh3/za77z8ic8J9gbcDv RLTtpfjF2Vy01Wh5LYJtVOsgkptA/ejlKBnov1hNo9dUkj/bum7xiv9oC1YF5/9ByBzxrv vlHob2oliRqQLqb+KgcV2fGJ5lWjwCDsbAJxjwZtD1++shJxIF5pj90eATJ+BLJZHoal1G 1gimQ5Ql1w5V8Kh3WFwim3W8FZQaLJsLv95pIV2xBJObxKyfOZYz2qsY/crCgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681637338; a=rsa-sha256; cv=none; b=EKKxpx708dfETQseP0WZrK1W6JnjxOGuyqPmntAuDXMjpOrQbWPxY2ucePxWkL3++1z4BO EgXAw/udBRp+TF/picTirEuWMj+Q30INpM6obRbMkTK6nHAM720TSuqI0RMTQIse1bZ2Fc TywOTfM5q9oBekukJIP9f+g3KioOKdzrRBdg70T36+zu5lS70AC2rZJNFoo3s6xdkxsvUx h6oNhh104O7c1vnyPoBJ8m1bf51hkOodv0jrlk3XXZ7aohLoPnXRT5NpVF3r077j4bA3OY OOpv4lg3rZ79Lwah6x+/GA0ulZ53nb/1gOOHLVpQYmBlNHGJU/6ZSmOLHMEo0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PzlHZ4WTMzjDT; Sun, 16 Apr 2023 09:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33G9SwUH073933; Sun, 16 Apr 2023 09:28:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33G9SwVm073932; Sun, 16 Apr 2023 09:28:58 GMT (envelope-from git) Date: Sun, 16 Apr 2023 09:28:58 GMT Message-Id: <202304160928.33G9SwVm073932@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: 389449887c64 - stable/13 - Merge commit 'd84e570b54961e8874bbd8de25635eb96be0977e' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 389449887c6426def0510c5861e0af9973f1ed08 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=389449887c6426def0510c5861e0af9973f1ed08 commit 389449887c6426def0510c5861e0af9973f1ed08 Author: Simon J. Gerraty AuthorDate: 2023-02-21 06:13:27 +0000 Commit: Gordon Bergling CommitDate: 2023-04-16 07:27:42 +0000 Merge commit 'd84e570b54961e8874bbd8de25635eb96be0977e' This unbreaks the build for WITH_BEARSSL=1 on stable/13. (cherry picked from commit 9c474dc51b0b09ff81339caee6772e454dd470e4) --- contrib/bearssl/flist | 459 ---------------------------- contrib/bearssl/inc/bearssl.h | 13 + contrib/bearssl/src/rsa/rsa_i62_keygen.c | 4 +- contrib/bearssl/src/rsa/rsa_pss_sig_unpad.c | 2 +- 4 files changed, 16 insertions(+), 462 deletions(-) diff --git a/contrib/bearssl/flist b/contrib/bearssl/flist deleted file mode 100644 index 9751ad231065..000000000000 --- a/contrib/bearssl/flist +++ /dev/null @@ -1,459 +0,0 @@ -T0/BlobWriter.cs -T0/CPU.cs -T0/CodeElement.cs -T0/CodeElementJump.cs -T0/CodeElementUInt.cs -T0/CodeElementUIntExpr.cs -T0/CodeElementUIntInt.cs -T0/CodeElementUIntUInt.cs -T0/ConstData.cs -T0/Opcode.cs -T0/OpcodeCall.cs -T0/OpcodeConst.cs -T0/OpcodeGetLocal.cs -T0/OpcodeJump.cs -T0/OpcodeJumpIf.cs -T0/OpcodeJumpIfNot.cs -T0/OpcodeJumpUncond.cs -T0/OpcodePutLocal.cs -T0/OpcodeRet.cs -T0/SType.cs -T0/T0Comp.cs -T0/TPointerBase.cs -T0/TPointerBlob.cs -T0/TPointerExpr.cs -T0/TPointerNull.cs -T0/TPointerXT.cs -T0/TValue.cs -T0/Word.cs -T0/WordBuilder.cs -T0/WordData.cs -T0/WordInterpreted.cs -T0/WordNative.cs -T0/kern.t0 -conf/Unix.mk -conf/Unix32.mk -conf/UnixClang.mk -conf/Win.mk -conf/samd20.mk -inc/bearssl.h -inc/bearssl_aead.h -inc/bearssl_block.h -inc/bearssl_ec.h -inc/bearssl_hash.h -inc/bearssl_hmac.h -inc/bearssl_kdf.h -inc/bearssl_pem.h -inc/bearssl_prf.h -inc/bearssl_rand.h -inc/bearssl_rsa.h -inc/bearssl_ssl.h -inc/bearssl_x509.h -mk/Defaults.mk -mk/NMake.mk -mk/Rules.mk -mk/SingleUnix.mk -mk/mkT0.cmd -mk/mkT0.sh -mk/mkrules.sh -samples/README.txt -samples/cert-ee-ec+rsa.pem -samples/cert-ee-ec.pem -samples/cert-ee-rsa.pem -samples/cert-ica-ec.pem -samples/cert-ica-rsa.pem -samples/cert-root-ec.pem -samples/cert-root-rsa.pem -samples/chain-ec+rsa.h -samples/chain-ec.h -samples/chain-rsa.h -samples/client_basic.c -samples/custom_profile.c -samples/key-ec.h -samples/key-ee-ec.pem -samples/key-ee-rsa.pem -samples/key-ica-ec.pem -samples/key-ica-rsa.pem -samples/key-root-ec.pem -samples/key-root-rsa.pem -samples/key-rsa.h -samples/server_basic.c -src/aead/ccm.c -src/aead/eax.c -src/aead/gcm.c -src/codec/ccopy.c -src/codec/dec16be.c -src/codec/dec16le.c -src/codec/dec32be.c -src/codec/dec32le.c -src/codec/dec64be.c -src/codec/dec64le.c -src/codec/enc16be.c -src/codec/enc16le.c -src/codec/enc32be.c -src/codec/enc32le.c -src/codec/enc64be.c -src/codec/enc64le.c -src/codec/pemdec.c -src/codec/pemdec.t0 -src/codec/pemenc.c -src/config.h -src/ec/ec_all_m15.c -src/ec/ec_all_m31.c -src/ec/ec_c25519_i15.c -src/ec/ec_c25519_i31.c -src/ec/ec_c25519_m15.c -src/ec/ec_c25519_m31.c -src/ec/ec_c25519_m62.c -src/ec/ec_c25519_m64.c -src/ec/ec_curve25519.c -src/ec/ec_default.c -src/ec/ec_keygen.c -src/ec/ec_p256_m15.c -src/ec/ec_p256_m31.c -src/ec/ec_p256_m62.c -src/ec/ec_p256_m64.c -src/ec/ec_prime_i15.c -src/ec/ec_prime_i31.c -src/ec/ec_pubkey.c -src/ec/ec_secp256r1.c -src/ec/ec_secp384r1.c -src/ec/ec_secp521r1.c -src/ec/ecdsa_atr.c -src/ec/ecdsa_default_sign_asn1.c -src/ec/ecdsa_default_sign_raw.c -src/ec/ecdsa_default_vrfy_asn1.c -src/ec/ecdsa_default_vrfy_raw.c -src/ec/ecdsa_i15_bits.c -src/ec/ecdsa_i15_sign_asn1.c -src/ec/ecdsa_i15_sign_raw.c -src/ec/ecdsa_i15_vrfy_asn1.c -src/ec/ecdsa_i15_vrfy_raw.c -src/ec/ecdsa_i31_bits.c -src/ec/ecdsa_i31_sign_asn1.c -src/ec/ecdsa_i31_sign_raw.c -src/ec/ecdsa_i31_vrfy_asn1.c -src/ec/ecdsa_i31_vrfy_raw.c -src/ec/ecdsa_rta.c -src/hash/dig_oid.c -src/hash/dig_size.c -src/hash/ghash_ctmul.c -src/hash/ghash_ctmul32.c -src/hash/ghash_ctmul64.c -src/hash/ghash_pclmul.c -src/hash/ghash_pwr8.c -src/hash/md5.c -src/hash/md5sha1.c -src/hash/mgf1.c -src/hash/multihash.c -src/hash/sha1.c -src/hash/sha2big.c -src/hash/sha2small.c -src/inner.h -src/int/i15_add.c -src/int/i15_bitlen.c -src/int/i15_decmod.c -src/int/i15_decode.c -src/int/i15_decred.c -src/int/i15_encode.c -src/int/i15_fmont.c -src/int/i15_iszero.c -src/int/i15_moddiv.c -src/int/i15_modpow.c -src/int/i15_modpow2.c -src/int/i15_montmul.c -src/int/i15_mulacc.c -src/int/i15_muladd.c -src/int/i15_ninv15.c -src/int/i15_reduce.c -src/int/i15_rshift.c -src/int/i15_sub.c -src/int/i15_tmont.c -src/int/i31_add.c -src/int/i31_bitlen.c -src/int/i31_decmod.c -src/int/i31_decode.c -src/int/i31_decred.c -src/int/i31_encode.c -src/int/i31_fmont.c -src/int/i31_iszero.c -src/int/i31_moddiv.c -src/int/i31_modpow.c -src/int/i31_modpow2.c -src/int/i31_montmul.c -src/int/i31_mulacc.c -src/int/i31_muladd.c -src/int/i31_ninv31.c -src/int/i31_reduce.c -src/int/i31_rshift.c -src/int/i31_sub.c -src/int/i31_tmont.c -src/int/i32_add.c -src/int/i32_bitlen.c -src/int/i32_decmod.c -src/int/i32_decode.c -src/int/i32_decred.c -src/int/i32_div32.c -src/int/i32_encode.c -src/int/i32_fmont.c -src/int/i32_iszero.c -src/int/i32_modpow.c -src/int/i32_montmul.c -src/int/i32_mulacc.c -src/int/i32_muladd.c -src/int/i32_ninv32.c -src/int/i32_reduce.c -src/int/i32_sub.c -src/int/i32_tmont.c -src/int/i62_modpow2.c -src/kdf/hkdf.c -src/kdf/shake.c -src/mac/hmac.c -src/mac/hmac_ct.c -src/rand/aesctr_drbg.c -src/rand/hmac_drbg.c -src/rand/sysrng.c -src/rsa/rsa_default_keygen.c -src/rsa/rsa_default_modulus.c -src/rsa/rsa_default_oaep_decrypt.c -src/rsa/rsa_default_oaep_encrypt.c -src/rsa/rsa_default_pkcs1_sign.c -src/rsa/rsa_default_pkcs1_vrfy.c -src/rsa/rsa_default_priv.c -src/rsa/rsa_default_privexp.c -src/rsa/rsa_default_pss_sign.c -src/rsa/rsa_default_pss_vrfy.c -src/rsa/rsa_default_pub.c -src/rsa/rsa_default_pubexp.c -src/rsa/rsa_i15_keygen.c -src/rsa/rsa_i15_modulus.c -src/rsa/rsa_i15_oaep_decrypt.c -src/rsa/rsa_i15_oaep_encrypt.c -src/rsa/rsa_i15_pkcs1_sign.c -src/rsa/rsa_i15_pkcs1_vrfy.c -src/rsa/rsa_i15_priv.c -src/rsa/rsa_i15_privexp.c -src/rsa/rsa_i15_pss_sign.c -src/rsa/rsa_i15_pss_vrfy.c -src/rsa/rsa_i15_pub.c -src/rsa/rsa_i15_pubexp.c -src/rsa/rsa_i31_keygen.c -src/rsa/rsa_i31_keygen_inner.c -src/rsa/rsa_i31_modulus.c -src/rsa/rsa_i31_oaep_decrypt.c -src/rsa/rsa_i31_oaep_encrypt.c -src/rsa/rsa_i31_pkcs1_sign.c -src/rsa/rsa_i31_pkcs1_vrfy.c -src/rsa/rsa_i31_priv.c -src/rsa/rsa_i31_privexp.c -src/rsa/rsa_i31_pss_sign.c -src/rsa/rsa_i31_pss_vrfy.c -src/rsa/rsa_i31_pub.c -src/rsa/rsa_i31_pubexp.c -src/rsa/rsa_i32_oaep_decrypt.c -src/rsa/rsa_i32_oaep_encrypt.c -src/rsa/rsa_i32_pkcs1_sign.c -src/rsa/rsa_i32_pkcs1_vrfy.c -src/rsa/rsa_i32_priv.c -src/rsa/rsa_i32_pss_sign.c -src/rsa/rsa_i32_pss_vrfy.c -src/rsa/rsa_i32_pub.c -src/rsa/rsa_i62_keygen.c -src/rsa/rsa_i62_oaep_decrypt.c -src/rsa/rsa_i62_oaep_encrypt.c -src/rsa/rsa_i62_pkcs1_sign.c -src/rsa/rsa_i62_pkcs1_vrfy.c -src/rsa/rsa_i62_priv.c -src/rsa/rsa_i62_pss_sign.c -src/rsa/rsa_i62_pss_vrfy.c -src/rsa/rsa_i62_pub.c -src/rsa/rsa_oaep_pad.c -src/rsa/rsa_oaep_unpad.c -src/rsa/rsa_pkcs1_sig_pad.c -src/rsa/rsa_pkcs1_sig_unpad.c -src/rsa/rsa_pss_sig_pad.c -src/rsa/rsa_pss_sig_unpad.c -src/rsa/rsa_ssl_decrypt.c -src/settings.c -src/ssl/prf.c -src/ssl/prf_md5sha1.c -src/ssl/prf_sha256.c -src/ssl/prf_sha384.c -src/ssl/ssl_ccert_single_ec.c -src/ssl/ssl_ccert_single_rsa.c -src/ssl/ssl_client.c -src/ssl/ssl_client_default_rsapub.c -src/ssl/ssl_client_full.c -src/ssl/ssl_engine.c -src/ssl/ssl_engine_default_aescbc.c -src/ssl/ssl_engine_default_aesccm.c -src/ssl/ssl_engine_default_aesgcm.c -src/ssl/ssl_engine_default_chapol.c -src/ssl/ssl_engine_default_descbc.c -src/ssl/ssl_engine_default_ec.c -src/ssl/ssl_engine_default_ecdsa.c -src/ssl/ssl_engine_default_rsavrfy.c -src/ssl/ssl_hashes.c -src/ssl/ssl_hs_client.c -src/ssl/ssl_hs_client.t0 -src/ssl/ssl_hs_common.t0 -src/ssl/ssl_hs_server.c -src/ssl/ssl_hs_server.t0 -src/ssl/ssl_io.c -src/ssl/ssl_keyexport.c -src/ssl/ssl_lru.c -src/ssl/ssl_rec_cbc.c -src/ssl/ssl_rec_ccm.c -src/ssl/ssl_rec_chapol.c -src/ssl/ssl_rec_gcm.c -src/ssl/ssl_scert_single_ec.c -src/ssl/ssl_scert_single_rsa.c -src/ssl/ssl_server.c -src/ssl/ssl_server_full_ec.c -src/ssl/ssl_server_full_rsa.c -src/ssl/ssl_server_mine2c.c -src/ssl/ssl_server_mine2g.c -src/ssl/ssl_server_minf2c.c -src/ssl/ssl_server_minf2g.c -src/ssl/ssl_server_minr2g.c -src/ssl/ssl_server_minu2g.c -src/ssl/ssl_server_minv2g.c -src/symcipher/aes_big_cbcdec.c -src/symcipher/aes_big_cbcenc.c -src/symcipher/aes_big_ctr.c -src/symcipher/aes_big_ctrcbc.c -src/symcipher/aes_big_dec.c -src/symcipher/aes_big_enc.c -src/symcipher/aes_common.c -src/symcipher/aes_ct.c -src/symcipher/aes_ct64.c -src/symcipher/aes_ct64_cbcdec.c -src/symcipher/aes_ct64_cbcenc.c -src/symcipher/aes_ct64_ctr.c -src/symcipher/aes_ct64_ctrcbc.c -src/symcipher/aes_ct64_dec.c -src/symcipher/aes_ct64_enc.c -src/symcipher/aes_ct_cbcdec.c -src/symcipher/aes_ct_cbcenc.c -src/symcipher/aes_ct_ctr.c -src/symcipher/aes_ct_ctrcbc.c -src/symcipher/aes_ct_dec.c -src/symcipher/aes_ct_enc.c -src/symcipher/aes_pwr8.c -src/symcipher/aes_pwr8_cbcdec.c -src/symcipher/aes_pwr8_cbcenc.c -src/symcipher/aes_pwr8_ctr.c -src/symcipher/aes_pwr8_ctrcbc.c -src/symcipher/aes_small_cbcdec.c -src/symcipher/aes_small_cbcenc.c -src/symcipher/aes_small_ctr.c -src/symcipher/aes_small_ctrcbc.c -src/symcipher/aes_small_dec.c -src/symcipher/aes_small_enc.c -src/symcipher/aes_x86ni.c -src/symcipher/aes_x86ni_cbcdec.c -src/symcipher/aes_x86ni_cbcenc.c -src/symcipher/aes_x86ni_ctr.c -src/symcipher/aes_x86ni_ctrcbc.c -src/symcipher/chacha20_ct.c -src/symcipher/chacha20_sse2.c -src/symcipher/des_ct.c -src/symcipher/des_ct_cbcdec.c -src/symcipher/des_ct_cbcenc.c -src/symcipher/des_support.c -src/symcipher/des_tab.c -src/symcipher/des_tab_cbcdec.c -src/symcipher/des_tab_cbcenc.c -src/symcipher/poly1305_ctmul.c -src/symcipher/poly1305_ctmul32.c -src/symcipher/poly1305_ctmulq.c -src/symcipher/poly1305_i15.c -src/x509/asn1.t0 -src/x509/asn1enc.c -src/x509/encode_ec_pk8der.c -src/x509/encode_ec_rawder.c -src/x509/encode_rsa_pk8der.c -src/x509/encode_rsa_rawder.c -src/x509/skey_decoder.c -src/x509/skey_decoder.t0 -src/x509/x509_decoder.c -src/x509/x509_decoder.t0 -src/x509/x509_knownkey.c -src/x509/x509_minimal.c -src/x509/x509_minimal.t0 -src/x509/x509_minimal_full.c -test/test_crypto.c -test/test_math.c -test/test_speed.c -test/test_x509.c -test/x509/alltests.txt -test/x509/dn-ee.der -test/x509/dn-ica1.der -test/x509/dn-ica2.der -test/x509/dn-root-new.der -test/x509/dn-root.der -test/x509/ee-badsig1.crt -test/x509/ee-badsig2.crt -test/x509/ee-cp1.crt -test/x509/ee-cp2.crt -test/x509/ee-cp3.crt -test/x509/ee-cp4.crt -test/x509/ee-dates.crt -test/x509/ee-md5.crt -test/x509/ee-names.crt -test/x509/ee-names2.crt -test/x509/ee-names3.crt -test/x509/ee-names4.crt -test/x509/ee-p256-sha1.crt -test/x509/ee-p256-sha224.crt -test/x509/ee-p256-sha256.crt -test/x509/ee-p256-sha384.crt -test/x509/ee-p256-sha512.crt -test/x509/ee-p256.crt -test/x509/ee-p384.crt -test/x509/ee-p521.crt -test/x509/ee-sha1.crt -test/x509/ee-sha224.crt -test/x509/ee-sha384.crt -test/x509/ee-sha512.crt -test/x509/ee-trailing.crt -test/x509/ee.crt -test/x509/ica1-1016.crt -test/x509/ica1-1017.crt -test/x509/ica1-4096.crt -test/x509/ica1-p256.crt -test/x509/ica1-p384.crt -test/x509/ica1-p521.crt -test/x509/ica1.crt -test/x509/ica2-1016.crt -test/x509/ica2-1017.crt -test/x509/ica2-4096.crt -test/x509/ica2-notCA.crt -test/x509/ica2-p256.crt -test/x509/ica2-p384.crt -test/x509/ica2-p521.crt -test/x509/ica2.crt -test/x509/junk.crt -test/x509/names.crt -test/x509/root-p256.crt -test/x509/root-p384.crt -test/x509/root-p521.crt -test/x509/root.crt -tools/brssl.c -tools/brssl.h -tools/certs.c -tools/chain.c -tools/client.c -tools/errors.c -tools/files.c -tools/impl.c -tools/keys.c -tools/names.c -tools/server.c -tools/skey.c -tools/sslio.c -tools/ta.c -tools/twrch.c -tools/vector.c -tools/verify.c -tools/xmem.c diff --git a/contrib/bearssl/inc/bearssl.h b/contrib/bearssl/inc/bearssl.h index 4f4797cf7937..310edb258d8d 100644 --- a/contrib/bearssl/inc/bearssl.h +++ b/contrib/bearssl/inc/bearssl.h @@ -137,6 +137,10 @@ #include "bearssl_x509.h" #include "bearssl_pem.h" +#ifdef __cplusplus +extern "C" { +#endif + /** \brief Type for a configuration option. * * A "configuration option" is a value that is selected when the BearSSL @@ -167,4 +171,13 @@ typedef struct { */ const br_config_option *br_get_config(void); +/* ======================================================================= */ + +/** \brief Version feature: support for time callback. */ +#define BR_FEATURE_X509_TIME_CALLBACK 1 + +#ifdef __cplusplus +} +#endif + #endif diff --git a/contrib/bearssl/src/rsa/rsa_i62_keygen.c b/contrib/bearssl/src/rsa/rsa_i62_keygen.c index 8f55c3759082..992fe97e6ff1 100644 --- a/contrib/bearssl/src/rsa/rsa_i62_keygen.c +++ b/contrib/bearssl/src/rsa/rsa_i62_keygen.c @@ -40,7 +40,7 @@ br_rsa_i62_keygen(const br_prng_class **rng, /* see bearssl_rsa.h */ br_rsa_keygen -br_rsa_i62_keygen_get() +br_rsa_i62_keygen_get(void) { return &br_rsa_i62_keygen; } @@ -49,7 +49,7 @@ br_rsa_i62_keygen_get() /* see bearssl_rsa.h */ br_rsa_keygen -br_rsa_i62_keygen_get() +br_rsa_i62_keygen_get(void) { return 0; } diff --git a/contrib/bearssl/src/rsa/rsa_pss_sig_unpad.c b/contrib/bearssl/src/rsa/rsa_pss_sig_unpad.c index a9f8ca3ac10f..0c6ae9990a09 100644 --- a/contrib/bearssl/src/rsa/rsa_pss_sig_unpad.c +++ b/contrib/bearssl/src/rsa/rsa_pss_sig_unpad.c @@ -114,7 +114,7 @@ br_rsa_pss_sig_unpad(const br_hash_class *hf_data, * in the string. */ for (u = 0; u < hash_len; u ++) { - r |= tmp[u] ^ x[(xlen - salt_len - 1) + u]; + r |= tmp[u] ^ x[(xlen - hash_len - 1) + u]; } return EQ0(r); From nobody Sun Apr 16 10:57:40 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PznFw46hbz457g3; Sun, 16 Apr 2023 10: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 4PznFw3Qnhz3qLg; Sun, 16 Apr 2023 10: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=1681642660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TjDxOvUp4f9Z/sF2tLat6cv2EIM0cdwDodDxU598VVU=; b=WZyyrSR8BSPt3CJZzu0YlJNf3XPMmVVs1+UHWiONOuEpPyXtlRpPdWXgKvWTYWtin6l71P Um6HolADwixg83r3s5feWbF9P1HSadqwMcyrtkCfbMHQX5e3300OR0gYs0+BGZHYASVDVI VY0TdiuQypqsrMWUO/bdrJjiTVZ1deEcA7WJXBEbkjHinuBagLndvaCN5LIERXdqIQHQ9m WQEZvk7tQjEX+1jDizosxutjkMmhyHr808WrOch8HlrVjoS4WaEWw/RlAd1GDMyyV9yrXl 2vq5SXI3R2LADbv1O0jrvINNslfinJPQFf2MspOKG620GjdFM24cIppMbOikWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681642660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TjDxOvUp4f9Z/sF2tLat6cv2EIM0cdwDodDxU598VVU=; b=OI+oCour8qymq0dvCW4lhgkBBFoWDaXQnJGcXJro29PJ9IUjLRSerKfcMjaM9HSYxMHwT1 EYXMkc7Oy2i9cPb8uBf0YPr+TFewv9EpBW1MiIjAahAFKHodKS2Fs6Ir5H51n+VgAPJl1F JW6h+LU+mn0pZvLbQmvkOrTEk7aiGMazi2+Ryev5Jx/bPJlTUTnFgJ5xqQsXfOQzGOqiiy Y0n66TsBPdsNEi6syfpir0lju/1pLrAARknznTe46TYZb64NViS6uyoJzHZ6esDJCioqWS Jz3t2NV/oxy44C1a9piRTzIVPcb+dgr4+FAiPfcfUqEeIq8xrRPVMOhZCGU+mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681642660; a=rsa-sha256; cv=none; b=FjhZOcCb+Jm2CUgK/ct8SwhcWtFqFTtAqZF0lF3spo+PGgyjg8kLDiQFRLix58eohACnBD tgb9PcY0Jn5CttCc/aHsXirGrcsvml7Zqupx47QPeRv3M2qvjQ6GBFlzgj015KqYWQFXe7 L3tEmNBn1em5+djStSdDicRBazDrVFKm9TNjrMUOmyl6V1btq5cMX/nTnELyN+GqLn4f4p 4yKcHVPqSR7DUqEe+nyhR4t+GpYrrsRjCTCCirX3K7v7hksqkZzJc4SRzv70n7pWdS8Vta nxcks87xUNc4llOY5yXdErCyj9SWLxKmMbPBtuTvbaFTLf2+fXYzc9c4AQE7GQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PznFw2D4DzktK; Sun, 16 Apr 2023 10:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GAveSj021511; Sun, 16 Apr 2023 10:57:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GAvenn021510; Sun, 16 Apr 2023 10:57:40 GMT (envelope-from git) Date: Sun, 16 Apr 2023 10:57:40 GMT Message-Id: <202304161057.33GAvenn021510@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: 074babfb2812 - stable/13 - DEBUG_VFS_LOCKS: use witness if available List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 074babfb2812c12caf99e3286f0a6c688ecf45bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=074babfb2812c12caf99e3286f0a6c688ecf45bf commit 074babfb2812c12caf99e3286f0a6c688ecf45bf Author: Konstantin Belousov AuthorDate: 2023-04-08 06:15:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 10:45:58 +0000 DEBUG_VFS_LOCKS: use witness if available (cherry picked from commit 7b6fe2428a97921e8df882d0a24b87094c37b468) --- sys/kern/vfs_lookup.c | 1 + sys/kern/vfs_subr.c | 16 +++++++++++++--- sys/sys/vnode.h | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 3ded2180ac82..b7ce93f3702d 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -161,6 +161,7 @@ nameiinit(void *dummy __unused) UMA_ALIGN_PTR, 0); vfs_vector_op_register(&crossmp_vnodeops); getnewvnode("crossmp", NULL, &crossmp_vnodeops, &vp_crossmp); + vp_crossmp->v_irflag |= VIRF_CROSSMP; } SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nameiinit, NULL); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 67f707dd9edb..c4d8ceac7e2b 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -5526,14 +5526,18 @@ assert_vi_unlocked(struct vnode *vp, const char *str) void assert_vop_locked(struct vnode *vp, const char *str) { - int locked; - if (KERNEL_PANICKED() || vp == NULL) return; - locked = VOP_ISLOCKED(vp); +#ifdef WITNESS + if ((vp->v_irflag & VIRF_CROSSMP) == 0) + witness_assert(&vp->v_vnlock->lock_object, LA_LOCKED, + __FILE__, __LINE__); +#else + int locked = VOP_ISLOCKED(vp); if (locked == 0 || locked == LK_EXCLOTHER) vfs_badlock("is not locked but should be", str, vp); +#endif } void @@ -5542,8 +5546,14 @@ assert_vop_unlocked(struct vnode *vp, const char *str) if (KERNEL_PANICKED() || vp == NULL) return; +#ifdef WITNESS + if ((vp->v_irflag & VIRF_CROSSMP) == 0) + witness_assert(&vp->v_vnlock->lock_object, LA_UNLOCKED, + __FILE__, __LINE__); +#else if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) vfs_badlock("is locked but should not be", str, vp); +#endif } void diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 2011f429141c..37cafdb0d5ae 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -248,6 +248,7 @@ struct xvnode { #define VIRF_PGREAD 0x0002 /* Direct reads from the page cache are permitted, never cleared once set */ #define VIRF_MOUNTPOINT 0x0004 /* This vnode is mounted on */ +#define VIRF_CROSSMP 0x0010 /* Cross-mp vnode, no locking */ #define VI_TEXT_REF 0x0001 /* Text ref grabbed use ref */ #define VI_MOUNT 0x0002 /* Mount in progress */ From nobody Sun Apr 16 10:57:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PznFy4Krdz457ZB; Sun, 16 Apr 2023 10:57: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 4PznFx484sz3qBG; Sun, 16 Apr 2023 10:57:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681642661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7WgI7X7w1QDfGmPgqJ7ZILn9RDUqUY8c8YJrlVbnWi4=; b=cZe2ljYC9/CtnFhSIi1umOveAQrRC6VkOfFQys6KaGnY+JDSeRu/gaWexbk0nOPYAwsuI2 Zeqbed+iyau3Gbo0kueU2/zbecRlatP5BKKljV/0LSjoM63oEMl8UqgLSOkeMaSSNUuv/M ywAbDCoF32+2JYD3wFiqLhvukNC8bfhHdUIzz6K1oyHZ5XkBa29CxP7zfsQ9o4NF5QhuV/ BrJslhKnPos/t5ZuFFUaOKeussXvoW07CBQepnWe2nyj14yn3B3J7qyN9vjmVcEfVp+5uB 1EBHxuhHb7fzGlXDv866cSWvCvjz0Y+deYOkC/rOf9dLaVz9XMMkGlfvFGjlMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681642661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7WgI7X7w1QDfGmPgqJ7ZILn9RDUqUY8c8YJrlVbnWi4=; b=adgr0m4kcQAZI77EMdmonM4bgQLmAnx43OdUzB5f9SsrzcymsbL+7tQyuh7YttXwH+Z9Za 7iZuezDDLzwL2k7M/W5z3bk5e8cDl9Ac1o5mhZLHdJ6HkSXgxbstYirQDkOiCSp9II3ugt tptMlZhJpDt98El5C68nxjsj5ZoC8FNwG/mU3mguZo8BgiBPUGniiKjy0qX2xY5f8mPyxA timUjH36oH1Rbnsb3ViTGDM1cWh91huoD4lV2t5lupT8dK1wmvajjy+XxJ0O4bM0CW7B2E ceCzIHwjQqP3vnMfVjnFLwrokZPQY23mvRDuV0qZp1emciqGjak1s/ievBFKjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681642661; a=rsa-sha256; cv=none; b=a3K4t0stN8E66tngNte+fTo8SvsQmyapURLcRn9emMouOIW5HDH/NqYITRyaiD2CZfBMV0 1VGFlsoYyibSNw8B4bPZR0O4PZLThFsupItXyZEPP/B7pTGMhgqV15nurgcjYVPpWJsNcF KfqisU51cNf39RzoMoAgqctsaK6gXVSGgaOOL1fgNH+L0okQ6ntIW8wlLHYBpo/C6FLSE6 q/izXqTCgofKftkjrZWksDXoesF1g3gOz5wuYprCc4A8d0Yx6r0MaoqydFa1/7p2+5diT8 /0KUjJfK0dHrATQdbsn/F5gRsXSzcLEN9iWuuU/oxaIcNGTWmE34EnGnhF7qow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PznFx2vG4zl7F; Sun, 16 Apr 2023 10:57:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GAvfNS021536; Sun, 16 Apr 2023 10:57:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GAvfWV021535; Sun, 16 Apr 2023 10:57:41 GMT (envelope-from git) Date: Sun, 16 Apr 2023 10:57:41 GMT Message-Id: <202304161057.33GAvfWV021535@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: 41959beeae1f - stable/13 - Add witness_is_owned(9) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 41959beeae1f463ab0421510cb28f6d77e57a61a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=41959beeae1f463ab0421510cb28f6d77e57a61a commit 41959beeae1f463ab0421510cb28f6d77e57a61a Author: Konstantin Belousov AuthorDate: 2023-04-10 15:54:58 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 10:45:58 +0000 Add witness_is_owned(9) (cherry picked from commit 75fc6f86c38807f1fb305c065c6affcf7617b029) --- sys/kern/subr_witness.c | 58 ++++++++++++++++++++++++++++++++++++++++--------- sys/sys/lock.h | 1 + 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index c849a191bf16..fe2e11c3bea5 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -2425,6 +2425,32 @@ witness_restore(struct lock_object *lock, const char *file, int line) instance->li_line = line; } +static bool +witness_find_instance(const struct lock_object *lock, + struct lock_instance **instance) +{ +#ifdef INVARIANT_SUPPORT + struct lock_class *class; + + if (lock->lo_witness == NULL || witness_watch < 1 || KERNEL_PANICKED()) + return (false); + class = LOCK_CLASS(lock); + if ((class->lc_flags & LC_SLEEPLOCK) != 0) { + *instance = find_instance(curthread->td_sleeplocks, lock); + return (true); + } else if ((class->lc_flags & LC_SPINLOCK) != 0) { + *instance = find_instance(PCPU_GET(spinlocks), lock); + return (true); + } else { + kassert_panic("Lock (%s) %s is not sleep or spin!", + class->lc_name, lock->lo_name); + return (false); + } +#else + return (false); +#endif +} + void witness_assert(const struct lock_object *lock, int flags, const char *file, int line) @@ -2433,18 +2459,9 @@ witness_assert(const struct lock_object *lock, int flags, const char *file, struct lock_instance *instance; struct lock_class *class; - if (lock->lo_witness == NULL || witness_watch < 1 || KERNEL_PANICKED()) + if (!witness_find_instance(lock, &instance)) return; class = LOCK_CLASS(lock); - if ((class->lc_flags & LC_SLEEPLOCK) != 0) - instance = find_instance(curthread->td_sleeplocks, lock); - else if ((class->lc_flags & LC_SPINLOCK) != 0) - instance = find_instance(PCPU_GET(spinlocks), lock); - else { - kassert_panic("Lock (%s) %s is not sleep or spin!", - class->lc_name, lock->lo_name); - return; - } switch (flags) { case LA_UNLOCKED: if (instance != NULL) @@ -2497,6 +2514,27 @@ witness_assert(const struct lock_object *lock, int flags, const char *file, #endif /* INVARIANT_SUPPORT */ } +/* + * Checks the ownership of the lock by curthread, consulting the witness list. + * Returns: + * 0 if witness is disabled or did not work + * -1 if not owned + * 1 if owned + */ +int +witness_is_owned(const struct lock_object *lock) +{ +#ifdef INVARIANT_SUPPORT + struct lock_instance *instance; + + if (!witness_find_instance(lock, &instance)) + return (0); + return (instance == NULL ? -1 : 1); +#else + return (0); +#endif +} + static void witness_setflag(struct lock_object *lock, int flag, int set) { diff --git a/sys/sys/lock.h b/sys/sys/lock.h index 2db38f9df89a..4031f20946c0 100644 --- a/sys/sys/lock.h +++ b/sys/sys/lock.h @@ -237,6 +237,7 @@ int witness_list_locks(struct lock_list_entry **, int (*)(const char *, ...)); int witness_warn(int, struct lock_object *, const char *, ...); void witness_assert(const struct lock_object *, int, const char *, int); +int witness_is_owned(const struct lock_object *lock); void witness_display_spinlock(struct lock_object *, struct thread *, int (*)(const char *, ...)); int witness_line(struct lock_object *); From nobody Sun Apr 16 10:57:42 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PznFz0jNRz457lC; Sun, 16 Apr 2023 10:57: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 4PznFy5KPLz3q7r; Sun, 16 Apr 2023 10:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681642662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7OnZXK0Ehd0KMwz6zvEDibDt68n1rN2GVP5QOpMJvUc=; b=mpqMLM0hq5FDRHElmUD2oXRB4E65yVxtLOOR2ORLwCXYXOImn7gG7sprs98i5skdmsAiKZ troWvLxnI2iH4FwYQvO4kvHgK/kNPXSVBoHQ/aJHKka9koW/N8VsjqglC5rpB5Z+hYg91i lblnblKuAtQRdQV2MGizu1prdj79TIbfcTjLhgsNZHzdCCSmjgeCXJur90qa7q4XjHSr0u V2ozzM6tWJyZbhpHqcfvB0n+r+coicW+RjB3rDP6MzL4sgaS0/4SXhskKZqtET1bFO/51W keeimkKJ315ZTz8zoQNddnon8jFOnsjiUslp41MovZhttSz0FsPe4MGr44FiYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681642662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7OnZXK0Ehd0KMwz6zvEDibDt68n1rN2GVP5QOpMJvUc=; b=XdCy4M0rckoD65Tc16jQ6LsxAKh/N+lRD2xglVlHv7KXIggT7Ctib2sw+3xGnkLvzKn2Kz FaXFDcZ3DRw75rs2SuI7AbT8M/J6EaLpVBX2mFbGfr4KFEhBFkQWo52ITxZSn4BVTyIMI/ rJGT2xyNgJK9wE2dVb0jFPHVVGDwfvdyt1SRKtVt0a77kHpjo3oOwS42Oi0ws0ycDKQIIT X54sq8TZ+mQOLkckc0+wCRTACAzEu9UFHxEx2+znDfPgyPuZJx8HlQV+jI4yfxZqHHqNqA iDcvD7dMGGGr9AuX+cXISUnDqcNraT8/tirzH8w7ifF0JTf78/q+0Q2JHeqDYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681642662; a=rsa-sha256; cv=none; b=HsaU1K5wFKGBXbIKS306EQNMcjSqJL5D5MoV8AQrHR00uoO9TXHiubiEVOAKgkMX1ckwYd Af6QR3eiA9e5nvStEIH//0BxXINwrTuvvW3JLS7BQCaEx9LvOMDL7YsnqNZpLk2jQCp2KD lg+qLNlOQ6vHuED38kMtkcItf5Fstv7yZ1Vzzw6alUyxiN+UtJGquDnno5URa8ZLmx20BD qM/sZkKecSm/gyc5qR+zeieXJIM8EwRueLmdlVRkKFLXxotq1VOm38h+S4TCaKfyIAXWhR KXAFQKT1VIXoOwdeQPu1FtrXu/saNEVbcA68fcq/c4paHdo7n/GSeQ4h/4by8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PznFy43Whzl7G; Sun, 16 Apr 2023 10:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GAvgX9021555; Sun, 16 Apr 2023 10:57:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GAvg7B021554; Sun, 16 Apr 2023 10:57:42 GMT (envelope-from git) Date: Sun, 16 Apr 2023 10:57:42 GMT Message-Id: <202304161057.33GAvg7B021554@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: 99da9d65a5e0 - stable/13 - DEBUG_VFS_LOCKS: restore diagnostic for the witness use case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 99da9d65a5e0db8f6563fee7fc576c1de4f84363 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=99da9d65a5e0db8f6563fee7fc576c1de4f84363 commit 99da9d65a5e0db8f6563fee7fc576c1de4f84363 Author: Konstantin Belousov AuthorDate: 2023-04-10 08:52:43 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 10:45:58 +0000 DEBUG_VFS_LOCKS: restore diagnostic for the witness use case (cherry picked from commit c53e990b8d0444b5ad59ddb18742a71434e30ee2) --- sys/kern/vfs_subr.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index c4d8ceac7e2b..7ebd63447caa 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -5530,14 +5530,13 @@ assert_vop_locked(struct vnode *vp, const char *str) return; #ifdef WITNESS - if ((vp->v_irflag & VIRF_CROSSMP) == 0) - witness_assert(&vp->v_vnlock->lock_object, LA_LOCKED, - __FILE__, __LINE__); + if ((vp->v_irflag & VIRF_CROSSMP) == 0 && + witness_is_owned(&vp->v_vnlock->lock_object) == -1) #else int locked = VOP_ISLOCKED(vp); if (locked == 0 || locked == LK_EXCLOTHER) - vfs_badlock("is not locked but should be", str, vp); #endif + vfs_badlock("is not locked but should be", str, vp); } void @@ -5547,13 +5546,12 @@ assert_vop_unlocked(struct vnode *vp, const char *str) return; #ifdef WITNESS - if ((vp->v_irflag & VIRF_CROSSMP) == 0) - witness_assert(&vp->v_vnlock->lock_object, LA_UNLOCKED, - __FILE__, __LINE__); + if ((vp->v_irflag & VIRF_CROSSMP) == 0 && + witness_is_owned(&vp->v_vnlock->lock_object) == 1) #else if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) - vfs_badlock("is locked but should not be", str, vp); #endif + vfs_badlock("is locked but should not be", str, vp); } void From nobody Sun Apr 16 11:10:27 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PznXg4spKz457kT; Sun, 16 Apr 2023 11:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PznXg4Rx1z41Qm; Sun, 16 Apr 2023 11:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FWI2hF3ufRx8eQLp653Qz7OSczwaq7ySNbgLzwMQHGo=; b=ln0dW8Ec+QtYOkl/FJSNOu1HGstm/qB2kMBKtF04957IzaUrgDvXG3bOURuON6NUrEvkj4 YLcPLwTnENF2uC1cuw5wQD7DwroSz9Oiu+/YKZbnfCEiV+b/lcWaaN5dMJKfUmf7pm2wRo o5hx5fQaso+GMS/FLUIDCZc/UZtnOD6ujXaOTpmAHnVHyN8uYx6I6IS2mnnzX2oXi3bSuD kJxda11+RqIV7P1BLg1X0nU+4J1hg2iE0yKZr0tw4+3RedyUynq0ydLBJVoFRxnu0//IyP XMctVI/cR4xP/bJIFueKln1YO603kyD+pQkcA+hbdeit5dGzFXDpkwqPAWXkIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FWI2hF3ufRx8eQLp653Qz7OSczwaq7ySNbgLzwMQHGo=; b=Q4wrXOTbW7J2uRqLKldPaYf/lmB9NxpmHICdPJoxWlQomPirl94jjr9shX2kkll9NeWgmQ DeH1ukqurkITREVMyUBFNFQblSnfEl7LeCSctQUH6hNAoIZJlL/DVuPLsKHlLn3ockvQmM XwXFqdN277ggpncVjivvWp8fslw2NHJK988YaMlQSC+Bb8RsQqkVpP0y/Wo2hwdpUTfdCj LNZkMqGD/Hn/W5WDCWK54YWAn/Kas44MCAKQsd0RC6CtgyIMZefPp5MsZT2FWrxtKLqKOF w+JvczafZ4SLF9YFeS0c7qo+RKHCJdwmIN9xnwThddKYTyctB2OwusFEicpndQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681643427; a=rsa-sha256; cv=none; b=J5j3qUrMEEy87m6jJH3RVPxNDCDb65SNUDutozYKnCpkiFI+hqMsSVnhvZ8MoPPM2Qsu0T q73u+3Pm62+oV1aF6Bh8DMrq1+BKWNUjD1CrctTtf82UU+dciNBjshBNjHIi+yO2Fv9gyH j/ho5mv6hjXFytPd+tA/NMKkWvGggX0VoIgtAgpbX0qoDWq6BBEvkhIe4RgGHoEU/X3lZ6 hMIiDc2/GvNQOAe1z7esIEukZuPkHY107VHXKfZXmN5DymYE12O/R1ichD8+JGzObc0Hc/ /AI6FUF/bykyhSw+vM2SXUbDgqvpb5j0Y/Ib97zGgJxJIWSx1LsQNeVlWM2XCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PznXg3VTyzlXq; Sun, 16 Apr 2023 11:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GBARU8047972; Sun, 16 Apr 2023 11:10:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GBARdl047971; Sun, 16 Apr 2023 11:10:27 GMT (envelope-from git) Date: Sun, 16 Apr 2023 11:10:27 GMT Message-Id: <202304161110.33GBARdl047971@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: fcfa6bf40d99 - stable/13 - Add kqueue1() syscall List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: fcfa6bf40d99fa28ff4feb461a6e90e4d1643819 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fcfa6bf40d99fa28ff4feb461a6e90e4d1643819 commit fcfa6bf40d99fa28ff4feb461a6e90e4d1643819 Author: Konstantin Belousov AuthorDate: 2023-03-25 23:39:02 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 10:59:43 +0000 Add kqueue1() syscall (cherry picked from commit 61194e9852e641d1533cd04a5679d6042ff975d3) --- sys/kern/kern_event.c | 13 +++++++++++++ sys/kern/syscalls.master | 5 +++++ sys/sys/event.h | 3 +++ 3 files changed, 21 insertions(+) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 90a725b6e0f0..29485f3a39db 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1058,6 +1058,19 @@ sys_kqueue(struct thread *td, struct kqueue_args *uap) return (kern_kqueue(td, 0, NULL)); } +int +sys_kqueue1(struct thread *td, struct kqueue1_args *uap) +{ + int flags; + + if ((uap->flags & ~(KQUEUE_CLOEXEC)) != 0) + return (EINVAL); + flags = 0; + if ((uap->flags & KQUEUE_CLOEXEC) != 0) + flags |= O_CLOEXEC; + return (kern_kqueue(td, flags, NULL)); +} + static void kqueue_init(struct kqueue *kq) { diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 5b46ee6c2839..7705cab0da77 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3283,6 +3283,11 @@ u_int flags, ); } +583 AUE_KQUEUE STD|CAPENABLED { + int kqueue1( + u_int flags + ); + } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master diff --git a/sys/sys/event.h b/sys/sys/event.h index b6704f4b4b50..1220ee5343e7 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -216,6 +216,9 @@ struct kevent32_freebsd11 { #define NOTE_NSECONDS 0x00000008 /* data is nanoseconds */ #define NOTE_ABSTIME 0x00000010 /* timeout is absolute */ +/* Flags for kqueue1(2) */ +#define KQUEUE_CLOEXEC 0x00000001 /* close on exec */ + struct knote; SLIST_HEAD(klist, knote); struct kqueue; From nobody Sun Apr 16 11:10:28 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PznXj0rxVz458Zg; Sun, 16 Apr 2023 11:10: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 4PznXh52p0z41n2; Sun, 16 Apr 2023 11:10:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6cDooFyGOpBXCw1tGHyDiteh2yVCd4R+c+FtM5KRSu8=; b=adyT8slp63TlCDZwOng+c7bLPgvMSpKGW5GyFlCOLWDRMIbP2IOWJ025OPvb68K4g6TaLA RcQWy7LXanWOo+xyGhEegbI06in+Fzo93HNrIhvsRp2UgnrpnH32nZcQV2ubULHi2hUHMR jEp0K3M+yritX/lQLl8jB0FPvwzG5/szTl4RE9pzs44uoQxxvSo+EumVC9nWBszDf4PO6B s24in1A4L9okSQw6xQlhpNNUiTiKiAImoAtTJ7PjcYVoXkd3blqk85rg4FikADNl5YDhcZ j8yvHHq0TFaWQ9zmyZ9NFkO30tJy7cjhNLOTzMVODy3G2T25V7SyApFnXF8TDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6cDooFyGOpBXCw1tGHyDiteh2yVCd4R+c+FtM5KRSu8=; b=JJa9J9rToebMGnTKR4WetAOB9UKLMEdfrNMMqnZMe/Vd8lbNVL5ZhrreOq9lm8HEB7N2Xr x8AJ2bCqGUvzJg+mSzhYagEdXXYwolFgFaacjnwY/uO3+nGBa33cSZN+L4zaUDtJ1b6OMj pU+c4cGXwHEUQ7arP704++pNurGKrqkAqPbMIyJ+Y3qc4pXERVc9azw2USIbf8V5Mfd2DV X/87CiXi5sKbUj4dAmyb5HHKdJy8RRinTLUxiro7MwmvN2tjxT9z4/bA8u6dixS8MyC939 /H7XrUybMsd9mop+a3iFrzubG1Wz5szOu+PRGX2KMEFThi6I379Qy5biU9PdyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681643428; a=rsa-sha256; cv=none; b=Zdpb4mwRuF/IQEhxEIXxPIGWLsi17UICIrW1fw9gN7HcgAqDCaDgNLCZTkDhbgFDc+2p5M 6CEXwy5kZRV5cubDHjGVeBJu3SmIyYpMR2JC08miL0Y7WaNhxQw/aiT5AHp6Y/lhldEkgv vCNwr4k+bdB/8tbbxxINfzhbZ1Jt/m9nCd0VhH6J7Jn9m+DeC2FX6/QslMdZ47vVuFxN9g 0dXnL/kNjrmtsirh+9NXqkJXer2g93S07S3WRNb55oHIW6TGjcb/gOBg5SaRftjtrdun/g N6apR898y/T7aJtIMA/cHO5L6JAewBS9v8fEvBANQBA0ttu+TqqnK7RHK2ma8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PznXh48hKzlK2; Sun, 16 Apr 2023 11:10:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GBASTb047991; Sun, 16 Apr 2023 11:10:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GBASYH047990; Sun, 16 Apr 2023 11:10:28 GMT (envelope-from git) Date: Sun, 16 Apr 2023 11:10:28 GMT Message-Id: <202304161110.33GBASYH047990@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: 35c8860cc4de - stable/13 - kqueue1(2): export the symbol from libc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 35c8860cc4deaf8055fa526f348c7e7cbfa73432 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=35c8860cc4deaf8055fa526f348c7e7cbfa73432 commit 35c8860cc4deaf8055fa526f348c7e7cbfa73432 Author: Konstantin Belousov AuthorDate: 2023-03-25 23:40:39 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 10:59:43 +0000 kqueue1(2): export the symbol from libc (cherry picked from commit 375732cc6e462ca160654886f0411d2950768a8b) --- lib/libc/sys/Symbol.map | 1 + sys/sys/event.h | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map index 9150f835ae0c..503e4e5ca657 100644 --- a/lib/libc/sys/Symbol.map +++ b/lib/libc/sys/Symbol.map @@ -418,6 +418,7 @@ FBSD_1.6 { FBSD_1.7 { _Fork; + kqueue1; swapoff; }; diff --git a/sys/sys/event.h b/sys/sys/event.h index 1220ee5343e7..36e965f853fc 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -360,6 +360,7 @@ struct timespec; __BEGIN_DECLS int kqueue(void); +int kqueue1(unsigned flags); int kevent(int kq, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); From nobody Sun Apr 16 11:10:29 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PznXj74gmz457kZ; Sun, 16 Apr 2023 11:10: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 4PznXj6FYrz41nQ; Sun, 16 Apr 2023 11:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dIe0Qpw05FiffQP3OMFvmS9OPO+rJngHG8K4VYTDM/o=; b=pkt47oLkYMktUjnfVVZqCCqWSctQMSL4xs1eLgf1LHaxqNzf2zPYDOBVWHaTcL4JqWOeWx QgEnOMohKV6lOe/lfTqUIUoulktDBIJp2TMTEuOL5MranQ4MUsRnGQr++RFOfEKLFn2wHK Fi8P96LVDMnaY5USIe85n/tlK6+AOaARHRPuBBjLANBCHy76qAwZTQL7Na4vb65ZY6ulJS opP3SOBx8HKXi52/qDoPfjpKaLMrp+wZa6oD77nYOB4xBfOKd0hXOEgw1BqbBBKriuvE3m sz3WXY6191cBDVETD8OXGgtr0iSW8jSJaHw4IghZ2s5phfueHe79d1W6pWz8sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dIe0Qpw05FiffQP3OMFvmS9OPO+rJngHG8K4VYTDM/o=; b=GvZIE6Wp7YHgWTMM1f1f+7KFH1P8MK7l3sHXKaGppI065TcmbpWdZLlA85d1+VQyx02URH 0Jz2q7xSmGodOjtMlA5h6COYs8ukWFPnmNRiVniD+DL9cwRcBv6nA+OJc7tOPd50pi14H/ AGbaFaZPZGmM2YC4WerVBFrn7vXgFiFcTHooBcvnngHsZUnpJUZR6lcXMF/ojYzNanssXc SSt3N96MPGC6/PhsH46OT0M8lW82YdIU760MwObXl6kkXzo4dSReiEvyBs2ZU7bg6MASl6 mDEpNVt6Z0Nsz+wDjTS4wLzFgfKVah9NRJrzg4Ej9lzXS1UG2obEodcNx+EgUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681643429; a=rsa-sha256; cv=none; b=hFTkUYPG7POVFeRaz6D1CkpxUtwfDqXWAyDzLQRHCdGNCAQU6YIRc7lYadMh4wpPhjS33E IxanLFj1uU/USi+EGsIrXzxgftd+CS5GyQuCifL8MDRT8TwOG6iMeTSDaIE08XLNnI0NH5 XLK9OdqzCC4hDuT/usOBVmPl9o7wg+9I0N2vnjdjgYu0rrJHbQq7DBjZFWlhVhkJV4njXp rLIOfG8/bXY4L0TgUHyCw3JmnHaQ0NJa9PpJfuDENUal5vzSuQOuGogulDnHJ8E3WniPTu nNcHCzWIXOY2qagqMPAVili42I6HeakLChsFl0mCA3relexS5Kg5DkN26OyM9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PznXj5Lzmzl81; Sun, 16 Apr 2023 11:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GBATL4048010; Sun, 16 Apr 2023 11:10:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GBATG6048009; Sun, 16 Apr 2023 11:10:29 GMT (envelope-from git) Date: Sun, 16 Apr 2023 11:10:29 GMT Message-Id: <202304161110.33GBATG6048009@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: 78182897b6a2 - stable/13 - kqueue1(2): document List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 78182897b6a238161466c29dd8941bfc147f0b79 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=78182897b6a238161466c29dd8941bfc147f0b79 commit 78182897b6a238161466c29dd8941bfc147f0b79 Author: Konstantin Belousov AuthorDate: 2023-03-25 23:41:21 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 10:59:43 +0000 kqueue1(2): document (cherry picked from commit f2ec444be523d3d00808ff82a7c690c75defe953) --- lib/libc/sys/Makefile.inc | 1 + lib/libc/sys/kqueue.2 | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 6f663158d840..4152d01a0f3d 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -430,6 +430,7 @@ MLINKS+=jail.2 jail_attach.2 \ jail.2 jail_set.2 MLINKS+=kldunload.2 kldunloadf.2 MLINKS+=kqueue.2 kevent.2 \ + kqueue.2 kqueue1.2 \ kqueue.2 EV_SET.3 MLINKS+=link.2 linkat.2 MLINKS+=madvise.2 posix_madvise.2 diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2 index 863136c9928f..dbe0dad532c0 100644 --- a/lib/libc/sys/kqueue.2 +++ b/lib/libc/sys/kqueue.2 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 14, 2022 +.Dd March 26, 2023 .Dt KQUEUE 2 .Os .Sh NAME @@ -38,6 +38,8 @@ .Ft int .Fn kqueue "void" .Ft int +.Fn kqueue1 "u_int flags" +.Ft int .Fo kevent .Fa "int kq" .Fa "const struct kevent *changelist" @@ -90,6 +92,22 @@ flag, then the descriptor table is shared, which will allow sharing of the kqueue between two processes. .Pp The +.Fn kqueue1 +system call also creates a new kernel event queue, and additionally takes +the +.Fa flags +argument, which is a bitwise-inclusive OR of the following flags: +.Bl -tag -width "KQUEUE_CLOEXEC" +.It Fa KQUEUE_CLOEXEC +The returned file descriptor is automatically closed on +.Xr execve 2 +.El +The +.Ql fd = kqueue() +call is equivalent to +.Ql fd = kqueue1(0) . +.Pp +The .Fn kevent system call is used to register events with the queue, and return any pending From nobody Sun Apr 16 11:10:30 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PznXl0z5bz458V3; Sun, 16 Apr 2023 11:10: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 4PznXl07Bvz41v7; Sun, 16 Apr 2023 11:10:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZR+wrsz+3gWS5yExK9Uvbyr0HnjtXa78nZgK7vOgwoA=; b=Zh+c7NuKHUkGfgiUAM40Pi9/v3ehx22WVQYLLFlBgXC2bvUknf7L++enwcTN4q3QlfAA4s bjRbkVkQ+YscWDGJq2Q2wKDZtDmWb+xyu3XmpmqYWmm9iIgej5tqB2dwwnVJ0bvJzLtqHd Xei8q1Y0fNrbusoHyse7WXGK7j2wL6LQt28Vp/245MnCwzcMN/18FF8kybOgIf6iE/KvJg Y7Lw/VpzL0jEWFINoTsABnnR9p5sqV3uGYsNlZqfmVG0HwzoCt7jPkiuTjVt63t206aW0W ob2dOWjiKiGVxYEtzPBVQv8dxIYUHCBlbVQnuQdIebRfcyXHJUp25nrgUmFC0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZR+wrsz+3gWS5yExK9Uvbyr0HnjtXa78nZgK7vOgwoA=; b=POFW6Xxb7PDnIAytRaC4GY+wST44XwLTwUYZ9VqBpzP13p4Gzc9rDcqv6iCid6iNHI8wHe Q8g0ksTD3pm+3gQsqAokq1EOFGk+m9tcSvy9H5dgSjr1EJH2OnFWQ0g0mOEiLO9CnYSoFi Q7Hr6WzmxSr79V3XiI7cYIbsTKePGszT0U0df+TQJy7xWMhFJzjfa2LEpmHj9GXdmSB3Px z4O5cZxZWo0vCkqSnFybddq5eGGbYU4GDBEayglJItiu8ZQRgLY24G5+DUGD1Jk/ZsvABO XAy00SSdQdTWAroGTG03Qg/VTbGRXsUrtZbtscWeJOs19RKGMHWsB+lIDciMNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681643431; a=rsa-sha256; cv=none; b=xZ5Ir6kIFddXpXkHL8KtbvEep4h+PrJI3OluByut25+r5reUm8zThXLuNKJB57/LYKeYjA PtuhjZ8RwswHKucZp7uCs2vDfYNfo9L+Co+e9CF7EG7keXMogWps5/K5onNp1Hmr4ylfIu 20Q7tTkB3H+kUX5sb23PRA84XD2zgGtuoOCCpJZw1NL1+mAfJq2UbnVgnUYVauVWpnX8Sv r+8NwW4/hAieZv91sI9myimRZX+cwY+VxPb6beeSf4qU+2QgDc+RQ/b7FCaR5h8A0Qbifc WIchWkiz4Si/3ye4zRrCF3FIsWAJMC84NkfaIWA9DNtT1KbySo6+hZ/o8lGAEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PznXk6JggzlYY; Sun, 16 Apr 2023 11:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GBAUgP048031; Sun, 16 Apr 2023 11:10:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GBAUaY048029; Sun, 16 Apr 2023 11:10:30 GMT (envelope-from git) Date: Sun, 16 Apr 2023 11:10:30 GMT Message-Id: <202304161110.33GBAUaY048029@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: e6aa3c8db0e5 - stable/13 - Rename kqueue1(2) to kqueuex(2) to avoid compat issues with NetBSD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: e6aa3c8db0e5e537f939f451bde10a33a9d8feab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e6aa3c8db0e5e537f939f451bde10a33a9d8feab commit e6aa3c8db0e5e537f939f451bde10a33a9d8feab Author: Konstantin Belousov AuthorDate: 2023-03-31 22:27:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 10:59:44 +0000 Rename kqueue1(2) to kqueuex(2) to avoid compat issues with NetBSD (cherry picked from commit dac310248826c37b60306c1b25fb94c35802196d) --- lib/libc/sys/Makefile.inc | 2 +- lib/libc/sys/Symbol.map | 2 +- lib/libc/sys/kqueue.2 | 6 +++--- sys/kern/kern_event.c | 2 +- sys/kern/syscalls.master | 2 +- sys/sys/event.h | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 4152d01a0f3d..23ab196c5f46 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -430,7 +430,7 @@ MLINKS+=jail.2 jail_attach.2 \ jail.2 jail_set.2 MLINKS+=kldunload.2 kldunloadf.2 MLINKS+=kqueue.2 kevent.2 \ - kqueue.2 kqueue1.2 \ + kqueue.2 kqueuex.2 \ kqueue.2 EV_SET.3 MLINKS+=link.2 linkat.2 MLINKS+=madvise.2 posix_madvise.2 diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map index 503e4e5ca657..6b81c92dbe93 100644 --- a/lib/libc/sys/Symbol.map +++ b/lib/libc/sys/Symbol.map @@ -418,7 +418,7 @@ FBSD_1.6 { FBSD_1.7 { _Fork; - kqueue1; + kqueuex; swapoff; }; diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2 index dbe0dad532c0..2996b0f02109 100644 --- a/lib/libc/sys/kqueue.2 +++ b/lib/libc/sys/kqueue.2 @@ -38,7 +38,7 @@ .Ft int .Fn kqueue "void" .Ft int -.Fn kqueue1 "u_int flags" +.Fn kqueuex "u_int flags" .Ft int .Fo kevent .Fa "int kq" @@ -92,7 +92,7 @@ flag, then the descriptor table is shared, which will allow sharing of the kqueue between two processes. .Pp The -.Fn kqueue1 +.Fn kqueuex system call also creates a new kernel event queue, and additionally takes the .Fa flags @@ -105,7 +105,7 @@ The returned file descriptor is automatically closed on The .Ql fd = kqueue() call is equivalent to -.Ql fd = kqueue1(0) . +.Ql fd = kqueuex(0) . .Pp The .Fn kevent diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 29485f3a39db..f580ed10eb8d 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1059,7 +1059,7 @@ sys_kqueue(struct thread *td, struct kqueue_args *uap) } int -sys_kqueue1(struct thread *td, struct kqueue1_args *uap) +sys_kqueuex(struct thread *td, struct kqueuex_args *uap) { int flags; diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 7705cab0da77..f4e8e071b42a 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3284,7 +3284,7 @@ ); } 583 AUE_KQUEUE STD|CAPENABLED { - int kqueue1( + int kqueuex( u_int flags ); } diff --git a/sys/sys/event.h b/sys/sys/event.h index 36e965f853fc..f204ab8fe0b5 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -216,7 +216,7 @@ struct kevent32_freebsd11 { #define NOTE_NSECONDS 0x00000008 /* data is nanoseconds */ #define NOTE_ABSTIME 0x00000010 /* timeout is absolute */ -/* Flags for kqueue1(2) */ +/* Flags for kqueuex(2) */ #define KQUEUE_CLOEXEC 0x00000001 /* close on exec */ struct knote; @@ -360,7 +360,7 @@ struct timespec; __BEGIN_DECLS int kqueue(void); -int kqueue1(unsigned flags); +int kqueuex(unsigned flags); int kevent(int kq, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); From nobody Sun Apr 16 11:10:31 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PznXm20NXz458NQ; Sun, 16 Apr 2023 11:10: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 4PznXm14Tkz422p; Sun, 16 Apr 2023 11:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zpES5DwGzSIxKzexRkDd/CgjisXLBjJhfDzxYOdPExg=; b=hkePprhbPk1n0JTe+i/3LyzxdemyjtQpwVwcG4Ap9yXKpw41kl9xcfoTcacl273JIANb3d GGumvP4EM0Rarc0k15k+OR2VyGQt1ewFYC7KI14nJkeUOqISvHyr6XlP0fg2gj97CqGU0V jqTqryG5XBXaTXzRgCRLbmRyElUcp2uIgGsZG/CwyEdrzb8wyOsRCQn9eFlUAjwbad/f1z G+FiG0clJRHSvPeZtgBxEHEnma9MfRtOcEKe2RkdIfu8z3adTtan3bLf6ivzSoQq3B1rEy c8xmPaTPtAlZHZLF+HOEGmk4qSwiHckSe9KQxHdeWftIQtS5Fodg+ATux6Opyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zpES5DwGzSIxKzexRkDd/CgjisXLBjJhfDzxYOdPExg=; b=clTkK3S9+1BZw4ThUvWdmqfYydGofGJscsb8WuQF4xeVhhSA1Q0yj+yUc2UeJaKuLeQIKm tZmK9BxDU/rtNRxFafNROM2MdCXMkmTQTn2nEbNAKSRVFmGqJRuyieamseIs5N1my9rUvc 7ZLCsMSOOf+2UJE94Qrg3jBpQOTtpQ2b48CbZIQMdC+HJ2K4NEkFDfmZxwBe0szbpt+w/4 QndOVH1gouFPYzqS/DXbphk0XJ59AEnAvIR6h1RoF91Ium4cP87VmPHIIqxc5Up+FCdnSX YYiDBJRDgN0+o3AOkSGhmCU7NMNHlLqXTAfhC3M+6o5NrgtJj3173qqUcpN8bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681643432; a=rsa-sha256; cv=none; b=KKqwInSd5G6k2WtsNXTMjCQx9ytQO85OBONtuOrm6AshUwUmX3kVaDEy98ylUYXqlz54Wf wRL/ZHevg7sfuTm1Qa21ES03hkg6kaxrCf50/9URhZ5zy6R2KZmoaN/gnSBP/IGI1BrTS4 vbnZTjDADC9stBiSZ/M/hSNNM0WcT5ZObFKc1d4lj5g/TASclux5BQODIg5pZauMMpcXzG N5+n4zvMQmDLJ/5PBS66w1r+5rIkQeBwR7YOFZmJPIQL0hhroBlrCrG8Wf5dUlrVYR8wGR zR86Ql80NQGhs2my+vmnLFK3Isy3Yt0zNBH52HEsXMABBEFFFKVyEKHkRx8HAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PznXm070LzlYZ; Sun, 16 Apr 2023 11:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GBAVRu048055; Sun, 16 Apr 2023 11:10:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GBAVAr048054; Sun, 16 Apr 2023 11:10:31 GMT (envelope-from git) Date: Sun, 16 Apr 2023 11:10:31 GMT Message-Id: <202304161110.33GBAVAr048054@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: b50b224df47f - stable/13 - Change kqueue1() to be compatible with NetBSD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: b50b224df47f9bf5a9b194e95908d5aa760ae791 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b50b224df47f9bf5a9b194e95908d5aa760ae791 commit b50b224df47f9bf5a9b194e95908d5aa760ae791 Author: Konstantin Belousov AuthorDate: 2023-03-31 22:31:41 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 10:59:44 +0000 Change kqueue1() to be compatible with NetBSD (cherry picked from commit 54579376c05e7a039cde5f424c641fa29348835f) --- lib/libc/gen/Makefile.inc | 1 + lib/libc/gen/Symbol.map | 1 + lib/libc/gen/kqueue1.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libc/sys/kqueue.2 | 8 ++++++++ sys/sys/event.h | 1 + 5 files changed, 63 insertions(+) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 22573d8ec36c..ae8a6bec08de 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -97,6 +97,7 @@ SRCS+= __getosreldate.c \ isinf.c \ isnan.c \ jrand48.c \ + kqueue1.c \ lcong48.c \ libc_dlopen.c \ lockf.c \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 0a20a41d0e20..84432432f4e6 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -436,6 +436,7 @@ FBSD_1.6 { }; FBSD_1.7 { + kqueue1; posix_spawn_file_actions_addchdir_np; posix_spawn_file_actions_addclosefrom_np; posix_spawn_file_actions_addfchdir_np; diff --git a/lib/libc/gen/kqueue1.c b/lib/libc/gen/kqueue1.c new file mode 100644 index 000000000000..b27a8f63019e --- /dev/null +++ b/lib/libc/gen/kqueue1.c @@ -0,0 +1,52 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include + +/* + * Provide some NetBSD compatibility. They support a set of O_* + * flags, we only carry O_CLOEXEC, and accept but ignore O_NONBLOCK. + */ +int +kqueue1(int openflags) +{ + u_int flags; + + if ((openflags & ~(O_CLOEXEC | O_NONBLOCK)) != 0) { + errno = EINVAL; + return (-1); + } + + flags = 0; + if ((openflags & O_CLOEXEC) != 0) + flags |= KQUEUE_CLOEXEC; + return (kqueuex(flags)); +} diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2 index 2996b0f02109..2d2b990102c2 100644 --- a/lib/libc/sys/kqueue.2 +++ b/lib/libc/sys/kqueue.2 @@ -107,6 +107,14 @@ The call is equivalent to .Ql fd = kqueuex(0) . .Pp +For compatibility with +.Nx , +the +.Fn kqueue1 +function is provided, which accepts the +.Dv O_CLOEXEC +flag with the expected semantic. +.Pp The .Fn kevent system call diff --git a/sys/sys/event.h b/sys/sys/event.h index f204ab8fe0b5..1141a22b8109 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -361,6 +361,7 @@ struct timespec; __BEGIN_DECLS int kqueue(void); int kqueuex(unsigned flags); +int kqueue1(int flags); int kevent(int kq, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); From nobody Sun Apr 16 11:10:33 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PznXn5NPyz458Zp; Sun, 16 Apr 2023 11:10: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 4PznXn2Gvxz41yB; Sun, 16 Apr 2023 11:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I047CXeGHGkxxpBv4I6lLtr7Et+oEV9bKHOunCTF/pQ=; b=ooBFvTa4MIFE2DpMO7fueEhiU1mbz90hU/xiXV/7I2mZBuRqwwzAHyU/hNSv4s0pGcFIC9 HVR/9+ywClxG2kv9mQP9U5jTbOta6l16Wrrm1P1UPCA1XsL4G7yL7JzGLbDGt2IUM4WH8U jX4pnPojzXMtja81KIxPGBbdDg/d9HzMFkiXe0pyZRfYiMiGGNUae+TYCDxVDkERghoRMM lMPnhCMopyIgmhMHu3D3fVAbXVkm24mUhRK7Zbji5zzjUIS+ty6DiG4qiDcMi3/SqjITtM UzcTfZnDXDtf8FvCW9W4LebYIqksZBM42gDlTsvM/9OW9pMs/7S71yk/vBusaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I047CXeGHGkxxpBv4I6lLtr7Et+oEV9bKHOunCTF/pQ=; b=hTUwUdHfh5Lz4FUjNLZAtkGPVU1jyFe/jsBE+QbOXpN1WfrVlya7OcIRjqx/IYanbBz3FF t5L8KoAOlH4D9oWn+Olp9lGWppaIQBTbNZicSwJyy5nVHPccbjEKY5tefuOQO/HziG1qNX fzXK1uQHzRTtNUy3Z+UjFEXqoduzHvI0g0MOP0iUIuTceKxFbCuPAs+5E8KsGlqiiff6Dj qH16H3/fv6w/Ecinm19KnBMgCr0f9rogkdKmPOl/CnISV+ojOpbVqWYxY4h7jqunxSaMal 7/KuOOxXqP1CDiUwSOm5G1IKseyaf8sLrJaGD8/RVhFILKqJhcWiY1Df/SkdDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681643433; a=rsa-sha256; cv=none; b=BjPgCppj8LzS1xAwb5FN/EgHA942/mlZYT5NcOBwdT3Szlqb7Rt+Gqzq6vOvLVmtwDJsiE S1RQB1LZzuTkhSTCSWMIz+qc9Kem1emQgN76ZesmytTACY+6DNI1NcrPWjIbb/J9kaWRMT 9uEGvGrZcR17heIj8bj5Y55zqFv8EBPV5SrowEiDKIx/1NhBx8hbgqkB3y4qhUJnn/c+uh 54kgCCgRsauCoRtrQsvA2PoEeUUsx2FtftOPUl5DPCuJpLolxZZw19Yv5t8wN9ykF7CL1o mrHguavPisTosQkQxjSGCilTq2R0C8LkTr6TeDNFK7qW6/LW1ejBik7Sxy9D4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PznXn13zFzlHp; Sun, 16 Apr 2023 11:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GBAXHw048074; Sun, 16 Apr 2023 11:10:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GBAXCN048073; Sun, 16 Apr 2023 11:10:33 GMT (envelope-from git) Date: Sun, 16 Apr 2023 11:10:33 GMT Message-Id: <202304161110.33GBAXCN048073@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: 166804038038 - stable/13 - Regen List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 16680403803806b37b730990eee6f08d11c46995 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=16680403803806b37b730990eee6f08d11c46995 commit 16680403803806b37b730990eee6f08d11c46995 Author: Konstantin Belousov AuthorDate: 2023-04-04 13:24:11 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 10:59:44 +0000 Regen --- sys/compat/freebsd32/freebsd32_sysent.c | 2 +- sys/kern/init_sysent.c | 1 + sys/kern/syscalls.c | 1 + sys/kern/systrace_args.c | 22 ++++++++++++++++++++++ sys/sys/syscall.h | 3 ++- sys/sys/syscall.mk | 3 ++- sys/sys/sysproto.h | 5 +++++ 7 files changed, 34 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 0b6b0a6a5d57..b683e366c864 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -607,7 +607,7 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(rctl_remove_rule_args), .sy_call = (sy_call_t *)sys_rctl_remove_rule, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 529 = rctl_remove_rule */ #ifdef PAD64_REQUIRED { .sy_narg = AS(freebsd32_posix_fallocate_args), .sy_call = (sy_call_t *)freebsd32_posix_fallocate, .sy_auevent = AUE_POSIX_FALLOCATE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 530 = freebsd32_posix_fallocate */ - { .sy_narg = AS(freebsd32_posix_fadvise_args), .sy_call = (sy_call_t *)freebsd32_posix_fadvise, .sy_auevent = AUE_POSIX_FADVISE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 531 = freebsd32_posix_fadvise */ + { .sy_narg = AS(freebsd32_posix_fadvise_args), .sy_call = (sy_call_t *)freebsd32_posix_fadvise, .sy_auevent = AUE_POSIX_FADVISE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 531 = freebsd32_posix_fadvise */ { .sy_narg = AS(freebsd32_wait6_args), .sy_call = (sy_call_t *)freebsd32_wait6, .sy_auevent = AUE_WAIT6, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 532 = freebsd32_wait6 */ #else { .sy_narg = AS(freebsd32_posix_fallocate_args), .sy_call = (sy_call_t *)freebsd32_posix_fallocate, .sy_auevent = AUE_POSIX_FALLOCATE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 530 = freebsd32_posix_fallocate */ diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 091b146417bc..05e51fdac863 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -638,4 +638,5 @@ struct sysent sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 580 = fspacectl */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_sched_getcpu, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 581 = sched_getcpu */ { .sy_narg = AS(swapoff_args), .sy_call = (sy_call_t *)sys_swapoff, .sy_auevent = AUE_SWAPOFF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 582 = swapoff */ + { .sy_narg = AS(kqueuex_args), .sy_call = (sy_call_t *)sys_kqueuex, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueuex */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 985afba8c17c..72251162d837 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -589,4 +589,5 @@ const char *syscallnames[] = { "#580", /* 580 = fspacectl */ "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ + "kqueuex", /* 583 = kqueuex */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index fa3c4ed20f2c..78a76358b43b 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3412,6 +3412,13 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } + /* kqueuex */ + case 583: { + struct kqueuex_args *p = params; + uarg[0] = p->flags; /* u_int */ + *n_args = 1; + break; + } default: *n_args = 0; break; @@ -9117,6 +9124,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* kqueuex */ + case 583: + switch (ndx) { + case 0: + p = "u_int"; + break; + default: + break; + }; + break; default: break; }; @@ -11070,6 +11087,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* kqueuex */ + case 583: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 253d53ad71fa..d80bf9b5930e 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -519,4 +519,5 @@ #define SYS_aio_readv 579 #define SYS_sched_getcpu 581 #define SYS_swapoff 582 -#define SYS_MAXSYSCALL 583 +#define SYS_kqueuex 583 +#define SYS_MAXSYSCALL 584 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 134cc6a52188..54911eb44b55 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -424,4 +424,5 @@ MIASM = \ aio_writev.o \ aio_readv.o \ sched_getcpu.o \ - swapoff.o + swapoff.o \ + kqueuex.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 700f33dc5155..57d264798c71 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1854,6 +1854,9 @@ struct swapoff_args { char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)]; char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; }; +struct kqueuex_args { + char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_sys_exit(struct thread *, struct sys_exit_args *); int sys_fork(struct thread *, struct fork_args *); @@ -2250,6 +2253,7 @@ int sys_aio_writev(struct thread *, struct aio_writev_args *); int sys_aio_readv(struct thread *, struct aio_readv_args *); int sys_sched_getcpu(struct thread *, struct sched_getcpu_args *); int sys_swapoff(struct thread *, struct swapoff_args *); +int sys_kqueuex(struct thread *, struct kqueuex_args *); #ifdef COMPAT_43 @@ -3196,6 +3200,7 @@ int freebsd12_closefrom(struct thread *, struct freebsd12_closefrom_args *); #define SYS_AUE_aio_readv AUE_AIO_READV #define SYS_AUE_sched_getcpu AUE_NULL #define SYS_AUE_swapoff AUE_SWAPOFF +#define SYS_AUE_kqueuex AUE_KQUEUE #undef PAD_ #undef PADL_ From nobody Sun Apr 16 11:12:02 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PznZV4Bbsz458VQ; Sun, 16 Apr 2023 11:12: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 4PznZV2LTqz440D; Sun, 16 Apr 2023 11:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=il9pVjZXB3gWLw9f63pVKsoou6VDVqaN+lHNhMUlad8=; b=I0HqhK5SW23zgVtQpOAP49ofNOpYrJPcI5rVRaH5HPLzmLDBijw7fR5WQLOIqC/TW+j3Ja 3FOEXHrDZg1bGFo5QEeFhpfwc+8uDEm1Lo5U2xoEdzE6MUKcwU2YYPGWvVXm5xHtPldvZk ogPl5txD4JC8zp+6peJPehkewRdujyF4nxScaYjx5d6b5+NoVu342R4bUU51nhGEatKaRM A3AXj0cuJcztgQgCG9dWOoKD+HGxt/n5h6+63p/X0+VzRYJrV02Y/pXF0ifenBJKjtTvJY XzFFdhOdghiGgYKDatvhhLhLb9IT9azb4hl95RBXOZvjoDf9Tp799wANZueBoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=il9pVjZXB3gWLw9f63pVKsoou6VDVqaN+lHNhMUlad8=; b=fHHFosvWhoUImyWsrP7Cig3z7iqr08MtEFa6rCUEJSRvbitmZtjEPm0QZ6sdPiJuICrQAq SiklBLypi9OkQpE6kU7JzQZBe270xbtprxOT2t0KPkxiLvdM1nez3fVbKhig9fXjj+iyN4 1RSlK7kWt3saKo4FQKPWh7vPKqcg1CjQwCmLQ2kJJki+BEwE2u/w0YPm3vRGKEtTgxWpzj EHyrHs2Sa9AzU+Go2LQdcQt6kUFI42IVE6/ZbcLL2p5Kcz8PLIEbGzRDTcpIeNyMBwJrIg OOF9HOyqcc35T6QTiCtZyp+VTJ8b8EGhRqS7o4JvQpV/iQB52zZwdg5tP2aWXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681643522; a=rsa-sha256; cv=none; b=x9yr6qbMYoYwVEUT9znT4xfz2hhrUZiWdhRj8mtOFoRHHM46uQngE7jux4rpzN8nb+p2Bt hzT2SE5+VlsDMyltfpCUzWSXWMM3LI3keNrt6Bo5LOH228cjhcGNw/I87Z7/a+XW6AIveL k1x38ewR194IAdx2vg2f1z0P5xjXiJsa84KIGIkHThsCnZM/DMhjK5Sudc2ok1hyWUUxeq SMp8QUmqUJRHpayS123G0Vwb5KFI5Y4vkwdkmnbACt26oEtRW7ekQjv9xD/ToaMpb7T/Bi lwGvxEmGsD8g2DjkbnXy8dUb0gpK9hCw/WRumX4Zbah4LY0/DkvI1KVU6CwdXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PznZV1QWyzlZC; Sun, 16 Apr 2023 11:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GBC2x5054536; Sun, 16 Apr 2023 11:12:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GBC2Ak054535; Sun, 16 Apr 2023 11:12:02 GMT (envelope-from git) Date: Sun, 16 Apr 2023 11:12:02 GMT Message-Id: <202304161112.33GBC2Ak054535@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: ad481562ab09 - stable/13 - pkru.3: fix markup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: ad481562ab09d61613b6e86c1352c3397f9d6b19 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ad481562ab09d61613b6e86c1352c3397f9d6b19 commit ad481562ab09d61613b6e86c1352c3397f9d6b19 Author: Konstantin Belousov AuthorDate: 2023-04-14 23:29:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 11:11:35 +0000 pkru.3: fix markup (cherry picked from commit dcc19c6701ea789ac109a132df032c61feacf9ea) --- lib/libc/x86/sys/pkru.3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/x86/sys/pkru.3 b/lib/libc/x86/sys/pkru.3 index fc9a7ba8ca86..47e324f21f4c 100644 --- a/lib/libc/x86/sys/pkru.3 +++ b/lib/libc/x86/sys/pkru.3 @@ -150,13 +150,13 @@ flag. The .Fn x86_pkru_get_perm function returns access rights for the key specified by the -.Fn keyidx +.Fa keyidx argument. If the value pointed to by .Fa access is zero after the call, no read or write permissions is granted for mappings which are assigned the key -.Fn keyidx . +.Fa keyidx . If .Fa access is not zero, read access is permitted. From nobody Sun Apr 16 11:12:03 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PznZW4vZtz458Pq; Sun, 16 Apr 2023 11:12: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 4PznZW3DtFz44Hk; Sun, 16 Apr 2023 11:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aUHd7UHbKTWSLNL7nYtN94UgOFXbhKfuCEJ2A1JllGc=; b=Qd1AqpI9/AWfp4IQIPVGjjd1Sq9tVDJ5pKo+PodBYNIgZGE+UYYaw4yFc1h4UJXWqC9JPJ 4CiBZmcksa/JgUGoB/GoBSy5DijDMvTBLLwZKglF5JPj1NbI9kqlnGlompDKfKML72VaPm 7ZQlKYtfNZvVH6yrEc5VnyJ3LCWsbjYSwdcmfBDapvXlGl+EaWwr6HGB/F89US+CP+NXMX vjTP4vi9wOJSsrKcT0iTsS5hXzlLkjSM/SxzLYc/Wq18lXrUVv7yVGgUC/iMb+sjpN/SgB +3XD00hTXZN7gm1ThrOhU9nJFd/VCTpNDBcDM9avtk/QaePnn7ivEB+CoW5Ziw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aUHd7UHbKTWSLNL7nYtN94UgOFXbhKfuCEJ2A1JllGc=; b=i/Y8yQRVDC4T5FVlv2zcrB1ov27Tmb0t/X1zQTUxOreTwUdA3kvghBougz1CwHu8XPcrHV ZomnPNL6qlNpVaM+khuzqK2gpBXnwkeWO5Vtq2Nfqhu2tdDx7ZO5LwpMF91YKBFcTXLeGo EB3lWfc2s8S0tMYoCD911DJ6hRlkK/8XKTUWrjfVO2JgkYnTWvp7Zh+DOnk4F6PjrVRSkK UTbbrpM7LcBBT+FQXSFGjdpzztQruKxKLbPGWKHibglEMcx/zgpyMC68amMW03fqmmI8qv 5q7YaPhYo95O4E+PCaCvHI/6vDGLSqBtzJX9krZlTu00Nlz3142HysH+tHFYJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681643523; a=rsa-sha256; cv=none; b=Et32I+pYNCIrzuWj+yvB9uyG13exjwwVuXVJaJzDR1dt/sOm4UEK+7yyxwjQyGAoi/Wp12 VNYCwj+o5SSAn75oqWwuq9jiODNwBKEdX3qGeEz5obOLhfkLJtiMPuUuzILuENw/YyT4tO dl3HJM0rNWdQtNmKL9VeVYujgQufxCtkPo9HZKz77soUTnHP6DXFnngiwAoP+RIBWu7piH RbRtGu53l3psCUBwADrc0Hk+Zv3HgM0IvXSb55xKa1NeBJ9OjSM7Csn287HEF/1sAmzvXF 0rpNRNky72t3NEvVo28YI7xVSEV5cg95fcWPlhvPa2WNCc45/uy2BW0yD/dd2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PznZW2LsGzlqx; Sun, 16 Apr 2023 11:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GBC3Z1054558; Sun, 16 Apr 2023 11:12:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GBC3Em054557; Sun, 16 Apr 2023 11:12:03 GMT (envelope-from git) Date: Sun, 16 Apr 2023 11:12:03 GMT Message-Id: <202304161112.33GBC3Em054557@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: c38df24407d1 - stable/13 - rtld: fixes for handling of the grouped options List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: c38df24407d1fcafb0c805db919315136a93c95a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c38df24407d1fcafb0c805db919315136a93c95a commit c38df24407d1fcafb0c805db919315136a93c95a Author: Konstantin Belousov AuthorDate: 2023-04-13 04:47:23 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 11:11:35 +0000 rtld: fixes for handling of the grouped options (cherry picked from commit 7cdfe51f30965a365e3e7c829396a56e2a7e5141) --- libexec/rtld-elf/rtld.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 8e2cd0dfcb24..30cb4b595b71 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -6078,13 +6078,16 @@ parse_args(char* argv[], int argc, bool *use_pathp, int *fdp, _rtld_error("Both -b and -f specified"); rtld_die(); } + if (j != arglen - 1) { + _rtld_error("Invalid options: %s", arg); + rtld_die(); + } i++; *argv0 = argv[i]; seen_b = true; break; } else if (opt == 'd') { *dir_ignore = true; - break; } else if (opt == 'f') { if (seen_b) { _rtld_error("Both -b and -f specified"); @@ -6099,7 +6102,8 @@ parse_args(char* argv[], int argc, bool *use_pathp, int *fdp, * name but the descriptor is what * will actually be executed). * - * -f must be the last option in, e.g., -abcf. + * -f must be the last option in the + * group, e.g., -abcf . */ if (j != arglen - 1) { _rtld_error("Invalid options: %s", arg); From nobody Sun Apr 16 13:30:40 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzrfS4d3Qz45MBp; Sun, 16 Apr 2023 13:30: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 4PzrfS4C3Fz3HTB; Sun, 16 Apr 2023 13:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681651840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l37eg2lX9JGuu8ofsqoW+Zfi9omohlgZcGYtQR2eCGA=; b=kzCD5Hb17HJ0+QWXabjK4pSE6WaLDhp/oINsQCYnS9MV3EGpOguyjuwXrFhsDm155sxZdm ywQg4gVRtQhPG3w9XsHCoYTBBVGs4wd+LYpGnJBY8BPsPGbxraC7tzY9tmTa+RjntZaWjp sscctkusfqlRk6sIRFPhb9YR0QyKrwt5PU9gF6P5UA4gfllDDgaQfWe89UZ47A8YOPpgyT zCe21sVKBXYYQ6XTIqSwg1grj8xQQ4nLmaOwf6BLsywPnHk2p7pQryrnwhMQv0SlORQud9 gdpd8EIfDQA2MA6C6OEptNH/5kn8otLZu5ia6TWEUlpSW8jxV/WmMt7y/OPibA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681651840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l37eg2lX9JGuu8ofsqoW+Zfi9omohlgZcGYtQR2eCGA=; b=qa8IdbwgkHJR8rwwfAMSKWRmeRsSTkJ2kPTBAB6Xb1X2ikwyQnj5Ga7EZS5AwmKPZmFlvu Ngw8/WcUeBtBpkBS49RdwVn9lVMheBffRmQmQ8wDhC/A3BfWNWYdnvuKeL1pRbe430Y54r picu6DLhJdIXWfCmGGiFe+wLRkfICgvK4DhYZcoz1b6riZTk5QxRX9iRTj+4EZvJjtRTxJ J5O2y+MtWrnhds05RbIHoRS/2x7gUJ7bQkKLbBfuKf+i1Bdwi/fEYQ/Sf8QjjYaLQs8M4Z azN4wigqVFBcEP8EtEPC8ArfiMhBOSbfbeyXReEfwvG/MX3ObTUQnLb0qYRapg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681651840; a=rsa-sha256; cv=none; b=WckKKBztgCpXK3XzIMjIgkWCFOFZbfSPlxWgiJYuKgg7aNS5b4IhlRX81Y01Dftnq0kNQP +aPapsyyruy+IboLTFlfbnQ+y0AklWmByHpvSUXWTGAWtN5/uHVuejCuUZjJC7SA25V8nU 6/wjgPR6xIzj2MD0OwFtpaEhSr4BP4H1H3NP1hm6+u+oVtAJA5U/FRo5w7SBiHQiEQ/DBJ KohkZ3NseBAGlrTYegdOdvWH67oGo93usyE51zngqHbzBJhYWl83dffKBIWhWKXEuHnKDC PnehhFby0FUBlMyFfI7CQ+pwbXpfQclx71urfRaPs115LyykBNdv+ws3/Rh9xg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PzrfS3HQ6zppx; Sun, 16 Apr 2023 13:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GDUe07078837; Sun, 16 Apr 2023 13:30:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GDUenC078836; Sun, 16 Apr 2023 13:30:40 GMT (envelope-from git) Date: Sun, 16 Apr 2023 13:30:40 GMT Message-Id: <202304161330.33GDUenC078836@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: 1305e8a6d02f - stable/13 - llvm-objcopy: link man page as strip.1 when WITH_LLVM_BINUTILS is set List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1305e8a6d02fb322f0a4860bf8a0a63e516ea9df Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1305e8a6d02fb322f0a4860bf8a0a63e516ea9df commit 1305e8a6d02fb322f0a4860bf8a0a63e516ea9df Author: Ed Maste AuthorDate: 2023-04-05 15:07:14 +0000 Commit: Ed Maste CommitDate: 2023-04-16 13:28:08 +0000 llvm-objcopy: link man page as strip.1 when WITH_LLVM_BINUTILS is set Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39429 (cherry picked from commit 5cb402cc89c01e0a1f18f8c6a4c7d9cfc10d26ab) --- usr.bin/clang/llvm-objcopy/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile index 20f5f191b766..1f4b8a3609af 100644 --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -34,7 +34,8 @@ LINKS= ${BINDIR}/llvm-objcopy ${BINDIR}/llvm-strip .if ${MK_LLVM_BINUTILS} != "no" LINKS+= ${BINDIR}/llvm-objcopy ${BINDIR}/objcopy \ ${BINDIR}/llvm-strip ${BINDIR}/strip -MLINKS= llvm-objcopy.1 objcopy.1 +MLINKS= llvm-objcopy.1 objcopy.1 \ + llvm-objcopy.1 strip.1 .endif .include "../llvm.prog.mk" From nobody Sun Apr 16 13:30:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzrfV182Fz45MKT; Sun, 16 Apr 2023 13:30: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 4PzrfT5CRyz3HW5; Sun, 16 Apr 2023 13:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681651841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZyToIuaAWhi4L/vcvbDhP3sfhENcOl1zP4bZJj8oy9I=; b=ILF/RF146Yx2IbykT3bScZSaFNkl2oyKfzEKlrOcIj2OCN0W4IgdpX9asi3AVSleoJehqQ 0Ulj+UFjXkOmD80eSlQAVNBuhTdLIVSThn5YlWBbUu3iaKp5rAgtRfrye1cB+D3TzJC1kK q5MFFIEtwhJy9rtC6hCZSt+dlrIsMmbEaDiM+D5uV3xp9SbB7fG0G+nbqKGSBGdZH0vCmx x79JVkBjlRtdP2MfTJ4waL2FvRsTkw1UD5TQdLhRid9b8Q/CRWy3R2dxAfHscQe6mBe4j4 MpM5yT0ASbnVwInraigabmR5IuGjryVV3yB/0ZtySmbyPX4rU5aAyKMglMmv0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681651841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZyToIuaAWhi4L/vcvbDhP3sfhENcOl1zP4bZJj8oy9I=; b=ND3ua6ImRnCGZvvA8Q8G1pkudB8B1jqAS54fx6cpCZ4eui/CBxO+3RiJWZWaYOfHk08aKp OOVeZkJ9SAYibr0ruvvnRKO84CWiLJ0pCbmXS/ObL6DgChPoDnZbebQBuRFDb8th/NcaJ/ L9aGzqZvG3/FCHMYPnpIvv1dfSWzctX1e+snkDJcTlAv9MGZFR9XWeAw5KHQIBo9R01cU1 0+F5W0E/OSZcYqYPRrevWctq7YGaljT7rkp+tdQRV5UBmTEipm6LxxzV4WvM0hn0M48eN+ SYpNpgLBqOQ9gxHb5N7UOAv9OzRJCb2JXOH3FQ/OYnBTWvsNrTMH8DivrqapZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681651841; a=rsa-sha256; cv=none; b=fNZSAbr8r5T2CRlqUvKIGVwbDwmKc8NmJ0jcwSzuNEuuMTU62qRIabEfWm9oAkpXH/gWy0 mE4zPYsklr9kZUoLKw8qd0eTrUUfTpkXBUKWRVoGSVvE933K4PyKL5ECQuA8qBISee87Mx qSVz5jRxPWxh+MaBYZuIQNlQn2KETKtLHYBEPQKjcB0QupFsZYMche8QVikZdIn6wDpJAD uU5UkD3Heyg3ZHFT77bODwcFZOoMgqJvokr5TPVg9oucSKSW0CIR3ot/NTcqnB3o92epiY XxZDM0E38Y510qJQzLqBnQn53U2zThL90LsoI7nCOcyo59J07tjOnbYL5d69fA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PzrfT4D5wzpZK; Sun, 16 Apr 2023 13:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GDUfnC078857; Sun, 16 Apr 2023 13:30:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GDUfQE078856; Sun, 16 Apr 2023 13:30:41 GMT (envelope-from git) Date: Sun, 16 Apr 2023 13:30:41 GMT Message-Id: <202304161330.33GDUfQE078856@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: e0a9723dee9c - stable/13 - fs/cd9660: add header include guards List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e0a9723dee9c1e900047b131c2c30466db4a9c46 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e0a9723dee9c1e900047b131c2c30466db4a9c46 commit e0a9723dee9c1e900047b131c2c30466db4a9c46 Author: Ed Maste AuthorDate: 2023-03-30 16:49:40 +0000 Commit: Ed Maste CommitDate: 2023-04-16 13:28:54 +0000 fs/cd9660: add header include guards Diff reduction against NetBSD files in sys/fs/cd9660/ and OpenBSD files in usr.sbin/makefs/cd9660/. Sponsored by: The FreeBSD Foundation (cherry picked from commit d33cdf16df52050102931ee3b37ce173e449c9c1) --- sys/fs/cd9660/cd9660_rrip.h | 5 +++++ sys/fs/cd9660/iso.h | 5 +++++ sys/fs/cd9660/iso_rrip.h | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/sys/fs/cd9660/cd9660_rrip.h b/sys/fs/cd9660/cd9660_rrip.h index 67ec3c233a0c..0c37f204c530 100644 --- a/sys/fs/cd9660/cd9660_rrip.h +++ b/sys/fs/cd9660/cd9660_rrip.h @@ -37,6 +37,9 @@ * $FreeBSD$ */ +#ifndef _ISOFS_CD9660_CD9660_RRIP_H_ +#define _ISOFS_CD9660_CD9660_RRIP_H_ + typedef struct { char type [ISODCL ( 0, 1)]; u_char length [ISODCL ( 2, 2)]; /* 711 */ @@ -137,3 +140,5 @@ typedef struct { u_char offset [ISODCL ( 12, 19)]; u_char length [ISODCL ( 20, 27)]; } ISO_RRIP_CONT; + +#endif /* _ISOFS_CD9660_CD9660_RRIP_H_ */ diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h index 591bcc4ff755..325bb97a9551 100644 --- a/sys/fs/cd9660/iso.h +++ b/sys/fs/cd9660/iso.h @@ -37,6 +37,9 @@ * $FreeBSD$ */ +#ifndef _ISOFS_CD9660_ISO_H_ +#define _ISOFS_CD9660_ISO_H_ + #define ISODCL(from, to) (to - from + 1) struct iso_volume_descriptor { @@ -365,3 +368,5 @@ isonum_733(const unsigned char *p) * Associated files have a leading '='. */ #define ASSOCCHAR '=' + +#endif /* _ISOFS_CD9660_ISO_H_ */ diff --git a/sys/fs/cd9660/iso_rrip.h b/sys/fs/cd9660/iso_rrip.h index 5ab9103022d1..99c34f971efe 100644 --- a/sys/fs/cd9660/iso_rrip.h +++ b/sys/fs/cd9660/iso_rrip.h @@ -37,6 +37,9 @@ * $FreeBSD$ */ +#ifndef _ISOFS_CD9660_ISO_RRIP_H_ +#define _ISOFS_CD9660_ISO_RRIP_H_ + /* * Analyze function flag (similar to RR field bits) */ @@ -83,3 +86,5 @@ int cd9660_rrip_getsymname(struct iso_directory_record *isodir, int cd9660_rrip_offset(struct iso_directory_record *isodir, struct iso_mnt *imp); #endif /* _KERNEL */ + +#endif /* _ISOFS_CD9660_ISO_RRIP_H_ */ From nobody Sun Apr 16 13:50:20 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pzs58611lz45P1W; Sun, 16 Apr 2023 13:50: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 4Pzs585RWdz3lYr; Sun, 16 Apr 2023 13:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681653020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AlEC9nrTlam8HCroc8sEYEccjprf6dmdG+e+1jc5mGM=; b=unU2zy1WOwT+lS4tfd89XjXB8vCi4hjmH5d8gj9KR+L6SUN3bFl5IAPiuaDKvfrbV195QP 1Hb4vPHztx0qOz0bLUxUm8skJ325uFnXRxO133PAIpSK2b8H4PdSyojforTHTXgNw6616N ilh9rmerEsuMbHPAR6K4m71BZM4WGvQyCzINHMxHIQYSRIepKAYXHD4orXX4xanWTCyCvR vxu0y4p+kc3Lfk97zVPegnj6sJSXJ7E0E1/ooxIDPlxnMj/4CrIkAqNjl6+c+4lQG6p6Rd 71LNJr2HSPvwXa6nqkIbzt10+WXAfP9EYLttQqCy2aSVDQYpN1holzk5Z+t2HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681653020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AlEC9nrTlam8HCroc8sEYEccjprf6dmdG+e+1jc5mGM=; b=a28eHXD5OMXHdpuxzuFDzyU/TojLjVeqTVyy3Z/X03TXOOAwSgxI4PZndyaORvCtYJcSJQ GC4lRXPVX9Hz6mPi4aUWtw7H9E2SF/3AHWq/VS6P5gLvpaHVT842mhr5NDKU7akcKobxJb f44TRSnPF9Etqk9GGpLEuyVIXmyvbYeRH/p2o3YjCgJuXCwtDFoA9TXjKJqYUqTglCIWlN JPGSkPtRoWDFtET0Xv9e3hbU0EAYlp/8LEybkQULhXIElXqGu6wxc+WUJDpJRsf17FQAat /McDGV4PdeThHgfp0spuv7CCRwJfQGfp8PJOgZBE3WgtccbYiTgrx7gCTWmMeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681653020; a=rsa-sha256; cv=none; b=KS3Odz6gz9zKD0nc0Im/HFe6SgClgUz2l6QN/Dl66az8/4fD1RlCAYlfyl6CP2Qlz9EGqz LDE65gkbpor5UKdjj6Oc+6pHsUC8ZjocxZFKxuJIa7OIc6sbdbB+TJEeOwdYIZIQTJADxK Bb91jEhTy/nwS9Qz3T+/X2wZ2NdEzlGjRbHUFpyqbCktU8Wgc4hfRXkl3nEInL9BoT7kV/ WF3lfEdBERqUzIrHsGosG7iB+0vG5cgXLiNGWF0b5XRi1hzzoHJMs/yMPEjbmIYeC9BEPP rqfxFnnoMCYQpwF2dm08lG+Pp+62NgPDSfIcU8GwiyAnZMhSCX90IWxarpbgNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pzs584TFMzpwj; Sun, 16 Apr 2023 13:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GDoKmM011120; Sun, 16 Apr 2023 13:50:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GDoKOW011119; Sun, 16 Apr 2023 13:50:20 GMT (envelope-from git) Date: Sun, 16 Apr 2023 13:50:20 GMT Message-Id: <202304161350.33GDoKOW011119@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: 3e9d966ce45e - stable/13 - vimage.8: Remove a double word List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 3e9d966ce45e3971c295a1dff7435d6b9f1321da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3e9d966ce45e3971c295a1dff7435d6b9f1321da commit 3e9d966ce45e3971c295a1dff7435d6b9f1321da Author: Gordon Bergling AuthorDate: 2023-04-13 18:22:25 +0000 Commit: Gordon Bergling CommitDate: 2023-04-16 13:50:09 +0000 vimage.8: Remove a double word - s/are are/are/ (cherry picked from commit e0c2f93029850968712a4fb4ab3630579d8812d3) --- tools/tools/vimage/vimage.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/vimage/vimage.8 b/tools/tools/vimage/vimage.8 index accb9d6400bb..8b0d74f69a74 100644 --- a/tools/tools/vimage/vimage.8 +++ b/tools/tools/vimage/vimage.8 @@ -70,7 +70,7 @@ Every process, socket and network interface present in the system is always attached to one, and only one, virtual network stack instance (vnet). During system bootup sequence a default vnet is created to which all the configured interfaces and user processes are initially attached. -Assuming that enough system resources are are available, a user with sufficient +Assuming that enough system resources are available, a user with sufficient privileges can create and manage a hierarchy of subordinated virtual images. The .Nm From nobody Mon Apr 17 06:19:01 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0H1x2nLTz45Qdn; Mon, 17 Apr 2023 06:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0H1x28c0z3GFq; Mon, 17 Apr 2023 06:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cZna1/vJ0lPY7cemX/TrMT1//rUqCNIP8MIzXzaekPE=; b=XdAT2UMS+ssANaHipdHOi7e07TUi5MqfNOdaUBWlOfMkozBMWigPG87SfObLzAgjqRAiBN u28dLZPnHfYUgru5/h4CM69wtupPHBZorj0RS7AdQOJwURmDkgmJo4iTb4zBs9A7vgwuK1 c5EIEgXNaA8htSkbmUfzOuJkwFjo55DGa3jmSp1kaTLPMOXYggjpZg2cHThXRwYG3dGn6L dOoxKf4MjwXjQwdh6mSKFpN7MGKK6Gmw1483HhKwOVKA+wEOOi+J43PgB7vIK7QcYaKRKY hQ36Th5kLULHp3zIfqb0U++7osKlm5vtRXmFTmaVT9yKYt+AdIZlQWlb03afzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cZna1/vJ0lPY7cemX/TrMT1//rUqCNIP8MIzXzaekPE=; b=MrhCdf+e+RkoJsfwWBV0nL73krLNwLdUhzthR60p25J/1nkKiSs+uLb+VEqhkfpUd/TBWG E1IOrFkpoQqr3D9K7ub1QE8HFWh1bHuZk72u/xfaAP3yiVTMVsk5Gv9c0n6yvr9WlMAPEX ZpwlGEM3+l/xlhV+x2K1ZxK5NwEfv7mWVT94qVpN02i/VPjIsvmslUhUwqS29ZdAFvfk2N SZNOXaMnKrVBs7qauNM/mBriJAcNrVAXfauaScP1r1tvV6SN6paMZ4z/vxHnBmW16oGaru qvLKfnH0E685QjHmfYFzbMzonJl214uW6msUNf8lXwfcqJxSw4FrE8OH8daOxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681712341; a=rsa-sha256; cv=none; b=KfLHuW3ocQkFjQOmcHTaVsRiR2gNdFfXXHdfWAb03wBxyIz9YyMvsOEBZBNqQQeO2a5Lnq lZ14T/SeJJyW3IyJE+51yEQ+81ZiPxx0cay+E/kYJWJyKQ0XoGPffxpXmmsnwhDNEjkfHj DkiL34zuxlknVIAyzIanv4xy+fr2lGIjd96tDh/DIGLg2VMhHoOb5bExNyZ5ulVRPMj+IY O+atiXvo4xwdnNyeEIYQZ7MJ7U2ZQFzVGli6Y13xKoEVZvT7Uto5g1tKn1yEAPCD90d0Mg vHqEjJ+MRMQwgTGuKIlXHQWvbBVHuGEscJkedTRzkeEcSYivdd82Qz/Nd7G/tQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0H1x1FGYzJNs; Mon, 17 Apr 2023 06:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33H6J1IR030685; Mon, 17 Apr 2023 06:19:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H6J1PU030684; Mon, 17 Apr 2023 06:19:01 GMT (envelope-from git) Date: Mon, 17 Apr 2023 06:19:01 GMT Message-Id: <202304170619.33H6J1PU030684@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 7124e665dac9 - stable/13 - powerpc: Use the existing CTLFLAG_RDTUN and CTLFLAG_RWTUN flag definitions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7124e665dac97258d5df4764ad81eb0563212a65 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7124e665dac97258d5df4764ad81eb0563212a65 commit 7124e665dac97258d5df4764ad81eb0563212a65 Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-17 06:17:48 +0000 powerpc: Use the existing CTLFLAG_RDTUN and CTLFLAG_RWTUN flag definitions Use them when possible, instead of separated flags. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 (cherry picked from commit dc1c5138c3255cc9004a3842001ed6c5db8f4ea3) --- sys/powerpc/powermac/powermac_thermal.c | 2 +- sys/powerpc/powerpc/platform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/powermac/powermac_thermal.c b/sys/powerpc/powermac/powermac_thermal.c index 2b1c383ded10..03dbb998559f 100644 --- a/sys/powerpc/powermac/powermac_thermal.c +++ b/sys/powerpc/powermac/powermac_thermal.c @@ -61,7 +61,7 @@ static struct kproc_desc pmac_therm_kp = { SYSINIT(pmac_therm_setup, SI_SUB_KTHREAD_IDLE, SI_ORDER_ANY, kproc_start, &pmac_therm_kp); -SYSCTL_INT(_machdep, OID_AUTO, manage_fans, CTLFLAG_RW | CTLFLAG_TUN, +SYSCTL_INT(_machdep, OID_AUTO, manage_fans, CTLFLAG_RWTUN, &enable_pmac_thermal, 1, "Enable automatic fan management"); static MALLOC_DEFINE(M_PMACTHERM, "pmactherm", "Powermac Thermal Management"); diff --git a/sys/powerpc/powerpc/platform.c b/sys/powerpc/powerpc/platform.c index 6f8f0361d11f..b9513c8f4e0c 100644 --- a/sys/powerpc/powerpc/platform.c +++ b/sys/powerpc/powerpc/platform.c @@ -68,7 +68,7 @@ static struct kobj_ops plat_kernel_kops; static struct platform_kobj plat_kernel_obj; static char plat_name[64] = ""; -SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RD | CTLFLAG_TUN, +SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RDTUN, plat_name, 0, "Platform currently in use"); static struct mem_affinity mem_info[VM_PHYSSEG_MAX + 1]; From nobody Mon Apr 17 06:19:02 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0H1y5Hcpz45QCK; Mon, 17 Apr 2023 06:19:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0H1y38djz3G3X; Mon, 17 Apr 2023 06:19:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KiudUFt1aaB2dkcESjTV/S1BxykevX9ClbrK8dLxOAM=; b=rQUZ3HupQPVxiswoXa28yQHLW6CbG6skkZRfQC3tbt0i18l7Sek4XnIZToLjiDA2y2sKBm FQ2reLIET4B8SyWijfDM/Nj1YNcaSg1lDGNrC6PzBviUyBDPmEqpHiiaN/+k5zfamAI9/P mzuSzVougIO0tMyvU3njdFHhHH/s1LGg6h5jshzPwQXezotlCgagxh364WQzpWmVpZXEi1 Jx7Jex8tlcAhkiAmHf7bAtGazpaakOdsxADAn7o03AekUBBfhXBmakc6WyFPDdQnsdoC18 67WoS/P3ji56494BUAUnf73uHnYEjCWkCdhs+QROLJt+LN7eNjtagLLw8Ouy2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KiudUFt1aaB2dkcESjTV/S1BxykevX9ClbrK8dLxOAM=; b=iaZmNJsD6tRNgvPIiwU1Q0cUCLaHzG748SyCqJ5UmP7W/ZAScucDc/1L2QTNfNgMG9GiIY AM2jIdnUDpdXxL1yTDdP1TIINlYEYrTfF97WP/YFWbEN469k9ljNzv5184DdkrdhulIbDX 8FhbYRvvKtv9RnYdjpjmQWPsgYnFyBL/Nuxoe7hch9vLvvV39tyfYIjt5nf3Vq/NSR/P5j DFXmxLkTAx5q2m+a4zThgCkagc2UDKWszt1Cu1jVdj8cMpdDxI3oAZ4tC3Xf3QHt3/F4tX ZbbaLKxwRQsz0lHwyqsbfJEXbOf4xDQ+SsJAQKI7D360deyLb9ae9JAl/iuPPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681712342; a=rsa-sha256; cv=none; b=GWXFPOdFAjGxDLN0zdRfN/SrdMXnkcv6faCpJ+lOSwPhP+CUaVWJF5y/9tilHx0NnyQ7bf fyPDjjupM6huUYl4hN/6nOWagygDsM+BY8pJtnkRJVlYdY0h0ZdfBwOYzGmYG49OCZEaZa a7hTVM7hYTikqWToehpHw45S5v2g6QilT59AjM2+ZTT7zfGqQdxFS6vmmNEZmZh+g9wCCG Dn86j/Jn2JK3Ue4KTwWMBAHGSmGZuovlk2PRWXKKRTKqvzmviXChnMI4DACeBU4RMvCzGc I8MF6W/Pu0vcesZb09s2tPgPqM8gK5mGfv0m30vU5kYQQAW/3cbLEsVMYMp/7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0H1y29lTzJHm; Mon, 17 Apr 2023 06:19:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33H6J2Ha030704; Mon, 17 Apr 2023 06:19:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H6J2Bh030703; Mon, 17 Apr 2023 06:19:02 GMT (envelope-from git) Date: Mon, 17 Apr 2023 06:19:02 GMT Message-Id: <202304170619.33H6J2Bh030703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 09f9dad4654a - stable/13 - cam iosched: Use the existing CTLFLAG_RDTUN and CTLFLAG_RWTUN flag definitions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 09f9dad4654af6821f8d9e70d35a8cc78d1305fe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=09f9dad4654af6821f8d9e70d35a8cc78d1305fe commit 09f9dad4654af6821f8d9e70d35a8cc78d1305fe Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-17 06:17:49 +0000 cam iosched: Use the existing CTLFLAG_RDTUN and CTLFLAG_RWTUN flag definitions Use them when possible, instead of separated flags. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 (cherry picked from commit 69cb72b8728ba605d6cc8758480eca3fc6fd2ed6) --- sys/cam/cam_iosched.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c index 50b6db88cebd..59feb68898d4 100644 --- a/sys/cam/cam_iosched.c +++ b/sys/cam/cam_iosched.c @@ -71,7 +71,7 @@ static MALLOC_DEFINE(M_CAMSCHED, "CAM I/O Scheduler", #ifdef CAM_IOSCHED_DYNAMIC static bool do_dynamic_iosched = 1; -SYSCTL_BOOL(_kern_cam, OID_AUTO, do_dynamic_iosched, CTLFLAG_RD | CTLFLAG_TUN, +SYSCTL_BOOL(_kern_cam, OID_AUTO, do_dynamic_iosched, CTLFLAG_RDTUN, &do_dynamic_iosched, 1, "Enable Dynamic I/O scheduler optimizations."); @@ -96,7 +96,7 @@ SYSCTL_BOOL(_kern_cam, OID_AUTO, do_dynamic_iosched, CTLFLAG_RD | CTLFLAG_TUN, * Note: See computation of EMA and EMVAR for acceptable ranges of alpha. */ static int alpha_bits = 9; -SYSCTL_INT(_kern_cam, OID_AUTO, iosched_alpha_bits, CTLFLAG_RW | CTLFLAG_TUN, +SYSCTL_INT(_kern_cam, OID_AUTO, iosched_alpha_bits, CTLFLAG_RWTUN, &alpha_bits, 1, "Bits in EMA's alpha."); From nobody Mon Apr 17 06:19:03 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0H1z4r6bz45QFw; Mon, 17 Apr 2023 06:19: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 4Q0H1z3lqbz3G69; Mon, 17 Apr 2023 06:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eqDy04TxdQ/yO5+Zd1PKDrtcsmhCu/CrOuH9fpFgfx0=; b=Z0+wrkDde07Dm5VGcKvIkbO6Phg3JFqP4Y0fSe+R927uyGZ7Zf9xgXshx0/QGOzZcv1pBr 3a3dVMCkdsj4QjQiMLNP6yk+1zcTDhwjYAaSZhGIxT9z8b6Pqqo/zDQCE+xL9amFQjKgdl BxiNGruKkCaB5rPVUB8KIB/bv6ppC3lOzDiEBcTYT2qiFTCNcua5B0GQYkWITjPO9X/Rgl uuFVF2jzzRCuemjmX0GNo5OakntxNXjm5EDZCYJYwfuApGIRb53Gf2aYQe24sVd5ndHX76 3wBn2oeF22mtCjaWW9VCPc90H36v8PrPUlAlLB6ssuzB9OQSavDAYxSuCv7jxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eqDy04TxdQ/yO5+Zd1PKDrtcsmhCu/CrOuH9fpFgfx0=; b=cJmjXbHK6iDs04EXyobkkHKrw2noqGO7lKiCZjV87wqu720e2536neryBorktIYIs8cUH/ 6kzTWPLFjDd4XhgBNysnRy6VroGCuzRuT/uDNu1gjm4UeGnqLdOKXIxmBNQpPFr+aJcHaQ jyimABL55tcdV6VOO7Tb1rw4f4g2KiPSfPL+Iaw74eKTCvwkgCFuae9X86+H43kdL5Lb3/ Rh2hOk2KXpDEgXBEr+hZmlKPZ1mJMLPLj2BwTNACSS695l0H0OP6bYNVKbq95ZqtR3CPcz LiKBqbfItp1Me6Z0QbwvFmMVcdhHOQ+XnfABMCOHiHd2G8lBXp4e9FYnZrIoQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681712343; a=rsa-sha256; cv=none; b=jRUIhJD1WffrpCSO8kWU+BfMznmhoNRbyrtpXYjwxtjqYTMEGtp3a3XmEBeQ6M/d3GcZ/L B50klJRVa100ZlYvnsGe6tf1OpBsQvdnuCavvNMIS9V8rXlrm8Fo6Fr8sqFV8bsAW5qNXV /UTX9CAazLPNDfxpN4wgB8EDXpwwCVBxFF2b/uJjeejQCybB6ON3p8aOhkiyT/Uw1zTzFi RyFnK2NHCCiNQkrgW8913PnYIQr8JoNqI/NsLoXh75hqpTLdqpvvbMhiTw1wo5nLNf4a6c mhSf3YgvfENVa8A0vPP1Ny8AdVpnslVchfAbBJEgTZ/HacIk//51Nmm/pB2HIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0H1z2npNzJft; Mon, 17 Apr 2023 06:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33H6J3aV030723; Mon, 17 Apr 2023 06:19:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H6J36Z030722; Mon, 17 Apr 2023 06:19:03 GMT (envelope-from git) Date: Mon, 17 Apr 2023 06:19:03 GMT Message-Id: <202304170619.33H6J36Z030722@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 60d6ed9cb8b3 - stable/13 - ice(4): Use the existing CTLFLAG_RWTUN flag definition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 60d6ed9cb8b3823030e625de3eb8b640ab92b983 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=60d6ed9cb8b3823030e625de3eb8b640ab92b983 commit 60d6ed9cb8b3823030e625de3eb8b640ab92b983 Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-17 06:17:49 +0000 ice(4): Use the existing CTLFLAG_RWTUN flag definition Use it when possible, instead of separated flags. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 (cherry picked from commit 5ff8018108278d06e024676c539e9f60f8189e83) --- sys/dev/ice/ice_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c index 0c047b574bf2..880f43e3598f 100644 --- a/sys/dev/ice/ice_lib.c +++ b/sys/dev/ice/ice_lib.c @@ -5852,7 +5852,7 @@ ice_add_debug_tunables(struct ice_softc *sc) debug_list = SYSCTL_CHILDREN(sc->debug_sysctls); SYSCTL_ADD_U64(ctx, debug_list, OID_AUTO, "debug_mask", - ICE_CTLFLAG_DEBUG | CTLFLAG_RW | CTLFLAG_TUN, + ICE_CTLFLAG_DEBUG | CTLFLAG_RWTUN, &sc->hw.debug_mask, 0, ICE_SYSCTL_DEBUG_MASK_HELP); From nobody Mon Apr 17 06:19:04 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0H220hpLz45QCN; Mon, 17 Apr 2023 06:19: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 4Q0H2106mtz3GHS; Mon, 17 Apr 2023 06:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZjIU5N1dAni5VIDMfqeqkGq6qMt7Hw5fhdNcNJf2Gcs=; b=SmVwECiQr3z4HDmUnjUEsCukmjIw5jBNvyC9IOszybdF++z8hbgvq0W3I/0/+TAkChl0hO 5gjEGscP9yfJNemyhro+qbGXCs3NT/u9u7fkSr4AiYVsu8yIhESBhb2sJaeYBgRiJG/3TX DJGxt8WSOc0BaIy3jHuWb7+za5mnk+46GaQjXQATPQQQ7fwM1dooZOedApy9GTcsyRZFQW 1JJAibZRcy5SxE3sga/QOP8e745geSseVeO0tikXzO6Gr6ck3SO1u8XEyyHjNOO1ECNgm7 7FyC82QFmAz6rqDkPEL/TQOUL7zKrg5o7u7jjVGO46TXsKyycCyTm/MzKejXwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZjIU5N1dAni5VIDMfqeqkGq6qMt7Hw5fhdNcNJf2Gcs=; b=TPYGZl9/FLwFB3XxBSD9tRqxHTGwXZ8VJMaql/1k6QDH0PpTQlru9T6NePLPyn/why/aZm rbJQBGx1AGqYflMJfKlJKUp+BZOKD4tIOmZ3bSfnRgHEbtW7hDBl0VfgjCpdHUP1pLLoQ/ wJSgyDPjJ+Yb2trIA73BOyJQ4QFXhm0C5xVDF46H0MGUfnVf+ZFYUPYoWXE5tcGCcafj+c GT2kar0BoRgNX8tFNGVRvD+h02kXZ0dv00H6SsirKayZGAhe/1D1b4nmsxqAnITdmluClu DrZGY8GHuNkq38pNu6Gpc8a0SmYBvJIq5AvDLEELBf7aAi3BtAIzieNV60nWPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681712345; a=rsa-sha256; cv=none; b=WPnFkHgQ8POeKnQ14HY8Kh1PW9lVBsoXAdEbz7AS7osx6rksN6d4Q1jFBc3UqxN2OvNj0H JP/AnVl9tFm/jVHLuEPTtNmFs8QiRrlzosUItOeeLXjrT4efXAWexFi/j0VK58vWeaSuo7 IlhPicJBZVOMkmz9cwNEuoHmG07itGvibiTqqFDigh4WbvYUBoOL7k1f8OI8zhPL8XepuU j7tSJ92mzAkY4W7p/N6jz+pHt6eNBE2GOO31iXJoN9Cwchq/fp2e0cgzOAFLq/hIZ/F5FO m8BNqLtRKQQBWLXc164Lb1o0ocVpk9krLeURYerrxzpE3niPX6mr3hX9NTeUfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0H2046PmzJNt; Mon, 17 Apr 2023 06:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33H6J4Dw030742; Mon, 17 Apr 2023 06:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H6J4WG030741; Mon, 17 Apr 2023 06:19:04 GMT (envelope-from git) Date: Mon, 17 Apr 2023 06:19:04 GMT Message-Id: <202304170619.33H6J4WG030741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: f500ecbeae7e - stable/13 - bxe(4): Use CTLFLAG_RDTUN flag definition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f500ecbeae7ee62d1994155ff819cf8b59c5509e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f500ecbeae7ee62d1994155ff819cf8b59c5509e commit f500ecbeae7ee62d1994155ff819cf8b59c5509e Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-17 06:17:49 +0000 bxe(4): Use CTLFLAG_RDTUN flag definition sysctl variables rx_budget and max_aggregation_size are read-only loader tunable. Mark them with CTLFLAG_RD flag. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 (cherry picked from commit 8bd9afe9e1821368f4bb0d39c8c6703bf5007fd1) --- sys/dev/bxe/bxe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c index 3b5fb46ed599..31c8207d246b 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -285,12 +285,12 @@ SYSCTL_INT(_hw_bxe, OID_AUTO, hc_tx_ticks, CTLFLAG_RDTUN, /* Maximum number of Rx packets to process at a time */ static int bxe_rx_budget = 0xffffffff; -SYSCTL_INT(_hw_bxe, OID_AUTO, rx_budget, CTLFLAG_TUN, +SYSCTL_INT(_hw_bxe, OID_AUTO, rx_budget, CTLFLAG_RDTUN, &bxe_rx_budget, 0, "Rx processing budget"); /* Maximum LRO aggregation size */ static int bxe_max_aggregation_size = 0; -SYSCTL_INT(_hw_bxe, OID_AUTO, max_aggregation_size, CTLFLAG_TUN, +SYSCTL_INT(_hw_bxe, OID_AUTO, max_aggregation_size, CTLFLAG_RDTUN, &bxe_max_aggregation_size, 0, "max aggregation size"); /* PCI MRRS: -1 (Auto), 0 (128B), 1 (256B), 2 (512B), 3 (1KB) */ From nobody Mon Apr 17 06:19:05 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0H2232Fgz45QlY; Mon, 17 Apr 2023 06:19: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 4Q0H215rBSz3GVQ; Mon, 17 Apr 2023 06:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TpEdBJph3+GWnmltrkgAdUNkdHVxx03qSL1z8rU6wIM=; b=w5RMb8iVlHjfqNY/cEn2Jr1iQCBB+7nwjjAjnl0O5drztIwTf+7SDpAXXRtmkyQpy/JKQa Vv8hvr1xKQXvsy8bCvS57s2s1rqazSIRFmTSUbGPwwcirzPTMcfEN5WkcYRf853zv3mWh+ z/eUlHeOTfRQk7/zlCx0E/n76pqrLEfFpf4TLdeY7zfXgIKbqcRaMD0t8efeOScplBI5et IK3fYxetpSorhPqF28A0ePrk6ltl0gXMqT/KzUJv/QM8cIVkLlB2/3rsURTW0CvSwq6TEi AjvCmAQhL9FPIL6lOiGM/q5fK3/Plf0yo8hIMGc58fbCL951ADE1a3n9CfmHeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TpEdBJph3+GWnmltrkgAdUNkdHVxx03qSL1z8rU6wIM=; b=SzWpLCS6vlAj8vY0ranQBQ6XdhNZPKWl9LA7YwRkG1Saa2rHhSTvEl3z3FEb9xgOqVFYCU fDlzsYKvFM6UtsUR4rniUvCjR4LUgqCZKGBwY4s89DHW51DoJBNTRFByV3m96fXR83ToHx 1JgBf4OYNYNbsWXylcjOYZPAce5Kb1vAqkXq93ZiZsawEQ0ywv8m8Z2Y/AxVwxAdDKdDyh yOl92mEZacQy1+tI+VdUUY21R+xvvX1LvNYVwVU7iu//GthxGryA/SiPn2RVKg3Mm6tkYk guVW3L9hli0b5xh0CtD6kwlPrCqaqACJJmMPnNNyJKE7Wv51AWFb0oy1bmCtkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681712345; a=rsa-sha256; cv=none; b=JboDEiyoaTtfO+u8vPqVjCPMoay/o4na7EmOn4jUpaqhWRLSRFIlbKT+izZmax4qevdFxq MXUj6/10LE8EMORDnhH+Qdr0xvG/fSY31VieQMoBKMJDgyNJ/+fHjmNFSbLwaE5WVr9oXE nedSY8ZirqEDFPoC//PikUEUgPOwjufXHVJi5IdwVx9g7P7uszqsoSHrMcHkA45+q04oAk IXOhqZGGbGD0z9ipYTAd3Wxu5iGbZPEUnADzFFgyBzv5/07lSTNgnpnQKNiz/xOoSs1B4B bnKNhp7zXfyfJEKRusOPs1wZKoLmPaupiX06gp+/13fFiaGn0tgGQt2jBqnc/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 4Q0H214hb3zJd3; Mon, 17 Apr 2023 06:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33H6J5WZ030767; Mon, 17 Apr 2023 06:19:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H6J5iB030766; Mon, 17 Apr 2023 06:19:05 GMT (envelope-from git) Date: Mon, 17 Apr 2023 06:19:05 GMT Message-Id: <202304170619.33H6J5iB030766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 07bd2fc4022c - stable/13 - iicbus(4): Use the existing CTLFLAG_RWTUN flag definition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 07bd2fc4022cc7da8c764b25d29aaf98d7a1647f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=07bd2fc4022cc7da8c764b25d29aaf98d7a1647f commit 07bd2fc4022cc7da8c764b25d29aaf98d7a1647f Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-17 06:17:49 +0000 iicbus(4): Use the existing CTLFLAG_RWTUN flag definition Use it when possible, instead of separated flags. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 (cherry picked from commit deac4c7f0753841de8da4d7f37d7e49620b3bbb4) --- sys/dev/iicbus/iicbus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c index b16a2bdba332..9d6f49de0582 100644 --- a/sys/dev/iicbus/iicbus.c +++ b/sys/dev/iicbus/iicbus.c @@ -325,7 +325,7 @@ iicbus_init_frequency(device_t dev, u_int bus_freq) */ SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "frequency", CTLFLAG_RW | CTLFLAG_TUN, &sc->bus_freq, + OID_AUTO, "frequency", CTLFLAG_RWTUN, &sc->bus_freq, sc->bus_freq, "Bus frequency in Hz"); } From nobody Mon Apr 17 06:24:42 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0H8W1FPJz45R6w; Mon, 17 Apr 2023 06:24: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 4Q0H8W0r9pz3hN4; Mon, 17 Apr 2023 06: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=1681712683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DpPAgaXhky8HGPfDubTnMjCTP3EsxoIrV3Hft1patmM=; b=UYLE9wD+KsT2tJtzAHj+mpowAgoXh+VfS9BfILg6ugrV+OgBDI3NYVZLX+9aAVAEOP4+Xm /FZfyXTOHtymD8BOu0cDLWn9PJaaEl6bi1Vqa95GA7ZKGEoVTkWHvF4eQo6g4pE4rFNiHW Qog93Ojv5pJTtPlsp0lflsvP78t8oM7gTQ0Nad4lj3ZcUzztRiC2fKvXa+hsyaZE0whvLf zpS1phmLVKJwK2DckIlekN/ck/Gq73JgZI0o8fLeeTimyAhHBUfBqmfP8hfaRycyXD1Vo1 Z9xK3E7Pnf82C+IEgJ6qjo8ims/PHgWIG1j83MzANoPJ4bni3j3DDe/0ebf3bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DpPAgaXhky8HGPfDubTnMjCTP3EsxoIrV3Hft1patmM=; b=C9N29FCcApjwKCMCSjO87noRhvkwLXo7gMqxzOBhqABfqgXyEiqCBvy/JBtwaTX7BQEcLC iB792O69+vEr+70Oq7qhtRTuNjibN/q6hqm3pgl4SeKmqBFHNaBZHBVuIkp9huW5psBovq 3e/InRodWr+v7ffpnioWNiSYkrOJkpVLOCmY3aCoiY+Le9MqWPYyUMQKTdMJeUAPUkOyq0 Bs9FX46yI90q4g6lpMkZbx91zbULAoWk2qggUCGFSE89MTa5ffwPMAg30OJpuCMrqO2VZg DJn1y+ilqR+Akpf9xXJLibq/tNy1NlW/nlrzG0DOwuCZjOzegvANoQyipyrOuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681712683; a=rsa-sha256; cv=none; b=TPw4s871jbu3JJqCvWiufnly21J6sd6H/42NB+sYa6Qyt/Z8X7Jif3pTFFmzMCh6xKp0qp L33RGiyS6w/oo2DtqDSLsQ0WKLjA5BEMuLveVpM6xJLGZYCUjrWDKshNdJubSammoaGTUr 2QKbsl2e5pPawylFos78jbmpvx6NWUIqtDdOoasGEOSCbDz9no2Au7NACRnlfi5Il0XYsd 1IiXqXB7XeGeF7rztPD6ZNOwovpv2euvE9jwigr3sQBrPhBV519pN0IfrwYtQFusqNZ0O/ lFH0zTQCpDYvevndgSk/1r4GTPI/dZbyS3QIS2u0LhtwUoEh9HQ/k6ogTDO0zA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0H8V6sdWzJPk; Mon, 17 Apr 2023 06:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33H6OgfO046079; Mon, 17 Apr 2023 06:24:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H6Og1E046078; Mon, 17 Apr 2023 06:24:42 GMT (envelope-from git) Date: Mon, 17 Apr 2023 06:24:42 GMT Message-Id: <202304170624.33H6Og1E046078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: f0274efa336b - stable/12 - powerpc: Use the existing CTLFLAG_RDTUN and CTLFLAG_RWTUN flag definitions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f0274efa336b59bcadf733537250de0c8a935b08 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f0274efa336b59bcadf733537250de0c8a935b08 commit f0274efa336b59bcadf733537250de0c8a935b08 Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-17 06:22:55 +0000 powerpc: Use the existing CTLFLAG_RDTUN and CTLFLAG_RWTUN flag definitions Use them when possible, instead of separated flags. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 (cherry picked from commit dc1c5138c3255cc9004a3842001ed6c5db8f4ea3) (cherry picked from commit 7124e665dac97258d5df4764ad81eb0563212a65) --- sys/powerpc/powermac/powermac_thermal.c | 2 +- sys/powerpc/powerpc/platform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/powermac/powermac_thermal.c b/sys/powerpc/powermac/powermac_thermal.c index 1a5db378daf8..2db5ec436d3b 100644 --- a/sys/powerpc/powermac/powermac_thermal.c +++ b/sys/powerpc/powermac/powermac_thermal.c @@ -61,7 +61,7 @@ static struct kproc_desc pmac_therm_kp = { SYSINIT(pmac_therm_setup, SI_SUB_KTHREAD_IDLE, SI_ORDER_ANY, kproc_start, &pmac_therm_kp); -SYSCTL_INT(_machdep, OID_AUTO, manage_fans, CTLFLAG_RW | CTLFLAG_TUN, +SYSCTL_INT(_machdep, OID_AUTO, manage_fans, CTLFLAG_RWTUN, &enable_pmac_thermal, 1, "Enable automatic fan management"); static MALLOC_DEFINE(M_PMACTHERM, "pmactherm", "Powermac Thermal Management"); diff --git a/sys/powerpc/powerpc/platform.c b/sys/powerpc/powerpc/platform.c index 252978f47a31..5c1bf2dd8057 100644 --- a/sys/powerpc/powerpc/platform.c +++ b/sys/powerpc/powerpc/platform.c @@ -64,7 +64,7 @@ static struct kobj_ops plat_kernel_kops; static struct platform_kobj plat_kernel_obj; static char plat_name[64] = ""; -SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RD | CTLFLAG_TUN, +SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RDTUN, plat_name, 0, "Platform currently in use"); static struct mem_region pregions[PHYS_AVAIL_SZ]; From nobody Mon Apr 17 06:24:43 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0H8X2lKcz45R39; Mon, 17 Apr 2023 06: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 4Q0H8X1LvPz3hQQ; Mon, 17 Apr 2023 06: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=1681712684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XqGHAaEXyQ8bM4yFPNyX8PsFEeh+UaJbQ6vDhqA3OBc=; b=Jk2F7e16ENElvShCMuyvrCpmYYExMsnr3MKUQ3LEnqNjw4VtlADmcLd29lGRKazlkyYabW vFtA19FBvweGssrSkwI28CQf50f8n6iqrv0lLtoDK2Bk/5YSItox3HKTzevaQbE2JZ0zd1 bEh5K3pTXJ0ZJ4PPKTuheCgD/xA2iN3Z80ytp26bmVaie/sdzFoRHVXK8uGGpi5+85qyr6 r2G/VaBBCgBFcy2tbBql+Mt6JQimHztCT00sD3dA4qG0OPD2AoizY22KR75AHRJz0vZC3+ vafByciLn92pZvkV/Il4kw9hrxnUHB9OS48T6mdccpw8EPteFe5xY4rx3eX0kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XqGHAaEXyQ8bM4yFPNyX8PsFEeh+UaJbQ6vDhqA3OBc=; b=K3lMJxYHvGS6/DPrJQe/DHEn75/D2yOo26ii22LLGwThLMNehG+i1osbNcMSbazxYBB7NO IEpjPRJ8Jb0E4sOhqQ68VcdUWAbYxupiF3RzDw9c7/gV5T4OEcqp2VZeJ6NTalCSWtwz27 mZ1IkN/2keLJeZgn9vIJMPCs2cZusxI7XMDlPVsZPXZ1U1hufD2PyWL9GNG7mymNevOweI e7UlibrdIRCTBclBk+J/17klvIxCUY2tA6M5gwGtTA981jk/dxGKZhXCTyQ9Y6VE7CPMpq UVIvZSrYTpX/rWTLLqTZISTKHWj/Br1mgxX2Dv51Ej3fkf7NEcaVFBJ7ARrRFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681712684; a=rsa-sha256; cv=none; b=vnGSkgC2QZdVJZ16XYBO6yBHgriwjt/mN09mm+3oXALAPeCpognpTWvlUudpTpoYWYZ2p3 moqQt0ZpaQW2nA9ttosNxcGxSGY9aof7Iv3XGnkMBuYubfPIz1OuviSIcb0hRQoJZxyyKX PMqcNai+EGMXvnNZIiUCAeVmXQZArTO4FQijxbEjO50y/mskv4VigPln0TLvwH/t1mDyww lPAwZA1v0JraaAtecHXa4ZNSNswSDD748IeaOJWy3eWYAKTj+SpjORz2a5MzUvQ946qFfn VtGOzmg6pD9pEBJmKK4Du65qyrldKcQY4g/OBMApD4llWm2qoHIjRbz273Tfzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0H8X0PGXzJkm; Mon, 17 Apr 2023 06:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33H6Ohgc046098; Mon, 17 Apr 2023 06:24:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H6OhGn046097; Mon, 17 Apr 2023 06:24:43 GMT (envelope-from git) Date: Mon, 17 Apr 2023 06:24:43 GMT Message-Id: <202304170624.33H6OhGn046097@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 1fa6add28785 - stable/12 - cam iosched: Use the existing CTLFLAG_RDTUN and CTLFLAG_RWTUN flag definitions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 1fa6add28785b44c91a332f69191af789b9f26b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1fa6add28785b44c91a332f69191af789b9f26b4 commit 1fa6add28785b44c91a332f69191af789b9f26b4 Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-17 06:22:55 +0000 cam iosched: Use the existing CTLFLAG_RDTUN and CTLFLAG_RWTUN flag definitions Use them when possible, instead of separated flags. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 (cherry picked from commit 69cb72b8728ba605d6cc8758480eca3fc6fd2ed6) (cherry picked from commit 09f9dad4654af6821f8d9e70d35a8cc78d1305fe) --- sys/cam/cam_iosched.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c index 0b4d89468804..470fdd42ade6 100644 --- a/sys/cam/cam_iosched.c +++ b/sys/cam/cam_iosched.c @@ -71,7 +71,7 @@ static MALLOC_DEFINE(M_CAMSCHED, "CAM I/O Scheduler", #ifdef CAM_IOSCHED_DYNAMIC static bool do_dynamic_iosched = 1; -SYSCTL_BOOL(_kern_cam, OID_AUTO, do_dynamic_iosched, CTLFLAG_RD | CTLFLAG_TUN, +SYSCTL_BOOL(_kern_cam, OID_AUTO, do_dynamic_iosched, CTLFLAG_RDTUN, &do_dynamic_iosched, 1, "Enable Dynamic I/O scheduler optimizations."); @@ -96,7 +96,7 @@ SYSCTL_BOOL(_kern_cam, OID_AUTO, do_dynamic_iosched, CTLFLAG_RD | CTLFLAG_TUN, * Note: See computation of EMA and EMVAR for acceptable ranges of alpha. */ static int alpha_bits = 9; -SYSCTL_INT(_kern_cam, OID_AUTO, iosched_alpha_bits, CTLFLAG_RW | CTLFLAG_TUN, +SYSCTL_INT(_kern_cam, OID_AUTO, iosched_alpha_bits, CTLFLAG_RWTUN, &alpha_bits, 1, "Bits in EMA's alpha."); From nobody Mon Apr 17 06:24:45 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0H8Y42Gzz45R37; Mon, 17 Apr 2023 06: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 4Q0H8Y2Nqqz3hQp; Mon, 17 Apr 2023 06:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mpggkTm8RWr+9iHcQbOPiuECaA92aP8rMv8y/CWHkLw=; b=Favk1P60cEl51J6DxXZcZ31Vfl1nQOqNYVhfFCply5RzI5mrwXu5vTRpFDH7/K2z3FXYXg zTc1ITXOIR0T38XQHHNrWJfIQ7sgvzgVYu4vzcWxCpLiO+GaN1clRUtgf2fk+pgErwhGPs 4T0ZtNNc1zF43CvKjLf9ieL8bB03aq7wYro/qy+96LMnpqaHQl5oKdAYX26akWZXCsTU96 rvJ6Tc4O6CEA69lQuYTi/up+N7iOmrzbstr+eDdd02/Zl9vDlp1Tweriky56uq0zLwityi NUkfZ/SB7Cyx/yphbedgxDQJh73OSdcuWu1JMsYRDoK3/u6MX3IQ6P8bjNeu0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mpggkTm8RWr+9iHcQbOPiuECaA92aP8rMv8y/CWHkLw=; b=Hi7uwOWKglQhxtfw6YQ80w0lAWeqOut26GoqYq1rxyIkgDa/MG8XDHu9HNx66/EuN6F2VO KyQ1rd/e6jTkj66ruvicsi4xv4ZH9mh1CkYjKKE4EERiB73NAvKea99lo92K5X0RVXnJvt T2Ta51UNdQFXyYgN+KxD9/Wr34GGKyUWndilUH8X4u8pzOnze4a/JI5xfALGBduEaaDLL2 6Mnoyzo/8Yf2n+1ys9fOkN6xcgFs/iujjPsHNk6xcwYioUI3hSK5s+0NUqTMqYSX8VvYJB H4tHk7ft/knFMnQssuZB65JPLACi9dVIWcBMO7045RenUC8bNnijm9GcQwvRog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681712685; a=rsa-sha256; cv=none; b=WtPsZtiS1nRcujxgXAkm4zgdpZHQ5ISgSk/yD6szBO33U9Y7aqLmrg1seZ21e7UKw5D2QQ 2i1jbMn1zxWajftpMOj184OEWFj152oherQgR8CkWJgo5Fhg/82K/7APXHEeJdFZv8mmWy UlaYHUWE2uWAoviw9UaCou3DDSFQnyiy2VgZtExbZXLk65cI4g/imiMTW7iOXkJC16zJQU vHQePF2HB+Q28510BxgXml1XDCgxlxrzuRrvLHX59+25vjCQaK8kMyxdbo4iZok2MndX6j y3GYiD7BqVmi2XtN+UsJj0mPm+XRc1g4Bh1rYF/73V+e28XCNGEf/c+D3zZXWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0H8Y0wfKzJCq; Mon, 17 Apr 2023 06:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33H6OjK5046123; Mon, 17 Apr 2023 06:24:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H6Ojo1046122; Mon, 17 Apr 2023 06:24:45 GMT (envelope-from git) Date: Mon, 17 Apr 2023 06:24:45 GMT Message-Id: <202304170624.33H6Ojo1046122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 5813a7c0e7c2 - stable/12 - ice(4): Use the existing CTLFLAG_RWTUN flag definition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 5813a7c0e7c2adf31fa10b1295a3f423b991134d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5813a7c0e7c2adf31fa10b1295a3f423b991134d commit 5813a7c0e7c2adf31fa10b1295a3f423b991134d Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-17 06:22:55 +0000 ice(4): Use the existing CTLFLAG_RWTUN flag definition Use it when possible, instead of separated flags. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 (cherry picked from commit 5ff8018108278d06e024676c539e9f60f8189e83) (cherry picked from commit 60d6ed9cb8b3823030e625de3eb8b640ab92b983) --- sys/dev/ice/ice_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c index f562b3b55b63..29759600b93b 100644 --- a/sys/dev/ice/ice_lib.c +++ b/sys/dev/ice/ice_lib.c @@ -5611,7 +5611,7 @@ ice_add_debug_tunables(struct ice_softc *sc) debug_list = SYSCTL_CHILDREN(sc->debug_sysctls); SYSCTL_ADD_U64(ctx, debug_list, OID_AUTO, "debug_mask", - ICE_CTLFLAG_DEBUG | CTLFLAG_RW | CTLFLAG_TUN, + ICE_CTLFLAG_DEBUG | CTLFLAG_RWTUN, &sc->hw.debug_mask, 0, "Debug message enable/disable mask"); From nobody Mon Apr 17 06:24:46 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0H8Z3sM4z45Qkh; Mon, 17 Apr 2023 06: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 4Q0H8Z2xHPz3hLg; Mon, 17 Apr 2023 06: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=1681712686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ffzyAJZly1wVczMhVjyUzQmZFNYz8voF7kUQgCMfgAA=; b=PNWOoTGhOZc1IhkqUUYUVA8EuL2kPJ+UGoeW/5unddwo3ACEa1PNpjSs0iFayEQVLrLvyg CCG4d3gdBYneY9tQSpkpPSSsu8HvEbO9QwBtLFy7XXQP9z6JvlDKMztgyCJzzGQOTVe1x9 CW+LX/B9kBku8LfdsHzY3Eylqa54cnwJyGOkxKEdarxLHhBslrkwQqeflq1U+bm+4VB1ba URso52els4jrSO+6GTpY0jBtd8sD21HmHZQTMPy4gekYeaNkmNexB9KNQGxKrjsgsIZxhQ Qc8hSdjdHLMDpp1ejJkDYJx/q7c4EFHKe4hQGIZ0mkB1EH/t2+uBz/seLM4EnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ffzyAJZly1wVczMhVjyUzQmZFNYz8voF7kUQgCMfgAA=; b=rza8KHOdiMvZtqphXxkNhPk4dkD4MDFX9t90Eb7U1Td4KkTukqpKNEkOpSQCi81a9Bix0Z eRE6C0NcwHYPZvmXVHLKHRNdXxqQG/Xw9AtHkgfVU/y0oIbWJREcwhyIvPtP3Kx9188cCF HsMSQeTUfSkNuBLzRa09njhy/2QJnxBdB0/97MvCE4J36JV//na6Zee+1+aMWc/v03ocMr 5ucvxlwVKFyG0KqIGdPrOJV5Oza6/4jcC2dC5l3k/nBLTFWH0Hka2yyeS+k0F31BQDnIPy uShn9Sp3zV1ro49BnxtHjK137/D17BLWWVlnL+xT45A8+NNxo2RqPhBHmmxuFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681712686; a=rsa-sha256; cv=none; b=uKk91ZTwEEObrbX2ktisrMXFvD+kN/84wItnqyScfjw7OpIBY/EeiyTlSgtcBK4eBQEPMH /+ZDShDXv2ux0rdZ3aulLHg56I7zfPjUlXKPC4Eb9mcEczY+7Ulawq6eBhZOCk2LBIgbG1 j7eHDrgwW7csUrp4zHXJgTO6OJrsUKt+toFMGY3cgh73fdPvvknwP0V4G6kEyD7vvdPft/ tHPA7vIJp4a+4bb/yyqeqC0f3p1F7ZyMTD0tKCV+9VhUGbyrHtdO9B5yimyiw+abyntZGG ZjWeYPFoGy4SrDuqcBI3IcOpGkn+uKx3gsx3RDBvvOV07WEIO1nWqpBWlr1/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 4Q0H8Z1nt3zJm4; Mon, 17 Apr 2023 06:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33H6Oka7046144; Mon, 17 Apr 2023 06:24:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H6OkKa046143; Mon, 17 Apr 2023 06:24:46 GMT (envelope-from git) Date: Mon, 17 Apr 2023 06:24:46 GMT Message-Id: <202304170624.33H6OkKa046143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: f6954802a8c8 - stable/12 - bxe(4): Use CTLFLAG_RDTUN flag definition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f6954802a8c8f635d519c694851636ad16327f8d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f6954802a8c8f635d519c694851636ad16327f8d commit f6954802a8c8f635d519c694851636ad16327f8d Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-17 06:22:55 +0000 bxe(4): Use CTLFLAG_RDTUN flag definition sysctl variables rx_budget and max_aggregation_size are read-only loader tunable. Mark them with CTLFLAG_RD flag. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 (cherry picked from commit 8bd9afe9e1821368f4bb0d39c8c6703bf5007fd1) (cherry picked from commit f500ecbeae7ee62d1994155ff819cf8b59c5509e) --- sys/dev/bxe/bxe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c index 8c61c5f34bd1..82851a804017 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -292,12 +292,12 @@ SYSCTL_INT(_hw_bxe, OID_AUTO, hc_tx_ticks, CTLFLAG_RDTUN, /* Maximum number of Rx packets to process at a time */ static int bxe_rx_budget = 0xffffffff; -SYSCTL_INT(_hw_bxe, OID_AUTO, rx_budget, CTLFLAG_TUN, +SYSCTL_INT(_hw_bxe, OID_AUTO, rx_budget, CTLFLAG_RDTUN, &bxe_rx_budget, 0, "Rx processing budget"); /* Maximum LRO aggregation size */ static int bxe_max_aggregation_size = 0; -SYSCTL_INT(_hw_bxe, OID_AUTO, max_aggregation_size, CTLFLAG_TUN, +SYSCTL_INT(_hw_bxe, OID_AUTO, max_aggregation_size, CTLFLAG_RDTUN, &bxe_max_aggregation_size, 0, "max aggregation size"); /* PCI MRRS: -1 (Auto), 0 (128B), 1 (256B), 2 (512B), 3 (1KB) */ From nobody Mon Apr 17 06:24:47 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0H8b592cz45QbV; Mon, 17 Apr 2023 06: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 4Q0H8b3w1Yz3hcn; Mon, 17 Apr 2023 06: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=1681712687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FCTnCftfON8j2mmoF1nbJ3AancSryCCcxls25u+R6VY=; b=Zc2PPJgeqx5odWV6VMIjypN6ae1dIqj+d3hUTBujkvuhoXQohrCTPLjEvH2LiMhiKG8ge1 w0KRpGIN35JB8ghm9A5LlzHUg4tZDSpH8BEZ2ZCy+nhm/cU/+4sqB9ezCUtZf6ZU+wrZYD cuz9dxlHQNHPyfp1oG3AQDvjHPZPVV9i8jaOvppdr2W/PaaRiKI6Bl/MR5InREHShGEtKN glCr+w1n2Qpz7OSDcjHjix1eWm3HOAspAWTJODWbQ6tZSZhhOmxUB/m+QvNdTBF/haHXDB e/T8DvXhFc8NcRBZkAV1WaJbH1wC2fTpHzcpU9Cjsjd6iB8Neq0OA8B3lpqc7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FCTnCftfON8j2mmoF1nbJ3AancSryCCcxls25u+R6VY=; b=vWHm9timUcYjiA1ayABISsCllAReDs3sAl5XpdN6WS0575aOOrIXk9/tCzQthfk6FP+aXq H0AumlUuUeN9QuhxFgRsPu3YYUrGjH0a/I0rTS3+6z1TPiLmU6mPF8sdf+kOGLYcS11We9 2ubjZzj+65UEWChOYfNcLpNfLMtY8ZElsup3Yi8usQczy0b7YhkasSK1y6VFji+ZgpP6Kg PJDQcSo0wmOA1Cyv+RM4yP9TbCYTuAm1mBw7uf/KZEfrF16fD7UgCRoK2yoMETGo7Fm+R4 bOpFUCshles/rpdzgXXxln1ld/SBFaPjGEUisHsP1/aIcRKzkLWNUZA+g3THog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681712687; a=rsa-sha256; cv=none; b=ByCbBUSdr43vAuGjS5CJWIdkq/GZ6oyB7pB0E2AmfMOs861BW6MQR2dxJVvGyBYCcT6CNb Z/p2fvFKw6JugN8QifvjGLVQcJK8Qa2dOoDeupEccG475qYeoQxNHfJkB1pDAttHzvs+/t YOthhZVikSHHyZNMjPPWcphtVbJfP+OkUjNrRzgkH8nNGslzXWm3CYGWEvEjtBp6soI4C3 6csAOuETjO/P/hIFQBu6AcaeEIG34cEnV5UaSmwtwwiiI9gPytpd3ZsSyNbBBgvlbZGpRf aeVZBzbAWAe4dnktiIp2Ve2AHGm4CgdN6vN645BJpzhsHiQGl+WBhv57dK+J5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0H8b2xylzJm5; Mon, 17 Apr 2023 06:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33H6OlgZ046163; Mon, 17 Apr 2023 06:24:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H6OlX9046162; Mon, 17 Apr 2023 06:24:47 GMT (envelope-from git) Date: Mon, 17 Apr 2023 06:24:47 GMT Message-Id: <202304170624.33H6OlX9046162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ae9a69acb145 - stable/12 - iicbus(4): Use the existing CTLFLAG_RWTUN flag definition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: ae9a69acb1457b6db64fb9e8f93bbdb69461adbb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ae9a69acb1457b6db64fb9e8f93bbdb69461adbb commit ae9a69acb1457b6db64fb9e8f93bbdb69461adbb Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-17 06:22:55 +0000 iicbus(4): Use the existing CTLFLAG_RWTUN flag definition Use it when possible, instead of separated flags. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 (cherry picked from commit deac4c7f0753841de8da4d7f37d7e49620b3bbb4) (cherry picked from commit 07bd2fc4022cc7da8c764b25d29aaf98d7a1647f) --- sys/dev/iicbus/iicbus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c index b16a2bdba332..9d6f49de0582 100644 --- a/sys/dev/iicbus/iicbus.c +++ b/sys/dev/iicbus/iicbus.c @@ -325,7 +325,7 @@ iicbus_init_frequency(device_t dev, u_int bus_freq) */ SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "frequency", CTLFLAG_RW | CTLFLAG_TUN, &sc->bus_freq, + OID_AUTO, "frequency", CTLFLAG_RWTUN, &sc->bus_freq, sc->bus_freq, "Bus frequency in Hz"); } From nobody Mon Apr 17 13:13:17 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0SCy5Cdhz45sqG; Mon, 17 Apr 2023 13:13: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 4Q0SCy1f3Bz3sGs; Mon, 17 Apr 2023 13:13:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681737198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QVnAVhRB0m88ZDHpQvDk0XTmRYSVzhrf24CQMBnJjEU=; b=O5a4osIvQRZDITJAzsU6UeZkgloAtc+dHxmELeIJQbs0DkVwZ9xIXNKlIXz+Y2DHsKK158 npdw1TtwUs0xxfkevRUIua82areM5nCCE++MP8Pf03sCqViOL44nZqy5xAz4k6XO1JUd7G ZJjTP4Ex0/0CdpAACyR+sa1voGDDash57/venDW3uVzGojr7F7ztABgkqN8ZmlhGG64o1j PAr20V7ELNbHoyuodRI7KmfaGrYnlUxPEixlBii9A/lfyq/1rU76RDSawHfKqFKz/uWAvj R5a3CjJVIMrbaSYEs/TMDMnrysVQDKVkoGG3jyCDQEv6wTkUMVxh+CZ+WcA1Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681737198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QVnAVhRB0m88ZDHpQvDk0XTmRYSVzhrf24CQMBnJjEU=; b=KysUQ4Fkix19XPKhlUNJ7QF1ohkE+iO4hWOLQyzji6lhqDpdaOvOw3Qmi/E2Fd/bnUlamq l+D9L1PZdycvvxuYXPFk3/2cSGPlpPucw9XDkR3OPlN1IPvNO+ZVWC0DLb2jkAsoHIalI7 VJ72f9TvX75cjD+mQXS2P+JIDF5DsPDMKpyI87ifE9E40vyo8DJ4JJvMNpIX2HHmUartpx IocxF5u6JwvboJMGa6wGyuCfSrubuGxbuvWyioaa3jRaj8XR6L3pzuqEalUtYIcy/7DrG5 VqZkFkrjKtP5nU/9XG4yuDHEkVujX8kHwz38eC9RE358yJ/nmwjZ/sh7gKZBbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681737198; a=rsa-sha256; cv=none; b=D551agYJ6FgET1Ahhw8ji02gBD9zqNytdE/nU7PLpUYcj/ruXQKI7sYuhn1RnZCm938YS/ c5y1XG88hCHhx5sZ5Jn8qzv6qoEVutjdFf6FC+ranbwmZvuNzKm7dgJ6qqLdjy2ZwBAveN B0BR24f5Agb3QCyuxaBXEaf6r7vLEEuQNt6HQNsmkMbCtSp/sielmPpA4BvbnHsR2+p/8+ cYpcSkKLJrzzJbl/VIawYxb9KujH2OKPPwmalNqXOmdQWuxbzT8Hs0yE2N/AWI4mD5EFqB 9snpEzdQjMucYVucxyhzZOW6kWIN1+IPfFHQPEgTjoaHyI6VtfAFQ2OUiSs+ig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0SCy0cXLzW8x; Mon, 17 Apr 2023 13:13:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HDDHvl023342; Mon, 17 Apr 2023 13:13:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HDDHuQ023341; Mon, 17 Apr 2023 13:13:17 GMT (envelope-from git) Date: Mon, 17 Apr 2023 13:13:17 GMT Message-Id: <202304171313.33HDDHuQ023341@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: 46529cb99040 - stable/13 - awk: errror on printf format strings lacking conversion specifier List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 46529cb990402ed46f5f3555aecc41091ef63f41 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=46529cb990402ed46f5f3555aecc41091ef63f41 commit 46529cb990402ed46f5f3555aecc41091ef63f41 Author: Ed Maste AuthorDate: 2023-04-14 14:49:05 +0000 Commit: Ed Maste CommitDate: 2023-04-17 13:13:10 +0000 awk: errror on printf format strings lacking conversion specifier Reported by: phk Reviewed by: imp, markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39573 (cherry picked from commit 5dbd073b045c8e98730c025a4acf2279be26c33e) --- contrib/one-true-awk/run.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/one-true-awk/run.c b/contrib/one-true-awk/run.c index 117fb0748bd8..b81dafba35e6 100644 --- a/contrib/one-true-awk/run.c +++ b/contrib/one-true-awk/run.c @@ -912,6 +912,9 @@ int format(char **pbuf, int *pbufsize, const char *s, Node *a) /* printf-like co case 'c': flag = 'c'; break; + case '\0': + FATAL("missing printf conversion specifier"); + break; default: WARNING("weird printf conversion %s", fmt); flag = '?'; From nobody Mon Apr 17 13:13:57 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0SDj3QmHz45stF; Mon, 17 Apr 2023 13:13: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 4Q0SDj31rQz3t7R; Mon, 17 Apr 2023 13:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681737237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oEnwOjn3Nov2ZiWjfRWzkcYGQqGvKDfXG4G7MgMfKmI=; b=sOCwhVpvS227MBzJW5dyXPu9H7JfnxNpaUwybnkZQitTGaJjQxB7oLH2zQA4gOavWkxQYK YEnQRCFK5dFcRzCEW1xzbu55v6HEv+hseXri+066I3A93aOhsDqsYhgDz434pDZC7FbIXc ShoDHAiaCV2YRnfSlI61SdM1HUa10Aj1y/4+oQ2wD2KPIYmT+/0LKtrnTfyCWxtFZtxTiV QZ3j9PtE5r7fXNRd0mzQLNmwvirfsJg1NC5BzSh8nuL3/ABC198LjngQItEGqe0jXwfxDd s8LS4RxtfpniG1LZn5Yim+FPURAk2/Ict2LMoDZL+xnuuNsvsA1irwdqPVzhKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681737237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oEnwOjn3Nov2ZiWjfRWzkcYGQqGvKDfXG4G7MgMfKmI=; b=Qf29QKUKSKNuJYequvDR0Q1xX29VqHfTKLgk1HexAlLJCcqHtHZkPBx61zmedRNgJBSo8d G7oPldZWn96Fh5oFHeuTz19blrge5iprD9TdjlHNnKKpfT8/qtbPFl9IsEWvGDb9tlyhGV 6yMrYwYiu0eYYZ+3rWME5T1O6g4Cal2wJQY53k3zrWVE0honWNgjmED99J4UE1sRExIzxc e79x834k+s9nuYqa6oM50oW1WTzTDzbA3TSBpxoR7HVmAwqQ3IH+ltQkLexWoB57A1kilY o+PWsv2pW7D0dcj7dkg6OtHwUVPaII61Kh4qASCjQsC0spCaiyJJ7olUb/K2fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681737237; a=rsa-sha256; cv=none; b=YqsUsJHr+EbjCOBRkbds38TT1XCr3TGPmX2NshFXayymwSIS5XidkBiF1Av7g3HEsaHrO2 DwjVOYNqA8u5EASACW65tPUOJJUs7h/aiyXSGhMkGXm2ipCchAvBBWQDdyEDtAbt94tnbg lBUQ9sXIHUFHjAjAdAN8odQuQbhBTxvBJiQgGioj6EETb209KMW94gUFLVRGNCTx0n1urU GCbSed3zcssZhoef0OaL1lCXBOqnImh//+/hm2Z2cr4c052CQYR5S/2MaVOqKz/zHHrk8S DdRMg2PzTe7lwR6glrvRAuuMOuMB9uXsE+XKlamU4h3N+KerYn7KRWbKcS6ZVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0SDj27KbzWNw; Mon, 17 Apr 2023 13:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HDDvSR023520; Mon, 17 Apr 2023 13:13:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HDDvoj023519; Mon, 17 Apr 2023 13:13:57 GMT (envelope-from git) Date: Mon, 17 Apr 2023 13:13:57 GMT Message-Id: <202304171313.33HDDvoj023519@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: 40399b2a4a8a - stable/12 - awk: errror on printf format strings lacking conversion specifier List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 40399b2a4a8a1a2bceb7ab484b53aa20f7189ed9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=40399b2a4a8a1a2bceb7ab484b53aa20f7189ed9 commit 40399b2a4a8a1a2bceb7ab484b53aa20f7189ed9 Author: Ed Maste AuthorDate: 2023-04-14 14:49:05 +0000 Commit: Ed Maste CommitDate: 2023-04-17 13:13:45 +0000 awk: errror on printf format strings lacking conversion specifier Reported by: phk Reviewed by: imp, markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39573 (cherry picked from commit 5dbd073b045c8e98730c025a4acf2279be26c33e) (cherry picked from commit 46529cb990402ed46f5f3555aecc41091ef63f41) --- contrib/one-true-awk/run.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/one-true-awk/run.c b/contrib/one-true-awk/run.c index 117fb0748bd8..b81dafba35e6 100644 --- a/contrib/one-true-awk/run.c +++ b/contrib/one-true-awk/run.c @@ -912,6 +912,9 @@ int format(char **pbuf, int *pbufsize, const char *s, Node *a) /* printf-like co case 'c': flag = 'c'; break; + case '\0': + FATAL("missing printf conversion specifier"); + break; default: WARNING("weird printf conversion %s", fmt); flag = '?'; From nobody Mon Apr 17 13:38:06 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0SmZ4HD7z45v6P; Mon, 17 Apr 2023 13: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 4Q0SmZ3fSPz3Ptp; Mon, 17 Apr 2023 13: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=1681738686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dW+O1cp8gj1wRUg95CwTxAq4oRvI3EQ4f4ckMarfpKo=; b=vIPIVis8WaftR8pUk3Ih4GB6eznbKn34MPnK6Wr1gL+T8gUB7hEcZvKdFtGleQRMpe3Kd3 P36HI4xwgMnTKYnveycfSBWco+y5NeHZMcbdML420b46OTArrtXRBcwvlz7XswjfkJIP+G VTBN6h/+1QcVhFsIOZ2AcVi+TTRLNYDYj/UB0w0nFYHYWr0RsI+vgN0Mb8lchOHCpOUGWL +OfMWD5MS3Jq+nBn7Sf7DrKgbF48hVjgCDDfOB//Ge6CF/lLFh90YZqTsOmLolqrTcre5j 2jp7kzN/SSIsqNm7jukWexhBqvtZU1U6LBYd6OMd/HAZ/XpCVtg4uClaHxugeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681738686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dW+O1cp8gj1wRUg95CwTxAq4oRvI3EQ4f4ckMarfpKo=; b=I+UBBLmBHjNjhBdzMwv2x1vxtPKON2Fi2vA4skCOEroXsJWw46TZjH9AFjlYPYCedGiMSp mK4uFIdk+ZzK7A6WE0VHadHZ1DvmiWclsxApzb5iTze/QzEnzbUKpgOgNVaYM+sbrgZF/i 0bl4C08CMBprPvnOk6NHhYzDODg/F121Sd88AYX9a6p7acAx0C0fcwPCNeHX6l8CElm4DJ MFTyU3Anz1d58T9YyTJvSCcnIVHtWAc6mzIRgfhTvccO6/d7zfQMXIM8njaa/etkY4MKUg MRC4mlbyMEeIEdqdB31/s2TfkjY8mTIl1r0SXnPoMQgGV8/OzuYs1g0/flosmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681738686; a=rsa-sha256; cv=none; b=iYwwVSoNBSSBJkTbmqoDa6r5k38n9X03Sdx/iZNBl4fceRfL8UiHrVMvyr31nKbkP1Lw+S +Y1Iu/yrLlNWS4VP7JduYBNCmmzMIUN8g/Flm0Z5vMuEQGBN2usIzD7629vPotaQNxjNjl blwiGDxfOf/MsGLulrfB1Zwss3rqPegeKUCgSciWbVXEjTIq5c7BBeZ1b28d/mEyczeNKT 1JZBrWTljYQXwqxWbK7wwAtWO8UgD6DZnkP1Y3U/PK8MiEt7wP3I8z4lmrwcm/6sk1OFl3 GciFzc/3O/cMnH4NEm3m1jdPii5H5xuEGn9kywTUUwYBnVc0UlC3/D/6eol//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 4Q0SmZ2XSPzWfN; Mon, 17 Apr 2023 13:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HDc6Yf056015; Mon, 17 Apr 2023 13:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HDc63P056014; Mon, 17 Apr 2023 13:38:06 GMT (envelope-from git) Date: Mon, 17 Apr 2023 13:38:06 GMT Message-Id: <202304171338.33HDc63P056014@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: da048bd318b3 - stable/13 - ofw: fix memory leak in ofwbus_attach() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: da048bd318b3d144de0d4ad9596963d978a75e0f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da048bd318b3d144de0d4ad9596963d978a75e0f commit da048bd318b3d144de0d4ad9596963d978a75e0f Author: Christos Margiolis AuthorDate: 2023-04-10 15:31:46 +0000 Commit: Mark Johnston CommitDate: 2023-04-17 13:34:02 +0000 ofw: fix memory leak in ofwbus_attach() PR: 269509 Reported by: Jaroslaw Pelczar Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D38903 (cherry picked from commit 38594ff9c0c9568b5082ba3273103904a6afd38e) --- sys/dev/ofw/ofwbus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/ofw/ofwbus.c b/sys/dev/ofw/ofwbus.c index 2a28a928e15e..6ea5be694af6 100644 --- a/sys/dev/ofw/ofwbus.c +++ b/sys/dev/ofw/ofwbus.c @@ -175,6 +175,7 @@ ofwbus_attach(device_t dev) if (ofw_bus_gen_setup_devinfo(&obd, node) != 0) continue; simplebus_add_device(dev, node, 0, NULL, -1, NULL); + ofw_bus_gen_destroy_devinfo(&obd); } return (bus_generic_attach(dev)); } From nobody Mon Apr 17 17:03:57 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0YL629G7z44vWH; Mon, 17 Apr 2023 17:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0YL61Pcwz49C6; Mon, 17 Apr 2023 17:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S+URsO8KmmIBuL9BZFtfv8It0YA84st/c8ciy2Hj8XA=; b=P/8bTPBpL44beDwXiO4bg2sMjAjyR0A47m6Cwz0Mcf56lZkK+PEniWFdBR/1yZN1sT8Q37 OvYt5xVP5gtjmsMG15+mVKRYQm/+la940Wy2fKE5KgwU7iIU134GBIaY9XOoxtRYUhaWyW 9+oIwo/ElNJfQuO8YIuEVeTbadtKdAW7+9vjbM0AjrdskJV+6gmM8V5F0y8EzC2dS2gc+k tHsbJsDYl5V7HzlSL2NgYmXgqczRVrofwVuOl6ipieloe64fCqN90S+R1oTSwbYd4DJHvO jV3yNolbHevL8oDYvW5UrrTkoWaGCL3bqhP+s5wmWcbhhcg23kx2DTAhuEJ0SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S+URsO8KmmIBuL9BZFtfv8It0YA84st/c8ciy2Hj8XA=; b=LBV0zgNq+kmPOKYoWIYZqt7iKpmfg+5RDuej3UHQMvkPEDAEUyO4OCixN2Vwda2/n5lm0H /t0wZxwxctpDM7SViLiCTs1ckWSn/15py/PNqS2RF3DL4C+FVy4DiibKxA09BnXk3RmKt1 9IkOhPXQF/672oVkek5t2Xh4YcnEd91XX4CG2Ki/1WAlb+gSkL1KN0euy6Lwgk6jHQC5KX SGpdM75QpgR/srDqZlluM/ZjPVIaVaur4zX0tK25yAa1eur0JhjQVcY0SeSPhT8uz6gw74 U1rcuz8kVz0s7q6+6CfCvHJkO59fCMkDHuEbvnHOsEOjZ9GbtYM0hssSLmOcGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681751038; a=rsa-sha256; cv=none; b=hfK6txNf6QLLIalxs675dk8FgTKfoCyE5QgT51MK3sZEqouiWHwwuJaTdjdQxQ/xEP/uI6 kZy8+mkFpWGyDlxxDtEA84zmuPSphv/VyI5LIdaynGLEL+FRTmE2hbJo4n7zNaF9GCb83y bV0TsWAFp6vfS78nXnelimdAm3cqGRD3Iz/S7wvrJK7aWGa6MJE23tWHy/or6keD2mvQoJ bhtsgJHwDv05dMlq1So/Szkdq/M37ES2W+yVrsBN9mFZykl2Y/RMOgwPKvv9vaUa8+xZFt rx3S1mr+JGb7K5zP2dusqeF9fqMGU3Escx8CcmPeuzZlampV7mTKfefCDN1Ycg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0YL60VQ2zd4c; Mon, 17 Apr 2023 17:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HH3vxK002489; Mon, 17 Apr 2023 17:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HH3vlC002488; Mon, 17 Apr 2023 17:03:57 GMT (envelope-from git) Date: Mon, 17 Apr 2023 17:03:57 GMT Message-Id: <202304171703.33HH3vlC002488@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 0edbab45af5d - stable/13 - arm: add an interrupt rman to nexus List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0edbab45af5d36596b77e7d6da71c3b529b09bc1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=0edbab45af5d36596b77e7d6da71c3b529b09bc1 commit 0edbab45af5d36596b77e7d6da71c3b529b09bc1 Author: Mitchell Horne AuthorDate: 2021-12-05 15:27:50 +0000 Commit: Mitchell Horne CommitDate: 2023-04-17 16:02:56 +0000 arm: add an interrupt rman to nexus Allow the nexus bus to own and manage interrupt resources. Currently, interrupt resources on this architecture are managed completely by ofwbus, but it is desirable that system-wide memory and interrupt resources be managed by the top-level bus. This is a pre-requisite to moving this resource management out of ofwbus. Reviewed By: ian, Elliott Mitchell MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D32357 (cherry picked from commit 1d03c3578d05b011dc714ec0735a5783c421530b) --- sys/arm/arm/nexus.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c index be84ab82d43f..f2506dfb3cb5 100644 --- a/sys/arm/arm/nexus.c +++ b/sys/arm/arm/nexus.c @@ -77,6 +77,7 @@ struct nexus_device { #define DEVTONX(dev) ((struct nexus_device *)device_get_ivars(dev)) static struct rman mem_rman; +static struct rman irq_rman; static int nexus_probe(device_t); static int nexus_attach(device_t); @@ -171,6 +172,12 @@ nexus_attach(device_t dev) if (rman_init(&mem_rman) || rman_manage_region(&mem_rman, 0, BUS_SPACE_MAXADDR)) panic("nexus_probe mem_rman"); + irq_rman.rm_start = 0; + irq_rman.rm_end = ~0; + irq_rman.rm_type = RMAN_ARRAY; + irq_rman.rm_descr = "Interrupts"; + if (rman_init(&irq_rman) || rman_manage_region(&irq_rman, 0, ~0)) + panic("nexus_attach irq_rman"); /* * First, deal with the children we know about already @@ -227,6 +234,10 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, flags &= ~RF_ACTIVE; switch (type) { + case SYS_RES_IRQ: + rm = &irq_rman; + break; + case SYS_RES_MEMORY: case SYS_RES_IOPORT: rm = &mem_rman; From nobody Mon Apr 17 17:03:59 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0YL734ZKz44vSV; Mon, 17 Apr 2023 17:03: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 4Q0YL72NGWz49FC; Mon, 17 Apr 2023 17:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pg2NuqjPwQs9JKD5qu4e2vNnomRstteH12ZJMpU3OEg=; b=gjfs9rlkdMFL0cBVtianGZfayw/aLDEBBniG6i7uNnoEnIsIm6cc9fSGIweemTR9XFAbjV hKy++khgj0MgiNfgZfizvGSVRCjtma1xxJ2lIMLzo4iKVM/cmz6Q2WPjmWdhtLNknBlOgh pdM7dS8yakmnj5wUWU8FRWFeWgGLzdpjFD8vIM6fifXVwKZXVaS/hkO9QqdrKe3482gWmW epKtmAEcwQYgBQkXZ3/x0JAk8r8W0RyEMYO6tdzvpmrU4IV5dQ3F3ChLaCavTGF3Ghqy4/ pLDLG1eM31Q1SXrXqWk9UzKDKz0im8vI6PI7dP2dtj3FvtjqR2QBCnq1L0WX/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pg2NuqjPwQs9JKD5qu4e2vNnomRstteH12ZJMpU3OEg=; b=WMZVBtLTurSsd9TeVbrQbcZMITjXgOipg5nm9xIyi6aj1DOzqRsGlZbfP3SDPybQOqxavg t3Pq/e/zNMsG+ID+bjfrWTTKoh5xYeMaXP/8f431qL27mjGTrz//AX8wjmCJg+ucXQa2c1 /yyreSRZZ10NO1PjzCy5wthVCuSGaBXy2OBoLbF2ijWoQDU+se5FvH4dIqR1+lemAnNewr 9mfVVCw2MV2qMummJQv/7DgowiJtpSH6LnR/G35azl7PuhzramHQ5RCNhbIIZedsNJHwJn p7OsGm/z9hCNMgCup413c3cHixr7tUNLNeYKsG0eVX49A2xWR10xGMI4MdTBUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681751039; a=rsa-sha256; cv=none; b=Z420b2UrFyM5ktFl+Z1KK2Yr4Of0DQRocxkfQ9NMhRZty16KFTcsHZTAQMGHeft9Jf+pdy dMI/uOsU12rSrPB3/EHsAsDOjsuSfmgYSfqEmzpoZHrPVVFbmQUWtCF4ByBgEBQnAHHtzQ a0L4g/oe3v7OewVmRH/pumxbGrLCp6Bpea031zFCuWrLQwVvrwisfQkSinP02Li63V6A2W 7yS7X5IlbYf+VRDvhDtaeMTMgxBszOO2NlN0B5J38mHHpfV6PKL79dXlFOKQSTjbyeBTxu lrK92AnqXeY3MtqUazMgYpHdXnLnsuNqYwx3jBjEHMpIz8BaR66uNYXbwEd50A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0YL71MlGzcyx; Mon, 17 Apr 2023 17:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HH3xPb002508; Mon, 17 Apr 2023 17:03:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HH3x4j002507; Mon, 17 Apr 2023 17:03:59 GMT (envelope-from git) Date: Mon, 17 Apr 2023 17:03:59 GMT Message-Id: <202304171703.33HH3x4j002507@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 5cdaedd8cc6a - stable/13 - physmem: add ram0 pseudo-driver List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5cdaedd8cc6a628a7c4c62e6f415b21f2e842235 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5cdaedd8cc6a628a7c4c62e6f415b21f2e842235 commit 5cdaedd8cc6a628a7c4c62e6f415b21f2e842235 Author: Mitchell Horne AuthorDate: 2021-05-27 14:27:40 +0000 Commit: Mitchell Horne CommitDate: 2023-04-17 16:02:56 +0000 physmem: add ram0 pseudo-driver Its purpose is to reserve all I/O space belonging to physical memory from nexus, preventing it from being handed out by bus_alloc_resource() to callers such as xenpv_alloc_physmem(), which looks for the first available free range it can get. This mimics the existing pseudo-driver on x86. If needed, the device can be disabled with hint.ram.0.disabled="1" in /boot/device.hints. Reviewed by: imp MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D32343 (cherry picked from commit e6cf1a0826c9d7f229e41224ec7b783501636528) --- sys/kern/subr_physmem.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_physmem.c b/sys/kern/subr_physmem.c index 450b891cb8a1..959394e06d4b 100644 --- a/sys/kern/subr_physmem.c +++ b/sys/kern/subr_physmem.c @@ -40,7 +40,9 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include +#include #include #ifdef _KERNEL @@ -49,7 +51,9 @@ __FBSDID("$FreeBSD$"); #include #include #include + #include +#include #else #include #include @@ -525,7 +529,6 @@ physmem_init_kernel_globals(void) panic("No memory entries in phys_avail"); Maxmem = atop(phys_avail[nextidx - 1]); } -#endif #ifdef DDB #include @@ -537,3 +540,98 @@ DB_SHOW_COMMAND(physmem, db_show_physmem) } #endif /* DDB */ + +/* + * ram pseudo driver - this reserves I/O space resources corresponding to physical + * memory regions. + */ + +static void +ram_identify(driver_t *driver, device_t parent) +{ + + if (resource_disabled("ram", 0)) + return; + if (BUS_ADD_CHILD(parent, 0, "ram", 0) == NULL) + panic("ram_identify"); +} + +static int +ram_probe(device_t dev) +{ + + device_quiet(dev); + device_set_desc(dev, "System RAM"); + return (BUS_PROBE_SPECIFIC); +} + +static int +ram_attach(device_t dev) +{ + vm_paddr_t avail_list[PHYS_AVAIL_COUNT]; + rman_res_t start, end; + struct region *hwp; + int rid, i; + + rid = 0; + + /* Get the avail list. */ + bzero(avail_list, sizeof(avail_list)); + regions_to_avail(avail_list, EXFLAG_NOALLOC | EXFLAG_NODUMP, + PHYS_AVAIL_COUNT, 0, NULL, NULL); + + /* Reserve all memory regions. */ + for (i = 0; avail_list[i + 1] != 0; i += 2) { + start = avail_list[i]; + end = avail_list[i + 1]; + + if (bootverbose) + device_printf(dev, + "reserving memory region: %jx-%jx\n", + (uintmax_t)start, (uintmax_t)end); + + if (bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, start, end, + end - start, 0) == NULL) + panic("ram_attach: resource %d failed to attach", rid); + rid++; + } + + /* Now, reserve the excluded memory regions. */ + for (i = 0, hwp = exregions; i < excnt; i++, hwp++) { + start = hwp->addr; + end = hwp->addr + hwp->size; + + if (bootverbose) + device_printf(dev, + "reserving excluded region: %jx-%jx\n", + (uintmax_t)start, (uintmax_t)(end - 1)); + + /* + * Best-effort attempt to reserve the range. This may fail, as + * sometimes the excluded ranges provided by the device tree + * will cover or overlap some I/O range. + */ + if (bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, start, end, + end - start, 0) == NULL) { + if (bootverbose) + device_printf(dev, "failed to reserve region\n"); + continue; + } + rid++; + } + + return (0); +} + +static device_method_t ram_methods[] = { + /* Device interface */ + DEVMETHOD(device_identify, ram_identify), + DEVMETHOD(device_probe, ram_probe), + DEVMETHOD(device_attach, ram_attach), + + DEVMETHOD_END +}; + +DEFINE_CLASS_0(ram, ram_driver, ram_methods, /* no softc */ 1); +DRIVER_MODULE(ram, nexus, ram_driver, 0, 0); +#endif /* _KERNEL */ From nobody Mon Apr 17 17:04:00 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0YL82xFJz44v74; Mon, 17 Apr 2023 17:04: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 4Q0YL82lb1z49Lh; Mon, 17 Apr 2023 17:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CfpeK6LP18OTNxWROixea8tuWJh2AfUAd73K2Ez8Y5U=; b=Y2VyJDurdah1QYDacxqHWoExQnewNozzdm8S88/5+D7FhacGLcImZ6xEGpSJ3L4nW/0XDF 74oeP2H/noqrKRg56Lj9MbhScewqgCCsRf+KkvrnFjB5zxB8Kn+ANhNZULBFxVZdCCrAHL 2QX9k8mJNo+3OpRXzXSmWlrYAJfj1daSWL5ZfGGpoK39FLdt1a24s3ss4vxHx/SgYq58L0 lbdOwJ9L5mJ+J8rc4HiEqksPkxCVILFiJLnFQksq8KAq/k8x6N/na+YFtmJDbwi+A+jb5L 8/o2dHFR1D2tZEhhiw3ATJxSUZDV6UoRtMX1wQ5Z7Fu0xVu7Op7Sjx1RULLn/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CfpeK6LP18OTNxWROixea8tuWJh2AfUAd73K2Ez8Y5U=; b=jHNTD7AfRqdcBRlBtB1KHYvRRzbcEd6rgyrJNlzpVxCpXvBR3mWadn1J+zVNby1Q9w6yds Od3pxOLPLD3TRLwdxNoq8fE6UYZueqokf5m7mPRprY4Sz4WHlTTBxSOJHYp9AHFwJLKOzO KrAGK94OWhhXAkMcYwoV2NNOniAalZX2CvT28XNfyd5cHxn5GbkSOfZXC46KuoqFzeyn0u DQs3zIPeZi4PBYWoNittqv3dtBujojTk7igR6coq6jagdhp+rCrm+seBP1us4X9qHNy7jM pKO2tbO9fosON1HgjwgimMVJT71v9XtNx8cEqQ33Ynfsk+vjavOXlErWRLcJeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681751040; a=rsa-sha256; cv=none; b=qMIhNDSSRvcff78KELWhlv4wGckkv/PRWfXXMzObcJlTAuuC0pR7CK99tcrClt5/edSXNp 9j4zO59kj2Km7uxsCMgAacViIdVCl0IfCO1KsQlmCYAsLCeG2V65rsolz8x/w1RSAzOlK5 btsINp9ogZphG+nYRMtDCSYLQL0oYEY2Zw6PcKNH9czpZ1aGz+rW098E1aCTaEWeh3yxGQ HVj1l4NuS13H0MLVI4HN81fM/WnUlowLeamjOx7PgPasDVxQYUaVzNcTtNlum3jm76t0ir hkdLPdeSg9zdIrDI7bg8Uzy4Nwg/Xybmkw1TBr0nwM8CQ+E9Tshjck7WkFpaqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0YL81s2wzcyy; Mon, 17 Apr 2023 17:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HH40JR002527; Mon, 17 Apr 2023 17:04:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HH40hJ002526; Mon, 17 Apr 2023 17:04:00 GMT (envelope-from git) Date: Mon, 17 Apr 2023 17:04:00 GMT Message-Id: <202304171704.33HH40hJ002526@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9cb88cc937ec - stable/13 - ofwbus: remove handling of resources from ofwbus List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9cb88cc937eca838065538652929ffb9d77624da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9cb88cc937eca838065538652929ffb9d77624da commit 9cb88cc937eca838065538652929ffb9d77624da Author: Elliott Mitchell AuthorDate: 2023-02-08 20:17:03 +0000 Commit: Mitchell Horne CommitDate: 2023-04-17 16:04:23 +0000 ofwbus: remove handling of resources from ofwbus The architecture nexus should handle allocation and release of memory and interrupts. This is to ensure that system-wide resources such as these are available to all devices, not just children of ofwbus0. On powerpc this moves the ownership of these resources up one level, from ofwbus0 to nexus0. Other architectures already have the required logic in their nexus implementation, so this eliminates the duplication of resources. An implementation of nexus_adjust_resource() is added for arm, arm64, and riscv. As noted by ian@ in the review, resource handling was the main bit of logic distinguishing ofwbus from simplebus. With some attention to detail, it should be possible to merge the two in the future. Co-authored by: mhorne MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D30554 (cherry picked from commit f9bdaab95ec469738fbfc1f0edd3e8c744b7f71f) --- sys/arm/arm/nexus.c | 24 ++++++++++++ sys/arm64/arm64/nexus.c | 24 ++++++++++++ sys/dev/ofw/ofwbus.c | 92 +++++---------------------------------------- sys/powerpc/powerpc/nexus.c | 92 +++++++++++++++++++++++++++++++++++++++++++++ sys/riscv/riscv/nexus.c | 24 ++++++++++++ 5 files changed, 173 insertions(+), 83 deletions(-) diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c index f2506dfb3cb5..3991ec91ed0d 100644 --- a/sys/arm/arm/nexus.c +++ b/sys/arm/arm/nexus.c @@ -87,6 +87,8 @@ static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int); static int nexus_activate_resource(device_t, device_t, int, int, struct resource *); +static int nexus_adjust_resource(device_t, device_t, int, struct resource *, + rman_res_t, rman_res_t); static bus_space_tag_t nexus_get_bus_tag(device_t, device_t); static bus_dma_tag_t nexus_get_dma_tag(device_t dev, device_t child); #ifdef SMP @@ -126,6 +128,7 @@ static device_method_t nexus_methods[] = { DEVMETHOD(bus_add_child, nexus_add_child), DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), DEVMETHOD(bus_activate_resource, nexus_activate_resource), + DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), DEVMETHOD(bus_config_intr, nexus_config_intr), DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), DEVMETHOD(bus_release_resource, nexus_release_resource), @@ -263,6 +266,27 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, return (rv); } +static int +nexus_adjust_resource(device_t bus __unused, device_t child __unused, int type, + struct resource *r, rman_res_t start, rman_res_t end) +{ + struct rman *rm; + + switch (type) { + case SYS_RES_IRQ: + rm = &irq_rman; + break; + case SYS_RES_MEMORY: + rm = &mem_rman; + break; + default: + return (EINVAL); + } + if (rman_is_region_manager(r, rm) == 0) + return (EINVAL); + return (rman_adjust_resource(r, start, end)); +} + static int nexus_release_resource(device_t bus, device_t child, int type, int rid, struct resource *res) diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c index 0775cc820a8c..350ad9d1be76 100644 --- a/sys/arm64/arm64/nexus.c +++ b/sys/arm64/arm64/nexus.c @@ -104,6 +104,8 @@ static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int); static int nexus_activate_resource(device_t, device_t, int, int, struct resource *); +static int nexus_adjust_resource(device_t, device_t, int, struct resource *, + rman_res_t, rman_res_t); static int nexus_map_resource(device_t, device_t, int, struct resource *, struct resource_map_request *, struct resource_map *); static int nexus_config_intr(device_t dev, int irq, enum intr_trigger trig, @@ -135,6 +137,7 @@ static device_method_t nexus_methods[] = { DEVMETHOD(bus_add_child, nexus_add_child), DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), DEVMETHOD(bus_activate_resource, nexus_activate_resource), + DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), DEVMETHOD(bus_map_resource, nexus_map_resource), DEVMETHOD(bus_config_intr, nexus_config_intr), DEVMETHOD(bus_get_resource_list, nexus_get_reslist), @@ -273,6 +276,27 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, return (rv); } +static int +nexus_adjust_resource(device_t bus __unused, device_t child __unused, int type, + struct resource *r, rman_res_t start, rman_res_t end) +{ + struct rman *rm; + + switch (type) { + case SYS_RES_IRQ: + rm = &irq_rman; + break; + case SYS_RES_MEMORY: + rm = &mem_rman; + break; + default: + return (EINVAL); + } + if (rman_is_region_manager(r, rm) == 0) + return (EINVAL); + return (rman_adjust_resource(r, start, end)); +} + static int nexus_release_resource(device_t bus, device_t child, int type, int rid, struct resource *res) diff --git a/sys/dev/ofw/ofwbus.c b/sys/dev/ofw/ofwbus.c index 6ea5be694af6..4432f1704392 100644 --- a/sys/dev/ofw/ofwbus.c +++ b/sys/dev/ofw/ofwbus.c @@ -63,22 +63,14 @@ __FBSDID("$FreeBSD$"); * hang from the Open Firmware root node and adds them as devices to this bus * (except some special nodes which are excluded) so that drivers can be * attached to them. - * */ -struct ofwbus_softc { - struct simplebus_softc simplebus_sc; - struct rman sc_intr_rman; - struct rman sc_mem_rman; -}; - #ifndef __aarch64__ static device_identify_t ofwbus_identify; #endif static device_probe_t ofwbus_probe; static device_attach_t ofwbus_attach; static bus_alloc_resource_t ofwbus_alloc_resource; -static bus_adjust_resource_t ofwbus_adjust_resource; static bus_release_resource_t ofwbus_release_resource; static device_method_t ofwbus_methods[] = { @@ -91,14 +83,14 @@ static device_method_t ofwbus_methods[] = { /* Bus interface */ DEVMETHOD(bus_alloc_resource, ofwbus_alloc_resource), - DEVMETHOD(bus_adjust_resource, ofwbus_adjust_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), DEVMETHOD(bus_release_resource, ofwbus_release_resource), DEVMETHOD_END }; DEFINE_CLASS_1(ofwbus, ofwbus_driver, ofwbus_methods, - sizeof(struct ofwbus_softc), simplebus_driver); + sizeof(struct simplebus_softc), simplebus_driver); static devclass_t ofwbus_devclass; EARLY_DRIVER_MODULE(ofwbus, nexus, ofwbus_driver, ofwbus_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); @@ -134,12 +126,9 @@ ofwbus_probe(device_t dev) static int ofwbus_attach(device_t dev) { - struct ofwbus_softc *sc; phandle_t node; struct ofw_bus_devinfo obd; - sc = device_get_softc(dev); - node = OF_peer(0); /* @@ -153,15 +142,6 @@ ofwbus_attach(device_t dev) * ofw_bus_devinfo from it. Pass node to simplebus_init directly. */ simplebus_init(dev, node); - sc->sc_intr_rman.rm_type = RMAN_ARRAY; - sc->sc_intr_rman.rm_descr = "Interrupts"; - sc->sc_mem_rman.rm_type = RMAN_ARRAY; - sc->sc_mem_rman.rm_descr = "Device Memory"; - if (rman_init(&sc->sc_intr_rman) != 0 || - rman_init(&sc->sc_mem_rman) != 0 || - rman_manage_region(&sc->sc_intr_rman, 0, ~0) != 0 || - rman_manage_region(&sc->sc_mem_rman, 0, BUS_SPACE_MAXADDR) != 0) - panic("%s: failed to set up rmans.", __func__); /* * Allow devices to identify. @@ -184,15 +164,12 @@ static struct resource * ofwbus_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { - struct ofwbus_softc *sc; - struct rman *rm; struct resource *rv; struct resource_list_entry *rle; - int isdefault, passthrough; + bool isdefault, passthrough; isdefault = RMAN_IS_DEFAULT_RANGE(start, end); passthrough = (device_get_parent(child) != bus); - sc = device_get_softc(bus); rle = NULL; if (!passthrough && isdefault) { rle = resource_list_find(BUS_GET_RESOURCE_LIST(bus, child), @@ -208,28 +185,11 @@ ofwbus_alloc_resource(device_t bus, device_t child, int type, int *rid, end = ummax(rle->end, start + count - 1); } - switch (type) { - case SYS_RES_IRQ: - rm = &sc->sc_intr_rman; - break; - case SYS_RES_MEMORY: - rm = &sc->sc_mem_rman; - break; - default: - return (NULL); - } - - rv = rman_reserve_resource(rm, start, end, count, flags & ~RF_ACTIVE, - child); + /* Let nexus handle the allocation. */ + rv = bus_generic_alloc_resource(bus, child, type, rid, start, end, + count, flags); if (rv == NULL) return (NULL); - rman_set_rid(rv, *rid); - - if ((flags & RF_ACTIVE) != 0 && bus_activate_resource(child, type, - *rid, rv) != 0) { - rman_release_resource(rv); - return (NULL); - } if (!passthrough && rle != NULL) { rle->res = rv; @@ -241,42 +201,12 @@ ofwbus_alloc_resource(device_t bus, device_t child, int type, int *rid, return (rv); } -static int -ofwbus_adjust_resource(device_t bus, device_t child __unused, int type, - struct resource *r, rman_res_t start, rman_res_t end) -{ - struct ofwbus_softc *sc; - struct rman *rm; - device_t ofwbus; - - ofwbus = bus; - while (strcmp(device_get_name(device_get_parent(ofwbus)), "root") != 0) - ofwbus = device_get_parent(ofwbus); - sc = device_get_softc(ofwbus); - switch (type) { - case SYS_RES_IRQ: - rm = &sc->sc_intr_rman; - break; - case SYS_RES_MEMORY: - rm = &sc->sc_mem_rman; - break; - default: - return (EINVAL); - } - if (rm == NULL) - return (ENXIO); - if (rman_is_region_manager(r, rm) == 0) - return (EINVAL); - return (rman_adjust_resource(r, start, end)); -} - static int ofwbus_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { struct resource_list_entry *rle; - int passthrough; - int error; + bool passthrough; passthrough = (device_get_parent(child) != bus); if (!passthrough) { @@ -287,10 +217,6 @@ ofwbus_release_resource(device_t bus, device_t child, int type, rle->res = NULL; } - if ((rman_get_flags(r) & RF_ACTIVE) != 0) { - error = bus_deactivate_resource(child, type, rid, r); - if (error) - return (error); - } - return (rman_release_resource(r)); + /* Let nexus handle the release. */ + return (bus_generic_release_resource(bus, child, type, rid, r)); } diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c index 1c6bc275ebdd..6edc7f258d39 100644 --- a/sys/powerpc/powerpc/nexus.c +++ b/sys/powerpc/powerpc/nexus.c @@ -63,12 +63,18 @@ __FBSDID("$FreeBSD$"); * mapping. All direct subdevices of nexus are attached by DEVICE_IDENTIFY(). */ +static struct rman intr_rman; +static struct rman mem_rman; + static device_probe_t nexus_probe; static device_attach_t nexus_attach; static bus_setup_intr_t nexus_setup_intr; static bus_teardown_intr_t nexus_teardown_intr; +static bus_alloc_resource_t nexus_alloc_resource; static bus_activate_resource_t nexus_activate_resource; static bus_deactivate_resource_t nexus_deactivate_resource; +static bus_adjust_resource_t nexus_adjust_resource; +static bus_release_resource_t nexus_release_resource; static int nexus_map_resource(device_t bus, device_t child, int type, struct resource *r, struct resource_map_request *argsp, @@ -90,8 +96,11 @@ static device_method_t nexus_methods[] = { /* Bus interface */ DEVMETHOD(bus_add_child, bus_generic_add_child), + DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), DEVMETHOD(bus_activate_resource, nexus_activate_resource), DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), + DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), + DEVMETHOD(bus_release_resource, nexus_release_resource), DEVMETHOD(bus_map_resource, nexus_map_resource), DEVMETHOD(bus_unmap_resource, nexus_unmap_resource), DEVMETHOD(bus_setup_intr, nexus_setup_intr), @@ -128,6 +137,15 @@ static int nexus_attach(device_t dev) { + intr_rman.rm_type = RMAN_ARRAY; + intr_rman.rm_descr = "Interrupts"; + mem_rman.rm_type = RMAN_ARRAY; + mem_rman.rm_descr = "I/O memory addresses"; + if (rman_init(&intr_rman) != 0 || rman_init(&mem_rman) != 0 || + rman_manage_region(&intr_rman, 0, ~0) != 0 || + rman_manage_region(&mem_rman, 0, BUS_SPACE_MAXADDR) != 0) + panic("%s: failed to set up rmans.", __func__); + bus_generic_probe(dev); bus_generic_attach(dev); @@ -215,6 +233,44 @@ nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int icells, return (intr); } +/* + * Allocate a resource on behalf of child. NB: child is usually going to be a + * child of one of our descendants, not a direct child of nexus0. + */ +static struct resource * +nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, + rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) +{ + struct rman *rm; + struct resource *rv; + + switch (type) { + case SYS_RES_IRQ: + rm = &intr_rman; + break; + case SYS_RES_MEMORY: + rm = &mem_rman; + break; + default: + return (NULL); + } + + rv = rman_reserve_resource(rm, start, end, count, flags & ~RF_ACTIVE, + child); + if (rv == NULL) + return (NULL); + rman_set_rid(rv, *rid); + + if ((flags & RF_ACTIVE) != 0) { + if (bus_activate_resource(child, type, *rid, rv) != 0) { + rman_release_resource(rv); + return (NULL); + } + } + + return (rv); +} + static int nexus_activate_resource(device_t bus __unused, device_t child __unused, int type, int rid __unused, struct resource *r) @@ -257,6 +313,42 @@ nexus_deactivate_resource(device_t bus __unused, device_t child __unused, return (rman_deactivate_resource(r)); } +static int +nexus_adjust_resource(device_t bus, device_t child __unused, int type, + struct resource *r, rman_res_t start, rman_res_t end) +{ + struct rman *rm; + + switch (type) { + case SYS_RES_IRQ: + rm = &intr_rman; + break; + case SYS_RES_MEMORY: + rm = &mem_rman; + break; + default: + return (EINVAL); + } + if (rm == NULL) + return (ENXIO); + if (rman_is_region_manager(r, rm) == 0) + return (EINVAL); + return (rman_adjust_resource(r, start, end)); +} + +static int +nexus_release_resource(device_t bus, device_t child, int type, + int rid, struct resource *r) +{ + int error; + + if ((rman_get_flags(r) & RF_ACTIVE) != 0) { + error = bus_deactivate_resource(child, type, rid, r); + if (error) + return (error); + } + return (rman_release_resource(r)); +} static int nexus_map_resource(device_t bus, device_t child, int type, struct resource *r, diff --git a/sys/riscv/riscv/nexus.c b/sys/riscv/riscv/nexus.c index 16fe971b6521..9cafb90fd34a 100644 --- a/sys/riscv/riscv/nexus.c +++ b/sys/riscv/riscv/nexus.c @@ -85,6 +85,8 @@ static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int); static int nexus_activate_resource(device_t, device_t, int, int, struct resource *); +static int nexus_adjust_resource(device_t, device_t, int, struct resource *, + rman_res_t, rman_res_t); static int nexus_map_resource(device_t, device_t, int, struct resource *, struct resource_map_request *, struct resource_map *); static int nexus_config_intr(device_t dev, int irq, enum intr_trigger trig, @@ -118,6 +120,7 @@ static device_method_t nexus_methods[] = { DEVMETHOD(bus_add_child, nexus_add_child), DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), DEVMETHOD(bus_activate_resource, nexus_activate_resource), + DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), DEVMETHOD(bus_map_resource, nexus_map_resource), DEVMETHOD(bus_config_intr, nexus_config_intr), DEVMETHOD(bus_get_resource_list, nexus_get_reslist), @@ -265,6 +268,27 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, return (rv); } +static int +nexus_adjust_resource(device_t bus __unused, device_t child __unused, int type, + struct resource *r, rman_res_t start, rman_res_t end) +{ + struct rman *rm; + + switch (type) { + case SYS_RES_IRQ: + rm = &irq_rman; + break; + case SYS_RES_MEMORY: + rm = &mem_rman; + break; + default: + return (EINVAL); + } + if (rman_is_region_manager(r, rm) == 0) + return (EINVAL); + return (rman_adjust_resource(r, start, end)); +} + static int nexus_release_resource(device_t bus, device_t child, int type, int rid, struct resource *res) From nobody Mon Apr 17 17:04:01 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0YL94Tnzz44vqp; Mon, 17 Apr 2023 17:04: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 4Q0YL941Hrz49j8; Mon, 17 Apr 2023 17:04:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i0NPWRAD9gLMj4LqfxsJ6ePFvTQbFnjRV4g78hRgha8=; b=t/0adWafhAtmoiKxOsFj3acUa6acrTkqynq4Ex9ZvLBc5ZZIjfyd1p12O8oEb4HS4VEs0e 3hxk2o4kYUcCEBNgufgkKOvrcZ22iWafiUwlf9zgCvbkySXIupkzXzjod8gzwk1Nxfucfk /GDfpQAKDzkpcDOZ5RjuiaQJzL4CCefwp1mBJ5jdOY6PcSgEiRyjRugC8/EhnxqTcfFjZ2 ZBPoUl2dtcw/5VgREeMIp+z7ACWT+q5gZbUlYqYiQy1ZHiOwDf55AH2qFML5zesp2SiShb UFrWZ4jgf16N+r1CFSIGc0mg8AgG7cWkqM8yjYcAATLHwUscYixs2cEfTiBhOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i0NPWRAD9gLMj4LqfxsJ6ePFvTQbFnjRV4g78hRgha8=; b=EXnN8LKtKCPCPPmBAAyanfnlRdN2u45vU6fYLVhyWglXubmZWnHk4ds3RGHblaSPWE+Lex sE+XauXuSSRcUmRGBs84xxm/LsHrFLKKyYZGAUiawwjsOEWLbPDL+AShgzJZE9+/IGzp3+ T7sGw+waPWhvIPtcfHVJKgnlufSEWBwEtj/XEDwNXBGSuEWsCLo9fYm/QnmNkWbCVne+SP sgrMKN6Adt5hSqthANvtJSDZx+1lpfKg3pQ4OgJeHy3McOleu0UQhSimbhxjvvkW2Xsm/n n77pP/6+YyQV1YkipXzTS3bIJczk8+MYTF1ANOLpeA4ClTB34ugWgaXTyjFmwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681751041; a=rsa-sha256; cv=none; b=seDW6kzW/DBqzLXWWqTFcNDYs7hLtyMOrTdszOr/I/bBTUIoiKgKtYamBSjtV4AzAzGVFY bKLeK0auSXCRns9+ZhXTW2LiYg9H7Bv/fN5emzhIEB4yZPkYxALkFnumyIMve28X34h4lP N1ih3UDQyYAwuKLP6gKwI0T0jNLfg2uw0pytWh6tY19URbcCWVQVZosj5GktBZ8ZtqYdC0 iMXEkXnweX1uQ+dO9gSkiwLKmUYuT7S+UF5HpNtoeKoky+GHi07BpKPMZ+ky1UtTGJ7Pal 1DtVZXrzkCryxWeeuhK4R7ISDnN8BJ/2GqRmLqvHb0OkE4ehmeoVVrqapdcBkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0YL931NlzdLw; Mon, 17 Apr 2023 17:04:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HH41Re002555; Mon, 17 Apr 2023 17:04:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HH41AS002554; Mon, 17 Apr 2023 17:04:01 GMT (envelope-from git) Date: Mon, 17 Apr 2023 17:04:01 GMT Message-Id: <202304171704.33HH41AS002554@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 53ad4781f550 - stable/13 - ofwbus: remove arm64 ifdefs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 53ad4781f5503b55db4c86dca7cade7c9cd9c991 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=53ad4781f5503b55db4c86dca7cade7c9cd9c991 commit 53ad4781f5503b55db4c86dca7cade7c9cd9c991 Author: Mitchell Horne AuthorDate: 2023-02-13 17:43:25 +0000 Commit: Mitchell Horne CommitDate: 2023-04-17 16:54:04 +0000 ofwbus: remove arm64 ifdefs Rather than using the DEVICE_IDENTIFY method, let's have other ofwbus-using platforms add ofwbus0 explicitly in nexus, like arm64. This gives them the same flexibility, e.g. if riscv starts supporting ACPI, and cleans up the #ifdefs. We were doing this already on riscv, but adjust the 'order' parameters. Reviewed by: andrew, jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D38492 (cherry picked from commit 53d5e65eead0f713c5e256018d46edbec0a96c11) --- sys/arm/arm/nexus.c | 5 ++++- sys/dev/ofw/ofwbus.c | 25 ++----------------------- sys/powerpc/powerpc/nexus.c | 4 ++++ sys/riscv/riscv/nexus.c | 10 +++++++--- 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c index 3991ec91ed0d..c6c511b85fe3 100644 --- a/sys/arm/arm/nexus.c +++ b/sys/arm/arm/nexus.c @@ -182,8 +182,11 @@ nexus_attach(device_t dev) if (rman_init(&irq_rman) || rman_manage_region(&irq_rman, 0, ~0)) panic("nexus_attach irq_rman"); + /* First, add ofwbus0. */ + device_add_child(dev, "ofwbus", 0); + /* - * First, deal with the children we know about already + * Next, deal with the children we know about already. */ bus_generic_probe(dev); bus_generic_attach(dev); diff --git a/sys/dev/ofw/ofwbus.c b/sys/dev/ofw/ofwbus.c index 4432f1704392..7660be8cec39 100644 --- a/sys/dev/ofw/ofwbus.c +++ b/sys/dev/ofw/ofwbus.c @@ -62,12 +62,10 @@ __FBSDID("$FreeBSD$"); * The ofwbus (which is a pseudo-bus actually) iterates over the nodes that * hang from the Open Firmware root node and adds them as devices to this bus * (except some special nodes which are excluded) so that drivers can be - * attached to them. + * attached to them. There should be only one ofwbus in the system, added + * directly as a child of nexus0. */ -#ifndef __aarch64__ -static device_identify_t ofwbus_identify; -#endif static device_probe_t ofwbus_probe; static device_attach_t ofwbus_attach; static bus_alloc_resource_t ofwbus_alloc_resource; @@ -75,9 +73,6 @@ static bus_release_resource_t ofwbus_release_resource; static device_method_t ofwbus_methods[] = { /* Device interface */ -#ifndef __aarch64__ - DEVMETHOD(device_identify, ofwbus_identify), -#endif DEVMETHOD(device_probe, ofwbus_probe), DEVMETHOD(device_attach, ofwbus_attach), @@ -96,28 +91,12 @@ EARLY_DRIVER_MODULE(ofwbus, nexus, ofwbus_driver, ofwbus_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(ofwbus, 1); -#ifndef __aarch64__ -static void -ofwbus_identify(driver_t *driver, device_t parent) -{ - - /* Check if Open Firmware has been instantiated */ - if (OF_peer(0) == 0) - return; - - if (device_find_child(parent, "ofwbus", -1) == NULL) - BUS_ADD_CHILD(parent, 0, "ofwbus", -1); -} -#endif - static int ofwbus_probe(device_t dev) { -#ifdef __aarch64__ if (OF_peer(0) == 0) return (ENXIO); -#endif device_set_desc(dev, "Open Firmware Device Tree"); return (BUS_PROBE_NOWILDCARD); diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c index 6edc7f258d39..78bcf6363d60 100644 --- a/sys/powerpc/powerpc/nexus.c +++ b/sys/powerpc/powerpc/nexus.c @@ -146,6 +146,10 @@ nexus_attach(device_t dev) rman_manage_region(&mem_rman, 0, BUS_SPACE_MAXADDR) != 0) panic("%s: failed to set up rmans.", __func__); + /* Add ofwbus0. */ + device_add_child(dev, "ofwbus", 0); + + /* Now, probe children. */ bus_generic_probe(dev); bus_generic_attach(dev); diff --git a/sys/riscv/riscv/nexus.c b/sys/riscv/riscv/nexus.c index 9cafb90fd34a..0333c851af2c 100644 --- a/sys/riscv/riscv/nexus.c +++ b/sys/riscv/riscv/nexus.c @@ -165,9 +165,13 @@ nexus_attach(device_t dev) if (rman_init(&irq_rman) || rman_manage_region(&irq_rman, 0, ~0)) panic("nexus_attach irq_rman"); - nexus_add_child(dev, 8, "timer", 0); - nexus_add_child(dev, 9, "rcons", 0); - nexus_add_child(dev, 10, "ofwbus", 0); + /* + * Add direct children of nexus. Devices will be probed and attached + * through ofwbus0. + */ + nexus_add_child(dev, 0, "timer", 0); + nexus_add_child(dev, 1, "rcons", 0); + nexus_add_child(dev, 2, "ofwbus", 0); bus_generic_probe(dev); bus_generic_attach(dev); From nobody Mon Apr 17 17:04:02 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0YLC0vyfz44vnB; Mon, 17 Apr 2023 17:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0YLB4tlKz49ck; Mon, 17 Apr 2023 17:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ExgMHSTd8b1B+AnOedURCWlEN3UmVTnAL+ByrPOwDM=; b=LN6rL7z+BwoZfySw0S0LL1pw8YPvrPPbDps0nz3U33k4Q++l5wzNB0dYV1a/BaVZLYqfgo vbt3Qa0fyoxEUJC7ClCY6BWTaQE0ai9Cn2nSdhjI8P+yUMvLQq9bwhV0XrDsViveAePMr3 g5RUCztPKy0CFhouRi80wBHEmK6nFe6mMm/OBCAIPQASkVQeZpt3M39jgbbVI2kJJsA7I1 Tl79cMossQjm1SCzrwRsZCIgsgRxVp5mapU0c6QQsycwqdIfL+O8IMCe6hlnxVoFzjdxgc DEH5GDJCK9ibJllA+w1On8v/SmAFo88K0uTwxMSEGtxTbK0qhnHVMc3LODQcxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ExgMHSTd8b1B+AnOedURCWlEN3UmVTnAL+ByrPOwDM=; b=oPEyTXiVGV3Iuls6nDmHrbI9AZq88K9m0tzESyXLl9zntninz7VOXKf+I1LFvAgqGtKnsm sI/OaNw6HiP64nN7YtfFbxRqQcLrbGOS1I/hTfIkk5QL6JDy6TXrx6n+hTSlRkLZEm74KA WnHBEwwPD20BY6X35KAEq8nVXu5sYP530B4E6J66iqbvAGZkh8/chK3SVp5KhXdlnMUaIg 2jql/KFkPNX0W8fC8GGgxM+BF54MW/RZSgVxZ9lSo/Z7HaS1zCRJBbnR/IqfXAo6v/hM9q D1e3NtZyDTWcLHawPLb34RLbkTmYz3hGhRcPH8VuTmvZzZ/uzbTP/U5wX5jMKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681751042; a=rsa-sha256; cv=none; b=I2yAC7vOncIqrIzS4A6GoX+7FMJoUYGVME0CflSdDz88+OLJsnyuWDn8NhpY/fAbU0iCW6 w+Kr4LwAQLOFz2AaJem+S29sLtPvPV9t9Ers0W+nBde5rjl5OTnfXrGKaN1ZXwNLKS2+jY 3z1chNCg8OOBSr5liOu0SRh/c0k3wTB38fZnC+kefZvHs9xFEfD32y1VaAa4J7oeERQcuf vYO/U3s8i6Jr4ZBc3W7QL/JAm+JEun9ap65sn6uqk7wgBfQWaT0SBan7uifPLcj+0LF6V+ El5SrToLZ75kfUBjpA19Umkw7AuHyNkfd6HcjuCr2TWqWyjzns2rRtGhCOP26A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0YLB3xW8zd4d; Mon, 17 Apr 2023 17:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HH42Ce002575; Mon, 17 Apr 2023 17:04:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HH42rd002574; Mon, 17 Apr 2023 17:04:02 GMT (envelope-from git) Date: Mon, 17 Apr 2023 17:04:02 GMT Message-Id: <202304171704.33HH42rd002574@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 19866d1a162f - stable/13 - ofwbus: only allow unit number zero List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 19866d1a162fca492ca5a7776d209d1ea4ae565e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=19866d1a162fca492ca5a7776d209d1ea4ae565e commit 19866d1a162fca492ca5a7776d209d1ea4ae565e Author: Mitchell Horne AuthorDate: 2023-02-13 17:44:03 +0000 Commit: Mitchell Horne CommitDate: 2023-04-17 16:54:04 +0000 ofwbus: only allow unit number zero ofwbus has always been the root of attachment for OFW/FDT platforms. It may have simplebus children, but we expect only one instance of the ofwbus driver, added directly by nexus. We may as well ensure this remains the case. Reviewed by: jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D38493 (cherry picked from commit afca197f5240ce2c2c7abfe5c9fbc50ba55f178b) --- sys/dev/ofw/ofwbus.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/ofw/ofwbus.c b/sys/dev/ofw/ofwbus.c index 7660be8cec39..c97fd41bb683 100644 --- a/sys/dev/ofw/ofwbus.c +++ b/sys/dev/ofw/ofwbus.c @@ -98,6 +98,11 @@ ofwbus_probe(device_t dev) if (OF_peer(0) == 0) return (ENXIO); + /* Only one instance of ofwbus. */ + if (device_get_unit(dev) != 0) + panic("ofwbus added with non-zero unit number: %d\n", + device_get_unit(dev)); + device_set_desc(dev, "Open Firmware Device Tree"); return (BUS_PROBE_NOWILDCARD); } From nobody Mon Apr 17 17:04:03 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0YLC75kfz44vss; Mon, 17 Apr 2023 17:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0YLC5w5Dz49jl; Mon, 17 Apr 2023 17:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XAhZj6Nwf2oxY1b7Y1CcJcxiafT2pX1sCg/zUW8P6ik=; b=xEuOhLUBmcqoFyq2oS6XxepyCwUi7r5LkZJhIE9Ml7t8OZSP5iVqLdN5QQ2rTU2BssRn8w D8Fw1s9X6cwC5jxrnNj9a5UbK7bZpAh23XngsY1e2WhE3o3CA7OKg+uECAEfaOaG/1gS5p +xXDF2RsI//sVkhSyMuR2gD26dNtabYZp2Ki8YjV28BbwrMoEbRjf/PCykyFQ8jAvG2mAk H9Hrbj/62oYgwf7AdXkigEeXgnpIr3hgyEXXrcxjIwuRgU9K4VebzHxNLR2mqr1YwLV4uk /fTb6z5uJ518ZNgZib3db4vWKoMBJGhuW1i0pM11ZLHjpgw2rDrRwXsY8sCDVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XAhZj6Nwf2oxY1b7Y1CcJcxiafT2pX1sCg/zUW8P6ik=; b=FjLXWC8T0qJWxLNdG6ZILTrkV8LZnRW7eRkJPhCwiTWH1L1kjW+qyubDDRzFXHSXdaIwFe RV5SxbyxjpRrIn7ZxEiGZzc822MCiSx+8JMkD3VF3i9y/IUcybZKEeSVp/4arQvY4PPLpW DJ+G7eh+Fn7ieNfb2P6lceY3tOLrb+11cio98RmNJb7orS45R/YHAeV//m3aHAb80AYN6c n5TxFn0XNXqEZee5L8d3w4mPxprTUldKJkUNKZud9903uGVZr0ozGB831rWpKcegQ5Xr9P tSqO6fc2lmmVkOwzbOEcwMwxLjIa++GJ/iPbapp93McJ2qKyEuHBYuIcBBclUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681751043; a=rsa-sha256; cv=none; b=spVlvgnVAzW6YUDeerCW+IfukwH/DzCJDwKkUF4ERPhnqx/mQOmO64qq3TqOzXgSGPknWy cEAWLyeIBF1qHkx4oH8JlyoDUBfFcKwebUwILTjHgVE+j+PgI+2OiDQ2YArvLArZvKZJm9 GV6t8laIBQRUDoSaNp0myhcv4QQk2yAWXpDDLywS6MIRuQuLz/zAgJ3nIZzGq5XNbZNa9x ggJHHlu8mpbbjU7X7eehGaxfX/B22kB96tclKO+idmnaGRoCbDXfaxHruH8r09SkmRSly3 SyyVslm/ujCZbLPr/30vTAprH3qiatTE+vjz04KVmLP8npeHAilzgzNhM6/nYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0YLC4t8Zzd00; Mon, 17 Apr 2023 17:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HH435Q002594; Mon, 17 Apr 2023 17:04:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HH43fD002593; Mon, 17 Apr 2023 17:04:03 GMT (envelope-from git) Date: Mon, 17 Apr 2023 17:04:03 GMT Message-Id: <202304171704.33HH43fD002593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 256af80ed4b3 - stable/13 - x86: nexus code tidy-up List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 256af80ed4b346fa7db412d22c3ac141722d383a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=256af80ed4b346fa7db412d22c3ac141722d383a commit 256af80ed4b346fa7db412d22c3ac141722d383a Author: Mitchell Horne AuthorDate: 2023-02-10 14:52:38 +0000 Commit: Mitchell Horne CommitDate: 2023-04-17 16:54:30 +0000 x86: nexus code tidy-up Make a pass at the various nexus implementations, fixing some very minor style issues, obsolete comments, etc. The method declaration section has become unwieldy in many respects. Attempt to tame it by: - Using generated method typedefs - Grouping methods roughly by category, and then alphabetically. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D38495 (cherry picked from commit 99bd5c1fe32272ce6e8d9b2d575b42dd94593b25) --- sys/x86/x86/nexus.c | 165 ++++++++++++++++++++++++---------------------------- 1 file changed, 76 insertions(+), 89 deletions(-) diff --git a/sys/x86/x86/nexus.c b/sys/x86/x86/nexus.c index 2ab891c728c5..fc3cdc3c24f3 100644 --- a/sys/x86/x86/nexus.c +++ b/sys/x86/x86/nexus.c @@ -52,16 +52,13 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include -#include -#include #include -#include -#include #include #include #include @@ -69,10 +66,13 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include +#include #include #include -#include #include +#include #ifdef DEV_APIC #include "pcib_if.h" @@ -82,7 +82,6 @@ __FBSDID("$FreeBSD$"); #include #include #endif -#include #define ELF_KERN_STR ("elf"__XSTRING(__ELF_WORD_SIZE)" kernel") @@ -92,58 +91,44 @@ static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device"); struct rman irq_rman, drq_rman, port_rman, mem_rman; -static int nexus_probe(device_t); -static int nexus_attach(device_t); -static int nexus_print_all_resources(device_t dev); -static int nexus_print_child(device_t, device_t); -static device_t nexus_add_child(device_t bus, u_int order, const char *name, - int unit); -static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, - rman_res_t, rman_res_t, rman_res_t, - u_int); -static int nexus_adjust_resource(device_t, device_t, int, struct resource *, - rman_res_t, rman_res_t); +static int nexus_print_all_resources(device_t dev); + +static device_probe_t nexus_probe; +static device_attach_t nexus_attach; + +static bus_add_child_t nexus_add_child; +static bus_print_child_t nexus_print_child; + +static bus_activate_resource_t nexus_activate_resource; +static bus_adjust_resource_t nexus_adjust_resource; +static bus_alloc_resource_t nexus_alloc_resource; +static bus_deactivate_resource_t nexus_deactivate_resource; +static bus_delete_resource_t nexus_delete_resource; +static bus_get_resource_t nexus_get_resource; +static bus_get_resource_list_t nexus_get_reslist; +static bus_map_resource_t nexus_map_resource; +static bus_release_resource_t nexus_release_resource; +static bus_set_resource_t nexus_set_resource; +static bus_unmap_resource_t nexus_unmap_resource; + #ifdef SMP -static int nexus_bind_intr(device_t, device_t, struct resource *, int); +static bus_bind_intr_t nexus_bind_intr; #endif -static int nexus_config_intr(device_t, int, enum intr_trigger, - enum intr_polarity); -static int nexus_describe_intr(device_t dev, device_t child, - struct resource *irq, void *cookie, - const char *descr); -static int nexus_activate_resource(device_t, device_t, int, int, - struct resource *); -static int nexus_deactivate_resource(device_t, device_t, int, int, - struct resource *); -static int nexus_map_resource(device_t bus, device_t child, int type, - struct resource *r, - struct resource_map_request *argsp, - struct resource_map *map); -static int nexus_unmap_resource(device_t bus, device_t child, int type, - struct resource *r, struct resource_map *map); -static int nexus_release_resource(device_t, device_t, int, int, - struct resource *); -static int nexus_setup_intr(device_t, device_t, struct resource *, int flags, - driver_filter_t filter, void (*)(void *), void *, - void **); -static int nexus_teardown_intr(device_t, device_t, struct resource *, - void *); -static int nexus_suspend_intr(device_t, device_t, struct resource *); -static int nexus_resume_intr(device_t, device_t, struct resource *); -static struct resource_list *nexus_get_reslist(device_t dev, device_t child); -static int nexus_set_resource(device_t, device_t, int, int, - rman_res_t, rman_res_t); -static int nexus_get_resource(device_t, device_t, int, int, - rman_res_t *, rman_res_t *); -static void nexus_delete_resource(device_t, device_t, int, int); -static int nexus_get_cpus(device_t, device_t, enum cpu_sets, size_t, - cpuset_t *); +static bus_config_intr_t nexus_config_intr; +static bus_describe_intr_t nexus_describe_intr; +static bus_resume_intr_t nexus_resume_intr; +static bus_setup_intr_t nexus_setup_intr; +static bus_suspend_intr_t nexus_suspend_intr; +static bus_teardown_intr_t nexus_teardown_intr; + +static bus_get_cpus_t nexus_get_cpus; + #if defined(DEV_APIC) && defined(DEV_PCI) -static int nexus_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs); -static int nexus_release_msi(device_t pcib, device_t dev, int count, int *irqs); -static int nexus_alloc_msix(device_t pcib, device_t dev, int *irq); -static int nexus_release_msix(device_t pcib, device_t dev, int irq); -static int nexus_map_msi(device_t pcib, device_t dev, int irq, uint64_t *addr, uint32_t *data); +static pcib_alloc_msi_t nexus_alloc_msi; +static pcib_release_msi_t nexus_release_msi; +static pcib_alloc_msix_t nexus_alloc_msix; +static pcib_release_msix_t nexus_release_msix; +static pcib_map_msi_t nexus_map_msi; #endif static device_method_t nexus_methods[] = { @@ -158,26 +143,26 @@ static device_method_t nexus_methods[] = { /* Bus interface */ DEVMETHOD(bus_print_child, nexus_print_child), DEVMETHOD(bus_add_child, nexus_add_child), - DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), - DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), - DEVMETHOD(bus_release_resource, nexus_release_resource), DEVMETHOD(bus_activate_resource, nexus_activate_resource), + DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), + DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), + DEVMETHOD(bus_get_resource, nexus_get_resource), + DEVMETHOD(bus_get_resource_list, nexus_get_reslist), + DEVMETHOD(bus_delete_resource, nexus_delete_resource), DEVMETHOD(bus_map_resource, nexus_map_resource), + DEVMETHOD(bus_release_resource, nexus_release_resource), + DEVMETHOD(bus_set_resource, nexus_set_resource), DEVMETHOD(bus_unmap_resource, nexus_unmap_resource), - DEVMETHOD(bus_setup_intr, nexus_setup_intr), - DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), - DEVMETHOD(bus_suspend_intr, nexus_suspend_intr), - DEVMETHOD(bus_resume_intr, nexus_resume_intr), #ifdef SMP DEVMETHOD(bus_bind_intr, nexus_bind_intr), #endif DEVMETHOD(bus_config_intr, nexus_config_intr), DEVMETHOD(bus_describe_intr, nexus_describe_intr), - DEVMETHOD(bus_get_resource_list, nexus_get_reslist), - DEVMETHOD(bus_set_resource, nexus_set_resource), - DEVMETHOD(bus_get_resource, nexus_get_resource), - DEVMETHOD(bus_delete_resource, nexus_delete_resource), + DEVMETHOD(bus_resume_intr, nexus_resume_intr), + DEVMETHOD(bus_setup_intr, nexus_setup_intr), + DEVMETHOD(bus_suspend_intr, nexus_suspend_intr), + DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), DEVMETHOD(bus_get_cpus, nexus_get_cpus), /* pcib interface */ @@ -188,7 +173,7 @@ static device_method_t nexus_methods[] = { DEVMETHOD(pcib_release_msix, nexus_release_msix), DEVMETHOD(pcib_map_msi, nexus_map_msi), #endif - { 0, 0 } + DEVMETHOD_END }; DEFINE_CLASS_0(nexus, nexus_driver, nexus_methods, 1); @@ -295,7 +280,7 @@ nexus_attach(device_t dev) if (BUS_ADD_CHILD(dev, 10, "legacy", 0) == NULL) panic("legacy: could not attach"); bus_generic_attach(dev); - return 0; + return (0); } static int @@ -312,7 +297,7 @@ nexus_print_all_resources(device_t dev) retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#jx"); retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd"); - return retval; + return (retval); } static int @@ -337,7 +322,7 @@ nexus_add_child(device_t bus, u_int order, const char *name, int unit) ndev = malloc(sizeof(struct nexus_device), M_NEXUSDEV, M_NOWAIT|M_ZERO); if (!ndev) - return(0); + return (0); resource_list_init(&ndev->nx_resources); child = device_add_child_ordered(bus, order, name, unit); @@ -345,7 +330,7 @@ nexus_add_child(device_t bus, u_int order, const char *name, int unit) /* should we free this in nexus_child_detached? */ device_set_ivars(child, ndev); - return(child); + return (child); } static struct rman * @@ -368,7 +353,6 @@ nexus_rman(int type) /* * Allocate a resource on behalf of child. NB: child is usually going to be a * child of one of our descendants, not a direct child of nexus0. - * (Exceptions include npx.) */ static struct resource * nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, @@ -389,10 +373,10 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, */ if (RMAN_IS_DEFAULT_RANGE(start, end) && (count == 1)) { if (device_get_parent(child) != bus || ndev == NULL) - return(NULL); + return (NULL); rle = resource_list_find(&ndev->nx_resources, type, *rid); if (rle == NULL) - return(NULL); + return (NULL); start = rle->start; end = rle->end; count = rle->count; @@ -405,17 +389,17 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, rv = rman_reserve_resource(rm, start, end, count, flags, child); if (rv == NULL) - return 0; + return (0); rman_set_rid(rv, *rid); if (needactivate) { if (bus_activate_resource(child, type, *rid, rv)) { rman_release_resource(rv); - return 0; + return (0); } } - return rv; + return (rv); } static int @@ -557,11 +541,12 @@ static int nexus_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { + int error; if (rman_get_flags(r) & RF_ACTIVE) { - int error = bus_deactivate_resource(child, type, rid, r); - if (error) - return error; + error = bus_deactivate_resource(child, type, rid, r); + if (error != 0) + return (error); } return (rman_release_resource(r)); } @@ -591,7 +576,7 @@ nexus_setup_intr(device_t bus, device_t child, struct resource *irq, * We depend here on rman_activate_resource() being idempotent. */ error = rman_activate_resource(irq); - if (error) + if (error != 0) return (error); if (bus_get_domain(child, &domain) != 0) domain = 0; @@ -667,7 +652,7 @@ nexus_set_resource(device_t dev, device_t child, int type, int rid, /* XXX this should return a success/failure indicator */ resource_list_add(rl, type, rid, start, start + count - 1, count); - return(0); + return (0); } static int @@ -680,12 +665,12 @@ nexus_get_resource(device_t dev, device_t child, int type, int rid, rle = resource_list_find(rl, type, rid); if (!rle) - return(ENOENT); + return (ENOENT); if (startp) *startp = rle->start; if (countp) *countp = rle->count; - return(0); + return (0); } static void @@ -795,7 +780,7 @@ ram_attach(device_t dev) /* Retrieve the system memory map from the loader. */ kmdp = preload_search_by_type("elf kernel"); if (kmdp == NULL) - kmdp = preload_search_by_type(ELF_KERN_STR); + kmdp = preload_search_by_type(ELF_KERN_STR); smapbase = (struct bios_smap *)preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_SMAP); if (smapbase != NULL) { @@ -858,7 +843,8 @@ static device_method_t ram_methods[] = { DEVMETHOD(device_identify, ram_identify), DEVMETHOD(device_probe, ram_probe), DEVMETHOD(device_attach, ram_attach), - { 0, 0 } + + DEVMETHOD_END }; static driver_t ram_driver = { @@ -890,13 +876,13 @@ sysresource_probe(device_t dev) if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, sysresource_ids)) <= 0) { device_quiet(dev); } - return(result); + return (result); } static int sysresource_attach(device_t dev) { - return(0); + return (0); } static device_method_t sysresource_methods[] = { @@ -907,7 +893,8 @@ static device_method_t sysresource_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), - { 0, 0 } + + DEVMETHOD_END }; static driver_t sysresource_driver = { From nobody Mon Apr 17 17:04:04 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0YLF09Qvz44vWY; Mon, 17 Apr 2023 17:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0YLD6p0hz49XK; Mon, 17 Apr 2023 17:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xR3WcjUdPzZ86Ed9ysR+jA3dVBineZGUdlovx/X2hxU=; b=LPbA0F7KUj6kkNGtsPF43w5OpdCCYJMNun88BXdFl9o7Y4eQb/UIqW9VX9rU/CsUmQMHEc lFIycYr+CQuLu7evGGaIyNvZp9Cee62kZMd+0c9Pcf3lLI5znk6jxc0o0Cj+vMX+7E+Dve OeeXwnt9g1IlqC9E40HWVoCjPYxsj8NNRTypbf68fGV3kANgFSn6SzHbZVXWGHh33c3N22 x9hayoQ41nmn2r/FPP5k/SVUSsj3EQ2FkRjL0XYt0orvrAYQDgnb+jMZN5NTiDCgu8BWy0 iXEL/7yVvyLN5Zjo7I8YMV8ObYi2xA4zjTo5zVa4QRfNkz8o+hRq5bb0m+mAKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xR3WcjUdPzZ86Ed9ysR+jA3dVBineZGUdlovx/X2hxU=; b=aMIZNAGFh0/WtpewO92DbHlnBR8lNJnTymGDo+Jklo26GdlLEBsII3FRNwCzR8FdAtMp77 Yw06sewXVzWjmAbHHgF9ck3LjXBZVxXnXEP+WZBRYXK+xrYWqNUmE/oK15s4Ymb/BIfyXc C0P7qgzzwDgf+BjIjlVHvoee+zDcc2y69EoazGA5sV9pfGbdn9wHPQELFU79XXnAR5dTFh DfstOLGR5anJFjrw3/hiuUExGLegm5H1QXZHRhY2ZZVr8ccf/Bh2KqbAxMC/TjwEOFXBQO WfW92I9jGuVtKtKyt7l6WqDL9n7ZGN670Qi+0Q875x7fmkCvVbqkvIZsyiN3tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681751045; a=rsa-sha256; cv=none; b=rHNwwBxas6Kc9wzburxBU8IK3tyjMVdaciGQMZ3icKyqr68VcwYkz25pHH/jmmHaMgUnzr cTd92oTV5wVzgtif0aVE0tMfTY5KQ7fnkSs8bRmtB8EFYIRB0BTt89Y1Q3EcZ2JpqsnWHC gVPuS17Fp7TuyHxTRobD4JNbnYPTBOsqN7iFq/rX8TeHiMQE2jw5Q4u7coUwGheEzGTNx7 Tda9ByvH8J3Vimuw4Y73Jx0R3gdhA4+wtx4iu0nKVAZ75SNXh5i095j9ppCL0Clzhdc/cT 94uqL02XYII9mGopXUrDbdBQqnDp0Wrf4/Nb9d5cuT0v54xQhesyDfqpxemudg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0YLD5rWhzd4f; Mon, 17 Apr 2023 17:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HH44uC002613; Mon, 17 Apr 2023 17:04:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HH44cm002612; Mon, 17 Apr 2023 17:04:04 GMT (envelope-from git) Date: Mon, 17 Apr 2023 17:04:04 GMT Message-Id: <202304171704.33HH44cm002612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: c75d7f769541 - stable/13 - riscv: nexus code tidy-up List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c75d7f769541a06a57f84780149a3d599f0ac802 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c75d7f769541a06a57f84780149a3d599f0ac802 commit c75d7f769541a06a57f84780149a3d599f0ac802 Author: Mitchell Horne AuthorDate: 2023-02-06 15:53:09 +0000 Commit: Mitchell Horne CommitDate: 2023-04-17 16:57:35 +0000 riscv: nexus code tidy-up Make a pass at the various nexus implementations, fixing some very minor style issues, obsolete comments, etc. The method declaration section has become unwieldy in many respects. Attempt to tame it by: - Using generated method typedefs - Grouping methods roughly by category, and then alphabetically. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D38495 (cherry picked from commit abe3309e71b94527e937f034dd81ca7d6afdeb67) --- sys/riscv/riscv/nexus.c | 89 ++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 49 deletions(-) diff --git a/sys/riscv/riscv/nexus.c b/sys/riscv/riscv/nexus.c index 0333c851af2c..38c11b13aff6 100644 --- a/sys/riscv/riscv/nexus.c +++ b/sys/riscv/riscv/nexus.c @@ -76,36 +76,28 @@ struct nexus_device { static struct rman mem_rman; static struct rman irq_rman; -static device_probe_t nexus_fdt_probe; -static int nexus_attach(device_t); - -static int nexus_print_child(device_t, device_t); -static device_t nexus_add_child(device_t, u_int, const char *, int); -static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, - rman_res_t, rman_res_t, rman_res_t, u_int); -static int nexus_activate_resource(device_t, device_t, int, int, - struct resource *); -static int nexus_adjust_resource(device_t, device_t, int, struct resource *, - rman_res_t, rman_res_t); -static int nexus_map_resource(device_t, device_t, int, struct resource *, - struct resource_map_request *, struct resource_map *); -static int nexus_config_intr(device_t dev, int irq, enum intr_trigger trig, - enum intr_polarity pol); -static struct resource_list *nexus_get_reslist(device_t, device_t); -static int nexus_set_resource(device_t, device_t, int, int, - rman_res_t, rman_res_t); -static int nexus_deactivate_resource(device_t, device_t, int, int, - struct resource *); -static int nexus_release_resource(device_t, device_t, int, int, - struct resource *); - -static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, - int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep); -static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); -static bus_space_tag_t nexus_get_bus_tag(device_t, device_t); - -static int nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, - int icells, pcell_t *intr); +static device_probe_t nexus_fdt_probe; +static device_attach_t nexus_attach; + +static bus_add_child_t nexus_add_child; +static bus_print_child_t nexus_print_child; + +static bus_activate_resource_t nexus_activate_resource; +static bus_adjust_resource_t nexus_adjust_resource; +static bus_alloc_resource_t nexus_alloc_resource; +static bus_deactivate_resource_t nexus_deactivate_resource; +static bus_get_resource_list_t nexus_get_reslist; +static bus_map_resource_t nexus_map_resource; +static bus_set_resource_t nexus_set_resource; +static bus_release_resource_t nexus_release_resource; + +static bus_config_intr_t nexus_config_intr; +static bus_setup_intr_t nexus_setup_intr; +static bus_teardown_intr_t nexus_teardown_intr; + +static bus_get_bus_tag_t nexus_get_bus_tag; + +static ofw_bus_map_intr_t nexus_ofw_map_intr; static device_method_t nexus_methods[] = { /* Device interface */ @@ -116,21 +108,22 @@ static device_method_t nexus_methods[] = { DEVMETHOD(ofw_bus_map_intr, nexus_ofw_map_intr), /* Bus interface */ - DEVMETHOD(bus_print_child, nexus_print_child), DEVMETHOD(bus_add_child, nexus_add_child), - DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), - DEVMETHOD(bus_activate_resource, nexus_activate_resource), + DEVMETHOD(bus_print_child, nexus_print_child), + DEVMETHOD(bus_activate_resource, nexus_activate_resource), DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), - DEVMETHOD(bus_map_resource, nexus_map_resource), - DEVMETHOD(bus_config_intr, nexus_config_intr), + DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), + DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), DEVMETHOD(bus_get_resource_list, nexus_get_reslist), + DEVMETHOD(bus_map_resource, nexus_map_resource), DEVMETHOD(bus_set_resource, nexus_set_resource), - DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), DEVMETHOD(bus_release_resource, nexus_release_resource), + DEVMETHOD(bus_config_intr, nexus_config_intr), DEVMETHOD(bus_setup_intr, nexus_setup_intr), DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), DEVMETHOD(bus_get_bus_tag, nexus_get_bus_tag), - { 0, 0 } + + DEVMETHOD_END }; static driver_t nexus_fdt_driver = { @@ -139,6 +132,11 @@ static driver_t nexus_fdt_driver = { 1 /* no softc */ }; +static devclass_t nexus_fdt_devclass; + +EARLY_DRIVER_MODULE(nexus_fdt, root, nexus_fdt_driver, nexus_fdt_devclass, + 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_FIRST); + static int nexus_fdt_probe(device_t dev) { @@ -203,7 +201,6 @@ nexus_add_child(device_t bus, u_int order, const char *name, int unit) child = device_add_child_ordered(bus, order, name, unit); - /* should we free this in nexus_child_detached? */ device_set_ivars(child, ndev); return (child); @@ -212,7 +209,6 @@ nexus_add_child(device_t bus, u_int order, const char *name, int unit) /* * Allocate a resource on behalf of child. NB: child is usually going to be a * child of one of our descendants, not a direct child of nexus0. - * (Exceptions include footbridge.) */ static struct resource * nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, @@ -232,10 +228,10 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, */ if (RMAN_IS_DEFAULT_RANGE(start, end) && (count == 1)) { if (device_get_parent(child) != bus || ndev == NULL) - return(NULL); + return (NULL); rle = resource_list_find(&ndev->nx_resources, type, *rid); if (rle == NULL) - return(NULL); + return (NULL); start = rle->start; end = rle->end; count = rle->count; @@ -301,7 +297,7 @@ nexus_release_resource(device_t bus, device_t child, int type, int rid, if (rman_get_flags(res) & RF_ACTIVE) { error = bus_deactivate_resource(child, type, rid, res); - if (error) + if (error != 0) return (error); } return (rman_release_resource(res)); @@ -326,7 +322,7 @@ nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, /* We depend here on rman_activate_resource() being idempotent. */ error = rman_activate_resource(res); - if (error) + if (error != 0) return (error); error = intr_setup_irq(child, res, filt, intr, arg, flags, cookiep); @@ -403,7 +399,7 @@ nexus_set_resource(device_t dev, device_t child, int type, int rid, /* XXX this should return a success/failure indicator */ resource_list_add(rl, type, rid, start, start + count - 1, count); - return(0); + return (0); } static int @@ -474,11 +470,6 @@ nexus_map_resource(device_t bus, device_t child, int type, struct resource *r, return (0); } -static devclass_t nexus_fdt_devclass; - -EARLY_DRIVER_MODULE(nexus_fdt, root, nexus_fdt_driver, nexus_fdt_devclass, - 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_FIRST); - static int nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int icells, pcell_t *intr) From nobody Mon Apr 17 17:04:05 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0YLG28NTz44vnJ; Mon, 17 Apr 2023 17:04:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0YLG0rL9z49kw; Mon, 17 Apr 2023 17:04:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5zPCXc7xz+KrQK2DZ4gyU5mTGVoS1LswA2A0DvRtSIc=; b=lGCu9VRLFVXxIvmL7vMCIf7o7szBNz06+Yua4HD8EoQ+D5RtNK0oCzdjkwnumoNdZP8kmU 2wL8GvMnafrExghyMmRuT42t4p9N18y2DpKLXrOOhpDsIvVPUV7C2uZt0m/71T16Oy5MSU vbLnor9/CPonwM0clX9d6JL2XM73vZpkLqJmc41Sm3YBNUjaGdJi2fNyKJ1wzupL995BsQ W9jwHq00yUPTNJ+XzPfvVMgf90/9FVRnxRGbHHXzA8p2leDRk98+Fijcjr/bAyOd3AODmo G32Xwiaw2DPLeijH5fP++yiaz3R86+32VWpHLyjpVQJ1FZupw0qQpog69rD8+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5zPCXc7xz+KrQK2DZ4gyU5mTGVoS1LswA2A0DvRtSIc=; b=HTnvhY4neIXsaJJbeZ72yJiJw4SaWNW02v+BxewDDC3uI0zOKd+y+SRtu3ANm+5Dmh4eWg WsQwIM+MgTeUmC83rVjTQA95VyLzbA+8/U48M/cnMpVmeJ8iU9DUjO7EpnDjofxxUteR1c ddxlHnDHp/uFWM4s22wvVHXbhCIO7jxSOB7GSYFGjdgC5IEByN2zFBAkgR/Q35NQ5e8rBW t67+ZQf28VLxz/OVQ1OVMF87ztN8CJKyQBbn1t6riXZ8+LswyBjDJP+NCtFV0PSLYvoVXG CmaIBMmmqkGNo4K3igBu0ZotIwJaR5abeAv+Eyh5Mst++vXc1mTkGsWiZejxkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681751046; a=rsa-sha256; cv=none; b=W8oSoYJrDqfYtynh9qfu7tZC6lCdqC2/KNxVlWyS08RqSK2hlnLlOMzB4txt2YxIxM6MAa ytNb7VJ2w6rqW8h+rEdm+0Wc1+aMwK8O5rggzLa3iA+Fw7X3+RZR90GHhD5ljlYfLbqDS4 0GEbvJ8imONZj9CWsJZ2S+kOYcaBIS4QcXozYREm/p0AWtdKtG6LgZVRZYgD4nt4RA9X6G J2euhUrvbZn3JzMf2qa4msi/DvN2YcCHSj47O5J8NnK2CDFcQzRV+4pzvHZLr7oDf1oVv/ qOomQImmzBFfzWhepDXZiNoQJ2FJJs1v7lcNaVB1GKujiaSJt0Jk2ZbUk+XM8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0YLF6fd3zd7X; Mon, 17 Apr 2023 17:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HH45sh002632; Mon, 17 Apr 2023 17:04:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HH45TD002631; Mon, 17 Apr 2023 17:04:05 GMT (envelope-from git) Date: Mon, 17 Apr 2023 17:04:05 GMT Message-Id: <202304171704.33HH45TD002631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: d3d739ffa7a5 - stable/13 - powerpc: nexus code tidy-up List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d3d739ffa7a53530ad81b4c242b9e12743bc8d99 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d3d739ffa7a53530ad81b4c242b9e12743bc8d99 commit d3d739ffa7a53530ad81b4c242b9e12743bc8d99 Author: Mitchell Horne AuthorDate: 2023-02-10 14:37:08 +0000 Commit: Mitchell Horne CommitDate: 2023-04-17 16:57:55 +0000 powerpc: nexus code tidy-up Make a pass at the various nexus implementations, fixing some very minor style issues, obsolete comments, etc. Update the top-level comment to be closer to other nexus implementations. The method declaration section has become unwieldy in many respects. Attempt to tame it by: - Using generated method typedefs - Grouping methods roughly by category, and then alphabetically. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D38495 (cherry picked from commit c514686aa06a08a97df051a75da9ea7964a74fb0) --- sys/powerpc/powerpc/nexus.c | 76 ++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c index 78bcf6363d60..baca759b2071 100644 --- a/sys/powerpc/powerpc/nexus.c +++ b/sys/powerpc/powerpc/nexus.c @@ -32,62 +32,62 @@ * from: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09 */ +/* + * This code implements a `root nexus' for Power ISA Architecture + * machines. The function of the root nexus is to serve as an + * attachment point for both processors and buses, and to manage + * resources which are common to all of them. In particular, + * this code implements the core resource managers for interrupt + * requests and I/O memory address space. + */ + #include __FBSDID("$FreeBSD$"); -#include #include #include #include -#include #include #include #include -#include #include -#include #include #include -#include -#include -#include - #include +#include #include #include -/* - * The nexus handles root-level resource allocation requests and interrupt - * mapping. All direct subdevices of nexus are attached by DEVICE_IDENTIFY(). - */ +#include +#include +#include static struct rman intr_rman; static struct rman mem_rman; -static device_probe_t nexus_probe; -static device_attach_t nexus_attach; -static bus_setup_intr_t nexus_setup_intr; -static bus_teardown_intr_t nexus_teardown_intr; -static bus_alloc_resource_t nexus_alloc_resource; -static bus_activate_resource_t nexus_activate_resource; +static device_probe_t nexus_probe; +static device_attach_t nexus_attach; + +static bus_activate_resource_t nexus_activate_resource; +static bus_adjust_resource_t nexus_adjust_resource; +static bus_alloc_resource_t nexus_alloc_resource; static bus_deactivate_resource_t nexus_deactivate_resource; -static bus_adjust_resource_t nexus_adjust_resource; -static bus_release_resource_t nexus_release_resource; -static int nexus_map_resource(device_t bus, device_t child, int type, - struct resource *r, - struct resource_map_request *argsp, - struct resource_map *map); -static int nexus_unmap_resource(device_t bus, device_t child, int type, - struct resource *r, struct resource_map *map); - -static bus_space_tag_t nexus_get_bus_tag(device_t, device_t); +static bus_map_resource_t nexus_map_resource; +static bus_release_resource_t nexus_release_resource; +static bus_unmap_resource_t nexus_unmap_resource; + #ifdef SMP -static bus_bind_intr_t nexus_bind_intr; +static bus_bind_intr_t nexus_bind_intr; #endif -static bus_config_intr_t nexus_config_intr; -static ofw_bus_map_intr_t nexus_ofw_map_intr; +static bus_config_intr_t nexus_config_intr; +static bus_setup_intr_t nexus_setup_intr; +static bus_teardown_intr_t nexus_teardown_intr; + +static bus_get_bus_tag_t nexus_get_bus_tag; + +static ofw_bus_map_intr_t nexus_ofw_map_intr; static device_method_t nexus_methods[] = { /* Device interface */ @@ -96,19 +96,19 @@ static device_method_t nexus_methods[] = { /* Bus interface */ DEVMETHOD(bus_add_child, bus_generic_add_child), - DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), - DEVMETHOD(bus_activate_resource, nexus_activate_resource), - DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), - DEVMETHOD(bus_release_resource, nexus_release_resource), + DEVMETHOD(bus_activate_resource, nexus_activate_resource), + DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), + DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), DEVMETHOD(bus_map_resource, nexus_map_resource), + DEVMETHOD(bus_release_resource, nexus_release_resource), DEVMETHOD(bus_unmap_resource, nexus_unmap_resource), - DEVMETHOD(bus_setup_intr, nexus_setup_intr), - DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), #ifdef SMP DEVMETHOD(bus_bind_intr, nexus_bind_intr), #endif DEVMETHOD(bus_config_intr, nexus_config_intr), + DEVMETHOD(bus_setup_intr, nexus_setup_intr), + DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), DEVMETHOD(bus_get_bus_tag, nexus_get_bus_tag), /* ofw_bus interface */ @@ -225,7 +225,7 @@ nexus_config_intr(device_t dev, int irq, enum intr_trigger trig, { return (powerpc_config_intr(irq, trig, pol)); -} +} static int nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int icells, From nobody Mon Apr 17 17:04:07 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0YLH4BGMz44vSx; Mon, 17 Apr 2023 17:04: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 4Q0YLH1f6mz49Y5; Mon, 17 Apr 2023 17:04:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ypttONUs3Y+1V2VcFpLS3+TqFPTsd0fCzgd8eyfmBBE=; b=S+OZg2oHzXH3qXYvIyuFoDb1+C3uuE6JVj81jYwQCpQtPEtOLGNgNhDWcIlRGuboEPJEa3 K+42zeJDnCraExi+SRS5mLYYdYrQdjSQ23CE2zjxfAr0SL97btTiSVaGpdNmfCDwN1+N3v JtX4iEicqhRaxvoXfojXnxY3lXYr4H77VJeNGaSnIBTkcJ8yidBN/6m4IvSrZRElKqPfXe p2Y4gs+J4i1bIoaS4wNpFYIGVSyywuc3JhLyHb173CXuXLtidkxvQE47UU1RqPlhjmh4Jz 7r4eHzTBEUZf8jSEjmzQ2tuMHCYetgx+9N0rRr5Z6xLbaKM0yP8K+FgKQE1O+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ypttONUs3Y+1V2VcFpLS3+TqFPTsd0fCzgd8eyfmBBE=; b=QQEu2AtKzNoy27iYUcR6trdiKOI8cEXiRk17/l1bTPOvFebAQXWcJPF4KK2ncVCHXkV2hy /cQoOu1Wjnxz04+eTW0/odeiL29jdAve6wFVoKCVZIb6T6FzG2SYcZ4aLzfoMTzDW9SjUy 7fggLsxUJLVsi5C5ZFiFjrdIBdQNltvlt1JtU6yA6W8P4g9zxP3dNgA6mToyo7aeT/ASlZ l5u69y26outABmbElL1MsSTGDZfoNG108AfwBqJw9yQgE2eEvdcJxXhwo3avTBXegFuten IVdFUxQhEZZiNFMf19TgNPDqasZ46lQu6QfVcWb9d7dWPOErPm34+i5RHqdmRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681751047; a=rsa-sha256; cv=none; b=OO1Sregv/6CABaoL+O69Y2toM3/INgGCeEmdgrg6q1Li5syAA9N4lNo4tY1FpOePmlMfyx +p+XMABG6sAnqm9L8iWA/vopMjVII3IbGV2swTkRIhDdzcdwrRjE3wfkhMo+wv/4Fnb1kB Djg0QHioUvTGzUZbsi/Tcjzed6hfEryIullVPchKbouSxJPkUD5Wavo9A7qsqOgjApux3Y sCSEEHCQdqg4rucNGnpfuXnucGWP8I6A/jAANMLGXxxkEvZLjqH8hmrT/dSA1nr7yZ/fUx bCDkvPGnkBQ0CNUbrFMiuJlC7USZk3rKDGOu5qfPTaAL2K02H6XZRzwzkh7GNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0YLH0lyRzd9W; Mon, 17 Apr 2023 17:04:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HH477G002657; Mon, 17 Apr 2023 17:04:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HH47Qk002656; Mon, 17 Apr 2023 17:04:07 GMT (envelope-from git) Date: Mon, 17 Apr 2023 17:04:07 GMT Message-Id: <202304171704.33HH47Qk002656@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: e0d675cf5cdf - stable/13 - arm: nexus code tidy-up List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e0d675cf5cdf1438ce6d525ac7d618e1f2a30231 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e0d675cf5cdf1438ce6d525ac7d618e1f2a30231 commit e0d675cf5cdf1438ce6d525ac7d618e1f2a30231 Author: Mitchell Horne AuthorDate: 2023-02-06 15:57:33 +0000 Commit: Mitchell Horne CommitDate: 2023-04-17 16:57:55 +0000 arm: nexus code tidy-up Make a pass at the various nexus implementations, fixing some very minor style issues, obsolete comments, etc. The method declaration section has become unwieldy in many respects. Attempt to tame it by: - Using generated method typedefs - Grouping methods roughly by category, and then alphabetically. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D38495 (cherry picked from commit c650e1949558c1993d7486859ad9804fd582129e) --- sys/arm/arm/nexus.c | 90 +++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 48 deletions(-) diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c index c6c511b85fe3..d0894f3823ef 100644 --- a/sys/arm/arm/nexus.c +++ b/sys/arm/arm/nexus.c @@ -45,20 +45,20 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include -#include #include -#include -#include -#include #include #include -#include +#include +#include #include +#include +#include #include @@ -79,37 +79,31 @@ struct nexus_device { static struct rman mem_rman; static struct rman irq_rman; -static int nexus_probe(device_t); -static int nexus_attach(device_t); -static int nexus_print_child(device_t, device_t); -static device_t nexus_add_child(device_t, u_int, const char *, int); -static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, - rman_res_t, rman_res_t, rman_res_t, u_int); -static int nexus_activate_resource(device_t, device_t, int, int, - struct resource *); -static int nexus_adjust_resource(device_t, device_t, int, struct resource *, - rman_res_t, rman_res_t); -static bus_space_tag_t nexus_get_bus_tag(device_t, device_t); -static bus_dma_tag_t nexus_get_dma_tag(device_t dev, device_t child); +static device_probe_t nexus_probe; +static device_attach_t nexus_attach; + +static bus_add_child_t nexus_add_child; +static bus_print_child_t nexus_print_child; + +static bus_activate_resource_t nexus_activate_resource; +static bus_adjust_resource_t nexus_adjust_resource; +static bus_alloc_resource_t nexus_alloc_resource; +static bus_deactivate_resource_t nexus_deactivate_resource; +static bus_release_resource_t nexus_release_resource; + #ifdef SMP -static int nexus_bind_intr(device_t, device_t, struct resource *, int); +static bus_bind_intr_t nexus_bind_intr; #endif -static int nexus_config_intr(device_t dev, int irq, enum intr_trigger trig, - enum intr_polarity pol); -static int nexus_describe_intr(device_t dev, device_t child, - struct resource *irq, void *cookie, const char *descr); -static int nexus_deactivate_resource(device_t, device_t, int, int, - struct resource *); -static int nexus_release_resource(device_t, device_t, int, int, - struct resource *); - -static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, - int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep); -static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); +static bus_config_intr_t nexus_config_intr; +static bus_describe_intr_t nexus_describe_intr; +static bus_setup_intr_t nexus_setup_intr; +static bus_teardown_intr_t nexus_teardown_intr; + +static bus_get_bus_tag_t nexus_get_bus_tag; +static bus_get_dma_tag_t nexus_get_dma_tag; #ifdef FDT -static int nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, - int icells, pcell_t *intr); +static ofw_bus_map_intr_t nexus_ofw_map_intr; #endif /* @@ -123,27 +117,29 @@ static device_method_t nexus_methods[] = { /* Device interface */ DEVMETHOD(device_probe, nexus_probe), DEVMETHOD(device_attach, nexus_attach), + /* Bus interface */ - DEVMETHOD(bus_print_child, nexus_print_child), DEVMETHOD(bus_add_child, nexus_add_child), - DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), - DEVMETHOD(bus_activate_resource, nexus_activate_resource), + DEVMETHOD(bus_print_child, nexus_print_child), + DEVMETHOD(bus_activate_resource, nexus_activate_resource), DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), - DEVMETHOD(bus_config_intr, nexus_config_intr), - DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), + DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), + DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), DEVMETHOD(bus_release_resource, nexus_release_resource), +#ifdef SMP + DEVMETHOD(bus_bind_intr, nexus_bind_intr), +#endif + DEVMETHOD(bus_config_intr, nexus_config_intr), + DEVMETHOD(bus_describe_intr, nexus_describe_intr), DEVMETHOD(bus_setup_intr, nexus_setup_intr), DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), DEVMETHOD(bus_get_bus_tag, nexus_get_bus_tag), DEVMETHOD(bus_get_dma_tag, nexus_get_dma_tag), - DEVMETHOD(bus_describe_intr, nexus_describe_intr), -#ifdef SMP - DEVMETHOD(bus_bind_intr, nexus_bind_intr), -#endif #ifdef FDT + /* ofw_bus interface */ DEVMETHOD(ofw_bus_map_intr, nexus_ofw_map_intr), #endif - { 0, 0 } + DEVMETHOD_END }; static devclass_t nexus_devclass; @@ -218,7 +214,6 @@ nexus_add_child(device_t bus, u_int order, const char *name, int unit) child = device_add_child_ordered(bus, order, name, unit); - /* should we free this in nexus_child_detached? */ device_set_ivars(child, ndev); return (child); @@ -227,7 +222,6 @@ nexus_add_child(device_t bus, u_int order, const char *name, int unit) /* * Allocate a resource on behalf of child. NB: child is usually going to be a * child of one of our descendants, not a direct child of nexus0. - * (Exceptions include footbridge.) */ static struct resource * nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, @@ -309,9 +303,9 @@ nexus_get_bus_tag(device_t bus __unused, device_t child __unused) { #ifdef FDT - return(fdtbus_bs_tag); + return (fdtbus_bs_tag); #else - return((void *)1); + return ((void *)1); #endif } @@ -319,7 +313,7 @@ static bus_dma_tag_t nexus_get_dma_tag(device_t dev, device_t child) { - return nexus_dma_tag; + return (nexus_dma_tag); } void @@ -348,7 +342,7 @@ nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, if ((rman_get_flags(res) & RF_SHAREABLE) == 0) flags |= INTR_EXCL; - return(intr_setup_irq(child, res, filt, intr, arg, flags, cookiep)); + return (intr_setup_irq(child, res, filt, intr, arg, flags, cookiep)); } static int From nobody Mon Apr 17 17:04:08 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0YLJ3Gdzz44vt4; Mon, 17 Apr 2023 17:04: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 4Q0YLJ2V3hz49YH; Mon, 17 Apr 2023 17:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/fFbDkvtnYvTGoRxS5C2u1QqpvK14Ol7btScAQ4La/o=; b=eOarPNs3uzn5XbEz+DfOViJxbUt1H5M+IQ611+Kz4j9w0hF1WN5BdyTp7y9HEn/hMqVCg/ OACwctS0DWZo5YiDkf6YouXVzDiM2IvyAKelCYaGsM9bPu+r64g5o4EQqGmmJMUBL10d/W Vu0DGlHz5UGab3WTZ+cgBeGTKqZkrbiX/4uaU6Km0PJP84af/dWQc9r7S64V+GFRjuerdw 7Fh6VWJcPNcFVK5z4vAjrg5QTLK52OCmha6Eca+CzTHCY/JlHNZE3pC/5TWItu1AfstJ8F MmWmaR3cT1GIWiMgUYPZgkTY1n0o5BT930sf+MmAPVWCeOqZPgfV2ViE36ezDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/fFbDkvtnYvTGoRxS5C2u1QqpvK14Ol7btScAQ4La/o=; b=XUWsR50pwkOEG2zmhXj+ZYNywRY14DqIikk2R2cNmSLntE6eCDzxfJSTO8V0TXTwPk2l5x 3Cf/34AczP9wUwwpg9DNi6Wvo0zJiDB5a0rsmMlj4EECVMANNGuz3N2imz33WeEIsgP0Fr sffMNCjxiR7k/3xDu0WeGZHxmqUVNNVA1UEcps+BymrISCbDM0ekhYWUqgQIKBDhqmKvlz 2P9N4HayljOBtbCdp1rgIyv8zchhz2wcapQpxIC/BkCd64NANl61dS9Cnpk5ABrBxqeVtJ PQanssopW9roUYqkJLP5s4s672Sn7m4qZKsha/nR8ruvBY68u/VELILGhUdTng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681751048; a=rsa-sha256; cv=none; b=r6F64Frs/yvnlaZuajsYYn6FwN+pPSaOLZ/9/YdidO4k/vK1N2W5YknDRF/4Suc51Ix4qq 6IB3oumhecbOkO0BEWCUNEJDHrIUfNFDbyZ1iOcMltYtQ/3QHsvrf07N3Z0tBdd8W7PA9Y AORG45Hzi4qvfgDo2YLAWGks729y7ijSeBCE2E2S6p88b6TtGsQOtO6YbU8BTrpk1AI8cf qluoR4jxAxQl7skVImSbX49p4yizjpQBS8Pg4cclBkX2QAozrvOYMvz3BJxmD+qhIyvvMo bZ+2tGR5QEzB3pg8i7DqqW8LTe5cvmQ1w/jzsgyyo+htr/+AfBoJ/J2gxjf/cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0YLJ1Y6hzd7Y; Mon, 17 Apr 2023 17:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HH48xP002679; Mon, 17 Apr 2023 17:04:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HH48rh002678; Mon, 17 Apr 2023 17:04:08 GMT (envelope-from git) Date: Mon, 17 Apr 2023 17:04:08 GMT Message-Id: <202304171704.33HH48rh002678@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 08e65a6bf425 - stable/13 - arm64: nexus code tidy-up List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 08e65a6bf4255f7f399dfa34de02ec04e77af554 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=08e65a6bf4255f7f399dfa34de02ec04e77af554 commit 08e65a6bf4255f7f399dfa34de02ec04e77af554 Author: Mitchell Horne AuthorDate: 2023-02-10 14:26:53 +0000 Commit: Mitchell Horne CommitDate: 2023-04-17 16:59:15 +0000 arm64: nexus code tidy-up Make a pass at the various nexus implementations, fixing some very minor style issues, obsolete comments, etc. The method declaration section has become unwieldy in many respects. Attempt to tame it by: - Using generated method typedefs - Grouping methods roughly by category, and then alphabetically. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D38495 (cherry picked from commit e582d4a2b09e679baae457b50c7270b4a9f501bf) --- sys/arm64/arm64/nexus.c | 96 +++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 52 deletions(-) diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c index 350ad9d1be76..bc7e8e881dab 100644 --- a/sys/arm64/arm64/nexus.c +++ b/sys/arm64/arm64/nexus.c @@ -46,21 +46,21 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include -#include #include -#include -#include -#include -#include #include #include -#include +#include #include +#include +#include +#include +#include #ifdef FDT #include @@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$"); #include #include #include "acpi_bus_if.h" -#include "pcib_if.h" #endif extern struct bus_space memmap_bus; @@ -94,63 +93,57 @@ static device_probe_t nexus_fdt_probe; static device_attach_t nexus_fdt_attach; #endif #ifdef DEV_ACPI -static device_probe_t nexus_acpi_probe; -static device_attach_t nexus_acpi_attach; +static device_probe_t nexus_acpi_probe; +static device_attach_t nexus_acpi_attach; #endif -static int nexus_print_child(device_t, device_t); -static device_t nexus_add_child(device_t, u_int, const char *, int); -static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, - rman_res_t, rman_res_t, rman_res_t, u_int); -static int nexus_activate_resource(device_t, device_t, int, int, - struct resource *); -static int nexus_adjust_resource(device_t, device_t, int, struct resource *, - rman_res_t, rman_res_t); -static int nexus_map_resource(device_t, device_t, int, struct resource *, - struct resource_map_request *, struct resource_map *); -static int nexus_config_intr(device_t dev, int irq, enum intr_trigger trig, - enum intr_polarity pol); -static struct resource_list *nexus_get_reslist(device_t, device_t); -static int nexus_set_resource(device_t, device_t, int, int, - rman_res_t, rman_res_t); -static int nexus_deactivate_resource(device_t, device_t, int, int, - struct resource *); -static int nexus_release_resource(device_t, device_t, int, int, - struct resource *); - -static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, - int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep); -static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); -static bus_space_tag_t nexus_get_bus_tag(device_t, device_t); +static bus_add_child_t nexus_add_child; +static bus_print_child_t nexus_print_child; + +static bus_activate_resource_t nexus_activate_resource; +static bus_adjust_resource_t nexus_adjust_resource; +static bus_alloc_resource_t nexus_alloc_resource; +static bus_deactivate_resource_t nexus_deactivate_resource; +static bus_get_resource_list_t nexus_get_reslist; +static bus_map_resource_t nexus_map_resource; +static bus_release_resource_t nexus_release_resource; +static bus_set_resource_t nexus_set_resource; + #ifdef SMP -static int nexus_bind_intr(device_t, device_t, struct resource *, int); +static bus_bind_intr_t nexus_bind_intr; #endif +static bus_config_intr_t nexus_config_intr; +static bus_describe_intr_t nexus_describe_intr; +static bus_setup_intr_t nexus_setup_intr; +static bus_teardown_intr_t nexus_teardown_intr; + +static bus_get_bus_tag_t nexus_get_bus_tag; #ifdef FDT -static int nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, - int icells, pcell_t *intr); +static ofw_bus_map_intr_t nexus_ofw_map_intr; #endif static device_method_t nexus_methods[] = { /* Bus interface */ - DEVMETHOD(bus_print_child, nexus_print_child), DEVMETHOD(bus_add_child, nexus_add_child), - DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), - DEVMETHOD(bus_activate_resource, nexus_activate_resource), + DEVMETHOD(bus_print_child, nexus_print_child), + DEVMETHOD(bus_activate_resource, nexus_activate_resource), DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), - DEVMETHOD(bus_map_resource, nexus_map_resource), - DEVMETHOD(bus_config_intr, nexus_config_intr), + DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), + DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), DEVMETHOD(bus_get_resource_list, nexus_get_reslist), - DEVMETHOD(bus_set_resource, nexus_set_resource), - DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), + DEVMETHOD(bus_map_resource, nexus_map_resource), DEVMETHOD(bus_release_resource, nexus_release_resource), - DEVMETHOD(bus_setup_intr, nexus_setup_intr), - DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), - DEVMETHOD(bus_get_bus_tag, nexus_get_bus_tag), + DEVMETHOD(bus_set_resource, nexus_set_resource), #ifdef SMP DEVMETHOD(bus_bind_intr, nexus_bind_intr), #endif - { 0, 0 } + DEVMETHOD(bus_config_intr, nexus_config_intr), + DEVMETHOD(bus_setup_intr, nexus_setup_intr), + DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), + DEVMETHOD(bus_get_bus_tag, nexus_get_bus_tag), + + DEVMETHOD_END }; static driver_t nexus_driver = { @@ -216,7 +209,6 @@ nexus_add_child(device_t bus, u_int order, const char *name, int unit) /* * Allocate a resource on behalf of child. NB: child is usually going to be a * child of one of our descendants, not a direct child of nexus0. - * (Exceptions include footbridge.) */ static struct resource * nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, @@ -236,10 +228,10 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, */ if (RMAN_IS_DEFAULT_RANGE(start, end) && (count == 1)) { if (device_get_parent(child) != bus || ndev == NULL) - return(NULL); + return (NULL); rle = resource_list_find(&ndev->nx_resources, type, *rid); if (rle == NULL) - return(NULL); + return (NULL); start = rle->start; end = rle->end; count = rle->count; @@ -362,7 +354,7 @@ static bus_space_tag_t nexus_get_bus_tag(device_t bus __unused, device_t child __unused) { - return(&memmap_bus); + return (&memmap_bus); } static int @@ -420,7 +412,7 @@ nexus_set_resource(device_t dev, device_t child, int type, int rid, /* XXX this should return a success/failure indicator */ resource_list_add(rl, type, rid, start, start + count - 1, count); - return(0); + return (0); } static int From nobody Tue Apr 18 01:20:21 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0mLs6KSyz45TQM; Tue, 18 Apr 2023 01:20: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 4Q0mLs4nYPz44lM; Tue, 18 Apr 2023 01:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681780821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rXWN95QngIkZKNZRbctl4xda3AB2MUEclTTpDtDKYcc=; b=iSGe+1Ef4nAFFyerwNfPGh0zNdLJoa/5K67lZoMbIsk8HywJ3WCpZcHiFO7ygfpytUMFpP D+jxWWSNwhr+xfzpaq2exErlTD7RPhWvTe5ISfgeqCi0Y/EkflgoDMgTAhSyumGEeKngUi zYKQOlASuhwf63b+Zfq/J0oLDn+6Pw+BYOGX0aAW2qbhI1Is1O0XEOMgYaeb26o+ibjJZo uH8MWfFKXBx2P7DfvYT1rT3VNObubFjQHzwv7Xk27YQ23VAoMryp2AlTK+9HFhT12z/Ch5 AbyMckV/Jpm6RRpWko7uKnSmlAn+BxIqnARq7qqw5nv8EGIUVTbVAHpBdiSPXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681780821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rXWN95QngIkZKNZRbctl4xda3AB2MUEclTTpDtDKYcc=; b=dVj7TDhheawD2Mz4feOAZ0sN8gcbcle5TaY73mK7We3vG1oIZewsDNDFUGDZDMi5K0T1Nq 3mYY6nQK8BHHPkbXexjb54eQcgBiNFln+DBxoDErST54pCpIJDVSZdsA9WCBOg1YP/tvov L8k6gDB3fIBfY1SNxPCK5CDbKTNi/qs8X66jp1cKW9us+qRL0ZSDO1mpzOuQcknxtbUqAF 8CjleZcwCTUUJUaxajpYrE6wi67mwVvcxtasSVm+wP4vX0Gtq3ZA2Azc/UVmqYN2FIw+CA 2vuylyDDLA1O1pfDigVet/IKubH8Vu2enq+9LBey/tKZKHyAJctJOgsWOnE0ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681780821; a=rsa-sha256; cv=none; b=CZXWBeQ4026nzC8NL3EnVH7hGSWhWzdnxZKzhWNbMQbU+nXAKpeseH4YnZWQ2XRyxRRDgB 8LeBDqQZL37lpo4te1UL9NsReQAn15QPOfuPWJv41jisVY3l8VBzyf65frhv+D6pgMNWxb jEDJOIMGw7MhpAWS8xzS4i0dbdR2MLGRPOxnLgfylhuShRiVSqFcckZQHOyYaf+EMUdBUe DneY3g4WQCtyr3RhnBl5BBIxEH8hzvKQTSyu7tN2QN1BGyCuYl4F5GU3tqHgPLH9VkXyVJ jpPpo8vfrOyAbhi4YUBY5D/0admsr8hnceeoLHCOlrNEEGUXP55abRiHx8zojg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0mLs3nyPzrPg; Tue, 18 Apr 2023 01:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33I1KLIZ018867; Tue, 18 Apr 2023 01:20:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33I1KLVw018866; Tue, 18 Apr 2023 01:20:21 GMT (envelope-from git) Date: Tue, 18 Apr 2023 01:20:21 GMT Message-Id: <202304180120.33I1KLVw018866@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: 8b7f6783e69b - stable/13 - tmpfs: MFC: unbreak module build outside of kernel build environment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 8b7f6783e69b67f345939f16f0c8d1a50be2f2d1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=8b7f6783e69b67f345939f16f0c8d1a50be2f2d1 commit 8b7f6783e69b67f345939f16f0c8d1a50be2f2d1 Author: Eugene Grosbein AuthorDate: 2023-04-15 04:00:03 +0000 Commit: Eugene Grosbein CommitDate: 2023-04-18 01:19:37 +0000 tmpfs: MFC: unbreak module build outside of kernel build environment (cherry picked from commit 5ee1c90e50ce8832c79aa61c8c2bbb71bd097799) --- sys/modules/tmpfs/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/modules/tmpfs/Makefile b/sys/modules/tmpfs/Makefile index 231c1d55fd88..de4921408805 100644 --- a/sys/modules/tmpfs/Makefile +++ b/sys/modules/tmpfs/Makefile @@ -4,6 +4,7 @@ KMOD= tmpfs SRCS= vnode_if.h \ - tmpfs_vnops.c tmpfs_fifoops.c tmpfs_vfsops.c tmpfs_subr.c opt_tmpfs.h + tmpfs_vnops.c tmpfs_fifoops.c tmpfs_vfsops.c tmpfs_subr.c \ + opt_tmpfs.h opt_ddb.h .include From nobody Tue Apr 18 04:11:00 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0r7m4YXtz45ftt; Tue, 18 Apr 2023 04:11: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 4Q0r7m2kGhz4JZf; Tue, 18 Apr 2023 04:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681791060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=03hvhAt657TZB+kcDWpuap+anoYwM2r7tx4mgm/81/k=; b=cD76kgEbLZZI5zUVcr6jQVRoUPA+SlyCC523iF4FCqBcwbx36RP5058plzUegij25kMOBU vj3+56OWSxm1YLP57L1H4tWseeQ/PGsqvMbOPxDSB/uNM1wcV7UUv4C5QEUig7uOiOASWo Qj23HaWnP6KnqIlQreO3DLcd3wSYVDbgYpeFW64gILZFkDc7aeOHB8BP5+zbE2o7XCWirw 1zosVha/6CE9tDJcRGQuXe8p/W44MlRmJI8XP2ocf0YchtXtlDCc35GF/QG7RTxThZvFbd FZBe3E06vNgXmT9HjJOPWSN3aU+nxZH+rK3JCC5cfb5o+OMEzOFOAHPIRxY+Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681791060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=03hvhAt657TZB+kcDWpuap+anoYwM2r7tx4mgm/81/k=; b=iqK7nyq07sdhmmQ2LJW944M06wi/n+U7Wb0COxQXazsoDcISUZ+7ximE34flzt//fMIdnm XMtibeGFzFosSHOdwXWoIGg8qCA/gLopr9znd0pTDpYLUYjyIE1nTRLaXpMeyZpo/wfJjL 3MemJpq08regD0uWm49HHsj3q/0TL3Lk3EhJf3bndD4VpwZpdOn827DW34jnHcXs0G176R xIax+XhDXbebhtPVrpJL3e+mp+QZxIPbysMuWsV+qMZhyfw+Qb2cxcITxdQH/BCDTUHDhd GmOdpUEUqUaWxB8OxT15iKqP2cYwmnrFAQI72qcVQxKq0U1RQh2/clUj10q1cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681791060; a=rsa-sha256; cv=none; b=I2cXyYqa+FXFNY32q2MnreFMMbDvV9QdCMZeBWM/AEwb2Zq+yuzEiA+elgk1bXYHfKEqal 7RbZadeBH5fei7tGXqzT8onYbKy2jjS6fzRzJ+J0ZPNPIUDSnOH95qA56rH1eQ1/gCarM9 lFr0oH+F+YptUdlOYmbL91KCbcW/BKZTLUCiRqcF12D6LzYt+YEFvOakw6m3PSNTaaDwk1 0d23BmGmCdlH1Zo8X6z17ZOiimUH6kOMtWFZkiCowgNy7ap2bJwJs6nQ3TNhl71BHBjDnf 9s4Dlz/n0dXwNm1Z2h5ISlqNN/W1G6BoRbaOg6GAVU55rbsL+ZQjjAWl+CJupA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0r7m1L8mzwf3; Tue, 18 Apr 2023 04:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33I4B0Ma003382; Tue, 18 Apr 2023 04:11:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33I4B0mI003381; Tue, 18 Apr 2023 04:11:00 GMT (envelope-from git) Date: Tue, 18 Apr 2023 04:11:00 GMT Message-Id: <202304180411.33I4B0mI003381@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: a545623b612e - stable/13 - kern: remove a double word in a KASSERT in subr_trap List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: a545623b612ed635420eb69060e2530913f7aa04 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a545623b612ed635420eb69060e2530913f7aa04 commit a545623b612ed635420eb69060e2530913f7aa04 Author: Gordon Bergling AuthorDate: 2023-04-13 18:03:37 +0000 Commit: Gordon Bergling CommitDate: 2023-04-18 04:10:34 +0000 kern: remove a double word in a KASSERT in subr_trap - s/with with/with/ (cherry picked from commit c159f76713d7c1cbfdfc0c81dd91a5483096cf6f) --- sys/kern/subr_trap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index be5041fe516f..61db62ae2b08 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -188,7 +188,7 @@ userret(struct thread *td, struct trapframe *frame) KASSERT(0, ("userret: Returning with sleep disabled")); } KASSERT(td->td_pinned == 0 || (td->td_pflags & TDP_CALLCHAIN) != 0, - ("userret: Returning with with pinned thread")); + ("userret: Returning with pinned thread")); KASSERT(td->td_vp_reserved == NULL, ("userret: Returning with preallocated vnode")); KASSERT((td->td_flags & (TDF_SBDRY | TDF_SEINTR | TDF_SERESTART)) == 0, From nobody Tue Apr 18 04:11:01 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0r7n5zyxz45fbB; Tue, 18 Apr 2023 04:11: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 4Q0r7n3S8Pz4Jp8; Tue, 18 Apr 2023 04:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681791061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/DjHcP2ly/yTPhgDAXY+KGgq3o0lVsUW32SnulExuNU=; b=eDPGIRkeKz8OwJSUTC/Uwby59DCDXTGGjy3TDrQ8lIQXxoueI7MAGpp4v5mpIu1xNuhfZa 4H/AgKdFaJ3A4M3ZHrqgm8iFAi3QqRoLCh+uvMk2wkHPbrbWFTxYsVKGWOTrOaOESJjfa5 qIQ6xU+57jVFNkMbiS/TZt04c2XKP5RwnrQ+mUiGAcwhwyBw0zDD/k8vlZNvt7CzQ1MFJE CbGkYjW9+UW3pC84clnoSo20X6KA9Jt2H+mz9Nx/s51pbxLQdohlf93rFbgQbDrUfhe7Ky vpFdiiRNk/dPSunNORTw+AKJjtsGfPdKXgpAnUyAzgf7huAqD7t7vsKiNGH0jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681791061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/DjHcP2ly/yTPhgDAXY+KGgq3o0lVsUW32SnulExuNU=; b=FUzuS4b2R5DvyNlX2JH0ZbDLi3OC1Q/Nm78Rttm9YCMAywP3+oGobZMuf0DawTHGMFROJB VzbFPS+vSpkPYnNWCGFgu6aQPHomcGe4eIxiVfeNoqqRKCQfQqz/bavAqFwXdNVQvBtLf+ COwhFtJ/tjyX2HTCF561K04/tv96nqSCd10Lv+EH0fOTz6UFmpoE/hC+9Vy4+DqLTZr/SI WVQssjVGHyS75Vy3H/LFlisUVNFxPsht9znHGTdJaVL4n0R86CZyoVxRQY4A5QRjTOGhhS 4F3wjCL+US7KYnu3TChS4HM/7N8KC+yX0HsvC9KEIHeWFdOWtocAVkHb/4pG7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681791061; a=rsa-sha256; cv=none; b=RNHFHdV3SFi4TbvabBBcZ7W9VaVTBZr1NqvqmeiEgE7BqpS/h6UOv3aC6tiQb/T7VpPtL7 I6eEoGBeUxc6/9CVXnm2N29IQAy9G0zY1DadSSgJipNyyVPGtA4ML3JZgHJ+HuE41gVyRT aso1XF3DO6rS+OtGZESf8xYEP0mK1XAWy8LYLjD9F/V6b9cPMt6Rxz3OsK1GHFjJ8xiNFx J3AoLFU/D+dYaeJgF8h7HEA9QSOOtrLndkILj6kAesnFRViJcr5M/IXidKKUYhIIAYWKgz qFRiHadaPunc5MoDuihVUOCZ8QPHiUTYGYFgYSQiUcHr9XEe4RviTrvIRFROUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0r7n2Ynhzx8t; Tue, 18 Apr 2023 04:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33I4B12u003416; Tue, 18 Apr 2023 04:11:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33I4B1tW003415; Tue, 18 Apr 2023 04:11:01 GMT (envelope-from git) Date: Tue, 18 Apr 2023 04:11:01 GMT Message-Id: <202304180411.33I4B1tW003415@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: 0b5e6fa6cdc1 - stable/13 - arm: Remove a double word in a comment in setjmp List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 0b5e6fa6cdc19bd3c059d3b2e46fc07621655a48 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0b5e6fa6cdc19bd3c059d3b2e46fc07621655a48 commit 0b5e6fa6cdc19bd3c059d3b2e46fc07621655a48 Author: Gordon Bergling AuthorDate: 2023-04-13 18:37:25 +0000 Commit: Gordon Bergling CommitDate: 2023-04-18 04:10:49 +0000 arm: Remove a double word in a comment in setjmp - s/number number/number/ (cherry picked from commit 26713ad9cf18b6ecd37f862182c84c1e57aee091) --- sys/arm/include/setjmp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/include/setjmp.h b/sys/arm/include/setjmp.h index 2090c5d15f40..490df1036e2b 100644 --- a/sys/arm/include/setjmp.h +++ b/sys/arm/include/setjmp.h @@ -44,7 +44,7 @@ * 44-45 d14 (vfp register d14) * 46-47 d15 (vfp register d15) * - * The magic number number identifies the jmp_buf and + * The magic number identifies the jmp_buf and * how the buffer was created as well as providing * a sanity check * From nobody Tue Apr 18 04:11:31 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0r8N0jHGz45g1s; Tue, 18 Apr 2023 04:11: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 4Q0r8M6sSxz4Knv; Tue, 18 Apr 2023 04:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681791092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7DF7y2cHDjfzXrQhdD8pwdyYuDjANWFSaCiW5odYAjM=; b=OH5YtHNUu4ir9tnEqOggURiC0S9vc1mQ+0Fx6WijTyXq/rc8LYGDrsMX9ByNleUsgq7YwP zvRR4tQHs0lDxShgu1YAdd8OXW9BN+rXSgi+1wTF+U9T+OMhaJCBpHb8LWMU4+RqX3KZuT dCQIyeb5j62XD/iUDhLjH9vmxFB6gzrUQDJ0T9upWNUG2xXK3r4DRHjckbkXMYHCPiEhOd SPlvVI1900wGJqMv24pSl5m9gRreN4URu1WX0YIONHTKmd1l3J+Sd1L+EKeisV+c1CVs7r oytUPP6q7+EagW/q1UQcUwG3Jdn5FY5JZM/EKD+tU0FrDV3qlFJEoIN20n0+/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681791092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7DF7y2cHDjfzXrQhdD8pwdyYuDjANWFSaCiW5odYAjM=; b=M7MiSM6MN2q5Y2NxCinHGiNNsm+Nt0bCHJi3aU+5/36TGvebWAxyzR/O6XLufHgfjlYXS1 1v6h7pQEOyD2uPefoL3Mn5uRnxqiqX377hdFzV0A89mJE56Z4KAbXEFy4fg3oyxYQjhIfe tncHMHglFigHo8YmQDzILgved95YSDqsCRDOsmfl4hRlVzqDGaGoNZFY//KTXbsJhp/8GT zLcWuG4S1pfIkvr2TkTaq42PC5PIPrufMe/Jgbi4eoF6ckvX0vd8RAsK+hHa9S3mUUcZmD XDxtbFCpB1SLMVbxA8rJKf2emrYnF+Q3accMkmXX5oDCWKRRh3KrDVNuK0LdhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681791092; a=rsa-sha256; cv=none; b=F/a8TT1qTLMGAcu5tlaUP//qpcfO08pPgsIzvnvWn9b6vgozbfx3r+1t/AUJd98zbhmSjE 31+V3qpD4YqGxcVOs2Pp9xK1fs8S/cybc14UwXYuUAGD/54bGJpVqjYX9sDshkBVV12Unm 82ZMp9At3QqtbaOCYA75wsrxqExPD19OoHeKBUHQQPC2IXLNSmMhD9pluISFPTpGaNU8zt PSqQuy7/kG/qPJrgW2vG+C4s95R4i4UNFjScJW6cxHw+GxKVzvYdYsrhkfglWo5bpm+gvA X/LBIWG8ePelu+CcWbxcQVA2w4OxUq3cr0ErZPge0wnaDWXGlef35oZiThmAbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0r8M5wwwzwry; Tue, 18 Apr 2023 04:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33I4BV2r006491; Tue, 18 Apr 2023 04:11:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33I4BVir006490; Tue, 18 Apr 2023 04:11:31 GMT (envelope-from git) Date: Tue, 18 Apr 2023 04:11:31 GMT Message-Id: <202304180411.33I4BVir006490@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: e04514c9aab6 - stable/12 - arm: Remove a double word in a comment in setjmp List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: e04514c9aab697b470632ca83aa23dcde0e7855f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e04514c9aab697b470632ca83aa23dcde0e7855f commit e04514c9aab697b470632ca83aa23dcde0e7855f Author: Gordon Bergling AuthorDate: 2023-04-13 18:37:25 +0000 Commit: Gordon Bergling CommitDate: 2023-04-18 04:11:19 +0000 arm: Remove a double word in a comment in setjmp - s/number number/number/ (cherry picked from commit 26713ad9cf18b6ecd37f862182c84c1e57aee091) --- sys/arm/include/setjmp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/include/setjmp.h b/sys/arm/include/setjmp.h index 2090c5d15f40..490df1036e2b 100644 --- a/sys/arm/include/setjmp.h +++ b/sys/arm/include/setjmp.h @@ -44,7 +44,7 @@ * 44-45 d14 (vfp register d14) * 46-47 d15 (vfp register d15) * - * The magic number number identifies the jmp_buf and + * The magic number identifies the jmp_buf and * how the buffer was created as well as providing * a sanity check * From nobody Tue Apr 18 07:23:31 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0wPv6Jb2z45tq8; Tue, 18 Apr 2023 07:23: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 4Q0wPv5Fczz3ncW; Tue, 18 Apr 2023 07:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681802611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r90Y+nph6UomTYz86BHgWO2Cn33WkXL7hSAFJfQvzso=; b=Y5jyhkjyyqu8OqqmLSV3Dnzxr5I3SJobqRimwdyhBvP7kmhtO/K8Vj1RaYCoBrUxmEI3ib TFm2tblpLJDPnTlIYImUUDOywaBbasrTyKzxAohlZ5wnn6DY4Ykkt01sojnCt+24V1WS6U MZf3AjbpUXZ0DOBMgPYVEKJVtAtXEu47WATkQX8M7NK6PMe463qlNV6RcwIgZovG2bJqcr cxltUyqv6qWxY19CpwMmvWMzIcxl9NmRh2NwBE6qdC3SkVB1XWRbYWEFUPBj52sMsWkwuG LqUiH5gAO4VSk7DY9vD1gTK8bCw0wWK+Be8nb1iBwWycizyWFdwsRwQ3dc5dRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681802611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r90Y+nph6UomTYz86BHgWO2Cn33WkXL7hSAFJfQvzso=; b=IvazYfZo9uHYRQ/TfCRmdvkEZbu6rG0Ya2Qaf5CzFgt0xtdd1V/iObO6y3Eao6xarBH6m3 jfd9ZbZ8yIHraacCXo6sjOtV3M+o8O7C1qXyJ6srZ4gB9aporB9afIQxCDx+eeREhIQyIQ HcLbJN/Q0qebAxyuYS4S33p96IZLofnMHxazAB/zTU+5WqVrP1Zmsxhyr3JysVpigLT5SZ I6QIPkuyqECM5jabuLj2tT/cdw4kygzvgPhAaNuEfuw8F1M2V2W105TdIyJ0DrPNYHmQrB tMvap9Zy2ceJQejX+64u8sD1WFD1zYa4gg+r/VLf2i73glyDGs7sP9E2MWm6ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681802611; a=rsa-sha256; cv=none; b=C/M2+EaA+LF/ANcOC4UEXXGePiMlg85HitEiZKFud3rFjBr42bQQgs/paSBNgAFxyrl3kU p1l0fPTtAP6c7/WbWt6zmNUBKAHBJwDqHMOPpMiBReyKu/UMGE5AvNHBdEzDUzDpq4fOuD 5b5j6PWwAQ8v01wMVckSJYWy/fdGCLvbJyVQPZrtcCuAONrnFgOwsz/Sidl4j4coybNhxU lCSNcPMjZhNLUnhcQjk7B+c3lUU4Blq8XN1Xfv92Z1jHEOIgGpbUxlRDW8Z0NYWCzMjgfm DIfWSH5XmrFoupjDkJyYPQIUjtSEj4VUktN5yJ6/58og7izJPaamKlqTsqMLYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0wPv3g5Rz12sQ; Tue, 18 Apr 2023 07:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33I7NVuI021152; Tue, 18 Apr 2023 07:23:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33I7NVRC021151; Tue, 18 Apr 2023 07:23:31 GMT (envelope-from git) Date: Tue, 18 Apr 2023 07:23:31 GMT Message-Id: <202304180723.33I7NVRC021151@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: 8011e2cd245e - stable/13 - if_epair: also remove vlan metadata from mbufs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 8011e2cd245e64469891a9afe23c32b3fef5e503 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8011e2cd245e64469891a9afe23c32b3fef5e503 commit 8011e2cd245e64469891a9afe23c32b3fef5e503 Author: Kristof Provost AuthorDate: 2023-04-10 11:02:55 +0000 Commit: Kristof Provost CommitDate: 2023-04-18 07:23:15 +0000 if_epair: also remove vlan metadata from mbufs We already remove mbuf tags from packets transitting an if_epair, but we didn't remove vlan metadata. In certain configurations this could lead to unexpected vlan tags turning up on the rx side. PR: 270736 Reviewed by: markj MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39482 (cherry picked from commit c69ae8419734829404bdb47d694d105c85f9835e) --- sys/net/if_epair.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c index 2404afe63e0a..662c601b3ad1 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -136,6 +136,8 @@ static struct epair_tasks_t epair_tasks; static void epair_clear_mbuf(struct mbuf *m) { + M_ASSERTPKTHDR(m); + /* Remove any CSUM_SND_TAG as ether_input will barf. */ if (m->m_pkthdr.csum_flags & CSUM_SND_TAG) { m_snd_tag_rele(m->m_pkthdr.snd_tag); @@ -143,6 +145,10 @@ epair_clear_mbuf(struct mbuf *m) m->m_pkthdr.csum_flags &= ~CSUM_SND_TAG; } + /* Clear vlan information. */ + m->m_flags &= ~M_VLANTAG; + m->m_pkthdr.ether_vtag = 0; + m_tag_delete_nonpersistent(m); } From nobody Tue Apr 18 07:23:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0wPx5SXBz45tS3; Tue, 18 Apr 2023 07:23: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 4Q0wPx2HNBz3njW; Tue, 18 Apr 2023 07:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681802613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ku3UW/8u3eCQu8XgQWSWdVaiJKc12KzjT7OiFUsb7Ms=; b=e0jeZrHjtgTArXxuJKz5imgAcfOXt65iYWyyUHMkT288wxiiTWvytuhpDCUQ0asr5aFWaX 8R/quCpeYWctbPnBKSOBDpLG0CxC12Roxjli5PjigpxcESsochON+4s4DrK83dYngyjnoK OZBlo0Ax4qyUYOBtn6cgrvpmRqDgWPhE+hrKMgh9aQptj4mnp0Hy9csNa6BxEWeto9b34A 7/Wbx8uy9U3h/TN8BMupSNGKTQw0335OzuCXYLXfis6qqxkKi2DcYOvN04n1Yzf+oLxWd/ B5z6tR0INNUViNE8g498KV6MCIZKNfeT02b12dfcLtWmVa5W+NIC09OIIPdm+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681802613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ku3UW/8u3eCQu8XgQWSWdVaiJKc12KzjT7OiFUsb7Ms=; b=t04e9fq0sy1GQ8O2heVOtna1+L1UMuurqOMW8qo5jjCjneBgoC5d8G/gudzwLiPb7JxhjM lfQO3BE8zxXgu4wDnhVRGDrjjBDJkYikFVLhepT9oZVLD4qd4CExrMEYe5/pr1J5x/6bfB tgyRUowRM4FxSvOarFcnbBDpSPL1H9h5eTk5XFmwCtcM49+Pwl7AjHOBedMOQ3GV5J2bkZ QqxXYdxdEjTtw2a9cAnMDVsZFoRCNG59iWtsBiGRcvyrF0MMHJPn67ynf6c3Rr0CFWqcaD WrrhVQ8/3Vxzs+QbL1jL6ylZyO5GJgvygG8Tr8PXGMXfyFhsIAmJJM9BRT2luw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681802613; a=rsa-sha256; cv=none; b=OVhvD+C2+UbDSpIFl+V2KFzLtjknX5Yfn7DxJXMlFPeem+W47k5WyYOcJ1OPEHOtiQszuN 13E6VfoQ03Mg7Z/kJrG0FOmpA8MEpnVtEnmd10gkBdANa6Ahn3YcI77nwCQsRTuNMYbZzU F3wZSo08Npj1lLQ50A1fophsKDW610aArNuYCr69Dtvb73EGntFGDNgGq6snOxOr39/xzZ 5mdO4ov14kiFU/Hxgxj+kLcuOQ8NAuWk9KlmM0ub51pGn2XvgcTVicoCmqQ3C3dx+anGjm 4kLvBhSZGeS3F6V7GXz9rY5LB8NUcVbBQ0dFYLOdIJVOhaq2ab7cCSd29/Ct3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0wPw5XW4z131m; Tue, 18 Apr 2023 07:23:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33I7NWM5021172; Tue, 18 Apr 2023 07:23:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33I7NW7K021171; Tue, 18 Apr 2023 07:23:32 GMT (envelope-from git) Date: Tue, 18 Apr 2023 07:23:32 GMT Message-Id: <202304180723.33I7NW7K021171@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: c79831b38a63 - stable/13 - epair tests: test PCP tagged packets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: c79831b38a63c5e2b6c20602104f1ccda7075182 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c79831b38a63c5e2b6c20602104f1ccda7075182 commit c79831b38a63c5e2b6c20602104f1ccda7075182 Author: Kristof Provost AuthorDate: 2023-04-10 10:55:10 +0000 Commit: Kristof Provost CommitDate: 2023-04-18 07:23:16 +0000 epair tests: test PCP tagged packets PR: 270736 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39483 (cherry picked from commit d116b8430b90212e308fe9945038c7bd98edf1bc) --- tests/sys/net/Makefile | 1 + tests/sys/net/if_epair_test.sh | 65 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/tests/sys/net/Makefile b/tests/sys/net/Makefile index cdf31477137e..6ba9b65108b0 100644 --- a/tests/sys/net/Makefile +++ b/tests/sys/net/Makefile @@ -6,6 +6,7 @@ TESTSDIR= ${TESTSBASE}/sys/net BINDIR= ${TESTSDIR} ATF_TESTS_C+= if_epair +ATF_TESTS_SH+= if_epair_test ATF_TESTS_SH+= if_bridge_test TEST_METADATA.if_bridge_test+= required_programs="python" ATF_TESTS_SH+= if_clone_test diff --git a/tests/sys/net/if_epair_test.sh b/tests/sys/net/if_epair_test.sh new file mode 100644 index 000000000000..45b5552fb3c9 --- /dev/null +++ b/tests/sys/net/if_epair_test.sh @@ -0,0 +1,65 @@ +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2023 Rubicon Communications, LLC (Netgate) +# +# 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. + +. $(atf_get_srcdir)/../common/vnet.subr + +atf_test_case "pcp" "cleanup" +pcp_head() +{ + atf_set descr 'Test PCP over if_epair. PR#270736' + atf_set require.user root +} + +pcp_body() +{ + vnet_init + + j="if_epair_test_pcp" + + epair=$(vnet_mkepair) + + vnet_mkjail ${j}one ${epair}a + vnet_mkjail ${j}two ${epair}b + + jexec ${j}one ifconfig ${epair}a 192.0.2.1/24 pcp 3 up + jexec ${j}two ifconfig ${epair}b 192.0.2.2/24 up + + atf_check -s exit:0 -o ignore \ + jexec ${j}one ping -c 1 192.0.2.2 + + # Now set a different PCP. This used to lead to double tagging and failed pin. + atf_check -s exit:0 -o ignore \ + jexec ${j}one ping -C5 -c 1 192.0.2.2 +} + +pcp_cleanup() +{ + vnet_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "pcp" +} From nobody Wed Apr 19 14:03:29 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q1jDy5W4dz461kK; Wed, 19 Apr 2023 14:03: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 4Q1jDy1LZnz44GQ; Wed, 19 Apr 2023 14:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681913010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eMNF875Jn8K4RuGroYfJQQler9Q6cEUfLYnWFpJs4hI=; b=yzRWB3UoU3+i3uhslNPoHDADX9/YcTBBvzMTgoNgErzjMYCc6G9qQFFOS4jLuVSoaLtOsm 9ZyMtNtkHJCPjrxoqEJxRvx9ql5Q33Rx8B98lRvQORknqCobyPxIZsExolFNvONZTVpnGB /s0Z0/Np5eSXluWJ6e4A3XeoccodPXRF1O2Agtn0a9xPAZRdD3PEesOcWmaKtSoqHraJue b4Qw8lPyNjXz+gG2fWtW+BviLtHDzKEuxvQ6+Rzv3nAFVYuiJpxSotNWvrgs8YjHJw+Xl2 MJbRgHjt/EtJx6gU+ywEEGzxtYZhF8ZmI0bXhOnh3tp59zxxrLUCjZilOo3RDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681913010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eMNF875Jn8K4RuGroYfJQQler9Q6cEUfLYnWFpJs4hI=; b=etWpTz2wNRWrF2dXfBsyUNrLkT6sjrn7Yu3LHlou2y6cGVliNT4hKL+PzxNzeasN2etqks Ya/pJzsDCvQtlm5zBq5xSBOOgALbEzdvVLym/Wgv+y49jwQLJAIRTTNPLPi7W8iUbsuZAw Mb+0mHEJVtIVf18mY9YBsVat9Dlach5nQU9CZjgF54iEa6IkMt7rSIwBs9KyS3uiaLiwYm fx+m/gURwDcIwDvfg093HP4HImU7zWJLh0rk6+DHIdpYIjoxMR8REl+KxVuOSH3SYtuGu2 kxJNugW6/WIKWWonxlCJt2TS6/LgMsxysd8wBSJVskLagyjlTAan4mcfK2mEfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681913010; a=rsa-sha256; cv=none; b=b2ju1pUVWtTYBMfY3ZRcK2xhUIpj3QfxLiT9zOFLw/ow4wt2zw97eM3yJof/DCvFKnEjKk KA4nwHYXfr3M1KI7u/ldaJQ9mUP0z6pUNxqunwr9zLI1wNy0QOqQU8C6cuBtaR4MM0Psm4 B4o6jBEPfOY1VDFDlHI81KzcRdiRe7paDMPRy1I/CZ0xldJX/AmKEEBePwZXpqYSjKuxtr flshVb6qv4Gus9WwbnjC1HtLahsP15Ku+cVEmCRCDMqjoexUKJhUO6nyaL+sUFaX/8ArGT A6iplMT8Z0Txw3zMw7ar858vZqL5Hr0kjslAiZEIDViZuQxDcv5rWJpaFteNMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q1jDy0QD6zxfd; Wed, 19 Apr 2023 14:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33JE3TY2059965; Wed, 19 Apr 2023 14:03:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33JE3T4w059964; Wed, 19 Apr 2023 14:03:29 GMT (envelope-from git) Date: Wed, 19 Apr 2023 14:03:29 GMT Message-Id: <202304191403.33JE3T4w059964@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: 0f1e73b789c8 - stable/13 - netisr: Purge another reference to NETISR_EPAIR List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0f1e73b789c8515b63c6f56dc7c787361754844d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0f1e73b789c8515b63c6f56dc7c787361754844d commit 0f1e73b789c8515b63c6f56dc7c787361754844d Author: Mark Johnston AuthorDate: 2023-04-12 14:27:00 +0000 Commit: Mark Johnston CommitDate: 2023-04-19 14:03:08 +0000 netisr: Purge another reference to NETISR_EPAIR Fixes: 03276e338a1b ("netisr: Remove the now-unused NETISR_EPAIR queue index") MFC after: 1 week (cherry picked from commit b4f1582f3b62ca943a6009d7f08c938833bf70d5) --- share/man/man9/netisr.9 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/share/man/man9/netisr.9 b/share/man/man9/netisr.9 index efcb8ed8e7b1..06e394915729 100644 --- a/share/man/man9/netisr.9 +++ b/share/man/man9/netisr.9 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 25, 2017 +.Dd April 12, 2023 .Dt NETISR 9 .Os .Sh NAME @@ -220,9 +220,6 @@ Routing socket loopback ARP .It Dv NETISR_IPV6 IPv6 -.It Dv NETISR_EPAIR -.Xr netstat 1 , -.Xr epair 4 .El .Sh AUTHORS This manual page and the From nobody Wed Apr 19 14:03:31 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q1jDz5RYbz461QL; Wed, 19 Apr 2023 14:03: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 4Q1jDz2FcVz44Lv; Wed, 19 Apr 2023 14:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681913011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IUNIvJUqrWclKzqnTPeTM0fLoSLZorJnHpYH2ysFZSM=; b=hGFSBNoSz0raAgg+WfHCl9pp5LUCp3kz4lWKESOB1+x5+QhGm23cSwD8+In5L0yzTo2cfW qF0NcVEQVxZhCEgUpEuP3yDVN3bQqNb3C7mZpX0+N9P1rTI3j1TxpWLWFrz3sCQ64tqDXE Lx4HUX1zuRJz2ekaES+Zl9B2fXn7Vsh61g9Te6UDcTQqiRVjGRFLR9PVVxubL5L0mnMmDZ kPkPBLKHuSgFv7sD5NDbDN+1jEIzB9Vl8rctLdXutA4UBSRojxAgcXug6UZk7V+YcFIDbu hZyKNVnuCcU+lkUiLyYpsxqxQi5qKc4EufIjDb+5LkL2NEXUvKr5FNX1WDdY5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681913011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IUNIvJUqrWclKzqnTPeTM0fLoSLZorJnHpYH2ysFZSM=; b=okS/ibLaXtijAguzEXeQbZKRcmS1zDqsNtQR+G8bm2Xk0JV+nuW7CMUJXGVleds1L/eMvu mgXY+uagwTtYqT0aeJy5+Gfhq9B4e9rFqYQ1IEbuRUc4x88/YpHu2KJQRESVZrmg0gh2aW OBHE3fOdIkz+lzUMGPkupefhERUYqnxhmT/dBWynCTvBozntFVPftOKWchdeSoucGg3C0s epJNvihNPjSOCoeeHhjbWTg2q8RlvdT3VGCyEgxCf/fqv0djsxejwhF24D4typn/VZoj8k gUovLbBFUge6/7ZAg7FlY2IlfMezIrHUluzDf4EGqFedkHDIL5FMbMxtTs5y+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681913011; a=rsa-sha256; cv=none; b=tqwQ4r1ZdtkCeUDejieiRIRF1svlZxqn8IDcqO+HS6jusYfjsa3gtpw6KjTB/iXoK34Tvb ZZCmkmYzlBkFeuCYoaFm2x9NmlWJrnEKri/VuGUSa/+fcme8KRm3tnx+5QvFfrmQvBW3gM iH1emzNcP4Jr8X8C13HFMGGqRR5E4b0AyZ+A5wugPw22VBPk9OvathUMRvp0FQZi5kbA/p LSL/U7Nn/WynJ607lF0vfuawALmw94k2acBu2XLP2lC/sMd/T5CtKMm5PYjlox1Vim91yI uxy4WTbUS4pDt5r55eeUnwhXe18Cf4Lx37S/6fA0EAQaURjBuy9lBFCDkMdD8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q1jDz1KkLzwr3; Wed, 19 Apr 2023 14:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33JE3VCk059984; Wed, 19 Apr 2023 14:03:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33JE3Vqn059983; Wed, 19 Apr 2023 14:03:31 GMT (envelope-from git) Date: Wed, 19 Apr 2023 14:03:31 GMT Message-Id: <202304191403.33JE3Vqn059983@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: 90348de64067 - stable/13 - bridge: Try to make the GRAB_OUR_PACKETS macro a bit more readable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 90348de64067b2d006baed7cf5cb83567da2e559 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=90348de64067b2d006baed7cf5cb83567da2e559 commit 90348de64067b2d006baed7cf5cb83567da2e559 Author: Mark Johnston AuthorDate: 2023-04-05 14:37:00 +0000 Commit: Mark Johnston CommitDate: 2023-04-19 14:03:17 +0000 bridge: Try to make the GRAB_OUR_PACKETS macro a bit more readable - Let the compiler use constant folding to eliminate conditionals. - Fix some inconsistent whitespace. No functional change intended. Reviewed by: zlei MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38410 (cherry picked from commit 82bbdde4ebc9deb30d3a05ddec4d76f0a88df881) --- sys/net/if_bridge.c | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 1d1e1cd20bc1..ef01be9c5b49 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2516,32 +2516,28 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) return (m); } -#if (defined(INET) || defined(INET6)) -# define OR_CARP_CHECK_WE_ARE_DST(iface) \ - || ((iface)->if_carp \ - && (*carp_forus_p)((iface), eh->ether_dhost)) -# define OR_CARP_CHECK_WE_ARE_SRC(iface) \ - || ((iface)->if_carp \ - && (*carp_forus_p)((iface), eh->ether_shost)) +#if defined(INET) || defined(INET6) +#define CARP_CHECK_WE_ARE_DST(iface) \ + ((iface)->if_carp && (*carp_forus_p)((iface), eh->ether_dhost)) +#define CARP_CHECK_WE_ARE_SRC(iface) \ + ((iface)->if_carp && (*carp_forus_p)((iface), eh->ether_shost)) #else -# define OR_CARP_CHECK_WE_ARE_DST(iface) -# define OR_CARP_CHECK_WE_ARE_SRC(iface) +#define CARP_CHECK_WE_ARE_DST(iface) false +#define CARP_CHECK_WE_ARE_SRC(iface) false #endif #ifdef INET6 -# define OR_PFIL_HOOKED_INET6 \ - || PFIL_HOOKED_IN(V_inet6_pfil_head) +#define PFIL_HOOKED_INET6 PFIL_HOOKED_IN(V_inet6_pfil_head) #else -# define OR_PFIL_HOOKED_INET6 +#define PFIL_HOOKED_INET6 false #endif -#define GRAB_OUR_PACKETS(iface) \ - if ((iface)->if_type == IFT_GIF) \ - continue; \ - /* It is destined for us. */ \ - if (memcmp(IF_LLADDR((iface)), eh->ether_dhost, ETHER_ADDR_LEN) == 0 \ - OR_CARP_CHECK_WE_ARE_DST((iface)) \ - ) { \ +#define GRAB_OUR_PACKETS(iface) \ + if ((iface)->if_type == IFT_GIF) \ + continue; \ + /* It is destined for us. */ \ + if (memcmp(IF_LLADDR(iface), eh->ether_dhost, ETHER_ADDR_LEN) == 0 || \ + CARP_CHECK_WE_ARE_DST(iface)) { \ if (bif->bif_flags & IFBIF_LEARNING) { \ error = bridge_rtupdate(sc, eh->ether_shost, \ vlan, bif, 0, IFBAF_DYNAMIC); \ @@ -2560,8 +2556,8 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) if_inc_counter(bifp, IFCOUNTER_IPACKETS, 1); \ if_inc_counter(bifp, IFCOUNTER_IBYTES, m->m_pkthdr.len); \ /* Filter on the physical interface. */ \ - if (V_pfil_local_phys && (PFIL_HOOKED_IN(V_inet_pfil_head) \ - OR_PFIL_HOOKED_INET6)) { \ + if (V_pfil_local_phys && (PFIL_HOOKED_IN(V_inet_pfil_head) || \ + PFIL_HOOKED_INET6)) { \ if (bridge_pfil(&m, NULL, ifp, \ PFIL_IN) != 0 || m == NULL) { \ return (NULL); \ @@ -2573,9 +2569,8 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) } \ \ /* We just received a packet that we sent out. */ \ - if (memcmp(IF_LLADDR((iface)), eh->ether_shost, ETHER_ADDR_LEN) == 0 \ - OR_CARP_CHECK_WE_ARE_SRC((iface)) \ - ) { \ + if (memcmp(IF_LLADDR(iface), eh->ether_shost, ETHER_ADDR_LEN) == 0 || \ + CARP_CHECK_WE_ARE_SRC(iface)) { \ m_freem(m); \ return (NULL); \ } @@ -2599,9 +2594,9 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) GRAB_OUR_PACKETS(bif2->bif_ifp) } -#undef OR_CARP_CHECK_WE_ARE_DST -#undef OR_CARP_CHECK_WE_ARE_SRC -#undef OR_PFIL_HOOKED_INET6 +#undef CARP_CHECK_WE_ARE_DST +#undef CARP_CHECK_WE_ARE_SRC +#undef PFIL_HOOKED_INET6 #undef GRAB_OUR_PACKETS /* Perform the bridge forwarding function. */ From nobody Wed Apr 19 19:46:21 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q1rrZ3nwvz46NTV; Wed, 19 Apr 2023 19:46: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 4Q1rrY3Jqtz462R; Wed, 19 Apr 2023 19:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681933581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NbfHOj3mB1aYZUGg7kuz+LvXcespWARp/Bwv4KGKHbU=; b=qpe+zXtfKAMBW3vwYTzHBJPu15GDsEXOUjj6WFQX2Eo2zlkx3/GaUqghZbaiLhG8RjKile jD0vmHCH0yCrpAj/Sr4ji9kLpgpfEp+NDYqow/62SYXLgy8SaqbqUUws/3DBctWBnHMbON Pq0vy/to81J1VO2P5hKTqGkE1D6Jh/3utt2YdpvnP5vEeY08PGko2iskk8qLcpu36pc5Uw Oya9LRea5FrPpPKyY0NGv1fecgOnj2cfsr3n85x0emllca1Z7frv9nyG7P2PveUbkT5MaJ LOwjl/diYzvnGTA+io8uywMpn2uRhdbxRFuMgaEw5L5pbfmcgXD31CJHplSgiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681933581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NbfHOj3mB1aYZUGg7kuz+LvXcespWARp/Bwv4KGKHbU=; b=ExkoOB1shAsCTrlQsygvizWKOZeHaoBNqFuaZXvnzFiXMeRIeMFl4E96QKNwO23MG7xxXO 2JzLbp25sExouxV8tXesOniqcYX9GNB7YFa+GVKibC25fZTxMcfU1GCyZsfy0OvmONPQsw ViWNi/bdMZ25ExnCGGAyiWpHuhu3ISlJdU3Cqe+Vf+ux4a4hoF69JTZ1wB2F++y/BSoS5V TbO/k17SDEWqxXR3w+O9YjQWSIUr6T5YZgDNFY0EXu3JPQwKS308YTSJvDIfZ+n9ch0e4/ rZekV1TzDjUpRAc3gsop2O1y07QtEUV7HL5mx7TPmho/LHwDdlS0HvUr0fL7BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681933581; a=rsa-sha256; cv=none; b=G8gFc5/P6qcZSDGBdnx0PJT4uOnX55rSC+I22MvoK+vBkJLMKNG1vi1iLmvWVjj/JlgYwC UTO/nqBea/+znMnEXYFaD8pMVMEieQ2vYRlEChk1DHYDOX3O8Wx4iIOBdfoEg6PlH65f31 8J+RP7w1INK5eFFUwwDhwEDqHf7z7dwe2yIeWI07h+fl2NyBmsEzCxEa5+cR4YsQ9bjZJE 5tAsW9vC8hsOktbfaSRbncuGYuLIHizDN24/p704c3ebsHYr5Ppo0aGnAAQicZhnz6VhjN XamTA2mBtSn1ltsAQPAjR91qMNhFbXn3vL4BvsAGl6oB/og4L1BQnvMHTh+9jA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q1rrY2QQqz16bw; Wed, 19 Apr 2023 19:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33JJkLDM020888; Wed, 19 Apr 2023 19:46:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33JJkLKT020887; Wed, 19 Apr 2023 19:46:21 GMT (envelope-from git) Date: Wed, 19 Apr 2023 19:46:21 GMT Message-Id: <202304191946.33JJkLKT020887@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: ac7506f22fa6 - stable/13 - tty: Default to printing kernel stack traceback only on INVARIANT kernels List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ac7506f22fa6420a85327a3831e766706003c36c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ac7506f22fa6420a85327a3831e766706003c36c commit ac7506f22fa6420a85327a3831e766706003c36c Author: Warner Losh AuthorDate: 2023-04-19 19:32:45 +0000 Commit: Warner Losh CommitDate: 2023-04-19 19:44:20 +0000 tty: Default to printing kernel stack traceback only on INVARIANT kernels Change the default from printing a breif kernel thread stack informaton back to omitting it for non-invariant kernels in response to SIGINFO/^T. Full and brief stack support can be selected with the kern.tty_info_kstacks sysctl. MFC After: 2 weeks Sponsored by: Netflix Reviewed by: grembo, jhb Differential Revision: https://reviews.freebsd.org/D35576 (cherry picked from commit b69996d1d5d08fd5009ac325ea8e8154efd01b33) --- sys/kern/tty_info.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/tty_info.c b/sys/kern/tty_info.c index 237aa47a18da..be6de114bdfd 100644 --- a/sys/kern/tty_info.c +++ b/sys/kern/tty_info.c @@ -239,7 +239,11 @@ sbuf_tty_drain(void *a, const char *d, int len) } #ifdef STACK +#ifdef INVARIANTS static int tty_info_kstacks = STACK_SBUF_FMT_COMPACT; +#else +static int tty_info_kstacks = STACK_SBUF_FMT_NONE; +#endif static int sysctl_tty_info_kstacks(SYSCTL_HANDLER_ARGS) From nobody Thu Apr 20 04:15:28 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q24810zWZz46DJ5; Thu, 20 Apr 2023 04:15: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 4Q24806kmgz40Qj; Thu, 20 Apr 2023 04:15:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681964128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=55dRbKsd4Bq2MHP8vd9DlxsIiW8sgITV96jK8bZMNBY=; b=YsygQ2+uz/albVnv8CkSMCnQ9Bw5owpxfHL0TtGJ8JR6mVvpBhfb0CXqTaBYPtIcN25n3B lSFwjtOUJ0Yn/myP2lHio717Xmlw/J9IqAIO6T+3fOm6pA2SemAC6F11YCrtieEHbRKcAn JNLLt8etgkS1yd+0ea+HTUIdFU7K3RkcgZzyuSLl0JHVmILrBM6kLF/RLlP335p/O/PKBT MJR1XJzbHEQbTBQI9b5k1ZoE9Mp3zUygzx4W/cRK1W8/013ae5+bZBHosWMqNOEYgukmet icExuM/HS1qdgcEPXWBGfgRj8+PyYYwQc4hk/esiIEyv2m/SU6qEL3shrPIBzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681964128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=55dRbKsd4Bq2MHP8vd9DlxsIiW8sgITV96jK8bZMNBY=; b=sMvo/YZwnghb8+W8CU32RHdDUbprW10VY+eVIMjUkcGs8kGcpvGryv150L8MIG5xlMZ437 2NXDoFakqHkjaYaxCyre3JwkpR0I2qc/E50KBG2L2CUrs2CrMy/0m3fQ/XgcehVBqyXxSg yAX+VW+0HU3aw4xEimtQvRNDXbczegTulLPr9vlYTQ+RGIJOi2H71leS3F2s4gd7wUOhud 8PajXNksEGtIFRu5eZg3bJQ3ejH2jizyuzkVht7WyvrDDYXl/bZ3bMmGO098WCjnjeuMNe FvpzVmn2567r0055g9rjnyL5i/oodHi/EJaB3MTTbzG4qR3o1vUom6C4zBuaJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681964128; a=rsa-sha256; cv=none; b=sYzpQ8kAXx+T4OGpaakNdkIMEurSpcR2cXfMKKGUokrNit1zVwWH/qMDExrNwQnq7K5B3J RfSTfavzKjw38CIVGbn6jlhAH3gQTodDtHKNdl+NNQTOxiKoUEDrb44X1WenFY4bE7RAnu T7WNSdL7j84SWEGToyy3x8E63/4ClCCS+fiJVJUDySl5R5YMvBIcMhsS2V8gmYxgV0IdJq NJ0lB8tX7FsaVJ8y6iJAtKJBBYFcLcbpImks+5hahHJUjDL18AYMB+81SOynC6S1HfR3LV RnUYgmciWjMzR21pGePZypjn9Pym+FBD3A/AXKeRttmQ2BDDTPo9FL/djnWVKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q24805njQzMhg; Thu, 20 Apr 2023 04:15:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33K4FSGt060752; Thu, 20 Apr 2023 04:15:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33K4FSvg060751; Thu, 20 Apr 2023 04:15:28 GMT (envelope-from git) Date: Thu, 20 Apr 2023 04:15:28 GMT Message-Id: <202304200415.33K4FSvg060751@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: 7e5811f76bb0 - stable/13 - loader: lua: unload the kernel when changing BEs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 7e5811f76bb0df289b32144849331a2db83ac718 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7e5811f76bb0df289b32144849331a2db83ac718 commit 7e5811f76bb0df289b32144849331a2db83ac718 Author: Cyrus Rahman AuthorDate: 2023-04-16 02:27:53 +0000 Commit: Kyle Evans CommitDate: 2023-04-20 04:15:15 +0000 loader: lua: unload the kernel when changing BEs Usually the kernel is loaded later, but there are circumstances where it could have been loaded earlier than changing BEs. Unload anything that is already there so that we know we're using artifacts from the proper environment. PR: 265471 Reviewed by: kevans MFC after: 3 days (cherry picked from commit d7584aa09fcf8d96544e5bfb3ea78f50d7720c0c) --- stand/lua/menu.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 400dbf3d469b..4a326cb54bb9 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -58,6 +58,9 @@ local function bootenvSet(env) loader.setenv("vfs.root.mountfrom", env) loader.setenv("currdev", env .. ":") config.reload() + if loader.getenv("kernelname") ~= nil then + loader.perform("unload") + end end local function multiUserPrompt() From nobody Thu Apr 20 04:15:29 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q24826PtGz46DNk; Thu, 20 Apr 2023 04:15: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 4Q24820F34z40Sd; Thu, 20 Apr 2023 04:15:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681964130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sSxdTs4orTFdzfHPJUdNfNvx1SOWK3yd4+B7O4j86zA=; b=Rd8t+4YnGNVR6K1JcXWD86rJ+SV+iDSwTn8GfWCVjP1Kkx4DHSkNBkmkU8t1JEkwh3JKqX RT9e9iWfeB2ip9ikiCDgOvHDd4Yw/cTwgKqAeafqSLEMsrzKE8v1Xmv0sAy4r9/jaur996 5eMlEXvbXKINubWJe1CWHAOEt8v+T0pdLIVOuFi1qiedBInIKDklL43KYP0pEMmgFJUgRf eZOEZxyZIPMpD115TrMss6BFlYzE826C1FWeCggV0dxHw4b1fY5PJZUAbOWrFlmViumfLv OW2OZmi/AfqwUX+pjwW/p1se6X4oRgyY6e6VVz5RpTAO+X9rLPBicbpdCwSZ4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681964130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sSxdTs4orTFdzfHPJUdNfNvx1SOWK3yd4+B7O4j86zA=; b=HpAO8R8xkI1JQy7tSF9RTFOn9soDsX2g4A+3jr2BKRjsc78vfvOOaU6Ebjz0eQQVNA8ds9 cNxnKOc9jTtPrtlfgy7VJpTNq/84L93/VO+7kY1dCy+FYer2x8HRRMOuIoZx+wGNKELkBk ztUbsWdvLrEn4z2fNc729fXGUbnOuYyYBrWtu5vPqTGJqtaHKxyWI/7rRkuyeN8Ka67wc1 TgYBSlny075BEL/3aFDGk56PNl7XRDjjSUCSEOolLpcSeQgpuFuWJPADkOC+KnwV4RneZj RPNJ3MuM1/CzOX8RwuBDRbNZ3eP3Nr9scdw7LgaxtrLaCgyKuiWLt8v8yrG9Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681964130; a=rsa-sha256; cv=none; b=McHaDL90qOlvm4qIfvNXijQgeD+2OOBIaiIxaOTXCE5ztxc9hMsThZAk23wIuTEUiCX5ch nD1IhkaJIKlD4bAc9iIgQayKWspQBoUEXsea6/ybJGfi3EsgibQeQUAwVlwlxf/SjHzioC ZNLYKI9jnWvAuq8Gbj5rLY+uEdyxvHo/vwNf/LnLbKb/zBUKFvI46R8kl78zU+qCfNOTAo OPwrRG2A5Y1snlz6BgXYEyzYUzqbHxFqdk4XftApF2TVU2cnk7zP2qLTR4mnzMqrh8wbTH rXxyY+4aDxRBHIxz9zjyXI4bLlqMlwxesfW1KNSI5IGlJh7gPVH/GxvhVhpJUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q24816SL8zMwV; Thu, 20 Apr 2023 04:15:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33K4FTdc060771; Thu, 20 Apr 2023 04:15:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33K4FTYM060770; Thu, 20 Apr 2023 04:15:29 GMT (envelope-from git) Date: Thu, 20 Apr 2023 04:15:29 GMT Message-Id: <202304200415.33K4FTYM060770@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: f0cb73450966 - stable/13 - loader: lua: disable autoboot timer after password entry List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: f0cb73450966fd064015efc8fc0342a44f9eb1d7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f0cb73450966fd064015efc8fc0342a44f9eb1d7 commit f0cb73450966fd064015efc8fc0342a44f9eb1d7 Author: Cyrus Rahman AuthorDate: 2023-04-16 02:30:41 +0000 Commit: Kyle Evans CommitDate: 2023-04-20 04:15:15 +0000 loader: lua: disable autoboot timer after password entry In the lua loader, if one sets a password in loader.conf, the autoboot_delay timer will start before the menu is displayed. One can interrupt the autoboot and bring up the menu by entering a keyboard character before the timer expires. If this is done a prompt for the password is displayed. Entering the password will bring up the menu, but the timer will again start and another keyboard character must be entered or autoboot will abort the menu and boot the system. PR: 265472 Reviewed by: kevans MFC after: 3 days (cherry picked from commit 0ab68e9272b573becdb42edf2b4419cb7ab04707) --- stand/lua/password.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/stand/lua/password.lua b/stand/lua/password.lua index 8edd4edd7ec3..3aea8e80bae6 100644 --- a/stand/lua/password.lua +++ b/stand/lua/password.lua @@ -135,6 +135,7 @@ function password.check() local pwd = loader.getenv("password") if pwd ~= nil then core.autoboot() + loader.setenv("autoboot_delay", "NO") -- The autoboot sequence was interrupted, so we'll need to -- prompt for a password. Put the screen back into a known -- good state, otherwise we're drawing back a couple lines From nobody Thu Apr 20 17:30:21 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2PnB15hGz46Lkn; Thu, 20 Apr 2023 17:30: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 4Q2Pn956bZz4NCh; Thu, 20 Apr 2023 17:30:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682011821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U8Ee8A7U4EjXLiFEVCzzjc6iIAiuq0CK8EA7l3KKo/0=; b=p18Rxncl+okxMrrjQWP9MkA2uxZuvX6GZT/sHVQaxqA03byX7TvPT5dCZZ3OeUBjnZqLXm apvfbmEji9XciB1LZ3ONRD46mDgCDoUUHjNXi+7Weywwp68SljjrSFSWSrhvFJ/oRxtM+v bLYRiDpUvu2v8u/e1pPYRY6uCy7BhRbKximp3T6kBgweXSEsHOlPBiEKRD/TyBOcBa9Vs+ dETOctSCmrksjMFHATM4tW6A8eZTOtrbvfWDdP7b0wPrARReFHrB032vPri5pLl7S+6Lz9 FjN0vUDLPvtEay10/wSgXdDEqEpk8+kntN7WK+deJQaydcYa9ZHaEBJTnTjl8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682011821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U8Ee8A7U4EjXLiFEVCzzjc6iIAiuq0CK8EA7l3KKo/0=; b=VjJtoHmJXHrlxV2ATfPhyYxrFJ9z/X+P7iMqcnsyWZugdQte0yIM6JIdxPAuGW31m6E5W2 /24sc+P34E2xEEWLSpCmxX6xvQ5upJmcErRRwBM5AJlOZMj5MOBwtPpREVJoKHQzCf5GTR HQNzOl7iCQY9fXBmCtUc43hOq+Uo+J0GJgeOWfdwf1lQWTms9IZ6LIZiK/UwxhgLWOJlZQ hNRId16CGTt4A+325ArTe9A3IJcxHFj5gU0oK1fg833xtJ8JclO/3Sxq9/K13QtwvDDO9W Ok8peeffOckvlcYH2dXtExnDPzmN6BBvdBhtyYiglqpQHSZXobgp/zRosnUBeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682011821; a=rsa-sha256; cv=none; b=i3oiqLzj7Sxb0ZnPzkKAdNWw3ZlRJ4vzhr03ARUFl2YZpnDWtb27pWVaaWj1gWUsL80kDA O/XPynHyX21Ad3Jk916vDX6LU62CFLvTLYl6e6rhdGrhYfIi6tL/U9TRf2fFQgrxEJAkkj emdzll9jDDT2RxAZxz9XGbvmBnAGWxuPqTw/9UUVcS0msAwdX/4jPcLG94EwM1agj/uIYj ksxBneJEFqwlpasDLA+34icMTpT0fSiW2LBnRgH6TFCyhfA3UIqZuxVq5/A++w0FM+9yRg C3xVkwIPJBnnU92J3HYWoEzNHxLThGt8s+QfSvhPkHfGYGb8sjE4/bGQxfc3Qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2Pn94CY7zmqJ; Thu, 20 Apr 2023 17:30:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33KHUL94069786; Thu, 20 Apr 2023 17:30:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KHULvU069785; Thu, 20 Apr 2023 17:30:21 GMT (envelope-from git) Date: Thu, 20 Apr 2023 17:30:21 GMT Message-Id: <202304201730.33KHULvU069785@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: 312c06634ec3 - stable/13 - pkill: tests: do a pass for case-sensitive conflicts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 312c06634ec3b405377840573f932fd937f51a61 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=312c06634ec3b405377840573f932fd937f51a61 commit 312c06634ec3b405377840573f932fd937f51a61 Author: Kyle Evans AuthorDate: 2023-03-20 19:51:41 +0000 Commit: Kyle Evans CommitDate: 2023-04-20 17:29:23 +0000 pkill: tests: do a pass for case-sensitive conflicts As in 76b6a59f9d30a5a39a5ed, encode upper-case flag tests with a leading underbar to avoid collisions (thus, erroneously dirty git repos) on case-sensitive filesystems. PR: 270948 Sponsored by: Klara, Inc. (cherry picked from commit 822057bfbbbcdb722a7ccd0e40d6b7e82b1d83f7) --- ObsoleteFiles.inc | 10 ++++++++++ bin/pkill/tests/Makefile | 16 ++++++++-------- bin/pkill/tests/{pgrep-F_test.sh => pgrep-_f_test.sh} | 0 bin/pkill/tests/{pgrep-LF_test.sh => pgrep-_lf_test.sh} | 0 bin/pkill/tests/{pgrep-P_test.sh => pgrep-_p_test.sh} | 0 bin/pkill/tests/{pgrep-U_test.sh => pgrep-_u_test.sh} | 0 bin/pkill/tests/{pkill-F_test.sh => pkill-_f_test.sh} | 0 bin/pkill/tests/{pkill-LF_test.sh => pkill-_lf_test.sh} | 0 bin/pkill/tests/{pkill-P_test.sh => pkill-_p_test.sh} | 0 bin/pkill/tests/{pkill-U_test.sh => pkill-_u_test.sh} | 0 10 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 39c3e57f93b1..9340f00e9e29 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,16 @@ # xargs -n1 | sort | uniq -d; # done +# 20230420: case-sensitive conflicts removed +OLD_FILES+=usr/tests/bin/pkill/pgrep-F_test +OLD_FILES+=usr/tests/bin/pkill/pgrep-LF_test +OLD_FILES+=usr/tests/bin/pkill/pgrep-P_test +OLD_FILES+=usr/tests/bin/pkill/pgrep-U_test +OLD_FILES+=usr/tests/bin/pkill/pkill-F_test +OLD_FILES+=usr/tests/bin/pkill/pkill-LF_test +OLD_FILES+=usr/tests/bin/pkill/pkill-P_test +OLD_FILES+=usr/tests/bin/pkill/pkill-U_test + # 20230410: new clang import which bumps version from 14.0.5 to 15.0.7 OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/algorithm OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/complex diff --git a/bin/pkill/tests/Makefile b/bin/pkill/tests/Makefile index 9bf448bb2460..66a1d655b764 100644 --- a/bin/pkill/tests/Makefile +++ b/bin/pkill/tests/Makefile @@ -7,10 +7,10 @@ PACKAGE= tests PROGS+= spin_helper BINDIR= ${TESTSDIR} -TAP_TESTS_SH= pgrep-F_test -TAP_TESTS_SH+= pgrep-LF_test -TAP_TESTS_SH+= pgrep-P_test -TAP_TESTS_SH+= pgrep-U_test +TAP_TESTS_SH= pgrep-_f_test +TAP_TESTS_SH+= pgrep-_lf_test +TAP_TESTS_SH+= pgrep-_p_test +TAP_TESTS_SH+= pgrep-_u_test TAP_TESTS_SH+= pgrep-_g_test TAP_TESTS_SH+= pgrep-_s_test TAP_TESTS_SH+= pgrep-g_test @@ -27,10 +27,10 @@ TAP_TESTS_SH+= pgrep-s_test TAP_TESTS_SH+= pgrep-t_test TAP_TESTS_SH+= pgrep-v_test TAP_TESTS_SH+= pgrep-x_test -TAP_TESTS_SH+= pkill-F_test -TAP_TESTS_SH+= pkill-LF_test -TAP_TESTS_SH+= pkill-P_test -TAP_TESTS_SH+= pkill-U_test +TAP_TESTS_SH+= pkill-_f_test +TAP_TESTS_SH+= pkill-_lf_test +TAP_TESTS_SH+= pkill-_p_test +TAP_TESTS_SH+= pkill-_u_test TAP_TESTS_SH+= pkill-_g_test TAP_TESTS_SH+= pkill-g_test TAP_TESTS_SH+= pkill-i_test diff --git a/bin/pkill/tests/pgrep-F_test.sh b/bin/pkill/tests/pgrep-_f_test.sh similarity index 100% rename from bin/pkill/tests/pgrep-F_test.sh rename to bin/pkill/tests/pgrep-_f_test.sh diff --git a/bin/pkill/tests/pgrep-LF_test.sh b/bin/pkill/tests/pgrep-_lf_test.sh similarity index 100% rename from bin/pkill/tests/pgrep-LF_test.sh rename to bin/pkill/tests/pgrep-_lf_test.sh diff --git a/bin/pkill/tests/pgrep-P_test.sh b/bin/pkill/tests/pgrep-_p_test.sh similarity index 100% rename from bin/pkill/tests/pgrep-P_test.sh rename to bin/pkill/tests/pgrep-_p_test.sh diff --git a/bin/pkill/tests/pgrep-U_test.sh b/bin/pkill/tests/pgrep-_u_test.sh similarity index 100% rename from bin/pkill/tests/pgrep-U_test.sh rename to bin/pkill/tests/pgrep-_u_test.sh diff --git a/bin/pkill/tests/pkill-F_test.sh b/bin/pkill/tests/pkill-_f_test.sh similarity index 100% rename from bin/pkill/tests/pkill-F_test.sh rename to bin/pkill/tests/pkill-_f_test.sh diff --git a/bin/pkill/tests/pkill-LF_test.sh b/bin/pkill/tests/pkill-_lf_test.sh similarity index 100% rename from bin/pkill/tests/pkill-LF_test.sh rename to bin/pkill/tests/pkill-_lf_test.sh diff --git a/bin/pkill/tests/pkill-P_test.sh b/bin/pkill/tests/pkill-_p_test.sh similarity index 100% rename from bin/pkill/tests/pkill-P_test.sh rename to bin/pkill/tests/pkill-_p_test.sh diff --git a/bin/pkill/tests/pkill-U_test.sh b/bin/pkill/tests/pkill-_u_test.sh similarity index 100% rename from bin/pkill/tests/pkill-U_test.sh rename to bin/pkill/tests/pkill-_u_test.sh From nobody Thu Apr 20 22:15:36 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2X6J4KyYz46g57; Thu, 20 Apr 2023 22: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 4Q2X6J3SkLz3vjN; Thu, 20 Apr 2023 22: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=1682028936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rMzwmtPnmE1vBQZW/4YKc1ED3i0UP5HMuwF0a/HYd88=; b=oIeaF2g3Vf9Fe4dqJHxFgwJvNRTpJqreYKoxXQsZJlh2wClAJGMzec4r2xJ6STjB1e+CBF GB5BZ7VFzYJ37qFBsD9nOORmL4AYG1JU0nBuPRFPcaakTc+0KhpecsoOoZ82ncZx0RACWG YsCS1pjnB0gWZo8Gzq13Q31oNC++A2Ixlb7cR0vvHHLDUqGXYa6lKgmm8P1Nebddu7pSJx usegcg7jYQ0raqf83JHXZLLcVSZ0SV0wJjzmEl0xySSe1V2kW1qY5SJ3iI1WTXUlWhlqrj IocRlL/PYbKn5UCo6FiHGvUHw9G6iXKnBybyWqEtoblO0weeTt/jEnj4AZc9mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682028936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rMzwmtPnmE1vBQZW/4YKc1ED3i0UP5HMuwF0a/HYd88=; b=d/EWH7Ed7xMj3f2OXfWxdSui0TotNuZSIcg0vTQdCezz0A4Noa+JhHB5Sr770LIRu0hAhw u08Y1wvlErGjvG2d4klLmHJUaWsaHDlGv9sd4/O42EuXTIe8jvR4ObhxZsHr/SSc1LYIV9 M/9U+6moLc2vxziDiHSJtF5KeXUTKzU42Tw4AXLa9O6YHT3BFp2Cy3xpyhp2GsMpT8a5qW 5awAtTmIaWz5mS4bNtjbBXf8jdjX+yb5y0QPI1MULqRfaEq9HUm2zk2XM6aw9OFEDOH+tC CEgkOrlWA2q/rm68cbBFEava9nBUKIvTI7FxSG6U58EESeZcUntq6ea1Y9Z6yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682028936; a=rsa-sha256; cv=none; b=htbu+Ve0zoU0P4ii5a4hTk5+a467SQKmca/j5dbM8eHfMNcSX2Sc8O1N32RwnCf59jXG2+ V3D5Xx9p33iV5E0VChGL4xwvxt7aSx+sGLsAyDtxvNvz4DGIcvCnBg5dc82V61Vmxly5Xs 6bRUG/qojdKUQkBnh+kyYVYFy1H+i7WA+IudXsKODPFN1qokxiVorv3S2Fiay9vpzgqU2q i7gJIr2kWKsO7Y3hpZj4nk2UeM1Oir4Cg9k6JQJYVgidTTwWFkm0WULYnsGzB4IIN/kOm+ EUB+wGfWQw4SjG4R1yXK2Y4f+iT8RkxJAVYyoNMLuK2Qywyp+Zm0gF9WEB90KQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2X6J2XzbzvW4; Thu, 20 Apr 2023 22:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33KMFavW041618; Thu, 20 Apr 2023 22:15:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KMFa4H041617; Thu, 20 Apr 2023 22:15:36 GMT (envelope-from git) Date: Thu, 20 Apr 2023 22:15:36 GMT Message-Id: <202304202215.33KMFa4H041617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: d7339c42673a - stable/13 - trpt: fix several bugs and add deprecation notice List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d7339c42673a84e222f630e80b5606776b755229 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d7339c42673a84e222f630e80b5606776b755229 commit d7339c42673a84e222f630e80b5606776b755229 Author: Michael Tuexen AuthorDate: 2023-04-20 22:09:40 +0000 Commit: Michael Tuexen CommitDate: 2023-04-20 22:09:40 +0000 trpt: fix several bugs and add deprecation notice This patch fixes several bugs releated to trpt including * the computation of the TCP payload bytes, in particular when TCP options are present or IPv4 is used. * the logging of incoming and outgoing packets. * the logging of timers, in particular add support for logging of the delayed ack timer. Also add a deprecation note, since support for this utility has been removed from the main branch. Therefore, this is a direct commit to stable/13. Reviewed by: cc, glebius, rrs Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D39436 --- sys/netinet/tcp_debug.c | 9 +++++---- sys/netinet/tcp_input.c | 13 ++++++++++++- sys/netinet/tcp_output.c | 28 ++++++++-------------------- sys/netinet/tcp_timer.c | 20 +++++++++++++++----- sys/netinet/tcp_timer.h | 6 ++++++ usr.sbin/trpt/trpt.8 | 31 ++++++++++++++++++++++--------- usr.sbin/trpt/trpt.c | 10 ++++------ 7 files changed, 72 insertions(+), 45 deletions(-) diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c index aedaa131095f..640940b1ce8c 100644 --- a/sys/netinet/tcp_debug.c +++ b/sys/netinet/tcp_debug.c @@ -177,13 +177,13 @@ tcp_trace(short act, short ostate, struct tcpcb *tp, void *ipgen, #ifdef INET6 isipv6 ? ntohs(((struct ip6_hdr *)ipgen)->ip6_plen) : #endif - ntohs(((struct ip *)ipgen)->ip_len); + ntohs(((struct ip *)ipgen)->ip_len) - + (((struct ip *)ipgen)->ip_hl << 2); if (act == TA_OUTPUT) { seq = ntohl(seq); ack = ntohl(ack); } - if (act == TA_OUTPUT) - len -= sizeof (struct tcphdr); + len -= th->th_off << 2; if (len) printf("[%x..%x)", seq, seq+len); else @@ -205,7 +205,8 @@ tcp_trace(short act, short ostate, struct tcpcb *tp, void *ipgen, case TA_USER: printf("%s", prurequests[req&0xff]); - if ((req & 0xff) == PRU_SLOWTIMO) + if ((req & 0xff) == PRU_SLOWTIMO || + (req & 0xff) == PRU_FASTTIMO) printf("<%s>", tcptimers[req>>8]); break; } diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 9bc9923530e0..bb2a0e497dcf 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1561,7 +1561,18 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, */ u_char tcp_saveipgen[IP6_HDR_LEN]; struct tcphdr tcp_savetcp; - short ostate = 0; + short ostate; + + if (so->so_options & SO_DEBUG) { + ostate = tp->t_state; +#ifdef INET6 + if (mtod(m, struct ip *)->ip_v == 6) + bcopy(mtod(m, char *), (char *)tcp_saveipgen, sizeof(struct ip6_hdr)); + else +#endif + bcopy(mtod(m, char *), (char *)tcp_saveipgen, sizeof(struct ip)); + tcp_savetcp = *th; + } #endif thflags = th->th_flags; inc = &tp->t_inpcb->inp_inc; diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index fea54cdcc5cb..f979649ca608 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1430,26 +1430,6 @@ send: hhook_run_tcp_est_out(tp, th, &to, len, tso); #endif -#ifdef TCPDEBUG - /* - * Trace. - */ - if (so->so_options & SO_DEBUG) { - u_short save = 0; -#ifdef INET6 - if (!isipv6) -#endif - { - save = ipov->ih_len; - ipov->ih_len = htons(m->m_pkthdr.len /* - hdrlen + (th->th_off << 2) */); - } - tcp_trace(TA_OUTPUT, tp->t_state, tp, mtod(m, void *), th, 0); -#ifdef INET6 - if (!isipv6) -#endif - ipov->ih_len = save; - } -#endif /* TCPDEBUG */ TCP_PROBE3(debug__output, tp, th, m); /* We're getting ready to send; log now. */ @@ -1502,6 +1482,10 @@ send: /* Save packet, if requested. */ tcp_pcap_add(th, m, &(tp->t_outpkts)); #endif +#ifdef TCPDEBUG + if (so->so_options & SO_DEBUG) + tcp_trace(TA_OUTPUT, tp->t_state, tp, (void *)ip6, th, 0); +#endif /* TCPDEBUG */ /* TODO: IPv6 IP6TOS_ECT bit on */ error = ip6_output(m, tp->t_inpcb->in6p_outputopts, @@ -1549,6 +1533,10 @@ send: /* Save packet, if requested. */ tcp_pcap_add(th, m, &(tp->t_outpkts)); #endif +#ifdef TCPDEBUG + if (so->so_options & SO_DEBUG) + tcp_trace(TA_OUTPUT, tp->t_state, tp, (void *)ip, th, 0); +#endif /* TCPDEBUG */ error = ip_output(m, tp->t_inpcb->inp_options, &tp->t_inpcb->inp_route, ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), 0, diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 4b00b686be32..21e6b66ff81c 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -266,8 +266,12 @@ tcp_timer_delack(void *xtp) struct epoch_tracker et; struct tcpcb *tp = xtp; struct inpcb *inp; - CURVNET_SET(tp->t_vnet); +#ifdef TCPDEBUG + int ostate; + ostate = tp->t_state; +#endif + CURVNET_SET(tp->t_vnet); inp = tp->t_inpcb; KASSERT(inp != NULL, ("%s: tp %p tp->t_inpcb == NULL", __func__, tp)); INP_WLOCK(inp); @@ -287,6 +291,11 @@ tcp_timer_delack(void *xtp) TCPSTAT_INC(tcps_delack); NET_EPOCH_ENTER(et); (void) tp->t_fb->tfb_tcp_output(tp); +#ifdef TCPDEBUG + if (inp->inp_socket->so_options & SO_DEBUG) + tcp_trace(TA_USER, ostate, tp, (void *)0, (struct tcphdr *)0, + (TCPT_DELACK << 8) | PRU_FASTTIMO); +#endif INP_WUNLOCK(inp); NET_EPOCH_EXIT(et); CURVNET_RESTORE(); @@ -380,7 +389,7 @@ tcp_timer_2msl(void *xtp) #ifdef TCPDEBUG if (tp != NULL && (tp->t_inpcb->inp_socket->so_options & SO_DEBUG)) tcp_trace(TA_USER, ostate, tp, (void *)0, (struct tcphdr *)0, - PRU_SLOWTIMO); + (TCPT_2MSL << 8) | PRU_SLOWTIMO); #endif TCP_PROBE2(debug__user, tp, PRU_SLOWTIMO); @@ -502,7 +511,7 @@ dropit: #ifdef TCPDEBUG if (tp != NULL && (tp->t_inpcb->inp_socket->so_options & SO_DEBUG)) tcp_trace(TA_USER, ostate, tp, (void *)0, (struct tcphdr *)0, - PRU_SLOWTIMO); + (TCPT_KEEP << 8) | PRU_SLOWTIMO); #endif TCP_PROBE2(debug__user, tp, PRU_SLOWTIMO); NET_EPOCH_EXIT(et); @@ -592,7 +601,8 @@ tcp_timer_persist(void *xtp) #ifdef TCPDEBUG if (tp != NULL && tp->t_inpcb->inp_socket->so_options & SO_DEBUG) - tcp_trace(TA_USER, ostate, tp, NULL, NULL, PRU_SLOWTIMO); + tcp_trace(TA_USER, ostate, tp, NULL, NULL, + (TCPT_PERSIST << 8) | PRU_SLOWTIMO); #endif TCP_PROBE2(debug__user, tp, PRU_SLOWTIMO); INP_WUNLOCK(inp); @@ -875,7 +885,7 @@ tcp_timer_rexmt(void * xtp) #ifdef TCPDEBUG if (tp != NULL && (tp->t_inpcb->inp_socket->so_options & SO_DEBUG)) tcp_trace(TA_USER, ostate, tp, (void *)0, (struct tcphdr *)0, - PRU_SLOWTIMO); + (TCPT_REXMT << 8) | PRU_SLOWTIMO); #endif TCP_PROBE2(debug__user, tp, PRU_SLOWTIMO); INP_WUNLOCK(inp); diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index 316b76e50f7e..d0bc74669123 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -35,6 +35,12 @@ #ifndef _NETINET_TCP_TIMER_H_ #define _NETINET_TCP_TIMER_H_ +#define TCPT_REXMT 0 /* retransmit */ +#define TCPT_PERSIST 1 /* retransmit persistance */ +#define TCPT_KEEP 2 /* keep alive */ +#define TCPT_2MSL 3 /* 2*msl quiet time timer */ +#define TCPT_DELACK 4 /* delay ack */ + /* * The TCPT_REXMT timer is used to force retransmissions. * The TCP has the TCPT_REXMT timer set whenever segments diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8 index 3c66f5afe761..8d674f76298b 100644 --- a/usr.sbin/trpt/trpt.8 +++ b/usr.sbin/trpt/trpt.8 @@ -28,13 +28,19 @@ .\" @(#)trpt.8 8.2 (Berkeley) 12/11/93 .\" $FreeBSD$ .\" -.Dd February 15, 2018 +.Dd April 21, 2023 .Dt TRPT 8 .Os .Sh NAME .Nm trpt .Nd transliterate protocol trace .Sh SYNOPSIS +To add support for this utility to the kernel, add the following line to the +kernel configuration file: +.Bd -ragged -offset indent +.Cd "options TCPDEBUG" +.Ed +.Pp .Nm .Op Fl a .Op Fl f @@ -44,12 +50,15 @@ .Oo .Ar system Op Ar core .Oc +.Sh DEPRECATION NOTICE +.Nm +is deprecated and will not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm -utility interrogates the buffer of -.Tn TCP -trace records created +utility interrogates the buffer of TCP trace records created when a socket is marked for .Dq debugging (see @@ -58,11 +67,8 @@ and prints a readable description of these records. When no options are supplied, .Nm prints all the trace records found in the system -grouped according to -.Tn TCP -connection protocol control -block -.Pq Tn PCB . +grouped according to TCP connection protocol control block +.Pq PCB . .Pp The following options may be used to alter this behavior: @@ -142,3 +148,10 @@ but this is not saved in the trace record. .Pp The output format is inscrutable and should be described here. +.Pp +It is not possible to use the +.Nm +utility if the following line is in the kernel config file: +.Bd -ragged -offset indent +.Cd "options TCPPCAP" +.Ed diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c index e8198f7d080e..b89a82c191d8 100644 --- a/usr.sbin/trpt/trpt.c +++ b/usr.sbin/trpt/trpt.c @@ -124,7 +124,7 @@ main(int argc, char **argv) case 'p': if (npcbs >= TCP_NDEBUG) errx(1, "too many pcb's specified"); - (void)sscanf(optarg, "%x", (int *)&tcp_pcbs[npcbs++]); + (void)sscanf(optarg, "%lx", (long *)&tcp_pcbs[npcbs++]); break; case 's': ++sflag; @@ -369,18 +369,16 @@ tcp_trace(short act, short ostate, struct tcpcb *tp, int family __unused, len = #ifdef INET6 - isipv6 ? ip6->ip6_plen : + isipv6 ? ntohs(ip6->ip6_plen) : #endif - ip4->ip_len; + ntohs(ip4->ip_len) - (ip4->ip_hl << 2); win = th->th_win; if (act == TA_OUTPUT) { seq = ntohl(seq); ack = ntohl(ack); - len = ntohs(len); win = ntohs(win); } - if (act == TA_OUTPUT) - len -= sizeof(struct tcphdr); + len -= th->th_off << 2; if (len) printf("[%lx..%lx)", (u_long)seq, (u_long)(seq + len)); else From nobody Fri Apr 21 00:42:54 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2bNH0rBLz46qdy; Fri, 21 Apr 2023 00:42: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 4Q2bNH0LZ0z3LPs; Fri, 21 Apr 2023 00:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682037775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7DnoMRDq/26HON4Yob2tO7mFME3fO1kVmfUe1hUzmNs=; b=hAWG95MaiuA7pNCaoAhn8ODb0z2RwLVy79UmFMwxCjBNuo4PUdwk7EH3ngcc3cigG3nzsI pFmFEPIE5pnW3i4jNjTrpPg5+HDdkdNavprhQ7vRiDYbEOZ7TNpuKzDSD/a14cwogjbaMJ Xl1thc5DFs0QtbHqDnpdU+AbZwBKwcXQFzQtzXI8201IkD1k5DbGRSOHxRALm30ygZ7YkW Fi5ejpjVqvrOY35VOX/jB2LkMLfBDJkR1amnuY3KpiRUKB5lazm0/bsHT2Ea3eEScBs7N3 pfMSWdIHZndUvxd6F5JR3KwUl6u+UXYdybk/EjH8aRhpDBc+QMeVuaWltYbfgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682037775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7DnoMRDq/26HON4Yob2tO7mFME3fO1kVmfUe1hUzmNs=; b=k4IZIoeBD1GFAVItp6WKBBxWyRZGke1B5mQUaGCkpSxRXmjRYhLAJJL3tzZ6x8c6k5UibK eU8kDeiVkwkUVXkEiWMimoNWrWiPZoQ8t7EYOcVwt0tmSWwVgFXjeA1MaNjy5mag9yc9X4 lOQNDOPouCJ9gYspDi3FwaA/lRd/eg6zG3Y65/xE2iIHViWAgtwwMkUdiA8Kfr4gknzbX2 NqXuxYZ8hRDfQzhvtfDAWNAYBcNN8UhjGPEavkYdgBnTD6jzWzQrgsELTSMtwmy5tpexdQ g7cCcEvAcA8ZpVdKpgEP7pPwlQjqn9uQXkqDcXg2TaRK/xmzGckUnV3KEGBGIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682037775; a=rsa-sha256; cv=none; b=N0oBL0LsDrBdkAAwUo/AhquLSEzM/bv6v52WqpdE/K+vGZIISNzBcJS2jUxjupV2uOjySU MIyBfWrUlacrHWT5rg4GIfGyUWH/BsX7KZWigYc1owV1zfBGnwfj47Mq4QM3Hx9LiZjOFv y4IseMBe3ZoGtf6TFF6/cfeLpadSjT1vTixPugPS2sIQhnaaQGjUKP8yxMGM9Kfbyu1yq7 3+ZavYZ9/FOb19CPgDGSo07ggTNgiZWydaGhp+3hdGPktfXsnM/iJZc4jsWFO69WHTrnna RPpQqO57sjF2TISmbOlirE2gGBYWgunPc7aojwJVjXthdZz246iWY/z8vD6iGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2bNG6Y24z10sT; Fri, 21 Apr 2023 00:42:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33L0gs0G086469; Fri, 21 Apr 2023 00:42:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33L0gsUl086468; Fri, 21 Apr 2023 00:42:54 GMT (envelope-from git) Date: Fri, 21 Apr 2023 00:42:54 GMT Message-Id: <202304210042.33L0gsUl086468@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: 11793cb60351 - stable/13 - amd64: fix PKRU and swapout interaction List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 11793cb6035116242d3480ebff855cc0beea1b0b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=11793cb6035116242d3480ebff855cc0beea1b0b commit 11793cb6035116242d3480ebff855cc0beea1b0b Author: Konstantin Belousov AuthorDate: 2023-04-13 11:37:35 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-21 00:32:33 +0000 amd64: fix PKRU and swapout interaction (cherry picked from commit 1e0e335b0f0dbae8ce49307377b23ef3673bd402) --- sys/amd64/amd64/pmap.c | 37 ++++++++++++++++++++++++++++--------- sys/amd64/include/pmap.h | 1 + sys/arm/include/pmap.h | 1 + sys/arm64/include/pmap.h | 1 + sys/i386/include/pmap.h | 1 + sys/mips/include/pmap.h | 1 + sys/powerpc/include/pmap.h | 1 + sys/riscv/include/pmap.h | 1 + sys/vm/vm_map.c | 2 +- 9 files changed, 36 insertions(+), 10 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index facbc6d3dd81..3883019daf24 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -6174,14 +6174,8 @@ pmap_remove_ptes(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, return (anyvalid); } -/* - * Remove the given range of addresses from the specified map. - * - * It is assumed that the start and end are properly - * rounded to the page size. - */ -void -pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +static void +pmap_remove1(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, bool map_delete) { struct rwlock *lock; vm_page_t mt; @@ -6213,7 +6207,8 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) pmap_delayed_invl_start(); PMAP_LOCK(pmap); - pmap_pkru_on_remove(pmap, sva, eva); + if (map_delete) + pmap_pkru_on_remove(pmap, sva, eva); /* * special handling of removing one page. a very @@ -6335,6 +6330,30 @@ out: vm_page_free_pages_toq(&free, true); } +/* + * Remove the given range of addresses from the specified map. + * + * It is assumed that the start and end are properly + * rounded to the page size. + */ +void +pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + pmap_remove1(pmap, sva, eva, false); +} + +/* + * Remove the given range of addresses as part of a logical unmap + * operation. This has the effect of calling pmap_remove(), but + * also clears any metadata that should persist for the lifetime + * of a logical mapping. + */ +void +pmap_map_delete(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + pmap_remove1(pmap, sva, eva, true); +} + /* * Routine: pmap_remove_all * Function: diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index 0faee81a67c5..ebdcbc6ce202 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -516,6 +516,7 @@ void pmap_force_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva); void pmap_get_mapping(pmap_t pmap, vm_offset_t va, uint64_t *ptr, int *num); boolean_t pmap_map_io_transient(vm_page_t *, vm_offset_t *, int, boolean_t); void pmap_unmap_io_transient(vm_page_t *, vm_offset_t *, int, boolean_t); +void pmap_map_delete(pmap_t, vm_offset_t, vm_offset_t); void pmap_pti_add_kva(vm_offset_t sva, vm_offset_t eva, bool exec); void pmap_pti_remove_kva(vm_offset_t sva, vm_offset_t eva); void pmap_pti_pcid_invalidate(uint64_t ucr3, uint64_t kcr3); diff --git a/sys/arm/include/pmap.h b/sys/arm/include/pmap.h index d06d44d648d5..8572602be35e 100644 --- a/sys/arm/include/pmap.h +++ b/sys/arm/include/pmap.h @@ -45,6 +45,7 @@ extern vm_offset_t virtual_end; void *pmap_kenter_temporary(vm_paddr_t, int); #define pmap_page_is_write_mapped(m) (((m)->a.flags & PGA_WRITEABLE) != 0) void pmap_page_set_memattr(vm_page_t, vm_memattr_t); +#define pmap_map_delete(pmap, sva, eva) pmap_remove(pmap, sva, eva) void *pmap_mapdev(vm_paddr_t, vm_size_t); void pmap_unmapdev(vm_offset_t, vm_size_t); diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 9140e25e023a..6c3b4211da0c 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -179,6 +179,7 @@ int pmap_pinit_stage(pmap_t, enum pmap_stage, int); bool pmap_ps_enabled(pmap_t pmap); uint64_t pmap_to_ttbr0(pmap_t pmap); void pmap_disable_promotion(vm_offset_t sva, vm_size_t size); +#define pmap_map_delete(pmap, sva, eva) pmap_remove(pmap, sva, eva) void *pmap_mapdev(vm_offset_t, vm_size_t); void *pmap_mapbios(vm_paddr_t, vm_size_t); diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h index 5ac99b92cad3..228c1520f0a0 100644 --- a/sys/i386/include/pmap.h +++ b/sys/i386/include/pmap.h @@ -286,6 +286,7 @@ void pmap_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva); void pmap_force_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva); void *pmap_trm_alloc(size_t size, int flags); void pmap_trm_free(void *addr, size_t size); +#define pmap_map_delete(pmap, sva, eva) pmap_remove(pmap, sva, eva) void invltlb_glob(void); diff --git a/sys/mips/include/pmap.h b/sys/mips/include/pmap.h index fb186011bd85..0cc098fcf4be 100644 --- a/sys/mips/include/pmap.h +++ b/sys/mips/include/pmap.h @@ -184,6 +184,7 @@ void pmap_flush_pvcache(vm_page_t m); int pmap_emulate_modified(pmap_t pmap, vm_offset_t va); void pmap_page_set_memattr(vm_page_t, vm_memattr_t); int pmap_change_attr(vm_offset_t, vm_size_t, vm_memattr_t); +#define pmap_map_delete(pmap, sva, eva) pmap_remove(pmap, sva, eva) static inline int pmap_vmspace_copy(pmap_t dst_pmap __unused, pmap_t src_pmap __unused) diff --git a/sys/powerpc/include/pmap.h b/sys/powerpc/include/pmap.h index d14398750080..4062417193e5 100644 --- a/sys/powerpc/include/pmap.h +++ b/sys/powerpc/include/pmap.h @@ -325,6 +325,7 @@ const char *pmap_mmu_name(void); bool pmap_ps_enabled(pmap_t pmap); int pmap_nofault(pmap_t pmap, vm_offset_t va, vm_prot_t flags); boolean_t pmap_page_is_mapped(vm_page_t m); +#define pmap_map_delete(pmap, sva, eva) pmap_remove(pmap, sva, eva) void pmap_page_array_startup(long count); diff --git a/sys/riscv/include/pmap.h b/sys/riscv/include/pmap.h index 8834c91362ad..f87e6942af2c 100644 --- a/sys/riscv/include/pmap.h +++ b/sys/riscv/include/pmap.h @@ -56,6 +56,7 @@ #define pmap_page_get_memattr(m) ((m)->md.pv_memattr) #define pmap_page_is_write_mapped(m) (((m)->a.flags & PGA_WRITEABLE) != 0) void pmap_page_set_memattr(vm_page_t m, vm_memattr_t ma); +#define pmap_map_delete(pmap, sva, eva) pmap_remove(pmap, sva, eva) /* * Pmap stuff diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index fa57cea48dae..ce520de160ef 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -3965,7 +3965,7 @@ vm_map_delete(vm_map_t map, vm_offset_t start, vm_offset_t end) */ if ((entry->eflags & MAP_ENTRY_IS_SUB_MAP) != 0 || entry->object.vm_object != NULL) - pmap_remove(map->pmap, entry->start, entry->end); + pmap_map_delete(map->pmap, entry->start, entry->end); if (entry->end == map->anon_loc) map->anon_loc = entry->start; From nobody Fri Apr 21 04:46:18 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2hn719Qzz475P5; Fri, 21 Apr 2023 04:46: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 4Q2hn70MMbz4Jd1; Fri, 21 Apr 2023 04:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682052379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6WkVbgSQdMPLuhGLRzPap4RxALlU9h/fKLBRGV2/wjo=; b=ClP2XBgeHgVz0HJXoBYU7v5OrG05TfMtFgUfzc70huNsp0jv+xvMoPkR0LQ4DK8qIX09Yq ZxAm8cuDbEZ8XYMos+g/LpMST0waIAIH10XXWRYuPpx+NKxBbaROMfv70imR35iqwJq9+t K5bQMYCy/nOP94vhA7Evsicbm1/1v1HhajEenATcgcz3yhcL3tjTRxOK7mp8i1r6G3lhsV jCowLRv1YhM/i8WSWHSOwSc/Z+CM86DvtOSNZD4acTLw+Uew2NoPk3UXJ8tmxKlK6VF3c4 XLFaR5OG9VEOcxpKxCCaxZChg09oRjND9ge7FKYGKjWqki3aBx/YhHpaSsNmNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682052379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6WkVbgSQdMPLuhGLRzPap4RxALlU9h/fKLBRGV2/wjo=; b=ttasygLaQvWoI95w7cUnbQHAKD6rwGm3bbe2Bd+xSaLCSm4qRSQho4gj6Z7rx6LxUIUEou IYMipBXx307cy9Tu8S3wnhP0wMKLMPJwedabwjfGQZhzhSQxOcUeRP09YNO0bErRcNd6SW pEDh0kvf87FJQaNBdUaFViFmFzo0mJ8srY9/UJO4qdCGl4EpR6JtNFjk+EcN99zmwfDnxu rN2Orvn5BfkC0azvpni7uFGl7uQ3BW2Bi4n1xOnm60jtgkWPvaoSUrB8AacDQPM8ftzMEC lQqQGtq/TO8k1nvBqC5hoZTfyPIu20x14nuA2jWfdiusnQ9Vx+0sktFsDKVviA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682052379; a=rsa-sha256; cv=none; b=vwqgMB2UdYkp4+SZOJEKt4yD89lnvAswECcMDQEUjUw4DOchyQQCqflBOjSkyzXoF0ouBI cwWxJUjH6fp49S1ZEplCPwuJYkud0oZci//l727PaFcHB0ZwXLZHmgF3ZviygBAygbfIJ+ 1c9raLD/PwIEDtXvrkObeBnXZ76mmS2MzsNz2EpSSgq017Q9kMTtakI4hd7qaBQh2vSNh4 dWqlCGN0g1QMVKFJHksmTmeY64RZfOJb5jg1Pk/Nh1Z8U2O2QTkZfj48wKYTpQqU1YjaVn vzo3u2nXHofVQk/8jnx3bWrB69+MgL3qMgUSyceE/3irz9zJJBcek56N23Bc+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 4Q2hn66V6cz16NR; Fri, 21 Apr 2023 04:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33L4kIKE081972; Fri, 21 Apr 2023 04:46:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33L4kICO081971; Fri, 21 Apr 2023 04:46:18 GMT (envelope-from git) Date: Fri, 21 Apr 2023 04:46:18 GMT Message-Id: <202304210446.33L4kICO081971@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: 6b5b4668ce76 - stable/13 - mount_nfs.8: Fix a mandoc warning List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 6b5b4668ce7649c0e2314964ae8f6bb1455ba00d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6b5b4668ce7649c0e2314964ae8f6bb1455ba00d commit 6b5b4668ce7649c0e2314964ae8f6bb1455ba00d Author: Gordon Bergling AuthorDate: 2023-04-18 07:14:20 +0000 Commit: Gordon Bergling CommitDate: 2023-04-21 04:45:36 +0000 mount_nfs.8: Fix a mandoc warning - sections out of conventional order: Sh IMPLEMENTATION NOTES (cherry picked from commit c2a9d23736da3593bc7cc883f43d913188d79beb) --- sbin/mount_nfs/mount_nfs.8 | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8 index 0e6ea0538063..c3da26c41c66 100644 --- a/sbin/mount_nfs/mount_nfs.8 +++ b/sbin/mount_nfs/mount_nfs.8 @@ -529,6 +529,26 @@ options should only be used as a last ditch effort at improving performance when mounting servers that do not support TCP mounts. .El .El +.Sh IMPLEMENTATION NOTES +When neither the +.Cm rsize +nor +.Cm wsize +options are specified, the I/O size will be set to the largest value +supported by both the NFS client and server. +The largest value supported by the NFS client is defined by +the tunable +.Cd vfs.maxbcachebuf +which can be set to a power of two up to +.Cd kern.maxphys . +.Pp +The +.Xr nfsstat 1 +command with the +.Ic -m +command line option will show what +.Nm +option settings are actually in use for the mount. .Sh COMPATIBILITY The following command line flags are equivalent to .Fl o @@ -625,26 +645,6 @@ Same as Same as .Fl o Cm nfsv4 .El -.Sh IMPLEMENTATION NOTES -When neither the -.Cm rsize -nor -.Cm wsize -options are specified, the I/O size will be set to the largest value -supported by both the NFS client and server. -The largest value supported by the NFS client is defined by -the tunable -.Cd vfs.maxbcachebuf -which can be set to a power of two up to -.Cd kern.maxphys . -.Pp -The -.Xr nfsstat 1 -command with the -.Ic -m -command line option will show what -.Nm -option settings are actually in use for the mount. .Sh SEE ALSO .Xr nfsstat 1 , .Xr nmount 2 , From nobody Fri Apr 21 04:46:19 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2hn81jtjz475hj; Fri, 21 Apr 2023 04:46: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 4Q2hn811Lgz4JbC; Fri, 21 Apr 2023 04:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682052380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ObF0lMS8BmTL0n2Y2/5DjdIHfjwMbCG6igkEs4VcxUE=; b=SVJEhTtjjb1MMAtJFU5VlZ2X+z9PtKPyCBVuGzXxyo830sx8Vk4SvIHJrs7UhAywVfEO47 iEFr2gFsrjyFaocHsw2PeT3lPlZjzTzIleUwodqaZs2t054M28K14nofiqww/VXiEGnV0c wwXVxqNHmWMUmf9W/JNEnHXURy4E9oEMCRcvMHFmGIfDaAFyjBZpqmSiMTZP41bLFjZAJO N24gN1IYe0a0P2upWmSqSdJ6WULqrau4pIm9gM495Tx6Bx19+rPG9Z0IRmUj0MXYcBB02f eO2nbOQelTPCmbzBS0V1jRGFM28kg+IzhBxeTbVsrra08Z1ncmlsL4uN6N5r4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682052380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ObF0lMS8BmTL0n2Y2/5DjdIHfjwMbCG6igkEs4VcxUE=; b=TR1/xdJrS2yVz5GGZ8aNJksJHmQPpCcGYi8mIIt3yIDzbcmv0RbXog0cxJEm7z0AejB2HI frZXBCUjlR+tFL8rNtkTxrWfOxf/Uu/O/OidnJpLlqeLOcAlLNGXaneBvOaAIxzXuIpPKC f9IXbHMtk3G5CvCZEDNxlM2ThtO3xCUjV++P05L85jGPeJ+FKzitNOIPx6vx3BqRrGpIrl VcsP/6vhMznLxtHAOrfAHJgapZe8CRuQjOrbK3Je26OkFUTbKx16NvFAufozSLWBjCPaSu z3lORE2bNSjJcxirqcK1ZRgaOvQJSC8aBwG4iIbZdHHVAUZ+hnDO2NWIlrlnwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682052380; a=rsa-sha256; cv=none; b=aPrrR1YrQDQMaMcy0ler0Rq0wshqWNHcEiLe85etzdxEjcC/1k4MrMTuT22TjWBlqsqj97 1lqLpKa9/rnKqCZFUkGbQ2vRDyl0Ra0h2hib9LQbuou/i5QGzUGls6Yykx/R0RILyHDPjG kZPoZ1vHlAsTmxGm+pctrBvELcEph485AJKOYp4zuLN3SRmz07zklMcFkYPSHbiELufWwB p65MynS6TUS7W4LJlTqdV4y9BhfbevC7GtK9CKTZhtSH7PjlgOai9g6pPntTKPclYTxsDP gCOSJ5fBOkTUofJxDxGcS1CuILvTfRmcu7bv8NHDYvIrl7kJ1KgMdwG6Eivl9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2hn7733Xz16NS; Fri, 21 Apr 2023 04:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33L4kJj5081991; Fri, 21 Apr 2023 04:46:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33L4kJcp081990; Fri, 21 Apr 2023 04:46:19 GMT (envelope-from git) Date: Fri, 21 Apr 2023 04:46:19 GMT Message-Id: <202304210446.33L4kJcp081990@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: eca916b0e65f - stable/13 - morse.6: Mention to standards in the SEE ALSO section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: eca916b0e65fb60df4725de3a1b1bd74c508ba77 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=eca916b0e65fb60df4725de3a1b1bd74c508ba77 commit eca916b0e65fb60df4725de3a1b1bd74c508ba77 Author: Gordon Bergling AuthorDate: 2023-04-16 09:46:09 +0000 Commit: Gordon Bergling CommitDate: 2023-04-21 04:45:52 +0000 morse.6: Mention to standards in the SEE ALSO section Mention ITU-T Recommendation F.1 and ITU-R M.1677-1 in the SEE ALSO section. Obtained from: OpenBSD (cherry picked from commit 82a036d86acaac75b1ff6d4f8b767bbb117694f1) --- usr.bin/morse/morse.6 | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/usr.bin/morse/morse.6 b/usr.bin/morse/morse.6 index bf339563589b..d2ce30eddb82 100644 --- a/usr.bin/morse/morse.6 +++ b/usr.bin/morse/morse.6 @@ -29,7 +29,7 @@ .\" @(#)bcd.6 8.1 (Berkeley) 5/31/93 .\" $FreeBSD$ .\" -.Dd January 5, 2018 +.Dd April 16, 2023 .Dt MORSE 6 .Os .Sh NAME @@ -178,6 +178,17 @@ device file .El .Sh SEE ALSO .Xr speaker 4 +.Rs +.%I ITU-T Recommendation F.1 +.%R "Operational provisions for the international public telegram service" +.%O Division B, I. Morse code +.Re +.Rs +.%I ITU-R M.1677-1 +.%R International Morse code +.%D 2009 +.%U https://www.itu.int/rec/R-REC-M.1677-1-200910-I/ +.Re .Sh HISTORY Sound support for .Nm @@ -191,7 +202,7 @@ Ability to key an external device added by Farnsworth support for .Nm added by -.An Stephen Cravey (N5UUU). +.An Stephen Cravey (N5UUU) . .Sh BUGS Only understands a few European characters (German and French), From nobody Fri Apr 21 04:46:20 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2hnB1kXMz475cf; Fri, 21 Apr 2023 04:46: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 4Q2hn92DdKz4JkF; Fri, 21 Apr 2023 04:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682052381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zl68p6PGc3/MYv9x5C/77gSOJu7ahzrBSunIl9q3aZs=; b=rnrquoHhZyO+poUNRXVWW/eRZkfkNIEgll38K2ZuA6yrbIGWPv9XJPxSLxTu2mjB6QepKP nAcrjNpeA7hKbnRy+O8qYNfdbmTCgyqOQFV1OtrfgUqnCWysr8RT9ihcNtln/nbYwx3mSv 8sRH3v5nvw+kTdqIv2tJNOP5dI3XABauNWVsMptv0kFYcvyMZk0Atd02+yPbtiaN9lmdeA mRHcIuevqQS7f3IRVDMjzrvoHCnDloXobYauEAmH3k29BGavxToy3CjSe9MFlAnkoNH0gt TEB+i8PYJ5PfO7gvpSOUTRwyQe9QxSZB1m36R//RtLaQBRfzG2c7V66zjpYDiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682052381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zl68p6PGc3/MYv9x5C/77gSOJu7ahzrBSunIl9q3aZs=; b=DkoU/PbSeltjWt5XNj4q9tFCxvUdVaMiAbZVGKUa5qbUu5vIyOb2omcHD2ci7jAWL6VA3K byqqtiIhAJQhx6Jh0lZsASWStIV+JnpKj/rdYVcTCyInxQjtfygTEPjU3ykE/KQP7RpDDZ OZ+z1B4iUJKZKiDAvH5gGOkYEapf8/Q35RdMs1A3R2rW+vC/Tu19GQ3AHlvth6F4OrPAhW vNdvN9Og8OhJRfejszfTM+eKzpY1Zt95hR715jvzseVGrXb8vHFDirtU1qcmaEhWck7yzc ifDR61Py2V/M1Q5xhZfhHoiMOmT0FB36PZYdv1t4q+X11tdJ57i0dbgqbz97ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682052381; a=rsa-sha256; cv=none; b=llkxFftFk5IBNbILDpMBFobOtsWXgkBsY5Q7biYQxE2EfArcbZgCaaEOwtz3Nt3NM+9k34 J7+Lasd/HgmfTN09qhpIRMFUTcjewKCNCvMWk7uj/Tg6B+/3WHjMczwxuIdRwWxOgcTc/G 0/UuNmrVvXuSJnXqUOlZy1/VcUYqjMMNT8jo8TfwIzOT+tfulp07ovFpMkN/uVUd5sl9m4 Z8TIN+bG9QCaVqRlqQSnjFXw1NcbKgcJM1mbBcMSDsgW6JnM7S/tfuC6fs1d5z4jtLPqmE R9rU6HMA3dZU044f4gpIupNr0uPSGgCn8HLyAy749DOrbIUs0DIpZFZBE1Vksw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2hn90h61z16NT; Fri, 21 Apr 2023 04:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33L4kLQE082010; Fri, 21 Apr 2023 04:46:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33L4kKQx082009; Fri, 21 Apr 2023 04:46:20 GMT (envelope-from git) Date: Fri, 21 Apr 2023 04:46:20 GMT Message-Id: <202304210446.33L4kKQx082009@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: 64040734ed6f - stable/13 - grdc.6: Add an ENVIRONMENT section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 64040734ed6f3e4eba87a57bcc137402156471dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=64040734ed6f3e4eba87a57bcc137402156471dd commit 64040734ed6f3e4eba87a57bcc137402156471dd Author: Gordon Bergling AuthorDate: 2023-04-16 09:17:06 +0000 Commit: Gordon Bergling CommitDate: 2023-04-21 04:46:09 +0000 grdc.6: Add an ENVIRONMENT section - Add an ENVIRONMENT section Obtained from: OpenBSD (cherry picked from commit 991360ba49707b84889e5bfce49dfbf383088171) --- usr.bin/grdc/grdc.6 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/usr.bin/grdc/grdc.6 b/usr.bin/grdc/grdc.6 index 5226a6b2a9c7..269b8984ec3e 100644 --- a/usr.bin/grdc/grdc.6 +++ b/usr.bin/grdc/grdc.6 @@ -26,6 +26,18 @@ The optional flag tells grdc to output the time in a 12-hour format. In this curses mode implementation, the scrolling option has trouble keeping up. +.Sh ENVIRONMENT +.Bl -tag -width Ds +.It Ev TZ +The time zone to use for displaying the time. +It is normally specified as a pathname relative to +.Pa /usr/share/zoneinfo , +though see +.Xr tzset 3 +for more information. +If this variable is not set, the time zone is determined based on +.Pa /etc/localtime . +.El .Sh AUTHORS .An -nosplit .An Amos Shapir , From nobody Fri Apr 21 04:47:04 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2hp03TjZz475cl; Fri, 21 Apr 2023 04:47:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q2hp02xX3z4LTd; Fri, 21 Apr 2023 04:47:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682052424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QUv7NY3rLD9fHCCBOb4U9Tkx0ygAzDzWHGAZH6edc10=; b=t4rbyf0edwui3MmuV6OaTxM52aOP8AD3rPubgOLrcVe5WnhDuH+IGRvkNvgYuNN95/zoY8 Kk6W3gF3jJ7NmJ4mWrwTAfRyckd8cpfNG9q+iXubKS9h2Ahq6RleK8u+UOl1wTiUMInVA/ /K+lW94pauf7z5JcPUTbdvFSUIRXm/Bf+6bkVBGbucDAGrVC/5UMXdX7dy1lKfiS91L4XZ QvH937GlvLlMskT4nKmu8ykJn7PzJOz+j+lQkslRe+ZXIVJx6a6WiM1XsQarXh1ZpZtAwr fIEYrCmG5+K/TJ7QcAJVswcbsU66nRNE/Qq6UptESvCJ2f+A0myBXkbxurUdog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682052424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QUv7NY3rLD9fHCCBOb4U9Tkx0ygAzDzWHGAZH6edc10=; b=es7MRREnxC6YxZ1o0hLgyTNbuUdU/2XsZmuyHDjZFL1pCkgwnVE+Ww0GDDhV5BSUBt0Pr2 1Gzlq8g3nh6jyBoHXDiEUeEGV0aCRYGomMQU5chXjz1p3TrRNBpv8H4dhNr7weDjtQ4vGm Cqus+WDsJjp8RQzUc1g8nBGfehc1Fov/V5QJnHQ7vCXJlMHuCqy7m0pPtEafCeBjVAi+Va t0+S9/A6guUuyhtW9gXD26+/yFJxhP8BiduKopapiXkcci8xacPYiSjdJHcv/eCCQ20g+C J9xVqc6ej5ZS42JCsvfNOp2BEGIR2HhleewUtPkEHV6rWCZBZHTTyHwfztBleA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682052424; a=rsa-sha256; cv=none; b=Q88YAUAFRMD/P4TMGX1ORol3xN+mwJ0iF8ccnH54ZFdGsYmqIH01IfZnIBO6VaYEiwG97V KqC0VmyCTia1B7sd5hUirBvATFozDyJQGEVjAfZ1NPpYAF9LDXVMHigvPb2fP2vrV5rUIT 9nmcPVl2ueVVMKBez93XyUJRaW8LR1Jc+SC7D/ixG/HLZGGoJ9bmwLJLlzGecR9ouvgo3d m0rNQuCyDpDQHUAuZswRWkcjnD7s30vDqlwUc1vyWg6zT2OJnWdIUOnNXdJ7M3b7qX9rUW YSsgcj2RENNi/R7pEK/E8CkbE3jTaF4saQF1MsmSk82iz/786mwGfqQ67KRATg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2hp01thvz168q; Fri, 21 Apr 2023 04:47:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33L4l4QC082222; Fri, 21 Apr 2023 04:47:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33L4l4mW082221; Fri, 21 Apr 2023 04:47:04 GMT (envelope-from git) Date: Fri, 21 Apr 2023 04:47:04 GMT Message-Id: <202304210447.33L4l4mW082221@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: b75fa8cba4c3 - stable/12 - mount_nfs.8: Fix a mandoc warning List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: b75fa8cba4c30e9ee80b20f6d4c6a91defc5d4bb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b75fa8cba4c30e9ee80b20f6d4c6a91defc5d4bb commit b75fa8cba4c30e9ee80b20f6d4c6a91defc5d4bb Author: Gordon Bergling AuthorDate: 2023-04-18 07:14:20 +0000 Commit: Gordon Bergling CommitDate: 2023-04-21 04:46:40 +0000 mount_nfs.8: Fix a mandoc warning - sections out of conventional order: Sh IMPLEMENTATION NOTES (cherry picked from commit c2a9d23736da3593bc7cc883f43d913188d79beb) --- sbin/mount_nfs/mount_nfs.8 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8 index a99ace2d1c82..7d65991e8892 100644 --- a/sbin/mount_nfs/mount_nfs.8 +++ b/sbin/mount_nfs/mount_nfs.8 @@ -471,6 +471,26 @@ options should only be used as a last ditch effort at improving performance when mounting servers that do not support TCP mounts. .El .El +.Sh IMPLEMENTATION NOTES +When neither the +.Cm rsize +nor +.Cm wsize +options are specified, the I/O size will be set to the largest value +supported by both the NFS client and server. +The largest value supported by the NFS client is defined by +the tunable +.Cd vfs.maxbcachebuf +which can be set to a power of two up to +.Cd kern.maxphys . +.Pp +The +.Xr nfsstat 1 +command with the +.Ic -m +command line option will show what +.Nm +option settings are actually in use for the mount. .Sh COMPATIBILITY The following command line flags are equivalent to .Fl o From nobody Fri Apr 21 04:47:05 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2hp15Pstz475LZ; Fri, 21 Apr 2023 04:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q2hp13gCwz4Lfx; Fri, 21 Apr 2023 04:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682052425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fu1KZbbk6i3deeUNt24QknofTp78ExkSLc/uVv8pV0U=; b=Vg3X5jG28Ivs0iPMjpuNQxAxx9ygZS6llTKPJqro9Mldy0+Rpxvv/P1c3m/xniTSaOGc+N my4eEoAQH7d1DsAwqW7MunWjhi7/hxOF45waMPSuZNiFTd98GCwxq0Yew+Ci/6nZHipdT6 Nd6oAFONLKLQLoyAD6RaAylOtWQ6XophJ1jyUf4kpWUv3vX+ge3QaivIfCy6+oGIMXUCBM Ubvm6u2C2qcRvO3aLbk/eAKaBUh5Q6WyBAsjnL+bsxMnFJw8Zx6WliZtJ4ltwn2gzSYgHJ jf4lWkkStpbARF9HnDX2QeeWhn4BfhsiiEetg+qw7rRjKFcv3AbrcEzYG/LJTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682052425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fu1KZbbk6i3deeUNt24QknofTp78ExkSLc/uVv8pV0U=; b=KC0wTTdyN432iCQd8NAG73Ch4acXBgGNKYwicTCxGps1Ze7OYxU5KePsR6H75HsRshxQKp MeiXQ9BBzE1oaNOMh9gOiSCugMR/zQkVlnaEz4fU6bIOgVjN5u3CcUsUKvXsYPcFENo2YI ynElPV8Kqj4RGYXICJcwzpd6M9qsChFO/HHsa4BN2jw2eaX8Z6gBcLz77gzp/zhu3VP/M6 SecmOrvHUvVbdWBuoN9A6j35cYy4D1UCm6CCk7q48tU2f2rdSXZ3fPa6tXuHHEtsbQw1eB GjyF+i31anpuy0cQ2G9YmDjnn/KZnmDx4rg6YPjZBMsRctuMbHa2FkTx5qDAEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682052425; a=rsa-sha256; cv=none; b=Cn8pbIWv9RTP1ZHDzv/5ZuqKEdlBfkDPIPlD8U3hTLdLJGg7Df0i+HRGJeElzUYtDwVPgs gQR2SP3WZ5pjW3SvCZ1XOv9f0ewxQQcFJaGs6n3pTcwjXtose4VhcI0qZKAIvT9RpwY4uo Cbz3WoWp9aapdhjQLKhxAcZaINGo1/V4CfGRtDnZ3M/PxANRItAthuDnDzO74Cf+QbnT0Q x05Lc4lqnqmL40sn3K6ZH7rzlGL5u9ahOr8jQ5/YnpFjNXLQ0MN7fHMmRc2zRR7Bj0DPH7 fIyBhFkewmpuXi8cBphjI4CZzdTXMlmTYxyUPWv6yPAQ1yIetBQytTQ/bdC90A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2hp12kH6z16NW; Fri, 21 Apr 2023 04:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33L4l5tj082242; Fri, 21 Apr 2023 04:47:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33L4l5KT082241; Fri, 21 Apr 2023 04:47:05 GMT (envelope-from git) Date: Fri, 21 Apr 2023 04:47:05 GMT Message-Id: <202304210447.33L4l5KT082241@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: 3c5b9739552c - stable/12 - morse.6: Mention to standards in the SEE ALSO section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 3c5b9739552c9e2afdbfb015db2288bfa9dc2199 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3c5b9739552c9e2afdbfb015db2288bfa9dc2199 commit 3c5b9739552c9e2afdbfb015db2288bfa9dc2199 Author: Gordon Bergling AuthorDate: 2023-04-16 09:46:09 +0000 Commit: Gordon Bergling CommitDate: 2023-04-21 04:46:49 +0000 morse.6: Mention to standards in the SEE ALSO section Mention ITU-T Recommendation F.1 and ITU-R M.1677-1 in the SEE ALSO section. Obtained from: OpenBSD (cherry picked from commit 82a036d86acaac75b1ff6d4f8b767bbb117694f1) --- usr.bin/morse/morse.6 | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/usr.bin/morse/morse.6 b/usr.bin/morse/morse.6 index bf339563589b..d2ce30eddb82 100644 --- a/usr.bin/morse/morse.6 +++ b/usr.bin/morse/morse.6 @@ -29,7 +29,7 @@ .\" @(#)bcd.6 8.1 (Berkeley) 5/31/93 .\" $FreeBSD$ .\" -.Dd January 5, 2018 +.Dd April 16, 2023 .Dt MORSE 6 .Os .Sh NAME @@ -178,6 +178,17 @@ device file .El .Sh SEE ALSO .Xr speaker 4 +.Rs +.%I ITU-T Recommendation F.1 +.%R "Operational provisions for the international public telegram service" +.%O Division B, I. Morse code +.Re +.Rs +.%I ITU-R M.1677-1 +.%R International Morse code +.%D 2009 +.%U https://www.itu.int/rec/R-REC-M.1677-1-200910-I/ +.Re .Sh HISTORY Sound support for .Nm @@ -191,7 +202,7 @@ Ability to key an external device added by Farnsworth support for .Nm added by -.An Stephen Cravey (N5UUU). +.An Stephen Cravey (N5UUU) . .Sh BUGS Only understands a few European characters (German and French), From nobody Fri Apr 21 04:47:06 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2hp265MTz475PG; Fri, 21 Apr 2023 04:47: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 4Q2hp24jdCz4LdJ; Fri, 21 Apr 2023 04:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682052426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fsh6WmdLldvIDTWLmvfOUL1+Mvn3bqqt3S0gKYF/71U=; b=QkJslvcS4ZyhcT3FCxfRj01p0IIHmnkVy7beBckwed79kK/CnnAg3rpFtxbLhi074bEQ1Q mSdiRCfxA96Kj7SVM/YYwqv5N5fjOKDdEwREUoMRnfmHBAS+Oerx3nxgTA+rE963J+JX6J 3rXkUyXxbdWPHt4BICfQV/Wclk/JGo0Z6PuZnpqaA9BQ8sMjQuc4aAqJ0MyGo2nMCUIrEg zPrGzejYNDYNicjaI3JtCntQTuRCI3FsDSDnnklSH9fMP1pCpMbtUxU8cpBBZ4v0dgGurz SvpyJ9ZQLBnwmF2qWUVNEj0wNjmaF8+X7HBk/XVVU4TJHV523xn0fR73TYFWgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682052426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fsh6WmdLldvIDTWLmvfOUL1+Mvn3bqqt3S0gKYF/71U=; b=cVDgDXHaasyhuWmVewppjG8zkZCodutOLY6wJ2AyyFzKXTdks6BvbXTCWI36NYFwl4xWkv XxHlosjgf5B4QgEBFiIaOwBn98TQBd2pFBdrjGfCVF4Oz3QY/ye+n1eubKYO9ZI4ZQjFDV zofPgDytOYPqnsu9yNGwZdhhOhjLtSU22gM8E+/FBZ9m8VzPSvWl6VI5T579athcF+dG3H YqxZRv9ivxL9M0iBZm9dUvju1U4xyYhQuCo1eNfwJzRKX/nQQ5JVpONdh2+amCmJ1gwUjn /Zh6oApLIuNJbrlvCs+XmW43jNXAtBzg4No3A09Bwx4iZ1G/9FBKlvpVaBQmcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682052426; a=rsa-sha256; cv=none; b=w/CrBlmhd1Moo2/kCdFQwoTyhJ/x47chrD8nTrHGonhbLMpA0i00qTSt4p6+YQydUjYczc vgXxEtf6Q42eW0U6n0p6FO36ta2nMcNWs+Mv9xRuRj3HMbTagLZdyQPwYzgGWYga20hYBT NdM8TuBVm5+BiuvlyoBaJklBjyi+uJ3XZ0/lzfPM4o5iXkQx/iEBCSZqbUyvpl2QJDfWMk IA1c0S0DqaslAm78l0hNRUnCRiJlkirh7TfexpQS9wmvWNiZrKmU5utKmU1cdOvc6Hdy2j KPklSr6hxesn9xlsxAAF7fBUjc/H1sdClodyTviEZcD/n/ktz8qrmvbz3j1yiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2hp23SyNz16NX; Fri, 21 Apr 2023 04:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33L4l6MK082262; Fri, 21 Apr 2023 04:47:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33L4l6Nc082261; Fri, 21 Apr 2023 04:47:06 GMT (envelope-from git) Date: Fri, 21 Apr 2023 04:47:06 GMT Message-Id: <202304210447.33L4l6Nc082261@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: b5a5ddaa4c2e - stable/12 - grdc.6: Add an ENVIRONMENT section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: b5a5ddaa4c2e6c2d813e1662df4b2f8ac941c61e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b5a5ddaa4c2e6c2d813e1662df4b2f8ac941c61e commit b5a5ddaa4c2e6c2d813e1662df4b2f8ac941c61e Author: Gordon Bergling AuthorDate: 2023-04-16 09:17:06 +0000 Commit: Gordon Bergling CommitDate: 2023-04-21 04:46:56 +0000 grdc.6: Add an ENVIRONMENT section - Add an ENVIRONMENT section Obtained from: OpenBSD (cherry picked from commit 991360ba49707b84889e5bfce49dfbf383088171) --- usr.bin/grdc/grdc.6 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/usr.bin/grdc/grdc.6 b/usr.bin/grdc/grdc.6 index 5226a6b2a9c7..269b8984ec3e 100644 --- a/usr.bin/grdc/grdc.6 +++ b/usr.bin/grdc/grdc.6 @@ -26,6 +26,18 @@ The optional flag tells grdc to output the time in a 12-hour format. In this curses mode implementation, the scrolling option has trouble keeping up. +.Sh ENVIRONMENT +.Bl -tag -width Ds +.It Ev TZ +The time zone to use for displaying the time. +It is normally specified as a pathname relative to +.Pa /usr/share/zoneinfo , +though see +.Xr tzset 3 +for more information. +If this variable is not set, the time zone is determined based on +.Pa /etc/localtime . +.El .Sh AUTHORS .An -nosplit .An Amos Shapir , From nobody Fri Apr 21 10:11:28 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2r0J5yH4z46CJT; Fri, 21 Apr 2023 10:11: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 4Q2r0J5Tv1z3Mtx; Fri, 21 Apr 2023 10:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682071888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qyHUJhNQVcUATMAtNCrP7ogz3hITgzR/Q3HbtxyzOAc=; b=sD9kEDQLoyr2sJO5rW77pxSudQuehvQ+VwsDsJrRcYgqYD/LMK7QCjaXtsZO84bjtCTPhx HYIcpg7FMhWOQ8mCT9JjNuJ3nOWcrPd0/niYKn3n5gOWnqbXr4ysO91n3XNrIHHF5pa1zu MXkh55ONWgHrA0mm78Uhzq/uIN5keLNfX5bboe8/Gr4fMdaLsFZ59FdvNFkYKleoLnOkMl ivkS/ODS9zCMDEyb6sUAhCyQTX36e5u3RXKXGHZnhAEfKc8322hxSwDycHy7iI6dCs9kQ/ KVrQ/C7oFykWXAugJtyJF27pCN11vIAqLn1eSBKj9RF4sVoHiATos5GtL3g/pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682071888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qyHUJhNQVcUATMAtNCrP7ogz3hITgzR/Q3HbtxyzOAc=; b=ApbrLzi4yiYzEPPZX4f6dx1LZk13ajC+JLOLz9TzonFrUhlkHQHlUfk3p0L91T1CZna+N4 2L8VQIvI5UXinTuxaKBGSACEMn1ajOfzcM1dDUsjCOm1Cuyvx+q/iqfn+Y2+PxiYDjFkYN PSLTUjlTOg/CrOJsEV6mWb9A7lQULAvipvxVFxE61CdZl0fjUr8ocl09fm0yal+4lIVWmd SfdoV+As2AbqW6sYb4eYdcLmnPiJEzgIrpvFEkGCA1wXvKE0+cjPH0FMPUdSKHat8EU9TV qxyZHDi/GvvaInWHUz43H41h7EQfsRDB3q2WA1FXzMbU2YitEtVKIc9/J9EhZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682071888; a=rsa-sha256; cv=none; b=ZFmK71tX8zer/FmLRMT65HbrXVMiVoauWvajNjB5JWLfLqFspPQ4XiCIx8oy/rXLFBxLcb HkhN8d1tIFEVyLnZRYmyZfjVcSpwGO+jPKKd3JZso6EKleHeOgxNIJzAFirFGViy3Bvq+A odpcqPX8QfULDEEWXTjSlnmdUCM5o6K75w0hUusjejoqK8V7g3AOXDYKUjX2Q11HcPn1tl 0Zmj+n2T9KMCFVlyymuUqr33CjQqDrkyQ6A7RfNnlzE/bpcD3ZhC3rDIxO4SqBGti2Yx3L AcaaBCjJsdeMIjZ+11mD+VxqeM7VX0pNXVDHEW1u0dETEn/jQ8I58zkzoeSkVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2r0J4Y8szGW3; Fri, 21 Apr 2023 10:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LABSxx020329; Fri, 21 Apr 2023 10:11:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LABS3I020328; Fri, 21 Apr 2023 10:11:28 GMT (envelope-from git) Date: Fri, 21 Apr 2023 10:11:28 GMT Message-Id: <202304211011.33LABS3I020328@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: e74e0dc9b018 - stable/13 - infiniband: Opt-in for net epoch List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e74e0dc9b0185e3b87a9b62161406af74cd0a56c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e74e0dc9b0185e3b87a9b62161406af74cd0a56c commit e74e0dc9b0185e3b87a9b62161406af74cd0a56c Author: Zhenlei Huang AuthorDate: 2023-04-05 16:05:02 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-21 10:10:11 +0000 infiniband: Opt-in for net epoch This is counterpart to e87c4940156c, which did the same for ethernet. Suggested by: hselasky Reviewed by: hselasky, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D39405 (cherry picked from commit fc6c93b6a5cf14cbc099f550f745d63779499fec) --- sys/net/if_infiniband.c | 9 +++++++-- sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h | 2 +- sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c | 6 ++++-- sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 2 +- sys/ofed/include/rdma/ib_verbs.h | 1 + 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sys/net/if_infiniband.c b/sys/net/if_infiniband.c index 9bf4756f2556..fc8ce08e0260 100644 --- a/sys/net/if_infiniband.c +++ b/sys/net/if_infiniband.c @@ -409,9 +409,13 @@ infiniband_input(struct ifnet *ifp, struct mbuf *m) struct infiniband_header *ibh; struct epoch_tracker et; int isr; + bool needs_epoch; + + needs_epoch = (ifp->if_flags & IFF_KNOWSEPOCH) == 0; CURVNET_SET_QUIET(ifp->if_vnet); - NET_EPOCH_ENTER(et); + if (__predict_false(needs_epoch)) + NET_EPOCH_ENTER(et); if ((ifp->if_flags & IFF_UP) == 0) { if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); @@ -501,7 +505,8 @@ infiniband_input(struct ifnet *ifp, struct mbuf *m) /* Allow monitor mode to claim this frame, after stats are updated. */ netisr_dispatch(isr, m); done: - NET_EPOCH_EXIT(et); + if (__predict_false(needs_epoch)) + NET_EPOCH_EXIT(et); CURVNET_RESTORE(); } diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h index eb1cb87dc888..2c63b8e0117c 100644 --- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h @@ -459,7 +459,7 @@ void ipoib_reap_ah(struct work_struct *work); void ipoib_mark_paths_invalid(struct ipoib_dev_priv *priv); void ipoib_flush_paths(struct ipoib_dev_priv *priv); -struct ipoib_dev_priv *ipoib_intf_alloc(const char *format); +struct ipoib_dev_priv *ipoib_intf_alloc(const char *format, struct ib_device *ca); int ipoib_ib_dev_init(struct ipoib_dev_priv *priv, struct ib_device *ca, int port); diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c index 0982af9fb904..a1a457804169 100644 --- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -902,7 +902,7 @@ ipoib_priv_alloc(void) } struct ipoib_dev_priv * -ipoib_intf_alloc(const char *name) +ipoib_intf_alloc(const char *name, struct ib_device *hca) { struct ipoib_dev_priv *priv; struct ifnet *dev; @@ -923,6 +923,8 @@ ipoib_intf_alloc(const char *name) } if_initname(dev, name, priv->unit); dev->if_flags = IFF_BROADCAST | IFF_MULTICAST; + if (hca->attrs.device_cap_flags & IB_DEVICE_KNOWSEPOCH) + dev->if_flags |= IFF_KNOWSEPOCH; infiniband_ifattach(priv->dev, NULL, priv->broadcastaddr); @@ -977,7 +979,7 @@ ipoib_add_port(const char *format, struct ib_device *hca, u8 port) struct ib_port_attr attr; int result = -ENOMEM; - priv = ipoib_intf_alloc(format); + priv = ipoib_intf_alloc(format, hca); if (!priv) goto alloc_mem_failed; diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c index 1ea5cdb1a319..0256c3ee06c9 100644 --- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c +++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c @@ -89,7 +89,7 @@ int ipoib_vlan_add(struct ifnet *pdev, unsigned short pkey) snprintf(intf_name, sizeof intf_name, "%s.%04x", ppriv->dev->name, pkey); - priv = ipoib_intf_alloc(intf_name); + priv = ipoib_intf_alloc(intf_name, ppriv->ca); if (!priv) { result = -ENOMEM; goto err; diff --git a/sys/ofed/include/rdma/ib_verbs.h b/sys/ofed/include/rdma/ib_verbs.h index 697dc3fbc98f..21ccfa6b08ad 100644 --- a/sys/ofed/include/rdma/ib_verbs.h +++ b/sys/ofed/include/rdma/ib_verbs.h @@ -229,6 +229,7 @@ enum ib_device_cap_flags { IB_DEVICE_SG_GAPS_REG = (1ULL << 32), IB_DEVICE_VIRTUAL_FUNCTION = (1ULL << 33), IB_DEVICE_RAW_SCATTER_FCS = (1ULL << 34), + IB_DEVICE_KNOWSEPOCH = (1ULL << 35), }; enum ib_signature_prot_cap { From nobody Fri Apr 21 10:11:29 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2r0L0vHPz46CWp; Fri, 21 Apr 2023 10:11: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 4Q2r0K6NlTz3N2Q; Fri, 21 Apr 2023 10:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682071889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MpP3J0Rex//8JQ6D1tFILHbewTLcdL1iKVuX8muzB6Q=; b=BnBCeHygriI4ddR4T5s68Ot6GbGc8LH068G13yOdl584vpTDNTvb9nLzLGEQAmRbTO65IM 5xklQRd8nGYZouM9LiN9WoO5Iw3hCDELpQdG+YKyHahQCuxHh9KC7E60nvYdLppago2Oo+ TAXFswuIDli9jAw4tlKikb807jDztTW9uqWLDIejjjzwjjMXCunNQpYxlWQzsSvohy6j23 EBPbOVvJumCzEYvjR0s+xoT1Xz+rQK7IVfrmkdeBzlJG+fZwToRHJrTGf7QHdoxDML2FRZ i1ks7v20iH/+CU1wuNwKUVoS4F+oIgKV6up9nDzyXSzI2VhySdJLteCgpDWEvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682071889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MpP3J0Rex//8JQ6D1tFILHbewTLcdL1iKVuX8muzB6Q=; b=cXZrX4A2c26Cr69hrPgeq6cGfwpCMPTySIKOxgyINqjRQHEf33xoyAOOddnGyXCC+3QQHS q4MovBKULURMOJdF1PXqt7/uIvJNdiyyD5e2DDniPBdoybFVRygDWnvZ7IXywhrHRwEpQP a7SAvAqwiWP4lLzJJthMQyB45KH1ykQLTQ+DaZnc5zXQdAHuGWNx8b3I7FGiIeVyVpIc5g ClrFiLXww9sJrtduaZluL4s5zBuTgI+myxi5cr58DAE5BAwKC7n7NzNQA2NUW4ejALjcxC hgRs4U6q3REaWWn3Oj8tRqf/OPI/WA7W48jM3gOvERGK1/kFh51HinZ/RkpO/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682071889; a=rsa-sha256; cv=none; b=gD9W7Tc3vYcBWITSwNzSrOh5HyexQEckcA1AB3+gIffbt2Ews3y5g0YHEizG84XdOSH4GY ndgCEt05huQTQ7gS7i/RYqYbvk3eNkNKlyAt0tmAe7vJqIL72b266VCompojpyWQ3Kf2yp JKjQs8op7KcZQaOSdNoGYGUMuHxz1qwZ1TkS2fzbgrF/+Mc84HGUAZNdReGDH8nlzlL6xh ++9zB1UDAwz8eCo0S1xNCzCUkKgRIAUAoZU8dy5FrTXroW2KFhWPvypgQSgVj6oSAZBdWN vrQ1xxrhTCs521j0TlXJ4u9f7S5qywZo7a+4mkBHu5LfeELtezr8AxDDN2EbvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2r0K5VnZzGjh; Fri, 21 Apr 2023 10:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LABT4p020349; Fri, 21 Apr 2023 10:11:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LABTXT020348; Fri, 21 Apr 2023 10:11:29 GMT (envelope-from git) Date: Fri, 21 Apr 2023 10:11:29 GMT Message-Id: <202304211011.33LABTXT020348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: a023d986e462 - stable/13 - mlx5ib(4): Mark driver knows net epoch List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a023d986e462ff12d2316842ceb8a5bddddb3b93 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a023d986e462ff12d2316842ceb8a5bddddb3b93 commit a023d986e462ff12d2316842ceb8a5bddddb3b93 Author: Zhenlei Huang AuthorDate: 2023-04-05 16:06:15 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-21 10:10:11 +0000 mlx5ib(4): Mark driver knows net epoch This driver has already been EPOCH(9) aware since e48813009c6a. Reviewed by: hselasky Tested by: hselasky MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D39406 (cherry picked from commit da4068c4e1a090915a1a763c0d9fa5dc5b80842c) --- sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c index 1d4842160d4a..b509bc9982fc 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c @@ -680,7 +680,8 @@ static int mlx5_ib_query_device(struct ib_device *ibdev, props->device_cap_flags = IB_DEVICE_CHANGE_PHY_PORT | IB_DEVICE_PORT_ACTIVE_EVENT | IB_DEVICE_SYS_IMAGE_GUID | - IB_DEVICE_RC_RNR_NAK_GEN; + IB_DEVICE_RC_RNR_NAK_GEN | + IB_DEVICE_KNOWSEPOCH; if (MLX5_CAP_GEN(mdev, pkv)) props->device_cap_flags |= IB_DEVICE_BAD_PKEY_CNTR; From nobody Fri Apr 21 10:11:30 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2r0M0cWwz46CQD; Fri, 21 Apr 2023 10:11: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 4Q2r0M02GDz3N84; Fri, 21 Apr 2023 10:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682071891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ABGSZAU3ESlR/NsEopF9TM3Z3eZBNi4DDxsDW/CMqM=; b=RQilFeU44F9RsbBluP4ba4VBC8XPJeMgAvNEL6dum6FhIGcb4OBcfD0R7cCgGjUJBPnG5x mgYPU/qKC0emxagVzFFFk138sRPAlMl6ArEBl5SFdf4Ah2LzL+61ziFEuDyHAgkdVzYJD+ xODsAOCty6HDSDtIJ59Yon0mI0GkVu5Gkbj4R5VI/OHMGU6l1l7E+QiNlSxendPYVxiQfw P1f1nmB1os+M1jp4ZCOi5KmCbcemvK1BkkxH4pHoKnp5pa7Axafk6EInzrF3iAxO1D3tKy gDdLTC/K/7uQeJxTjV9FsROHE+WDTIMT1SlwwcAMI0mXOfD5g0jn2lwqoHieQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682071891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ABGSZAU3ESlR/NsEopF9TM3Z3eZBNi4DDxsDW/CMqM=; b=F3ecFuv23/X6CuOWQ59oJ0sZ1cshV2wl+IChTkwdZDpWTORZimKHNteP0AKSVVVprB1D41 dzwQ/Ww5JXeDorV0Tea4ulw2GMgn7zwcnbREhOedSIza9CWoHZ+4I3Ijj9+0guBfWo4Dk1 IhzNOvJg6QCHy7taYqnRrsuDnEOvm5WNz0FfUnNWUn8QHixDN83FmxwFVhbdUw7yVLKrxR 3+9HGLrsgw1oXfrkhP2xXrFpQd7Y0MbABEs51Zcg6wfRlwN/DRvGpwwh1WBQXGWj2gbMWX VzZ3/p/I3Aw505P9gAYr/Y9/eOhCS7ClEFJhTSTBxcJn5XQXylHEoH09EqUqjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682071891; a=rsa-sha256; cv=none; b=GBjLn2ERYNXU2Ftpb0qQwVGAJ/te3OcHeSz4gy99B/irp/bAWkWnuF0vMeb9E8UK0J3SAC oN42VRRj8yPrwAEMfRSmbZPNLZz9iZYyeQJNPh3hOnGOdtfiwfDovQyCU8J4V4lFwrs/FX atxYkbptWbBVo1oExiShEsgXD+I0NAb9lVVczTp14qCP/afBiPPKyrx0jF9NSFrZ2xVAZG qozLT5/5sCKidUSvOSFeYgUsUBQPos5/2XpaN6y+nkkINKNtQ7+z05fvWcKDUIWFrHTd0r AYf2plOAwQdF7V4VyMSTo6D4YUWBoCqoLBfHKV+bXVTEjeOgBxnVeYp7GFDg0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2r0L6DrkzG8C; Fri, 21 Apr 2023 10:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LABUDJ020368; Fri, 21 Apr 2023 10:11:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LABUBE020367; Fri, 21 Apr 2023 10:11:30 GMT (envelope-from git) Date: Fri, 21 Apr 2023 10:11:30 GMT Message-Id: <202304211011.33LABUBE020367@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: fd635d87ad35 - stable/13 - vnet: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fd635d87ad35bda209e29303167dec8c9ed48847 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=fd635d87ad35bda209e29303167dec8c9ed48847 commit fd635d87ad35bda209e29303167dec8c9ed48847 Author: Zhenlei Huang AuthorDate: 2023-04-17 10:24:35 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-21 10:10:12 +0000 vnet: Fix a typo in a source code comment - s/form/from/ MFC after: 3 days (cherry picked from commit a7acce3491987c116e607697a4906807f4ea1c10) --- sys/net/vnet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/vnet.c b/sys/net/vnet.c index b46ed9e270e0..057043808031 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -245,7 +245,7 @@ vnet_alloc(void) /* * Allocate storage for virtualized global variables and copy in - * initial values form our 'master' copy. + * initial values from our 'master' copy. */ vnet->vnet_data_mem = malloc(VNET_SIZE, M_VNET_DATA, M_WAITOK); memcpy(vnet->vnet_data_mem, (void *)VNET_START, VNET_BYTES); From nobody Fri Apr 21 10:11:31 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2r0N2FlFz46CJb; Fri, 21 Apr 2023 10:11: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 4Q2r0N1S1Hz3NMp; Fri, 21 Apr 2023 10:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682071892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oHhKLF+dXbS9g0J3Rgi4NdWwrctiJMdvK4oyveE7EA4=; b=RBqWVvnFNDRObXRxktX6qt3a6M62RTzfrBu2D85Boqy66S5a2vmqoBoUIvYjvpwF8iRH2k hmzkiogGhwclPiCZ8h22lR1AkeY7Dg7dmywEwzbSKPbuWEPhUqguLZknFqmU0jeiASBXjQ DLMg/Gjcd3a65RF/loO22v7ygxOUChovBdI7pn+cl+9DDDKFJZPbE4hcIdL8W0FbQCgQTO cA3P6pId7XyeGCejBcqQcM+6YDE0gg/wSbyTjX1fc2tUxnEu4sbkwUFdQEQndLQ+BKLdXD s9o4+RGtTBpGx3AbRFEWp300G4o2CVZMrdno12miv4T/GIp9/TPZXVU6Y4rYTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682071892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oHhKLF+dXbS9g0J3Rgi4NdWwrctiJMdvK4oyveE7EA4=; b=ncalg0DURFxkVkBbyTR/gvi1A75Ace/KWUH/EOHbfVfbYlh0HgJbzikFGP5RAwrTsI/p0N o7HhKzc50CNCBNkujZFkWhyXd9aX6QSNdxRkqWTf8tQjZo5lk37tlOdv0ohyOvpI7fC5VN UeF4UjlsfIF8cdiT6alW4943OGH8ZYAVeYiElgtD9Gw6hmFZ/8BB/9Sw1hCXUjfamylttg aqCQWIW0MFtd70Aykj1oNKi+cLhif7XEEB8yJdRHxKGZSvO31hbAJhxSxxK2JxIkE87ZG6 arJ+xTGzpaqs5uvcd2xpOemUqkSclvKzy6yZqTzc/byFC5WUUDn85ZEXSLSoVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682071892; a=rsa-sha256; cv=none; b=OK5aLwWdbdBxmD/jy6Y6VJPjit/PPIbpgvupEdFDBpG9WfwNp7jaKt1v9SwDxO6mkuY420 OXK04MYuyvBVO6M9gAWo0kB/qdJkfAVYiMJKm4+OuPF5RzbJnUCZaXmKH+OPl8PZZzAdAi sZaYjR8wmfSIE61qwY69NDQjOIxTcRyXICiksvlkhjtDq+qAHe+B8Mt9fBZUqJtFhpUzXB FwattZnvj4QN7U63Rn4doLC+yWLjlYAKeBien6lSNlwZfQCAnepAkFxbnkdIW74qY5QHsy pEWky2Sz1bHfLVJrmMmX/4ryxjkgLg2kHcge1tH7PMrfF01aRkAvBFZBcYmKIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2r0N0GYnzG8D; Fri, 21 Apr 2023 10:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LABVgb020387; Fri, 21 Apr 2023 10:11:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LABVs5020386; Fri, 21 Apr 2023 10:11:31 GMT (envelope-from git) Date: Fri, 21 Apr 2023 10:11:31 GMT Message-Id: <202304211011.33LABVs5020386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 774a2ee9ad7a - stable/13 - lagg(4): Correctly define some sysctl variables List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 774a2ee9ad7a512c5faf0fc30b13aa1de33ceb2f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=774a2ee9ad7a512c5faf0fc30b13aa1de33ceb2f commit 774a2ee9ad7a512c5faf0fc30b13aa1de33ceb2f Author: Zhenlei Huang AuthorDate: 2023-04-17 10:24:35 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-21 10:10:12 +0000 lagg(4): Correctly define some sysctl variables 939a050ad96c virtualized lagg(4), but the corresponding sysctl of some virtualized global variables are not marked with CTLFLAG_VNET. A try to operate on those variables via sysctl will effectively go to the 'master' copies and the virtualized ones are not read or set accordingly. As a side effect, on updating the 'master' copy, the virtualized global variables of newly created vnets will have correct values. PR: 270705 Reviewed by: kp Fixes: 939a050ad96c Virtualize lagg(4) cloner MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39467 (cherry picked from commit 401f03445e4aa42960e337604560593c7096e589) --- sys/net/if_lagg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 687c07971d60..55d68bbde226 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -278,22 +278,22 @@ SYSCTL_INT(_net_link_lagg, OID_AUTO, failover_rx_all, CTLFLAG_RW | CTLFLAG_VNET, /* Default value for using flowid */ VNET_DEFINE_STATIC(int, def_use_flowid) = 0; #define V_def_use_flowid VNET(def_use_flowid) -SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_flowid, CTLFLAG_RWTUN, - &VNET_NAME(def_use_flowid), 0, +SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_flowid, + CTLFLAG_RWTUN | CTLFLAG_VNET, &VNET_NAME(def_use_flowid), 0, "Default setting for using flow id for load sharing"); /* Default value for using numa */ VNET_DEFINE_STATIC(int, def_use_numa) = 1; #define V_def_use_numa VNET(def_use_numa) -SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_numa, CTLFLAG_RWTUN, - &VNET_NAME(def_use_numa), 0, +SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_numa, + CTLFLAG_RWTUN | CTLFLAG_VNET, &VNET_NAME(def_use_numa), 0, "Use numa to steer flows"); /* Default value for flowid shift */ VNET_DEFINE_STATIC(int, def_flowid_shift) = 16; #define V_def_flowid_shift VNET(def_flowid_shift) -SYSCTL_INT(_net_link_lagg, OID_AUTO, default_flowid_shift, CTLFLAG_RWTUN, - &VNET_NAME(def_flowid_shift), 0, +SYSCTL_INT(_net_link_lagg, OID_AUTO, default_flowid_shift, + CTLFLAG_RWTUN | CTLFLAG_VNET, &VNET_NAME(def_flowid_shift), 0, "Default setting for flowid shift for load sharing"); static void From nobody Fri Apr 21 10:11:33 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2r0P2xw9z46CZJ; Fri, 21 Apr 2023 10:11: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 4Q2r0P2FtQz3NfP; Fri, 21 Apr 2023 10:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682071893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8hDnsxT7qHyBPCgjyNdCKFyPJJUQx1v+GhNEff+woK0=; b=yfY/a181W9w+dqzZ/ar+8gPJn4EvSK1lxZSxzaWvNwgzeHVdm8fzKXjl5kL8wqDH1uaBPl hwKWfmMcBbS4e8em0AEM5zgk6bcR0sIt0nnfYRD7mwoLA4pE8kwwXtVOn+1/Py+N7s3TXq +kn7ODgdImDD3/s7XOEgWayZ8oCePJvuVPLa3jPqLPRpbWOhHSD0yi6QuLLqxg4jKTPyrl mihanCYdHaQfTlIacTplDwLKMbjzlRNAKVyOHm+vJNqFxfZdUkMQSj+ltf0r7IetsAhBcG AT9ut35xQLbw+do55wkxYgC6ErkU/0kGjyqetJc9+ItNzab/a7Dw6mtLcSpjjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682071893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8hDnsxT7qHyBPCgjyNdCKFyPJJUQx1v+GhNEff+woK0=; b=g3i9T8PVVy0QHTB/FLZbv1ogH4eynliTYWzLtUYNg5fB/M9OZsf0vA9FWfRK128IWtOY1e wpPtFvgMQwwMp0P/1LU9VXLjOzT+7m8MZcu/raOvrrmcf/lRtRFh4m/Xj4i4qF5/WyYIYG RTopn5xU+fkHPBUyxqaarzZGS0M+7kU9C2u1QjbSu6HrU0X8yNU+E40DRbRF2MaQ+aGKIP Hj7tu3uR/4buk9oxSunix/oiVD5ZXUpd9vumhubgPQ1ca3SebdfYb+lpLPDJll/kMYE14g okJwk2n6tQIvWE69NVYC5d5FzaKHxD7AZ141+Kc9WgftqCIX4B7vqFDryIcqjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682071893; a=rsa-sha256; cv=none; b=fvQjAOH+S9yJp2tRvH+kfSepGSBHYTqflpG63GJ27cqzQISlcGbGnKp5ujsQ+YwGN0QpK+ CUyaafpF0GnIPJKMQaBvkIzj1iUkPYrxecXtVOtCjsEtg3fBqy0VPN2jAs763oJb9WLK/F Whf/ye2RPj5ZIkSKo9Uof/5ZLRw04o4126cy6pI89EI1kXnNKd/7X7wDC7WbPrxRD6NN+G 55vdYI1z40OXaI8XTM3EGN7hlMmRhjDR9BeXw2V/v82AD6PYl56ZsLXQ+P9ggLbAgJABOq FPDokitu6MBbryRVXkVFIl1zmNSW1iaF+ao2o14dRdEo3HxD1odtVkVKCQlPhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2r0P1CG7zGg1; Fri, 21 Apr 2023 10:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LABXoL020412; Fri, 21 Apr 2023 10:11:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LABXsq020411; Fri, 21 Apr 2023 10:11:33 GMT (envelope-from git) Date: Fri, 21 Apr 2023 10:11:33 GMT Message-Id: <202304211011.33LABXsq020411@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ff7151058e51 - stable/13 - printf.9: Update the use example of the %D conversion specifier List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ff7151058e51902989b05f39a0569224dae54245 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ff7151058e51902989b05f39a0569224dae54245 commit ff7151058e51902989b05f39a0569224dae54245 Author: Zhenlei Huang AuthorDate: 2023-04-14 10:08:56 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-21 10:10:12 +0000 printf.9: Update the use example of the %D conversion specifier The output of hexadecimal bytes are in lowercase. Update the example to reflect the reality. Reviewed by: gbe (manpages) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39543 (cherry picked from commit 722b7589cca704670c3c532bdd0f5d46675df085) --- share/man/man9/printf.9 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man9/printf.9 b/share/man/man9/printf.9 index 4d3a6fb8b2a5..33347fb135ca 100644 --- a/share/man/man9/printf.9 +++ b/share/man/man9/printf.9 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 9, 2020 +.Dd April 14, 2023 .Dt PRINTF 9 .Os .Sh NAME @@ -164,14 +164,14 @@ printf_test(void) { printf("reg=%b\en", 3, "\e10\e2BITTWO\e1BITONE"); - printf("out: %4D\en", "AAAA", ":"); + printf("out: %4D\en", "AAZZ", ":"); } .Ed .Pp will produce the following output: .Bd -literal -offset indent reg=3 -out: 41:41:41:41 +out: 41:41:5a:5a .Ed .Pp The call From nobody Fri Apr 21 10:11:34 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2r0Q4bdTz46CMY; Fri, 21 Apr 2023 10:11: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 4Q2r0Q35HDz3NRC; Fri, 21 Apr 2023 10:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682071894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SrndkCv5XNJMNoPBbEbxGm64GvWtC9kUJ7V8L4woeM8=; b=oBSkkKN/j6CXUK5s4K4ur/BLehlkzXR3f95nhqnWQtege8jTkETlGspPSif8B3dgdbc/gp rZpPPS/HRRb7tB3vI8RxX/XdVBec2JYQ9WlQSuA6/nSYMeqn+XDW0QNH4lN0sAwMKyDZLN eTCBepyvxW/lYlJ14BWA7k386vYL4eOXN+1eBhNqEqUBKQ6uMGIJYbpJEAehZmQXQHv7L9 JdoRbUR0iFwo17aK36yLdYiqIy6oelUZfGZ7deYzv8HlN+j3wwXEghcQ1qlzsfnJBgBH4o 9Ns9XweWHfeNkrVIZxrvlCcSBWSZXmM7VtGEXAmwiZhUR5/Ptc0ObrTXHjgT8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682071894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SrndkCv5XNJMNoPBbEbxGm64GvWtC9kUJ7V8L4woeM8=; b=E1XzHJHt59G2To7rsyG/FtN4g1QDASsgDv+WaaKl0Kl26JQsUSUVP5im7yPj9qENSZsTET 8NXXWfwmstvlT/QtbIdVAG3y3Ai2B/ze2rfqWnY3Q+PqR7ZBJDqZB9xTHideGL7HO+N7Yv O8l9eJXuYXWNY9imkEyYfo3k8nt2GScHCPEda+i35CsNNpF6fyCWDJFOlBxFz2Y4F8dM6X M9c7sUJbGtGZ/A4mkTlMXHFX+ZR6wXqfwablt2RGxiZZEwAbIcjVfM+fbk50wNn0nEZXnT NAXVjHIVro+JUgW4VlRB28R3/df99l1Ha3QWyFsIwbYK1A51nkuQ70sYkicO1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682071894; a=rsa-sha256; cv=none; b=KT7UTthOL09z9arZ/pFgS5U4gOMa+goXZTgJ7Sslr5F6FkYYoeKXFO48vOd4iswGH24vps D4NVcP6lv1tVd02bKbwmgvwhMTHwMeNjleWmm0JVnP4JPhHfK1AyHYk2t1s2oNeRTYOwxQ 2lv3vTMH7bxmRKVc2f5tHd9qHK7HsAsFcZKEjHS2v+TlTWRyrD1IRjRMnMRkkvInINBNVP HZdUIpEkFOKmvl2oUiUg/h5QPsSo0gsLnskS1Icp16mel4ERvdd0/COhqIHzmhVDldfash e33MmVCqRWq6CjLRN4Se7I9o+xDrkBhyUWRQsMFBo1VzMKkP8vdBiADqe6prYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2r0Q26B7zGlP; Fri, 21 Apr 2023 10:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LABYNJ020436; Fri, 21 Apr 2023 10:11:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LABYDr020435; Fri, 21 Apr 2023 10:11:34 GMT (envelope-from git) Date: Fri, 21 Apr 2023 10:11:34 GMT Message-Id: <202304211011.33LABYDr020435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: de53ebb0f20e - stable/13 - bridge: Log MAC address port flapping List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: de53ebb0f20e9735a6167230eb38fd4695aa9c51 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=de53ebb0f20e9735a6167230eb38fd4695aa9c51 commit de53ebb0f20e9735a6167230eb38fd4695aa9c51 Author: Zhenlei Huang AuthorDate: 2023-04-07 14:25:41 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-21 10:10:12 +0000 bridge: Log MAC address port flapping MAC flapping occurs when a bridge receives packets with the same source MAC address on different member interfaces. The common reasons are: - user roams from one bridge port to another - user has wrong network setup, bridge loops e.g. - someone set duplicated ethernet address on his/her nic - some bad guy / virus / trojan send spoofed packets if_bridge currently updates the bridge routing entry silently hence it is hard to diagnose. Emit logs when MAC address port flapping occurs to make it easier to diagnose. Reviewed by: kp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D39375 Differential Revision: https://reviews.freebsd.org/D39542 (cherry picked from commit 2d3614fb132b1cb8efd1e0accdd0c98ce6893efa) (cherry picked from commit 9af6f4268ac3cc8203f34c746d955b4405279099) --- sys/net/if_bridge.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index ef01be9c5b49..cd2fbff3a85c 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -466,6 +466,21 @@ SYSCTL_INT(_net_link_bridge, OID_AUTO, allow_llz_overlap, "Allow overlap of link-local scope " "zones of a bridge interface and the member interfaces"); +/* log MAC address port flapping */ +VNET_DEFINE_STATIC(bool, log_mac_flap) = true; +#define V_log_mac_flap VNET(log_mac_flap) +SYSCTL_BOOL(_net_link_bridge, OID_AUTO, log_mac_flap, + CTLFLAG_RW | CTLFLAG_VNET, &VNET_NAME(log_mac_flap), true, + "Log MAC address port flapping"); + +VNET_DEFINE_STATIC(int, log_interval) = 5; +VNET_DEFINE_STATIC(int, log_count) = 0; +VNET_DEFINE_STATIC(struct timeval, log_last) = { 0 }; + +#define V_log_interval VNET(log_interval) +#define V_log_count VNET(log_count) +#define V_log_last VNET(log_last) + struct bridge_control { int (*bc_func)(struct bridge_softc *, void *); int bc_argsize; @@ -2745,6 +2760,7 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, struct bridge_iflist *bif, int setflags, uint8_t flags) { struct bridge_rtnode *brt; + struct bridge_iflist *obif; int error; BRIDGE_LOCK_OR_NET_EPOCH_ASSERT(sc); @@ -2768,7 +2784,7 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, /* Check again, now that we have the lock. There could have * been a race and we only want to insert this once. */ - if ((brt = bridge_rtnode_lookup(sc, dst, vlan)) != NULL) { + if (bridge_rtnode_lookup(sc, dst, vlan) != NULL) { BRIDGE_RT_UNLOCK(sc); return (0); } @@ -2817,12 +2833,23 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, } if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC && - brt->brt_dst != bif) { + (obif = brt->brt_dst) != bif) { BRIDGE_RT_LOCK(sc); brt->brt_dst->bif_addrcnt--; brt->brt_dst = bif; brt->brt_dst->bif_addrcnt++; BRIDGE_RT_UNLOCK(sc); + + if (V_log_mac_flap && + ppsratecheck(&V_log_last, &V_log_count, V_log_interval)) { + log(LOG_NOTICE, + "%s: mac address %6D vlan %d moved from %s to %s\n", + sc->sc_ifp->if_xname, + &brt->brt_addr[0], ":", + brt->brt_vlan, + obif->bif_ifp->if_xname, + bif->bif_ifp->if_xname); + } } if ((flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) From nobody Fri Apr 21 10:17:50 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2r7g188kz46D1v; Fri, 21 Apr 2023 10:17: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 4Q2r7g0bRhz3Pxb; Fri, 21 Apr 2023 10:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682072271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q5C3Ipi8UGL5p5bvbeZ5vxCLOkxa7+Kvg9pCG2IAzpA=; b=bTpBlX2Og6BUpay1TEHOK8vahyUEAUwwZmRbOvPAFTCRIkt1hTgCfhZcOly75VRelrZy5M 35WC4icEk7zN6CxDf2MTw/3MxEQ+9jfR5ZHS5oyZvAGt7i3E6P2nigA+9KcKYaZHJZnnz2 22XWzEvZj/ykbT0OIFHIuNcKIP5Ci9zQfGedLwqk0MRegRxwj58x6hYnvd8ET1bfv8PTDw doKK6QCev1I1EyZ48b8OGxwT571HE+a2ToA7fmxeyOuCxm3BqsS5py3LxEuVso13rLNhbT R5sc8Bm8GM83qWH+VhVZ2cLpjUvpsvMd8V5m/CxUvsn0zXYt19q0dJgZVYoTsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682072271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q5C3Ipi8UGL5p5bvbeZ5vxCLOkxa7+Kvg9pCG2IAzpA=; b=nJCSmswIrNBMT+GRaRH8C0XkfFiBL3Qly9APfJw5omtQX4N0jfs0Gbm3o3+zCpjxI1MJJl aH8OuRTc3t3pvAvijyARiSeIajpj2k+J+XNPpW6nrqgu6f3bOT1GlJWm1g5zTiLpQY5CcJ vkph8qt0ebiN7OZ1Bmktop5clp7wh7iSpRl85yOJpoU7rh9CCY77vVACggItDjAJsBLnjg rGrS3N9Q/8TpPZb8yNCXwbjLM3Scwb1dUeHSOSNxxesa/VA8s+taQWjHVuGZt4v9MNaQpL 6vxtbV5iaH/GSL9+cY06HSYkduz4jh5yJdN7YC94UsjDIlpgK5c7pqb0tt6W/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682072271; a=rsa-sha256; cv=none; b=jDMZ5Yx6JowNSSWiPFY1FJouSqjBU45e69r+SPs6GZxz1WvEKfVxpYovGHPfSseJ1rj9b3 vpZ/e6YhQt1kgr+/dmA24E2vRygphtTH7P3WAikuj+H0EgpPAbUvmylu/iJWpAzEXLq0Sl +pGDvDLzMzNeANZjtMbKVj/QPaqOBzO+09xHNtT+C6tiZbTWQKGp+mKaJaZuMORPHddwiU PPdTd3h4/CgvdY/p7E1QG1aQPzN+SadZwgxBYrXi7SUTKGXo91F/YamF6Xx3sbUwGWBG56 +bHB+qjHw+jkc2HLJPlgCZ/Tf2J7pQkCpep0CC5lAzmHmQDy28UZntXS7qEIDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2r7f6mHlzGlb; Fri, 21 Apr 2023 10:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LAHorX024876; Fri, 21 Apr 2023 10:17:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LAHoM6024875; Fri, 21 Apr 2023 10:17:50 GMT (envelope-from git) Date: Fri, 21 Apr 2023 10:17:50 GMT Message-Id: <202304211017.33LAHoM6024875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 109bea7ab84e - stable/12 - vnet: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 109bea7ab84e7e3d56289c8d9a4aad090987cfd3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=109bea7ab84e7e3d56289c8d9a4aad090987cfd3 commit 109bea7ab84e7e3d56289c8d9a4aad090987cfd3 Author: Zhenlei Huang AuthorDate: 2023-04-17 10:24:35 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-21 10:16:10 +0000 vnet: Fix a typo in a source code comment - s/form/from/ MFC after: 3 days (cherry picked from commit a7acce3491987c116e607697a4906807f4ea1c10) (cherry picked from commit fd635d87ad35bda209e29303167dec8c9ed48847) --- sys/net/vnet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/vnet.c b/sys/net/vnet.c index 0c8755990520..91b28dff482d 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -246,7 +246,7 @@ vnet_alloc(void) /* * Allocate storage for virtualized global variables and copy in - * initial values form our 'master' copy. + * initial values from our 'master' copy. */ vnet->vnet_data_mem = malloc(VNET_SIZE, M_VNET_DATA, M_WAITOK); memcpy(vnet->vnet_data_mem, (void *)VNET_START, VNET_BYTES); From nobody Fri Apr 21 10:17:51 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2r7h2VQPz46CYW; Fri, 21 Apr 2023 10:17: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 4Q2r7h1fXgz3Q6R; Fri, 21 Apr 2023 10:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682072272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=neRsCKak3AK0ZYhRwKaJHDEGrPyHdGYZGVvpfYLIx40=; b=aM9qvI0FtjCrqE5HLt7u37wAzsRqIKxCRTMFHX7EOp+2drm/XEbehmfh6rmdbc4F49wGwE rWPJh73YtPqGKpHriTdnY2pJEVDa0xVp9MAiVMcIh2pUG6Gl8fAuaW5zvfRkNX+g8GVxWp 6Z8mHXGKHb5oIpiTPsc47u5NIgfKZwyzhsPslU0w4kngchygSPlmjx8mwYA98k8qf0FaJF VvQulAoMcNG/iPqpoeABi4j1sJH5SeWremi4vdIbDJnYKaKRhnf/hzhDTDevkJ5uKHb60S s1LW9aKxL/UDPs7RX9vlMckxovQ4GiM73mskXvsFWFNDwukEvL5PJy5ykG7b7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682072272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=neRsCKak3AK0ZYhRwKaJHDEGrPyHdGYZGVvpfYLIx40=; b=LymIaLmj0NzNJl/0SM6vCB0t5A37Iqu4Ou1ykLQkc0uNsm4rYqc2OlTKdRpP3pMJEB0imX jgovCG4l//92qBTtGlMPAoc8aHY2ny+fl6iJDSERbYwk4S1RVyje4v/jsu1PC3Zdpxkjn7 g8+Ee6dnGB3sZH55gTibQ8CUoPX/R/U+6OCBaRM2bPo+/S7IanQFAXvli7N5S+HoOTVSNN RO5zw62Q1xJZAnkDUPNZQzx+ZSoaicKzdHmKTQZWOZWvLy5ezfGCLuQ72M4ZWiR4GN7wl0 sHH21weP3u/37+FOyK2cUzez/3S/tmUuCaKnOaCzfsI0bQueyCR31G7jEvoTpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682072272; a=rsa-sha256; cv=none; b=UOpziRTlGC630T2nxKkor7ZLzaOReomere5rso7KPhdniejYC99k1kMavGySoumijilaFH 25p/amjk3XhlAPH0CJ7bKp2bRzqHaHOFdlxfJRJ7NZwi2szUYNIaW7WVcLcGbXr3/io1SG 7d85ZJlBKlDyZgT9Hg76Na7kUYzoyim7yX1wEKIaGOL958bKrQW9jQiUTQ2/TUw1ipJX3e NGJ/DRYWlGrK6XkuhFxEMawdWG4XaaigebDrHLn3CMj4PGaBW+s4RxhezTraVmkCd44jwC 3gWl5zvyMsRmoaeubMQqADiJs1ECPHAc/Zme6hiHs7cMI9eZCCu/GfnCRAaTGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2r7h0WsdzGgr; Fri, 21 Apr 2023 10:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LAHp7T024895; Fri, 21 Apr 2023 10:17:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LAHp8H024894; Fri, 21 Apr 2023 10:17:51 GMT (envelope-from git) Date: Fri, 21 Apr 2023 10:17:51 GMT Message-Id: <202304211017.33LAHp8H024894@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 673685a50aeb - stable/12 - lagg(4): Correctly define some sysctl variables List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 673685a50aeb090b81bbd84f5c606728e00aba68 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=673685a50aeb090b81bbd84f5c606728e00aba68 commit 673685a50aeb090b81bbd84f5c606728e00aba68 Author: Zhenlei Huang AuthorDate: 2023-04-17 10:24:35 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-21 10:16:10 +0000 lagg(4): Correctly define some sysctl variables 939a050ad96c virtualized lagg(4), but the corresponding sysctl of some virtualized global variables are not marked with CTLFLAG_VNET. A try to operate on those variables via sysctl will effectively go to the 'master' copies and the virtualized ones are not read or set accordingly. As a side effect, on updating the 'master' copy, the virtualized global variables of newly created vnets will have correct values. PR: 270705 Reviewed by: kp Fixes: 939a050ad96c Virtualize lagg(4) cloner MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39467 (cherry picked from commit 401f03445e4aa42960e337604560593c7096e589) (cherry picked from commit 774a2ee9ad7a512c5faf0fc30b13aa1de33ceb2f) --- sys/net/if_lagg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 796aa7f24dcd..34bcd37bed73 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -269,15 +269,15 @@ SYSCTL_INT(_net_link_lagg, OID_AUTO, failover_rx_all, CTLFLAG_RW | CTLFLAG_VNET, /* Default value for using flowid */ VNET_DEFINE_STATIC(int, def_use_flowid) = 0; #define V_def_use_flowid VNET(def_use_flowid) -SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_flowid, CTLFLAG_RWTUN, - &VNET_NAME(def_use_flowid), 0, +SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_flowid, + CTLFLAG_RWTUN | CTLFLAG_VNET, &VNET_NAME(def_use_flowid), 0, "Default setting for using flow id for load sharing"); /* Default value for flowid shift */ VNET_DEFINE_STATIC(int, def_flowid_shift) = 16; #define V_def_flowid_shift VNET(def_flowid_shift) -SYSCTL_INT(_net_link_lagg, OID_AUTO, default_flowid_shift, CTLFLAG_RWTUN, - &VNET_NAME(def_flowid_shift), 0, +SYSCTL_INT(_net_link_lagg, OID_AUTO, default_flowid_shift, + CTLFLAG_RWTUN | CTLFLAG_VNET, &VNET_NAME(def_flowid_shift), 0, "Default setting for flowid shift for load sharing"); static void From nobody Fri Apr 21 10:17:53 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2r7j32z1z46Ctl; Fri, 21 Apr 2023 10:17: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 4Q2r7j2Qk1z3Q4d; Fri, 21 Apr 2023 10:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682072273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/U9m33cg2nq8wZrM1bJXitHzNIngaWqGZebdQHqBPU0=; b=IUJiBNW2yMYuPTIQ2BNZEGggT21kcT72IRMwvdGUJwxxBa+4Xi6CCg2Z/uu5cwzxTXvfL2 7RaYAdZvmZO6oARiifhCJz/33OydMq3YkZ2EItcKRylaQXH7ReY61FZvq7/jw7F26p4ax5 jzxVLdWh1UDW0SMaWTztelBDA7+3H9xmrAjvHYQqVQ5sLGaMr0FWUkW005H2UAs0URIon2 Qh4YTFKdgvNbGZvOYhGSh199yHugD2ekcaUN3yEEdzIUenBEHs+v61k84UeNL9to3x6kBb E1NZ5fyBs8N5cVmUYxKPaPr76bAKbmXv9RIfrWQMG8VqhDfI2e6Cs05Qd0/Ouw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682072273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/U9m33cg2nq8wZrM1bJXitHzNIngaWqGZebdQHqBPU0=; b=I3VP0kTSSijnQ5iAcExjNvpdbzk6VOYCHBfPZwnR3HooqGK7JVl5W9aXVouRJf8g5Rg2AR e2fZBhcDmWmnOKw3onXS/lS9Tych7fou0XTeKFiW+9jR08/y/uWHiJINRbLZbX/Ml/QsT3 CJzzVwv1C2FI7L5GYmIZTv8HVus04yA2TxjysiCU8MMARLxsoeoMrSkMRKFNm3Q4X+6fEW y49LgTIbJH5AL4yVv6UEpobXfW9j61T2c0DHcfVK0nLhG5A/K4+OL+k01PLviItm+o8Vk+ bDKq2RV56ROE77WqIyk4Hv70iiyPIZBuKYRGXwhyF9/ku4ga0+z+SBWAe9E2lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682072273; a=rsa-sha256; cv=none; b=Ep1NSYFZi5obrjzcfWPv4GvTV6Z8sC2QKDTcOmqDIrgizq+FTBahHSMwPL1wHZdZcxsZmB 4CpSr1LV8pqhkTmWXMmz4xJEEQmuwzOlcLxlcqed+w5wdtwr/xfOYamV1KA0YHA0vNFeHa bikhDWZTEKfRtlqDYOryoWVd1/G/qRCi9Zl2IxnbH6ZdGFfDjJQBcX6cJUnZ8KAnwLGmLi gD55PsDdX+GJOmpZSeqZ93v6547T6FwNuiLn1fBDuxO4nogMoQBgdhTf07PtDGBWv+Awcq QHqeVDqX0TDcZ80XVz4uy7Z8ufSaboyAi5qE7C0gEeLEAExEDWl8XGK54qaXwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2r7j1TrbzGk8; Fri, 21 Apr 2023 10:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LAHr7m024929; Fri, 21 Apr 2023 10:17:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LAHrff024928; Fri, 21 Apr 2023 10:17:53 GMT (envelope-from git) Date: Fri, 21 Apr 2023 10:17:53 GMT Message-Id: <202304211017.33LAHrff024928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: d26e62ad16dc - stable/12 - printf.9: Update the use example of the %D conversion specifier List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d26e62ad16dc573cccb12c79ac9d34ad773ac0d2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d26e62ad16dc573cccb12c79ac9d34ad773ac0d2 commit d26e62ad16dc573cccb12c79ac9d34ad773ac0d2 Author: Zhenlei Huang AuthorDate: 2023-04-14 10:08:56 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-21 10:16:10 +0000 printf.9: Update the use example of the %D conversion specifier The output of hexadecimal bytes are in lowercase. Update the example to reflect the reality. Reviewed by: gbe (manpages) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39543 (cherry picked from commit 722b7589cca704670c3c532bdd0f5d46675df085) (cherry picked from commit ff7151058e51902989b05f39a0569224dae54245) --- share/man/man9/printf.9 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man9/printf.9 b/share/man/man9/printf.9 index 0b4bd826aa5c..c5cb6f2ad89d 100644 --- a/share/man/man9/printf.9 +++ b/share/man/man9/printf.9 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 18, 2015 +.Dd April 14, 2023 .Dt PRINTF 9 .Os .Sh NAME @@ -160,14 +160,14 @@ printf_test(void) { printf("reg=%b\en", 3, "\e10\e2BITTWO\e1BITONE"); - printf("out: %4D\en", "AAAA", ":"); + printf("out: %4D\en", "AAZZ", ":"); } .Ed .Pp will produce the following output: .Bd -literal -offset indent reg=3 -out: 41:41:41:41 +out: 41:41:5a:5a .Ed .Pp The call From nobody Fri Apr 21 10:17:54 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2r7k4KjTz46ChM; Fri, 21 Apr 2023 10:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q2r7k36Ctz3QNj; Fri, 21 Apr 2023 10:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682072274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QKUDyboT6Ok35JIXVvo/cbcSzW/IUU10sU9zIrbTnco=; b=FEPmtEPQIAjdeHOu/u9t2/kXVJ/AoaamgssML1WZu/VkP0yy9TbHSZ9tjCEmksjIlKuczn UBkLDVOu6py/orUpEEVJOC3CTb21fZkABMByuZ7j1J5+suG5xyDC/LuLG6R8ZEmM46CwgV NUV72yErimsoCvQYgazVpGxpqmWlpSZHFzu8xHSE8Ujcpp3pS9YaO69qCfDtivhT5KxXRg SBTWQZ9sbp5G3pDmpnPdWjCEMm0ATAm9bRalwmF8/YjKuQ7cqoWDQ8nckUbrl7YJPP+M4g lZUvN2MrcjZnUqa5GdRkj0xOSN7KIzJg7zupqMP+c2Lmhzl8H5BSmgaqDatG1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682072274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QKUDyboT6Ok35JIXVvo/cbcSzW/IUU10sU9zIrbTnco=; b=mWT9zEssqFGYb+fvEWkbkOGOAY4TaB662JQP1M03e64dmWHgXlTRF37BsbYoTvNuxt58L/ a6OqtYFykVqq+V6lbB11MRNqApVwDZijahIwK5P60A9xeFAVm2JK+4YRjt+BWQKFfbZV/a ZoPNCx6u2JoBn5jCL6fj3jAdaeozTSe6ZHfVTNXVqFhALebwp8tltJyEhSNwxUWRBETFGp oWzxE1alDs6dC1NVd/cw2liVmVsot6kmEkhLYz34KvIT1AvmA/Swjj5WAHCyJytb9bJRRk cPnmro5FmsTibdgRAM36LuDFjpbg8A3p5f7qU9Ng+u8hHvSNF9BisGJmhtgIvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682072274; a=rsa-sha256; cv=none; b=qo9yc7QPS8s7cMaDfg+2vXdTc0DMroR+WSixVt4f/XtWV06DstLj17WtKsYIypdzJht7we 95P60Q/dVz4q2QDbb9THdhQdMlYz5tUXei84Fm3SgTJWhdFe1D+zaPzi4OO/IkSPTvA49F IgfCEWktoPM9yrgDMyi+XtsfDyH1BQYduiU8w09+O/GOzruiKn1Uh8tj6WEvVOzc8l65/J sA6DxN+ZKRyZB+s0UbPAeoUagu9Ix1UTikbcpfppNEMYQz62TzzFSjUpFBoeZhdhj7zDiS UgXnG50lFw/9FGSJpC+/mGc5pHxlVmnpXLsKRe47Xwe57FVo6HdmHD3brzgEzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2r7k2Bv4zGgs; Fri, 21 Apr 2023 10:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LAHsZp024953; Fri, 21 Apr 2023 10:17:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LAHsp6024952; Fri, 21 Apr 2023 10:17:54 GMT (envelope-from git) Date: Fri, 21 Apr 2023 10:17:54 GMT Message-Id: <202304211017.33LAHsp6024952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 303d9a593bdd - stable/12 - bridge: Log MAC address port flapping List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 303d9a593bddb7e0d83c490052041b4c665f4b45 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=303d9a593bddb7e0d83c490052041b4c665f4b45 commit 303d9a593bddb7e0d83c490052041b4c665f4b45 Author: Zhenlei Huang AuthorDate: 2023-04-07 14:25:41 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-21 10:16:10 +0000 bridge: Log MAC address port flapping MAC flapping occurs when a bridge receives packets with the same source MAC address on different member interfaces. The common reasons are: - user roams from one bridge port to another - user has wrong network setup, bridge loops e.g. - someone set duplicated ethernet address on his/her nic - some bad guy / virus / trojan send spoofed packets if_bridge currently updates the bridge routing entry silently hence it is hard to diagnose. Emit logs when MAC address port flapping occurs to make it easier to diagnose. Reviewed by: kp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D39375 Differential Revision: https://reviews.freebsd.org/D39542 (cherry picked from commit 2d3614fb132b1cb8efd1e0accdd0c98ce6893efa) (cherry picked from commit 9af6f4268ac3cc8203f34c746d955b4405279099) (cherry picked from commit de53ebb0f20e9735a6167230eb38fd4695aa9c51) --- sys/net/if_bridge.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 67ab983cd4a7..28e8e8856b8e 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -469,6 +469,21 @@ SYSCTL_INT(_net_link_bridge, OID_AUTO, allow_llz_overlap, "Allow overlap of link-local scope " "zones of a bridge interface and the member interfaces"); +/* log MAC address port flapping */ +VNET_DEFINE_STATIC(bool, log_mac_flap) = true; +#define V_log_mac_flap VNET(log_mac_flap) +SYSCTL_BOOL(_net_link_bridge, OID_AUTO, log_mac_flap, + CTLFLAG_RW | CTLFLAG_VNET, &VNET_NAME(log_mac_flap), true, + "Log MAC address port flapping"); + +VNET_DEFINE_STATIC(int, log_interval) = 5; +VNET_DEFINE_STATIC(int, log_count) = 0; +VNET_DEFINE_STATIC(struct timeval, log_last) = { 0 }; + +#define V_log_interval VNET(log_interval) +#define V_log_count VNET(log_count) +#define V_log_last VNET(log_last) + struct bridge_control { int (*bc_func)(struct bridge_softc *, void *); int bc_argsize; @@ -2806,6 +2821,7 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, struct bridge_iflist *bif, int setflags, uint8_t flags) { struct bridge_rtnode *brt; + struct bridge_iflist *obif; int error; BRIDGE_LOCK_OR_NET_EPOCH_ASSERT(sc); @@ -2829,7 +2845,7 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, /* Check again, now that we have the lock. There could have * been a race and we only want to insert this once. */ - if ((brt = bridge_rtnode_lookup(sc, dst, vlan)) != NULL) { + if (bridge_rtnode_lookup(sc, dst, vlan) != NULL) { BRIDGE_RT_UNLOCK(sc); return (0); } @@ -2878,12 +2894,23 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, } if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC && - brt->brt_dst != bif) { + (obif = brt->brt_dst) != bif) { BRIDGE_RT_LOCK(sc); brt->brt_dst->bif_addrcnt--; brt->brt_dst = bif; brt->brt_dst->bif_addrcnt++; BRIDGE_RT_UNLOCK(sc); + + if (V_log_mac_flap && + ppsratecheck(&V_log_last, &V_log_count, V_log_interval)) { + log(LOG_NOTICE, + "%s: mac address %6D vlan %d moved from %s to %s\n", + sc->sc_ifp->if_xname, + &brt->brt_addr[0], ":", + brt->brt_vlan, + obif->bif_ifp->if_xname, + bif->bif_ifp->if_xname); + } } if ((flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) From nobody Fri Apr 21 13:46:54 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2wmt2Xx8z46Rw6; Fri, 21 Apr 2023 13:46: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 4Q2wmt1zStz4FWY; Fri, 21 Apr 2023 13:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682084814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UfalPSEGZ+lWiD+NPK9nGEwy60jowamBMT1Z974KgbM=; b=vaNaUxbh2f1VxuhLt2W4A0rGFdU/EcoiVTbPUtWCbxX07YkCDjcfg8HRln9+250NTWdt3o Iqm8JkmhOHCgH0EUp9rJ34KBfdNzBBpLsrzKUyxONM45tFKxNr8huPMHy1nB9UCWwipapL NcX7XoMvgZrh3Hq3HZ4QneVr2TKrYpDw0H10zQR5Qvl1o50xlvZAUpcr3Z1z2bsgY7wlbk jSyGY4Zyz9DZPOQLiUNKVWl9aU7oM0Xc5f/YXe5cN39Lz9VwFnty6WOuKJtgR+h34482bv PAnbX1E0lejwsaIlGQ+J5iKJUZQqktdhIb1J7rxN3FFs3KVyWGgWvlgr+dzAnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682084814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UfalPSEGZ+lWiD+NPK9nGEwy60jowamBMT1Z974KgbM=; b=hUEFt85maviGGpAtOeXGoExxMeuoR37dZGwsQBcGwYw6l1gRBuWJzjIaER8qe9kU/B3PC3 IoIPh3P5vQ5FKA1wWjm5L5Qr9Qs12KVgVPSrMk+li06njzWUU7wCgnqSoVFJOgo6G8zNJ1 qOc1hL57vAuTqQjw69K0yJd8XDFKI38Y9UVGRM9aUqMolaZOAjg1U3VAtkKYRFRzKwzvWJ dk1iFPEPNnvYzwW8oKjPA+HP793PHUde03IXV5anAT9K4MauFBCLapUu2QW2YHKG2ijTr7 ykOORRLG1iZ2BUj1UDztFbESFLFfJgIfoAKs2BqtzsEP1A85byK0yADg9r0F2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682084814; a=rsa-sha256; cv=none; b=uCU0cjnry13jHohCLO3ibUL0ThjWYl8iRgbv2N466Liez4avENLdFfrY62GtAeHO45XDdL YDvj2h5No/DytvH3pwj2a9zpCn0CqS+4t73Utb9pT2XKAH4TZkf6S/dCkJKvn/chxfpgrN 0Sis7/8R2RJgFPWlleCpItgBFJUXlyfXBc4f4x+oWqlUMyEI9sPuSU1yeqCzHO9eYCLDVn rigZ6sxMjPq/TxUxpGrbneyOLDh/xW4/C0EX7B0xHBeyC6RtytvlcYasVLpI0iRUWByq4R y1J1B28g6Ey9Kggj1TY7EPgYLd0LLi8VEHyJIg5PUys0Nn1b1Yz9d9WJPlg+HA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2wmt12n7zMM4; Fri, 21 Apr 2023 13:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LDksEx069033; Fri, 21 Apr 2023 13:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LDksWr069032; Fri, 21 Apr 2023 13:46:54 GMT (envelope-from git) Date: Fri, 21 Apr 2023 13:46:54 GMT Message-Id: <202304211346.33LDksWr069032@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: 533a942a213c - stable/13 - sftp: avoid leaking path arg in calls to make_absolute_pwd_glob List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 533a942a213c9e852265f94d27f1e9768294eaa6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=533a942a213c9e852265f94d27f1e9768294eaa6 commit 533a942a213c9e852265f94d27f1e9768294eaa6 Author: Ed Maste AuthorDate: 2022-11-03 17:17:40 +0000 Commit: Ed Maste CommitDate: 2023-04-21 13:45:30 +0000 sftp: avoid leaking path arg in calls to make_absolute_pwd_glob As Coverity reports: Overwriting tmp in tmp = make_absolute_pwd_glob(tmp, remote_path) leaks the storage that tmp points to. Consume the first arg in make_absolute_pwd_glob, and add xstrdup() to the one case which did not assign to the same variable that was passed in. With this change make_absolute() and make_absolute_pwd_glob() have the same semantics with respect to freeing the input string. This change was reported to OpenSSH in https://lists.mindrot.org/pipermail/openssh-unix-dev/2022-November/040497.html [and was later adopted upstream]. Reported by: Coverity Scan CID: 1500409 Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37253 (cherry picked from commit 69c72a57af843267b220f8367c4cc7162a12d696) --- crypto/openssh/sftp.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/crypto/openssh/sftp.c b/crypto/openssh/sftp.c index 29081db3d434..ce7ab7f8f2fe 100644 --- a/crypto/openssh/sftp.c +++ b/crypto/openssh/sftp.c @@ -617,14 +617,14 @@ escape_glob(const char *s) } static char * -make_absolute_pwd_glob(const char *p, const char *pwd) +make_absolute_pwd_glob(char *p, const char *pwd) { char *ret, *escpwd; escpwd = escape_glob(pwd); if (p == NULL) return escpwd; - ret = make_absolute(xstrdup(p), escpwd); + ret = make_absolute(p, escpwd); free(escpwd); return ret; } @@ -637,7 +637,7 @@ process_get(struct sftp_conn *conn, const char *src, const char *dst, glob_t g; int i, r, err = 0; - abs_src = make_absolute_pwd_glob(src, pwd); + abs_src = make_absolute_pwd_glob(xstrdup(src), pwd); memset(&g, 0, sizeof(g)); debug3("Looking up %s", abs_src); @@ -1997,9 +1997,7 @@ complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path, memset(&g, 0, sizeof(g)); if (remote != LOCAL) { - tmp2 = make_absolute_pwd_glob(tmp, remote_path); - free(tmp); - tmp = tmp2; + tmp = make_absolute_pwd_glob(tmp, remote_path); remote_glob(conn, tmp, GLOB_DOOFFS|GLOB_MARK, NULL, &g); } else glob(tmp, GLOB_DOOFFS|GLOB_MARK, NULL, &g); From nobody Fri Apr 21 20:46:04 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q364Y50ydz46sNt; Fri, 21 Apr 2023 20:46: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 4Q364Y0Bn5z3MZy; Fri, 21 Apr 2023 20:46:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682109965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UB/uDZOIiS9oo15uKZZtGct3/P2pK8Ne89cZA8R9UPo=; b=F12Yj7kzA4KNDnP73L7k4xEc/MPADICBOHME9LShkNB55mIQQJd5WpMBhI73qLGMGg83MR k/TRUYNeM9LEl602OH+f6h+LhHns3eZ5SOhaHhXce4gGtTKnk4hdIUioXr9rBQkMwqL/n3 5ej4loh1IyuEulTZL3dbI23NbT/hS+uuG/xuW33t00JPGUCaAprbu9BNhkfncDaqH3Iqbk l5uSr12wMkRZaEzfiE5zrunm8/Cu1zgHE2nXOeU+HzJxRRTc9tz9TN9O2pnjY2WBqhfHBx RzfEirbC9R1CSzlI8pXP3nyV3iSTQAt87v0Xaoba2frI4LLdzCXspN9r68kZVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682109965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UB/uDZOIiS9oo15uKZZtGct3/P2pK8Ne89cZA8R9UPo=; b=CJaHkPO2Qbwc5qXoLfnydRSGZJall6VLoxXwnYh/rbPdHBq3tVe/SEmpdKn7auj8cm1MAW 8hg2mSSRJeA3anJPbrblFYg4CPe8hPIRG3bUDsU94/1Qn+N2/5CkMlOh7ABbXvy1hemrk+ 4IUSMiYyP+/XzIFmktl5Uj9YQnCIFoqpr9+BqljyYUNRdgErj9a7z4doJoOCDD+DAbqhzg YwmynNT2R0rt+9taOheLW5C5Kwjv3l5nR5QshIgbAlIVB2ajiCDu9iQrr0Ga59DauDo48R JtHgFEdOGxh++TdOObPvZaQ/lnjdLsIKfQsAnXs73LpLWO0OtdsdI2ApxvMAKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682109965; a=rsa-sha256; cv=none; b=awxW/Dui2hkZZSFM5dcCz28XR1h9Z5zAd+Zdl+BUb4bn79Y8WOSdXZQjgjE4Btx6TJZrCU R7K/2EvwhS7kGlymuOBUye3bCMfjyPmQeyYm2TpobbKhJsJoxO2K6lcIahTKqD9oEiQv91 MMEeiaZpMiiwAfy094jqBjGgE+b5RrLYQCJQADFWKsbKsGxr9dXl+ryuWH0LWgXlGnVmPM 0z5A/gHS3ySvtcfgFGRwrgWh9GJhD/PdwM8nMfTJYD205LMQjITJPZO8UIdtthwjx+8O6v sd7DftNPQzj3esfmg+AEwgSoh7Y3cUzJ18DKNKUu5foCaYb9rPPJpsbSrURNew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q364X6PnCzZXB; Fri, 21 Apr 2023 20:46:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LKk4Jr061766; Fri, 21 Apr 2023 20:46:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LKk4E7061765; Fri, 21 Apr 2023 20:46:04 GMT (envelope-from git) Date: Fri, 21 Apr 2023 20:46:04 GMT Message-Id: <202304212046.33LKk4E7061765@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: bf5c45448720 - stable/13 - Enable KERN_TLS by default in ARM64 GENERIC List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bf5c45448720e20208d3e8f2b563e5234c28159a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bf5c45448720e20208d3e8f2b563e5234c28159a commit bf5c45448720e20208d3e8f2b563e5234c28159a Author: Allan Jude AuthorDate: 2021-01-28 20:48:37 +0000 Commit: Ed Maste CommitDate: 2023-04-21 13:46:35 +0000 Enable KERN_TLS by default in ARM64 GENERIC PR: 270759 Sponsored-by: Ampere Computing Submitted-by: Klara, Inc. (cherry picked from commit f9322ff6efa508df8368e31e3c4880cff11b0e23) --- sys/arm64/conf/GENERIC | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC index 9f7a67e2079a..a81f58b410e5 100644 --- a/sys/arm64/conf/GENERIC +++ b/sys/arm64/conf/GENERIC @@ -39,6 +39,7 @@ options TCP_BLACKBOX # Enhanced TCP event logging options TCP_HHOOK # hhook(9) framework for TCP options TCP_RFC7413 # TCP Fast Open options SCTP_SUPPORT # Allow kldload of SCTP +options KERN_TLS # TLS transmit & receive offload options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists From nobody Fri Apr 21 21:20:21 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q36r55P2Qz46vPf; Fri, 21 Apr 2023 21:20: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 4Q36r54W6dz3JVW; Fri, 21 Apr 2023 21:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682112021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3sN3Ih9lIjLbAtTrJixjOTuPvJKj/sEyYTROxOWJkK8=; b=obLHJYx8LLNssuDEXypWC35KMm9i+hO/c9g2X+m8ANHxBtANy8uzEGbD+s44cPboFIgBCl aPIyEv/KEX7k7EyYakLXdstfzIcQYVguuM8Hq3FUtih8pOwwCVI+umMjGWE2xVweDkzcNm pMFgCv7ifluPWBFHsKmAEGx4C3hjLIYK2AcsmC6b2cLK5ge0W8CX548hbebUXw6L2LYlwM srGLiLhaRaXNa3f4Xv4LOkCTd+w4hyAoB/DusGZpamKzpL00XU+v5EMc4d+XNSnkJibBOm 0PuZ1EKPRL+hh6J9AS5DSROOb9OSA1ShHYDzYFTEVQVXMciRXUvQQibpdWDvDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682112021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3sN3Ih9lIjLbAtTrJixjOTuPvJKj/sEyYTROxOWJkK8=; b=alv7I9/E8X0U1lWe81iUVyqlsixKmFkIVHqMG147K2oPSZYNAsm61mAXVJp99/B5CMyqXz 18l/Tg3bGLJm0Lv/3zWS7sZD1jM5xULmq+Lfzbmor00u9amYeuw3/13tkTdJ2EK1P+6/sQ yF8KsPzMlAhNUnbXi4mSh7A0dGmfEZLq0bHyMyRN1g4fieoDOr6ZcPyPLqc+8VcMeiAQ0v wIesaYSgxFCH94tD0fOBhrBq4ZO6GLyDEA12cWBnz7jnEpbu9tXRA8GVeCuNei48bQz2Z4 Yl5YciPX6Shk3z1Wbd8KFdSvfHJPRkHpNaw+mfs3eAXciuuZq5kZm3voO+kt+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682112021; a=rsa-sha256; cv=none; b=ZYxWOvkvr20bWP24RwttDpOv+wnezhXCvzNuGTide/PCAITmmkZLWoIVeW7MBvRX7vv7co KuEQCj1z4IV/VXCQUEiSyuMNbgbfKkqUvXO6pPEw5fHJnAi2rhUFSTYQH3sDbsvYMa1LUM vcT3p8PE1xwfLwBALDVUxZYnUfib2CsJn+mvVEW1+aS9/cOurbbMIggMTFPH5fBP2RaC2N D820nIsRmv/PY7nWbnPvF3QB3GSkuKIuQSZyCQidhkeztEVFvc+gk5r7PNGuISnHcgUKUi NVksR4CNTb2o1gNk0VOONQYdPNJkD5wkWgZStQiLhrSLzNTsSGCyhXMsutyLUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q36r53Wt5zbkx; Fri, 21 Apr 2023 21:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LLKLFu020907; Fri, 21 Apr 2023 21:20:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LLKLQp020906; Fri, 21 Apr 2023 21:20:21 GMT (envelope-from git) Date: Fri, 21 Apr 2023 21:20:21 GMT Message-Id: <202304212120.33LLKLQp020906@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: 5fbe15bc2187 - stable/13 - makefs: remove unused cd9660 options List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5fbe15bc21870dec4042c46c83b2ce3c09fa8a87 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5fbe15bc21870dec4042c46c83b2ce3c09fa8a87 commit 5fbe15bc21870dec4042c46c83b2ce3c09fa8a87 Author: Ed Maste AuthorDate: 2023-03-31 12:52:22 +0000 Commit: Ed Maste CommitDate: 2023-04-21 21:18:24 +0000 makefs: remove unused cd9660 options Makefs defined "follow-symlinks" and "help" options, but they did nothing. Remove them. Obtained from: OpenBSD a8f1645688c2 Sponsored by: The FreeBSD Foundation (cherry picked from commit c753f49f7006d28786c29dfbb5f838b494e2146f) --- usr.sbin/makefs/cd9660.c | 13 ------------- usr.sbin/makefs/cd9660.h | 2 -- 2 files changed, 15 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 661eefc832da..4d82a8dc93a1 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -196,7 +196,6 @@ cd9660_set_defaults(iso9660_disk *diskStructure) /* Set up defaults in our own structure */ diskStructure->verbose_level = 0; diskStructure->keep_bad_images = 0; - diskStructure->follow_sym_links = 0; diskStructure->isoLevel = 2; diskStructure->rock_ridge_enabled = 0; @@ -266,10 +265,6 @@ cd9660_prep_opts(fsinfo_t *fsopts) OPT_NUM('v', "verbose", verbose_level, 0, 2, "Turns on verbose output"), - OPT_BOOL('h', "help", displayHelp, - "Show help message"), - OPT_BOOL('S', "follow-symlinks", follow_sym_links, - "Resolve symlinks in pathnames"), OPT_BOOL('R', "rockridge", rock_ridge_enabled, "Enable Rock-Ridge extensions"), OPT_BOOL('C', "chrp-boot", chrp_boot, @@ -491,14 +486,6 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, assert(dir != NULL); assert(root != NULL); - if (diskStructure->displayHelp) { - /* - * Display help here - probably want to put it in - * a separate function - */ - return; - } - if (diskStructure->verbose_level > 0) printf("%s: image %s directory %s root %p\n", __func__, image, dir, root); diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h index fae2d2077c00..f271e0425517 100644 --- a/usr.sbin/makefs/cd9660.h +++ b/usr.sbin/makefs/cd9660.h @@ -238,9 +238,7 @@ typedef struct _iso9660_disk { int include_padding_areas; - int follow_sym_links; int verbose_level; - int displayHelp; int keep_bad_images; /* SUSP options and variables */ From nobody Fri Apr 21 21:20:22 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q36r82n16z46vh7; Fri, 21 Apr 2023 21:20: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 4Q36r65HWrz3Jmq; Fri, 21 Apr 2023 21:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682112022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FSwcFK2dvdS7Mta0MZ831S5cWoEhcSKP54qx2VpZS0c=; b=aC9xc6oVbYBs8WaQzlmBpZrUtgWHd0Rbf/o8yfCnvB7c3DEFHIRbAhEgQKVrEFEl/3Jaef SvztAX9jIugKgKy568zZd2LpEkx9SMK4/wfv+etGbgUmp8Yt8uwa4mhawZZrgjIGqY640u 4yn138ugjTQcdMWusHBRcuXKVVnI/tUA5JyIPCFs8lWZq/PWuNFFDwub1bpG6DbEMiVzuR fBtndf6udFxdqsUcA0A2vXwU5MKQWiUmCDdBoK0J3sU3uIhU80poxAmlu2Mz1/XXQ/W8Vh vCcjmVwYjkUuEflQykGfe2u5dx23NJZoMwKhHObFrKBCR2YH1PFyy0cp6yecow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682112022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FSwcFK2dvdS7Mta0MZ831S5cWoEhcSKP54qx2VpZS0c=; b=F68Y0rWG13WbLrqaAhOKmgBZeJrbEMj2AixmpvGf5ZARfINTn5FNXm20G0AK+aO4ecix8b NdtLdgJmF4nOhWACwn15j/F38fYPyfKJ7fHVmjoYnkkU/s9ZJr4HsYm80DNeRP+i3iqa7R QqycvmTRDGoHqHZPCCeqJXPTCc2hkXt7To5oRtlglNOAhDPPMLhTTTH/uAmXqqdJdJ1Qnp QBdou4EkJe6mWIb5aJ3wuE0G+qUAN/H6T/P8f6wG+SgefqhcGmQ783Fs5W2qoSsW36WyVT ANAaPkLQa0SkAhs8t94NoHGul2CJn3HQ8Hp6mQwQjezmjjk0J92D8kkgus+F+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682112022; a=rsa-sha256; cv=none; b=XVzR+qCzY0sXx5+Uf2cvEit7gDgGHfKEZ7EzYXo2WSviryj+w0IZefU7NvfkisSt43N09y XBsa5+AyZg5MabZEEnAsz3MX2zGsZgje0v6DbmzXZnVowoRmLf6iLWRmNzY0bHHTLnufcE CaTERTvwJEHLnN4FcY2IKdP511MMawwrLpZHrdYU3nQiBmtd5CchO6MjMqBjtKfuBOfZkU cfQiGTXv3DJFQCdITl9833a+IvHYam8/7/LX6h9V605Hq/dA3E+4A5JFIFalPUaXwkTOR7 4MRTKTJlAdUMgzOiRh0c4dAnVEtIuC+rtIb3O0xbSEYq7u9zvGlSg5qryR+0gQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q36r64PSszbTl; Fri, 21 Apr 2023 21:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LLKMZQ020929; Fri, 21 Apr 2023 21:20:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LLKMe7020928; Fri, 21 Apr 2023 21:20:22 GMT (envelope-from git) Date: Fri, 21 Apr 2023 21:20:22 GMT Message-Id: <202304212120.33LLKMe7020928@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: 6dda38e5ca07 - stable/13 - makefs: remove unused variable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6dda38e5ca071c30d8aa6322988569b5473d95a8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6dda38e5ca071c30d8aa6322988569b5473d95a8 commit 6dda38e5ca071c30d8aa6322988569b5473d95a8 Author: Ed Maste AuthorDate: 2023-04-17 12:12:27 +0000 Commit: Ed Maste CommitDate: 2023-04-21 21:19:48 +0000 makefs: remove unused variable Reported by: Clang Sponsored by: The FreeBSD Foundation (cherry picked from commit 79ead0849707396cb2de0bab7e354fb099ea344e) --- usr.sbin/makefs/cd9660/cd9660_write.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.sbin/makefs/cd9660/cd9660_write.c b/usr.sbin/makefs/cd9660/cd9660_write.c index 6716c2f98704..95038320a059 100644 --- a/usr.sbin/makefs/cd9660/cd9660_write.c +++ b/usr.sbin/makefs/cd9660/cd9660_write.c @@ -429,7 +429,6 @@ cd9660_copy_file(iso9660_disk *diskStructure, FILE *fd, off_t start_sector, { FILE *rf; int bytes_read; - off_t sector = start_sector; int buf_size = diskStructure->sectorSize; char *buf; @@ -462,7 +461,6 @@ cd9660_copy_file(iso9660_disk *diskStructure, FILE *fd, off_t start_sector, (void)fclose(rf); return 0; } - sector++; } fclose(rf); From nobody Fri Apr 21 21:20:23 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q36r847Bfz46vXw; Fri, 21 Apr 2023 21:20: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 4Q36r76CX1z3JVm; Fri, 21 Apr 2023 21:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682112023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s4FX7gyuUgJ/SbbTA2x2ZgPhI6j4Z4Ng1Tev3eSkPrk=; b=mlgIdCS8XSjzdUaxz/1AV6jDlZAmrvDmnsnM7FKOI+2tLwZ6sLXeHPofdtMmnxoqBBVOou 1FZ8/zq9Ff/Y0cqNhI2zq7EDHpcJtwiubhGNRhcUjXS4Aewc6UMxsw0zO5HQHx+k4hNuPW 4KAKNwzHZzxyXeuIAKuQ5JhX+WyPaWhUke2cph+5buaIU+moOX2rXKqzE0O99EXlkPjT0/ 0klkWP5LeKcaMqjJJyKhMFFr8PcPdEjdMscPrvGUFpYgr2JmyUbHOBQZPW8j3DI9QYIaRY wL75TCU9tgj2NFmg/4c3+HH/quv0DvRAxTOQ/JtSn8S3matuSP05lG32MTEEHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682112023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s4FX7gyuUgJ/SbbTA2x2ZgPhI6j4Z4Ng1Tev3eSkPrk=; b=aJKDHzU31zw6bIrH/VmbYHv1HMagUEGh0NMbQz+T6V7KaoadVStRr/JEmcxFHyhoqDTqtl +bT2d0Gbeo9PnYeO/DYTyxku3xn9894ZHbiO6Gvr/bDJz2Dmm+Gr+5qFTohv07K1W4DSfo +osgZQk2BMHp6uV68wanO3h8tBo0UuhX8B7468dCDD0/CqSxO65BBk1KOM09myLyakihzb AFMWQ2r8BUTjMG9f45+pHi4KUK5M9uQQQueZUB+Au4+2uAAkTJ6TzTDfERhjtCfwLxrgBU VE+2g7vTDAwHWO4NW295N81YSOGfvtwE9f9bV8/5eUfccBUR7UJu+rOt0qg+Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682112023; a=rsa-sha256; cv=none; b=gmSj8LXsRE9QUnQml/3G0mEYEJwzfPD2PSiubQZhT34DisFf4dKnIewJczSmDe9Dg6Tr3b 10d4VOB4Ne7JSFTBOhT9nxZb/VeOMIFRPn3BxPg2sK1uecjGclyVNOwMf9nkXeT70GusA/ z11Rb9NODiC2ezQ/0xf1OOYbso3R8nbllkrc1f1DA1YMpi8soH2/zr0Gno3ieYtlKk7Une bIHwg/ZsuIGJ6b7JTT3ZVy36TG0hQaXfTNShPhJ6+vP9WcpnIj9JFnxsQirp2QQPWWLZvv IHoysuA/QHN2bgBqCYk0hkkErQjsaugOnj8f/aftlnJ0awHuATAEe9JgklTyvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q36r75Js9zbZg; Fri, 21 Apr 2023 21:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33LLKNqC020952; Fri, 21 Apr 2023 21:20:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LLKNH5020951; Fri, 21 Apr 2023 21:20:23 GMT (envelope-from git) Date: Fri, 21 Apr 2023 21:20:23 GMT Message-Id: <202304212120.33LLKNH5020951@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: 775defbe0c23 - stable/13 - makefs: use unsigned and %u for rock_ridge_move_count List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 775defbe0c2346aad87e313f9d56e973ad8a245d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=775defbe0c2346aad87e313f9d56e973ad8a245d commit 775defbe0c2346aad87e313f9d56e973ad8a245d Author: Ed Maste AuthorDate: 2023-04-10 22:53:53 +0000 Commit: Ed Maste CommitDate: 2023-04-21 21:19:48 +0000 makefs: use unsigned and %u for rock_ridge_move_count For diff reduction against NetBSD's makefs. Based on NetBSD git mirror commit 00991aee8248. With this change our makefs cd9660 support should be in sync up to NetBSD commit bdae6c9dc792 ("makefs(8): Nix trailing whitespace."). Sponsored by: The FreeBSD Foundation (cherry picked from commit 10854bf51747c172e45e365995ccf42aef2ab470) --- usr.sbin/makefs/cd9660.c | 2 +- usr.sbin/makefs/cd9660.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 4d82a8dc93a1..0c9be8274643 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1255,7 +1255,7 @@ cd9660_rrip_move_directory(iso9660_disk *diskStructure, cd9660node *dir) return NULL; diskStructure->rock_ridge_move_count++; - snprintf(newname, sizeof(newname), "%08i", + snprintf(newname, sizeof(newname), "%08u", diskStructure->rock_ridge_move_count); /* Point to old parent */ diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h index f271e0425517..4cd8cd471672 100644 --- a/usr.sbin/makefs/cd9660.h +++ b/usr.sbin/makefs/cd9660.h @@ -249,7 +249,7 @@ typedef struct _iso9660_disk { int rock_ridge_enabled; /* Other Rock Ridge Variables */ char *rock_ridge_renamed_dir_name; - int rock_ridge_move_count; + unsigned rock_ridge_move_count; cd9660node *rr_moved_dir; int archimedes_enabled; From nobody Sat Apr 22 04:44:16 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3JhK2m6zz469HX; Sat, 22 Apr 2023 04:44: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 4Q3JhK0vS3z3DRc; Sat, 22 Apr 2023 04:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682138657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1rnX8wUmJlIzXXO/r82z0uSOJygzUulCGnSYHVoDYZI=; b=neABZqXQQg3tHMtrkwdNtgOUUsEd46HAmAS0+XWFN3ZuhekkD4oAl2t5ChV7il8fRrtN7G heELPxmZb0Z2suGOTX5iA0pdd5bPT7000xeoTo36oPRjZ3MGIw+5UDb69U908jkdD3G2Yr jPaLcDLiMuYQo37AGAEYuzbDyYgejA+VZK2vTV31H8E+7aLOsNx7jxyK4KJ0Rt65C+rV+o g8gpwvOkK8N1AFzYC/warYfAZYYp5tKh4ZQCiiYHgU7jX8JMZvRFQXk/bX5EGvv2TWO8wv UNMA6heGQBiCVthYw9IKZ9nQ92cMmRV5DlDipn+KDxN8KfaMZT6cz3GcKvVE8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682138657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1rnX8wUmJlIzXXO/r82z0uSOJygzUulCGnSYHVoDYZI=; b=T6eoXV4uw9TolK8DzJhoGTI46RfI8opD6HKPKjDfP6uoWsSxbHu0aXv3oihh1WfGTkymxw pN5WXnrUFbGcjRGbXifbrsszSRy7sUbxOoHy8Flj1wF09mep1JuHicSD32uQ4uHJDxilOV mhUTSN3ED8nJ57iXPYxeto9Mwys8nJGfhW7anysmOUK44RO8PCzyHjWkTFStkaIT0FgJMf 52Z4r/O77uA3xZoepvn/CAnaTwg7uUyjTwIRt59H2MIdq1gQgqgZkNdT6YMa2AfUju37rx XS3OUXn4dy+Cc/gVguaiNxtRVw5MZ1hMC0/CPVfmtWqRMeQJQa6X5NKKlL0mag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682138657; a=rsa-sha256; cv=none; b=ibdVe+A4qGniOUB/OYJGB+hjlELS6g49FHD8CVHiDgrCUha+slLCkPQPmA/ZVxk9djWEm6 ekBS7zPEVsq92TQFxK1mw7mRIdWOAZiYQYH3wEIRolEDy5X2psEddLmruBBEdIyC4exy6n fe0+LLTi+li2QErPwmyqcnX27fMRRBpd47vwOMIfaVemI9GMpaU0dC8VjlROvYUgctEZGe qL9+PV00G5MO0vb58SuzBq3hfqBo/lFyWfv3Lg30hchoTFJUB8XouQ9PCKpfUuPTEiXOPO LhSUuBw/ZgiNH3jBkbq9ecGPWspGm50t0MjJEOFUFkb+8vV0Xn1Y8Wyu7a0U+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 4Q3JhK0168zp8r; Sat, 22 Apr 2023 04:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33M4iG0m052010; Sat, 22 Apr 2023 04:44:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33M4iGY0052009; Sat, 22 Apr 2023 04:44:16 GMT (envelope-from git) Date: Sat, 22 Apr 2023 04:44:16 GMT Message-Id: <202304220444.33M4iGY0052009@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: 02a7d117b591 - stable/13 - unionfs.5: Use '.An -nosplit' in the AUTHORS section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 02a7d117b5914dd8c42b8d98fe92faca381148bd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=02a7d117b5914dd8c42b8d98fe92faca381148bd commit 02a7d117b5914dd8c42b8d98fe92faca381148bd Author: Gordon Bergling AuthorDate: 2023-04-19 15:11:41 +0000 Commit: Gordon Bergling CommitDate: 2023-04-22 04:44:05 +0000 unionfs.5: Use '.An -nosplit' in the AUTHORS section Use '.An -nosplit' in the AUTHORS section to prevent line breaks. (cherry picked from commit 409731e7d71358cda3d23d903607614c29680038) --- share/man/man5/unionfs.5 | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man5/unionfs.5 b/share/man/man5/unionfs.5 index 7d5e16e3ff68..2f781c0899e7 100644 --- a/share/man/man5/unionfs.5 +++ b/share/man/man5/unionfs.5 @@ -69,6 +69,7 @@ The device driver first appeared in .Fx 5.0 . .Sh AUTHORS +.An -nosplit The .Nm device driver was written by Jan-Simon Pendry for From nobody Sat Apr 22 04:44:33 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3Jhd6Bz2z468CV; Sat, 22 Apr 2023 04:44: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 4Q3Jhd20SNz3Dys; Sat, 22 Apr 2023 04:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682138673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2bh+HFKEfC++7khBjBLq1bBREpVb2x0x0Q8TNTEF6fk=; b=HoraY2pKX+k2o4ZUZGZDXBOcuKZCmx3p78JCAqlLtfVseMFJ2NGf8Qe1pYEYnQu3dpB159 R0829NSF/QITtmv/pTO/nLCP+vyHTpWR5vczyr76TT3vhrGV6OkDV8o+mp8btH813Xo9EJ EWpysJJyuPOnnDnlNEmr7hr+KPeUjJIxSivGvpEsEPJCvSgllIUqmagiRarzM13ejG7/xx vaBR6981WgZWg/NtW3zCoe6K5rktYXF9vnrJz+MCuTiPjYkZnllyJLDMf9gRgjwSW611I/ fPa74e+4fNBdt6ikoBPkbWZdMlI1gtY1fDOmWJp4IZ6/FpYHSKXaLQqpTJr9Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682138673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2bh+HFKEfC++7khBjBLq1bBREpVb2x0x0Q8TNTEF6fk=; b=VjC+OvGdPRiKGfdiKQOIYJnsT6WWzeK7BQoTOQRsSEbmFjMf9pJjMBGX6Ibn92tcSjgX3a B5a5+rRcya4+l1BbyJGYl5KTVKoAXcOxBItenopOeE76l89AtmgXzXFPKhbZy2nKextH+q uUJIkdipYTiCD3BpEbdxS0IkbyEsshvrehzycjW4gzg2Ukb9XX84gxbWbiiPzLDPPHM2RU jDRRKdKPxuZYo8kAQ971fq7adMxQfODHNHyiqS9mT3QCuz/TbE1MO87/tenpoalv5P4Lkl 3qDwVGrb/EDyBIU5qMtc9BK9M40q+Xt7A/QidrAHrcOSqlrxN5GcYRLLoHG0gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682138673; a=rsa-sha256; cv=none; b=QfYlQ7JBkavosL9re1WtlV/vhAuq0QIJtCS3habLPHzp+p0O94Ba27uV6+4AV6LsIwwPCr 6Tx6Lxq82QzIGnXwVGvHgjY5CMB+BXM2bwiByVE+U0mh1hk6L+yniPU+qOXIKb9kZK7OIi GedvaWxY66w3a6oCwra5ZmMk9V1eAzpgc8KaVbOWLYAHZXG5u2DA7bgmICQMAwraVhD4zZ 8c2vT6L/+nT1l6+TcPE725GLufFdMp8uy2SIs4GPE5XhiSdTbqiRgahXngRtiTmO1EI0BC 7RfU5q8GcpPr8XDUi0TqaGzPaB4KMZVfG1cIcqKY4arHEaQSQ6r2QrC9MwzwNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3Jhd15jtzp0n; Sat, 22 Apr 2023 04:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33M4iXKJ052148; Sat, 22 Apr 2023 04:44:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33M4iXoN052147; Sat, 22 Apr 2023 04:44:33 GMT (envelope-from git) Date: Sat, 22 Apr 2023 04:44:33 GMT Message-Id: <202304220444.33M4iXoN052147@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: 14089ff9c21d - stable/12 - unionfs.5: Use '.An -nosplit' in the AUTHORS section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 14089ff9c21d7de7a08351c7e7ff0c154b939e62 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=14089ff9c21d7de7a08351c7e7ff0c154b939e62 commit 14089ff9c21d7de7a08351c7e7ff0c154b939e62 Author: Gordon Bergling AuthorDate: 2023-04-19 15:11:41 +0000 Commit: Gordon Bergling CommitDate: 2023-04-22 04:44:24 +0000 unionfs.5: Use '.An -nosplit' in the AUTHORS section Use '.An -nosplit' in the AUTHORS section to prevent line breaks. (cherry picked from commit 409731e7d71358cda3d23d903607614c29680038) --- share/man/man5/unionfs.5 | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man5/unionfs.5 b/share/man/man5/unionfs.5 index 7d5e16e3ff68..2f781c0899e7 100644 --- a/share/man/man5/unionfs.5 +++ b/share/man/man5/unionfs.5 @@ -69,6 +69,7 @@ The device driver first appeared in .Fx 5.0 . .Sh AUTHORS +.An -nosplit The .Nm device driver was written by Jan-Simon Pendry for From nobody Sat Apr 22 09:00:52 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3QNN6RQDz46RS0; Sat, 22 Apr 2023 09:00: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 4Q3QNN2qbPz4b8P; Sat, 22 Apr 2023 09:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682154052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YIG4+2LmyFFTG+ljNoX+Nx3/gKF090OXIBsMXGHfy34=; b=wfOFAkjFRQ5L31OFomQn3lHhvKIIJqCSjn7X1ZVQjKavfyaldGURnGJTKbmAl+zPUdQQS9 1Fn2zOWGhLiq2Cp4wweZCMRSIttpTMq2eF6X/c+5II/mIQAnM6MqT5ieGLNwIu9BxB/00t 0aH3Zjtx3JlRKmoeQBb5/hcxwN2dwuj6pDhq8X7WuuKunfEy5qB+5JuvxDjFuHdszYXTpo uV861H8lR0scwviYRKaByeO3Jwuvts60BgTyEtkYuLfAR0Kxtj1v6AnoLjdkFZ3o8XyF0q p++6eWmdkpFPA0AJgZwWEH88Kc2AdrsGqZjL7K7ikV799Gzb7cBUNdL4+Y/SpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682154052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YIG4+2LmyFFTG+ljNoX+Nx3/gKF090OXIBsMXGHfy34=; b=oaG9CqrVDw+/bTYgg4l0aKQkK3EEHOXyf0UJ1kD8P7IMum6L7yjhQk0IbtulirGbVdsrjf SZGX1jUpFxiehKsjfUK9iKHt7HDqI+cKItw9vGWFv3WdNN5317BHxzTjksMUP1lCG/+kU6 9aWHFvtha44rI29gyEeImSKSucfCgPqqSRqquKYkIezJcQmf4vpbDOdN7FeMNHBWTBAIBM LMRujLinW5ukWTrqRhlxgdq+FaEObWjfo8/nADg4tPved7HOsrPPS3sdUgXjfNWjucEKap Ve8hon3l8WuYTHSZuehMtKQ28AXos+W/D65PV264ZBnx4xJzljIl21hfaNIeFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682154052; a=rsa-sha256; cv=none; b=MfTGOdii5KICU61lD7IaR9buN068h9EsIAD4ZuaCBeDTtH6pzvAwaiw9XV68FEgXnKNZEN avufx3LdNN1k412QbZCSoc11cQC0BglCxWODZXh3PfZHfIldZJMkbzQqvHsIxxazyLMEaG EnNvQ50rsOwwdtVSXd8QcN3lx9KAYf/gWu1mezszk2t484rjcoQQhLfvkIZE4Mw4rCKj0Y TSGUMsnSUKEcr4zCtgEKNFWDFVtv334JtyfO9BVEx3N4rr6AA5xEhy1G+AYF6usOWfqy/E fY6lJHNrYoTLPEk/ROV4eIwWit++/tgidwIj2SPUjSbiwkrcMt+UytxIW3OItQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3QNN1x1LzvSn; Sat, 22 Apr 2023 09:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33M90qEP072762; Sat, 22 Apr 2023 09:00:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33M90qNV072761; Sat, 22 Apr 2023 09:00:52 GMT (envelope-from git) Date: Sat, 22 Apr 2023 09:00:52 GMT Message-Id: <202304220900.33M90qNV072761@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: 01bdf9acd258 - stable/13 - libsa: make single bit bitfields unsigned to avoid clang 16 warning List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 01bdf9acd2581b92ad0d7215c7cd744a2533346b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=01bdf9acd2581b92ad0d7215c7cd744a2533346b commit 01bdf9acd2581b92ad0d7215c7cd744a2533346b Author: Dimitry Andric AuthorDate: 2023-04-17 16:15:57 +0000 Commit: Dimitry Andric CommitDate: 2023-04-22 08:58:48 +0000 libsa: make single bit bitfields unsigned to avoid clang 16 warning Clang 16 introduced a warning about single bit bitfields in structs, which is triggered by a declaration in libsa's tftp.c: stand/libsa/tftp.c:382:20: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] h->islastblock = 1; /* very short file */ ^ ~ stand/libsa/tftp.c:432:18: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] h->islastblock = 1; /* EOF */ ^ ~ Signed one-bit bitfields can only have values -1 and 0, but the intent here is to use the field as a boolean, so make it unsigned. MFC after: 3 days (cherry picked from commit 1a3ccb8f1552977e1b264e3b89d1fba8e717dad8) --- stand/libsa/tftp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/libsa/tftp.c b/stand/libsa/tftp.c index 903537b4bbe5..f1e056da3561 100644 --- a/stand/libsa/tftp.c +++ b/stand/libsa/tftp.c @@ -106,8 +106,8 @@ static int is_open = 0; struct tftp_handle { struct iodesc *iodesc; int currblock; /* contents of lastdata */ - int islastblock:1; /* flag */ - int tries:4; /* number of read attempts */ + unsigned int islastblock:1; /* flag */ + unsigned int tries:4; /* number of read attempts */ int validsize; int off; char *path; /* saved for re-requests */ From nobody Sat Apr 22 09:00:53 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3QNP5HpZz46RZs; Sat, 22 Apr 2023 09:00: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 4Q3QNP42zmz4b8f; Sat, 22 Apr 2023 09:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682154053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xqp+Qs1Nrjhh0qW7IdAJA1ZGo6gIhbC9h2HwQtHHpFY=; b=QCt9MNa2dyZWLqRI1DoRxTWXxdSrIZxEHsKj35f3AnzPryx5w65j6wUVlKA6X41jTDbrV8 ehub1xpExgdvV03Hd56XrmmEW6O7gimHZXe4wSqmUTDR4mbE4P14xwaAeSkTjTRMJKIhpn KVxcZO1ADCJdvWMjk1+YrDZ7RHE1J3ATEmBobJTB6/sBVfrkktnB6aBITvAgFT0CFcUCTK bJu4Typ+7PDvxF54wJwqIMee8QOr1CqTjPREr27er3GRmucLWaqWVF7wTINgARxMLyPiVC sDBM6UGHBKAXn9UtDpVBhH9Qeusq/5Kyb8N37YQIvTsDfEu+7euEyeukLuRmzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682154053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xqp+Qs1Nrjhh0qW7IdAJA1ZGo6gIhbC9h2HwQtHHpFY=; b=C+FlwF/DDH2SQ8kHn35gSBVro9pi2j1F4QDOFTWxXjefOXVgTAQ2vaIBanjCVq6JqiZPrO l7p8/yzB0yWv8KRXiK34xeVUXCRPGvnBQt29Pi5o0C4liAWqrT2Ue/6S0YWmBjgpeeV5Sg YQg4fA2iZdPepkcmtfj3A5Lm4ZDaEUt4ZD+PfXRRc1ZcGoIrDdQuVydHwERsw5RcHKTjBY KwOYDri5XI2a/Xgr3KfMzHXX1MXGPGE7DKTk4sJHi6muTkyGPgxyL4zpFRnl+abmk5pIyt K28PoBOeHOE/hmrnefFajIoxbTmYt2K0PRmxHgkDqZNnqUfzGozuA2UYHXWa5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682154053; a=rsa-sha256; cv=none; b=ZLi423OjfKEbg7HfzeXuZsvOEc7GXuGa89la/0c4XLBffZ5ZhhAOhRB214Oc2srEn1z0EN frZdArN7RNwn2ba0y62pL5RWGjXESOKgb3ebqo57cgN3TrhSZPaJZTHLfxv1M/IjofT6UJ KflMPSkiAcC83ih5wmtaYxdfOS5hBFOg6x0MPIFBKfpFts3CpR2Hc9ihFgagCTsvst6VWv 7qeEB5LEHodoXx/AF347AbKPcHNq0xdF/UntoZMCRopqEnA1HTT/8Fn+7/4tkfB0aSGnVK YbsJVgV9Ixevyd4qp7eQxxfAOGGWLot0iELyxC6fo2HuJ86ziI/rJXbqRj8ujQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3QNP34Y2zwHc; Sat, 22 Apr 2023 09:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33M90rhX072788; Sat, 22 Apr 2023 09:00:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33M90rAK072787; Sat, 22 Apr 2023 09:00:53 GMT (envelope-from git) Date: Sat, 22 Apr 2023 09:00:53 GMT Message-Id: <202304220900.33M90rAK072787@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: 5cc19c2f6c68 - stable/13 - bsnmp: make single bit bitfields unsigned to avoid clang 16 warning List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 5cc19c2f6c68afd557c6888b22095054a4b4e419 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5cc19c2f6c68afd557c6888b22095054a4b4e419 commit 5cc19c2f6c68afd557c6888b22095054a4b4e419 Author: Dimitry Andric AuthorDate: 2023-04-17 16:11:56 +0000 Commit: Dimitry Andric CommitDate: 2023-04-22 08:58:56 +0000 bsnmp: make single bit bitfields unsigned to avoid clang 16 warning Clang 16 introduced a warning about single bit bitfields in structs, which is triggered by a declaration in bsnmp's snmpd.h: contrib/bsnmp/snmpd/trans_lsock.c:271:21: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] peer->input.stream = 1; ^ ~ Signed one-bit bitfields can only have values -1 and 0, but the intent here is to use the field as a boolean, so make it unsigned. MFC after: 3 days (cherry picked from commit b740e02500ca248e1096cf745a17d2a8fcc44fed) --- contrib/bsnmp/snmpd/snmpd.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/bsnmp/snmpd/snmpd.h b/contrib/bsnmp/snmpd/snmpd.h index 48a7b44a04b2..394a4f4736d6 100644 --- a/contrib/bsnmp/snmpd/snmpd.h +++ b/contrib/bsnmp/snmpd/snmpd.h @@ -152,12 +152,12 @@ struct port_input { int fd; /* socket */ void *id; /* evSelect handle */ - int stream : 1; /* stream socket */ - int cred : 1; /* want credentials */ + u_int stream : 1; /* stream socket */ + u_int cred : 1; /* want credentials */ struct sockaddr *peer; /* last received packet */ socklen_t peerlen; - int priv : 1; /* peer is privileged */ + u_int priv : 1; /* peer is privileged */ u_char *buf; /* receive buffer */ size_t buflen; /* buffer length */ From nobody Sat Apr 22 09:00:54 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3QNQ5s4sz46RLs; Sat, 22 Apr 2023 09:00: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 4Q3QNQ4qM7z4b9B; Sat, 22 Apr 2023 09:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682154054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gDbJ8X0L6FCFgXAYVr1inPPNCS+Ht75Z+bQTt2m7BmY=; b=coCIFT+we5v0QuEofQ7J2ZZCO1A0PbmumymKVo/F1NbC73RsL5YzJ8mmdkNMg1N1DN5XgC x0H0Uq5A3G4A71Mi1pSgsivt09+I7xj9G5UH5bzVpIgstSr0wOaNuOio4ga7U996QWfzpU vpGlsuK0gHyujEwZLmKcUcv5osBCZOqoHjeBFWSfU5x0WbP1W3pnBnEjQNtDWuQJht7/EA NI9Vi6JT0SD/y00Ju5lBPZFQgLAzx48HyypXWrJ3zqAuV4351mUeH1xtoBaYPTXB7uI5um Tac0+BFhYzILGpYXC4N4QunItFUr06ng+5Q9BynKeZ0RKhzoGSm/t7vscyXolg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682154054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gDbJ8X0L6FCFgXAYVr1inPPNCS+Ht75Z+bQTt2m7BmY=; b=prLsCEFkUn1DjQnuI+IqoPzB9B6WT727yUTDQRbegMaz/CzYThQtL0R8FRmyPCzD7c1xgr WhDsPhUsXdZR43qu/M/nz1vLcGtqm618kf4ph+5IfAhKYOx1YLLx2sBdsUfax90s68Kkn/ r+yIHLi+RINRD0gu46wDbvACD3HQqCGwjLR02ALyYXGizvrggLI8gh/iKXcatvy5HmOsx1 Aso2ng7Uwo08ZT5B26J3JiOhMrPWJRnJYUyVqjxuwKjfjTgF4XjIVNp53JVYrWWgW/ZfvV /VMtcCmVT/FEZWCt68L8v/QCdR2M1D5hdzrrzRjQXgcIMhL62c079zEx0a3KNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682154054; a=rsa-sha256; cv=none; b=Y92AJAJN4yrFRaLt5z144nU1WOvSeYZIQ8JSyaiPSCXZKvZJXMpeEMoE+IZexpwcgBBdy1 cmbcdjMFSJhQSd7e2m4UY6bv403PXd8KlqF/Xn3mBq+9FrNoWjpYQdhbk5MQg6YXMTGhLJ eUckJYV2rnONy/dWSc1zjmtpA4Y5pV3eE+QEkuyBpMzTsT3VW717f+ZGjmhWDrvu1DzG+l BVOpOHp3GTdE8Y2rS/mHFnVPxpM8djMZwXb9rLjIYPhqVyTaQPTTQjDYjl3TklRvvxT0R1 yrbyPbl7PGK0p7iVTQe/3ge55xv8IJ5Z/T6ZP/534RLPvwtIpwQSy7l5Lm72lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3QNQ3nzpzw7X; Sat, 22 Apr 2023 09:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33M90sZ5072809; Sat, 22 Apr 2023 09:00:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33M90sbT072808; Sat, 22 Apr 2023 09:00:54 GMT (envelope-from git) Date: Sat, 22 Apr 2023 09:00:54 GMT Message-Id: <202304220900.33M90sbT072808@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: 9f9b65a0933a - stable/13 - ichiic: use bool for one-bit wide bit-fields List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 9f9b65a0933a9b6fdde611210b29bd670c932a44 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9f9b65a0933a9b6fdde611210b29bd670c932a44 commit 9f9b65a0933a9b6fdde611210b29bd670c932a44 Author: Dimitry Andric AuthorDate: 2023-04-18 18:08:28 +0000 Commit: Dimitry Andric CommitDate: 2023-04-22 08:59:44 +0000 ichiic: use bool for one-bit wide bit-fields A one-bit wide bit-field can take only the values 0 and -1. Clang 16 introduced a warning that "implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1". Fix by using c99 bool. Reported by: Clang Reviewed by: emaste, wulf MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39665 (cherry picked from commit 87f55ab0b46ad72efee11d1b64ec8f839bb013da) --- sys/dev/ichiic/ig4_acpi.c | 4 ++-- sys/dev/ichiic/ig4_iic.c | 8 ++++---- sys/dev/ichiic/ig4_pci.c | 4 ++-- sys/dev/ichiic/ig4_var.h | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/dev/ichiic/ig4_acpi.c b/sys/dev/ichiic/ig4_acpi.c index b23d6324cff7..06aecc31090f 100644 --- a/sys/dev/ichiic/ig4_acpi.c +++ b/sys/dev/ichiic/ig4_acpi.c @@ -108,7 +108,7 @@ ig4iic_acpi_attach(device_t dev) ig4iic_acpi_detach(dev); return (ENXIO); } - sc->platform_attached = 1; + sc->platform_attached = true; error = ig4iic_attach(sc); if (error) @@ -127,7 +127,7 @@ ig4iic_acpi_detach(device_t dev) error = ig4iic_detach(sc); if (error) return (error); - sc->platform_attached = 0; + sc->platform_attached = false; } if (sc->intr_res) { diff --git a/sys/dev/ichiic/ig4_iic.c b/sys/dev/ichiic/ig4_iic.c index f24b26f53366..b4ef235bcf38 100644 --- a/sys/dev/ichiic/ig4_iic.c +++ b/sys/dev/ichiic/ig4_iic.c @@ -337,9 +337,9 @@ set_slave_addr(ig4iic_softc_t *sc, uint8_t slave) { uint32_t tar; uint32_t ctl; - int use_10bit; + bool use_10bit; - use_10bit = 0; + use_10bit = false; if (sc->slave_valid && sc->last_slave == slave && sc->use_10bit == use_10bit) { return; @@ -364,7 +364,7 @@ set_slave_addr(ig4iic_softc_t *sc, uint8_t slave) reg_write(sc, IG4_REG_CTL, ctl); reg_write(sc, IG4_REG_TAR_ADD, tar); set_controller(sc, IG4_I2C_ENABLE); - sc->slave_valid = 1; + sc->slave_valid = true; sc->last_slave = slave; } @@ -1009,7 +1009,7 @@ ig4iic_set_config(ig4iic_softc_t *sc, bool reset) (sc->cfg.bus_speed & IG4_CTL_SPEED_MASK)); /* Force setting of the target address on the next transfer */ - sc->slave_valid = 0; + sc->slave_valid = false; return (0); } diff --git a/sys/dev/ichiic/ig4_pci.c b/sys/dev/ichiic/ig4_pci.c index 71b95c3d95fb..d6906aa80e1a 100644 --- a/sys/dev/ichiic/ig4_pci.c +++ b/sys/dev/ichiic/ig4_pci.c @@ -316,7 +316,7 @@ ig4iic_pci_attach(device_t dev) ig4iic_pci_detach(dev); return (ENXIO); } - sc->platform_attached = 1; + sc->platform_attached = true; error = ig4iic_attach(sc); if (error) @@ -335,7 +335,7 @@ ig4iic_pci_detach(device_t dev) error = ig4iic_detach(sc); if (error) return (error); - sc->platform_attached = 0; + sc->platform_attached = false; } if (sc->intr_res) { diff --git a/sys/dev/ichiic/ig4_var.h b/sys/dev/ichiic/ig4_var.h index da81980039f1..3cad69cf57e3 100644 --- a/sys/dev/ichiic/ig4_var.h +++ b/sys/dev/ichiic/ig4_var.h @@ -91,10 +91,10 @@ struct ig4iic_softc { struct ig4_cfg cfg; uint32_t intr_mask; uint8_t last_slave; - int platform_attached : 1; - int use_10bit : 1; - int slave_valid : 1; - int poll: 1; + bool platform_attached : 1; + bool use_10bit : 1; + bool slave_valid : 1; + bool poll: 1; /* * Locking semantics: From nobody Sat Apr 22 09:01:13 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3QNn2zbxz46RVy; Sat, 22 Apr 2023 09: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 4Q3QNn2YZRz4cbY; Sat, 22 Apr 2023 09: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=1682154073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62C8F8wvIl4TZtULD3S18BGO+G5YMtGRD1cCft1Aaa8=; b=TBGTYd04yBh/ukJN6s6uNoNN4DqfEM3RBCT/gwNQF/R5//yROLxVeRAZYQRvNkZh7PeKA/ 50jzynsZ6lMEOAFHUmXBm3BC0D0+SWI1f91v3Hpy9CczZMpdC7RQHozMQQTxY1wUlTFRc1 yR+/3hUUfGVZRbPc1oJHZBsRFRonJUeMGbBUdV0TJRUx/rW2LzwNKQbZ/7PfikiO3BBLWS Um7IOml1yni1k0nnoKOY3Z6pzKHXUIEjsbllW533IlyFIss0RC8quDDyuF5/lMmhPcWlrX 6Ljbb3kOBHH6eo6QO1BiDB1ZaBjqhflGSi6S3R9lPdNJB8HW2zdv75h7MeC8XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682154073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62C8F8wvIl4TZtULD3S18BGO+G5YMtGRD1cCft1Aaa8=; b=fA2QlUItl7mn3Lkv8tVmiG8jhoFN8syri3908uESCXuCvc+l9JxdN2xpbC9YnjeC5C2+GD E2ebp0C1iZbrPr2G5aBopdaKqugEM7U1VyoecrvglbH2lr5qSn+NtKuDFbY7ZdtDiBbEMV kgCqZ2RDIxTrauUCQDmcKyHC9DUFKHddyzzrJc57agOPJGis5BGEm1MKBuMwpiiUIQ3jKe n2pRURnUAw+WsaCzyZF+3/GBdO0/K52uONdEausG3fYwD4Ep6IpuO0nVp7rXHWvE4bM0jE w1xKECNo7Gf2gJA7fiSk/iNiqsoio+Fh+hEGRAfIIsM7eRwzYeNJVpmp0Axh+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682154073; a=rsa-sha256; cv=none; b=m+++L7PZMdaHxCCcc/R9RwZfXPh33TkovEkh6d/+lOm7Ll8J57glcelhsLkEvNA74KBC0P JJ8c1AfN3xF0kmdjFWICZbbBwv35UvjwCBRhwiww/jg5RYjf8X3VYF4Q2hPP43v6IF6TMf s0eSjwIcJqLtE6MNY1FNZquoXcVMYBSYoKs+zCpC0Dl4z2iyrdjRLskoa0j2X3wQvgHfbS VAAthnI4Pzt2hN7AekvefzbOy/BtiLD8jUYEGsljvwHrQ2e2ktQ7FeaMUj2oOQaSAdU93P imI9J7N0qIFGMee4lQ8N1KeDoYqNKBpjC8Gj64KTGL1Sog/tCidgGscGdvZuPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3QNn1f4dzvws; Sat, 22 Apr 2023 09:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33M91DtY074774; Sat, 22 Apr 2023 09:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33M91DxQ074773; Sat, 22 Apr 2023 09:01:13 GMT (envelope-from git) Date: Sat, 22 Apr 2023 09:01:13 GMT Message-Id: <202304220901.33M91DxQ074773@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: f65f23e90da8 - stable/12 - libsa: make single bit bitfields unsigned to avoid clang 16 warning List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: f65f23e90da89a517dada5a4f330b181833e7a6b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f65f23e90da89a517dada5a4f330b181833e7a6b commit f65f23e90da89a517dada5a4f330b181833e7a6b Author: Dimitry Andric AuthorDate: 2023-04-17 16:15:57 +0000 Commit: Dimitry Andric CommitDate: 2023-04-22 09:00:01 +0000 libsa: make single bit bitfields unsigned to avoid clang 16 warning Clang 16 introduced a warning about single bit bitfields in structs, which is triggered by a declaration in libsa's tftp.c: stand/libsa/tftp.c:382:20: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] h->islastblock = 1; /* very short file */ ^ ~ stand/libsa/tftp.c:432:18: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] h->islastblock = 1; /* EOF */ ^ ~ Signed one-bit bitfields can only have values -1 and 0, but the intent here is to use the field as a boolean, so make it unsigned. MFC after: 3 days (cherry picked from commit 1a3ccb8f1552977e1b264e3b89d1fba8e717dad8) --- stand/libsa/tftp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/libsa/tftp.c b/stand/libsa/tftp.c index 22e03ab58da1..8436bab31ae1 100644 --- a/stand/libsa/tftp.c +++ b/stand/libsa/tftp.c @@ -103,8 +103,8 @@ static int is_open = 0; struct tftp_handle { struct iodesc *iodesc; int currblock; /* contents of lastdata */ - int islastblock:1; /* flag */ - int tries:4; /* number of read attempts */ + unsigned int islastblock:1; /* flag */ + unsigned int tries:4; /* number of read attempts */ int validsize; int off; char *path; /* saved for re-requests */ From nobody Sat Apr 22 09:01:14 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3QNp4FbDz46RFn; Sat, 22 Apr 2023 09:01: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 4Q3QNp3VNxz4cDJ; Sat, 22 Apr 2023 09:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682154074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FOtXdasmqwV/sJXOzfUvD2i2poyZnhGlh0pdMa4DdIU=; b=tTif2O5Z6rlcl6im+D2oKYzcHxlHpQXs9N5O4iHZPdOd8HZwaldCnSJW8SHU1+oNWDXW3p tP/MYdX46tsir/YmMp2z3xSNabw8Xavz7noQpOsCKxzXIihy+D4SCzVNh21iHXViOJS0hm /JdNlsa8OrMa6l+uNxWXTB7xZv9aWWN0I+JWy/WSvy1WCnc6ti/1Ld6T2T5vipwW3VjDX3 40cGLu4K5/KKL9Aw73BkjXMRQzAKu3qv+hYCkR3PxxtgKFr6OTsG4PR+NqMIvrbLzgCV1s lKXvtpPV3a/YdnNfDUDkeDy5msd7Z/cNp5WDktj8u0IuYUF7qgCNorg7QwrvuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682154074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FOtXdasmqwV/sJXOzfUvD2i2poyZnhGlh0pdMa4DdIU=; b=dR6UXeWGr8U7vSgdZKQzHfzYOaHHQaW+/cnv7qBvCSWS4ttwE9aqHeQZcjHj7jrJ9uHUGb cJNvH1qmjJyPenbcQq5YCF1rJaCmSRgm8P+CnJyGijcGl7WsrRg1pjCq3y9lX+X8/3mepd sUfkzxUrqBNKUFv4f+bawhZ+JreesIeI0hy2cBDeFAZqTfGl6iYM2o1azwnFZinjiJC/Uf G6CImwpcBHObWwu+l9v9ZCItYBRstHt3OrZzerPX4guhJo71DYXSiK6iUuEcW6SaQk4O9Z tsY5YhFE+lYv0Iwko7yczQklA+868Vltn5w6ihRJK/7LEyMpwobQy+v79RHnyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682154074; a=rsa-sha256; cv=none; b=AIjijFMIT0ItaRrqRjzfdhwGPQLcVK2w/RRcLRqI1A1BDomv5J4Y+AJLg6Oy7vE3xk8+OC rzghsHu+82KEq1L92D39SbF9Pia2AX8OF+Ac3MGK9fXhTaxgdH5J5Sg+eWsidB5W2YiZTy I5lCXQckx031xZnBEEkcDoZrsa/W0lyzVuKrQmyYAzYONCrqVt/3M/oe2O3sp3FQCTyOVs iZeBqFaOXoCcuhd/nBxtll5H4EkvXYe8+NeQj0mKGfRNogq4ovnH33z/knszMJqeI8tP/C Z0TfboegjcU1OSLjRpleInjeZLvW2xaQ/+EaYIE4CFmH4dVdFG6lxKUi0CC6zA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3QNp2b7tzwBZ; Sat, 22 Apr 2023 09:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33M91E8h074793; Sat, 22 Apr 2023 09:01:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33M91E7U074792; Sat, 22 Apr 2023 09:01:14 GMT (envelope-from git) Date: Sat, 22 Apr 2023 09:01:14 GMT Message-Id: <202304220901.33M91E7U074792@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: 859735832d83 - stable/12 - bsnmp: make single bit bitfields unsigned to avoid clang 16 warning List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: 859735832d83e80a32c974bf3324023442edfe70 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=859735832d83e80a32c974bf3324023442edfe70 commit 859735832d83e80a32c974bf3324023442edfe70 Author: Dimitry Andric AuthorDate: 2023-04-17 16:11:56 +0000 Commit: Dimitry Andric CommitDate: 2023-04-22 09:00:07 +0000 bsnmp: make single bit bitfields unsigned to avoid clang 16 warning Clang 16 introduced a warning about single bit bitfields in structs, which is triggered by a declaration in bsnmp's snmpd.h: contrib/bsnmp/snmpd/trans_lsock.c:271:21: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] peer->input.stream = 1; ^ ~ Signed one-bit bitfields can only have values -1 and 0, but the intent here is to use the field as a boolean, so make it unsigned. MFC after: 3 days (cherry picked from commit b740e02500ca248e1096cf745a17d2a8fcc44fed) --- contrib/bsnmp/snmpd/snmpd.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/bsnmp/snmpd/snmpd.h b/contrib/bsnmp/snmpd/snmpd.h index 48a7b44a04b2..394a4f4736d6 100644 --- a/contrib/bsnmp/snmpd/snmpd.h +++ b/contrib/bsnmp/snmpd/snmpd.h @@ -152,12 +152,12 @@ struct port_input { int fd; /* socket */ void *id; /* evSelect handle */ - int stream : 1; /* stream socket */ - int cred : 1; /* want credentials */ + u_int stream : 1; /* stream socket */ + u_int cred : 1; /* want credentials */ struct sockaddr *peer; /* last received packet */ socklen_t peerlen; - int priv : 1; /* peer is privileged */ + u_int priv : 1; /* peer is privileged */ u_char *buf; /* receive buffer */ size_t buflen; /* buffer length */ From nobody Sat Apr 22 09:01:15 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3QNq5xZcz46RXn; Sat, 22 Apr 2023 09:01: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 4Q3QNq54VFz4cYW; Sat, 22 Apr 2023 09:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682154075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8J45tg4zGiiBPnrUsSOurbe0siDGA0LsmWAAGtie6XQ=; b=fTg1oVs7/k6fmllqMRV/Ag6OSeTluFifDgwbFtx0dztxmwIftV+N9XJxNm5gGHzXcnNEPb dS6sgmFoNT0XB5iU2ZpEUEzaMHdsC78vLIbhJKitkoLRDI5ZzStjz2GvERPgnmhuVnd43f rTpkmo51k56FHcGM5UqAu1fVc9Z86km1aES33YK00RecnTVbOevmvZXJ+cfXI+f7OphMee mvSp62UJNV4aYeRzw/u+51P+paNRtKw16oDoeKeSSWIwjOl//v2YF5bvaElxTrXpR8n9vl uBeVauJZc7694DQB+TAm+66ab/tUXof6h+luKMXrqpqj4+oCp6Mj4zscQAjl7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682154075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8J45tg4zGiiBPnrUsSOurbe0siDGA0LsmWAAGtie6XQ=; b=l2/iyUj2XYa7GjLqg1l6ssfC/CULWlszu+OehjshKlxQpo3QwkFglsSx5JLlkBY2SRpvxK q/hyJosIiWsgIaG+0CM/C4xnQKZA9pWOAMkpy16lHHzPPiwybG7Uqg2zOlq86ch5h9FHJ+ Pr82mNEWsLnEPn2e45VPKHkD0mkzTGHsCDnqmKzt6sL4wHmeRqSS0OyzYwO4k7xiygY0Lm nzOKGr6j8x/lbOJHgASFPEdU7KKl8LXwsVnQ3TMy2DN2kk1dJJ5dGAGExHDWJ4qO5Tgl5z jx71ggwN2JRPVfj8/4+8VeV2TKJRgZTPO3xp3ia90HXEbJiqaoiYquS8HA3noQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682154075; a=rsa-sha256; cv=none; b=pGoaSDOIWQCbS5Q+74OXG7is7DVuymZ9V02euVvaB48kFKQlRiNKvVvAdNFCy2y/dvVanN DYrnYFQrEva2gH4OJojsGN9kjI/VqZ0AGA6JLzS4qE+AxMjy5+f/7gUJuxsfTpvetvGq47 Q05KJbZ0D3Lz3+CxY5YP+WBsKv1NYyjNn+a2ZfmaJq/2rASsUmi1hp5rze8CJbYcXy9lb5 cXtbbANMv5LR/O95K6hQT5sz3sJCiwVQ4CRqD+/HG+rmOhatTtO1uzD6HaWrwn6CdTd4AP 7MdZgGafnrf65WAvel640QayxANrF1LYmhq88/cv4r/BFPJQTZP7BIgZ/Zj6XQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3QNq3Qpzzw7d; Sat, 22 Apr 2023 09:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33M91Fbg074816; Sat, 22 Apr 2023 09:01:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33M91FLQ074815; Sat, 22 Apr 2023 09:01:15 GMT (envelope-from git) Date: Sat, 22 Apr 2023 09:01:15 GMT Message-Id: <202304220901.33M91FLQ074815@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: 449c2949368d - stable/12 - libarchive: make single bit bitfields unsigned to avoid clang 16 warning List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: 449c2949368d94093dace944defa479e1541b1f2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=449c2949368d94093dace944defa479e1541b1f2 commit 449c2949368d94093dace944defa479e1541b1f2 Author: Dimitry Andric AuthorDate: 2023-04-17 16:20:56 +0000 Commit: Dimitry Andric CommitDate: 2023-04-22 09:00:16 +0000 libarchive: make single bit bitfields unsigned to avoid clang 16 warning Clang 16 introduced a warning about single bit bitfields in structs, which is triggered by various declarations in libarchive: contrib/libarchive/libarchive/archive_write_set_format_7zip.c:1541:13: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] file->dir = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:5127:15: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] isoent->dir = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:5213:14: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] isoent->dir = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:5214:18: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] isoent->virtual = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:7149:18: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] isoent->virtual = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:7435:32: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] iso9660->zisofs.detect_magic = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:7495:25: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] iso9660->zisofs.making = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:7496:26: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] iso9660->zisofs.allzero = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:7702:28: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] iso9660->zisofs.allzero = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:7871:25: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] zisofs->header_passed = 1; ^ ~ contrib/libarchive/libarchive/archive_write_set_format_iso9660.c:7894:24: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] zisofs->initialized = 1; ^ ~ Signed one-bit bitfields can only have values -1 and 0, but the intent here is to use the fields as booleans, so make them unsigned. This has also been sent upstream. MFC after: 3 days (cherry picked from commit 67ecab6f50ff29e9bda340be1e9d2acc963c9a2b) --- .../libarchive/libarchive/archive_write_set_format_7zip.c | 2 +- .../libarchive/archive_write_set_format_iso9660.c | 14 +++++++------- .../libarchive/libarchive/archive_write_set_format_xar.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_write_set_format_7zip.c b/contrib/libarchive/libarchive/archive_write_set_format_7zip.c index d5ca9a665654..f4b34685d3d0 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_7zip.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_7zip.c @@ -165,7 +165,7 @@ struct file { mode_t mode; uint32_t crc32; - signed int dir:1; + unsigned int dir:1; }; struct _7zip { diff --git a/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c b/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c index 58b7216a8071..b3e41d4ab997 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c @@ -289,12 +289,12 @@ struct isoent { struct extr_rec *current; } extr_rec_list; - signed int virtual:1; + unsigned int virtual:1; /* If set to one, this file type is a directory. * A convenience flag to be used as * "archive_entry_filetype(isoent->file->entry) == AE_IFDIR". */ - signed int dir:1; + unsigned int dir:1; }; struct hardlink { @@ -755,9 +755,9 @@ struct iso9660 { /* Used for making zisofs. */ struct { - signed int detect_magic:1; - signed int making:1; - signed int allzero:1; + unsigned int detect_magic:1; + unsigned int making:1; + unsigned int allzero:1; unsigned char magic_buffer[64]; int magic_cnt; @@ -7802,8 +7802,8 @@ struct zisofs_extract { uint64_t pz_uncompressed_size; size_t uncompressed_buffer_size; - signed int initialized:1; - signed int header_passed:1; + unsigned int initialized:1; + unsigned int header_passed:1; uint32_t pz_offset; unsigned char *block_pointers; diff --git a/contrib/libarchive/libarchive/archive_write_set_format_xar.c b/contrib/libarchive/libarchive/archive_write_set_format_xar.c index d885f5c256d3..9d5e5dd41cbb 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_xar.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_xar.c @@ -212,8 +212,8 @@ struct file { struct heap_data data; struct archive_string script; - signed int virtual:1; - signed int dir:1; + unsigned int virtual:1; + unsigned int dir:1; }; struct hardlink { From nobody Sat Apr 22 09:01:16 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3QNr60qQz46RQT; Sat, 22 Apr 2023 09:01: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 4Q3QNr562Cz4cZ4; Sat, 22 Apr 2023 09:01:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682154076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tI9nHMXDjR9xvgpRPIYNE0S7QNifvjnTuR8LIgkp4cY=; b=GBVNnA/lguPBooAjlVg2Uq3qNR4oBxPsZOBUHqkv4v08DxyLtfSWzhjoymRaMK5KEOEXCK GCKSZ19YQla6iyZpjQsGQNUN5n6G3BItZAXLseAiKQ8xRdPu9j1STheIgoL0MQILspdVYa 5xVpo/nDtkeJtjqycws7vihvEMYyBAj6+w0HqO8+M9lsfXOsNvXzx3HzScO4ODDEqPEU02 x52bKO5YLtbllCKPWwuMOrXyw0nw/w+CWfaUMcC575AYuQpkVQibJGYOqqG3oosv4Hn48c ebVk2C+JKmDhLRgvEazgRV/YvxCCoNkF8ujKfJryDCNB0mk1M1Xo7VXOPHrlug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682154076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tI9nHMXDjR9xvgpRPIYNE0S7QNifvjnTuR8LIgkp4cY=; b=PtMGerAQSdaojCvPcPcv3AcTtFKewJdGFmzIrOH4ACX1bkdyyQ3OQkNU+0k3udTRnFtOH3 EulFvrRFc81hPyV2vpbpD6qBuVS886aVBSM/d9oaQpsWo7ajIj9b6SfJ3HDs1eNeVTmFvZ btkHnkVOVpV3MfgLn0e0TiAP178FxgtGbvfi4IQ2C+7gYtyyE14SZWOcqmAIUvaRWysbhp +RgbG3mv5teTbrmtWvP/eNAhmPMGAa62HCdUTswx+FssLwS+LD0/NLn5c8jXqPCsDYowCh +u4pUigOPY+bLqSGV6vveyzmkU+WkF/S90Zen/hftdiK/DuS+4kUJhlL3pz17A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682154076; a=rsa-sha256; cv=none; b=pqAOXVs7jNC/UaWoR7fW/iy1x+R4G9g/zjwSybSl1pikMJoboNXsliAd1IKaO2rxSpKcmc HVPGn8SLhQFhOggo1Q/JylFEj8sVTS5BqX7kINGwe4mW5p59waUzBdFrZJDGDsnWIEh1W7 cmX9Xerbm6MBlIUROMxNTASScohi+F4D13i1WnNd5UgqAfUG9FTwRKcB/PqfIlbtSdrhz5 Cg/dBXpzaosU13OlHHorsGGDxukvWLri9kzr/EsDF3/kA1U5V6BdbbA4v+QDszbcgdWlxs kGDlTFtk+5BRvhxWEJC4o4q+LwZmR4tI3avjD2o+OTinIGiaWiIe62vmkgjo/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 4Q3QNr4CqqzwBg; Sat, 22 Apr 2023 09:01:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33M91GZr074838; Sat, 22 Apr 2023 09:01:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33M91Gl5074837; Sat, 22 Apr 2023 09:01:16 GMT (envelope-from git) Date: Sat, 22 Apr 2023 09:01:16 GMT Message-Id: <202304220901.33M91Gl5074837@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: 17eaa359dcb5 - stable/12 - ichiic: use bool for one-bit wide bit-fields List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: 17eaa359dcb5cb51f5b1a23d34a5c744e350ad8e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=17eaa359dcb5cb51f5b1a23d34a5c744e350ad8e commit 17eaa359dcb5cb51f5b1a23d34a5c744e350ad8e Author: Dimitry Andric AuthorDate: 2023-04-18 18:08:28 +0000 Commit: Dimitry Andric CommitDate: 2023-04-22 09:00:22 +0000 ichiic: use bool for one-bit wide bit-fields A one-bit wide bit-field can take only the values 0 and -1. Clang 16 introduced a warning that "implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1". Fix by using c99 bool. Reported by: Clang Reviewed by: emaste, wulf MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39665 (cherry picked from commit 87f55ab0b46ad72efee11d1b64ec8f839bb013da) --- sys/dev/ichiic/ig4_acpi.c | 4 ++-- sys/dev/ichiic/ig4_iic.c | 8 ++++---- sys/dev/ichiic/ig4_pci.c | 4 ++-- sys/dev/ichiic/ig4_var.h | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/dev/ichiic/ig4_acpi.c b/sys/dev/ichiic/ig4_acpi.c index 673f160c6312..44d07eff9ac8 100644 --- a/sys/dev/ichiic/ig4_acpi.c +++ b/sys/dev/ichiic/ig4_acpi.c @@ -107,7 +107,7 @@ ig4iic_acpi_attach(device_t dev) ig4iic_acpi_detach(dev); return (ENXIO); } - sc->platform_attached = 1; + sc->platform_attached = true; error = ig4iic_attach(sc); if (error) @@ -126,7 +126,7 @@ ig4iic_acpi_detach(device_t dev) error = ig4iic_detach(sc); if (error) return (error); - sc->platform_attached = 0; + sc->platform_attached = false; } if (sc->intr_res) { diff --git a/sys/dev/ichiic/ig4_iic.c b/sys/dev/ichiic/ig4_iic.c index f24b26f53366..b4ef235bcf38 100644 --- a/sys/dev/ichiic/ig4_iic.c +++ b/sys/dev/ichiic/ig4_iic.c @@ -337,9 +337,9 @@ set_slave_addr(ig4iic_softc_t *sc, uint8_t slave) { uint32_t tar; uint32_t ctl; - int use_10bit; + bool use_10bit; - use_10bit = 0; + use_10bit = false; if (sc->slave_valid && sc->last_slave == slave && sc->use_10bit == use_10bit) { return; @@ -364,7 +364,7 @@ set_slave_addr(ig4iic_softc_t *sc, uint8_t slave) reg_write(sc, IG4_REG_CTL, ctl); reg_write(sc, IG4_REG_TAR_ADD, tar); set_controller(sc, IG4_I2C_ENABLE); - sc->slave_valid = 1; + sc->slave_valid = true; sc->last_slave = slave; } @@ -1009,7 +1009,7 @@ ig4iic_set_config(ig4iic_softc_t *sc, bool reset) (sc->cfg.bus_speed & IG4_CTL_SPEED_MASK)); /* Force setting of the target address on the next transfer */ - sc->slave_valid = 0; + sc->slave_valid = false; return (0); } diff --git a/sys/dev/ichiic/ig4_pci.c b/sys/dev/ichiic/ig4_pci.c index 71b95c3d95fb..d6906aa80e1a 100644 --- a/sys/dev/ichiic/ig4_pci.c +++ b/sys/dev/ichiic/ig4_pci.c @@ -316,7 +316,7 @@ ig4iic_pci_attach(device_t dev) ig4iic_pci_detach(dev); return (ENXIO); } - sc->platform_attached = 1; + sc->platform_attached = true; error = ig4iic_attach(sc); if (error) @@ -335,7 +335,7 @@ ig4iic_pci_detach(device_t dev) error = ig4iic_detach(sc); if (error) return (error); - sc->platform_attached = 0; + sc->platform_attached = false; } if (sc->intr_res) { diff --git a/sys/dev/ichiic/ig4_var.h b/sys/dev/ichiic/ig4_var.h index da81980039f1..3cad69cf57e3 100644 --- a/sys/dev/ichiic/ig4_var.h +++ b/sys/dev/ichiic/ig4_var.h @@ -91,10 +91,10 @@ struct ig4iic_softc { struct ig4_cfg cfg; uint32_t intr_mask; uint8_t last_slave; - int platform_attached : 1; - int use_10bit : 1; - int slave_valid : 1; - int poll: 1; + bool platform_attached : 1; + bool use_10bit : 1; + bool slave_valid : 1; + bool poll: 1; /* * Locking semantics: