From nobody Mon Apr 13 00:12:11 2026 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 4fv7Bn1C4yz6ZBPb for ; Mon, 13 Apr 2026 00:12: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv7Bm6pH4z3VTK for ; Mon, 13 Apr 2026 00:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776039136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Thc9Mu9Yy0fKenP4afZKKEUwt9bqMu1ceGdY0T/JCQ=; b=dKI4tSSqJ+MolvVBil6PlqvOs1Jmcna2soC8AiL/vlYmNLLpRtTH4ImAvZgf6vXKKPapi0 nhC4KaVafSSPhFFpYQjAaEhQRG0CQw0rteWizSGle55lGsyZOtrLp11qvnaaI2ycQu3F5n MBD0lfQoMqHNSQ7d9Do8IXeskMZ+h4+C5ZWO52W3JJbnrwHcz3oZsuTc6bRjscP+7QuVO0 ug+8W4NyAr+i01/sTY2U29hHohZvP1gthBQTD4dYz7TtB8+eF+P56CmjHbzlHka/CIV7YI Mp0s+DFlTdCmbYndj7m9UsaHzN7lhO27/jJto0JPttdAlZuFuzayVj9gnLNgQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776039136; a=rsa-sha256; cv=none; b=UdigQYkTIXS4BNfFn/uDjnBfrpduHYLGqfUwOCQcZS45lNEEw/eyOilx+Ioa0m8GXd+IUl CJSw9LXRGcpPBUhcd9+GZTzpO2rp2o7KmldpC8mxqZtCN64QayZKHXEJ5iHrrRXgQKZgX8 Njfw5lxq21uy+fkDHpTRfjGsfVkeh2Y79n1PHrq2dhWT17e803/C3gzOFWbv0Moyvv04qx iXorj3X9rP6Iilix6Sna/iQdvajkxLrI963I8C6HiMQ92bTsKtZecGlxGtr+mrA6meEbFp cfQzFRVbgfHcgMXOXy1oDMja/zxHG5wuPa0E35uKjyiDA9YExDT7ZXNlEiIfaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776039136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Thc9Mu9Yy0fKenP4afZKKEUwt9bqMu1ceGdY0T/JCQ=; b=gpjgPkiX8oiE8kNSijI9gwjWjlztJ/z/ewVPCDEVTlbW6XtONFlMR+5wU3DIHrQDQirJPu BviOM2AgbHAEANgGB+cqItlqCj8K0cGBCKcOrDq/uyaHoxzm2oSnkc7mw3pRA1I3BLTU3T eqxlmNHgBzNj2XMBDnJKphttQu9C9k5dMFOWS7tGs+I2AflVx5HzcOiUJWoteleRH44SpP vjVJ2U/XuNqVgUpiRq8Zoo2cXaXRYFVo+CQewICNBRyslpvIVn2HSQxCXGAA44LpkYzKHD ZHNdb1eJ0S7VGxAqgCAUDvHBiHzlgCUCy8Fz2W+i4oC/ap1ZHczC3HSXHWyQaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv7Bm64mYzgbd for ; Mon, 13 Apr 2026 00:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 345c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 00:12:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 27ac9d336f71 - stable/14 - crypto/openssl: update from 3.0.16 to 3.0.20 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 27ac9d336f715b4ce91bf447f73d5c3621d099ce Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 00:12:11 +0000 Message-Id: <69dc34db.345c2.36ced66d@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=27ac9d336f715b4ce91bf447f73d5c3621d099ce commit 27ac9d336f715b4ce91bf447f73d5c3621d099ce Author: Enji Cooper AuthorDate: 2026-04-13 00:10:02 +0000 Commit: Enji Cooper CommitDate: 2026-04-13 00:10:02 +0000 crypto/openssl: update from 3.0.16 to 3.0.20 ### Description This particular change contains all functional and security fixes made between 3.0.16 and 3.0.20, with the net-resulting security issues being the ones addressed in 3.0.20 [1] [2]. This is a direct commit to stable/14 as stable/15 and later use OpenSSL 3.5, as of writing, and thus this change could not have been merged through main and stable/15 since the 3.0.17+ was released after :main switched to OpenSSL 3.5. This does not contain any merge commits as any MFV changes are banned unless they go through :main. ### Process used when updating the component 1. Run the subtree merge command in a staging tree. 2. Resolve conflicts. 3. Compare against reference branch. 4. Pull over remaining changes adding new manpages to the build. 5. Take changes from staging tree over to stable/14 . ### Test Plan Tested with sanity checks on 14-STABLE (amd64) and `make tinderbox` on all 14-STABLE supported architectures. 1. https://github.com/openssl/openssl/releases/tag/openssl-3.0.20 2. https://github.com/openssl/openssl/blob/openssl-3.0.20/CHANGES.md --- crypto/openssl/ACKNOWLEDGEMENTS.md | 4 +- crypto/openssl/CHANGES.md | 781 +- crypto/openssl/Configurations/10-main.conf | 3 +- crypto/openssl/Configurations/50-nonstop.conf | 2 + crypto/openssl/Configurations/unix-Makefile.tmpl | 17 +- .../openssl/Configurations/windows-makefile.tmpl | 5 +- crypto/openssl/Configure | 7 +- crypto/openssl/INSTALL.md | 4 +- crypto/openssl/NEWS.md | 460 +- crypto/openssl/NOTES-WINDOWS.md | 5 + crypto/openssl/README-ENGINES.md | 2 +- crypto/openssl/README.md | 9 +- crypto/openssl/VERSION.dat | 4 +- crypto/openssl/apps/CA.pl | 383 + crypto/openssl/apps/CA.pl.in | 260 +- crypto/openssl/apps/asn1parse.c | 72 +- crypto/openssl/apps/ca.c | 742 +- crypto/openssl/apps/ciphers.c | 55 +- crypto/openssl/apps/cmp.c | 1163 +- crypto/openssl/apps/cms.c | 491 +- crypto/openssl/apps/crl.c | 124 +- crypto/openssl/apps/crl2pkcs7.c | 36 +- crypto/openssl/apps/dgst.c | 141 +- crypto/openssl/apps/dhparam.c | 152 +- crypto/openssl/apps/dsa.c | 78 +- crypto/openssl/apps/dsaparam.c | 64 +- crypto/openssl/apps/ec.c | 78 +- crypto/openssl/apps/ecparam.c | 127 +- crypto/openssl/apps/enc.c | 180 +- crypto/openssl/apps/engine.c | 112 +- crypto/openssl/apps/errstr.c | 17 +- crypto/openssl/apps/fipsinstall.c | 192 +- crypto/openssl/apps/gendsa.c | 39 +- crypto/openssl/apps/genpkey.c | 67 +- crypto/openssl/apps/genrsa.c | 57 +- crypto/openssl/apps/include/app_libctx.h | 4 +- crypto/openssl/apps/include/app_params.h | 1 - crypto/openssl/apps/include/apps.h | 262 +- crypto/openssl/apps/include/apps_ui.h | 5 +- crypto/openssl/apps/include/cmp_mock_srv.h | 18 +- crypto/openssl/apps/include/engine_loader.h | 8 +- crypto/openssl/apps/include/fmt.h | 32 +- crypto/openssl/apps/include/function.h | 17 +- crypto/openssl/apps/include/http_server.h | 86 +- crypto/openssl/apps/include/names.h | 2 +- crypto/openssl/apps/include/opt.h | 544 +- crypto/openssl/apps/include/platform.h | 12 +- crypto/openssl/apps/include/s_apps.h | 56 +- crypto/openssl/apps/include/vms_term_sock.h | 12 +- crypto/openssl/apps/info.c | 36 +- crypto/openssl/apps/kdf.c | 45 +- crypto/openssl/apps/lib/app_libctx.c | 3 +- crypto/openssl/apps/lib/app_params.c | 7 +- crypto/openssl/apps/lib/app_provider.c | 5 +- crypto/openssl/apps/lib/app_rand.c | 7 +- crypto/openssl/apps/lib/app_x509.c | 54 +- crypto/openssl/apps/lib/apps.c | 825 +- crypto/openssl/apps/lib/apps_ui.c | 39 +- crypto/openssl/apps/lib/cmp_mock_srv.c | 121 +- crypto/openssl/apps/lib/columns.c | 1 - crypto/openssl/apps/lib/engine.c | 15 +- crypto/openssl/apps/lib/engine_loader.c | 38 +- crypto/openssl/apps/lib/http_server.c | 126 +- crypto/openssl/apps/lib/names.c | 2 +- crypto/openssl/apps/lib/opt.c | 271 +- crypto/openssl/apps/lib/s_cb.c | 625 +- crypto/openssl/apps/lib/s_socket.c | 119 +- crypto/openssl/apps/lib/tlssrp_depr.c | 47 +- crypto/openssl/apps/lib/vms_decc_argv.c | 2 +- crypto/openssl/apps/lib/vms_term_sock.c | 517 +- crypto/openssl/apps/lib/win32_init.c | 31 +- crypto/openssl/apps/list.c | 484 +- crypto/openssl/apps/mac.c | 42 +- crypto/openssl/apps/nseq.c | 22 +- crypto/openssl/apps/ocsp.c | 487 +- crypto/openssl/apps/openssl.c | 58 +- crypto/openssl/apps/passwd.c | 253 +- crypto/openssl/apps/pkcs12.c | 342 +- crypto/openssl/apps/pkcs7.c | 39 +- crypto/openssl/apps/pkcs8.c | 88 +- crypto/openssl/apps/pkey.c | 100 +- crypto/openssl/apps/pkeyparam.c | 32 +- crypto/openssl/apps/pkeyutl.c | 244 +- crypto/openssl/apps/prime.c | 39 +- crypto/openssl/apps/progs.pl | 11 +- crypto/openssl/apps/rand.c | 28 +- crypto/openssl/apps/rehash.c | 169 +- crypto/openssl/apps/req.c | 450 +- crypto/openssl/apps/rsa.c | 103 +- crypto/openssl/apps/rsautl.c | 91 +- crypto/openssl/apps/s_client.c | 1742 +- crypto/openssl/apps/s_server.c | 929 +- crypto/openssl/apps/s_time.c | 164 +- crypto/openssl/apps/sess_id.c | 42 +- crypto/openssl/apps/smime.c | 208 +- crypto/openssl/apps/speed.c | 1256 +- crypto/openssl/apps/spkac.c | 56 +- crypto/openssl/apps/srp.c | 196 +- crypto/openssl/apps/storeutl.c | 181 +- crypto/openssl/apps/testdsa.h | 1490 +- crypto/openssl/apps/testrsa.h | 4912 +++- crypto/openssl/apps/timeouts.h | 8 +- crypto/openssl/apps/ts.c | 269 +- crypto/openssl/apps/verify.c | 137 +- crypto/openssl/apps/version.c | 53 +- crypto/openssl/apps/vms_decc_init.c | 73 +- crypto/openssl/apps/x509.c | 389 +- crypto/openssl/configdata.pm.in | 4 +- crypto/openssl/crypto/LPdir_nyi.c | 2 +- crypto/openssl/crypto/LPdir_unix.c | 23 +- crypto/openssl/crypto/LPdir_vms.c | 24 +- crypto/openssl/crypto/LPdir_win.c | 35 +- crypto/openssl/crypto/LPdir_win32.c | 2 + crypto/openssl/crypto/LPdir_wince.c | 2 + crypto/openssl/crypto/aes/aes_cbc.c | 8 +- crypto/openssl/crypto/aes/aes_cfb.c | 18 +- crypto/openssl/crypto/aes/aes_core.c | 3589 ++- crypto/openssl/crypto/aes/aes_ecb.c | 2 +- crypto/openssl/crypto/aes/aes_ige.c | 56 +- crypto/openssl/crypto/aes/aes_local.h | 51 +- crypto/openssl/crypto/aes/aes_misc.c | 6 +- crypto/openssl/crypto/aes/aes_ofb.c | 6 +- crypto/openssl/crypto/aes/aes_wrap.c | 12 +- crypto/openssl/crypto/aes/aes_x86core.c | 594 +- crypto/openssl/crypto/aes/asm/aes-s390x.pl | 5 +- crypto/openssl/crypto/aes/asm/aesv8-armx.pl | 8 +- crypto/openssl/crypto/aria/aria.c | 337 +- crypto/openssl/crypto/arm_arch.h | 165 +- crypto/openssl/crypto/armcap.c | 154 +- crypto/openssl/crypto/asn1/a_bitstr.c | 12 +- crypto/openssl/crypto/asn1/a_d2i_fp.c | 40 +- crypto/openssl/crypto/asn1/a_digest.c | 9 +- crypto/openssl/crypto/asn1/a_dup.c | 6 +- crypto/openssl/crypto/asn1/a_gentm.c | 8 +- crypto/openssl/crypto/asn1/a_i2d_fp.c | 4 +- crypto/openssl/crypto/asn1/a_int.c | 33 +- crypto/openssl/crypto/asn1/a_mbstr.c | 58 +- crypto/openssl/crypto/asn1/a_object.c | 32 +- crypto/openssl/crypto/asn1/a_octet.c | 4 +- crypto/openssl/crypto/asn1/a_print.c | 3 +- crypto/openssl/crypto/asn1/a_sign.c | 43 +- crypto/openssl/crypto/asn1/a_strex.c | 91 +- crypto/openssl/crypto/asn1/a_strnid.c | 16 +- crypto/openssl/crypto/asn1/a_time.c | 53 +- crypto/openssl/crypto/asn1/a_type.c | 12 +- crypto/openssl/crypto/asn1/a_utctm.c | 2 +- crypto/openssl/crypto/asn1/a_utf8.c | 4 +- crypto/openssl/crypto/asn1/a_verify.c | 27 +- crypto/openssl/crypto/asn1/ameth_lib.c | 172 +- crypto/openssl/crypto/asn1/asn1_err.c | 366 +- crypto/openssl/crypto/asn1/asn1_gen.c | 103 +- crypto/openssl/crypto/asn1/asn1_item_list.h | 4 +- crypto/openssl/crypto/asn1/asn1_lib.c | 12 +- crypto/openssl/crypto/asn1/asn1_local.h | 28 +- crypto/openssl/crypto/asn1/asn1_parse.c | 74 +- crypto/openssl/crypto/asn1/asn_mime.c | 123 +- crypto/openssl/crypto/asn1/asn_mstbl.c | 12 +- crypto/openssl/crypto/asn1/asn_pack.c | 4 +- crypto/openssl/crypto/asn1/bio_asn1.c | 44 +- crypto/openssl/crypto/asn1/bio_ndef.c | 17 +- crypto/openssl/crypto/asn1/d2i_param.c | 2 +- crypto/openssl/crypto/asn1/d2i_pr.c | 41 +- crypto/openssl/crypto/asn1/d2i_pu.c | 4 +- crypto/openssl/crypto/asn1/evp_asn1.c | 26 +- crypto/openssl/crypto/asn1/f_int.c | 7 +- crypto/openssl/crypto/asn1/f_string.c | 4 +- crypto/openssl/crypto/asn1/i2d_evp.c | 34 +- crypto/openssl/crypto/asn1/n_pkey.c | 23 +- crypto/openssl/crypto/asn1/nsseq.c | 6 +- crypto/openssl/crypto/asn1/p5_pbe.c | 19 +- crypto/openssl/crypto/asn1/p5_pbev2.c | 55 +- crypto/openssl/crypto/asn1/p5_scrypt.c | 67 +- crypto/openssl/crypto/asn1/p8_pkey.c | 22 +- crypto/openssl/crypto/asn1/standard_methods.h | 1 - crypto/openssl/crypto/asn1/t_bitst.c | 4 +- crypto/openssl/crypto/asn1/t_pkey.c | 19 +- crypto/openssl/crypto/asn1/t_spki.c | 6 +- crypto/openssl/crypto/asn1/tasn_dec.c | 227 +- crypto/openssl/crypto/asn1/tasn_enc.c | 56 +- crypto/openssl/crypto/asn1/tasn_new.c | 30 +- crypto/openssl/crypto/asn1/tasn_prn.c | 92 +- crypto/openssl/crypto/asn1/tasn_scn.c | 2 +- crypto/openssl/crypto/asn1/tasn_typ.c | 26 +- crypto/openssl/crypto/asn1/tasn_utl.c | 22 +- crypto/openssl/crypto/asn1/tbl_standard.h | 85 +- crypto/openssl/crypto/asn1/x_algor.c | 21 +- crypto/openssl/crypto/asn1/x_bignum.c | 29 +- crypto/openssl/crypto/asn1/x_int64.c | 87 +- crypto/openssl/crypto/asn1/x_long.c | 25 +- crypto/openssl/crypto/asn1/x_sig.c | 8 +- crypto/openssl/crypto/asn1/x_spki.c | 10 +- crypto/openssl/crypto/asn1/x_val.c | 4 +- crypto/openssl/crypto/asn1_dsa.c | 61 +- crypto/openssl/crypto/async/arch/async_null.c | 1 - crypto/openssl/crypto/async/arch/async_null.h | 13 +- crypto/openssl/crypto/async/arch/async_posix.c | 6 +- crypto/openssl/crypto/async/arch/async_posix.h | 51 +- crypto/openssl/crypto/async/arch/async_win.c | 10 +- crypto/openssl/crypto/async/arch/async_win.h | 30 +- crypto/openssl/crypto/async/async.c | 29 +- crypto/openssl/crypto/async/async_err.c | 16 +- crypto/openssl/crypto/async/async_local.h | 9 +- crypto/openssl/crypto/async/async_wait.c | 48 +- crypto/openssl/crypto/bf/bf_cfb64.c | 8 +- crypto/openssl/crypto/bf/bf_ecb.c | 2 +- crypto/openssl/crypto/bf/bf_enc.c | 12 +- crypto/openssl/crypto/bf/bf_local.h | 134 +- crypto/openssl/crypto/bf/bf_ofb64.c | 8 +- crypto/openssl/crypto/bf/bf_pi.h | 1548 +- crypto/openssl/crypto/bio/bf_buff.c | 23 +- crypto/openssl/crypto/bio/bf_lbuf.c | 20 +- crypto/openssl/crypto/bio/bf_prefix.c | 14 +- crypto/openssl/crypto/bio/bf_readbuff.c | 64 +- crypto/openssl/crypto/bio/bio_addr.c | 162 +- crypto/openssl/crypto/bio/bio_cb.c | 22 +- crypto/openssl/crypto/bio/bio_dump.c | 26 +- crypto/openssl/crypto/bio/bio_err.c | 114 +- crypto/openssl/crypto/bio/bio_lib.c | 46 +- crypto/openssl/crypto/bio/bio_local.h | 153 +- crypto/openssl/crypto/bio/bio_meth.c | 46 +- crypto/openssl/crypto/bio/bio_print.c | 173 +- crypto/openssl/crypto/bio/bio_sock.c | 213 +- crypto/openssl/crypto/bio/bio_sock2.c | 87 +- crypto/openssl/crypto/bio/bss_acpt.c | 140 +- crypto/openssl/crypto/bio/bss_bio.c | 68 +- crypto/openssl/crypto/bio/bss_conn.c | 192 +- crypto/openssl/crypto/bio/bss_core.c | 8 +- crypto/openssl/crypto/bio/bss_dgram.c | 833 +- crypto/openssl/crypto/bio/bss_fd.c | 46 +- crypto/openssl/crypto/bio/bss_file.c | 88 +- crypto/openssl/crypto/bio/bss_log.c | 206 +- crypto/openssl/crypto/bio/bss_mem.c | 14 +- crypto/openssl/crypto/bio/bss_null.c | 2 +- crypto/openssl/crypto/bio/bss_sock.c | 101 +- crypto/openssl/crypto/bio/ossl_core_bio.c | 4 +- crypto/openssl/crypto/bn/asm/armv4-gf2m.pl | 4 +- crypto/openssl/crypto/bn/asm/rsaz-avx512.pl | 4 +- crypto/openssl/crypto/bn/asm/sparcv9-mont.pl | 4 +- crypto/openssl/crypto/bn/asm/x86_64-gcc.c | 306 +- crypto/openssl/crypto/bn/bn_add.c | 3 +- crypto/openssl/crypto/bn/bn_asm.c | 457 +- crypto/openssl/crypto/bn/bn_blind.c | 35 +- crypto/openssl/crypto/bn/bn_const.c | 253 +- crypto/openssl/crypto/bn/bn_conv.c | 14 +- crypto/openssl/crypto/bn/bn_ctx.c | 37 +- crypto/openssl/crypto/bn/bn_depr.c | 16 +- crypto/openssl/crypto/bn/bn_dh.c | 1135 +- crypto/openssl/crypto/bn/bn_div.c | 160 +- crypto/openssl/crypto/bn/bn_err.c | 54 +- crypto/openssl/crypto/bn/bn_exp.c | 344 +- crypto/openssl/crypto/bn/bn_exp2.c | 29 +- crypto/openssl/crypto/bn/bn_gcd.c | 35 +- crypto/openssl/crypto/bn/bn_gf2m.c | 158 +- crypto/openssl/crypto/bn/bn_intern.c | 14 +- crypto/openssl/crypto/bn/bn_kron.c | 6 +- crypto/openssl/crypto/bn/bn_lib.c | 74 +- crypto/openssl/crypto/bn/bn_local.h | 820 +- crypto/openssl/crypto/bn/bn_mod.c | 20 +- crypto/openssl/crypto/bn/bn_mont.c | 69 +- crypto/openssl/crypto/bn/bn_mpi.c | 3 +- crypto/openssl/crypto/bn/bn_mul.c | 69 +- crypto/openssl/crypto/bn/bn_nist.c | 432 +- crypto/openssl/crypto/bn/bn_ppc.c | 8 +- crypto/openssl/crypto/bn/bn_prime.c | 70 +- crypto/openssl/crypto/bn/bn_print.c | 6 +- crypto/openssl/crypto/bn/bn_rand.c | 78 +- crypto/openssl/crypto/bn/bn_recp.c | 12 +- crypto/openssl/crypto/bn/bn_rsa_fips186_4.c | 45 +- crypto/openssl/crypto/bn/bn_shift.c | 8 +- crypto/openssl/crypto/bn/bn_sparc.c | 65 +- crypto/openssl/crypto/bn/bn_sqr.c | 16 +- crypto/openssl/crypto/bn/bn_sqrt.c | 13 +- crypto/openssl/crypto/bn/bn_srp.c | 26 +- crypto/openssl/crypto/bn/bn_word.c | 3 +- crypto/openssl/crypto/bn/bn_x931p.c | 25 +- crypto/openssl/crypto/bn/rsaz_exp.c | 40 +- crypto/openssl/crypto/bn/rsaz_exp.h | 67 +- crypto/openssl/crypto/bn/rsaz_exp_x2.c | 182 +- crypto/openssl/crypto/bsearch.c | 12 +- crypto/openssl/crypto/buffer/buf_err.c | 2 +- crypto/openssl/crypto/camellia/camellia.c | 426 +- crypto/openssl/crypto/camellia/cmll_cbc.c | 8 +- crypto/openssl/crypto/camellia/cmll_cfb.c | 18 +- crypto/openssl/crypto/camellia/cmll_ctr.c | 10 +- crypto/openssl/crypto/camellia/cmll_ecb.c | 2 +- crypto/openssl/crypto/camellia/cmll_local.h | 18 +- crypto/openssl/crypto/camellia/cmll_misc.c | 6 +- crypto/openssl/crypto/camellia/cmll_ofb.c | 6 +- crypto/openssl/crypto/cast/c_cfb64.c | 8 +- crypto/openssl/crypto/cast/c_ecb.c | 2 +- crypto/openssl/crypto/cast/c_enc.c | 4 +- crypto/openssl/crypto/cast/c_ofb64.c | 8 +- crypto/openssl/crypto/cast/c_skey.c | 15 +- crypto/openssl/crypto/cast/cast_local.h | 321 +- crypto/openssl/crypto/cast/cast_s.h | 2560 +- crypto/openssl/crypto/chacha/chacha_enc.c | 45 +- crypto/openssl/crypto/chacha/chacha_ppc.c | 24 +- crypto/openssl/crypto/cmac/cmac.c | 3 +- crypto/openssl/crypto/cmp/cmp_asn.c | 189 +- crypto/openssl/crypto/cmp/cmp_client.c | 207 +- crypto/openssl/crypto/cmp/cmp_ctx.c | 208 +- crypto/openssl/crypto/cmp/cmp_err.c | 302 +- crypto/openssl/crypto/cmp/cmp_hdr.c | 50 +- crypto/openssl/crypto/cmp/cmp_http.c | 36 +- crypto/openssl/crypto/cmp/cmp_local.h | 212 +- crypto/openssl/crypto/cmp/cmp_msg.c | 275 +- crypto/openssl/crypto/cmp/cmp_protect.c | 48 +- crypto/openssl/crypto/cmp/cmp_server.c | 128 +- crypto/openssl/crypto/cmp/cmp_status.c | 59 +- crypto/openssl/crypto/cmp/cmp_util.c | 76 +- crypto/openssl/crypto/cmp/cmp_vfy.c | 200 +- crypto/openssl/crypto/cms/cms_asn1.c | 301 +- crypto/openssl/crypto/cms/cms_att.c | 88 +- crypto/openssl/crypto/cms/cms_cd.c | 8 +- crypto/openssl/crypto/cms/cms_dd.c | 13 +- crypto/openssl/crypto/cms/cms_dh.c | 43 +- crypto/openssl/crypto/cms/cms_ec.c | 42 +- crypto/openssl/crypto/cms/cms_enc.c | 32 +- crypto/openssl/crypto/cms/cms_env.c | 192 +- crypto/openssl/crypto/cms/cms_err.c | 304 +- crypto/openssl/crypto/cms/cms_ess.c | 59 +- crypto/openssl/crypto/cms/cms_io.c | 30 +- crypto/openssl/crypto/cms/cms_kari.c | 110 +- crypto/openssl/crypto/cms/cms_lib.c | 41 +- crypto/openssl/crypto/cms/cms_local.h | 86 +- crypto/openssl/crypto/cms/cms_pwri.c | 66 +- crypto/openssl/crypto/cms/cms_rsa.c | 43 +- crypto/openssl/crypto/cms/cms_sd.c | 152 +- crypto/openssl/crypto/cms/cms_smime.c | 143 +- crypto/openssl/crypto/comp/c_zlib.c | 174 +- crypto/openssl/crypto/comp/comp_err.c | 22 +- crypto/openssl/crypto/comp/comp_lib.c | 6 +- crypto/openssl/crypto/comp/comp_local.h | 22 +- crypto/openssl/crypto/conf/conf_api.c | 6 +- crypto/openssl/crypto/conf/conf_def.c | 78 +- crypto/openssl/crypto/conf/conf_err.c | 90 +- crypto/openssl/crypto/conf/conf_lib.c | 27 +- crypto/openssl/crypto/conf/conf_mod.c | 67 +- crypto/openssl/crypto/conf/conf_sap.c | 6 +- crypto/openssl/crypto/conf/conf_ssl.c | 13 +- crypto/openssl/crypto/context.c | 38 +- crypto/openssl/crypto/core_algorithm.c | 52 +- crypto/openssl/crypto/core_fetch.c | 34 +- crypto/openssl/crypto/core_namemap.c | 75 +- crypto/openssl/crypto/cpt_err.c | 82 +- crypto/openssl/crypto/cpuid.c | 41 +- crypto/openssl/crypto/crmf/crmf_asn.c | 81 +- crypto/openssl/crypto/crmf/crmf_err.c | 88 +- crypto/openssl/crypto/crmf/crmf_lib.c | 236 +- crypto/openssl/crypto/crmf/crmf_local.h | 25 +- crypto/openssl/crypto/crmf/crmf_pbm.c | 29 +- crypto/openssl/crypto/cryptlib.c | 112 +- crypto/openssl/crypto/ct/ct_b64.c | 16 +- crypto/openssl/crypto/ct/ct_err.c | 62 +- crypto/openssl/crypto/ct/ct_local.h | 97 +- crypto/openssl/crypto/ct/ct_log.c | 27 +- crypto/openssl/crypto/ct/ct_oct.c | 22 +- crypto/openssl/crypto/ct/ct_policy.c | 13 +- crypto/openssl/crypto/ct/ct_prn.c | 16 +- crypto/openssl/crypto/ct/ct_sct.c | 11 +- crypto/openssl/crypto/ct/ct_sct_ctx.c | 13 +- crypto/openssl/crypto/ct/ct_vfy.c | 9 +- crypto/openssl/crypto/ct/ct_x509v3.c | 62 +- crypto/openssl/crypto/ctype.c | 414 +- crypto/openssl/crypto/der_writer.c | 23 +- crypto/openssl/crypto/des/cbc_cksm.c | 4 +- crypto/openssl/crypto/des/cbc_enc.c | 2 + crypto/openssl/crypto/des/cfb64ede.c | 16 +- crypto/openssl/crypto/des/cfb64enc.c | 8 +- crypto/openssl/crypto/des/cfb_enc.c | 13 +- crypto/openssl/crypto/des/des_enc.c | 144 +- crypto/openssl/crypto/des/des_local.h | 381 +- crypto/openssl/crypto/des/ecb3_enc.c | 4 +- crypto/openssl/crypto/des/ecb_enc.c | 3 +- crypto/openssl/crypto/des/fcrypt.c | 154 +- crypto/openssl/crypto/des/fcrypt_b.c | 52 +- crypto/openssl/crypto/des/ncbc_enc.c | 6 +- crypto/openssl/crypto/des/ofb64ede.c | 10 +- crypto/openssl/crypto/des/ofb64enc.c | 8 +- crypto/openssl/crypto/des/ofb_enc.c | 8 +- crypto/openssl/crypto/des/pcbc_enc.c | 4 +- crypto/openssl/crypto/des/qud_cksm.c | 22 +- crypto/openssl/crypto/des/set_key.c | 725 +- crypto/openssl/crypto/des/spr.h | 640 +- crypto/openssl/crypto/des/xcbc_enc.c | 6 +- crypto/openssl/crypto/dh/dh_ameth.c | 48 +- crypto/openssl/crypto/dh/dh_asn1.c | 38 +- crypto/openssl/crypto/dh/dh_backend.c | 21 +- crypto/openssl/crypto/dh/dh_check.c | 8 +- crypto/openssl/crypto/dh/dh_depr.c | 2 +- crypto/openssl/crypto/dh/dh_err.c | 92 +- crypto/openssl/crypto/dh/dh_gen.c | 18 +- crypto/openssl/crypto/dh/dh_group_params.c | 5 +- crypto/openssl/crypto/dh/dh_kdf.c | 26 +- crypto/openssl/crypto/dh/dh_key.c | 59 +- crypto/openssl/crypto/dh/dh_lib.c | 16 +- crypto/openssl/crypto/dh/dh_local.h | 24 +- crypto/openssl/crypto/dh/dh_meth.c | 28 +- crypto/openssl/crypto/dh/dh_pmeth.c | 53 +- crypto/openssl/crypto/dh/dh_rfc5114.c | 34 +- crypto/openssl/crypto/dllmain.c | 7 +- crypto/openssl/crypto/dsa/dsa_ameth.c | 157 +- crypto/openssl/crypto/dsa/dsa_asn1.c | 30 +- crypto/openssl/crypto/dsa/dsa_backend.c | 24 +- crypto/openssl/crypto/dsa/dsa_check.c | 8 +- crypto/openssl/crypto/dsa/dsa_depr.c | 10 +- crypto/openssl/crypto/dsa/dsa_err.c | 50 +- crypto/openssl/crypto/dsa/dsa_gen.c | 24 +- crypto/openssl/crypto/dsa/dsa_key.c | 18 +- crypto/openssl/crypto/dsa/dsa_lib.c | 19 +- crypto/openssl/crypto/dsa/dsa_local.h | 38 +- crypto/openssl/crypto/dsa/dsa_meth.c | 52 +- crypto/openssl/crypto/dsa/dsa_ossl.c | 70 +- crypto/openssl/crypto/dsa/dsa_pmeth.c | 39 +- crypto/openssl/crypto/dsa/dsa_sign.c | 14 +- crypto/openssl/crypto/dsa/dsa_vrf.c | 2 +- crypto/openssl/crypto/dso/dso_dl.c | 59 +- crypto/openssl/crypto/dso/dso_dlfcn.c | 132 +- crypto/openssl/crypto/dso/dso_err.c | 56 +- crypto/openssl/crypto/dso/dso_lib.c | 8 +- crypto/openssl/crypto/dso/dso_local.h | 16 +- crypto/openssl/crypto/dso/dso_vms.c | 162 +- crypto/openssl/crypto/dso/dso_win32.c | 160 +- crypto/openssl/crypto/ebcdic.c | 110 +- crypto/openssl/crypto/ec/curve25519.c | 5131 ++-- .../crypto/ec/curve448/arch_32/arch_intrinsics.h | 8 +- crypto/openssl/crypto/ec/curve448/arch_32/f_impl.h | 18 +- .../openssl/crypto/ec/curve448/arch_32/f_impl32.c | 10 +- .../crypto/ec/curve448/arch_64/arch_intrinsics.h | 12 +- crypto/openssl/crypto/ec/curve448/arch_64/f_impl.h | 15 +- .../openssl/crypto/ec/curve448/arch_64/f_impl64.c | 8 +- crypto/openssl/crypto/ec/curve448/curve448.c | 222 +- crypto/openssl/crypto/ec/curve448/curve448_local.h | 22 +- .../openssl/crypto/ec/curve448/curve448_tables.c | 3028 +-- crypto/openssl/crypto/ec/curve448/curve448utils.h | 44 +- crypto/openssl/crypto/ec/curve448/ed448.h | 102 +- crypto/openssl/crypto/ec/curve448/eddsa.c | 232 +- crypto/openssl/crypto/ec/curve448/f_generic.c | 25 +- crypto/openssl/crypto/ec/curve448/field.h | 87 +- crypto/openssl/crypto/ec/curve448/point_448.h | 101 +- crypto/openssl/crypto/ec/curve448/scalar.c | 82 +- crypto/openssl/crypto/ec/curve448/word.h | 48 +- crypto/openssl/crypto/ec/ec2_oct.c | 34 +- crypto/openssl/crypto/ec/ec2_smpl.c | 122 +- crypto/openssl/crypto/ec/ec_ameth.c | 89 +- crypto/openssl/crypto/ec/ec_asn1.c | 150 +- crypto/openssl/crypto/ec/ec_backend.c | 93 +- crypto/openssl/crypto/ec/ec_check.c | 14 +- crypto/openssl/crypto/ec/ec_curve.c | 1560 +- crypto/openssl/crypto/ec/ec_cvt.c | 4 +- crypto/openssl/crypto/ec/ec_deprecated.c | 8 +- crypto/openssl/crypto/ec/ec_err.c | 212 +- crypto/openssl/crypto/ec/ec_key.c | 44 +- crypto/openssl/crypto/ec/ec_kmeth.c | 147 +- crypto/openssl/crypto/ec/ec_lib.c | 188 +- crypto/openssl/crypto/ec/ec_local.h | 496 +- crypto/openssl/crypto/ec/ec_mult.c | 113 +- crypto/openssl/crypto/ec/ec_oct.c | 34 +- crypto/openssl/crypto/ec/ec_pmeth.c | 29 +- crypto/openssl/crypto/ec/ec_print.c | 6 +- crypto/openssl/crypto/ec/ecdh_kdf.c | 22 +- crypto/openssl/crypto/ec/ecdh_ossl.c | 9 +- crypto/openssl/crypto/ec/ecdsa_ossl.c | 51 +- crypto/openssl/crypto/ec/ecdsa_sign.c | 13 +- crypto/openssl/crypto/ec/ecdsa_vrf.c | 6 +- crypto/openssl/crypto/ec/eck_prn.c | 23 +- crypto/openssl/crypto/ec/ecp_mont.c | 32 +- crypto/openssl/crypto/ec/ecp_nist.c | 28 +- crypto/openssl/crypto/ec/ecp_nistp224.c | 602 +- crypto/openssl/crypto/ec/ecp_nistp256.c | 789 +- crypto/openssl/crypto/ec/ecp_nistp521.c | 940 +- crypto/openssl/crypto/ec/ecp_nistputil.c | 62 +- crypto/openssl/crypto/ec/ecp_nistz256.c | 363 +- crypto/openssl/crypto/ec/ecp_nistz256_table.c | 24407 +++++++++++-------- crypto/openssl/crypto/ec/ecp_oct.c | 31 +- crypto/openssl/crypto/ec/ecp_ppc.c | 8 +- crypto/openssl/crypto/ec/ecp_s390x_nistp.c | 323 +- crypto/openssl/crypto/ec/ecp_smpl.c | 169 +- crypto/openssl/crypto/ec/ecx_backend.c | 32 +- crypto/openssl/crypto/ec/ecx_backend.h | 18 +- crypto/openssl/crypto/ec/ecx_key.c | 2 +- crypto/openssl/crypto/ec/ecx_meth.c | 229 +- crypto/openssl/crypto/ec/ecx_s390x.c | 28 +- crypto/openssl/crypto/encode_decode/decoder_err.c | 14 +- crypto/openssl/crypto/encode_decode/decoder_lib.c | 363 +- crypto/openssl/crypto/encode_decode/decoder_meth.c | 90 +- crypto/openssl/crypto/encode_decode/decoder_pkey.c | 173 +- crypto/openssl/crypto/encode_decode/encoder_err.c | 14 +- crypto/openssl/crypto/encode_decode/encoder_lib.c | 218 +- .../openssl/crypto/encode_decode/encoder_local.h | 12 +- crypto/openssl/crypto/encode_decode/encoder_meth.c | 100 +- crypto/openssl/crypto/encode_decode/encoder_pkey.c | 98 +- crypto/openssl/crypto/engine/eng_all.c | 4 +- crypto/openssl/crypto/engine/eng_cnf.c | 13 +- crypto/openssl/crypto/engine/eng_ctrl.c | 28 +- crypto/openssl/crypto/engine/eng_dyn.c | 116 +- crypto/openssl/crypto/engine/eng_err.c | 128 +- crypto/openssl/crypto/engine/eng_fat.c | 2 +- crypto/openssl/crypto/engine/eng_lib.c | 4 +- crypto/openssl/crypto/engine/eng_list.c | 13 +- crypto/openssl/crypto/engine/eng_local.h | 48 +- crypto/openssl/crypto/engine/eng_openssl.c | 126 +- crypto/openssl/crypto/engine/eng_pkey.c | 20 +- crypto/openssl/crypto/engine/eng_rdrand.c | 30 +- crypto/openssl/crypto/engine/eng_table.c | 46 +- crypto/openssl/crypto/engine/tb_asnmth.c | 22 +- crypto/openssl/crypto/engine/tb_cipher.c | 10 +- crypto/openssl/crypto/engine/tb_dh.c | 10 +- crypto/openssl/crypto/engine/tb_digest.c | 10 +- crypto/openssl/crypto/engine/tb_dsa.c | 10 +- crypto/openssl/crypto/engine/tb_eckey.c | 10 +- crypto/openssl/crypto/engine/tb_pkmeth.c | 10 +- crypto/openssl/crypto/engine/tb_rand.c | 10 +- crypto/openssl/crypto/engine/tb_rsa.c | 10 +- crypto/openssl/crypto/err/err.c | 238 +- crypto/openssl/crypto/err/err_all.c | 48 +- crypto/openssl/crypto/err/err_all_legacy.c | 112 +- crypto/openssl/crypto/err/err_local.h | 15 +- crypto/openssl/crypto/err/err_prn.c | 12 +- crypto/openssl/crypto/ess/ess_asn1.c | 24 +- crypto/openssl/crypto/ess/ess_err.c | 38 +- crypto/openssl/crypto/ess/ess_lib.c | 51 +- crypto/openssl/crypto/evp/asymcipher.c | 93 +- crypto/openssl/crypto/evp/bio_b64.c | 69 +- crypto/openssl/crypto/evp/bio_enc.c | 56 +- crypto/openssl/crypto/evp/bio_md.c | 8 +- crypto/openssl/crypto/evp/bio_ok.c | 72 +- crypto/openssl/crypto/evp/c_allc.c | 8 +- crypto/openssl/crypto/evp/cmeth_lib.c | 57 +- crypto/openssl/crypto/evp/ctrl_params_translate.c | 1357 +- crypto/openssl/crypto/evp/dh_ctrl.c | 46 +- crypto/openssl/crypto/evp/dh_support.c | 15 +- crypto/openssl/crypto/evp/digest.c | 161 +- crypto/openssl/crypto/evp/dsa_ctrl.c | 18 +- crypto/openssl/crypto/evp/e_aes.c | 1624 +- crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c | 447 +- crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c | 440 +- crypto/openssl/crypto/evp/e_aria.c | 358 +- crypto/openssl/crypto/evp/e_bf.c | 20 +- crypto/openssl/crypto/evp/e_camellia.c | 240 +- crypto/openssl/crypto/evp/e_cast.c | 22 +- crypto/openssl/crypto/evp/e_chacha20_poly1305.c | 268 +- crypto/openssl/crypto/evp/e_des.c | 128 +- crypto/openssl/crypto/evp/e_des3.c | 192 +- crypto/openssl/crypto/evp/e_idea.c | 34 +- crypto/openssl/crypto/evp/e_null.c | 8 +- crypto/openssl/crypto/evp/e_old.c | 16 +- crypto/openssl/crypto/evp/e_rc2.c | 53 +- crypto/openssl/crypto/evp/e_rc4.c | 22 +- crypto/openssl/crypto/evp/e_rc4_hmac_md5.c | 161 +- crypto/openssl/crypto/evp/e_rc5.c | 26 +- crypto/openssl/crypto/evp/e_seed.c | 10 +- crypto/openssl/crypto/evp/e_sm4.c | 44 +- crypto/openssl/crypto/evp/e_xcbc_d.c | 34 +- crypto/openssl/crypto/evp/ec_ctrl.c | 39 +- crypto/openssl/crypto/evp/ec_support.c | 194 +- crypto/openssl/crypto/evp/encode.c | 342 +- crypto/openssl/crypto/evp/evp_cnf.c | 7 +- crypto/openssl/crypto/evp/evp_enc.c | 265 +- crypto/openssl/crypto/evp/evp_err.c | 358 +- crypto/openssl/crypto/evp/evp_fetch.c | 175 +- crypto/openssl/crypto/evp/evp_key.c | 22 +- crypto/openssl/crypto/evp/evp_lib.c | 174 +- crypto/openssl/crypto/evp/evp_local.h | 183 +- crypto/openssl/crypto/evp/evp_pbe.c | 124 +- crypto/openssl/crypto/evp/evp_pkey.c | 40 +- crypto/openssl/crypto/evp/evp_rand.c | 115 +- crypto/openssl/crypto/evp/evp_utils.c | 70 +- crypto/openssl/crypto/evp/exchange.c | 115 +- crypto/openssl/crypto/evp/kdf_lib.c | 10 +- crypto/openssl/crypto/evp/kdf_meth.c | 27 +- crypto/openssl/crypto/evp/kem.c | 67 +- crypto/openssl/crypto/evp/keymgmt_lib.c | 72 +- crypto/openssl/crypto/evp/keymgmt_meth.c | 102 +- crypto/openssl/crypto/evp/legacy_blake2.c | 6 +- crypto/openssl/crypto/evp/legacy_md5_sha1.c | 6 +- crypto/openssl/crypto/evp/legacy_mdc2.c | 2 +- crypto/openssl/crypto/evp/legacy_meth.h | 55 +- crypto/openssl/crypto/evp/legacy_ripemd.c | 2 +- crypto/openssl/crypto/evp/legacy_sha.c | 130 +- crypto/openssl/crypto/evp/legacy_wp.c | 2 +- crypto/openssl/crypto/evp/m_sigver.c | 164 +- crypto/openssl/crypto/evp/mac_lib.c | 37 +- crypto/openssl/crypto/evp/mac_meth.c | 27 +- crypto/openssl/crypto/evp/names.c | 50 +- crypto/openssl/crypto/evp/p5_crpt.c | 24 +- crypto/openssl/crypto/evp/p5_crpt2.c | 69 +- crypto/openssl/crypto/evp/p_dec.c | 7 +- crypto/openssl/crypto/evp/p_enc.c | 7 +- crypto/openssl/crypto/evp/p_lib.c | 569 +- crypto/openssl/crypto/evp/p_open.c | 6 +- crypto/openssl/crypto/evp/p_seal.c | 13 +- crypto/openssl/crypto/evp/p_sign.c | 8 +- crypto/openssl/crypto/evp/p_verify.c | 8 +- crypto/openssl/crypto/evp/pbe_scrypt.c | 32 +- crypto/openssl/crypto/evp/pmeth_check.c | 25 +- crypto/openssl/crypto/evp/pmeth_gn.c | 61 +- crypto/openssl/crypto/evp/pmeth_lib.c | 726 +- crypto/openssl/crypto/evp/signature.c | 127 +- crypto/openssl/crypto/ex_data.c | 45 +- crypto/openssl/crypto/ffc/ffc_backend.c | 16 +- crypto/openssl/crypto/ffc/ffc_dh.c | 64 +- crypto/openssl/crypto/ffc/ffc_key_generate.c | 2 +- crypto/openssl/crypto/ffc/ffc_key_validate.c | 10 +- crypto/openssl/crypto/ffc/ffc_params.c | 62 +- crypto/openssl/crypto/ffc/ffc_params_generate.c | 186 +- crypto/openssl/crypto/ffc/ffc_params_validate.c | 46 +- crypto/openssl/crypto/getenv.c | 18 +- crypto/openssl/crypto/hmac/hmac.c | 32 +- crypto/openssl/crypto/hmac/hmac_local.h | 4 +- crypto/openssl/crypto/http/http_client.c | 330 +- crypto/openssl/crypto/http/http_err.c | 106 +- crypto/openssl/crypto/http/http_lib.c | 46 +- crypto/openssl/crypto/idea/i_cbc.c | 4 +- crypto/openssl/crypto/idea/i_cfb64.c | 7 +- crypto/openssl/crypto/idea/i_ecb.c | 2 +- crypto/openssl/crypto/idea/i_ofb64.c | 7 +- crypto/openssl/crypto/idea/idea_local.h | 179 +- crypto/openssl/crypto/info.c | 169 +- crypto/openssl/crypto/init.c | 162 +- crypto/openssl/crypto/initthread.c | 19 +- crypto/openssl/crypto/lhash/lh_stats.c | 14 +- crypto/openssl/crypto/lhash/lhash.c | 23 +- crypto/openssl/crypto/lhash/lhash_local.h | 4 +- crypto/openssl/crypto/md2/md2_dgst.c | 296 +- crypto/openssl/crypto/md4/md4_dgst.c | 16 +- crypto/openssl/crypto/md4/md4_local.h | 63 +- crypto/openssl/crypto/md4/md4_one.c | 2 +- crypto/openssl/crypto/md5/md5_dgst.c | 16 +- crypto/openssl/crypto/md5/md5_local.h | 96 +- crypto/openssl/crypto/md5/md5_one.c | 2 +- crypto/openssl/crypto/mdc2/mdc2dgst.c | 16 +- crypto/openssl/crypto/mem.c | 95 +- crypto/openssl/crypto/mem_sec.c | 131 +- crypto/openssl/crypto/mips_arch.h | 48 +- crypto/openssl/crypto/modes/asm/ghash-armv4.pl | 4 +- crypto/openssl/crypto/modes/cbc128.c | 38 +- crypto/openssl/crypto/modes/ccm128.c | 108 +- crypto/openssl/crypto/modes/cfb128.c | 64 +- crypto/openssl/crypto/modes/ctr128.c | 38 +- crypto/openssl/crypto/modes/cts128.c | 86 +- crypto/openssl/crypto/modes/gcm128.c | 638 +- crypto/openssl/crypto/modes/ocb128.c | 67 +- crypto/openssl/crypto/modes/ofb128.c | 20 +- crypto/openssl/crypto/modes/siv128.c | 61 +- crypto/openssl/crypto/modes/wrap128.c | 49 +- crypto/openssl/crypto/modes/xts128.c | 22 +- crypto/openssl/crypto/o_dir.c | 2 + crypto/openssl/crypto/o_fopen.c | 46 +- crypto/openssl/crypto/o_str.c | 90 +- crypto/openssl/crypto/o_time.c | 20 +- crypto/openssl/crypto/objects/o_names.c | 44 +- crypto/openssl/crypto/objects/obj_compat.h | 62 +- crypto/openssl/crypto/objects/obj_dat.c | 38 +- crypto/openssl/crypto/objects/obj_dat.h | 2 +- crypto/openssl/crypto/objects/obj_err.c | 10 +- crypto/openssl/crypto/objects/obj_lib.c | 6 +- crypto/openssl/crypto/ocsp/ocsp_asn.c | 90 +- crypto/openssl/crypto/ocsp/ocsp_cl.c | 42 +- crypto/openssl/crypto/ocsp/ocsp_err.c | 90 +- crypto/openssl/crypto/ocsp/ocsp_ext.c | 77 +- crypto/openssl/crypto/ocsp/ocsp_http.c | 16 +- crypto/openssl/crypto/ocsp/ocsp_lib.c | 12 +- crypto/openssl/crypto/ocsp/ocsp_local.h | 94 +- crypto/openssl/crypto/ocsp/ocsp_prn.c | 61 +- crypto/openssl/crypto/ocsp/ocsp_srv.c | 61 +- crypto/openssl/crypto/ocsp/ocsp_vfy.c | 50 +- crypto/openssl/crypto/ocsp/v3_ocsp.c | 60 +- crypto/openssl/crypto/packet.c | 48 +- crypto/openssl/crypto/param_build.c | 162 +- crypto/openssl/crypto/param_build_set.c | 20 +- crypto/openssl/crypto/params.c | 153 +- crypto/openssl/crypto/params_dup.c | 39 +- crypto/openssl/crypto/params_from_text.c | 24 +- crypto/openssl/crypto/passphrase.c | 73 +- crypto/openssl/crypto/pem/pem_all.c | 35 +- crypto/openssl/crypto/pem/pem_err.c | 90 +- crypto/openssl/crypto/pem/pem_info.c | 61 +- crypto/openssl/crypto/pem/pem_lib.c | 122 +- crypto/openssl/crypto/pem/pem_local.h | 145 +- crypto/openssl/crypto/pem/pem_oth.c | 2 +- crypto/openssl/crypto/pem/pem_pk8.c | 74 +- crypto/openssl/crypto/pem/pem_pkey.c | 115 +- crypto/openssl/crypto/pem/pem_sign.c | 6 +- crypto/openssl/crypto/pem/pvkfmt.c | 112 +- crypto/openssl/crypto/perlasm/sparcv9_modes.pl | 10 +- crypto/openssl/crypto/perlasm/x86_64-xlate.pl | 5 +- crypto/openssl/crypto/pkcs12/p12_add.c | 45 +- crypto/openssl/crypto/pkcs12/p12_asn.c | 46 +- crypto/openssl/crypto/pkcs12/p12_attr.c | 33 +- crypto/openssl/crypto/pkcs12/p12_crpt.c | 25 +- crypto/openssl/crypto/pkcs12/p12_crt.c | 86 +- crypto/openssl/crypto/pkcs12/p12_decr.c | 81 +- crypto/openssl/crypto/pkcs12/p12_init.c | 3 +- crypto/openssl/crypto/pkcs12/p12_key.c | 58 +- crypto/openssl/crypto/pkcs12/p12_kiss.c | 31 +- crypto/openssl/crypto/pkcs12/p12_local.h | 6 +- crypto/openssl/crypto/pkcs12/p12_mutl.c | 59 +- crypto/openssl/crypto/pkcs12/p12_npas.c | 20 +- crypto/openssl/crypto/pkcs12/p12_p8d.c | 11 +- crypto/openssl/crypto/pkcs12/p12_p8e.c | 31 +- crypto/openssl/crypto/pkcs12/p12_sbag.c | 97 +- crypto/openssl/crypto/pkcs12/p12_utl.c | 83 +- crypto/openssl/crypto/pkcs12/pk12err.c | 64 +- crypto/openssl/crypto/pkcs7/bio_pk7.c | 2 +- crypto/openssl/crypto/pkcs7/pk7_asn1.c | 125 +- crypto/openssl/crypto/pkcs7/pk7_attr.c | 16 +- crypto/openssl/crypto/pkcs7/pk7_doit.c | 121 +- crypto/openssl/crypto/pkcs7/pk7_lib.c | 60 +- crypto/openssl/crypto/pkcs7/pk7_mime.c | 12 +- crypto/openssl/crypto/pkcs7/pk7_smime.c | 59 +- crypto/openssl/crypto/pkcs7/pkcs7err.c | 138 +- crypto/openssl/crypto/poly1305/poly1305.c | 102 +- crypto/openssl/crypto/poly1305/poly1305_base2_44.c | 29 +- crypto/openssl/crypto/poly1305/poly1305_ieee754.c | 279 +- crypto/openssl/crypto/poly1305/poly1305_ppc.c | 24 +- crypto/openssl/crypto/ppccap.c | 110 +- crypto/openssl/crypto/property/defn_cache.c | 19 +- crypto/openssl/crypto/property/property.c | 80 +- crypto/openssl/crypto/property/property_err.c | 36 +- crypto/openssl/crypto/property/property_local.h | 18 +- crypto/openssl/crypto/property/property_parse.c | 139 +- crypto/openssl/crypto/property/property_query.c | 22 +- crypto/openssl/crypto/property/property_string.c | 37 +- crypto/openssl/crypto/provider.c | 24 +- crypto/openssl/crypto/provider_child.c | 55 +- crypto/openssl/crypto/provider_conf.c | 56 +- crypto/openssl/crypto/provider_core.c | 267 +- crypto/openssl/crypto/provider_local.h | 8 +- crypto/openssl/crypto/provider_predefined.c | 4 +- crypto/openssl/crypto/punycode.c | 27 +- crypto/openssl/crypto/rand/prov_seed.c | 18 +- crypto/openssl/crypto/rand/rand_deprecated.c | 8 +- crypto/openssl/crypto/rand/rand_egd.c | 103 +- crypto/openssl/crypto/rand/rand_err.c | 156 +- crypto/openssl/crypto/rand/rand_lib.c | 182 +- crypto/openssl/crypto/rand/rand_local.h | 30 +- crypto/openssl/crypto/rand/rand_meth.c | 2 +- crypto/openssl/crypto/rand/rand_pool.c | 15 +- crypto/openssl/crypto/rand/randfile.c | 97 +- crypto/openssl/crypto/rc2/rc2_cbc.c | 30 +- crypto/openssl/crypto/rc2/rc2_ecb.c | 2 +- crypto/openssl/crypto/rc2/rc2_local.h | 250 +- crypto/openssl/crypto/rc2/rc2_skey.c | 284 +- crypto/openssl/crypto/rc2/rc2cfb64.c | 8 +- crypto/openssl/crypto/rc2/rc2ofb64.c | 8 +- crypto/openssl/crypto/rc4/rc4_enc.c | 16 +- crypto/openssl/crypto/rc4/rc4_local.h | 6 +- crypto/openssl/crypto/rc4/rc4_skey.c | 15 +- crypto/openssl/crypto/rc5/rc5_ecb.c | 2 +- crypto/openssl/crypto/rc5/rc5_enc.c | 4 +- crypto/openssl/crypto/rc5/rc5_local.h | 330 +- crypto/openssl/crypto/rc5/rc5_skey.c | 5 +- crypto/openssl/crypto/rc5/rc5cfb64.c | 8 +- crypto/openssl/crypto/rc5/rc5ofb64.c | 8 +- crypto/openssl/crypto/ripemd/rmd_dgst.c | 19 +- crypto/openssl/crypto/ripemd/rmd_local.h | 112 +- crypto/openssl/crypto/ripemd/rmdconst.h | 360 +- crypto/openssl/crypto/rsa/rsa_acvp_test_params.c | 29 +- crypto/openssl/crypto/rsa/rsa_ameth.c | 274 +- crypto/openssl/crypto/rsa/rsa_asn1.c | 51 +- crypto/openssl/crypto/rsa/rsa_backend.c | 119 +- crypto/openssl/crypto/rsa/rsa_chk.c | 12 +- crypto/openssl/crypto/rsa/rsa_crpt.c | 18 +- crypto/openssl/crypto/rsa/rsa_depr.c | 4 +- crypto/openssl/crypto/rsa/rsa_err.c | 274 +- crypto/openssl/crypto/rsa/rsa_gen.c | 45 +- crypto/openssl/crypto/rsa/rsa_lib.c | 159 +- crypto/openssl/crypto/rsa/rsa_local.h | 72 +- crypto/openssl/crypto/rsa/rsa_meth.c | 132 +- crypto/openssl/crypto/rsa/rsa_mp.c | 4 +- crypto/openssl/crypto/rsa/rsa_none.c | 4 +- crypto/openssl/crypto/rsa/rsa_oaep.c | 52 +- crypto/openssl/crypto/rsa/rsa_ossl.c | 126 +- crypto/openssl/crypto/rsa/rsa_pk1.c | 72 +- crypto/openssl/crypto/rsa/rsa_pmeth.c | 104 +- crypto/openssl/crypto/rsa/rsa_pss.c | 64 +- crypto/openssl/crypto/rsa/rsa_saos.c | 17 +- crypto/openssl/crypto/rsa/rsa_schemes.c | 22 +- crypto/openssl/crypto/rsa/rsa_sign.c | 243 +- crypto/openssl/crypto/rsa/rsa_sp800_56b_check.c | 121 +- crypto/openssl/crypto/rsa/rsa_sp800_56b_gen.c | 24 +- crypto/openssl/crypto/rsa/rsa_x931.c | 5 +- crypto/openssl/crypto/rsa/rsa_x931g.c | 32 +- crypto/openssl/crypto/s390x_arch.h | 178 +- crypto/openssl/crypto/s390xcap.c | 704 +- crypto/openssl/crypto/s390xcpuid.pl | 8 +- crypto/openssl/crypto/seed/seed.c | 752 +- crypto/openssl/crypto/seed/seed_cbc.c | 8 +- crypto/openssl/crypto/seed/seed_cfb.c | 8 +- crypto/openssl/crypto/seed/seed_ecb.c | 2 +- crypto/openssl/crypto/seed/seed_local.h | 123 +- crypto/openssl/crypto/seed/seed_ofb.c | 6 +- crypto/openssl/crypto/self_test_core.c | 32 +- crypto/openssl/crypto/sha/asm/keccak1600-s390x.pl | 3 +- crypto/openssl/crypto/sha/keccak1600.c | 271 +- crypto/openssl/crypto/sha/sha256.c | 120 +- crypto/openssl/crypto/sha/sha3.c | 2 +- crypto/openssl/crypto/sha/sha512.c | 219 +- crypto/openssl/crypto/sha/sha_local.h | 251 +- crypto/openssl/crypto/sha/sha_ppc.c | 6 +- crypto/openssl/crypto/siphash/siphash.c | 61 +- crypto/openssl/crypto/sm2/sm2_crypt.c | 80 +- crypto/openssl/crypto/sm2/sm2_err.c | 42 +- crypto/openssl/crypto/sm2/sm2_key.c | 8 +- crypto/openssl/crypto/sm2/sm2_sign.c | 142 +- crypto/openssl/crypto/sm3/legacy_sm3.c | 3 +- crypto/openssl/crypto/sm3/sm3.c | 6 +- crypto/openssl/crypto/sm3/sm3_local.h | 90 +- crypto/openssl/crypto/sm4/sm4.c | 42 +- crypto/openssl/crypto/sparcv9cap.c | 85 +- crypto/openssl/crypto/sparse_array.c | 28 +- crypto/openssl/crypto/srp/srp_lib.c | 71 +- crypto/openssl/crypto/srp/srp_vfy.c | 117 +- crypto/openssl/crypto/stack/stack.c | 25 +- crypto/openssl/crypto/store/store_err.c | 92 +- crypto/openssl/crypto/store/store_lib.c | 217 +- crypto/openssl/crypto/store/store_local.h | 24 +- crypto/openssl/crypto/store/store_meth.c | 74 +- crypto/openssl/crypto/store/store_register.c | 52 +- crypto/openssl/crypto/store/store_result.c | 114 +- crypto/openssl/crypto/store/store_strings.c | 12 +- crypto/openssl/crypto/threads_none.c | 25 +- crypto/openssl/crypto/threads_pthread.c | 94 +- crypto/openssl/crypto/threads_win.c | 56 +- crypto/openssl/crypto/trace.c | 131 +- crypto/openssl/crypto/ts/ts_asn1.c | 64 +- crypto/openssl/crypto/ts/ts_conf.c | 108 +- crypto/openssl/crypto/ts/ts_err.c | 122 +- crypto/openssl/crypto/ts/ts_lib.c | 4 +- crypto/openssl/crypto/ts/ts_local.h | 18 +- crypto/openssl/crypto/ts/ts_req_print.c | 2 +- crypto/openssl/crypto/ts/ts_rsp_print.c | 41 +- crypto/openssl/crypto/ts/ts_rsp_sign.c | 172 +- crypto/openssl/crypto/ts/ts_rsp_verify.c | 104 +- crypto/openssl/crypto/ts/ts_verify_ctx.c | 6 +- crypto/openssl/crypto/txt_db/txt_db.c | 22 +- crypto/openssl/crypto/ui/ui_err.c | 36 +- crypto/openssl/crypto/ui/ui_lib.c | 260 +- crypto/openssl/crypto/ui/ui_local.h | 56 +- crypto/openssl/crypto/ui/ui_null.c | 10 +- crypto/openssl/crypto/ui/ui_openssl.c | 536 +- crypto/openssl/crypto/ui/ui_util.c | 65 +- crypto/openssl/crypto/uid.c | 34 +- crypto/openssl/crypto/vms_rms.h | 86 +- crypto/openssl/crypto/whrlpool/wp_block.c | 811 +- crypto/openssl/crypto/whrlpool/wp_dgst.c | 20 +- crypto/openssl/crypto/x509/by_dir.c | 76 +- crypto/openssl/crypto/x509/by_file.c | 66 +- crypto/openssl/crypto/x509/by_store.c | 175 +- crypto/openssl/crypto/x509/pcy_cache.c | 24 +- crypto/openssl/crypto/x509/pcy_data.c | 2 +- crypto/openssl/crypto/x509/pcy_lib.c | 19 +- crypto/openssl/crypto/x509/pcy_local.h | 34 +- crypto/openssl/crypto/x509/pcy_map.c | 10 +- crypto/openssl/crypto/x509/pcy_node.c | 28 +- crypto/openssl/crypto/x509/pcy_tree.c | 107 +- crypto/openssl/crypto/x509/standard_exts.h | 5 - crypto/openssl/crypto/x509/t_crl.c | 7 +- crypto/openssl/crypto/x509/t_req.c | 24 +- crypto/openssl/crypto/x509/t_x509.c | 75 +- crypto/openssl/crypto/x509/v3_addr.c | 306 +- crypto/openssl/crypto/x509/v3_admis.c | 52 +- crypto/openssl/crypto/x509/v3_admis.h | 28 +- crypto/openssl/crypto/x509/v3_akeya.c | 6 +- crypto/openssl/crypto/x509/v3_akid.c | 30 +- crypto/openssl/crypto/x509/v3_asid.c | 213 +- crypto/openssl/crypto/x509/v3_bcons.c | 28 +- crypto/openssl/crypto/x509/v3_bitst.c | 54 +- crypto/openssl/crypto/x509/v3_conf.c | 77 +- crypto/openssl/crypto/x509/v3_cpols.c | 93 +- crypto/openssl/crypto/x509/v3_crld.c | 135 +- crypto/openssl/crypto/x509/v3_enum.c | 30 +- crypto/openssl/crypto/x509/v3_extku.c | 23 +- crypto/openssl/crypto/x509/v3_genn.c | 45 +- crypto/openssl/crypto/x509/v3_ia5.c | 6 +- crypto/openssl/crypto/x509/v3_info.c | 47 +- crypto/openssl/crypto/x509/v3_int.c | 2 +- crypto/openssl/crypto/x509/v3_ist.c | 37 +- crypto/openssl/crypto/x509/v3_lib.c | 29 +- crypto/openssl/crypto/x509/v3_ncons.c | 98 +- crypto/openssl/crypto/x509/v3_pci.c | 65 +- crypto/openssl/crypto/x509/v3_pcia.c | 14 +- crypto/openssl/crypto/x509/v3_pcons.c | 30 +- crypto/openssl/crypto/x509/v3_pku.c | 12 +- crypto/openssl/crypto/x509/v3_pmaps.c | 27 +- crypto/openssl/crypto/x509/v3_prn.c | 29 +- crypto/openssl/crypto/x509/v3_purp.c | 136 +- crypto/openssl/crypto/x509/v3_san.c | 229 +- crypto/openssl/crypto/x509/v3_skid.c | 15 +- crypto/openssl/crypto/x509/v3_sxnet.c | 28 +- crypto/openssl/crypto/x509/v3_tlsf.c | 29 +- crypto/openssl/crypto/x509/v3_utf8.c | 11 +- crypto/openssl/crypto/x509/v3_utl.c | 166 +- crypto/openssl/crypto/x509/v3err.c | 236 +- crypto/openssl/crypto/x509/x509_att.c | 93 +- crypto/openssl/crypto/x509/x509_cmp.c | 48 +- crypto/openssl/crypto/x509/x509_d2.c | 15 +- crypto/openssl/crypto/x509/x509_err.c | 134 +- crypto/openssl/crypto/x509/x509_ext.c | 35 +- crypto/openssl/crypto/x509/x509_local.h | 118 +- crypto/openssl/crypto/x509/x509_lu.c | 98 +- crypto/openssl/crypto/x509/x509_meth.c | 27 +- crypto/openssl/crypto/x509/x509_obj.c | 19 +- crypto/openssl/crypto/x509/x509_r2x.c | 9 +- crypto/openssl/crypto/x509/x509_req.c | 32 +- crypto/openssl/crypto/x509/x509_set.c | 14 +- crypto/openssl/crypto/x509/x509_trust.c | 56 +- crypto/openssl/crypto/x509/x509_txt.c | 3 +- crypto/openssl/crypto/x509/x509_v3.c | 22 +- crypto/openssl/crypto/x509/x509_vfy.c | 355 +- crypto/openssl/crypto/x509/x509_vpm.c | 157 +- crypto/openssl/crypto/x509/x509cset.c | 2 +- crypto/openssl/crypto/x509/x509name.c | 54 +- crypto/openssl/crypto/x509/x509type.c | 2 +- crypto/openssl/crypto/x509/x_all.c | 144 +- crypto/openssl/crypto/x509/x_attrib.c | 6 +- crypto/openssl/crypto/x509/x_crl.c | 109 +- crypto/openssl/crypto/x509/x_exten.c | 9 +- crypto/openssl/crypto/x509/x_name.c | 127 +- crypto/openssl/crypto/x509/x_pubkey.c | 147 +- crypto/openssl/crypto/x509/x_req.c | 84 +- crypto/openssl/crypto/x509/x_x509.c | 64 +- crypto/openssl/crypto/x509/x_x509a.c | 14 +- crypto/openssl/demos/bio/client-arg.c | 2 +- crypto/openssl/demos/bio/client-conf.c | 4 +- crypto/openssl/demos/bio/saccept.c | 13 +- crypto/openssl/demos/bio/sconnect.c | 11 +- crypto/openssl/demos/bio/server-arg.c | 13 +- crypto/openssl/demos/bio/server-cmod.c | 11 +- crypto/openssl/demos/bio/server-conf.c | 13 +- crypto/openssl/demos/cipher/aesccm.c | 13 +- crypto/openssl/demos/cipher/aesgcm.c | 10 +- crypto/openssl/demos/cipher/aeskeywrap.c | 99 +- crypto/openssl/demos/cipher/ariacbc.c | 20 +- crypto/openssl/demos/cms/cms_comp.c | 2 +- crypto/openssl/demos/cms/cms_ddec.c | 6 +- crypto/openssl/demos/cms/cms_dec.c | 2 +- crypto/openssl/demos/cms/cms_denc.c | 6 +- crypto/openssl/demos/cms/cms_enc.c | 2 +- crypto/openssl/demos/cms/cms_sign.c | 2 +- crypto/openssl/demos/cms/cms_sign2.c | 2 +- crypto/openssl/demos/cms/cms_uncomp.c | 2 +- crypto/openssl/demos/cms/cms_ver.c | 2 +- crypto/openssl/demos/digest/BIO_f_md.c | 28 +- *** 497080 LINES SKIPPED *** From nobody Mon Apr 13 01:05:51 2026 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 4fv8Nb2MHVz6ZFFF for ; Mon, 13 Apr 2026 01:05: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv8Nb1drZz3Zm5 for ; Mon, 13 Apr 2026 01:05:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776042351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J5nwZCmDZKlXaquKNMYNO6jRMX6EaFPxUkZgN0GTsPs=; b=F/AWW3FbOuKjni6GxwEG8PoUkT7T82wh0c9vUBvMhSYo0C+nPHb/AK/J1JHJZ+FwNApjQa sd9beYl8YY0R4zrwHVCj7+1+Ee9V3DlGFDjD4urpDe98s0KRsT33DhGllOvNO4Sw4OEwX/ gvCNTE9UUN79PZ2zPnlRkXziJ3MHhwq0CowkRN2IFh/ZeXY0slzuHS7vXOJDYPgmaOtpqa 4U2YPbDXzAmzDvfgfan4Gb+yZqG4uUOhnb6iDRWydyqG17xBRgbPo5I3rFg/k6m5JjY3QW Hq9tocORTsSGsDQY20K1iPjmEnI+19l0WJqDOggUH27hk5dCZEv9GL604FSHZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776042351; a=rsa-sha256; cv=none; b=ga76He7774wQCJ/mAZebZoY02tDt4YY1iwvTFv5m3k7ksX0BBge41F57TKup3Z+G5/emq0 ou1BDkIHRu+YGt/L8dru/AYrypXbEgjeR+f7jqlbOl66uo555svsLUQRzKwT4TSW9kZYOO chz5FkHh4J52k+qZKRHGN0mYkWtN6WfwcWhTBOdA/QtloNfBFwiU1ExTrMrU0P2StwuQBz G5+7O/4tHpTdeM4dX9da/UMGXswgr7RESZ6yr4VDxK5EW/eacZTAVOu+WMZzp4aXIGaNWn k4FLDQME31TUc7H5y5kuHGbHHqdo1by3rcS9WstAT8dmIBk7IJ9bX4Qx2iY2LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776042351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J5nwZCmDZKlXaquKNMYNO6jRMX6EaFPxUkZgN0GTsPs=; b=bmBIsTDn5lRz7ztapOtIamQ8owcMX1+7/wrtusWzLMkbq5cLFyJGWSzNLuBKcbHWfUPXDD 9Oe217KcDAhZP9rG0MWHCRdFjnLn9AFLURtfjz345n01rIt4F499Cs7HRkK7X1LnjudhPR d5qd160oYu2TvnTVjfdc+qOi7B8oiYd2WHK6u/bikVQvPECjnnl8Lxlakk1wiYb1V7EbJe 5Ee2avZseNpdrOX3XfAe/JxGaLDfxi6aLkNpKLho6dL3KLrMjIKEHZveNlDhdYmBwNBwbR HFL5feb8ImG+ao2o1HXHaNrU5qkHu/5K9XFF8qVQubb5wG+hCSqChboQuRNQiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv8Nb0sGwzhRD for ; Mon, 13 Apr 2026 01:05:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a7e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 01:05:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: b5737f2ff8d3 - stable/15 - mk: Disable blacklist when disabling blocklist 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b5737f2ff8d382bdee12b19c7f27580a8da5023c Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 01:05:51 +0000 Message-Id: <69dc416f.3a7e2.4b9d5b5b@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=b5737f2ff8d382bdee12b19c7f27580a8da5023c commit b5737f2ff8d382bdee12b19c7f27580a8da5023c Author: Jose Luis Duran AuthorDate: 2026-03-29 16:14:50 +0000 Commit: Jose Luis Duran CommitDate: 2026-04-13 01:05:12 +0000 mk: Disable blacklist when disabling blocklist WITHOUT_BLOCKLIST, when set, should enforce WITHOUT_BLACKLIST. This fixes the build when WITHOUT_BLOCKLIST=yes is set. Reported by: ivy Reviewed by: ivy Fixes: 7238317403b9 ("blocklist: Rename blacklist to blocklist") MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56118 (cherry picked from commit 0d9676e1ca92febd42fbebef8d6833a0939d3f7c) --- share/man/man5/src.conf.5 | 19 ++++++++++++++++++- share/mk/src.opts.mk | 8 ++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index d5f44e79bee7..ad1a2b3ed93a 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd February 23, 2026 +.Dd March 28, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -261,9 +261,20 @@ Set this if you do not want to build .Xr blocklistd 8 and .Xr blocklistctl 8 . +When set, it enforces these options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_BLACKLIST +.El +.Pp When set, these options are also in effect: .Pp .Bl -inset -compact +.It Va WITHOUT_BLACKLIST_SUPPORT +(unless +.Va WITH_BLACKLIST_SUPPORT +is set explicitly) .It Va WITHOUT_BLOCKLIST_SUPPORT (unless .Va WITH_BLOCKLIST_SUPPORT @@ -276,6 +287,12 @@ support, like .Xr fingerd 8 and .Xr sshd 8 . +When set, it enforces these options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_BLACKLIST_SUPPORT +.El .It Va WITHOUT_BLUETOOTH Do not build Bluetooth related kernel modules, programs and libraries. .It Va WITHOUT_BOOT diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 88fd83a3c723..a0bf8c2d454f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -408,6 +408,14 @@ MK_BLOCKLIST:= no MK_BLOCKLIST_SUPPORT:= no .endif +.if ${MK_BLOCKLIST} == "no" +MK_BLACKLIST:= no +.endif + +.if ${MK_BLOCKLIST_SUPPORT} == "no" +MK_BLACKLIST_SUPPORT:= no +.endif + .if ${MK_CDDL} == "no" MK_CTF:= no MK_DTRACE:= no From nobody Mon Apr 13 01:20:27 2026 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 4fv8jR2m1kz6ZFnY for ; Mon, 13 Apr 2026 01:20: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv8jR236Lz3bqS for ; Mon, 13 Apr 2026 01:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776043227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OITFkssOg+T1dcVrXy6hXiFFQYVN5irY7haJV1N7dhU=; b=m7idOP7b7JauwYushUOd0/b8jO2FWhjY6c/RgkykWb2Nh9DSF+aqwOFK5uu/0PmFfLfm8W nYMHa4U7LKLYdR09MxOMhRNkNBRq6dCdaxxb1/HAz8wkCcFVTCB2ascL5mmPSiQ8VKwJm0 DIKCH1uwfaFTqy2lebreV8vTxS1/dBiA1tT5JeFGrQgCBdlMpyuzQV1YCGOftlv7gNkaK3 /AGFv704SVLHnlsddz9/JTF3dA4BIS/ie7GZVqq/4+q4PppegHYrWxz3ujORsIr1Ojth02 bDoPf76A3SLSi/Am3ywxrMByog3n4tW5dqCUec0zCkmR4OQXTQk7TZ24nbE5YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776043227; a=rsa-sha256; cv=none; b=PPoABd9+296uy5oGcmTRJLyIpvSlOnPrVATyRYS5RQouF1vqX5hWs/FKNegun2JmS0hPEy +s/0ZfWkhSOqSe+FLJ9SDdUaFNnxxm/ZGq7hZVB7a1IBBUa/jNvomI+P+HNqq0A7H2+A1j 0iN4CEWBRt0bYTyuNLf0EbxXcjzl2VY00SZxJiQ+1SzMF5ZK9ytr+Q/yvL2F7Y9EseaiN7 LCDyRNkp5lUVt1jh3wsx+G1z2YBkkY1dJA0kwpNxdzgGQa2bT8W+vsnKxaCldXORc1Y3Gd Ld5w9J6Lz9CC8DaJlyzMcqVCy4Sv5dxl+wpMiWYoGn54PvM8kHDy3hnqEwut9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776043227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OITFkssOg+T1dcVrXy6hXiFFQYVN5irY7haJV1N7dhU=; b=UnfNiMhvuHIZTJUg5xhS+MqMp0uff/g5O5yNGApfUfTYgho0165FutfnQMVKr4bA70qImC +yx3sU9W7b36P3RMMoKBLdJvb7vNAXirr9JaX46hVtUYZ11+UciRNb+1IUfLH4vspKq3vK jDWCmcxt2BsFqA7yE3bY49es0DjRjLQ9mPA3N6MMV5I+oJud2l+0+i/it0KT0PNYdQNgpU tzqVMw+kX9A52VaXwOqA3OAIFbfzBocYQgkm1tKMskJ3FWl6vjjTCq5ncLDyiT668e5dGC IUJWCBUUqd+TuWu6STD7l0IDLyNYrCtHD5ka8A/nVEpsJwiQnS7B8Tns+8Yxhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv8jR1MY5zjNB for ; Mon, 13 Apr 2026 01:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c16c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 01:20:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: bd6548f4b462 - stable/15 - nfsid.h: Put the nfsd_idargs structure in a new .h 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bd6548f4b462a731cde55a57174ff56b423de2fb Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 01:20:27 +0000 Message-Id: <69dc44db.3c16c.4edf3aa5@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=bd6548f4b462a731cde55a57174ff56b423de2fb commit bd6548f4b462a731cde55a57174ff56b423de2fb Author: Rick Macklem AuthorDate: 2026-04-06 14:09:01 +0000 Commit: Rick Macklem CommitDate: 2026-04-13 01:18:41 +0000 nfsid.h: Put the nfsd_idargs structure in a new .h This patch moves the definition of the nfsd_idargs structure out of nfs.h and into a new file called nfsid.h. This is being done so that it can be included in nfs_diskless.c in a future commit. There should be no semantics change from this commit. (cherry picked from commit e6db4dd9d7216067388ae91ac73c3917a93f9420) --- sys/fs/nfs/nfs.h | 23 --------------- sys/fs/nfs/nfs_commonport.c | 1 + sys/fs/nfs/nfs_commonsubs.c | 1 + sys/fs/nfs/nfs_var.h | 1 - sys/fs/nfs/nfsid.h | 67 ++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/nfsuserd/nfsuserd.c | 1 + 6 files changed, 70 insertions(+), 24 deletions(-) diff --git a/sys/fs/nfs/nfs.h b/sys/fs/nfs/nfs.h index 7903542be91d..b30e4f17b7c5 100644 --- a/sys/fs/nfs/nfs.h +++ b/sys/fs/nfs/nfs.h @@ -235,18 +235,6 @@ struct nfscbd_args { u_short port; /* Port# for callbacks */ }; -struct nfsd_idargs { - int nid_flag; /* Flags (see below) */ - uid_t nid_uid; /* user/group id */ - gid_t nid_gid; - int nid_usermax; /* Upper bound on user name cache */ - int nid_usertimeout;/* User name timeout (minutes) */ - u_char *nid_name; /* Name */ - int nid_namelen; /* and its length */ - gid_t *nid_grps; /* and the list */ - int nid_ngroup; /* Size of groups list */ -}; - struct nfsd_oidargs { int nid_flag; /* Flags (see below) */ uid_t nid_uid; /* user/group id */ @@ -391,17 +379,6 @@ struct nfsreferral { #define NFSLCK_WANTBITS \ (NFSLCK_WANTWDELEG | NFSLCK_WANTRDELEG | NFSLCK_WANTNODELEG) -/* And bits for nid_flag */ -#define NFSID_INITIALIZE 0x0001 -#define NFSID_ADDUID 0x0002 -#define NFSID_DELUID 0x0004 -#define NFSID_ADDUSERNAME 0x0008 -#define NFSID_DELUSERNAME 0x0010 -#define NFSID_ADDGID 0x0020 -#define NFSID_DELGID 0x0040 -#define NFSID_ADDGROUPNAME 0x0080 -#define NFSID_DELGROUPNAME 0x0100 - /* * fs.nfs sysctl(3) identifiers */ diff --git a/sys/fs/nfs/nfs_commonport.c b/sys/fs/nfs/nfs_commonport.c index 44fcbe2d5722..dbc2b3b942e9 100644 --- a/sys/fs/nfs/nfs_commonport.c +++ b/sys/fs/nfs/nfs_commonport.c @@ -40,6 +40,7 @@ * to this BSD variant. */ #include +#include #include #include #include diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 950288027d76..78e2fbb72bdb 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -43,6 +43,7 @@ #include "opt_inet6.h" #include +#include #include #include diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 145cbf984464..2f81905f6c36 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -119,7 +119,6 @@ int nfsrv_delegupdate(struct nfsrv_descript *, nfsquad_t, nfsv4stateid_t *, vnode_t, int, struct ucred *, NFSPROC_T *, int *); int nfsrv_releaselckown(struct nfsstate *, nfsquad_t, NFSPROC_T *); void nfsrv_zapclient(struct nfsclient *, NFSPROC_T *); -int nfssvc_idname(struct nfsd_idargs *); void nfsrv_servertimer(void * __unused); int nfsrv_getclientipaddr(struct nfsrv_descript *, struct nfsclient *); void nfsrv_setupstable(NFSPROC_T *); diff --git a/sys/fs/nfs/nfsid.h b/sys/fs/nfs/nfsid.h new file mode 100644 index 000000000000..bd9807ca1acc --- /dev/null +++ b/sys/fs/nfs/nfsid.h @@ -0,0 +1,67 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Rick Macklem at The University of Guelph. + * + * 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. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. + */ + +#ifndef _NFS_NFSID_H_ +#define _NFS_NFSID_H_ + +/* Definitions for id<-->name mapping. */ +struct nfsd_idargs { + int nid_flag; /* Flags (see below) */ + uid_t nid_uid; /* user/group id */ + gid_t nid_gid; + int nid_usermax; /* Upper bound on user name cache */ + int nid_usertimeout;/* User name timeout (minutes) */ + u_char *nid_name; /* Name */ + int nid_namelen; /* and its length */ + gid_t *nid_grps; /* and the list */ + int nid_ngroup; /* Size of groups list */ +}; + +/* And bits for nid_flag */ +#define NFSID_INITIALIZE 0x0001 +#define NFSID_ADDUID 0x0002 +#define NFSID_DELUID 0x0004 +#define NFSID_ADDUSERNAME 0x0008 +#define NFSID_DELUSERNAME 0x0010 +#define NFSID_ADDGID 0x0020 +#define NFSID_DELGID 0x0040 +#define NFSID_ADDGROUPNAME 0x0080 +#define NFSID_DELGROUPNAME 0x0100 +#define NFSID_SYSSPACE 0x0200 + +#if defined(_KERNEL) || defined(KERNEL) +int nfssvc_idname(struct nfsd_idargs *); +#endif + +#endif /* _NFS_NFSID_H */ diff --git a/usr.sbin/nfsuserd/nfsuserd.c b/usr.sbin/nfsuserd/nfsuserd.c index 058253beaf95..9326dd9018e0 100644 --- a/usr.sbin/nfsuserd/nfsuserd.c +++ b/usr.sbin/nfsuserd/nfsuserd.c @@ -50,6 +50,7 @@ #include #include #include +#include #include #include From nobody Mon Apr 13 02:54:56 2026 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 4fvBpS4zNwz6ZMsP for ; Mon, 13 Apr 2026 02:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvBpS46r5z3nKZ for ; Mon, 13 Apr 2026 02:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776048896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I9uFKFH65OQsL3VcMhezvxHUERNNv8aDmVA4ORHqoSk=; b=LIR5fae5SH2x8aY5bY3e/GOQmqCq9HoQuX49Ej4Pzp18KMpdusTFZPRZDMVrZHJ+wS0pL4 wlnU0yByCGE2mh2QjdqYogfhMO48NFHqu7S92YfVV8WWIXhSczJ7ww4YFI7RgDAL2pCMvC YHF96Iu7EwR/PzzNpUdm8ktebUbQkyiVli+WJVkuNFx4mLN7YjGyzt4U5VuTo+2+Za8v0P UR6532RahNklqOXDMVt5KAVGcoZFUidtj2PMGYrZUXlX3En1yC/XSrPSfITQ417HuqUv75 bpQ1jGPBCpirPKkdpemaXU5o/o5C3jDf/WFXPvU/NHOTUMpHTKuONarNsKSj7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776048896; a=rsa-sha256; cv=none; b=urhezmn11EB5lx+01obZYIYpPIIZAHpj+1Atu88n/EoqLRBaFA+06CeEcuxdVrne8NuqMP av+boB3ApMkMvfIlT1HmF3R2jqvfz2WNp6mcvuVGXqpjDzYrhmVzrZMbk0XEx+E6TL67vU ojJjTpNAvQnQ34CkzDCha410h5b8StmoewpUiLMzD03IB7MYVyRk1EQ7tj66vTspOsxb0o /tC1yFiKIghEMj7bZ6KKAipmXjKOI6P26LY4kyQeq5aF+stIIEkUxh7qPgP5PZOGds0qVx P85499FPgvoPb4PQIx/oCuCpbJN1qbsFbZwqqDt1RtMlYMWlY6CnCWtdwP2v/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776048896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I9uFKFH65OQsL3VcMhezvxHUERNNv8aDmVA4ORHqoSk=; b=DNwpRKZwoZ37pX9dmXyakT8lGf7sFrRCAyZpFw6iz8Mb1yALeYAS9gL/Z8IFKUpiOSW3k2 sewLUMYLfL/0kP6oUgAqknyeZ1GXMIn0dqcJrodXk15CudKgM4VX0YlA0UCyaJ32KXfrmE 7j3IgtJ+WOzMPYvrUdLWdz10M2+Zn+rst1iOa5S+tkWPKacGw4mKRd+GyMLsbjly6s2+wb hqkIAxWjI2JJ2k6QPAzcffDg168b7N4M5JlGE1sLQa1VOYSxF736+n683LAucbdG5R5J9k yW2wJxr63JT9/SvurDGfoVjLMTr64+qfXQKE2gvWNnskX83haFvmy95G4j4L3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvBpS3jn2zm80 for ; Mon, 13 Apr 2026 02:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 463f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 02:54:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0361497268a5 - stable/15 - rtadvd: Fix validation of the MTU parameter when parsing config 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 0361497268a51c565ff335f102690dd8ccad4546 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 02:54:56 +0000 Message-Id: <69dc5b00.463f3.23255166@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0361497268a51c565ff335f102690dd8ccad4546 commit 0361497268a51c565ff335f102690dd8ccad4546 Author: Mark Johnston AuthorDate: 2026-04-01 12:14:24 +0000 Commit: Mark Johnston CommitDate: 2026-04-13 02:53:05 +0000 rtadvd: Fix validation of the MTU parameter when parsing config MFC after: 1 week (cherry picked from commit 607f6be6ec19f49ff595226afe1c8aa6515c59a0) --- usr.sbin/rtadvd/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index 1b37d53c8b91..628ca3be886f 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -613,7 +613,7 @@ getconfig_free_pfx: get_prefix(rai); MAYHAVE(val64, "mtu", 0); - if (val < 0 || val64 > 0xffffffff) { + if (val64 < 0 || val64 > 0xffffffff) { syslog(LOG_ERR, "<%s> mtu (%" PRIu64 ") on %s out of range", __func__, val64, ifi->ifi_ifname); From nobody Mon Apr 13 02:54:57 2026 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 4fvBpT6yrPz6ZMnK for ; Mon, 13 Apr 2026 02:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvBpT5WYpz3nQL for ; Mon, 13 Apr 2026 02:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776048897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H4WCpiLvS21ohd/zFX34dR52bcBPvXL4iOj/C09rtC8=; b=Ks9LB2A4gyQRe9ahDe9NEM8HjSKhlQOC0tPDgq1se/g7hMmQ0cnaMohU9S/Q50rAH2wA1u ZTPB3ngBF+8ajOpkF0VJrCX0nGwebUZgJ2pUv5B0AQLOpBwrDLISe+YHGRm0nUFhTnaN4L Bt+WF/3aZQdetCgBClZ1lCAkTlMep7P2+KFX6aQvp1yzD5iggR35pG6ko96zQVzp3K5NLp vbq31yatk/JHLPoSdWx1nwUJGARWxqnnQZ31JPtm8GQZ/1KzU11yK1IDX4+gG2uVUmuM1u oIFbkdqy62gbaStrar83np9kjbBEbrVse54ik5ILwi9+hmuZ6wJpAzlrhyzzaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776048897; a=rsa-sha256; cv=none; b=aHRkulZ3ue0r9VWgyZrFdSMRXI8wtR1+gqyvk3G2hi2+lOzMhbJRfZYwFTJsLy/xA0IA16 ctG4tr+wR/3V5W4ESZ7NfMSnGy3ECkQpEpHKRI0m9rRjqR3YfvkJNpiaVWaLiLX71RYZsj f7eA6zSGjiWSLE4S8RKZ0WcZqdUFhVagml92Wyoa3xAzRYFSbohUFRSbKFst3PatyRAHp3 ZMGmjYEbeTXugGkO5NYT3ir7mFMTO3n0BGBF8A+jmomF6EjpW5pNhWLMIJXrZSpL45AATO hDtsBfghM4eeJVI+F9FRzThdjuRUn70Vi/zm2fs4M+feKwb4CaASSn8xvKUeYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776048897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H4WCpiLvS21ohd/zFX34dR52bcBPvXL4iOj/C09rtC8=; b=vhs/k/6qj+S43MUAJ7UzsfskKZhqeRwsQ14u0WzjGkYtK2xiOsjlbOm86ghYeb0nIPK7Se +9iAAQyRUDHkpt+Hg9PzoS7DW5I9ywGp3oM5jTg7B9oA5/6TzIjWdYnZuJj0KHtr98SMjt MQpHn8o0rG4JYwJ0F38EL+9ALkGqOmr/Vhlqo5arO0lR7xiXJr5EPd6xBgpotq3lhS6kXw ybb5kxwWJCAJwH1SlPJafTDqtz+LbjS30XuT7xSH3RscGev3Fvm6ooE/5OC5eiJLg2TsU1 fj0XSKnYPOXlx5R+MPJF8ISdkQlyDaEKT8HSQaVgnxbPp0xRmWnETnPBT/AlvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvBpT4YVSzm81 for ; Mon, 13 Apr 2026 02:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 463f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 02:54:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2791bc4219e8 - stable/15 - vm_fault: Avoid creating clean, writeable superpage mappings 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 2791bc4219e8e5e99e0160ff398b31436e0f04de Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 02:54:57 +0000 Message-Id: <69dc5b01.463f7.33b9bf1a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2791bc4219e8e5e99e0160ff398b31436e0f04de commit 2791bc4219e8e5e99e0160ff398b31436e0f04de Author: Mark Johnston AuthorDate: 2026-03-27 00:25:31 +0000 Commit: Mark Johnston CommitDate: 2026-04-13 02:53:05 +0000 vm_fault: Avoid creating clean, writeable superpage mappings The pmap layer requires writeable superpage mappings to be dirty. Otherwise, during demotion, we may miss a hw update of the PDE which sets the dirty bit. When creating a managed superpage mapping without promotion, i.e., with pmap_enter(psind == 1), we must therefore ensure that a writeable mapping is created with the dirty bit pre-set. To that end, vm_fault_soft_fast(), when handling a map entry with write permissions, checks whether all constituent pages are dirty, and if so, converts the fault to a write fault, so that pmap_enter() does the right thing. If one or more pages is not dirty, we simply create a 4K mapping. vm_fault_populate(), which may also create superpage mappings, did not do this, and thus could create mappings which violate the invariant described above. Modify it to instead check whether all constituent pages are already dirty, and if so, convert the fault to a write fault. Otherwise the mapping is downgraded to read-only. Reported by: ashafer Reviewed by: alc, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55536 (cherry picked from commit f404109e90eee7f67ddaae3f52286d524a190fa0) --- sys/vm/vm_fault.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index addda72e2b56..2eed9851135a 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -642,6 +642,8 @@ vm_fault_populate(struct faultstate *fs) pager_last = map_last; } for (pidx = pager_first; pidx <= pager_last; pidx += npages) { + bool writeable; + m = vm_page_lookup(fs->first_object, pidx); vaddr = fs->entry->start + IDX_TO_OFF(pidx) - fs->entry->offset; KASSERT(m != NULL && m->pindex == pidx, @@ -652,14 +654,28 @@ vm_fault_populate(struct faultstate *fs) !pmap_ps_enabled(fs->map->pmap))) psind--; + writeable = (fs->prot & VM_PROT_WRITE) != 0; npages = atop(pagesizes[psind]); for (i = 0; i < npages; i++) { vm_fault_populate_check_page(&m[i]); vm_fault_dirty(fs, &m[i]); + + /* + * If this is a writeable superpage mapping, all + * constituent pages and the new mapping should be + * dirty, otherwise the mapping should be read-only. + */ + if (writeable && psind > 0 && + (m[i].oflags & VPO_UNMANAGED) == 0 && + m[i].dirty != VM_PAGE_BITS_ALL) + writeable = false; } + if (psind > 0 && writeable) + fs->fault_type |= VM_PROT_WRITE; VM_OBJECT_WUNLOCK(fs->first_object); - rv = pmap_enter(fs->map->pmap, vaddr, m, fs->prot, fs->fault_type | - (fs->wired ? PMAP_ENTER_WIRED : 0), psind); + rv = pmap_enter(fs->map->pmap, vaddr, m, + fs->prot & ~(writeable ? 0 : VM_PROT_WRITE), + fs->fault_type | (fs->wired ? PMAP_ENTER_WIRED : 0), psind); /* * pmap_enter() may fail for a superpage mapping if additional From nobody Mon Apr 13 02:54:58 2026 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 4fvBpW1WVFz6ZMsT for ; Mon, 13 Apr 2026 02:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvBpV672qz3n6M for ; Mon, 13 Apr 2026 02:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776048898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dP7vpKhAocgvUzfh7KNsCCph+TyGVJkJ+nqqKtInQ3c=; b=D1z3rPQaAInsAIHWy40L/NxfFM1jpqur9N4cEQgY/thPI+alE31kLKlzkb9jbdcY+/Uf23 +mhdTADzeOgs91zq/6tYS7pjAhtoMI8LcW0lFKDs85naFsQTdn31XJXAsUl3/TecajBIg/ EDqr0JN4Eh03/vvjGV0J3WkR04gczwzy9ln9E9m8jv6fDdI82kBkmhc8a9/Zjm8cGA1T4c 9JC5koO2T3GrZgkP/SxwHetB358EpFhuStvX5vpVr8JcVV6pUxWJz8WsVEgN0cu3yuo9QB VSrRXlXaif5VvGPeNAYM1G17Ux7LdNcvz1EMBdiEry/JsyLV/eUlVystjZSDRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776048898; a=rsa-sha256; cv=none; b=sYoI1vbHKelZ+oksoTqhcHK5J780lG4jUpIOBrq/2uEVIayh/OI3Wf1WHfpXja5kEdu1y9 qkYghglagjs7M+YWCvzeAKUMgPXXVBAEpAGO1bTiVuWVezQ6W/rN/TQEvx+P5K5D8OL3oJ CtvQHAHKXaoBohIhCZf/6fOKwJLD0IVjaEvD4H387z4pN8xsQxtKXsulU2Wir0PbCy8zVs sp1zR4g4iWreRfNVO2hARcUPIu14ohnG+Q/isDnnWlsmtVmsWArNkGBiVCcbKbYnu0Gvg0 pOwhsUhjvVPquvHUmtaIuduykXCt8TGU3y/Yhy/FdsT6u8BGqAsruNtH08+mPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776048898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dP7vpKhAocgvUzfh7KNsCCph+TyGVJkJ+nqqKtInQ3c=; b=dH5s+qYwehv0amCbe5FphN10AAvgpQ4R/lNoHI2mz8vXbMDX+Z4WFn60Jx/eVsp5qHN5ik /2Y0MOphH3eavYjlaitfeizt9L8b1g0rVcZBY1QbZ48XTsXyTXM8xLEZNANLY4WsewKUaX b1oP5nawWD+ruvjMtCVfSK6lLBZtsfFXxoL3SrWJZxJ3ebYqhjZKs5kcabgZu+pJU+y+Gl vMlD6p1SRZeUfFBThGVBxUC/pBcruqTyyw7zbEGSQ5bTWFaH6zEjUGCb0xd1jiNohzbhr7 Yd9rHYBEOt5JDD+YjxigvrNqMrBrf5xrpPse6xQDkuX162nGZfdy+NUjcfiBEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvBpV5PqFzm82 for ; Mon, 13 Apr 2026 02:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46740 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 02:54:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 84b871567ebe - stable/15 - kqueue: Fix a race when adding an fd-based knote to a queue 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 84b871567ebe264222d96655e4f6f92c73b0996e Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 02:54:58 +0000 Message-Id: <69dc5b02.46740.65dfb70f@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=84b871567ebe264222d96655e4f6f92c73b0996e commit 84b871567ebe264222d96655e4f6f92c73b0996e Author: Mark Johnston AuthorDate: 2026-03-27 00:24:18 +0000 Commit: Mark Johnston CommitDate: 2026-04-13 02:53:06 +0000 kqueue: Fix a race when adding an fd-based knote to a queue When registering a new kevent backed by a file descriptor, we first look up the file description with fget(), then lock the kqueue, then see if a corresponding knote is already registered. If not, and KN_ADD is specified, we add the knote to the kqueue. closefp_impl() interlocks with this process by calling knote_fdclose(), which locks each kqueue and checks to see if the fd is registered with a knote. But, if userspace closes an fd while a different thread is registering it, i.e., after fget() succeeds but before the kqueue is locked, then we may end up with a mismatch in the knote table, where the knote kn_fp field points to a different file description than the knote ident. Fix the problem by double-checking before registering a knote. Add a new fget_noref_unlocked() helper for this purpose. It is a clone of fget_noref(). We could simply use fget_noref(), but I like having an explicit unlocked variant. PR: 293382 Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55852 (cherry picked from commit 8f3227f527567aef53da845ab78da8e16d9051c1) --- sys/kern/kern_event.c | 14 +++++++++++++- sys/sys/filedesc.h | 17 +++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 2bb965f3e5e4..3872fb5862c5 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ktrace.h" #include "opt_kqueue.h" @@ -1807,6 +1806,19 @@ findkn: error = ENOMEM; goto done; } + + /* + * Now that the kqueue is locked, make sure the fd + * didn't change out from under us. + */ + if (fops->f_isfd && + fget_noref_unlocked(td->td_proc->p_fd, + kev->ident) != fp) { + KQ_UNLOCK(kq); + tkn = kn; + error = EBADF; + goto done; + } kn->kn_fp = fp; kn->kn_kq = kq; kn->kn_fop = fops; diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index 4817855443af..c6499a18b884 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -212,6 +212,8 @@ struct filedesc_to_leader { #ifdef _KERNEL +#include + /* Operation types for kern_dup(). */ enum { FDDUP_NORMAL, /* dup() behavior. */ @@ -303,6 +305,21 @@ int fget_only_user(struct filedesc *fdp, int fd, MPASS(refcount_load(&fp->f_count) > 0); \ }) +/* + * Look up a file description without requiring a lock. In general the result + * may be immediately invalidated after the function returns, the caller must + * handle this. + */ +static inline struct file * +fget_noref_unlocked(struct filedesc *fdp, int fd) +{ + if (__predict_false( + (u_int)fd >= (u_int)atomic_load_int(&fdp->fd_nfiles))) + return (NULL); + + return (atomic_load_ptr(&fdp->fd_ofiles[fd].fde_file)); +} + /* Requires a FILEDESC_{S,X}LOCK held and returns without a ref. */ static __inline struct file * fget_noref(struct filedesc *fdp, int fd) From nobody Mon Apr 13 02:56:39 2026 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 4fvBrS2Zj0z6ZMnt for ; Mon, 13 Apr 2026 02:56: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvBrR723pz3pHY for ; Mon, 13 Apr 2026 02:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776049000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H+R39vLGNavh42iAeebN+aJKmkAjlznAkSdrd1e01Bc=; b=SQTnf6ZANApnZQowFrY3r7A4eQtQfm7t9NkDxvz4veRieUN1d3TmsgM7PNE8fM1QKFQ7jX Hi9cLf7qQC4XsOnedinjlEjddRybKYZ8vyhExDtMFzRWu76ajG6f8vKdDj7cN5zI0JxqOy 2q3aE7VfIvNhGZjaKvkTwwJoC9PTDuEy3hnlwwoeKOfEjuoQMQ+2pwuk5IxOMRpCSBI17X Ma7cdUzKVdAyRa4iMMbWmGh6cFHMAA9mV4vksJhz0bOziB5eEaLz5weXMRWYRRRToWJ+Qv GK+Pbi2h4448GfpQ7+YE8wHX6XPOwln3Z0ZxkvnkWLiLM+4t0JsO0G0ZqA3DDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776049000; a=rsa-sha256; cv=none; b=K5lt7oao95A2hL8A3Zx9UzciTk0PdZAC0fM4eBWZ8jHnxRik7dl76puaVYbSrDr4/+cPyt HywvRaP0mP44NwOMt4Ik6fuM2t2p+nDabc+FJRvQcZqwOggZaaBo8G3uSEP3jUb1/gknAQ wRnjGedXqqXRg1UCwrDkznVW+DNFBpWgJXlVj1cdLJhx3j8PlJOFdlX20I401cUOKnLqAY DP3gwwX7AUM7eJZKW1Gjv1SHhhd0mq6bAuqJGSluFXVfMgJkzyN/3S3mUjAwSoPiPCvIwp 7Poa1Ds5anY96VUGAhK0XBwHRbE0cPhMEw3VB3LFRbrVyiKAgmLlVpR2aYOGMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776049000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H+R39vLGNavh42iAeebN+aJKmkAjlznAkSdrd1e01Bc=; b=EM36QoP8q3CpMUgXbv6bHwqj2Cos72wmQN2zdtpD3evJMfMcByc/09sz7kJb35O70VV6VA uQD1h7vJx6a+8dAbSA/BzE7a9LaeZVh1sF9GcbLMxTDaz6r7OxbbE8HYfIfhunMzk+F4BS rP4olYQvcYYp+tO5mwthLhlwpSv+gAmA+qsKuxpj5Ntu+I+MrdHzFWWDtS38j6V1+9JkPT 48vrTXYAzlQFSWX/3WBZaNpvYW2FKApcUNghE+F7/EzJRY6UVCM01B9vhkHqm8P06yp+wF LfNCJaEKNui0HN1ln7wJnPX1bIUUqBWPnyC7wYq3JL1Sku5C6sDuutjWV+n7lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvBrR6H4tzlP5 for ; Mon, 13 Apr 2026 02:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44d44 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 02:56:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 88535adba95d - stable/14 - kqueue: Fix a race when adding an fd-based knote to a queue 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 88535adba95d019557b4281c52daa9feccade2fe Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 02:56:39 +0000 Message-Id: <69dc5b67.44d44.27fb06e6@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=88535adba95d019557b4281c52daa9feccade2fe commit 88535adba95d019557b4281c52daa9feccade2fe Author: Mark Johnston AuthorDate: 2026-03-27 00:24:18 +0000 Commit: Mark Johnston CommitDate: 2026-04-13 02:53:26 +0000 kqueue: Fix a race when adding an fd-based knote to a queue When registering a new kevent backed by a file descriptor, we first look up the file description with fget(), then lock the kqueue, then see if a corresponding knote is already registered. If not, and KN_ADD is specified, we add the knote to the kqueue. closefp_impl() interlocks with this process by calling knote_fdclose(), which locks each kqueue and checks to see if the fd is registered with a knote. But, if userspace closes an fd while a different thread is registering it, i.e., after fget() succeeds but before the kqueue is locked, then we may end up with a mismatch in the knote table, where the knote kn_fp field points to a different file description than the knote ident. Fix the problem by double-checking before registering a knote. Add a new fget_noref_unlocked() helper for this purpose. It is a clone of fget_noref(). We could simply use fget_noref(), but I like having an explicit unlocked variant. PR: 293382 Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55852 (cherry picked from commit 8f3227f527567aef53da845ab78da8e16d9051c1) --- sys/kern/kern_event.c | 14 +++++++++++++- sys/sys/filedesc.h | 17 +++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 920256f8c1bd..df509e7a8492 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ktrace.h" #include "opt_kqueue.h" @@ -1654,6 +1653,19 @@ findkn: error = ENOMEM; goto done; } + + /* + * Now that the kqueue is locked, make sure the fd + * didn't change out from under us. + */ + if (fops->f_isfd && + fget_noref_unlocked(td->td_proc->p_fd, + kev->ident) != fp) { + KQ_UNLOCK(kq); + tkn = kn; + error = EBADF; + goto done; + } kn->kn_fp = fp; kn->kn_kq = kq; kn->kn_fop = fops; diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index 440c5d3d15f9..18077d11150d 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -213,6 +213,8 @@ struct filedesc_to_leader { #ifdef _KERNEL +#include + /* Operation types for kern_dup(). */ enum { FDDUP_NORMAL, /* dup() behavior. */ @@ -303,6 +305,21 @@ int fget_only_user(struct filedesc *fdp, int fd, MPASS(refcount_load(&fp->f_count) > 0); \ }) +/* + * Look up a file description without requiring a lock. In general the result + * may be immediately invalidated after the function returns, the caller must + * handle this. + */ +static inline struct file * +fget_noref_unlocked(struct filedesc *fdp, int fd) +{ + if (__predict_false( + (u_int)fd >= (u_int)atomic_load_int(&fdp->fd_nfiles))) + return (NULL); + + return (atomic_load_ptr(&fdp->fd_ofiles[fd].fde_file)); +} + /* Requires a FILEDESC_{S,X}LOCK held and returns without a ref. */ static __inline struct file * fget_noref(struct filedesc *fdp, int fd) From nobody Mon Apr 13 02:56:40 2026 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 4fvBrT416hz6ZMWR for ; Mon, 13 Apr 2026 02:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvBrT1S5gz3pFd for ; Mon, 13 Apr 2026 02:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776049001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C6fXXSswFSxjTyJ66xjFa5iTviYR5opijSJ0nyzIWCo=; b=UmXPzy5w+DG/ZLDuEeno86cfTIyfQ7Pm+RvkEoV36Xk+H1CXFZgC658FVmKr5EfpnzKHEp dONno+hHGIA1OkOrqd4LxJr40XS+BgFxwxgpFA24ctoZtzbEryfomiMYGzCx2oG+Dd6op4 UY6eAvQq77ztcIpEcGU4ews1i6rzZDSbj82mkvCUNQcr+eUpjk5a8afHU1e0CzlX43F5fb SoLAW2zSrMymrvB3vsTOEzMxNGqdNYpem6u3CPu7uj7QTl6YugctOcMPl88fXQ+jSXgVDL fvke8stDPrv1ToTPew6PsYtZz4n8D3cDmI/qSp51K1JQDoXYH+wekrgIiC4tpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776049001; a=rsa-sha256; cv=none; b=BfqXcTil8bmOMyZuUtIwCOqk1QC2rkUJy9dLdTB1ZF+lfpd0S8KshQqdmx7qf8W2qptGEd P4LNxwCetQPC45yBBz1xGT4mWck1KlFOKQdrC+YAb0IJF/mrrn3mTm96vE/l9pAnkgOWtf F9ARWi24n+punPRdY3Lof96YBxs8lvRPniE7JUk9XADxUpqfWQJTxXT9UIBLOypb+KuNUZ mJ113mp0r8cpwGI1FwYkPNBdpoMeuiqeNJNS54CrnFY88vVbubqVNek3ql8/8I+lIdUh8t +tbQONNc6GgiLjLrxsUtIrEBARfQAW2pglu7eSu1b0PLeOJ9UPQ2nDx3PQiAoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776049001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C6fXXSswFSxjTyJ66xjFa5iTviYR5opijSJ0nyzIWCo=; b=JTAiRuyOT3BemsvbRwGTVWSpUqX+IoVxqUeOZdaXQgHM/Idq//QO5hR/WTUmJfSsiAV9CX r6pgJBPgG0M9QcwhWYp+yhuTCJZD70Jz2qimcz+uUosyY3/wIHH4k8i1OEF5qdXgjHtWCa Yw8D7AS2d96hYhBxENBjSqS1aHPzQEEt2Al2rWAN6PjP0zrFDJAJ9DxnMoljOkz4sXAJrQ ompmePHn4EBIWgUog27iM0Edlydk9YefzX0SQhY+/IH0XKZtB0jC50cZj8OTLBwzqQMH3d ZjYF+sU62hFhL6OvbrNMzOaCWPq2CHMDLEn1cCVNLVypKuwB4HQK99MrddVjvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvBrT13LdzlqG for ; Mon, 13 Apr 2026 02:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44ea6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 02:56:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9b7c0f4f81f0 - stable/14 - vm_fault: Reset m_needs_zeroing properly 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 9b7c0f4f81f06424899094d4381dede79669b623 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 02:56:40 +0000 Message-Id: <69dc5b68.44ea6.274d1173@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9b7c0f4f81f06424899094d4381dede79669b623 commit 9b7c0f4f81f06424899094d4381dede79669b623 Author: Mark Johnston AuthorDate: 2026-04-08 04:21:09 +0000 Commit: Mark Johnston CommitDate: 2026-04-13 02:53:32 +0000 vm_fault: Reset m_needs_zeroing properly - When allocating a page, we should only consider the PG_ZERO flag when handling the top-level page. - Unconditionally reset the flag when restarting the fault handler. Previously, vm_fault_busy_sleep() would fail to reset it. PR: 294039 Reviewed by: kib Tested by: Peter Much MFC after: 3 days Fixes: cff67bc43df1 ("vm_fault: only rely on PG_ZERO when the page was newly allocated") Differential Revision: https://reviews.freebsd.org/D56234 (cherry picked from commit 04132e01004316ddd0e0cde6ef15b100b7b1844d) --- sys/vm/vm_fault.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 418f39ac2a2b..87deb993402c 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -272,8 +272,6 @@ vm_fault_might_be_cow(struct faultstate *fs) static void vm_fault_deallocate(struct faultstate *fs) { - - fs->m_needs_zeroing = true; vm_fault_page_release(&fs->m_cow); vm_fault_page_release(&fs->m); vm_object_pip_wakeup(fs->object); @@ -1321,7 +1319,8 @@ vm_fault_allocate(struct faultstate *fs) vm_waitpfault(dset, vm_pfault_oom_wait * hz); return (FAULT_RESTART); } - fs->m_needs_zeroing = (fs->m->flags & PG_ZERO) == 0; + if (fs->object == fs->first_object) + fs->m_needs_zeroing = (fs->m->flags & PG_ZERO) == 0; fs->oom_started = false; return (FAULT_CONTINUE); @@ -1653,7 +1652,6 @@ vm_fault(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, fs.fault_flags = fault_flags; fs.map = map; fs.lookup_still_valid = false; - fs.m_needs_zeroing = true; fs.oom_started = false; fs.nera = -1; fs.can_read_lock = true; @@ -1662,6 +1660,7 @@ vm_fault(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, RetryFault: fs.fault_type = fault_type; + fs.m_needs_zeroing = true; /* * Find the backing store object and offset into it to begin the From nobody Mon Apr 13 02:58:41 2026 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 4fvBtp0ZvDz6ZMT8 for ; Mon, 13 Apr 2026 02:58: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvBtn6s8Dz3qXg for ; Mon, 13 Apr 2026 02:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776049122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h8ydgQvVxXdc5UY8VUqw+GDSzENVP0FBZwKMY79Q+AM=; b=OLvDdbf5h7/o4mztlvQCZxiGlo2WRRY0E4Uuz/JmcTj1NmJ1xWpJm0T0B9PvtiVFNfe34L D2X9NVfaUl9HC0l1LtKFDLip9fbIWyqOdMOo1NPRuu/11jzm/GmkWUGCjS4OLjlT+Ffgl9 wyOKQY93+HfsKtLftq5KFunMqEL1D/t4+Rm8qFMGDqGDEy1UB2tJK3tXuzepM5HIM5f6Q8 i9SQ0XwfBLGu/xKqqwIVAG5/aWg4+Gr9eDXLqsKt1b26nodIFiFwgfTUOTbfL+RZiHRNZU PlT006TZH1ttv3CpWGLxcY4kUj2hjwRLNE7YuGUa9RtxbXBWyVdcqdbWHclY2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776049122; a=rsa-sha256; cv=none; b=C20uwe6J8DuV33OtSLTEsiRDXs7QohN+Onqv5nC+4Hqb31CwxB0ZIvZj4Hd9lnjhBpkNjI dNZ23opt+sg6utCizt6nPJQUuRU4/9LsRIsOWzEloRsN7zRvIn80oWj9s0JghgCRbKAL2H u576Z6HHo2Ks31dXpjEUKktmIzsUEW2FPIQwuTxDEyoVeDCtvhwEC8urq3mlPS1Dvdb9gR zIGcaSKcUZwZ+sfsRwKLgjT1JR9jyOPpicZUyREsf6gnp/6qH3VN98IThN0VRlPjbbImoQ wChmL//iSYeBRisNbvyXbMsObzfsND1x5/uAKNPKzv0VcOVKRZyQ5oZdCd0tLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776049122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h8ydgQvVxXdc5UY8VUqw+GDSzENVP0FBZwKMY79Q+AM=; b=qkulZdUHchXLwfy4oiLV4G9lMWcFF1i/zkZ7++8t28QHsa0CmCC9o2uRJ8oo6IJNP2RDBf do3U/1Bv+uCobwRl6g+fUGTM6aDkbKRCAyRMDAlMnb91s8r1MxJdgadDt1b3AZqOoCllio e4b/KH7tUE8YiX9O73eBOrGwG8lF7ZWcR39eqGUff2Eb9KCSKU/K85M5NYn6gpBAbRVp9i te6W1tWAi4gYfl3Z/ld2b27rJWZi1fq9hwIq25/LJ19pZuTKXdQEdcNACCHLts23PxzbOG 3jrUrefIQRpEV7xhfXohy+l0C5kjtZjQhmUvkwZKwCTmrQiKTqpRuD8u8UOyUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvBtn61YWzm5w for ; Mon, 13 Apr 2026 02:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46633 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 02:58:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: bb5347cc6f78 - stable/13 - kqueue: Fix a race when adding an fd-based knote to a queue 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: bb5347cc6f78949dab1c631af546aa3fbd87e724 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 02:58:41 +0000 Message-Id: <69dc5be1.46633.3225eb05@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bb5347cc6f78949dab1c631af546aa3fbd87e724 commit bb5347cc6f78949dab1c631af546aa3fbd87e724 Author: Mark Johnston AuthorDate: 2026-03-27 00:24:18 +0000 Commit: Mark Johnston CommitDate: 2026-04-13 02:53:41 +0000 kqueue: Fix a race when adding an fd-based knote to a queue When registering a new kevent backed by a file descriptor, we first look up the file description with fget(), then lock the kqueue, then see if a corresponding knote is already registered. If not, and KN_ADD is specified, we add the knote to the kqueue. closefp_impl() interlocks with this process by calling knote_fdclose(), which locks each kqueue and checks to see if the fd is registered with a knote. But, if userspace closes an fd while a different thread is registering it, i.e., after fget() succeeds but before the kqueue is locked, then we may end up with a mismatch in the knote table, where the knote kn_fp field points to a different file description than the knote ident. Fix the problem by double-checking before registering a knote. Add a new fget_noref_unlocked() helper for this purpose. It is a clone of fget_noref(). We could simply use fget_noref(), but I like having an explicit unlocked variant. PR: 293382 Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55852 (cherry picked from commit 8f3227f527567aef53da845ab78da8e16d9051c1) --- sys/kern/kern_event.c | 14 +++++++++++++- sys/sys/filedesc.h | 17 +++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 3fb576648fee..850db2d97dfa 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ktrace.h" #include "opt_kqueue.h" @@ -1632,6 +1631,19 @@ findkn: error = ENOMEM; goto done; } + + /* + * Now that the kqueue is locked, make sure the fd + * didn't change out from under us. + */ + if (fops->f_isfd && + fget_noref_unlocked(td->td_proc->p_fd, + kev->ident) != fp) { + KQ_UNLOCK(kq); + tkn = kn; + error = EBADF; + goto done; + } kn->kn_fp = fp; kn->kn_kq = kq; kn->kn_fop = fops; diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index a39716fdce0b..566b0a898307 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -198,6 +198,8 @@ struct filedesc_to_leader { #ifdef _KERNEL +#include + /* Operation types for kern_dup(). */ enum { FDDUP_NORMAL, /* dup() behavior. */ @@ -293,6 +295,21 @@ int fget_only_user(struct filedesc *fdp, int fd, MPASS(refcount_load(&fp->f_count) > 0); \ }) +/* + * Look up a file description without requiring a lock. In general the result + * may be immediately invalidated after the function returns, the caller must + * handle this. + */ +static inline struct file * +fget_noref_unlocked(struct filedesc *fdp, int fd) +{ + if (__predict_false( + (u_int)fd >= (u_int)atomic_load_int(&fdp->fd_nfiles))) + return (NULL); + + return (atomic_load_ptr(&fdp->fd_ofiles[fd].fde_file)); +} + /* Requires a FILEDESC_{S,X}LOCK held and returns without a ref. */ static __inline struct file * fget_locked(struct filedesc *fdp, int fd) From nobody Mon Apr 13 02:58:42 2026 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 4fvBtq2cfWz6ZMlS for ; Mon, 13 Apr 2026 02:58: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvBtq06Xqz3qVH for ; Mon, 13 Apr 2026 02:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776049123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0RFY9YZukwAMTtRJYkRVmadkYcYkyfCoTmL3CEt9YEs=; b=FvF6wRnvW5gcWbAgItaFaSNpfS8uvEKw8yTOaSD5N3XW5qYHNzlh6JyvVmNsRqi13DETu4 srYJpjsm+E3727+custkBq4cLFHHO4mRNybXTcOV0+C9YleIYZy689zzlIMVVebL/BrJKi vQQjyOFnQo5zeXvgUQs7/IUWoMIwDfbjKS0bMv58NUx+LzttWc+PC8cXZIdzFc7L6RCxgp CZUOvZCPn5ugpg7Un4LxJqm7OM7xcAdSh7fdQwVaIE1l7zXKt169JlLS1lH1+bYHlQrkPQ nscxKeJORRJrjLj+MpJ8EkC/d6/OuF8YCyuDHO+gHibmLqq747AE7C3IIdlAcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776049123; a=rsa-sha256; cv=none; b=FPew/Avk0P30S4Dcs80V4iHB2GWv3yDsJx1dwJHjeugRzgSPJcCn8I7X0sfBxKWTbCK+F1 AVDwuLI79TGWugDOCx0ZnxYtAktqp0kUPXyJEPqhHlU/mn1CqYi/uGzHwsybePSsdGKPHG OznYw4/9c3I1NsyZpB1D5Id/LI7+OLPIXmNJh/OPxNaKSxYciMmgj0fymgmjBzCC7N7yDU KPvu2y1S5g3XHyG7hMuCAD31+fC8B5nV45/0TrIx5waKh3tZ+W+oIox4aJ+amKe/mMgpA4 vF7zPTZyf/Vxj1dCApGkxAe04FWWeOp//ZSYlbWPM9KOret5lQULg/H1Vh3jtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776049123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0RFY9YZukwAMTtRJYkRVmadkYcYkyfCoTmL3CEt9YEs=; b=r0QaJ5doanTgIuLIbgA3ZuiTi51xsJFj7KSAlZ3cz0jdUKrimB802xSzb/ZyeVqLNp1BCW xeHdU6bfJM5w5vg4YvQriBU9ZdO4SKiDc4A+Pe5XKcyzKBZLM1DoPoezvVrkDBYA6cUtwi yZeY47APwHsVsjZ0VUKBTW9aruNLCI8fMnUsg/h4oIIEfqfmjSI+F0w14nZ3lf3sM9OKSf teLwlG2rNYqaCc+Z0BkB5rb2sk7F8VGpyfO4G5LLnKGFdi/F5E1Cea13Yx/WHbSfy0GP3w 6jbh2L6BMqcojddaYdNzKxOOPqMrZsU92Bi/+awxWBcDejP9aFKQAvYb+TYElw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvBtp6qKnzlsB for ; Mon, 13 Apr 2026 02:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46509 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 02:58:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 50f7b62f0862 - stable/13 - vm_fault: Reset m_needs_zeroing properly 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 50f7b62f0862f764215cee98547d5b8c0979ec26 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 02:58:42 +0000 Message-Id: <69dc5be2.46509.31529829@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=50f7b62f0862f764215cee98547d5b8c0979ec26 commit 50f7b62f0862f764215cee98547d5b8c0979ec26 Author: Mark Johnston AuthorDate: 2026-04-08 04:21:09 +0000 Commit: Mark Johnston CommitDate: 2026-04-13 02:58:16 +0000 vm_fault: Reset m_needs_zeroing properly - When allocating a page, we should only consider the PG_ZERO flag when handling the top-level page. - Unconditionally reset the flag when restarting the fault handler. Previously, vm_fault_busy_sleep() would fail to reset it. PR: 294039 Reviewed by: kib Tested by: Peter Much MFC after: 3 days Fixes: cff67bc43df1 ("vm_fault: only rely on PG_ZERO when the page was newly allocated") Differential Revision: https://reviews.freebsd.org/D56234 (cherry picked from commit 04132e01004316ddd0e0cde6ef15b100b7b1844d) --- sys/vm/vm_fault.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 605f677aecd5..614cba69002e 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -242,8 +242,6 @@ unlock_vp(struct faultstate *fs) static void fault_deallocate(struct faultstate *fs) { - - fs->m_needs_zeroing = true; fault_page_release(&fs->m_cow); fault_page_release(&fs->m); vm_object_pip_wakeup(fs->object); @@ -1202,7 +1200,8 @@ vm_fault_allocate(struct faultstate *fs) vm_waitpfault(dset, vm_pfault_oom_wait * hz); return (FAULT_RESTART); } - fs->m_needs_zeroing = (fs->m->flags & PG_ZERO) == 0; + if (fs->object == fs->first_object) + fs->m_needs_zeroing = (fs->m->flags & PG_ZERO) == 0; fs->oom_started = false; return (FAULT_CONTINUE); @@ -1462,7 +1461,6 @@ vm_fault(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, fs.fault_flags = fault_flags; fs.map = map; fs.lookup_still_valid = false; - fs.m_needs_zeroing = true; fs.oom_started = false; fs.nera = -1; faultcount = 0; @@ -1470,6 +1468,7 @@ vm_fault(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, RetryFault: fs.fault_type = fault_type; + fs.m_needs_zeroing = true; /* * Find the backing store object and offset into it to begin the From nobody Mon Apr 13 04:01:50 2026 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 4fvDHf1ZZHz6YCS4 for ; Mon, 13 Apr 2026 04:01:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvDHf10XJz3vly for ; Mon, 13 Apr 2026 04:01:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xDDJn9sxDkQK74xToW+t+7OyJn3ti1IE4+Es2e6d0T8=; b=hJHi/uLTxKMDA+bOROFL5f2OpQpU5m/MkzDKsbj25v3SA3MIrY2eptfRpKiLsWShnAsOqB gxFvrRIAtE8azDJcEZ+w272wR/1v+bDs+Yha/D62QkPFxOb/o/U61NjWevciVns4kRWJe4 wFa3uoZ9LAKpP6gSCyKIpEKmf8US3VzKAK67UgqWjQaRF+3iq27MlOvkgvVpFsGXmXXTC0 G7+hKCFptU9NhKvvBEpxOLqaH7FQ6CctHs9cAhX5lmsfgAqFCpuxKl4mkjFFvaje6S3Hkm wnv8iXT8+PqpNNB0cTOzYumO0sYW6Tq0a5GB28+orEx+7NMvbmkTn4STeQmstQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776052910; a=rsa-sha256; cv=none; b=V4z5Vaxo3urfNKhoOkPoCndnNjqFXlZz32VkfFrS/5E3/v7hdU473HeUEuw98rkAfDZjF6 /fk2BAqauwEY311Rg6Y0UfaOuQO1VwWUTqoHe+radPa/O7LUuOGHwhBxFx3GPZJLLCNt+L HvdqXzNbcZoT5qbmMmjhH5A2yKh+HFg6feZ6rDKH5uRgkP8WPc+kfIHpZoXjBm2tEUlzmn BmXI7d0AotyGglM7CMI0yhPCmZAo9Dc37FFbTD9HpquR8xQUOr/IYemYs2QF0fjitbUYrV hrf+Xc/02yV42z7BDn/EHcfXt+kIWYUqsKxX8TIt9C6MrkSQdh8EJSuqNm+E8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xDDJn9sxDkQK74xToW+t+7OyJn3ti1IE4+Es2e6d0T8=; b=fw00uKTmBEazujyh9ADy1882rsjm5Q2eLCoMbemG8K2QEIaOrN4ltXmFE1C9spNaQuYw54 uTwe2qwdfVtP00w194bZo2BGgfxlLZHKKqde+yacM8wO2Bkex32Pk1blakIi5XGrVK01YE G1Pj4ZZVanDd92vuKeua6myFagLFzpindiVmqjcuwvEe37hXNtZEvaZf02auwBTS32W3dN 3oAcxjChJTt+IToc2Rq2L2urGqj0YoJS5h/H82rbThAhTD8U/sk6ziRckOWvWXGgjAw2pL aoeRs7SH9T3/BF1fpMQhpa7RSN6UKcbGqfYg0aUjMFEleB5sehfWLOl3195v3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvDHf0Hztznwk for ; Mon, 13 Apr 2026 04:01:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cfef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 04:01:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: e6d30726b97a - stable/15 - kqueue: simplify knote_fdclose() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: e6d30726b97a449b584cf65447a983d452f9511a Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 04:01:50 +0000 Message-Id: <69dc6aae.1cfef.5fe91daf@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e6d30726b97a449b584cf65447a983d452f9511a commit e6d30726b97a449b584cf65447a983d452f9511a Author: Kyle Evans AuthorDate: 2026-04-01 22:30:48 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 03:12:19 +0000 kqueue: simplify knote_fdclose() The influx logic in knote_fdclose() is a little misguided, the resulting wakeup() call should always be redundant: knote_drop_detached() will always issue a wakeup before it returns, so anything waiting on *that* knote that had entered fluxwait should have been woken up then. This is the obvious divergence from the other influx/wakeup pattern in the implementation, which will kn_influx-- and then issue the wakeup after it has processed all of the knotes it can make progress on. While we're here, the kq_knlist cannot shrink, so we can avoid that condition in the loop and avoid potentially excessive wakeups from fluxwait on kqueues that we didn't touch. Reviewed by: kib, markj (cherry picked from commit ff1050d2a366bd288a6ebbf63f98003272513f92) --- sys/kern/kern_event.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 3872fb5862c5..245a18738d86 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2838,7 +2838,6 @@ knote_fdclose(struct thread *td, int fd) struct filedesc *fdp = td->td_proc->p_fd; struct kqueue *kq; struct knote *kn; - int influx; FILEDESC_XLOCK_ASSERT(fdp); @@ -2848,22 +2847,25 @@ knote_fdclose(struct thread *td, int fd) */ TAILQ_FOREACH(kq, &fdp->fd_kqlist, kq_list) { KQ_LOCK(kq); + if (kq->kq_knlistsize <= fd || + SLIST_EMPTY(&kq->kq_knlist[fd])) { + KQ_UNLOCK(kq); + continue; + } -again: - influx = 0; - while (kq->kq_knlistsize > fd && - (kn = SLIST_FIRST(&kq->kq_knlist[fd])) != NULL) { + while ((kn = SLIST_FIRST(&kq->kq_knlist[fd])) != NULL) { if (kn_in_flux(kn)) { - /* someone else might be waiting on our knote */ - if (influx) - wakeup(kq); + /* + * Wait for this knote to stabilize, it could be + * the case that it's in the process of being + * dropped anyways. + */ kq->kq_state |= KQ_FLUXWAIT; msleep(kq, &kq->kq_lock, PSOCK, "kqflxwt", 0); - goto again; + continue; } kn_enter_flux(kn); KQ_UNLOCK(kq); - influx = 1; knote_drop(kn, td); KQ_LOCK(kq); } From nobody Mon Apr 13 04:01:51 2026 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 4fvDHg272Hz6YCS6 for ; Mon, 13 Apr 2026 04:01: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvDHg1V5Qz3w2d for ; Mon, 13 Apr 2026 04:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6890horTUeO+dlW7ppsFWA6tygoq/508SIDnmAbdPe8=; b=iZoZ4BeT/NyB5tH7LTLAybRJxwBuMD0QO525tKOr9DN6XiFwdky+QK04hcc4pSVFwQ3qVA 14T6uIaZQ2AMn0JqOLg3IOLSGZLLnrgN71neRCMegc1VZAOHMTMhr5Tx06L03Os+ho2O3e jxj405XpBNdNkOwN1noXhfZJ9TRcZIDlRSGg06yFxebJQ2fsIjj1wSpm1N1+0QQS6dB6FA 4jShg9+uvZqV5DazY0Vcy/AYORMGFtop+IBR2olvnihnVyCQr/QIiv4iznWm7FH2P4bI7G Ahg4PA79GZdqcMSF1+PrYwt+VJWCuN80HPDkMGSM3w26zoG81LFmgiNx0L/phA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776052911; a=rsa-sha256; cv=none; b=OAQ/LewnGmihNjdFUyyEjkWBWhIshF9TSD/Ro9WfpSlGFgRcsvzHH3pfRZkPKi9syFzKE+ ptqwb8V0famVo7KBBgvNCE/ZBxUPI7trMcUEkdpWvbIaFcguSgDKvhkrVe2Mo25pLDeOoL /0UZrzfKQruuSyqz6fyojM1yLBRGKdu8+TDGsynpKZRIvSfBxLyI4h12LCj71sdhSzCjed xvSEV4jgmnDxxNdLo05yKlna5aRwfitTGpmsvu8YLtECGxr3g/noWfZwHCp/QUtSPWWaEq 54OpC1vcOKaBx6w3oq4+G3cxKreHN7xUTQXPbnLtgEXzrgxz4ZIHW86+ApXfmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6890horTUeO+dlW7ppsFWA6tygoq/508SIDnmAbdPe8=; b=YWDPfUS7Wb0YhaYW8ZB1h4MRxGVmGQsf4cpCKoAXLjabCADLn6s4ZSO/sJwG3X5xo5QNja r2YhAVSXdc5z8CgautKjKn07DeXwzANWgGy7J/nQGsDait8UXCQ+NltI8uVAZb13VCiKum KMeCorOntPUS0BBeJKtfxql8QwVDr9Wky8zQnjLdM10e+drxbBiVdhvoq20xNeSya8zbsS OK+CjIKx7BH7ChA/gnJcTVgs9zmV7bp3ePz8YhQzALPigBqW93GDWoe8o0WbUwf8JtwHbv OpORst1Tv14umfcGmEKmjcKMFa+4xw4uniQgbD0bgkVh1eE4HkKchRjpnqjgaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvDHg13SSznCL for ; Mon, 13 Apr 2026 04:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bfec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 04:01:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: f30a8cff5171 - stable/15 - kqueue: avoid a possible fork-deadlock 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: f30a8cff5171864e7f46d49ca41574606a3d5f1e Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 04:01:51 +0000 Message-Id: <69dc6aaf.1bfec.5f779388@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f30a8cff5171864e7f46d49ca41574606a3d5f1e commit f30a8cff5171864e7f46d49ca41574606a3d5f1e Author: Kyle Evans AuthorDate: 2026-04-01 22:30:48 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 03:12:24 +0000 kqueue: avoid a possible fork-deadlock kqueue_fork_copy() is likely to have transitioned at least one knote through a flux state, so we should check whether we need to wake anything up on the way out to avoid a possible deadlock. This was a part of D56210, but we'll close the review with the next commit. Reviewed by: kib, markj (cherry picked from commit 14d0baf2e89202cec3f9cb03a573372ccbc568b2) --- sys/kern/kern_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 245a18738d86..2d7df3da58bb 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -3155,7 +3155,7 @@ kqueue_fork_copy(struct filedesc *fdp, struct file *fp, struct file *fp1, } kqueue_release(kq, 1); kq1->kq_forksrc = NULL; - KQ_UNLOCK(kq); + KQ_UNLOCK_FLUX(kq); knote_free(marker); return (error); From nobody Mon Apr 13 04:01:52 2026 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 4fvDHj3y5jz6YCKN for ; Mon, 13 Apr 2026 04:01: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvDHh50qzz3w9m for ; Mon, 13 Apr 2026 04:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UXTlvMPEIbAO/PxrBb9w/XMNk43AR9ut0anRkwrd85w=; b=vin7H3v0lgxdLOEcwm9SjxRmycVgLvtpxv55yhJuThoos7zZbffTpUMNb6f7rs9cBoJJ/J VBnsMgiBMfVcP5KA4xGPYWNqTI/Rfownn5BweAnPoBKepeoCsYLnr0hp//ub4cUL1q7RgM u3EBkWqqM0QNOEAkvlD9X4284WFQs9cO2UNQcJN8wS0/nTfiR6YdfBZ3j1xkkAiU5/WERI KIYKGF3Yj8ZoaE1z7t8vN7sbGgj1zAzAOlBA+VT/ffHPZRgdWN6zgeJNMFkuo1pxgsWKTH Q/Nhewi/cbJDzWT0/+996Gnm7/LKV/5Juw52kZ46e2JLf/mO50OLgXhba3M/Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776052912; a=rsa-sha256; cv=none; b=m0bsgyiWHqo0mON0Yxkl8gvQxsTAmIwmv2tuKI1pffoYxQHAUARGJY2cIVsV4UIOjP2H1y dv5TLXH8i/SyoisZ/LI0QH5K4OaMQL6mCbvu0qZx0fzWZLrxiwEMiAf0uwCt84h9GfjG24 pznkFUcp477/k9TqcUX/FWSpGRCR2SGWiHr8ViAnG+NnhVfGj+Hh+s9F4xyzSitP7Z7uki OFG9GvE6ZrjyJAXAHNxSlx981NxWWJWvTCQDYw+16SEOTpHpU9ukqe0ydOBO04Rh3kO915 QVmU4fqQqDphwTPRoP2AlxMD/SR3pTsgI8QkBB7NT4Y50q5zNlR9j3GMV79vgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UXTlvMPEIbAO/PxrBb9w/XMNk43AR9ut0anRkwrd85w=; b=s1SUKYXFWJfF901awxYzEdOJr4qtxar8m/LtkJ9q2RotBqmCvItsOjk2KgAY2jofqlGgNJ FJkJuxdKVrSkpjaU79UfhmdmI6SDmb/k/Ai3OMVVMi6W+efFXeRnmTWlLRuEUEH+NYivaW haxDupzdb8w4dlC1zGQu//ntITx4qZ9BCLtw5VlMQivTknl768uZG6jN2oSX7Hbw6RJIWn EXCT1koFNPQPEmeIimV3ZjmbuqxWOAjHBWFBfpY7Glz6m/cdbqwkZ8e3WlocFZuQzRBS63 Q6zFUUrTn8dKkZIQoXJp7LcJw76WhInuSn9tw3K+1nSKBl1sXD5IOD+e9Pnnfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvDHh1tNhznXD for ; Mon, 13 Apr 2026 04:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e208 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 04:01:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: d02c54533aa4 - stable/15 - kqueue: add some kn_knlist assertions around knlist_(add|remove) 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: d02c54533aa49980ad3e8b984d9af4ec835d9adc Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 04:01:52 +0000 Message-Id: <69dc6ab0.1e208.9d30c33@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d02c54533aa49980ad3e8b984d9af4ec835d9adc commit d02c54533aa49980ad3e8b984d9af4ec835d9adc Author: Kyle Evans AuthorDate: 2026-04-01 22:30:48 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 03:12:29 +0000 kqueue: add some kn_knlist assertions around knlist_(add|remove) We currently assert that kn_status is accurate, but there's more room for error. Neither of these are very likely, but currently we'd blow up in SLIST*() macros instead of providing more obvious diagnostics. It's perhaps only worth testing these because knlist_remove() requires getting logic across both f_attach() and f_detach() correct. Reviewed by: kib, markj (cherry picked from commit 306c9049c642da6a59a5dc088589605a9aa38b87) --- sys/kern/kern_event.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 2d7df3da58bb..915d34ac1695 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2619,6 +2619,8 @@ knlist_add(struct knlist *knl, struct knote *kn, int islocked) KASSERT(kn_in_flux(kn), ("knote %p not in flux", kn)); KASSERT((kn->kn_status & KN_DETACHED) != 0, ("knote %p was not detached", kn)); + KASSERT(kn->kn_knlist == NULL, + ("knote %p was already on knlist %p", kn, kn->kn_knlist)); if (!islocked) knl->kl_lock(knl->kl_lockarg); SLIST_INSERT_HEAD(&knl->kl_list, kn, kn_selnext); @@ -2641,6 +2643,8 @@ knlist_remove_kq(struct knlist *knl, struct knote *kn, int knlislocked, KASSERT(kqislocked || kn_in_flux(kn), ("knote %p not in flux", kn)); KASSERT((kn->kn_status & KN_DETACHED) == 0, ("knote %p was already detached", kn)); + KASSERT(kn->kn_knlist == knl, + ("knote %p was not on knlist %p", kn, knl)); if (!knlislocked) knl->kl_lock(knl->kl_lockarg); SLIST_REMOVE(&knl->kl_list, kn, knote, kn_selnext); From nobody Mon Apr 13 04:01:53 2026 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 4fvDHj4ryHz6YCXP for ; Mon, 13 Apr 2026 04:01: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvDHj3Vmvz3wLR for ; Mon, 13 Apr 2026 04:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uqrstS+fESvbCeBP5u5f7HpFszKPvYYemnV/r43WxYY=; b=fVFkU4F8/EuAN7NqdbwCcSC0Q99b2P2zExDFUWlrI2QRjlCkzifFBO7BjN/GZOafBkHTL6 09Zqjhga6ujvxnc1OUoum49tcsWQm6r0z8jVcUI7nkSBhN77xawYf0MbaAFbLZm1AqIyGI heXNUZnJzAnsPQ0joMLUSvhwopZPNtmko8MC0Zkus/A6tIiyB7mEU1Te8nXayDclis8TBH T4Un+lGjT12Zi8kHnMcKrpSCpP9WDERAWsQPyo8zJM9UAPFn8TbSiZymcgro1QyyF0w1vF 79nXbgRyvcasn47OWP0ycf0WviIEt8PIanCR85P4xcXWS41geKlyDPRzLtwWvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776052913; a=rsa-sha256; cv=none; b=x8trt7LXIGkOiDzpHzbdYd4kK0BgCwZ2pNFBck6JSzE9dMX6ytYC5m1OdEF8FAX63FmDgW rChEe3Asc3Kfz1Ii8RbTtv5tVLn9ug5BeeROf1hBmYws46h2o5PcFDaxLoplVnoiOanYXk 6YumqMMUKduDdX/zQ6RPzJ1HeVPtOmlo/w7w5B3pmYfmk5h1HvgnS78m1rtfD0pZbYDLo3 CESwK6mNVBxPghdjum6+CZAufwKlMPC/pJGbR5Ux1KP0MGrI7I5ZXNZRC2j8lCimAAgBMF /GnmN6Y1bH8fRZzk8VweuW5O7C5YHpW3ZUtfo409MK2p0XrsQdEgP1QXEPZl1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uqrstS+fESvbCeBP5u5f7HpFszKPvYYemnV/r43WxYY=; b=noHxWAafWiakrnqYZCGC8McyFO8UwxxjaPrg8GDUQ1bOSJPfbOSZXZ19n+n01srf7RDLm8 9ICYS6fbsuCxQUH0OthKIqKzUyx1lzsUBWm4y9y4Z8Rk3RAv/2mAb6YTxpOAU3qahy2mMD /1fSQ396YyjwgWGVel99eJATdwk8lhgv+44uKFD/6fr5nzS1LINKdF9+o1tt7R+AZ8YFgI xt8C2zuG89g+QALQiZhbTBY41i387Hc2N8EpZVKNjPIB2knjasYUP1tV0QUda4D5fkAWUf g9EcrLOyTGlrrbiYxtNHOTcEyPaFKODDNfj7hd7cv22GFaA/1ky8AlpBDAPpnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvDHj2Nfnzp1M for ; Mon, 13 Apr 2026 04:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e959 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 04:01:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 94429503486f - stable/15 - kqueue: compare against the size in kqueue_expand 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 94429503486f0738b5670b9a203f48fc2bd5fabf Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 04:01:53 +0000 Message-Id: <69dc6ab1.1e959.3738f878@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=94429503486f0738b5670b9a203f48fc2bd5fabf commit 94429503486f0738b5670b9a203f48fc2bd5fabf Author: Kyle Evans AuthorDate: 2026-04-01 22:30:48 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 03:12:33 +0000 kqueue: compare against the size in kqueue_expand This is a cosmetic change, rather than a functional one: comparing the knlistsize against the fd requires a little bit of mental gymnastics to confirm that this is fine and not doing unnecessary work in some cases. Notably, one must consider that kq_knlistsize only grows in KQEXTENT chunks, which means that concurrent threads trying to grow the kqueue to consecutive fds will usually not result in the list being replaced twice. One can also more clearly rule out classes of arithmetic problems in the final `else` branch. Reviewed by: kib, markj (cherry picked from commit 0b4f0e0515d0c7ec855cd654ae5dc562f4931cae) --- sys/kern/kern_event.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 915d34ac1695..f3723783146a 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2017,10 +2017,11 @@ kqueue_expand(struct kqueue *kq, const struct filterops *fops, uintptr_t ident, to_free = NULL; if (fops->f_isfd) { fd = ident; - if (kq->kq_knlistsize <= fd) { - size = kq->kq_knlistsize; - while (size <= fd) + size = atomic_load_int(&kq->kq_knlistsize); + if (size <= fd) { + do { size += KQEXTENT; + } while (size <= fd); list = malloc(size * sizeof(*list), M_KQUEUE, mflag); if (list == NULL) return ENOMEM; @@ -2028,7 +2029,7 @@ kqueue_expand(struct kqueue *kq, const struct filterops *fops, uintptr_t ident, if ((kq->kq_state & KQ_CLOSING) != 0) { to_free = list; error = EBADF; - } else if (kq->kq_knlistsize > fd) { + } else if (kq->kq_knlistsize >= size) { to_free = list; } else { if (kq->kq_knlist != NULL) { @@ -2043,6 +2044,7 @@ kqueue_expand(struct kqueue *kq, const struct filterops *fops, uintptr_t ident, kq->kq_knlistsize = size; kq->kq_knlist = list; } + MPASS(error != 0 || kq->kq_knlistsize > fd); KQ_UNLOCK(kq); } } else { From nobody Mon Apr 13 04:01:54 2026 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 4fvDHl0hF0z6YCc0 for ; Mon, 13 Apr 2026 04:01: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvDHk4bRLz3wLc for ; Mon, 13 Apr 2026 04:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e70k1Rn5Itoq12h/EUzJ/jZCYHxTUZihkR6QrE8SSOc=; b=V2bEJHBwm/m0D9Q0GWQDvWfXWHCcdHJ3gdNjXTX5sr3ojelkysfY0sXWUYdiu/ba5lorzh +tx3yJ8RiaaSzNkCEEKSO38pjQ6QGjaBgyeXeJzSlFdbB44YxjhZafvqnfv4qRy/qPocBN ZBg5l+/dk/32EhHQq4NbueIWqH2Jt432Md9tF8H9sprylevQoefOYy/1USPBcxNNjwlDxg p/OTzfAka7UKv+ypoqyL8Rqn+5QYZRBzbr/Qg1qln872gEdEiQGIFOwDXiao3OKYZLDn1H MpdAc3ZEjabpNHChVD6q6YX3rjM6UdUbgCmU2sFULNQTQ1AO7qpCzV0HmT4g1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776052914; a=rsa-sha256; cv=none; b=NJs5+z92RquuOJQyMgcHDykfcAuehb1x8NUd721G/59cqqKqdWhwadJ2iU658nb6uFT7oN AiF8snpGa+4m7Ena4ufxtQqf6WZxa39UbAsstTsY5g1DhXSy4GWH2x2kuEtL3UT7J3iawF add6slDGXNdqdXIGSwXEBYvrgc12NsUlLaeImwpizMTuG0EsDHsoRtBoMSARtdZ8nmrZCN ZEg0BjDbbY/3bVXdldhTlkK26RY4MMGzyQhC8us/Ne+R7UlxgZ4p3Ij1lZwzAmvYJMWqYt TSNGXG5NF71S7WpUnLus4XQ5Gc5UzNXfBYXF1WW7ZkwrsRGwY1NYGJWDgwFODw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e70k1Rn5Itoq12h/EUzJ/jZCYHxTUZihkR6QrE8SSOc=; b=uwaLpn9jVC4J7gxGDghXAcCE3QujkLMLoxGf2o5l+cGZweGkYsfWTMAnqtdaC0ENWbCL+Z qej1MbE0I12l0odNLGhvnXwVTblM3sxQXrBJk1uhDMlFHtJjsB0+3Fy32Awt7SqwenQ6x6 jRxX9JzBpN13/V+wqbE0KeZrYdwbL6FC12VHt8e+D382LkvIxRyBNCDei6yxEqYGLChrvo LAnNhOkw7qs+/n+zX8oCdvDnszc4B5jC3GR/iRryKDEEDprcw5ZSA0adhnZEbi5HsdhycT pOPJ4P+joodWLvwp1XxboQZrRG0YBZ8zR2Lvv2RXsva2SW1jmDqS/2N79mIDRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvDHk3CbVznwm for ; Mon, 13 Apr 2026 04:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d2d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 04:01:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 842bee699fe2 - stable/15 - lualoader: allow the local module to filter out the BE list 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 842bee699fe21c46285ba0fe885519a6e3adbd44 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 04:01:54 +0000 Message-Id: <69dc6ab2.1d2d9.2b344831@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=842bee699fe21c46285ba0fe885519a6e3adbd44 commit 842bee699fe21c46285ba0fe885519a6e3adbd44 Author: Kyle Evans AuthorDate: 2026-04-08 12:49:18 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 03:12:35 +0000 lualoader: allow the local module to filter out the BE list This allows something like the following local.lua to install a filter to implement its own notion of hidden BEs using a naming convention of a leading dot to hide them: -- file: /boot/lua/local.lua local core = require("core") local function be_hide(be) if core.isSingleUserBoot() then -- All BEs are accepted for single-user return true end local name = be:match("/([^/]+)$") if not name then -- Accept malformed BEs, for whatever reason return true end return name:match("^%.") == nil end if core.bootenvFilter then -- Just in case we need to be compatible with older versions of -- core.lua without the filtering functionality. core.bootenvFilter(be_hide) end -- EOF Requested by: Marek Zarychta Reviewed by: imp (cherry picked from commit bf0881060ecd75ce79683b82ebcd4809eadf7cf5) --- stand/lua/core.lua | 20 ++++++++++++++++++-- stand/lua/core.lua.8 | 13 ++++++++++++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/stand/lua/core.lua b/stand/lua/core.lua index d06f41511a47..c276f61e5904 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -305,6 +305,15 @@ function core.bootenvDefault() return loader.getenv("zfs_be_active") end +function core.bootenvFilter(func) + local oldf = core.bootenv_filter + + -- Filter contract: returns true if the BE should be kept, false if it + -- should be hidden. + core.bootenv_filter = func + return oldf +end + function core.bootenvList() local bootenv_count = tonumber(loader.getenv(bootenv_list .. "_count")) local bootenvs = {} @@ -332,11 +341,18 @@ function core.bootenvList() for curenv_idx = 0, bootenv_count - 1 do curenv = loader.getenv(bootenv_list .. "[" .. curenv_idx .. "]") if curenv ~= nil and unique[curenv] == nil then - envcount = envcount + 1 - bootenvs[envcount] = curenv unique[curenv] = true + + -- If we have a filter installed (by a local module), we + -- give it a chance to veto the BE. + if not core.bootenv_filter or + core.bootenv_filter(curenv) then + envcount = envcount + 1 + bootenvs[envcount] = curenv + end end end + return bootenvs end diff --git a/stand/lua/core.lua.8 b/stand/lua/core.lua.8 index de43d3e2b220..325320b2fce8 100644 --- a/stand/lua/core.lua.8 +++ b/stand/lua/core.lua.8 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 29, 2025 +.Dd April 8, 2026 .Dt CORE.LUA 8 .Os .Sh NAME @@ -164,6 +164,17 @@ is set in kernels will be autodetected from the current system. .It Fn core.bootenvDefault Returns the default boot environment, nil if unset. +.It Fn core.bootenvFilter func +Installs a filter +.Fa func +into +.Fn core.bootenvList . +If the +.Fa func +returns true, then the boot environment is retained in the list. +Otherwise, the boot environment is hidden. +The old filter, if any, is returned to allow the caller to compose a filter on +top of another filter. .It Fn core.bootenvList Returns a table of boot environments, or an empty table. These will be picked up using the From nobody Mon Apr 13 04:01:55 2026 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 4fvDHl6SgJz6YCc3 for ; Mon, 13 Apr 2026 04:01: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvDHl4gpjz3wBC for ; Mon, 13 Apr 2026 04:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6RNqDItuLSop19LxWMWCYSHNjf7c2Or6nh1/CveEe0=; b=yZz7EgWJ/SNQ27PaSxCCk6qnBgOkuozNfP8/zolG9op+DFAHfBAzfIT96O2/BycSaU4zDE 7LakA6PozXHWiJaxlt9nav2hWviz5Iqr5VHYM2rhrv1c19JONLf8xUHBUXaShvkGz6v5uy ERaAqdL5cxEkHd+LzjpDSoBmPo6rz6TNH+tluFLl8Qb3CibOXSzJN64jhCKpLnmhWtbMgb f2taUbFYSo1ja09cxkLkvT6noHgLKPKS3AIz+goKCzxqTNw194zvjibljGJ9sv5c1l/XN1 QPAFnZlLdOqu0T6opb3iF0iMz77/h92NilvBoeAoDxswbsLDKxCY2HsGuMHqHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776052915; a=rsa-sha256; cv=none; b=J4xVjO5fQ5vmr+TE1ftcov//K40NKpDtLLDihuNFAcpCW/U1SD2+gzdA8Sp3i1zW71nZs1 VhhuKqL9uuzW0Twtm/bJGnp65du8AILOqScXTG2ZA59RqGHkYmw8eL5koGjwGFDvjxQrDs 6cEIwa+MtNsBO2GIEvgLcwdQHA8hLo08p4zS4cJ8DOdR0QcDQvybayVv7idhDALUpQ05Hl VXhm+8IWM5fCJ/gsIszyfXlF70a54XCi/hv8b0nYQO9t+wnYQa6X2TtA8bjGXq7YlMTdlD AMp0jplYu5JhA6qS1KTVzO1p6AlW3huFINd0C1rfCqFVzDPiHeDiyKhFWrU2Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6RNqDItuLSop19LxWMWCYSHNjf7c2Or6nh1/CveEe0=; b=F9lde5U4wUJZEx7QlN35FPc+r+EydWSnTWwz7S1I7ImW/RXCAcbPaqaXFdFay+FWaFeOWD RnZdoq1SJVj7rLFOYkbSDHZGaXdZI8HkwuioNfAJqOwRZ1McWXQ+N0VFaz4tP4+Yxd8Q2W ahfMIwf3163itR9cyGE8p08VsqV7JjL2/ypZOpU9a7ugpSkj5gjlocjuxBt1Iq2Cksl0By AOrmQJng7H63ZFgVax87/MX/aT3wAl5lafNiAyDIppA3IVN7D2koqEOevLEzwej7JiGyIB Egk+O5DSpBzsSsMuAbkiDPl3pNMTscF1Bj4UK0dzXhmpsrA85l/enVK3PUCcJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvDHl43FTznXH for ; Mon, 13 Apr 2026 04:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e20c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 04:01:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 65e1c27b4bab - stable/15 - kqueue: slightly clarify the flow in knlist_cleardel() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 65e1c27b4bab018926837b6106cb16daafd3a7ac Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 04:01:55 +0000 Message-Id: <69dc6ab3.1e20c.1e93a804@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=65e1c27b4bab018926837b6106cb16daafd3a7ac commit 65e1c27b4bab018926837b6106cb16daafd3a7ac Author: Kyle Evans AuthorDate: 2026-04-09 02:37:00 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 03:12:40 +0000 kqueue: slightly clarify the flow in knlist_cleardel() This is purely a cosmetic change to make it a little easier on the eyes, rather than jumping back to the else branch up top. Re-flow it to use another loop on the outside and just inline the re-lock before we repeat after awaking from fluxwait. The !killkn path should maybe issue a wakeup if there's a thread in KQ_SLEEP so that userland can observe the EOF, but this isn't a practical problem today: pretty much every case of knlist_clear is tied to a file descriptor and called in the close(2) path. As a consequence, potentially affected knotes are almost always destroyed before we even get to knlist_clear(). Reviewed by: kib, markj (cherry picked from commit c6dd40f2d35d596ca60a5d87616c3e4a0fd4f676) --- sys/kern/kern_event.c | 50 +++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index f3723783146a..6e16c40a531c 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2788,31 +2788,39 @@ knlist_cleardel(struct knlist *knl, struct thread *td, int islocked, int killkn) KNL_ASSERT_LOCKED(knl); else { KNL_ASSERT_UNLOCKED(knl); -again: /* need to reacquire lock since we have dropped it */ knl->kl_lock(knl->kl_lockarg); } - SLIST_FOREACH_SAFE(kn, &knl->kl_list, kn_selnext, kn2) { - kq = kn->kn_kq; - KQ_LOCK(kq); - if (kn_in_flux(kn)) { - KQ_UNLOCK(kq); - continue; - } - knlist_remove_kq(knl, kn, 1, 1); - if (killkn) { - kn_enter_flux(kn); - KQ_UNLOCK(kq); - knote_drop_detached(kn, td); - } else { - /* Make sure cleared knotes disappear soon */ - kn->kn_flags |= EV_EOF | EV_ONESHOT; - KQ_UNLOCK(kq); + for (;;) { + /* + * Each pass removes as many knotes as we can before dropping + * into FLUXWAIT. Active knotes are simply detached and either + * freed or converted to one-shot, as the attached subject is + * essentially disappearing. + */ + SLIST_FOREACH_SAFE(kn, &knl->kl_list, kn_selnext, kn2) { + kq = kn->kn_kq; + KQ_LOCK(kq); + if (kn_in_flux(kn)) { + KQ_UNLOCK(kq); + continue; + } + knlist_remove_kq(knl, kn, 1, 1); + if (killkn) { + kn_enter_flux(kn); + KQ_UNLOCK(kq); + knote_drop_detached(kn, td); + } else { + /* Make sure cleared knotes disappear soon */ + kn->kn_flags |= EV_EOF | EV_ONESHOT; + KQ_UNLOCK(kq); + } + kq = NULL; } - kq = NULL; - } - if (!SLIST_EMPTY(&knl->kl_list)) { + if (SLIST_EMPTY(&knl->kl_list)) + break; + /* there are still in flux knotes remaining */ kn = SLIST_FIRST(&knl->kl_list); kq = kn->kn_kq; @@ -2822,7 +2830,7 @@ again: /* need to reacquire lock since we have dropped it */ kq->kq_state |= KQ_FLUXWAIT; msleep(kq, &kq->kq_lock, PSOCK | PDROP, "kqkclr", 0); kq = NULL; - goto again; + knl->kl_lock(knl->kl_lockarg); } if (islocked) From nobody Mon Apr 13 04:01:56 2026 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 4fvDHn1RTsz6YCc7 for ; Mon, 13 Apr 2026 04:01: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvDHm5Wgdz3w85 for ; Mon, 13 Apr 2026 04:01:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pBI53ygvmPz3aX9YcgEc7ghzRhSL+QcAJoe5KJNEYQk=; b=HO1shigtI3ljSKtivjsl1lQO2X1P0z+uFWQbocFAsbY4NaH896YrzgoNaFPdHFoDoFfqBv uoLcZkfraBAbEBORKeVcIfDAHaQ8QVWIUvsWK97b6f7OJwEfU3OeCLRRP2GgUNrGAorFVX WZdLFX8+8OLOzuZIKsY6HV6QlIxZLJ5FbWES78BLONEDGrmnn7MMZNFSImyMBqv5Pj6dcv Wmk/QYsgmaCXMKDlvK3Luaq9KH4OAe0HrRqnwi8oNQxVyTSD4AC52ExtQ2tMrm5lwMhHKv DOk51Hubj1r9/6XCdslPRlwOKwS89fMMq6GfdQuK3RiN9K9yevNt3VG9B1XbUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776052916; a=rsa-sha256; cv=none; b=I4jLvi6TuYUAMpRUzwvy4ACFQCcV1nzi1LDzLSGgOLmxfXR2CahznEbF9zmMmVeYojWqM+ GU1pEsTJxEWGDn4aCDJYviuk5juDzJ0EX/iBROnaP7IvMz3p7gegaDeyxbnjm5/5mjUhGx HByb3QIrCoMnpzuDVpioEVFvdWGCVWZfvVA9TUPOK0xb06GXj519J4i+3nnZuiXmVcVbHx YTAeHuhaILzNLSZZIt+5vA3y/axp3U85fw+TNLCTQ1SodgZCm2I+U/VCVa8ag/KMwdDpPf TP9jRlg+B++AXSFESot5iGlAWK6jVc+l9bJxOQdnfZ4DXYJ8mCyCr7wgNznLxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pBI53ygvmPz3aX9YcgEc7ghzRhSL+QcAJoe5KJNEYQk=; b=FvDWkMDTRLfqHpDs2khc+meBdPB/7dooC3vD+2JlzVfSp4jQWD67YITeKLakKUxajhXbtl 13rrdYo8/wOFTaQFkIzCbye9EyK3SGyg/af530bIQ52U5rzwjjh0vunf3mcRGS0LvmyX5l mCNpQRw3/spBMenRZzY3o7JBfrcPbCI/8ZKGbDl8969T1skhRnpQgoIpP4fRUcc8LMAqsA E3PFKDKAsLK0/x6BiQvul+15vv7rO91konF2GcWAxoaieb0c2ZhTvdqFhH9WwAUgR7h9Mv 5LzMf2bcFkzuQfyod5I/viZTWzsXcs51VLuytPSHWTmat+EJrxNpRbMZTWfZbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvDHm4vPCznmZ for ; Mon, 13 Apr 2026 04:01:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e191 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 04:01:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: ac6173b54ffb - stable/15 - libc: fix memfd_create's HUGETLB handling 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: ac6173b54ffbad0bc65396b8ce7e5f30fba4e12e Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 04:01:56 +0000 Message-Id: <69dc6ab4.1e191.4cbee355@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ac6173b54ffbad0bc65396b8ce7e5f30fba4e12e commit ac6173b54ffbad0bc65396b8ce7e5f30fba4e12e Author: Kyle Evans AuthorDate: 2026-04-09 02:37:00 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 03:12:44 +0000 libc: fix memfd_create's HUGETLB handling The 'simplification' commit referenced below actually broke one aspect of MFD_HUGETLB: the caller isn't supposed to be required to specify a size. MFD_HUGETLB by itself without a shift mask just requests a large page, so we revert that part of memfd_create() back. While we're here, fix up the related parts of the manpages a little bit, since MFD_HUGETLB is actually supported. The manpage claims that we would return ENOSYS if forced mappings weren't supported, but this was actually not true. However, that seems like a very important distinction to make between ENOSYS and EOPNOTSUPP, so fix the implementation to match the docs. Reviewed by: kib, markj (cherry picked from commit 9a8d333368baef356f0a611b47ec592568dd14f9) --- lib/libc/gen/memfd_create.c | 23 +++++++++++++------ lib/libsys/shm_open.2 | 31 ++++++++++++++++++++++---- tests/sys/posixshm/memfd_test.c | 35 +++++++++++++++++++++++++++++ tests/sys/posixshm/posixshm.h | 45 ++++++++++++++++++++++++++++++++++++++ tests/sys/posixshm/posixshm_test.c | 38 +++++++++++--------------------- 5 files changed, 136 insertions(+), 36 deletions(-) diff --git a/lib/libc/gen/memfd_create.c b/lib/libc/gen/memfd_create.c index 78131f46d7b1..8e6c93be4337 100644 --- a/lib/libc/gen/memfd_create.c +++ b/lib/libc/gen/memfd_create.c @@ -95,16 +95,25 @@ memfd_create(const char *name, unsigned int flags) npgs = getpagesizes(pgs, nitems(pgs)); if (npgs == -1) goto clean; - pgsize = (size_t)1 << ((flags & MFD_HUGE_MASK) >> MFD_HUGE_SHIFT); - for (pgidx = 0; pgidx < npgs; pgidx++) { - if (pgsize == pgs[pgidx]) - break; - } - if (pgidx == npgs) { - errno = EOPNOTSUPP; + else if (npgs == 1) { + errno = ENOSYS; goto clean; } + if ((flags & MFD_HUGE_MASK) == 0) { + pgidx = 1; + } else { + pgsize = 1UL << ((flags & MFD_HUGE_MASK) >> MFD_HUGE_SHIFT); + for (pgidx = 1; pgidx < npgs; pgidx++) { + if (pgsize == pgs[pgidx]) + break; + } + if (pgidx == npgs) { + errno = EOPNOTSUPP; + goto clean; + } + } + memset(&slc, 0, sizeof(slc)); slc.psind = pgidx; slc.alloc_policy = SHM_LARGEPAGE_ALLOC_DEFAULT; diff --git a/lib/libsys/shm_open.2 b/lib/libsys/shm_open.2 index c3196d966e6b..58597a341b9e 100644 --- a/lib/libsys/shm_open.2 +++ b/lib/libsys/shm_open.2 @@ -26,7 +26,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 4, 2025 +.Dd March 26, 2025 .Dt SHM_OPEN 2 .Os .Sh NAME @@ -343,7 +343,25 @@ Allow adding seals to the resulting file descriptor using the .Xr fcntl 2 command. .It Dv MFD_HUGETLB -This flag is currently unsupported. +Create a memfd backed by a +.Dq largepage +object. +One of the +.Dv MFD_HUGE_* +flags defined in +.In sys/mman.h +may be included to specify a fixed size. +If a specific size is not requested, the smallest supported large page size is +selected. +.Pp +The behavior documented above for the +.Fn shm_create_largepage +.Fa psind +argument also applies to largepage objects created by +.Fn memfd_create , +and the +.Dv SHM_LARGEPAGE_ALLOC_DEFAULT +policy will always be used. .El .Sh RETURN VALUES If successful, @@ -458,17 +476,22 @@ argument was too long. .Pp An invalid or unsupported flag was included in .Fa flags . +.It Bq Er EINVAL +A hugetlb mapping was requested, but +.Dv MFD_HUGETLB +was not specified in +.Fa flags . .It Bq Er EMFILE The process has already reached its limit for open file descriptors. .It Bq Er ENFILE The system file table is full. .It Bq Er ENOSYS -In -.Fa memfd_create , .Dv MFD_HUGETLB was specified in .Fa flags , and this system does not support forced hugetlb mappings. +.It Bq Er EOPNOTSUPP +This system does not support the requested hugetlb page size. .El .Pp .Fn shm_open diff --git a/tests/sys/posixshm/memfd_test.c b/tests/sys/posixshm/memfd_test.c index 5cae184206b1..387eca4cafe9 100644 --- a/tests/sys/posixshm/memfd_test.c +++ b/tests/sys/posixshm/memfd_test.c @@ -34,6 +34,8 @@ #include #include +#include "posixshm.h" + ATF_TC_WITHOUT_HEAD(basic); ATF_TC_BODY(basic, tc) { @@ -277,6 +279,38 @@ ATF_TC_BODY(immutable_seals, tc) close(fd); } +ATF_TC_WITHOUT_HEAD(hugetlb); +ATF_TC_BODY(hugetlb, tc) +{ + size_t ps[MAXPAGESIZES], pgsize; + int fd, pscnt; + + pscnt = pagesizes(ps, false); +#define MFD_HUGE_SUPPORTED(sz) (sz <= (1 << 24)) +#define MFD_HUGE_FLAGS(sz) (((ffsl(sz) - 1U) << MFD_HUGE_SHIFT) & MFD_HUGE_MASK) + for (int psidx = 1; psidx < pscnt; psidx++) { + pgsize = ps[psidx]; + + if (!MFD_HUGE_SUPPORTED(pgsize)) + continue; + + ATF_REQUIRE_MSG((fd = memfd_create("...", + MFD_HUGETLB | MFD_HUGE_FLAGS(pgsize))) != -1, + "Creating a %zu-size hugetlb memfd", pgsize); + } + + fd = memfd_create("...", MFD_HUGETLB); + if (pscnt == 1) { + ATF_REQUIRE_MSG(fd == -1, + "Creating an unspecified hugetlb memfd without large page support"); + ATF_REQUIRE(errno == ENOSYS); + } else { + ATF_REQUIRE_MSG(fd != -1, + "Creating an unspecified hugetlb memfd with large page support"); + close(fd); + } +} + ATF_TP_ADD_TCS(tp) { @@ -289,5 +323,6 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, get_seals); ATF_TP_ADD_TC(tp, dup_seals); ATF_TP_ADD_TC(tp, immutable_seals); + ATF_TP_ADD_TC(tp, hugetlb); return (atf_no_error()); } diff --git a/tests/sys/posixshm/posixshm.h b/tests/sys/posixshm/posixshm.h new file mode 100644 index 000000000000..84c73e0d10df --- /dev/null +++ b/tests/sys/posixshm/posixshm.h @@ -0,0 +1,45 @@ +/*- + * + * Copyright (c) 2020 Klara, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include + +#include + +static int +pagesizes(size_t ps[MAXPAGESIZES], bool required) +{ + int pscnt; + + pscnt = getpagesizes(ps, MAXPAGESIZES); + ATF_REQUIRE_MSG(pscnt != -1, "getpagesizes failed; errno=%d", errno); + ATF_REQUIRE_MSG(ps[0] != 0, "psind 0 is %zu", ps[0]); + ATF_REQUIRE_MSG(pscnt <= MAXPAGESIZES, "invalid pscnt %d", pscnt); + if (pscnt == 1 && required) + atf_tc_skip("no large page support"); + return (pscnt); +} + diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index 55514a5f4bde..680a443b6eac 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -49,6 +49,8 @@ #include +#include "posixshm.h" + #define TEST_PATH_LEN 256 static char test_path[TEST_PATH_LEN]; static char test_path2[TEST_PATH_LEN]; @@ -1239,20 +1241,6 @@ shm_open_large(int psind, int policy, size_t sz) return (fd); } -static int -pagesizes(size_t ps[MAXPAGESIZES]) -{ - int pscnt; - - pscnt = getpagesizes(ps, MAXPAGESIZES); - ATF_REQUIRE_MSG(pscnt != -1, "getpagesizes failed; errno=%d", errno); - ATF_REQUIRE_MSG(ps[0] != 0, "psind 0 is %zu", ps[0]); - ATF_REQUIRE_MSG(pscnt <= MAXPAGESIZES, "invalid pscnt %d", pscnt); - if (pscnt == 1) - atf_tc_skip("no large page support"); - return (pscnt); -} - ATF_TC_WITHOUT_HEAD(largepage_basic); ATF_TC_BODY(largepage_basic, tc) { @@ -1261,7 +1249,7 @@ ATF_TC_BODY(largepage_basic, tc) size_t ps[MAXPAGESIZES]; int error, fd, pscnt; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); zeroes = calloc(1, ps[0]); ATF_REQUIRE(zeroes != NULL); for (int i = 1; i < pscnt; i++) { @@ -1317,7 +1305,7 @@ ATF_TC_BODY(largepage_config, tc) size_t ps[MAXPAGESIZES + 1]; /* silence warnings if MAXPAGESIZES == 1 */ int error, fd; - (void)pagesizes(ps); + (void)pagesizes(ps, true); fd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0); ATF_REQUIRE_MSG(fd >= 0, "shm_open failed; error=%d", errno); @@ -1379,7 +1367,7 @@ ATF_TC_BODY(largepage_mmap, tc) size_t ps[MAXPAGESIZES]; int fd, pscnt; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { fd = shm_open_large(i, SHM_LARGEPAGE_ALLOC_DEFAULT, ps[i]); @@ -1475,7 +1463,7 @@ ATF_TC_BODY(largepage_munmap, tc) size_t ps[MAXPAGESIZES], ps1; int fd, pscnt; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { fd = shm_open_large(i, SHM_LARGEPAGE_ALLOC_DEFAULT, ps[i]); ps1 = ps[i - 1]; @@ -1526,7 +1514,7 @@ ATF_TC_BODY(largepage_madvise, tc) size_t ps[MAXPAGESIZES]; int fd, pscnt; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { fd = shm_open_large(i, SHM_LARGEPAGE_ALLOC_DEFAULT, ps[i]); addr = mmap(NULL, ps[i], PROT_READ | PROT_WRITE, MAP_SHARED, fd, @@ -1595,7 +1583,7 @@ ATF_TC_BODY(largepage_mlock, tc) "sysctlbyname(vm.stats.vm.v_user_wire_count) failed; error=%d", errno); - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { if (ps[i] / ps[0] > max_wired - wired) { /* Cannot wire past the limit. */ @@ -1638,7 +1626,7 @@ ATF_TC_BODY(largepage_msync, tc) size_t ps[MAXPAGESIZES]; int fd, pscnt; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { fd = shm_open_large(i, SHM_LARGEPAGE_ALLOC_DEFAULT, ps[i]); addr = mmap(NULL, ps[i], PROT_READ | PROT_WRITE, MAP_SHARED, fd, @@ -1697,7 +1685,7 @@ ATF_TC_BODY(largepage_mprotect, tc) size_t ps[MAXPAGESIZES]; int fd, pscnt; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { /* * Reserve a contiguous region in the address space to avoid @@ -1767,7 +1755,7 @@ ATF_TC_BODY(largepage_minherit, tc) pid_t child; int fd, pscnt, status; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { fd = shm_open_large(i, SHM_LARGEPAGE_ALLOC_DEFAULT, ps[i]); addr = mmap(NULL, ps[i], PROT_READ | PROT_WRITE, MAP_SHARED, fd, @@ -1855,7 +1843,7 @@ ATF_TC_BODY(largepage_pipe, tc) int fd, pfd[2], pscnt, status; pid_t child; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { fd = shm_open_large(i, SHM_LARGEPAGE_ALLOC_DEFAULT, ps[i]); @@ -1908,7 +1896,7 @@ ATF_TC_BODY(largepage_reopen, tc) size_t ps[MAXPAGESIZES]; int fd, psind; - (void)pagesizes(ps); + (void)pagesizes(ps, true); psind = 1; gen_test_path(); From nobody Mon Apr 13 04:01:57 2026 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 4fvDHp3gC5z6YCcB for ; Mon, 13 Apr 2026 04:01: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvDHn65wkz3wYF for ; Mon, 13 Apr 2026 04:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LsucKv5MLwPIIQo0eIDuu3XVG87AwRZSFy9kj095IKY=; b=RWhWIUH80cuankCz33+yRXeJ6xIVOHevM10bT4B9YuwRC3NOqJy75O03HPx49Y/3jLBXSp Oys7dyqw3EI5NiaBwrDvdgPdjyV0yom6mI6QCwCh6K3KpP+pRmrxIOKNOmK88ED/RVBURn QjdW1eD3qxSR1LVU1SjiXPmr1klNY81T0XzCAINVbgkdLBmxz4jnbvw+h/kpUXzqrL6LX+ dqoWWznoCRObQzoes1sFRgmEoscydVIgLZ3eAe06d4O4q54qiU3AHzD9bU6VVI6Y7J9fcd eg+xMX9yj7VLRTay8QrsajMDxFD2yjODtafOBOWxtQOuvQmwMDWSsQKY0jWn2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776052917; a=rsa-sha256; cv=none; b=tbdbzpXzd9TTI9fZH7m0kYb9XR80pk1bd6bLhG8BqFuPo3MhI8itdfIScsT6bs/Fjtp79W VipdObEn6kXeDYSzHzFaHBoa9wwlvtTpO1wV+4RrhooHL1EGa8n7ryK8Ro7mEzB1tk7Gbr fG0aPGX5pmElv4I50tLSksYmLEskEcCiHSz+GbrDLHg9Qizn1fyOPDRTnPHKjnUwciJOZC Nq82vX4nIxzZrmnqnb5cQ59KwrsSH25L7QuWrAMy/0gSb2wNW0kr50aKbNKgRR9s9l3sHE s6sC8aIOQzre0VygB7MqnBjUatSNXHTbWusGNC/tgGk+0cfbEClcfuOjLD7G4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LsucKv5MLwPIIQo0eIDuu3XVG87AwRZSFy9kj095IKY=; b=P0hNsveKEjuQzf0pvQfs8r8MCCUkkxexpQweh7LiAStUpkuaGlPOwVy18/zuL7hNkDaRkI EhTsbBjgxXiAj1uaL/chnt3FHuFYlMTi/QK3WcjhSEJjRghXhqjnwYSCuSy85qmrNtGkai MFTlPGJBCJNXCnd0NXHAwxW+TNlXYi3dU7NXLd/sajuAzYvFlns15CkbtS0C7SBNzqhJfs c1JqmHrWlu3yDOSB37/yF5a+1DWII/+HvwUfPeiFRNpk1DCki5YoR2957VOZg+/d3LDrhR dqi1FXgyeYtn7po5fApbKaFi+N81aYsCgxI9v6MWruQtXbinMaURMaIzA7ROog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvDHn5QTGzp1R for ; Mon, 13 Apr 2026 04:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e318 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 04:01:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 60618b0b57dd - stable/15 - kqueue: don't leak file refs on failure to knote_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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 60618b0b57ddd49f56e1d1f07e132b765a8f840a Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 04:01:57 +0000 Message-Id: <69dc6ab5.1e318.1b660de7@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=60618b0b57ddd49f56e1d1f07e132b765a8f840a commit 60618b0b57ddd49f56e1d1f07e132b765a8f840a Author: Kyle Evans AuthorDate: 2026-04-09 02:37:00 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 03:12:52 +0000 kqueue: don't leak file refs on failure to knote_attach() We'll subsequently just knote_free() since the knote is barely constructed, but that bypasses any logic that might release references on owned files/fops. Defer clearing those until the knote actually owns them and update the comment to draw the line more clearly. Reviewed by: kib (cherry picked from commit 0bf4d22c37083170961c31694b90551538901a1c) --- sys/kern/kern_event.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 6e16c40a531c..4db5c6669470 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1822,12 +1822,6 @@ findkn: kn->kn_fp = fp; kn->kn_kq = kq; kn->kn_fop = fops; - /* - * apply reference counts to knote structure, and - * do not release it at the end of this routine. - */ - fops = NULL; - fp = NULL; kn->kn_sfflags = kev->fflags; kn->kn_sdata = kev->data; @@ -1848,6 +1842,16 @@ findkn: goto done; } + /* + * We transfer ownership of fops/fp to the knote + * structure and avoid releasing them at the end of + * this routine, now that all of the remaining exit + * paths will knote_drop() to release the reference + * counts we held on them above. + */ + fops = NULL; + fp = NULL; + if ((error = kn->kn_fop->f_attach(kn)) != 0) { knote_drop_detached(kn, td); goto done; From nobody Mon Apr 13 04:01:58 2026 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 4fvDHq33x0z6YCq3 for ; Mon, 13 Apr 2026 04:01: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvDHq0229z3wWN for ; Mon, 13 Apr 2026 04:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rkZOt02LNflDve90R3D+S97JFdwMED5I4QXt90rfx0E=; b=eYX4ndyN1q2A2gKAZe+uWAJHYNEKku78O806WeccOKdZbFsibt7NqTU+UagM3u8Dfa4kkM ZaW/EM/2rFT0jm3OUWSx6rWJFiLwcaUc5Rc6a2xqLTwUhgCzoTx3CvhlODSNwUrEF5jmnp SKIFA79DDqy7veT8ftpdn2ae6o+UW3Q6M7QINphz6Iw10QMD9vQGvhV/xDvpOQcaw0KCoH BDX9JaUK89szTkZbC5ChmJcIow68RhWSftwYtvyIh0tpYdtQCGEX7yfu65TghAGy94keMz Er0Ip9IM98aEGEmXLM8Ej78ry4NIC7mkhrU3H6C9u7gBYfHF6giaw0naNlNfSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776052919; a=rsa-sha256; cv=none; b=ujtCYk/ulgbCyMe4OCMOYk/6yZDsa4f6nTNPl/7viITtf9pCjL7twrBIntSXwZmvVo0JgC 1lm+NidTpXV+1VxUX8sho7qHM1oHgFguQHrXEHhMnVIpsNafWgd/D68QcDCP6P0s/v6aNR 5uiCHuObwUs5Y1mKK0q1cOEK+KOLv1cuGiTUIS+KvHYRNYUOUSYh4uMZt6aQ0nMGSaFjdh ql7kDb1x3zPRxGrIz1jOBI6t3Lvu8+BGQaJR12fSDqvZWaQ3Kw4/++FoQbkCZ6EMO3dyRS D+X3QtCjvLj7ohT+1Nb16BE+lb9XfAPvT918A1KytMQ6K1Q5Tq5y0QFi4r0PdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776052919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rkZOt02LNflDve90R3D+S97JFdwMED5I4QXt90rfx0E=; b=rjwLTH6Om/BYBwevdLNjeEqQP3cMAGjsP67dbtQ9pzOLrNou2vVTGqvO9r4/btK+jEr7jN GV2n3htdK1rcEgRpecLgNnQcFg8q0Snn8el7lqwZVaOTdZap6OW+e43/8BoHN6jXMaiKbD f0r5RQm167cSciivmuZmDag5tXtIB9j+zl7NnyuMLYc6aqDqb0SJQaP52Y2zr7b7cZSSXk YErmolaZ+u4UlGWNYEw7HHT7RZa+UxZW+XNUYfBHEoP7uzUXz0evSml9glZoCt8TfvKZHt uKUGwTyybQlDwY7M6OCzFQgIjQh3Ns0bNX5LDKZBMLsuSLXtAdb6zor/QBuzaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvDHp6MSQznXK for ; Mon, 13 Apr 2026 04:01:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19dfb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 04:01:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 84561bc27cb4 - stable/15 - tests: kqueue: add a basic test for CPONFORK 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 84561bc27cb4830a9d4fa27f6ce32c8042f53185 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 04:01:58 +0000 Message-Id: <69dc6ab6.19dfb.56963c4@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=84561bc27cb4830a9d4fa27f6ce32c8042f53185 commit 84561bc27cb4830a9d4fa27f6ce32c8042f53185 Author: Kyle Evans AuthorDate: 2026-04-09 02:37:00 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 03:12:55 +0000 tests: kqueue: add a basic test for CPONFORK Just copy over a timer and a write-filter, be sure that we can observe both in the child. Maybe the timer should check for a minimum time passed, but I don't know that we'd be likely to get that wrong. This also adds a negative test with a kqueue that is *not* set for CPONFORK being added to the first one, made readable, and confirming that we don't see a knote for it in the child. Some other improvements to the test noted in the review are planned in the short term, but they're not particularly worth blocking adding this as a basic sanity check. Reviewed by: kib, markj (cherry picked from commit 0c9cec8b66e7033f50059329704515d5222b9ff4) --- tests/sys/kqueue/kqueue_fork.c | 140 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/tests/sys/kqueue/kqueue_fork.c b/tests/sys/kqueue/kqueue_fork.c index e4c0412c1980..6f517a2e0e29 100644 --- a/tests/sys/kqueue/kqueue_fork.c +++ b/tests/sys/kqueue/kqueue_fork.c @@ -27,9 +27,13 @@ */ #include +#include +#include +#include #include #include +#include #include #include @@ -81,9 +85,145 @@ ATF_TC_BODY(shared_table_filt_sig, tc) ATF_REQUIRE_EQ(WEXITSTATUS(status), 0); } +#define TIMER_FORKED 0 +#define TIMER_TIMEOUT 1 + +#define RECV_TIMER 0x01 +#define RECV_VNODE 0x02 +#define RECV_CLOREAD 0x04 +#define RECV_ERROR 0x80 +#define RECV_ALL (RECV_TIMER | RECV_VNODE) + +static int +cponfork_notes_check(int kq, int clofd) +{ + struct kevent ev; + int error, received = 0; + + EV_SET(&ev, TIMER_TIMEOUT, EVFILT_TIMER, + EV_ADD | EV_ENABLE | EV_ONESHOT, NOTE_SECONDS, 4, NULL); + error = kevent(kq, &ev, 1, NULL, 0, NULL); + if (error == -1) + return (RECV_ERROR); + + while ((received & RECV_ALL) != RECV_ALL) { + error = kevent(kq, NULL, 0, &ev, 1, NULL); + if (error < 0) + return (RECV_ERROR); + else if (error == 0) + break; + + switch (ev.filter) { + case EVFILT_TIMER: + if (ev.ident == TIMER_TIMEOUT) + return (received | RECV_ERROR); + + received |= RECV_TIMER; + break; + case EVFILT_VNODE: + received |= RECV_VNODE; + break; + case EVFILT_READ: + if ((int)ev.ident != clofd) + return (received | RECV_ERROR); + received |= RECV_CLOREAD; + break; + } + } + + return (received); +} + +ATF_TC_WITHOUT_HEAD(cponfork_notes); +ATF_TC_BODY(cponfork_notes, tc) +{ + struct kevent ev[3]; + int clofd, dfd, error, kq, pdfd, pmask, status; + pid_t pid; + + kq = kqueuex(KQUEUE_CPONFORK); + ATF_REQUIRE(kq >= 0); + + dfd = open(".", O_DIRECTORY); + ATF_REQUIRE(dfd >= 0); + + clofd = kqueue(); + ATF_REQUIRE(clofd >= 0); + + /* + * Setup an event on clofd that we can trigger to make it readable, + * as we'll want this ready to go when we fork to be sure that if we + * *were* going to receive an event from it, it would have occurred + * before the three-second timer that would normally close out the child + * fires. + */ + EV_SET(&ev[0], 0, EVFILT_USER, EV_ADD | EV_ENABLE, 0, 0, NULL); + error = kevent(clofd, &ev[0], 1, NULL, 0, NULL); + ATF_REQUIRE(error != -1); + + /* + * Every event we setup here we should expect to observe in both the + * child and the parent, with exception to the EVFILT_READ of clofd. We + * except that one to be dropped in the child when the kqueue it's + * attached to goes away, thus its exclusion from the RECV_ALL mask. + */ + EV_SET(&ev[0], dfd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_ONESHOT, + NOTE_WRITE, 0, NULL); + EV_SET(&ev[1], TIMER_FORKED, EVFILT_TIMER, EV_ADD | EV_ENABLE | EV_ONESHOT, + NOTE_SECONDS, 3, NULL); + EV_SET(&ev[2], clofd, EVFILT_READ, EV_ADD | EV_ENABLE | EV_ONESHOT, 0, + 0, NULL); + error = kevent(kq, &ev[0], 3, NULL, 0, NULL); + ATF_REQUIRE(error != -1); + + /* Fire off an event to make clofd readable. */ + EV_SET(&ev[0], 0, EVFILT_USER, 0, NOTE_TRIGGER, 0, NULL); + error = kevent(clofd, &ev[0], 1, NULL, 0, NULL); + + /* + * We're only using pdfork here for the kill-on-exit semantics, in case + * the parent fails to setup some context needed for one of our events + * to fire. + */ + pid = pdfork(&pdfd, 0); + ATF_REQUIRE(pid != -1); + if (pid == 0) { + struct kinfo_file kf = { .kf_structsize = sizeof(kf) }; + + if (fcntl(kq, F_KINFO, &kf) != 0) + _exit(RECV_ERROR); + else if (kf.kf_type != KF_TYPE_KQUEUE) + _exit(RECV_ERROR); + + _exit(cponfork_notes_check(kq, clofd)); + } + + /* Setup anything we need to fire off any of our events above. */ + error = mkdir("canary", 0755); + ATF_REQUIRE(error == 0); + + /* + * We'll simultaneously do the same exercise of polling the kqueue in + * the parent, to demonstrate that forking doesn't "steal" any of the + * knotes from us -- all of the events we've added are one-shot and + * still fire twice (once in parent, once in child). + */ + pmask = cponfork_notes_check(kq, clofd); + ATF_REQUIRE_EQ(pmask, RECV_ALL | RECV_CLOREAD); + + /* Wait for the child to timeout or observe the timer. */ + _Static_assert(RECV_ALL <= UCHAR_MAX, + "Too many events to observe -- switch from waitpid -> waitid"); + error = waitpid(pid, &status, 0); + ATF_REQUIRE(error != -1); + ATF_REQUIRE(WIFEXITED(status)); + ATF_REQUIRE_EQ(WEXITSTATUS(status), RECV_ALL); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, shared_table_filt_sig); + ATF_TP_ADD_TC(tp, cponfork_notes); return (atf_no_error()); } From nobody Mon Apr 13 05:03:28 2026 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 4fvFfm6Fswz6YHRw for ; Mon, 13 Apr 2026 05:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvFfm5Q3xz46XZ for ; Mon, 13 Apr 2026 05:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776056608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VHGgdsB3O15pp7jQ56+bKOC0fzCJu0kkZ9f/bTAwB88=; b=aNfYBu+oaZEaYnQbLhAspICAuqUGEIpRUzbYVsgCUVZL+lMq7Y/eymAfUqECp3S+WHbfYW byG/qk1u6qJLprK+v8mHspynWpxwvu1TTqVFHY0cZ8rVR4G99mDmCA+G7yDh94GnHlqnCO YjCORRhllA/H0rZl+Kmyyk+VP5YfbpZvUz4nRyp9JY5j861BT9O8GaxKqiNQNaz1aK05iw 2IWnXAuOKyUD2FbnpCLeLgy8rGQd2tPizq+kaHOHCZMFZzat1nsZEyANXj5DQCUbV10+lK C+qZzx+HuUntjE/is7H3ehmDg4n0X0SwL5hQc0NelegdLSAUHpciYFK0qxJY/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776056608; a=rsa-sha256; cv=none; b=SpLLkg6+c325xc24NDYBwGKljSlDmg3vt37x/cO/0PD2AMdu2cM6yTm+1z2Vm/W47hxste wnj/vDMIxt44KyGfR3mCDKG2ttRdHFbjuNTmFASMI3YQZ6jPC44jxytnWpe2JtlTxANUuZ t2M5Il7KxPN0hYuWb0IQwvqclvG6t5yKX0Vd92LYZ9pqIkCUDZFQ32RlBpJk+vM9Um1PY4 9EUmHhdUUCLsrwscKE2DGizu9lMKvtFu2R8Z9G7OFJK/ddHJXxCSW4dwiZm4kdb9YzzFOp Fy6CvJlVHde4cuZAipUV1RvIsINEiQqlzsYihcIHto4iCmeq5f5UnuMOtVyU7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776056608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VHGgdsB3O15pp7jQ56+bKOC0fzCJu0kkZ9f/bTAwB88=; b=cVODiIO1dx5jkq1HLboUoVPTVXaxhoUSem3M8wvqOqTkAI68se4E54FgoCmn0R/j6FVOQB GNCJDAbquM4towFeZ0N90uD/p958QILQHAkN9DcfxBKlBPVGDj2fpuF75oE0yZ3JkjcWfu +IZlxP/v+LuBXqdIBwilXqwOALszKf2jsAzqlmuurszYndsWsk7LF/L30mPBvvW4kPXP4D U+4v/5l3GE7CTMc5ldDRVwuObsz9RMSI82HsJEZzIZkX2Ayf8OFJaHx4HFuUvprftFGv60 NFW4/D8QqnQO4GmIDLmj/VmNG3SE9rpes62x7teTgya8gKrPXRv1Bxv/i33zjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvFfm4p30zqSJ for ; Mon, 13 Apr 2026 05:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2459c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 05:03:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 0ccb63941591 - stable/14 - cross-build: Define __*int*_t and include sys/cdefs.h 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 0ccb63941591d8b9ec77b95d3a4dff11c784e2ad Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 05:03:28 +0000 Message-Id: <69dc7920.2459c.398042ae@gitrepo.freebsd.org> The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0ccb63941591d8b9ec77b95d3a4dff11c784e2ad commit 0ccb63941591d8b9ec77b95d3a4dff11c784e2ad Author: Warner Losh AuthorDate: 2024-05-26 17:39:18 +0000 Commit: Warner Losh CommitDate: 2026-04-13 05:02:27 +0000 cross-build: Define __*int*_t and include sys/cdefs.h FreeBSD assumes that sys/types.h includes sys/cdefs.h, so add it here. FreeBSD also needs __*int*_t defined for software we bootstrap (a lot of it). GLIBC defines these, but musl does not, so we have to define them here, even though it looks backwards. There's no good #define to key off of, so use !defined GLIBC since on Linux defacto there's only two libc implementations. Co-authored-by: Val Packett Sponsored by: Netflix Pull Request: https://github.com/freebsd/freebsd-src/pull/1066 Reviewed by: val_packett.cool Differential Revision: https://reviews.freebsd.org/D45354 (cherry picked from commit 3c5f0da5106bee21ab3726f608b5c377da92a733) --- tools/build/cross-build/include/linux/sys/types.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tools/build/cross-build/include/linux/sys/types.h b/tools/build/cross-build/include/linux/sys/types.h index 770b3057f8a8..d13e19f9b9b5 100644 --- a/tools/build/cross-build/include/linux/sys/types.h +++ b/tools/build/cross-build/include/linux/sys/types.h @@ -35,6 +35,27 @@ */ #pragma once +#include /* FreeBSD source assumes sys/types.h includes this */ +/* + * MUSL doesn't define the __intXX_t that FreeBSD does, but many of our headers + * assume that will always be present. Define them here. We assume !defined + * __GLIBC__ is musl since musl doesn't have a define to key off of. Thesee + * typedefs look backwards, but it's not circular because MUSL never defines the + * __*int*_t. Also, we don't have to work in the kernel, so it's OK to include + * stdint.h here. + */ +#ifndef __GLIBC__ +#include +typedef int64_t __int64_t; +typedef int32_t __int32_t; +typedef int16_t __int16_t; +typedef int8_t __int8_t; +typedef uint64_t __uint64_t; +typedef uint32_t __uint32_t; +typedef uint16_t __uint16_t; +typedef uint8_t __uint8_t; +#endif + #include_next #ifndef __size_t From nobody Mon Apr 13 10:23:50 2026 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 4fvNmQ6rv3z6YxbN for ; Mon, 13 Apr 2026 10:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvNmQ6K4Sz3NDs for ; Mon, 13 Apr 2026 10:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776075830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ktntF6MgHIml8Tg39hutzO919XzdhpvzP7PeYUaZ/rI=; b=aFI9CrsLxXYn/f7m48Sz17jzmLcaX40E66lRrxc4LvF2RYGclMaimNZU7ezy1uGjxBP7Zw jxB3ghWbezRV/fPDkZQYj3Pka0EBP+qh35M/8cCUvGxdlyaydJ/Rv8rw6vQFNQFC8lsyML Nx24dfz4pxVaBz/ct+x5pmmnOyqAUotClwJHL+LiEzAXbbPeYKc2WaoOA/txXqNjkl40wj /EE84v8l7rUFGcWuWn9BRMq8web/6FeLIjxhqLVWJhnSzNU81axNaGx5trsZq4PLllqpb/ sdhcPTzmPXuNoo3rivjHsV0ZxuxJB5BhWJsvA0fRnOKOZ2cMRZK/dJN9bbhbXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776075830; a=rsa-sha256; cv=none; b=e041k/KszG+E6u8jZgvgaFeES1jIhK9gUh2LJj9Cj9R7J0Q33uXWV9TC2rPmi5BZYGAC5/ uGwqbt9xsBVUn7Vp6H855H1VX8u3TnLnxPeeD79Omzp9xFVM5LsGo6HFHxhIiYobxm6FYc SBIwjCEPS4E97CfQ339iWCzl03LelAwgz7Ung7gDyVnXZPSP/784GMh59gTblrgWlDUElb C7kBSr/VoZ+t0jQzeOa9XqPkJ2laqweloyRDQ2E3OjpVseoJiSvPsvzxagXsZ+U3EAx6Q7 IHZ26qN2ktgJEID6qemBy8dF4vdmYFUTh+Me/ToVfHmhBvm+Rw0JHL88ZlHxfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776075830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ktntF6MgHIml8Tg39hutzO919XzdhpvzP7PeYUaZ/rI=; b=ZYHjlW+UZkElRQP/WDTcCknLPp4qGh23urTryorqWA5tyyBGwwRqrHHC7bQQTlpvEHWbn1 3KSQHdnLKgm4i1r0Kte/l2iJ7f6YjABtT1UBGCcWu3V/TTDNzZOKs1rOCNZd3AsKQ7dQTN 3UcifQu23i75gzeWcVSj01P1ucqve+cMjGC5t3TrW2yoncqiJlj5GDF8t6ROatUJxeG5Xy FZNIHlvaB/ds0Iq221QDrN8LbS3aWZkPIXJa5YD/fIr9l07DdJb5U1t87dxkiZiqkpBXii rB9Xvy+ZbdvZ63kEbIOF+T4duxzI4O6rOl92aScM3060wHNZvydYDb3GQQtGSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvNmQ5wXXz10HP for ; Mon, 13 Apr 2026 10:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26d8a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 10:23:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: ae1a2033dc25 - stable/15 - installer: Add download.freebsd.org to mirror list 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ae1a2033dc254d3f89f223819d23767d8e120def Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 10:23:50 +0000 Message-Id: <69dcc436.26d8a.2407b3ad@gitrepo.freebsd.org> The branch stable/15 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=ae1a2033dc254d3f89f223819d23767d8e120def commit ae1a2033dc254d3f89f223819d23767d8e120def Author: Li-Wen Hsu AuthorDate: 2026-04-09 04:06:19 +0000 Commit: Li-Wen Hsu CommitDate: 2026-04-13 10:23:35 +0000 installer: Add download.freebsd.org to mirror list download.freebsd.org is backed by project mirrors and a CDN, which should benefit most users. Sponsored by: The FreeBSD Foundation Reviewed by: delphij (releng) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54849 (cherry picked from commit 45079cdf8b517adf803db7dc7aa85e5728cfeb2f) --- usr.sbin/bsdinstall/scripts/mirrorselect | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect index 05eff9fee56e..708d1b7487eb 100755 --- a/usr.sbin/bsdinstall/scripts/mirrorselect +++ b/usr.sbin/bsdinstall/scripts/mirrorselect @@ -40,6 +40,7 @@ MIRROR=`bsddialog --backtitle "$OSNAME Installer" \ --title "Mirror Selection" --extra-button --extra-label "Other" \ --menu "Please select the best suitable site for you or \"other\" if you want to specify a different choice. The \"Main Site\" directs users to the nearest project managed mirror via GeoDNS (they carry the full range of possible distributions and support both IPv4 and IPv6). All other sites are known as \"Community Mirrors\"; not every site listed here carries more than the base distribution kits. Select a site!" \ 0 0 16 \ + http://download.freebsd.org "Main Site (GeoDNS, CDN, HTTP)"\ http://ftp.freebsd.org "Main Site (GeoDNS, HTTP)"\ ftp://ftp.freebsd.org "Main Site (GeoDNS, FTP)"\ http://ftp.au.freebsd.org "Australia - IPv6"\ @@ -103,7 +104,17 @@ case ${_UNAME_R} in ;; esac -BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/${RELDIR}/`uname -m`/`uname -p`/${_UNAME_R}" +case ${MIRROR} in + *ftp*) + BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD" + ;; + *) + BSDINSTALL_DISTSITE="$MIRROR" + ;; + +esac + +BSDINSTALL_DISTSITE="${BSDINSTALL_DISTSITE}/${RELDIR}/`uname -m`/`uname -p`/${_UNAME_R}" case $MIRROR_BUTTON in $BSDDIALOG_ERROR | $BSDDIALOG_CANCEL | $BSDDIALOG_ESC) From nobody Mon Apr 13 10:24:21 2026 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 4fvNn22dQhz6YxvW for ; Mon, 13 Apr 2026 10:24: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvNn16x6yz3NVr for ; Mon, 13 Apr 2026 10:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776075862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I0pHQIe2L/kjhzH3ZZz3A7NHq/i7wJgiWof+6tCBj88=; b=gxVJgEsJhyHfzk/q7HZ76QAALlugdHiHLiy6MxV5bkFTOxZqvW1Z4zghDUnN60KqWROjI2 +6zWMHiLLiGUh9MU/rIIETKM0Q5YuMHE72wgVSNyKXLN4+d7yyl7gpDpn2V7DajN0dw66T LniK20hXH4f9leD6hSvgYDZrepHiBWxvjSdqwBCaz+GDdZ+hxmGpEAjCdrJESAcDRWoUC9 YPjPxJYdaMmU+Zz3RqytoKyFrNSwPKCrzrosHaRV7zOo5kfNXfpXqixQzMyiW4HcEhbMOp WxKjlZWC8l7gcH7gwSPNGDLtQ6dDXuvYjxuMvs3XZZhw98ZlcyrP8BJbeKUsAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776075862; a=rsa-sha256; cv=none; b=LSxSYxbydT+Q1f77DaZOTBOd8kKoZpmgZoB1XqjOG3I422n1egXnneOnZZImHTJtFG0qEm LTAw0W2wSYjQiltnrMZChlWbG6I8RuamEIZwOtAxKQeOSGUmWYBn8mUwViRHtBB3JRjC6a ff4/1e+wj3KoUMBNqjg24u5rwbylQtRvW26I2mT2X0qA749Cvb0REg10WWm6Aa60rmmxBX zbds8MZtD7okxuZbDkSJd9kDixLa5MbVxr8IOXTLywclZNUz/XTCAz/CDq66p8E89Fvad1 YvWdbLNwJu8eafE2IbZ+FNC3PU5KskDm1u1rNa5YbmIgsDsIzzZo6OoqQYlQ/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776075862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I0pHQIe2L/kjhzH3ZZz3A7NHq/i7wJgiWof+6tCBj88=; b=wHq8VQdJ5KCeGIfbqQgCd2Vh4XdJ0t/AOaimi5rX0N0ORglyjVwaC8zq3cvhm+HBKVCrok 6Gu7hci1pIqrFEm6bgX5EyiJdhB81lcOlGc1m0QDU07smlpCzijxv8SdkhHhvHmExohaO9 GLAXe7GLSbMpzz1d+eBwpQPW91yF1Uda0KPTsl51Exlmm4Z4zhGWWxPLF5adKSveV5LG6H +GzJmEBbahA4Da2aXkT+sFkW2aQBtgFXnYSMkE6DByG24ruehQi9Hp+XDdkL4tOdYmYQAd SkOLABn+hRQIpKhMyU/mkZ4fgcHJNidsowDA0OqxovLhf1GcMSS7J7RLR3msYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvNn16XR0z10fT for ; Mon, 13 Apr 2026 10:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25eb4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 10:24:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: aaa210987afa - stable/14 - installer: Add download.freebsd.org to mirror list 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aaa210987afad8e575088f608a0b85f98186602b Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 10:24:21 +0000 Message-Id: <69dcc455.25eb4.32fc314@gitrepo.freebsd.org> The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=aaa210987afad8e575088f608a0b85f98186602b commit aaa210987afad8e575088f608a0b85f98186602b Author: Li-Wen Hsu AuthorDate: 2026-04-09 04:06:19 +0000 Commit: Li-Wen Hsu CommitDate: 2026-04-13 10:24:13 +0000 installer: Add download.freebsd.org to mirror list download.freebsd.org is backed by project mirrors and a CDN, which should benefit most users. Sponsored by: The FreeBSD Foundation Reviewed by: delphij (releng) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54849 (cherry picked from commit 45079cdf8b517adf803db7dc7aa85e5728cfeb2f) --- usr.sbin/bsdinstall/scripts/mirrorselect | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect index 1ffbf1512ee2..fa6ef41330f8 100755 --- a/usr.sbin/bsdinstall/scripts/mirrorselect +++ b/usr.sbin/bsdinstall/scripts/mirrorselect @@ -40,6 +40,7 @@ MIRROR=`bsddialog --backtitle "$OSNAME Installer" \ --title "Mirror Selection" --extra-button --extra-label "Other" \ --menu "Please select the best suitable site for you or \"other\" if you want to specify a different choice. The \"Main Site\" directs users to the nearest project managed mirror via GeoDNS (they carry the full range of possible distributions and support both IPv4 and IPv6). All other sites are known as \"Community Mirrors\"; not every site listed here carries more than the base distribution kits. Select a site!" \ 0 0 16 \ + http://download.freebsd.org "Main Site (GeoDNS, CDN, HTTP)"\ http://ftp.freebsd.org "Main Site (GeoDNS, HTTP)"\ ftp://ftp.freebsd.org "Main Site (GeoDNS, FTP)"\ http://ftp.au.freebsd.org "Australia - IPv6"\ @@ -105,7 +106,17 @@ case ${_UNAME_R} in ;; esac -BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/${RELDIR}/`uname -m`/`uname -p`/${_UNAME_R}" +case ${MIRROR} in + *ftp*) + BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD" + ;; + *) + BSDINSTALL_DISTSITE="$MIRROR" + ;; + +esac + +BSDINSTALL_DISTSITE="${BSDINSTALL_DISTSITE}/${RELDIR}/`uname -m`/`uname -p`/${_UNAME_R}" case $MIRROR_BUTTON in $BSDDIALOG_ERROR | $BSDDIALOG_CANCEL | $BSDDIALOG_ESC) From nobody Mon Apr 13 10:57:44 2026 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 4fvPWY0SZcz6Z0NL for ; Mon, 13 Apr 2026 10:57: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvPWX6vPqz3R2R for ; Mon, 13 Apr 2026 10:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776077865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FWQdH7Ewgr9iPlDOHfqGronLLIBepDy+HoPImr6TIrs=; b=kzQAHP0GEKqhXrQ3gOy/qp6V1/98CNR+vo1k7BST77VAonJbV4wu3HCinKt+w2FHCZj3KD KiWKy8Zz1MrrMljAO5c7W003nnzHTaefQLkmedGMhXM9idbmW6T1aOZVY8iWePcFIvQTzB dDiV5cdLCgDlMnsigDfn0bCm8WAitmFPZ1AAHl65GJqM3D3eIoZTXeADzhsrKAa68xTMAQ XMFdlQ7IDJVpowBFsvPhWcPhqVX949IHbM6gg1486Q6rck71NUq39cTSTYDfTyU4jil1af b3KMyhM8pgs3gXsx5Y9MvnQXV6G9raGG9+iI5uknbcmiWtzy0SYObh6ZhCcWmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776077865; a=rsa-sha256; cv=none; b=pqe1tt97XcuSfarc0LtHuzcF4GnpJw+zOOG/IpzPM5Bt+ThyZwvHAIFih7VCmG7zibHNRq HSr9yaBKXmT3t44QEV+k2TgMeCQ1iIO5hffzvMC9BIIxylDCYx4xNGPJxcHwrKCXbQ+5jx jjMChMeWzpbcUFuzQ5BgDbGxdt4FMwIL+YjQXutnWqLiRXxaajLJOl765quhd7YjTS+we7 X1D5X2xMC3U5bF8ycbrk8MXY1WKzV2aHoY9DwG+ybYggjqW1y5k4c8lu1MFMQy8AAPllNK cKTH+VQC8lC9wtzZ3vd5/CLL+V5PhBt+sE4DxSYb3gm2xDw7nxG4XmsUfSuQMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776077865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FWQdH7Ewgr9iPlDOHfqGronLLIBepDy+HoPImr6TIrs=; b=ARmiNsIwgzs8M1CgyeOHjs9mV/QMaVXaHFeBtakpKQzchmTmQHtUEfBuaKmGTyG4yd5xGb OwGKapDjPSus8aBYySEXijNCel/jxLhw4qcrH1J7xBxb2KDtS4lrAVzyUeO0QAxnYZQm4f yKs2XVBcdhX+DfOq0NAGlMsq26+Ke3WhVLuBLgsgXWO6wCHPCSgUQhtYMHiXMjNhoWGMLq s7yI5y1BCArdsT3pcrXU7a7gzZDSwWrcyRh9bkRMXYm1hBKVBLg2CEvmUHU0rBkxPd5NXA /do8ZihsCQNbXr+P5/S+vx6a/TynoLEr1SCmonNrF1ixJ4IYzJPqVHrUBXbRAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvPWX5Y20z119J for ; Mon, 13 Apr 2026 10:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32237 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 10:57:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 58718cf36593 - stable/15 - vm_fault: Reset m_needs_zeroing properly 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 58718cf365933dc2c75d43f7154371344bf47286 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 10:57:44 +0000 Message-Id: <69dccc28.32237.8638128@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=58718cf365933dc2c75d43f7154371344bf47286 commit 58718cf365933dc2c75d43f7154371344bf47286 Author: Mark Johnston AuthorDate: 2026-04-08 04:21:09 +0000 Commit: Mark Johnston CommitDate: 2026-04-13 10:57:26 +0000 vm_fault: Reset m_needs_zeroing properly - When allocating a page, we should only consider the PG_ZERO flag when handling the top-level page. - Unconditionally reset the flag when restarting the fault handler. Previously, vm_fault_busy_sleep() would fail to reset it. PR: 294039 Reviewed by: kib Tested by: Peter Much MFC after: 3 days Fixes: cff67bc43df1 ("vm_fault: only rely on PG_ZERO when the page was newly allocated") Differential Revision: https://reviews.freebsd.org/D56234 (cherry picked from commit 04132e01004316ddd0e0cde6ef15b100b7b1844d) --- sys/vm/vm_fault.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 2eed9851135a..907b02f5833a 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -273,8 +273,6 @@ vm_fault_might_be_cow(struct faultstate *fs) static void vm_fault_deallocate(struct faultstate *fs) { - - fs->m_needs_zeroing = true; vm_fault_page_release(&fs->m_cow); vm_fault_page_release(&fs->m); vm_object_pip_wakeup(fs->object); @@ -1370,7 +1368,8 @@ vm_fault_allocate(struct faultstate *fs, struct pctrie_iter *pages) vm_waitpfault(dset, vm_pfault_oom_wait * hz); return (FAULT_RESTART); } - fs->m_needs_zeroing = (fs->m->flags & PG_ZERO) == 0; + if (fs->object == fs->first_object) + fs->m_needs_zeroing = (fs->m->flags & PG_ZERO) == 0; fs->oom_started = false; return (FAULT_CONTINUE); @@ -1705,7 +1704,6 @@ vm_fault(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, fs.fault_flags = fault_flags; fs.map = map; fs.lookup_still_valid = false; - fs.m_needs_zeroing = true; fs.oom_started = false; fs.nera = -1; fs.can_read_lock = true; @@ -1714,6 +1712,7 @@ vm_fault(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, RetryFault: fs.fault_type = fault_type; + fs.m_needs_zeroing = true; /* * Find the backing store object and offset into it to begin the From nobody Mon Apr 13 14:43:22 2026 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 4fvVWt6svCz6ZGNb for ; Mon, 13 Apr 2026 14:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvVWt60L7z3tyX for ; Mon, 13 Apr 2026 14:43:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qgiiCu2OB33N+EM8WGbNlQzs+IS0feBNuj+XdzaSKbg=; b=GvdrNeSXaK242GKOBAslkrwFSztZl9DO0YyWadru/d3OmbHSp6l7MbYjA7pzp3ippHwgQj /2E2tPb4Irkynr5nJGOXZfsiprw7Y+R+2kWr8uTr/MlaEMRiZWB5srQefTW/G73t5VOvXA ZMlbfodltwuUGushsyjutr0hvoDJrXiduJ6YsHU6Vvewc9pnyOLnViaNSGcvb5Z4w4xhEa qXJw4VdrNxI+ZTZwhD7F4WMsaLBmvId/VBaFvWISP3APfYuQtA0fOREpKpJA48qzNnMTY+ Nqc30QFztjMFw34z8b/ybxjsaTq7I6O7BXuAKoHsiB/93FC1iTPVFDV8WjpuBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776091402; a=rsa-sha256; cv=none; b=UyEz7auVbHM40d3h8Be0dxKGMbakWsGG/TZsXXtWzxSOsLabXr8sRZMF+7u3G5tP1Hu7g0 AKThv3k/G7ET2viBT/G22+Yf1AuAqTM31TF9n8KpKR9+6nOLTBE9ZvQKQRNv047ikiR5DJ GhP4Q5/WeeavFqdozHTJZ4EdzSgLL3U80eXL/c88sHWuqMEkIz+zvM5ZFgzZlK6/uj9Gq8 xYCu+4sXhpG8b3ZteGkus8aSKwg9QV0+fy7czHpyIszbq53D1qiNbYKkIo8zT/nJVOOkMD TPbR+vVnfV5+Di+fmyS0yRQRcHAJ+3I2nqfEirTe3YCxCKNXgYqqjy5oVUPjhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qgiiCu2OB33N+EM8WGbNlQzs+IS0feBNuj+XdzaSKbg=; b=wiXvzgkkYHT0f0Qirp8Oh3CV1MJpJYhE/0mcObCLWfKVo3JTGyyIE7fOUn6s0EVq9YJx9b a8vR/wsTboz8zs7fvQLR+9Sxs8d3U7vbAf1guxPYMhRE4EPjdcxF9e//t8+6Jyz8f7+O2g XqoeoaGjXrVqtRa2FBpcM3zsqWA6nvwNnE+mdCeDVPRUeEVYFQMnUM1uAhbyI2DQQaBOy8 AXEkGAHXQsIvqjkp2lnB6/eoF6+FnsmBvw7rQrzmISwQq2RjuJcT+iFwOmrzldZwN4pBWT aPOiFYNKqg5SK6nEHaEzBMVw81XPUDNY3bU0XyRjsXjNh/Ah+F2feJrDXLrZGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvVWt5QtTz1757 for ; Mon, 13 Apr 2026 14:43:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a104 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 14:43:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: cdd2a1d19ad3 - stable/14 - kqueue: add some kn_knlist assertions around knlist_(add|remove) 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: cdd2a1d19ad3e9c62a12b78512522ca972bbd0e2 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 14:43:22 +0000 Message-Id: <69dd010a.1a104.13be1720@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=cdd2a1d19ad3e9c62a12b78512522ca972bbd0e2 commit cdd2a1d19ad3e9c62a12b78512522ca972bbd0e2 Author: Kyle Evans AuthorDate: 2026-04-01 22:30:48 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 14:43:15 +0000 kqueue: add some kn_knlist assertions around knlist_(add|remove) We currently assert that kn_status is accurate, but there's more room for error. Neither of these are very likely, but currently we'd blow up in SLIST*() macros instead of providing more obvious diagnostics. It's perhaps only worth testing these because knlist_remove() requires getting logic across both f_attach() and f_detach() correct. Reviewed by: kib, markj (cherry picked from commit 306c9049c642da6a59a5dc088589605a9aa38b87) --- sys/kern/kern_event.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index df509e7a8492..4e7ad058e144 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2461,6 +2461,8 @@ knlist_add(struct knlist *knl, struct knote *kn, int islocked) KASSERT(kn_in_flux(kn), ("knote %p not in flux", kn)); KASSERT((kn->kn_status & KN_DETACHED) != 0, ("knote %p was not detached", kn)); + KASSERT(kn->kn_knlist == NULL, + ("knote %p was already on knlist %p", kn, kn->kn_knlist)); if (!islocked) knl->kl_lock(knl->kl_lockarg); SLIST_INSERT_HEAD(&knl->kl_list, kn, kn_selnext); @@ -2483,6 +2485,8 @@ knlist_remove_kq(struct knlist *knl, struct knote *kn, int knlislocked, KASSERT(kqislocked || kn_in_flux(kn), ("knote %p not in flux", kn)); KASSERT((kn->kn_status & KN_DETACHED) == 0, ("knote %p was already detached", kn)); + KASSERT(kn->kn_knlist == knl, + ("knote %p was not on knlist %p", kn, knl)); if (!knlislocked) knl->kl_lock(knl->kl_lockarg); SLIST_REMOVE(&knl->kl_list, kn, knote, kn_selnext); From nobody Mon Apr 13 14:43:23 2026 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 4fvVWw2HF1z6ZGJ5 for ; Mon, 13 Apr 2026 14:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvVWv6RvBz3vJ7 for ; Mon, 13 Apr 2026 14:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NRFgeYIiTvlkWp+YBNB3lblJS/sBTCU4USsy6Le0TTk=; b=bH0HCU6txz0DL7ve+rIhhGw+KakI6idhAChIe52OC5NyIrt3AlHVWy8IinD8T6nDXuZRFn QayCn7OhtR5I99ftMASUv5oiSIgnA5bw6idUoDav55TJSAWL1kSAFEElnlUJ4mx0ficLga jKL6cPMkYA3poYsj4UhRVjHEYxUX1LiUTAYgUiMUelR093m3y1jbY4WjCCr6+IQkY0ZIWx 11pdMQB/yQEZ0Go/zPXECY8RVKj8YYTiKoc8OlaVUjjkHQVI4E2cJWrbkhqM5vAC/7ENHZ fCTGT7nlJeEeHZ3gz4KW4MW+ggdUV79OiN+YVPIo84mitZNl9ZfbgnDHdD8mpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776091403; a=rsa-sha256; cv=none; b=HYdPn+kyd14HAANuekjAJ7DjvA+kNF4g8rafeFB3MP03vLKad576uR5pGEVQ52JdzM/WFj I4IMCePxn7FV58qKQ9MfC13BNRXNtVXa7AWMUZbyAhEnKguCxOXQBKyqfcA5wDv/RM8zQf FoTVKU+RoTPFiIBhpHjE/1htmbbT3WnvRgA0UjgdjVqrH/JDQXAzM2Oa1TyZx3GGQ0nzAU xMtyJVrXFoSV2/7/SDV6FB5UChTE7zN8dxY+bZGUOuy8hLIxCkU3xEXZZETwW4vwiV9fkz U23xScgSVNMDAvoGVXyxdGt6TOXOz7q2BojnJaJwNY85KnUcppYoGkP/4lF3Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NRFgeYIiTvlkWp+YBNB3lblJS/sBTCU4USsy6Le0TTk=; b=ejcA5t5S8ySKKTHoLfFtRbOZ4Ipa1XrKjH8iZ0hRUJuQU5UYnoJ6ewbVG8nemuiA3xegbk /C0w5MDYY21pIUlyPSJxOLTdxeFWYrLzmofeTJR0mnGtSB+VUlZUDk3Z7nfFe2V+kQiePL BEWbPmZbFeNSXqfePz+dMJBbym0Rt42/N06FQ+ohO6h60/4wo2LhrKP2/CyxxVuoCpask5 P088SVR8X8EriN10J6gKVAjWw44+cRKVwGexv+kr+iibQZaS/ZgjkcTXAuhdpUMHvmmXhO FZlpwZM1B3pk0OVSY+zxI8PNUV4w2LGK2IVS0x6eHnaukQBKD2RcwvUp8jwHGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvVWv5rSzz1758 for ; Mon, 13 Apr 2026 14:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1953a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 14:43:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: f206751e1280 - stable/14 - kqueue: simplify knote_fdclose() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: f206751e1280410a8c911283a92ee9194a3f1ac6 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 14:43:23 +0000 Message-Id: <69dd010b.1953a.3480e59e@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f206751e1280410a8c911283a92ee9194a3f1ac6 commit f206751e1280410a8c911283a92ee9194a3f1ac6 Author: Kyle Evans AuthorDate: 2026-04-01 22:30:48 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 14:43:15 +0000 kqueue: simplify knote_fdclose() The influx logic in knote_fdclose() is a little misguided, the resulting wakeup() call should always be redundant: knote_drop_detached() will always issue a wakeup before it returns, so anything waiting on *that* knote that had entered fluxwait should have been woken up then. This is the obvious divergence from the other influx/wakeup pattern in the implementation, which will kn_influx-- and then issue the wakeup after it has processed all of the knotes it can make progress on. While we're here, the kq_knlist cannot shrink, so we can avoid that condition in the loop and avoid potentially excessive wakeups from fluxwait on kqueues that we didn't touch. Reviewed by: kib, markj (cherry picked from commit ff1050d2a366bd288a6ebbf63f98003272513f92) --- sys/kern/kern_event.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 4e7ad058e144..a8e59ff408a4 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2684,7 +2684,6 @@ knote_fdclose(struct thread *td, int fd) struct filedesc *fdp = td->td_proc->p_fd; struct kqueue *kq; struct knote *kn; - int influx; FILEDESC_XLOCK_ASSERT(fdp); @@ -2694,22 +2693,25 @@ knote_fdclose(struct thread *td, int fd) */ TAILQ_FOREACH(kq, &fdp->fd_kqlist, kq_list) { KQ_LOCK(kq); + if (kq->kq_knlistsize <= fd || + SLIST_EMPTY(&kq->kq_knlist[fd])) { + KQ_UNLOCK(kq); + continue; + } -again: - influx = 0; - while (kq->kq_knlistsize > fd && - (kn = SLIST_FIRST(&kq->kq_knlist[fd])) != NULL) { + while ((kn = SLIST_FIRST(&kq->kq_knlist[fd])) != NULL) { if (kn_in_flux(kn)) { - /* someone else might be waiting on our knote */ - if (influx) - wakeup(kq); + /* + * Wait for this knote to stabilize, it could be + * the case that it's in the process of being + * dropped anyways. + */ kq->kq_state |= KQ_FLUXWAIT; msleep(kq, &kq->kq_lock, PSOCK, "kqflxwt", 0); - goto again; + continue; } kn_enter_flux(kn); KQ_UNLOCK(kq); - influx = 1; knote_drop(kn, td); KQ_LOCK(kq); } From nobody Mon Apr 13 14:43:24 2026 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 4fvVWx24Fxz6ZGjS for ; Mon, 13 Apr 2026 14:43:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvVWx0Vcvz3v6G for ; Mon, 13 Apr 2026 14:43:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8XkHks80KXO/siDy2wXfLgw52VytXEgWUOM5N1vWYq0=; b=qrS2x1TvLqTV2WZoLlxZ1tx8F0paIxb9EhuFORCM75g/yW7Oyfa9HcDIUCd6phwn7rbZ3x d+Rd1bQHL2nCQq0myfJiT8V6hoE9g+C6I3P8yT8VD5JywqmOPk8fPbo/sxIBJnBC+ERiIT 4ERUoDhRnqsyMirfEbHhBBYNf7WRlBpOVsW5wn5s28UQoHegr5iQJlcCpqlQg6Ut3Lu8DK E1HN+HGXykiUae09u7zDuKEZbgXud0usHTa+JO26s4kaIJ8yUYyjkyIHMPWiyfN41GOTOM TW/mu4WBEkdhm3CCZMgDC9LOBBZ1pdvD0pXQIZUDdc5FWT0RKTHEr0Zkp3q8IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776091405; a=rsa-sha256; cv=none; b=vWjTMbR8VFFjtMY//YiYCfBLonPz904AR7X7HIZ14Z+gppJ8FMOJs/O4X9NClz9r4PcLC1 zn/AzPugbS0/qNNjLuKfXp01zcNC4sfTzjgDMelgIa6QOAcejaoCm7lFPnlxRv4/0mKP5g mlmd3DzRRUcJh3O3LEL/HBzliaDOk6uTFvPjk0a01YRtbmUyzCkpUZviob2Rd12/KStvj9 +DNdM1fnjns1fay7i5p2xeqWAFoYcHt4vVmd4V2wUkENUiAKeS1pR9B8AwQkEdUZx723AE IjIeHslgkepa2CZx4xepsq7LdPBkzugUh1Xed9mr9YlhohtuYSiQi9srVrfP8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8XkHks80KXO/siDy2wXfLgw52VytXEgWUOM5N1vWYq0=; b=Mad0T53UHVEAyJIl3Yrah5azAkKwcatCx9l+k4dmJO1ibCR/+wqvrlHXCQ5HNgkzqz/vV7 h3Vtujg6bkv9VF8Kgvb5NSEunXFRYit/X50any5WaRRy0pfwzz997hJDoReAin3aXcmUie QIqE9rPnufSb1bVQyaGXn4y0MocSkDhvEeFBOUp8Y1b/j/nKq4ZrcngKm/V9neCdNdHnEX TbI/pnxKTiE7Fy70RIeScEXAf263jgrPVry3HjQ5oV4NRiYveN+3+aaVjGGkF/Nby3NoZB FqAdWOV8cCgHIXV5Sd42pAtXFgJdz986wD+bJrYSZ7wPNpWpIVimSL3zjJhdqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvVWw6QHlz16lM for ; Mon, 13 Apr 2026 14:43:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a108 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 14:43:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 42a8f973cb90 - stable/14 - kqueue: compare against the size in kqueue_expand 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 42a8f973cb90fa40025586f083e7b13db7f81926 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 14:43:24 +0000 Message-Id: <69dd010c.1a108.349f32ce@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=42a8f973cb90fa40025586f083e7b13db7f81926 commit 42a8f973cb90fa40025586f083e7b13db7f81926 Author: Kyle Evans AuthorDate: 2026-04-01 22:30:48 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 14:43:16 +0000 kqueue: compare against the size in kqueue_expand This is a cosmetic change, rather than a functional one: comparing the knlistsize against the fd requires a little bit of mental gymnastics to confirm that this is fine and not doing unnecessary work in some cases. Notably, one must consider that kq_knlistsize only grows in KQEXTENT chunks, which means that concurrent threads trying to grow the kqueue to consecutive fds will usually not result in the list being replaced twice. One can also more clearly rule out classes of arithmetic problems in the final `else` branch. Reviewed by: kib, markj (cherry picked from commit 0b4f0e0515d0c7ec855cd654ae5dc562f4931cae) --- sys/kern/kern_event.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index a8e59ff408a4..3df1ed5565d2 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1859,10 +1859,11 @@ kqueue_expand(struct kqueue *kq, const struct filterops *fops, uintptr_t ident, to_free = NULL; if (fops->f_isfd) { fd = ident; - if (kq->kq_knlistsize <= fd) { - size = kq->kq_knlistsize; - while (size <= fd) + size = atomic_load_int(&kq->kq_knlistsize); + if (size <= fd) { + do { size += KQEXTENT; + } while (size <= fd); list = malloc(size * sizeof(*list), M_KQUEUE, mflag); if (list == NULL) return ENOMEM; @@ -1870,7 +1871,7 @@ kqueue_expand(struct kqueue *kq, const struct filterops *fops, uintptr_t ident, if ((kq->kq_state & KQ_CLOSING) != 0) { to_free = list; error = EBADF; - } else if (kq->kq_knlistsize > fd) { + } else if (kq->kq_knlistsize >= size) { to_free = list; } else { if (kq->kq_knlist != NULL) { @@ -1885,6 +1886,7 @@ kqueue_expand(struct kqueue *kq, const struct filterops *fops, uintptr_t ident, kq->kq_knlistsize = size; kq->kq_knlist = list; } + MPASS(error != 0 || kq->kq_knlistsize > fd); KQ_UNLOCK(kq); } } else { From nobody Mon Apr 13 14:43:25 2026 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 4fvVWy4SXQz6ZGdq for ; Mon, 13 Apr 2026 14:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvVWy0bgWz3vGc for ; Mon, 13 Apr 2026 14:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1t6/HzLj9ydDuJ8Zazh6zjQikcxNjbeb9TROKza8VVA=; b=NEGiSoI+tfgLPjdPGBf66jgInH8DJHvUa1gUh0bRt8y3M7Vu2V7fQ6sb55CN98XpjAkK/Y 507wWexhsIM6BQBHC4rSYLfBtnHzNnS0ZzqfCEnl8JmPD+gaqaVuGak4oTBgRHzkAK1lav S5UEfUEK7bVhjSeZBrAIIajse5R0XqR+qSYtxC9TY8KQC4aW9ASqUG1sdWxkwtgQTcfesm 39wHGdZ75CtGBg+4wvZdC9AVxVhqHBj9KI/qooARuGXOTxydlITch0GvJXlOtCyXb2/uxl pKUh5ONlFRmfPbIrQzA3IF0/GzRpLgcJRkY9GXhNcev7p/WUi4iie/rMuZxFZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776091406; a=rsa-sha256; cv=none; b=b6zQBtf9icMfk3IR9BhRDsR46K1vIPZ2juJimycKdJ3rhRbe3XB0nohyGmk4Fx5qLzb3nw nwyjcnJXADwob5eFg9sjEq62vDOCrzc3K6R7HtdlO57X9qprDZdBsaa4pgV9Cz1JaRFl1h xAobA/06LBKMuofzQI75jSUxyPU15tVTWh49wOE2Crv+EiKNKwXhAiKi703JbpKw1FdrY+ q+12OMefBHyDHI8oF7QhweAskVc7iIryZ8AIIdbmLzMeiD0lHFAn6wnkWueig1FlpClyp+ OIQrq+ap+Sut+7nnXHpVAUBahhpV/U3y2Arvzt9seTNAwQqn72JsiA9DJVGoAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1t6/HzLj9ydDuJ8Zazh6zjQikcxNjbeb9TROKza8VVA=; b=CvkMuEhXZRZAc9+wNfcOU5uv76PVqfhoP5BFDy0z7z3UCddg+ltfseESIaVF3Z2/c//SJn 2Aepr3lgploEoyG+4bX2BebfmGnaauqUqhDVMd1lbQqnicD1dz7NIoOpXGXzGR+g6LesTu eF/qpzgPW4xp8OXGwJO5Uh+d7PZiPEwlswMNjOub+Rsb2HmGSdwqrc00iUoTnq1aGPaZT2 7uPkxnwnggN0O5R1LpCEyp1+YFqZ20tJ5nmgCRBl/bc/SUbb/4siB11uPXgS4sVRyyWsp7 SAe3o0Gyhgx2BuhdyCZZJvkDj/5jOIns+A5N7qWCK/PfKLQW5UI3yV2+HvW2AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvVWx75k3z16nR for ; Mon, 13 Apr 2026 14:43:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 183b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 14:43:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 9ef671ef0c6c - stable/14 - lualoader: allow the local module to filter out the BE list 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 9ef671ef0c6c50e85a35d867ef1c7890f9de91af Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 14:43:25 +0000 Message-Id: <69dd010d.183b4.36980857@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9ef671ef0c6c50e85a35d867ef1c7890f9de91af commit 9ef671ef0c6c50e85a35d867ef1c7890f9de91af Author: Kyle Evans AuthorDate: 2026-04-08 12:49:18 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 14:43:16 +0000 lualoader: allow the local module to filter out the BE list This allows something like the following local.lua to install a filter to implement its own notion of hidden BEs using a naming convention of a leading dot to hide them: -- file: /boot/lua/local.lua local core = require("core") local function be_hide(be) if core.isSingleUserBoot() then -- All BEs are accepted for single-user return true end local name = be:match("/([^/]+)$") if not name then -- Accept malformed BEs, for whatever reason return true end return name:match("^%.") == nil end if core.bootenvFilter then -- Just in case we need to be compatible with older versions of -- core.lua without the filtering functionality. core.bootenvFilter(be_hide) end -- EOF Requested by: Marek Zarychta Reviewed by: imp (cherry picked from commit bf0881060ecd75ce79683b82ebcd4809eadf7cf5) --- stand/lua/core.lua | 20 ++++++++++++++++++-- stand/lua/core.lua.8 | 13 ++++++++++++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/stand/lua/core.lua b/stand/lua/core.lua index ccd8213a718d..4091f446e1f1 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -303,6 +303,15 @@ function core.bootenvDefault() return loader.getenv("zfs_be_active") end +function core.bootenvFilter(func) + local oldf = core.bootenv_filter + + -- Filter contract: returns true if the BE should be kept, false if it + -- should be hidden. + core.bootenv_filter = func + return oldf +end + function core.bootenvList() local bootenv_count = tonumber(loader.getenv(bootenv_list .. "_count")) local bootenvs = {} @@ -330,11 +339,18 @@ function core.bootenvList() for curenv_idx = 0, bootenv_count - 1 do curenv = loader.getenv(bootenv_list .. "[" .. curenv_idx .. "]") if curenv ~= nil and unique[curenv] == nil then - envcount = envcount + 1 - bootenvs[envcount] = curenv unique[curenv] = true + + -- If we have a filter installed (by a local module), we + -- give it a chance to veto the BE. + if not core.bootenv_filter or + core.bootenv_filter(curenv) then + envcount = envcount + 1 + bootenvs[envcount] = curenv + end end end + return bootenvs end diff --git a/stand/lua/core.lua.8 b/stand/lua/core.lua.8 index de43d3e2b220..325320b2fce8 100644 --- a/stand/lua/core.lua.8 +++ b/stand/lua/core.lua.8 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 29, 2025 +.Dd April 8, 2026 .Dt CORE.LUA 8 .Os .Sh NAME @@ -164,6 +164,17 @@ is set in kernels will be autodetected from the current system. .It Fn core.bootenvDefault Returns the default boot environment, nil if unset. +.It Fn core.bootenvFilter func +Installs a filter +.Fa func +into +.Fn core.bootenvList . +If the +.Fa func +returns true, then the boot environment is retained in the list. +Otherwise, the boot environment is hidden. +The old filter, if any, is returned to allow the caller to compose a filter on +top of another filter. .It Fn core.bootenvList Returns a table of boot environments, or an empty table. These will be picked up using the From nobody Mon Apr 13 14:43:27 2026 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 4fvVWz6tNMz6ZGdr for ; Mon, 13 Apr 2026 14:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvVWz2KN7z3vSw for ; Mon, 13 Apr 2026 14:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KmetWQpMXdSoy71SPtgt508a4gOXRnGmxAtwVqHcsIY=; b=nfBYGlPc8S+4LLeynfbxDog8lsscLANIvGdLF8G1pWSFFX9ih6sXvQvY3OWEAnSLmfqo1y Y+6x1bG9ZihfsoriY5ip7xdYQzqd4DUqnsnTwjdllJmJJ6c/xchtRfOh2WK9lpL8WUvfW5 8JT5AlGDP5qRaWeG/HiTNHSB2eh9YXZZ8AcaaA5wWL1zbe3Npar108o17fIKWc5nUuF5kp ewwIMz+x2KpO2Ht1Hh81h3mQMHvgjk+T9+ocR8FqSNdq52W6s46NIlsRIYhJsbq9an7AgK m2uB6odL97nfYgW1hINc2EWxE21vOMyRdwrIb/FlEXuOQtikS4+tzxoKyoFgCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776091407; a=rsa-sha256; cv=none; b=LCnRcUqCGGsNU9NcPmsJwZ9f9M0mB0keZGFv0aEULZOwg0462Wwgp/N+K6bQDBbn7Aq4+k wDTMHcw4uK9rRjcKFVftzTjMBPf9FbENfw6YE2arMf5Va6iOQDjiHg6REe/gIiiXVc0IWC fuOJTm1fCIInouofWgqq/43rVvjNLe2i4iCSClDLXHVeaXjVoLtJWSylvsx21DIRSL5EdH 64FaZbuBYgocj4SOwFE2TQ5QGz5rKvRhBZMBuj7CSX84ChyOxgJDQZCHQ7gVpjOwMfui2t TLMe5LMuwqQrxmtpaW9bXsogaR4G1LDXwu2UWNImH9Vhrlks5deG9pre9mdprg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KmetWQpMXdSoy71SPtgt508a4gOXRnGmxAtwVqHcsIY=; b=r1rzyUsQoCP/46GhtK4WRu3Wk+BQJZ36db96xBu0R1i+O+EYURlojlNau/nndf5lMfK4D7 elNJzal2RXkS9OIpstIhcrGQi81VvpVc0Wryc2P4aITM5+iJDSZ95s0waU4nvjITNyi7kE +qcDUpT20nYyZH+CbGtfdi130tk6g6be9xLCMd7fH2YWRE/11P5dHHu82+SQWgRQTI1S3K 8kXizRsLpwuqWH5vhUAnoFsuEhTvkK27FKHAsU4T4M/bWj9OyrYfuLhk+8ky8QhrDHpKW2 EpVuItIT3OcE3+mW/b5nxCB+U6Hkfrh1mbvOJZTbo+R0uOYtsmN8GjYk9MUV4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvVWz0lFWz17H3 for ; Mon, 13 Apr 2026 14:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 181df by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 14:43:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6706984194d7 - stable/14 - libc: fix memfd_create's HUGETLB handling 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 6706984194d76b8eaa13508c7b781e817cb76df2 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 14:43:27 +0000 Message-Id: <69dd010f.181df.3550b148@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6706984194d76b8eaa13508c7b781e817cb76df2 commit 6706984194d76b8eaa13508c7b781e817cb76df2 Author: Kyle Evans AuthorDate: 2026-04-09 02:37:00 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 14:43:17 +0000 libc: fix memfd_create's HUGETLB handling The 'simplification' commit referenced below actually broke one aspect of MFD_HUGETLB: the caller isn't supposed to be required to specify a size. MFD_HUGETLB by itself without a shift mask just requests a large page, so we revert that part of memfd_create() back. While we're here, fix up the related parts of the manpages a little bit, since MFD_HUGETLB is actually supported. The manpage claims that we would return ENOSYS if forced mappings weren't supported, but this was actually not true. However, that seems like a very important distinction to make between ENOSYS and EOPNOTSUPP, so fix the implementation to match the docs. Reviewed by: kib, markj (cherry picked from commit 9a8d333368baef356f0a611b47ec592568dd14f9) --- lib/libc/gen/memfd_create.c | 23 +++++++++++++------ lib/libc/sys/shm_open.2 | 31 ++++++++++++++++++++++---- tests/sys/posixshm/memfd_test.c | 35 +++++++++++++++++++++++++++++ tests/sys/posixshm/posixshm.h | 45 ++++++++++++++++++++++++++++++++++++++ tests/sys/posixshm/posixshm_test.c | 38 +++++++++++--------------------- 5 files changed, 136 insertions(+), 36 deletions(-) diff --git a/lib/libc/gen/memfd_create.c b/lib/libc/gen/memfd_create.c index 78131f46d7b1..8e6c93be4337 100644 --- a/lib/libc/gen/memfd_create.c +++ b/lib/libc/gen/memfd_create.c @@ -95,16 +95,25 @@ memfd_create(const char *name, unsigned int flags) npgs = getpagesizes(pgs, nitems(pgs)); if (npgs == -1) goto clean; - pgsize = (size_t)1 << ((flags & MFD_HUGE_MASK) >> MFD_HUGE_SHIFT); - for (pgidx = 0; pgidx < npgs; pgidx++) { - if (pgsize == pgs[pgidx]) - break; - } - if (pgidx == npgs) { - errno = EOPNOTSUPP; + else if (npgs == 1) { + errno = ENOSYS; goto clean; } + if ((flags & MFD_HUGE_MASK) == 0) { + pgidx = 1; + } else { + pgsize = 1UL << ((flags & MFD_HUGE_MASK) >> MFD_HUGE_SHIFT); + for (pgidx = 1; pgidx < npgs; pgidx++) { + if (pgsize == pgs[pgidx]) + break; + } + if (pgidx == npgs) { + errno = EOPNOTSUPP; + goto clean; + } + } + memset(&slc, 0, sizeof(slc)); slc.psind = pgidx; slc.alloc_policy = SHM_LARGEPAGE_ALLOC_DEFAULT; diff --git a/lib/libc/sys/shm_open.2 b/lib/libc/sys/shm_open.2 index 8bea939690ba..c4361b87d8d7 100644 --- a/lib/libc/sys/shm_open.2 +++ b/lib/libc/sys/shm_open.2 @@ -26,7 +26,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 30, 2023 +.Dd April 13, 2026 .Dt SHM_OPEN 2 .Os .Sh NAME @@ -342,7 +342,25 @@ Allow adding seals to the resulting file descriptor using the .Xr fcntl 2 command. .It Dv MFD_HUGETLB -This flag is currently unsupported. +Create a memfd backed by a +.Dq largepage +object. +One of the +.Dv MFD_HUGE_* +flags defined in +.In sys/mman.h +may be included to specify a fixed size. +If a specific size is not requested, the smallest supported large page size is +selected. +.Pp +The behavior documented above for the +.Fn shm_create_largepage +.Fa psind +argument also applies to largepage objects created by +.Fn memfd_create , +and the +.Dv SHM_LARGEPAGE_ALLOC_DEFAULT +policy will always be used. .El .Sh RETURN VALUES If successful, @@ -457,17 +475,22 @@ argument was too long. .Pp An invalid or unsupported flag was included in .Fa flags . +.It Bq Er EINVAL +A hugetlb mapping was requested, but +.Dv MFD_HUGETLB +was not specified in +.Fa flags . .It Bq Er EMFILE The process has already reached its limit for open file descriptors. .It Bq Er ENFILE The system file table is full. .It Bq Er ENOSYS -In -.Fa memfd_create , .Dv MFD_HUGETLB was specified in .Fa flags , and this system does not support forced hugetlb mappings. +.It Bq Er EOPNOTSUPP +This system does not support the requested hugetlb page size. .El .Pp .Fn shm_open diff --git a/tests/sys/posixshm/memfd_test.c b/tests/sys/posixshm/memfd_test.c index 5cae184206b1..387eca4cafe9 100644 --- a/tests/sys/posixshm/memfd_test.c +++ b/tests/sys/posixshm/memfd_test.c @@ -34,6 +34,8 @@ #include #include +#include "posixshm.h" + ATF_TC_WITHOUT_HEAD(basic); ATF_TC_BODY(basic, tc) { @@ -277,6 +279,38 @@ ATF_TC_BODY(immutable_seals, tc) close(fd); } +ATF_TC_WITHOUT_HEAD(hugetlb); +ATF_TC_BODY(hugetlb, tc) +{ + size_t ps[MAXPAGESIZES], pgsize; + int fd, pscnt; + + pscnt = pagesizes(ps, false); +#define MFD_HUGE_SUPPORTED(sz) (sz <= (1 << 24)) +#define MFD_HUGE_FLAGS(sz) (((ffsl(sz) - 1U) << MFD_HUGE_SHIFT) & MFD_HUGE_MASK) + for (int psidx = 1; psidx < pscnt; psidx++) { + pgsize = ps[psidx]; + + if (!MFD_HUGE_SUPPORTED(pgsize)) + continue; + + ATF_REQUIRE_MSG((fd = memfd_create("...", + MFD_HUGETLB | MFD_HUGE_FLAGS(pgsize))) != -1, + "Creating a %zu-size hugetlb memfd", pgsize); + } + + fd = memfd_create("...", MFD_HUGETLB); + if (pscnt == 1) { + ATF_REQUIRE_MSG(fd == -1, + "Creating an unspecified hugetlb memfd without large page support"); + ATF_REQUIRE(errno == ENOSYS); + } else { + ATF_REQUIRE_MSG(fd != -1, + "Creating an unspecified hugetlb memfd with large page support"); + close(fd); + } +} + ATF_TP_ADD_TCS(tp) { @@ -289,5 +323,6 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, get_seals); ATF_TP_ADD_TC(tp, dup_seals); ATF_TP_ADD_TC(tp, immutable_seals); + ATF_TP_ADD_TC(tp, hugetlb); return (atf_no_error()); } diff --git a/tests/sys/posixshm/posixshm.h b/tests/sys/posixshm/posixshm.h new file mode 100644 index 000000000000..84c73e0d10df --- /dev/null +++ b/tests/sys/posixshm/posixshm.h @@ -0,0 +1,45 @@ +/*- + * + * Copyright (c) 2020 Klara, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include + +#include + +static int +pagesizes(size_t ps[MAXPAGESIZES], bool required) +{ + int pscnt; + + pscnt = getpagesizes(ps, MAXPAGESIZES); + ATF_REQUIRE_MSG(pscnt != -1, "getpagesizes failed; errno=%d", errno); + ATF_REQUIRE_MSG(ps[0] != 0, "psind 0 is %zu", ps[0]); + ATF_REQUIRE_MSG(pscnt <= MAXPAGESIZES, "invalid pscnt %d", pscnt); + if (pscnt == 1 && required) + atf_tc_skip("no large page support"); + return (pscnt); +} + diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index a3ce18f855f5..406ad5011884 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -50,6 +50,8 @@ #include +#include "posixshm.h" + #define TEST_PATH_LEN 256 static char test_path[TEST_PATH_LEN]; static char test_path2[TEST_PATH_LEN]; @@ -1240,20 +1242,6 @@ shm_open_large(int psind, int policy, size_t sz) return (fd); } -static int -pagesizes(size_t ps[MAXPAGESIZES]) -{ - int pscnt; - - pscnt = getpagesizes(ps, MAXPAGESIZES); - ATF_REQUIRE_MSG(pscnt != -1, "getpagesizes failed; errno=%d", errno); - ATF_REQUIRE_MSG(ps[0] != 0, "psind 0 is %zu", ps[0]); - ATF_REQUIRE_MSG(pscnt <= MAXPAGESIZES, "invalid pscnt %d", pscnt); - if (pscnt == 1) - atf_tc_skip("no large page support"); - return (pscnt); -} - ATF_TC_WITHOUT_HEAD(largepage_basic); ATF_TC_BODY(largepage_basic, tc) { @@ -1262,7 +1250,7 @@ ATF_TC_BODY(largepage_basic, tc) size_t ps[MAXPAGESIZES]; int error, fd, pscnt; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); zeroes = calloc(1, ps[0]); ATF_REQUIRE(zeroes != NULL); for (int i = 1; i < pscnt; i++) { @@ -1318,7 +1306,7 @@ ATF_TC_BODY(largepage_config, tc) size_t ps[MAXPAGESIZES + 1]; /* silence warnings if MAXPAGESIZES == 1 */ int error, fd; - (void)pagesizes(ps); + (void)pagesizes(ps, true); fd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0); ATF_REQUIRE_MSG(fd >= 0, "shm_open failed; error=%d", errno); @@ -1380,7 +1368,7 @@ ATF_TC_BODY(largepage_mmap, tc) size_t ps[MAXPAGESIZES]; int fd, pscnt; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { fd = shm_open_large(i, SHM_LARGEPAGE_ALLOC_DEFAULT, ps[i]); @@ -1476,7 +1464,7 @@ ATF_TC_BODY(largepage_munmap, tc) size_t ps[MAXPAGESIZES], ps1; int fd, pscnt; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { fd = shm_open_large(i, SHM_LARGEPAGE_ALLOC_DEFAULT, ps[i]); ps1 = ps[i - 1]; @@ -1527,7 +1515,7 @@ ATF_TC_BODY(largepage_madvise, tc) size_t ps[MAXPAGESIZES]; int fd, pscnt; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { fd = shm_open_large(i, SHM_LARGEPAGE_ALLOC_DEFAULT, ps[i]); addr = mmap(NULL, ps[i], PROT_READ | PROT_WRITE, MAP_SHARED, fd, @@ -1596,7 +1584,7 @@ ATF_TC_BODY(largepage_mlock, tc) "sysctlbyname(vm.stats.vm.v_user_wire_count) failed; error=%d", errno); - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { if (ps[i] / ps[0] > max_wired - wired) { /* Cannot wire past the limit. */ @@ -1639,7 +1627,7 @@ ATF_TC_BODY(largepage_msync, tc) size_t ps[MAXPAGESIZES]; int fd, pscnt; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { fd = shm_open_large(i, SHM_LARGEPAGE_ALLOC_DEFAULT, ps[i]); addr = mmap(NULL, ps[i], PROT_READ | PROT_WRITE, MAP_SHARED, fd, @@ -1698,7 +1686,7 @@ ATF_TC_BODY(largepage_mprotect, tc) size_t ps[MAXPAGESIZES]; int fd, pscnt; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { /* * Reserve a contiguous region in the address space to avoid @@ -1768,7 +1756,7 @@ ATF_TC_BODY(largepage_minherit, tc) pid_t child; int fd, pscnt, status; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { fd = shm_open_large(i, SHM_LARGEPAGE_ALLOC_DEFAULT, ps[i]); addr = mmap(NULL, ps[i], PROT_READ | PROT_WRITE, MAP_SHARED, fd, @@ -1856,7 +1844,7 @@ ATF_TC_BODY(largepage_pipe, tc) int fd, pfd[2], pscnt, status; pid_t child; - pscnt = pagesizes(ps); + pscnt = pagesizes(ps, true); for (int i = 1; i < pscnt; i++) { fd = shm_open_large(i, SHM_LARGEPAGE_ALLOC_DEFAULT, ps[i]); @@ -1909,7 +1897,7 @@ ATF_TC_BODY(largepage_reopen, tc) size_t ps[MAXPAGESIZES]; int fd, psind; - (void)pagesizes(ps); + (void)pagesizes(ps, true); psind = 1; gen_test_path(); From nobody Mon Apr 13 14:43:28 2026 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 4fvVX14mkwz6ZGlj for ; Mon, 13 Apr 2026 14:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvVX02F8hz3vYx for ; Mon, 13 Apr 2026 14:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LQq/KmRfGrmBj01ik4M7XoSJ0/lq64RYK2Th2Z96p28=; b=YZR8+qN1O6ISq+f8wS2ugJqfuuQveOYHQrBJ9akZ43ygg/zujtCFfYBG7DLAU7xzjft7pg ZE+Y69HBPTgxNAHA25RVBiQco4FFN8QM4CNecpZZseLxKGCYlHpgK8ydTFA7WFtrAKZAtJ QylkQXAgwXPq1WVTWvPMf+zx9GpoA9KxgJAg+ZaZobjPrdJ96RbQc4hLCIpRf8lLN+qzqn XLRCGrqbyzsfNq6qGgmLv719xZeSINf+PlvO9CcjWUssHf3soCSZE7Jg2EYSQZFrl4Pl/t seJ2z5PmBWTXWBkAYx+G4LbVih8IUMzHcRNT1miMgs2uj1zqwQf8iuOvo71Lxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776091408; a=rsa-sha256; cv=none; b=H1g8RER6/ZaZnuSnVPEEHq+YcTNHnpjx9x0mi0YzVAH9bC11kq+Wq0J/VaUcVTlUibhA4O NLXWdG/9YIDdyyCjIFNXtkfU23mKUfMJW23pipX/SCX2TdAYVu95Tzmzpwif3slnYsQYjU 6O5NSiWrQoVEdGMF79w3XOY9HkUoP/diP16C9MatmNFc0E7G7D9ICycTU8qFMl0kAWe9sC QXNhy2CE60ixoMOtFip9UAxxLULr1K5LoC0Ktb3zIVik1RJ/MZzgkyXKyhbMU8Ix8v6SjX M5EWNA6BvzC+xQTjl/c5hXk2u2N1GntKYKXjWO1TDgHGKrijyiwKQk83pP16Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LQq/KmRfGrmBj01ik4M7XoSJ0/lq64RYK2Th2Z96p28=; b=q4Xli2J7B/Ff0AncDxRIF2ncE0yIbz9T+cVQ6XDB2JR542ZEibi3PA59zzP8QB5D9+G+R+ OQ+dGgaie6r55Utxpl8grcNTXjdtVDpTzynohCDgTX8eg3EfIdHEoKWmT2LXVFOTCspxMH g6vNre9O9B8nUx42FTmvsaCdAp3At74vxmoppbDyeEQRFpoaN1WH2d7kP/Ciki4LQNWZBd yLbV8srH/PgGTr/9L77SZR2CURCYGg1NfcghzqNYPo8duyCkUsKfEzYJ0j5Ke2jXr263J5 k9Ha5g7QEX4Fz9dXjjKGne/9L8fAsXJ2Gv/uog/fWmgHI4e7ncTiterYK3Sq3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvVX01YLXz17H5 for ; Mon, 13 Apr 2026 14:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a10c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 14:43:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 64c72d3020f5 - stable/14 - kqueue: don't leak file refs on failure to knote_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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 64c72d3020f5c0d07219745f658400ca26654d84 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 14:43:28 +0000 Message-Id: <69dd0110.1a10c.13b8c5d@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=64c72d3020f5c0d07219745f658400ca26654d84 commit 64c72d3020f5c0d07219745f658400ca26654d84 Author: Kyle Evans AuthorDate: 2026-04-09 02:37:00 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 14:43:17 +0000 kqueue: don't leak file refs on failure to knote_attach() We'll subsequently just knote_free() since the knote is barely constructed, but that bypasses any logic that might release references on owned files/fops. Defer clearing those until the knote actually owns them and update the comment to draw the line more clearly. Reviewed by: kib (cherry picked from commit 0bf4d22c37083170961c31694b90551538901a1c) --- sys/kern/kern_event.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 3df1ed5565d2..e10e57cdceb8 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1669,12 +1669,6 @@ findkn: kn->kn_fp = fp; kn->kn_kq = kq; kn->kn_fop = fops; - /* - * apply reference counts to knote structure, and - * do not release it at the end of this routine. - */ - fops = NULL; - fp = NULL; kn->kn_sfflags = kev->fflags; kn->kn_sdata = kev->data; @@ -1695,6 +1689,16 @@ findkn: goto done; } + /* + * We transfer ownership of fops/fp to the knote + * structure and avoid releasing them at the end of + * this routine, now that all of the remaining exit + * paths will knote_drop() to release the reference + * counts we held on them above. + */ + fops = NULL; + fp = NULL; + if ((error = kn->kn_fop->f_attach(kn)) != 0) { knote_drop_detached(kn, td); goto done; From nobody Mon Apr 13 14:43:29 2026 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 4fvVX16Gw4z6ZGjc for ; Mon, 13 Apr 2026 14:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvVX12nw0z3vTF for ; Mon, 13 Apr 2026 14:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kcBffETgdqHbZ5ZFBjpf2j/P+OS+Ub1pSPgnvW+gSI4=; b=VCnhcbQwTMC9yQYBQ0eAbPd2lxmkkeStQcZJbaGwshghUNtyDF3kVBegIA0KnM+H1AZ172 4IYOX5+5akRpvkUXomOghwBXP6jBMfRnbE9523IOu9oWJqo8gYrZStFotwBPvlfEwj/T3s 112BH4q4kd92klDn/kXDymQb0wOPlurBStQgJ2EpUAqN8fE6XMMEUIr19GWxTjTs1CWglF joRU/a6Bourle1Mwv43Qd6gU/yDGpXbZs9Y5IzroCzwh1MTc4tg1b9rSGSdYsPqFbKjckq mjLNI7vtxqynRw4hwQW1hzwOsaUJeEiQPAyIsGMjq0lwjNFjjJvm/8xwAI9tlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776091409; a=rsa-sha256; cv=none; b=iTsK2BAHfE8iTm1uX0F8lN0M5FLDecVo/yyamtLAIqvdQMxWzK9p3StYnNGM8iLciEwNSz VAtwkUOuNq6hCUI+41ttTo9rKG6966H082bDyt/vmPPyypRLIhb99pZOz1xW6p9lRv4/HA uqq4ZhzOOJ4l3qS0lWWR4WAZeBHeo5eWzggeMjcKkeF/gjaxt1BLqInBMFJhq7AMv5rXNw GtGMjGz0quLW4YO75BYjrLes8TV0+Xd7/cDG5Y+qyJe87qs5xK71qWTWUC5ifNB3tAuW4p CPM70TxWiJ91KM1IjBZMJfgMBfahbMlp5AsvZj+6LrVU8LTF5zLaeMXleKc8Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776091409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kcBffETgdqHbZ5ZFBjpf2j/P+OS+Ub1pSPgnvW+gSI4=; b=T3kA1zMGuzuglLA2BbMQXD+6DmBY8JHVNHe9XTWz1jyeQnSgJUdGU0WX4/ZnFSaxKUaNzg uuAdBroD4xVxq1wR+Wlv9qeplpZ1roAuTM+gzCBZiuTTuAQ7T+nkmSnRZ84cBEvxhCqydr lXJosKUYvxvJQxCarFs7URsS+18eMKP0v4KfpqCA4N4aFV/DBrzP5iWkjWPPvuKhumRnjc xJ8qkfXoe6ewqn4PTOBzwo6L8kqfmuSc1tuLs2OhQm8Q3juxsCBFbzhkceOlbIxOe/Wafe HUlO9P3bMzCMfnMUWTwKFDiKDGNM0C+Mj7rRP2q2IuEVX/4XdnMebEBXhcHUeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvVX12MvKz17H6 for ; Mon, 13 Apr 2026 14:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 182e8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 14:43:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: efab056932ed - stable/14 - kqueue: slightly clarify the flow in knlist_cleardel() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: efab056932ede3f1e14cfcc800f5c421f2d78b95 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 14:43:29 +0000 Message-Id: <69dd0111.182e8.6111503a@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=efab056932ede3f1e14cfcc800f5c421f2d78b95 commit efab056932ede3f1e14cfcc800f5c421f2d78b95 Author: Kyle Evans AuthorDate: 2026-04-09 02:37:00 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 14:43:17 +0000 kqueue: slightly clarify the flow in knlist_cleardel() This is purely a cosmetic change to make it a little easier on the eyes, rather than jumping back to the else branch up top. Re-flow it to use another loop on the outside and just inline the re-lock before we repeat after awaking from fluxwait. The !killkn path should maybe issue a wakeup if there's a thread in KQ_SLEEP so that userland can observe the EOF, but this isn't a practical problem today: pretty much every case of knlist_clear is tied to a file descriptor and called in the close(2) path. As a consequence, potentially affected knotes are almost always destroyed before we even get to knlist_clear(). Reviewed by: kib, markj (cherry picked from commit c6dd40f2d35d596ca60a5d87616c3e4a0fd4f676) --- sys/kern/kern_event.c | 50 +++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index e10e57cdceb8..7c31a2f551ab 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2634,31 +2634,39 @@ knlist_cleardel(struct knlist *knl, struct thread *td, int islocked, int killkn) KNL_ASSERT_LOCKED(knl); else { KNL_ASSERT_UNLOCKED(knl); -again: /* need to reacquire lock since we have dropped it */ knl->kl_lock(knl->kl_lockarg); } - SLIST_FOREACH_SAFE(kn, &knl->kl_list, kn_selnext, kn2) { - kq = kn->kn_kq; - KQ_LOCK(kq); - if (kn_in_flux(kn)) { - KQ_UNLOCK(kq); - continue; - } - knlist_remove_kq(knl, kn, 1, 1); - if (killkn) { - kn_enter_flux(kn); - KQ_UNLOCK(kq); - knote_drop_detached(kn, td); - } else { - /* Make sure cleared knotes disappear soon */ - kn->kn_flags |= EV_EOF | EV_ONESHOT; - KQ_UNLOCK(kq); + for (;;) { + /* + * Each pass removes as many knotes as we can before dropping + * into FLUXWAIT. Active knotes are simply detached and either + * freed or converted to one-shot, as the attached subject is + * essentially disappearing. + */ + SLIST_FOREACH_SAFE(kn, &knl->kl_list, kn_selnext, kn2) { + kq = kn->kn_kq; + KQ_LOCK(kq); + if (kn_in_flux(kn)) { + KQ_UNLOCK(kq); + continue; + } + knlist_remove_kq(knl, kn, 1, 1); + if (killkn) { + kn_enter_flux(kn); + KQ_UNLOCK(kq); + knote_drop_detached(kn, td); + } else { + /* Make sure cleared knotes disappear soon */ + kn->kn_flags |= EV_EOF | EV_ONESHOT; + KQ_UNLOCK(kq); + } + kq = NULL; } - kq = NULL; - } - if (!SLIST_EMPTY(&knl->kl_list)) { + if (SLIST_EMPTY(&knl->kl_list)) + break; + /* there are still in flux knotes remaining */ kn = SLIST_FIRST(&knl->kl_list); kq = kn->kn_kq; @@ -2668,7 +2676,7 @@ again: /* need to reacquire lock since we have dropped it */ kq->kq_state |= KQ_FLUXWAIT; msleep(kq, &kq->kq_lock, PSOCK | PDROP, "kqkclr", 0); kq = NULL; - goto again; + knl->kl_lock(knl->kl_lockarg); } if (islocked) From nobody Mon Apr 13 17:36:01 2026 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 4fvZM51YM4z6ZScP for ; Mon, 13 Apr 2026 17:36: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvZM50mDzz3Ngv for ; Mon, 13 Apr 2026 17:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776101761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Y3ikc7Wx7GJU7oI9eRfDF8OtxgiCx5FdlEyoP76ZAA=; b=F90Ewym5uxH+bS533IPknDX/ugsCmG1NKlegUTjOYkdPWgY6vCy+Lszu8E1JgtdfN1mi1f /IKPe5u+qYDSAEa8ZCkAo+Jl+ZJonFqBEKXriVH366B+8CFWfm31Oa3ZD1r/XSe3I9SaoU qFjmmgUu1zqBrZximUZVdrvZPxNd9T4vIpv0qf2LAEDcDGnrMtHs0yE4F16uCyEOhtvkSZ 7vnPcZ81rElovo4xpDoJh4h0Xmi2N73gWfrusBVkd8U3SFeosChujj29p8SE0iiKWhcx/C 7G5zjIiA1d0kPms6QjZ6sacIG+1bzJSuIc1VBI60SPRsfjYVLbnnBcRVAvfk7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776101761; a=rsa-sha256; cv=none; b=e8Nwc/6g2su0NX23sdy1D2k1CwMNmafpVJF3PJtMtgrRGB1QcS4hphwo4Ac7ern/JUIbkm B4TAVkvC8VlTlcgZD14Q2os9XUVJQioko86GySJDsAMOrhm0Brbo9FM8I6Til1VajJ3qim F51I6Rt+NlFyKfYSii/2kZWg1lRsg3OfCJvN0tLf7CGfmpcMCnX360cZ87SRT5jmC24vzb rfLcZVCAXhKe6j9nlWriD98Z2hQ6U1vNTxwUUqw4Xq1h+fN0UePvH3lzYmJqHB+q+xx3Il dbgP0upCBUwi+4ytJBOPQtjRV2TZSyIrX1X7wJXf0wHPGq2EzTND0fQFgybNwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776101761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Y3ikc7Wx7GJU7oI9eRfDF8OtxgiCx5FdlEyoP76ZAA=; b=pSkWftkL+yApTnAiVJrUHe0T9eE6fYHz34u0dhZw2FwbRIT5847nUcLiZpcryegmbDwRKq xIY9RWJewszU8PLhzlFfY7PlOhdKZJPQtOmiEDVJZt5HgyITi+fXl7BoilPGb9/A0WytPp /3nTjZO5QeD8jfncm1RzZcWtcAxAS6rf9GSB5aaA8kL6L0U8hsHuEkJvhUIfm+evhTRfIx cIoGdaTVw67KI/5UKMDcKvv+6AVyOQ0TJiEZlc4Slx/LAVDE+CY1V0rmRIsFDgIefTQ3J/ C/emEdbkSK+vOnSEohJS8v0Np2pbCQQ27mm+65YJRZkfN/mk2Uw+8lz2tYuMYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvZM50KyVz1CkZ for ; Mon, 13 Apr 2026 17:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33c20 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 17:36:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 855507463e0d - stable/15 - fmax.3: Add caveat for going beyond C std requirements 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 855507463e0d3903d31aa7c084efbf4f819b5d63 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 17:36:01 +0000 Message-Id: <69dd2981.33c20.18a98019@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=855507463e0d3903d31aa7c084efbf4f819b5d63 commit 855507463e0d3903d31aa7c084efbf4f819b5d63 Author: Ed Maste AuthorDate: 2026-04-02 21:59:42 +0000 Commit: Ed Maste CommitDate: 2026-04-13 17:35:35 +0000 fmax.3: Add caveat for going beyond C std requirements libm's fmax and fmin family of functions treat +0.0 as greater than -0.0. This is not required by the C standard, so the user may not see this behaviour due to compiler optimization. PR: 294214 Reviewed by: fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56230 (cherry picked from commit 7764e9ca28a9702aed4ba7391e055ec2fcf35c41) --- lib/msun/man/fmax.3 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/msun/man/fmax.3 b/lib/msun/man/fmax.3 index 25fc9b6d518a..873a19375ce5 100644 --- a/lib/msun/man/fmax.3 +++ b/lib/msun/man/fmax.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 29, 2004 +.Dd April 6, 2026 .Dt FMAX 3 .Os .Sh NAME @@ -68,10 +68,6 @@ functions return the smaller of .Fa x and .Fa y . -They treat -.Li +0.0 -as being larger than -.Li -0.0 . If one argument is an \*(Na, then the other argument is returned. If both arguments are \*(Nas, then the result is an \*(Na. These routines do not raise any floating-point exceptions. @@ -90,6 +86,13 @@ and .Fn fminl functions conform to .St -isoC-99 . +.Sh CAVEATS +The library implementations of these functions treat +.Li +0.0 +as being larger than +.Li -0.0 . +This behavior is not specified by the C standard, is not portable, +and may not occur in light of compiler optimizations. .Sh HISTORY These routines first appeared in .Fx 5.3 . From nobody Mon Apr 13 17:39:31 2026 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 4fvZR74zgzz6ZT66 for ; Mon, 13 Apr 2026 17:39: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvZR749Zxz3Qkx for ; Mon, 13 Apr 2026 17:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776101971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4yKG7yK9SrgBflYGZ4zUmQjgGpvpJXhi6Qr9KI4jeYk=; b=FnMZ46Txbm5nUjgN9TLG4rZUsWD+xbbMpvh3RpQsG+iCk0AeUc66tjtDyGAzH7vFa4Ljc0 u+ty7a0dyvq6hQSgZtmr7vpPSHvw8YKdWfGB7VzejK7goT6m0HO0XAf8sqLkkTVSS6cIhi xSpK5/GPCR6ZfZ341oO2t/hpxTqE8OxeJxPD+qnpr2GTb0wpE/HiGlLv+Lt7xznkXwMv/X hlX4vVkEY53yXs6fySTGbpNxrwNf/XCmIVxIU5j4MLIu1SlJURegchFtEwbWDlJNqn9oh3 ge1biUMQB9O8NThDPpNlLqVEu8KyJ+/whJ07Pebo1SWbg/iporEl3NKJN4z9OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776101971; a=rsa-sha256; cv=none; b=Sx4tKsrpmNq7FwRoHLGjLHlYnsX5/43UzEGOWxLM2BX17XtSf1A6lSg97vP9ewp8eCd52p VmwCIvcny8ibcRYHTVUB8DG+U1WIH1DkuEH8hlaMHOiu4XDeYPu3hqi2DIXC3zsVK4GAPi g+EsdbxpEiLYLottjeuXHUsOR4D/oOCZZEE2Y2fk9+vMuu8KNuy637ufjtsx+XunFKPkrh vI0euAeHk7Z5wMElYMndJJjJSEZZMCVcZS+DIyKlURrKloQPhlFG7MhPHMwlnl1lUpKtWO EY8Yv+SSmTvKYqx3XIHsp6OlglbOGa3PBokxz1KMSNyWfIQDXI9Y20Uqpk/1ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776101971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4yKG7yK9SrgBflYGZ4zUmQjgGpvpJXhi6Qr9KI4jeYk=; b=REMtzlbF9AZC2dc8rqodIQWbM7jlCp6HtLAB0to9mbT+TIkZGM2RCAS7mGyk44OsBptOpX 4tfQXhcahMAbvwOIokAJF9OzUwImPTK4t+D2i5JDoTDm+rv8IqGNRBpQ7GU0P9YEGMHhae dIx6hIULMP/opJse9AGwKTEzxkvwmx5t1yHp35FWduMC3bRwnWEufTH324uBzkX6jankP/ KyrSgqGizVfEtm+Ibt5LXnZyh8Ar27LI8nWylSgwVYAVeb5Cn0TXG9L4vT+aa+zW9utI13 Q2RToaysvdQpmB9u/9R4elXSlYEitXkPgWp26lzrM7MX19yINuAO48d5xbAimQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvZR73jNNz1CyG for ; Mon, 13 Apr 2026 17:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32d39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 17:39:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 84e7cd491fdf - stable/15 - tunefs: Better fix for arm64 alignment issues 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 84e7cd491fdfaa5c2f09e2e79d637c334c12d419 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 17:39:31 +0000 Message-Id: <69dd2a53.32d39.583088ec@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=84e7cd491fdfaa5c2f09e2e79d637c334c12d419 commit 84e7cd491fdfaa5c2f09e2e79d637c334c12d419 Author: Dag-Erling Smørgrav AuthorDate: 2026-04-07 13:54:28 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-13 17:39:24 +0000 tunefs: Better fix for arm64 alignment issues Rather than trust that the compiler will lay out the stack frame the way we expect it to, use a union to force the correct alignment. MFC after: 1 week Fixes: 616f47f176c3 ("tunefs: Fix alignment warning on arm64") Reviewed by: kevans, mckusick Differential Revision: https://reviews.freebsd.org/D56245 (cherry picked from commit 8244dd326265867293b2286efc3d571f06ef0dab) tunefs: Fix pointer arithmetic While here, remove a bogus const which has been there for years. MFC after: 1 week Reported by: ivy@ Fixes: 1b83e8a3f840 ("Constify string pointers.") Fixes: 8244dd326265 ("tunefs: Better fix for arm64 alignment issues") Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D56343 (cherry picked from commit 9d95d806691e4ef1411c6c3b892d8b774754d724) --- sbin/tunefs/tunefs.c | 64 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c index 56f343a5a4db..f3e9306f8ca1 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -51,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -72,6 +74,11 @@ static int journal_alloc(int64_t size); static void journal_clear(void); static void sbdirty(void); +typedef union { + char buf[MAXBSIZE]; + struct direct dir; +} dirblock; + int main(int argc, char *argv[]) { @@ -631,16 +638,17 @@ journal_balloc(void) static ino_t dir_search(ufs2_daddr_t blk, int bytes) { - char block[MAXBSIZE]; + dirblock block; struct direct *dp; int off; - if (bread(&disk, fsbtodb(&sblock, blk), block, bytes) <= 0) { + if (bread(&disk, fsbtodb(&sblock, blk), &block, bytes) <= 0) { warn("Failed to read dir block"); return (-1); } for (off = 0; off < bytes; off += dp->d_reclen) { - dp = (struct direct *)(uintptr_t)&block[off]; + assert(off % alignof(struct direct) == 0); + dp = (struct direct *)(uintptr_t)(block.buf + off); if (dp->d_reclen == 0) break; if (dp->d_ino == 0) @@ -700,12 +708,13 @@ journal_findfile(void) } static void -dir_clear_block(const char *block, off_t off) +dir_clear_block(dirblock *block, off_t off) { struct direct *dp; for (; off < sblock.fs_bsize; off += DIRBLKSIZ) { - dp = (struct direct *)(uintptr_t)&block[off]; + assert(off % alignof(struct direct) == 0); + dp = (struct direct *)(uintptr_t)(block->buf + off); dp->d_ino = 0; dp->d_reclen = DIRBLKSIZ; dp->d_type = DT_UNKNOWN; @@ -721,21 +730,23 @@ static int dir_insert(ufs2_daddr_t blk, off_t off, ino_t ino) { struct direct *dp; - char block[MAXBSIZE]; + dirblock block; - if (bread(&disk, fsbtodb(&sblock, blk), block, sblock.fs_bsize) <= 0) { + assert((size_t)sblock.fs_bsize <= sizeof(block)); + if (bread(&disk, fsbtodb(&sblock, blk), &block, sblock.fs_bsize) <= 0) { warn("Failed to read dir block"); return (-1); } - bzero(&block[off], sblock.fs_bsize - off); - dp = (struct direct *)(uintptr_t)&block[off]; + assert(off % alignof(struct direct) == 0); + bzero(block.buf + off, sblock.fs_bsize - off); + dp = (struct direct *)(uintptr_t)(block.buf + off); dp->d_ino = ino; dp->d_reclen = DIRBLKSIZ; dp->d_type = DT_REG; dp->d_namlen = strlen(SUJ_FILE); bcopy(SUJ_FILE, &dp->d_name, strlen(SUJ_FILE)); - dir_clear_block(block, off + DIRBLKSIZ); - if (bwrite(&disk, fsbtodb(&sblock, blk), block, sblock.fs_bsize) <= 0) { + dir_clear_block(&block, off + DIRBLKSIZ); + if (bwrite(&disk, fsbtodb(&sblock, blk), &block, sblock.fs_bsize) <= 0) { warn("Failed to write dir block"); return (-1); } @@ -749,15 +760,16 @@ dir_insert(ufs2_daddr_t blk, off_t off, ino_t ino) static int dir_extend(ufs2_daddr_t blk, ufs2_daddr_t nblk, off_t size, ino_t ino) { - char block[MAXBSIZE]; + dirblock block; - if (bread(&disk, fsbtodb(&sblock, blk), block, + assert((size_t)sblock.fs_bsize <= sizeof(block)); + if (bread(&disk, fsbtodb(&sblock, blk), &block, roundup(size, sblock.fs_fsize)) <= 0) { warn("Failed to read dir block"); return (-1); } - dir_clear_block(block, size); - if (bwrite(&disk, fsbtodb(&sblock, nblk), block, sblock.fs_bsize) + dir_clear_block(&block, size); + if (bwrite(&disk, fsbtodb(&sblock, nblk), &block, sblock.fs_bsize) <= 0) { warn("Failed to write dir block"); return (-1); @@ -846,19 +858,17 @@ journal_insertfile(ino_t ino) static int indir_fill(ufs2_daddr_t blk, int level, int *resid) { - char indirbuf[MAXBSIZE]; - ufs1_daddr_t *bap1; - ufs2_daddr_t *bap2; + union { + char buf[MAXBSIZE]; + ufs1_daddr_t ufs1; + ufs2_daddr_t ufs2; + } indir = { 0 }; + ufs1_daddr_t *bap1 = &indir.ufs1; + ufs2_daddr_t *bap2 = &indir.ufs2; ufs2_daddr_t nblk; - int ncnt; - int cnt; - int i; + int cnt = 0, ncnt; - bzero(indirbuf, sizeof(indirbuf)); - bap1 = (ufs1_daddr_t *)(uintptr_t)indirbuf; - bap2 = (void *)bap1; - cnt = 0; - for (i = 0; i < NINDIR(&sblock) && *resid != 0; i++) { + for (int i = 0; i < NINDIR(&sblock) && *resid != 0; i++) { nblk = journal_balloc(); if (nblk <= 0) return (-1); @@ -875,7 +885,7 @@ indir_fill(ufs2_daddr_t blk, int level, int *resid) } else (*resid)--; } - if (bwrite(&disk, fsbtodb(&sblock, blk), indirbuf, + if (bwrite(&disk, fsbtodb(&sblock, blk), indir.buf, sblock.fs_bsize) <= 0) { warn("Failed to write indirect"); return (-1); From nobody Mon Apr 13 17:39:40 2026 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 4fvZRK09tYz6ZT1w for ; Mon, 13 Apr 2026 17:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvZRJ6H4hz3R0x for ; Mon, 13 Apr 2026 17:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776101980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mra76PogTbD9AQaQ5voP03GpKaXJESlU4tQIvZU5CYg=; b=OjtpUr+EF5zPvPgiio5MId4O4SpHPzmgJxATJjLcvdHm6e9FgzRGfYckHZRQl4rtkU+he+ jso5aYizzwxzDOgwRDIHMnom+SAm9xrWidll3XKHqW9RYv6C7mQmvZBk8sMvkxDodVdduh FD1sU5NlQil0z6Wjgx5bvNY0z15BYOf9H0VPUly8g58QBHwKe0J6jLBHXHspwOSi1FcEWo 0OMy7W7vPUBIavUnXFl2ACjuJmrqYRgU0Q7V+MNvXmWv+DS5FkTKTC5YzH81r7demteNcS B5psK0gEWL4H696kt3vAOYPa+MmWbWu2bsOFxNa9zzXFWYK2LHraF2EtTQLWLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776101980; a=rsa-sha256; cv=none; b=SgkTHlSLTBiwIqRNNqkYKVsZsZp5sW8ILIdlyRX+Op7bU+ZDC2O6wLXWHfBlF1l5OpgEMZ jpAmMibNs1eze4KvVRx4X5+FXShTGBO2vvzcjXvFPx6hiTvLFEkN1bdEyCOt9vFAgzCXuZ frKDTstSJJYTuUFwb1TTJGtEnUfW5ZszcdJ2pj3w0OJ62s56UGNxxGKiRDeEptYr6NmSpb 25WZR4mMqvsXv5rVlNxschIU5DEdCyRGYhD8nfW9GTo9MQV76bbr8vACiu7F7RMqGiz6aT kOlBm+N6d5pPM3zmZGOBOC0z+bqw8TCnIAGFpjfzXjZCFFa3aSX1nJeayp4pAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776101980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mra76PogTbD9AQaQ5voP03GpKaXJESlU4tQIvZU5CYg=; b=rUZJGJWAzF1t0ZQaPIK235Lv1t2xBgTIHUCdt/h/l4Ngl5feCVV5YiOTOKrslvt0cmY4pB vC+3RIa9m3bM5GgkomqY4VIj70wcpmN2tZuGu3/k4WHi1zJJITuz0E1XeW1UUeadpgOROY LpkUXUkM+nM83bl9LIDt4vXTx61XeEezw8kFe+8Iodu9EaRttCuH6fzqL3eIZB52OvM3gO tUXS/i2MLP7nygVPvGUww4jEZfI/qK/zRUGN0a/ym+ajSGSu2A5LlpL8V2wdTOTzHYAgvg bYMUSd1t4eLx4Lr5X610jdY2t5X+k0DhKS8R51iZ6a9jW5MGghlt0fiM3w+Jeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvZRJ5sdvz1CNF for ; Mon, 13 Apr 2026 17:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 342b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 17:39:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: c4266d84c56f - stable/14 - tunefs: Better fix for arm64 alignment issues 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c4266d84c56f845945349a83801d99ca9ecf5d3a Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 17:39:40 +0000 Message-Id: <69dd2a5c.342b0.4e5c1108@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c4266d84c56f845945349a83801d99ca9ecf5d3a commit c4266d84c56f845945349a83801d99ca9ecf5d3a Author: Dag-Erling Smørgrav AuthorDate: 2026-04-07 13:54:28 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-13 17:39:36 +0000 tunefs: Better fix for arm64 alignment issues Rather than trust that the compiler will lay out the stack frame the way we expect it to, use a union to force the correct alignment. MFC after: 1 week Fixes: 616f47f176c3 ("tunefs: Fix alignment warning on arm64") Reviewed by: kevans, mckusick Differential Revision: https://reviews.freebsd.org/D56245 (cherry picked from commit 8244dd326265867293b2286efc3d571f06ef0dab) tunefs: Fix pointer arithmetic While here, remove a bogus const which has been there for years. MFC after: 1 week Reported by: ivy@ Fixes: 1b83e8a3f840 ("Constify string pointers.") Fixes: 8244dd326265 ("tunefs: Better fix for arm64 alignment issues") Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D56343 (cherry picked from commit 9d95d806691e4ef1411c6c3b892d8b774754d724) --- sbin/tunefs/tunefs.c | 64 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c index 4dbdaf3db574..ae52143beeaf 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -56,6 +56,7 @@ static char sccsid[] = "@(#)tunefs.c 8.2 (Berkeley) 4/19/94"; #include #include +#include #include #include #include @@ -63,6 +64,7 @@ static char sccsid[] = "@(#)tunefs.c 8.2 (Berkeley) 4/19/94"; #include #include #include +#include #include #include #include @@ -84,6 +86,11 @@ static int journal_alloc(int64_t size); static void journal_clear(void); static void sbdirty(void); +typedef union { + char buf[MAXBSIZE]; + struct direct dir; +} dirblock; + int main(int argc, char *argv[]) { @@ -643,16 +650,17 @@ journal_balloc(void) static ino_t dir_search(ufs2_daddr_t blk, int bytes) { - char block[MAXBSIZE]; + dirblock block; struct direct *dp; int off; - if (bread(&disk, fsbtodb(&sblock, blk), block, bytes) <= 0) { + if (bread(&disk, fsbtodb(&sblock, blk), &block, bytes) <= 0) { warn("Failed to read dir block"); return (-1); } for (off = 0; off < bytes; off += dp->d_reclen) { - dp = (struct direct *)(uintptr_t)&block[off]; + assert(off % alignof(struct direct) == 0); + dp = (struct direct *)(uintptr_t)(block.buf + off); if (dp->d_reclen == 0) break; if (dp->d_ino == 0) @@ -712,12 +720,13 @@ journal_findfile(void) } static void -dir_clear_block(const char *block, off_t off) +dir_clear_block(dirblock *block, off_t off) { struct direct *dp; for (; off < sblock.fs_bsize; off += DIRBLKSIZ) { - dp = (struct direct *)(uintptr_t)&block[off]; + assert(off % alignof(struct direct) == 0); + dp = (struct direct *)(uintptr_t)(block->buf + off); dp->d_ino = 0; dp->d_reclen = DIRBLKSIZ; dp->d_type = DT_UNKNOWN; @@ -733,21 +742,23 @@ static int dir_insert(ufs2_daddr_t blk, off_t off, ino_t ino) { struct direct *dp; - char block[MAXBSIZE]; + dirblock block; - if (bread(&disk, fsbtodb(&sblock, blk), block, sblock.fs_bsize) <= 0) { + assert((size_t)sblock.fs_bsize <= sizeof(block)); + if (bread(&disk, fsbtodb(&sblock, blk), &block, sblock.fs_bsize) <= 0) { warn("Failed to read dir block"); return (-1); } - bzero(&block[off], sblock.fs_bsize - off); - dp = (struct direct *)(uintptr_t)&block[off]; + assert(off % alignof(struct direct) == 0); + bzero(block.buf + off, sblock.fs_bsize - off); + dp = (struct direct *)(uintptr_t)(block.buf + off); dp->d_ino = ino; dp->d_reclen = DIRBLKSIZ; dp->d_type = DT_REG; dp->d_namlen = strlen(SUJ_FILE); bcopy(SUJ_FILE, &dp->d_name, strlen(SUJ_FILE)); - dir_clear_block(block, off + DIRBLKSIZ); - if (bwrite(&disk, fsbtodb(&sblock, blk), block, sblock.fs_bsize) <= 0) { + dir_clear_block(&block, off + DIRBLKSIZ); + if (bwrite(&disk, fsbtodb(&sblock, blk), &block, sblock.fs_bsize) <= 0) { warn("Failed to write dir block"); return (-1); } @@ -761,15 +772,16 @@ dir_insert(ufs2_daddr_t blk, off_t off, ino_t ino) static int dir_extend(ufs2_daddr_t blk, ufs2_daddr_t nblk, off_t size, ino_t ino) { - char block[MAXBSIZE]; + dirblock block; - if (bread(&disk, fsbtodb(&sblock, blk), block, + assert((size_t)sblock.fs_bsize <= sizeof(block)); + if (bread(&disk, fsbtodb(&sblock, blk), &block, roundup(size, sblock.fs_fsize)) <= 0) { warn("Failed to read dir block"); return (-1); } - dir_clear_block(block, size); - if (bwrite(&disk, fsbtodb(&sblock, nblk), block, sblock.fs_bsize) + dir_clear_block(&block, size); + if (bwrite(&disk, fsbtodb(&sblock, nblk), &block, sblock.fs_bsize) <= 0) { warn("Failed to write dir block"); return (-1); @@ -858,19 +870,17 @@ journal_insertfile(ino_t ino) static int indir_fill(ufs2_daddr_t blk, int level, int *resid) { - char indirbuf[MAXBSIZE]; - ufs1_daddr_t *bap1; - ufs2_daddr_t *bap2; + union { + char buf[MAXBSIZE]; + ufs1_daddr_t ufs1; + ufs2_daddr_t ufs2; + } indir = { 0 }; + ufs1_daddr_t *bap1 = &indir.ufs1; + ufs2_daddr_t *bap2 = &indir.ufs2; ufs2_daddr_t nblk; - int ncnt; - int cnt; - int i; + int cnt = 0, ncnt; - bzero(indirbuf, sizeof(indirbuf)); - bap1 = (ufs1_daddr_t *)(uintptr_t)indirbuf; - bap2 = (void *)bap1; - cnt = 0; - for (i = 0; i < NINDIR(&sblock) && *resid != 0; i++) { + for (int i = 0; i < NINDIR(&sblock) && *resid != 0; i++) { nblk = journal_balloc(); if (nblk <= 0) return (-1); @@ -887,7 +897,7 @@ indir_fill(ufs2_daddr_t blk, int level, int *resid) } else (*resid)--; } - if (bwrite(&disk, fsbtodb(&sblock, blk), indirbuf, + if (bwrite(&disk, fsbtodb(&sblock, blk), indir.buf, sblock.fs_bsize) <= 0) { warn("Failed to write indirect"); return (-1); From nobody Mon Apr 13 17:39:46 2026 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 4fvZRQ6Bj0z6ZT8J for ; Mon, 13 Apr 2026 17:39: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvZRQ4c0pz3RJ4 for ; Mon, 13 Apr 2026 17:39:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776101986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XBYKfig8z6uRpzf+oDypTQP8ILhhCXL2flRgzCv7T5M=; b=J4EeXwUg8/Mf1F+WTsyC3akhRg/e3dcTih+aP3ueuKUUxDBFE/PnuG17gaKyAjdiK09kms ktYofddy3ayKr9KgUz5qgpjAEVQSrYsLep5AGU6qLaaCh0ADpXiRrrgvLMPSa5C5n1I0NP wXPRKtIRGJZ9oyTnx0dbGRd0Rw96uN+ZBby//iNEjB/Bd/4pNIQHIKi1iamtiGNtcZNZ7K Zx6X4ExAmItaNxxdvwXrAVD+DEY3ufPnmqo3CeXerDszGF7XZdl+oVO5JFNIoHjltCKj8u K409ZS+D5TpKpTxJe6KExAYUX5Dz5k2VSvaEJ3jKnnewN+tO/yqkiUyZY3EuCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776101986; a=rsa-sha256; cv=none; b=oa9NfwKfovoEv6VtVMJFF85T6SA6t2t399Ja8W+rbm/iQsKg2JDtwCI4YXf+L9La4uPo07 y+hbAtxsaqvlqtgujyeAUcvw2vFPc8pvbaAa6wTC70+UQ807eQKwKT9KWNCyJ6K8ad3aon z3Fvn0RfbnyEQexQkb1IAZ+yGATsVKT3ccfFDFw2bzC7HKL/4Uf/75yB8dfOu8yzmcAcQ2 pYwydhWLxMNw7kWmN6iKLVWgu1o67Y0IRfZc3JYm0jDmPPAAY87Ptu8VpDpy+t/h6moR+W CxxdqCmrd/WkxddzWYiEt3xrkKVqGr1vIa6fTXpd9i3ysxsohkYxKSZYLMdANg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776101986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XBYKfig8z6uRpzf+oDypTQP8ILhhCXL2flRgzCv7T5M=; b=vIMXafddhbF+SyC7BBt2/A0Zvp76t73qDoxCG1iyupglBpjac7Bh3inS1Br7w/K+ftpE6f ywrgginHHjrUdW1Q9PYr+lIDB1wEtRuNPRpmGDtSy5YqzPamhD6aFxt3/2QAU2dXzcQrAQ rsVHsNEED3V8xtfJiiiLD62qXwgQ2WMa08XpgcXSlo329Iu7a1j9dJGefkADJrj4gLqMms A9aYcvIBq3GD7626lk5LTJdsypo4Mp6goVOpWMUj9EkuuWzGzGn79ul1RGQCOPjxQmF9yt ImZVopRKXnlOKeLna89tNwHIwOzMFrCIVLo8jdBC4eApWLYgXeCrDCGjJDW/CA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvZRQ3ycJz1Cjx for ; Mon, 13 Apr 2026 17:39:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32a39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 17:39:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Kyle Evans Subject: git: b06d6b9ebbc6 - stable/15 - kqueue_fork_copy_knote(): zero kn_knlist for the copy before calling knlist_add() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: b06d6b9ebbc6d2681cecc15bd6c1ece6a816ef73 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 17:39:46 +0000 Message-Id: <69dd2a62.32a39.2e3e3f57@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b06d6b9ebbc6d2681cecc15bd6c1ece6a816ef73 commit b06d6b9ebbc6d2681cecc15bd6c1ece6a816ef73 Author: Konstantin Belousov AuthorDate: 2026-04-02 11:02:14 +0000 Commit: Kyle Evans CommitDate: 2026-04-13 17:39:41 +0000 kqueue_fork_copy_knote(): zero kn_knlist for the copy before calling knlist_add() Reported by: pho, dhw Sponsored by: The FreeBSD Foundation (cherry picked from commit aab1ef4527f1b0935add3e8dba9e928e0623376f) --- sys/kern/kern_event.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 4db5c6669470..01731ca46b6b 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -3092,6 +3092,7 @@ kqueue_fork_copy_knote(struct kqueue *kq1, struct knote *kn, struct proc *p1, kn1->kn_status |= KN_DETACHED; kn1->kn_status &= ~KN_QUEUED; kn1->kn_kq = kq1; + kn1->kn_knlist = NULL; error = fop->f_copy(kn1, p1); if (error != 0) { knote_free(kn1); From nobody Mon Apr 13 17:43:20 2026 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 4fvZWX3hMVz6ZT75 for ; Mon, 13 Apr 2026 17:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvZWX2wZpz3SXd for ; Mon, 13 Apr 2026 17:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776102200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p7Qk3/Bsa+8JbHlLEpAZEpkfHGAzD9/RXQzg7vutvkc=; b=GU4a8vbJU/0TzI9Q1p/g4s55zqVT9o3y8mCuFgzaEL//01aX8g93GWfga94+Pd0vnHxyg6 RprQZ0cJL0JbzvG11auQ9LcccnmYvC6FvCgM1L/oBVX8BFMZf1zunaVftaz/QK345WOhSX 7WFXx0EI8zd5e3oQ8AfTy1sLm2K6166Ku7TRK3PKG4J0BsDNsjZlXhsWjF6rsN/T9F+UUn jPh869Lr1PiEocsbcsj2xWKLaCfnNTotvCDl7kZ0BFEetO4ibaiV7ujZ5El8NkE01m7hyz LsOTZToU2JoH9wqhQgQOa3F+rsnSrEJyMKq84M8t8AoG7sK4stcjy2z7mUixQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776102200; a=rsa-sha256; cv=none; b=mynHTNbFDmUnX8MtWBITLpZq7XiLY87h6yjJYOFmftMRM3xj+TaLen+6SW/n756EgvGQ9w 025W3uTyHCUKhLzc3ERSGE16YR2ua3+zxgFZuhV15txe63aiYbg1w+ap8RUMAmIXJuuLRg TmNyUiC/y90gkdsGkNu7vzbNVokr3/OE3U0lWTmRYPgVyIrH81mRy3XTSaZ48t5E0KzLq5 X7034yWUbuZghfiHCMaqwSuId/IRgvHpZ0oGBQk6uOuH3z99J6ODggnv/PZvNSO4LUf3V9 5PZkrSSKpHG63/vcrTj/2dZLdF5dCpDAW/WcxS4gDFtX8uw3+bAKIShtLaxL2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776102200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p7Qk3/Bsa+8JbHlLEpAZEpkfHGAzD9/RXQzg7vutvkc=; b=ml2tB/gCtnjlA8xZUdgEoEHGd6DgoQHDtIRqbAb+g6cr6OcFmqac0LhZ4VThnTjKlcSwNL OhzEqUevgU7Fy/l1n6IYxCpb4KhjeYMbplGdexoBiUFJYzNnSJRq2qG9gbsN02dBVQn2cF QJU31e/tukSZ4rhTO2LhLp+xgf5FJYqu3Uoof8WCROeoUNeuV2vZ+diLaoYtn+9vhGag+W 9+xXf8SgOLyYH1urjbBQlvinhV2ydtUkLVJiCNYN9Azjxg0IBkyIQUSp1PmOEHS2lt/PzE puK5mgnnuhcBIxijyIqM3VFOrmuxPQ3KzA+YDahI4c2NpzZyoKGdRV9CDngHJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvZWX1p0Hz1CZG for ; Mon, 13 Apr 2026 17:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31d6f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 17:43:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: dc6149102509 - stable/14 - fmax.3: Add caveat for going beyond C std requirements 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: dc61491025091d9e61048cc3cfb18d25ed354a8b Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 17:43:20 +0000 Message-Id: <69dd2b38.31d6f.fc670d3@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=dc61491025091d9e61048cc3cfb18d25ed354a8b commit dc61491025091d9e61048cc3cfb18d25ed354a8b Author: Ed Maste AuthorDate: 2026-04-02 21:59:42 +0000 Commit: Ed Maste CommitDate: 2026-04-13 17:43:05 +0000 fmax.3: Add caveat for going beyond C std requirements libm's fmax and fmin family of functions treat +0.0 as greater than -0.0. This is not required by the C standard, so the user may not see this behaviour due to compiler optimization. PR: 294214 Reviewed by: fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56230 (cherry picked from commit 7764e9ca28a9702aed4ba7391e055ec2fcf35c41) (cherry picked from commit 855507463e0d3903d31aa7c084efbf4f819b5d63) --- lib/msun/man/fmax.3 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/msun/man/fmax.3 b/lib/msun/man/fmax.3 index 25fc9b6d518a..873a19375ce5 100644 --- a/lib/msun/man/fmax.3 +++ b/lib/msun/man/fmax.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 29, 2004 +.Dd April 6, 2026 .Dt FMAX 3 .Os .Sh NAME @@ -68,10 +68,6 @@ functions return the smaller of .Fa x and .Fa y . -They treat -.Li +0.0 -as being larger than -.Li -0.0 . If one argument is an \*(Na, then the other argument is returned. If both arguments are \*(Nas, then the result is an \*(Na. These routines do not raise any floating-point exceptions. @@ -90,6 +86,13 @@ and .Fn fminl functions conform to .St -isoC-99 . +.Sh CAVEATS +The library implementations of these functions treat +.Li +0.0 +as being larger than +.Li -0.0 . +This behavior is not specified by the C standard, is not portable, +and may not occur in light of compiler optimizations. .Sh HISTORY These routines first appeared in .Fx 5.3 . From nobody Mon Apr 13 17:44:05 2026 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 4fvZXW0YGsz6ZTZr for ; Mon, 13 Apr 2026 17:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvZXV69scz3T8Q for ; Mon, 13 Apr 2026 17:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776102250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXPkSylKhPbXyH4cpV9pKiXfCGc0GlIKd1ilNGNz5ks=; b=F8eDotVWNIz2HlkpjpbCe+OfIPvCPiwyeGMBt8h8huyeiVUzLsMBBkF9laiLDPIaNnsmml FQ0cGkYKeyXa4MiriG+vXu7dsddW939WrxW4vhYOJKalx7z8/GbJGjLK6ua5rVpZpR8aI/ KNiKwvNAyz92pXUmiAaCLaD3Xh2cZWCqRMbkP53AQ2SZEwOgXPW2mJELrKtnAvo+D3Acqq BeTX5vM1fAGviyrBWs6066hioMkkiWFbtZDgjZbYkGEA+BARh2eL793as4/eDpqnC2T/Qq 8fuuewd8qcQlZlUBYpbaSbpT5vdRsBvq/O46sQ+9wLZbxN5ZqFsQaoJFpxeETw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776102250; a=rsa-sha256; cv=none; b=PMNz0zwaoX2QevVT3AqtvJ0W3gSwJQqFRyaQmls2QsfMFDiBdjk2BV28PTAszOfGld4EcA 63hge0AdvlO7qRnsh060ODSNt/3l/chyCU2GlafMuCxyiB97xvFIwTg+6jEpexJVz4NRV2 YxfFYlT12yoXgSB0usDx8sypr6IJGGWpEt8Kx3hNVYmaNV8xENwWex1vXr6OA4h3LuWhNi nY4Lcgxf6j47eASLSrn1HansmTdFpykpDqYnas6gv/l1iEkOc7TbN5ljL/MD2ILVS+qpju fB6S9kgz+NXe5F4w3OXyolk5NwJY8jFOAXPnb3JNcmD9ilTZyqRhty47ct8phA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776102250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXPkSylKhPbXyH4cpV9pKiXfCGc0GlIKd1ilNGNz5ks=; b=iFkJRQ0IXDCYMDT2j1IXC7lkl6nJuAenMs2a5OkE5WpUzivG2P2qTBTh+h1TofFlDkqje4 CgC/05UhaWYCYCEKbeW5EFTz3ZR3qRsuaPLMZ24yEPJSNchy8y5zms79NqEpTCy6cN2GA2 GAmXltrx6kp7tofgcztCvGbI5RSTpT1pojmHIpdcQkvnZCVNxoc+6fYkajOaTG6cOIBE6C 8E7fzyPdevHC8XoyD5UXp+cVRSFTJwxpgDEpincV6TJXl8v21NP7/XBvgjN2RTU4pRsG9u HH+VWFoZWJgRZARWyzu1chwsBCjEPOJYJzqM/6LZkF63Js6MVdeNkzz1EBJFoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvZXV5l8Pz1P for ; Mon, 13 Apr 2026 17:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35f35 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 17:44:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8b8ae24e08c9 - stable/15 - stand: Force disable RETPOLINE for boot loaders 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 8b8ae24e08c97623cfc464394ca85f86db38bdff Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 17:44:05 +0000 Message-Id: <69dd2b65.35f35.76c14434@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8b8ae24e08c97623cfc464394ca85f86db38bdff commit 8b8ae24e08c97623cfc464394ca85f86db38bdff Author: Ed Maste AuthorDate: 2026-03-24 14:53:13 +0000 Commit: Ed Maste CommitDate: 2026-04-13 17:43:47 +0000 stand: Force disable RETPOLINE for boot loaders Boot loaders do not require speculative execution protection, and may be too large if enabled. Reported by: Shawn Webb Reviewed by: dim, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56068 (cherry picked from commit 61f78130c2f3a6abaa70bd66d6d6974060fb3d04) --- stand/defs.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/stand/defs.mk b/stand/defs.mk index eb4133b604eb..2cf1893a6159 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -11,6 +11,7 @@ FORTIFY_SOURCE= 0 MK_CTF= no MK_SSP= no MK_PIE= no +MK_RETPOLINE= no MK_ZEROREGS= no MAN= .if !defined(PIC) From nobody Mon Apr 13 19:54:50 2026 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 4fvdRH15Lrz6Zd3c for ; Mon, 13 Apr 2026 19:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvdRG4mTCz3myW for ; Mon, 13 Apr 2026 19:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fv1Zc2ttNVQiGwnLyUDSDwGPzl3/ZjpUUA23vpefWv0=; b=A1DEYoWNLkmMk9GkU7txW3Tv0NnbbqGe0PAs2hRf/N0is7rwtqdlGcDmA8fz2rFIwvLLXr GdTkOwArrqYtlECPz8zakF6cDeb4KdOOQRWOsShNZLsAWoccCHzdY7Ui2R72p7QYNfnLOS +WpYWyJWm4I79znDfusn+LsUvQ9DhFr5nXePq/wa5EWyJZPc+W08zDICPnSPIKWXAKjDMA Tgp1ztgm7D8ONqc5odwfG65VnRu6gH25Bukly9PFe2MX++1M7JkScX3y+WtcbQ1kBUmd2l XENTkNOjrgIOEEF922kJBnAfhT3r8A9RaZOWVOULHh4TcIgRBT6bBZri2vTstQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776110090; a=rsa-sha256; cv=none; b=Ikv4Bo8TBOouGqDbYMftlWbS1aYDqnZ/RXS0dUxVN03/AlLAPJQ6GvJ8AIeouGfa7rDUAl viTueoE9mAwlPbeW1d0V8HWmbwFy9T1u98sZmFf0M3GFT0HWf4fkBG2l9I0YZ2eArVUiFc jZqxbKrJzw3gaGpIbwueBNfMJYWIVWUjXXYaECNtbWMPMYr6ReAAroC7v2lc4A1WZc8EFN BdK3Cw+wVlCUDQgCbSyHqBvcDzNZpaiNSLBEKsOlZX6oYxJUCPDWgHoJLElMu1uwZv1BDy OTWtYe1hyjqUNbACwlOHlKXoYqzMr8WLAPpyezHfX2K18lVZsei5d0Z+EYUK6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fv1Zc2ttNVQiGwnLyUDSDwGPzl3/ZjpUUA23vpefWv0=; b=l4E1nlh90T6aehIFYb3FmHQP2R3b5gYQLewa80wO/O2YXpRfutr2clbZux/G6XseDFV5QY Om1BOjC68BmRsbsQRx3b0eAgEoviHK2GXFDLmq7V2mCwW0K4MxmpBB6J7L3HVn2+6q/SJ0 necI+M9dXcN7DST4VdDHNLoI5OciLYpIoz0j9PpJcDpepoDZQe9HFcO4/7vvdVf5gC/bUT 8FKr5RRRkxGSanhPwwbnCbVFTotH9JDVw3cST6E/75Zib8VMNQ41spsfSaCrWk3CYHar71 ZciB6AoWHdooYFkTQsE+rrPJT/iVrbcu2KivJlPuplloFP4XwttR+jVegH73Vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvdRG40Bgz2vZ for ; Mon, 13 Apr 2026 19:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41b2d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 19:54:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Matt Delco From: Alexander Ziaee Subject: git: 4d6fb9d57b8a - stable/15 - nvme: Removed unused 'regs' 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4d6fb9d57b8aa77b0e5b9650540f3a01d4ef7972 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 19:54:50 +0000 Message-Id: <69dd4a0a.41b2d.11136efb@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=4d6fb9d57b8aa77b0e5b9650540f3a01d4ef7972 commit 4d6fb9d57b8aa77b0e5b9650540f3a01d4ef7972 Author: Matt Delco AuthorDate: 2026-03-10 19:30:51 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-13 19:54:16 +0000 nvme: Removed unused 'regs' variable The private struct has a 'regs' member that's only written to and otherwise unused. This change removes it. Fixes: b3d9e5013f3e5 (Don't active memory space) Requested by: jhb Reviewed by: imp, jhb, jrtc27 Differential Revision: https://reviews.freebsd.org/D55817 (cherry picked from commit 4e3beef84628ce6dfea7f053cddf3289fddf7794) --- sys/dev/nvme/nvme_ahci.c | 1 - sys/dev/nvme/nvme_pci.c | 1 - sys/dev/nvme/nvme_private.h | 2 -- 3 files changed, 4 deletions(-) diff --git a/sys/dev/nvme/nvme_ahci.c b/sys/dev/nvme/nvme_ahci.c index b06661226d34..dd005dd868de 100644 --- a/sys/dev/nvme/nvme_ahci.c +++ b/sys/dev/nvme/nvme_ahci.c @@ -79,7 +79,6 @@ nvme_ahci_attach(device_t dev) } ctrlr->bus_tag = rman_get_bustag(ctrlr->resource); ctrlr->bus_handle = rman_get_bushandle(ctrlr->resource); - ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle; /* Allocate and setup IRQ */ ctrlr->rid = 0; diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index 8e5e64e1f0e0..f2b9465294f6 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -225,7 +225,6 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) ctrlr->bus_tag = rman_get_bustag(ctrlr->resource); ctrlr->bus_handle = rman_get_bushandle(ctrlr->resource); - ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle; return (0); } diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 8b5737dfb72b..9cfe9c32b360 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -286,8 +286,6 @@ struct nvme_controller { struct nvme_qpair adminq; struct nvme_qpair *ioq; - struct nvme_registers *regs; - struct nvme_controller_data cdata; struct nvme_namespace ns[NVME_MAX_NAMESPACES]; From nobody Mon Apr 13 19:54:51 2026 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 4fvdRJ0wKnz6ZclL for ; Mon, 13 Apr 2026 19:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvdRH5GXnz3n1R for ; Mon, 13 Apr 2026 19:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IpIomQos7jTnl3xHA8YFcJW5iKePsVzMtalkscCHLLg=; b=ZEEPV/OD0jPNGQYAWdV639yFmgYM/5LbuIsN6dA+17UC6bKZkR1wByZEgh8ntZIXBA+nHV eZ+5bWtW0NNaX5zOecd6yBoLE2aXISOH3TDvXsiiemZdAkDCkX7sLQ76ijw7drKR0jtBx6 BnPjmtkQjktQp+TxFjLB/d90SqMsiE0OXouSXpUj4pFxv2XEzwwpjr05Kks5/WWAj9LsYF Jwx03M897zyisOEWvdHQY5Hh81l7YWuVRI9CRukzh1Hw7o4Mbo4hGhVbPWKBO8Mlr9cHWx SlLFLQQ5RW1vudIg6Kg9RqrUeG8TKMZPuUyhjFfKxpxkDmJSkfUrj14jyi4msw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776110091; a=rsa-sha256; cv=none; b=kWzwmj0MptZ1UXGUCaGdSsdCrwKr3KMDfMAxBFBDuLd6610pqgOculy3Z+gFNhfU1VMZ5B tMICCGkhlwCk/0c5rbFRX3Tg3Az5XbSudaQ9TrdZtDrQakTX0+uhXo5GWAlqIB2DPSDntY G31wVggXNpEVwLBbL9wuoRnrH6UC10Jl+se49qzjyW7ORauclLS7UyE5QmpnxxkLBbQAVz aSKd+tmzHxg3GvFMiKx3NZ3VwRWIbgCXDrK5Ly7MkU/Jnpfo7i4KNB5iTwx2j7DXv9CJgX TfykFmwShJ1zXBi/wTzMYjcIlCtpWI0BAlzUWr5jbPNI8RHjwVfg6K+G8z7J2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IpIomQos7jTnl3xHA8YFcJW5iKePsVzMtalkscCHLLg=; b=cZOAXaTDMP7UHCgLRTHNSXwcyuzQguMsHnGB+j4HphayKm/cpDPpzpHymjOuMDGn+yzyr8 fYid49Gz5Qo2fvxMGQmH16QcPRTmP9vUz2FSwsa/yqcecEqANBBOZYb/WZeGUlXy66aBKh DqU8sn7RNSTUVeyvGwmzJHgMkgs+BhFXNDS81Jo5M5ZeOTTMYZUZSgWBp7gKTcAFZwnhlc OiFp6KIWVYCOC7AcEF5JBQ3FC3nUvJt5gys7oG9uVC97Znc58JvZAwGKBt166VXac7K5bI FsiRozkO+ZfGLJdNJv8lSTLMKb618Av5GAPzKwwiM8sLeB5nf9QjlRe8mgSgvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvdRH4r0Fz2Ng for ; Mon, 13 Apr 2026 19:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41ed9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 19:54:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Matt Delco From: Alexander Ziaee Subject: git: b8429aca4cf7 - stable/15 - nvme: Replace bus_space_[read|write]_4 with bus_[read|write]_4 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b8429aca4cf7fae6b88e3bc1aa7309c8b79557c5 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 19:54:51 +0000 Message-Id: <69dd4a0b.41ed9.a703c36@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=b8429aca4cf7fae6b88e3bc1aa7309c8b79557c5 commit b8429aca4cf7fae6b88e3bc1aa7309c8b79557c5 Author: Matt Delco AuthorDate: 2026-03-10 20:12:56 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-13 19:54:16 +0000 nvme: Replace bus_space_[read|write]_4 with bus_[read|write]_4 The goal this change is to remove the use of the tag and handle needed by bus_space_[read|write]_4. Fixes: b3d9e5013f3e5 (Don't active memory space) Requested by: jhb Reviewed by: gallatin, imp, jhb, jrtc27 Differential Revision: https://reviews.freebsd.org/D55818 (cherry picked from commit 889d10d5b12050b4b3923917b5edeac85e8ca706) --- sys/dev/nvme/nvme_ahci.c | 2 -- sys/dev/nvme/nvme_pci.c | 3 --- sys/dev/nvme/nvme_private.h | 17 ++++++----------- sys/dev/nvme/nvme_qpair.c | 7 +++---- 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/sys/dev/nvme/nvme_ahci.c b/sys/dev/nvme/nvme_ahci.c index dd005dd868de..f85826db43b9 100644 --- a/sys/dev/nvme/nvme_ahci.c +++ b/sys/dev/nvme/nvme_ahci.c @@ -77,8 +77,6 @@ nvme_ahci_attach(device_t dev) ret = ENOMEM; goto bad; } - ctrlr->bus_tag = rman_get_bustag(ctrlr->resource); - ctrlr->bus_handle = rman_get_bushandle(ctrlr->resource); /* Allocate and setup IRQ */ ctrlr->rid = 0; diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index f2b9465294f6..143adfda7322 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -223,9 +223,6 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) } } - ctrlr->bus_tag = rman_get_bustag(ctrlr->resource); - ctrlr->bus_handle = rman_get_bushandle(ctrlr->resource); - return (0); } diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 9cfe9c32b360..d499c6f34ca8 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -225,8 +225,6 @@ struct nvme_controller { #define QUIRK_INTEL_ALIGNMENT 4 /* Pre NVMe 1.3 performance alignment */ #define QUIRK_AHCI 8 /* Attached via AHCI redirect */ - bus_space_tag_t bus_tag; - bus_space_handle_t bus_handle; int resource_id; struct resource *resource; @@ -331,20 +329,17 @@ struct nvme_controller { offsetof(struct nvme_registers, reg) #define nvme_mmio_read_4(sc, reg) \ - bus_space_read_4((sc)->bus_tag, (sc)->bus_handle, \ - nvme_mmio_offsetof(reg)) + bus_read_4((sc)->resource, nvme_mmio_offsetof(reg)) #define nvme_mmio_write_4(sc, reg, val) \ - bus_space_write_4((sc)->bus_tag, (sc)->bus_handle, \ - nvme_mmio_offsetof(reg), val) + bus_write_4((sc)->resource, nvme_mmio_offsetof(reg), val) #define nvme_mmio_write_8(sc, reg, val) \ do { \ - bus_space_write_4((sc)->bus_tag, (sc)->bus_handle, \ - nvme_mmio_offsetof(reg), val & 0xFFFFFFFF); \ - bus_space_write_4((sc)->bus_tag, (sc)->bus_handle, \ - nvme_mmio_offsetof(reg)+4, \ - (val & 0xFFFFFFFF00000000ULL) >> 32); \ + bus_write_4((sc)->resource, nvme_mmio_offsetof(reg), \ + (val) & 0xFFFFFFFF); \ + bus_write_4((sc)->resource, nvme_mmio_offsetof(reg) + 4, \ + ((val) & 0xFFFFFFFF00000000ULL) >> 32); \ } while (0); #define nvme_printf(ctrlr, fmt, args...) \ diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index f7dc231d74df..e31bf818ed35 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -476,8 +476,8 @@ _nvme_qpair_process_completions(struct nvme_qpair *qpair) } if (done) { - bus_space_write_4(qpair->ctrlr->bus_tag, qpair->ctrlr->bus_handle, - qpair->cq_hdbl_off, qpair->cq_head); + bus_write_4(qpair->ctrlr->resource, qpair->cq_hdbl_off, + qpair->cq_head); } return (done); @@ -1068,8 +1068,7 @@ nvme_qpair_submit_tracker(struct nvme_qpair *qpair, struct nvme_tracker *tr) bus_dmamap_sync(qpair->dma_tag, qpair->queuemem_map, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - bus_space_write_4(ctrlr->bus_tag, ctrlr->bus_handle, - qpair->sq_tdbl_off, qpair->sq_tail); + bus_write_4(ctrlr->resource, qpair->sq_tdbl_off, qpair->sq_tail); qpair->num_cmds++; } From nobody Mon Apr 13 19:54:52 2026 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 4fvdRK0mY6z6Zd3f for ; Mon, 13 Apr 2026 19:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvdRJ6JcQz3n3t for ; Mon, 13 Apr 2026 19:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZfOYi/P1vuuK4A0OvUSharopxbP63rnqrUSn42imH10=; b=eXmDeChLzw+sGIFgzQ1WDEdwPV23HueLRhecYnrJfK8OBMak7neYfMHLViNcy5htEaizWN SJx9vJin8WF2FcqvTljx+wyFAr9D2lgZtyVYW7qgMr0/+9qLtqoQ4yzuiiGCuTfmCZT5C2 uqf3gZUm2rYhiddKIH2nZXaXlFVAdjzHSlTD826PerNDgV/eCsCyhGKe181cbEoiLZFSoQ T1zBVA9n/dwfGY8SO6X0fAeRCxMZpNtEJ3/yBZWbsn5W4ulSPR/tWzon/69viYjJ3WReWs D6kGjS8tDfUrtSoipV3DgasPst751P6gjCtR3IMeunUzgA9CVL+VCp4PVek3wA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776110092; a=rsa-sha256; cv=none; b=u9sENVMzIQRNcJONKE5xg2kiZQv8wKdTffk98bC/3H6IbVh1ElAxDvZF+jAoDPEbekSzJZ 6O51+MNgxhNQComwApVmrWNOR2X9MbjJVLB5r0tFPUcsW4grAvqWGKNmS4c8sQuMCb/FDi TA1ok4BlZlFDAs7bm+2L5xGVI/b6b//MSxQnPLJWTuiYAColnfWoY447fuWxvwBa0QQwWR LczE3K3vjlOgxI/4h+xaKtIxNfzrCDrT8hS1zs+zAKSKoGy79nyVpHcnbxP4mA/10o+SkO VMiEmapRKNNKFRbUErVF5LNClJWEyBrNYhddXHmh3oZq7pzVfxI4hg2gdbjUdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZfOYi/P1vuuK4A0OvUSharopxbP63rnqrUSn42imH10=; b=piIhEWytxXAgZHIWn6xCO6pm8ll6WdSxCPCuaSnwMYvD9goBka6x97GKVCgk4IePycCl3m RwIkkBNj0Fj2XerS0VMZXhnZpv65ypcrH8IXXEbUYUpUuXRXnW9MiITYiYgjEn7ZrXiU8T lSERcKVa0fIv4injEpjrPaP4HsPCTJaKIdFrz3kqwq4QvxqtvYPJ3I+ECH3pb/ZrI22O+O i25NxZIM01mWZ5wDTIsbxwE7BNMbOfPgy5G2xRCow4z/4l2nrG8hd3IJEkqswpi24n3Lxj 4v3DG2GCbG+sFtys3X/8hkAjh2bH+2BlrgXqKMXLM9wqKZAp7+DujtQKVn/y9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvdRJ5fS6z3MZ for ; Mon, 13 Apr 2026 19:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 418ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 19:54:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Matt Delco From: Alexander Ziaee Subject: git: 296debec8856 - stable/15 - x86: Guard clock frequency against a divide by 0 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 296debec88562255349328e6b501d2687febc950 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 19:54:52 +0000 Message-Id: <69dd4a0c.418ff.2a004b63@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=296debec88562255349328e6b501d2687febc950 commit 296debec88562255349328e6b501d2687febc950 Author: Matt Delco AuthorDate: 2026-03-26 17:22:54 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-13 19:54:16 +0000 x86: Guard clock frequency against a divide by 0 We may be running in a Virtual Machine which may not fully support hardware performance counters. If the MPERF counter somehow ends up at zero, return an error and fail gracefully instead of panicking. This patch is part of Google Cloud Engine (GCE) C4-LSSD turnup. Sponsored by: Google Tested by: NetApp (previous) PR: 292808 MFC after: 3 days Co-authored-by: Aymeric Wibo Co-authored-by: Jim Mattson Suggested by: jrtc27 (split out this part) Reviewed by: imp, obiwac, olce Differential Revision: https://reviews.freebsd.org/D56056 (cherry picked from commit c505fc1468849150f48484b225b6476d8316de57) --- sys/x86/x86/cpu_machdep.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 5483fbd6dd4e..775fee97d3cd 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -425,6 +425,7 @@ cpu_est_clockrate(int cpu_id, uint64_t *rate) uint64_t tsc1, tsc2; uint64_t acnt, mcnt, perf; register_t reg; + int error = 0; if (pcpu_find(cpu_id) == NULL || rate == NULL) return (EINVAL); @@ -460,6 +461,11 @@ cpu_est_clockrate(int cpu_id, uint64_t *rate) acnt = rdmsr(MSR_APERF); tsc2 = rdtsc(); intr_restore(reg); + if (mcnt == 0) { + tsc_perf_stat = 0; + error = EOPNOTSUPP; + goto err; + } perf = 1000 * acnt / mcnt; *rate = (tsc2 - tsc1) * perf; } else { @@ -470,6 +476,7 @@ cpu_est_clockrate(int cpu_id, uint64_t *rate) *rate = (tsc2 - tsc1) * 1000; } +err: #ifdef SMP if (smp_cpus > 1) { thread_lock(curthread); @@ -478,7 +485,7 @@ cpu_est_clockrate(int cpu_id, uint64_t *rate) } #endif - return (0); + return (error); } /* From nobody Mon Apr 13 19:54:53 2026 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 4fvdRL25bnz6Zd7P for ; Mon, 13 Apr 2026 19:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvdRK6w0Rz3n6n for ; Mon, 13 Apr 2026 19:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EvqRckNRudgZaSNf8G+URjcW2nDQL4qutndL0AjvBpQ=; b=LuHZvvQpTTIrbRMQufmuIH3zQq35NkdmzdY0O2k3XhL6ivbYHhq/bfG+iEASWS2WW8Hhne 4V62zBNwqmM1zRm2AVQbmvZyz1ngWUIhj4/EyK0UjZh4I09nMrwK4nZCWw9O+NZWujS/0s bA/cVRbTd6R1z4/5Cw5JvJ5V/K9Stuu15ayzpMPxszasfzF1iIBsHq26BRlJNyLJSw2TTG YVF5f90G1V1FHw6majbbzLJMM+0hNomLReC28twDE2Uw+bmNUe6zbOEgm4RuJ/Tn5bJtTt uvO+F8P2a5B0n3H/j77Log+2wRraIn9gbS9n0r6nMT2lzEYBr0bePqO09O3P7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776110094; a=rsa-sha256; cv=none; b=W0tC8QDtDneUZFDTZpMU3DuIuZjX1FL5Fkpuagy1Ltx5+dL8/jhvWBSvvNGDyE8v1k2WjH lCvJvGKNZ59WhVLSezW/nTxKcJ/q4xHD6vqOotQUFRNtSnEoGSR89ww+o4ZNgfrIjsgAVy FqHiIY+7IUc+afJamhfNGjPA6NaxpnCZ9RGWHXfwsrAnCP7N/jx1lLuIMtJzHahifFNKBW AKT7Zm7NWr4PG4iI5FxuBWRZNBdhAUxLKgca8Jm+0qG++PD/hcX3MmKN+dyCKBo/2cxER8 efqWrXHSCijsrs/0GxDq7Z8nDzCc3nbldLRWxbNUxafGJ+lmE7U5ki+OTif7Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EvqRckNRudgZaSNf8G+URjcW2nDQL4qutndL0AjvBpQ=; b=ob1eBWzuqauIKbhuBvcVvu8aAbXGhpX/hxV8B0emObR435Cfy/J5mcQ3Ol34/2v6FkgVB6 MuJko4lx0kd/JS0KGVTXBRiGfvq0CaoUEVrD5heegB3hXRdvuON0wtcPIt5BRz+qlrMOWD EgTJA8djsYCv4qN4gTldGpNHJXgh3Gx8ZHF4KKeSSb5zbFRArIpDwCNeQoinPQLKFeJ3k6 Dutm3F3+Okh4u8CJWqBxfaYN4m3nOgH2NnYhHoQcI3cf/y0e0ypt9i0ACDixkzvEY21ico jeHy4wwsWHQ3c+nGR9Nc9/tf5bvg0cP+siyFZhb0z4pwLpu/VAm4fJCxR9ovYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvdRK6GNRz378 for ; Mon, 13 Apr 2026 19:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42527 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 19:54:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Matt Delco From: Alexander Ziaee Subject: git: 1b8723defccc - stable/15 - x86: Handle when MPERF/APERF MSRs aren't writable 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1b8723defcccade771864aad4cbc0eaa372366ed Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 19:54:53 +0000 Message-Id: <69dd4a0d.42527.4a2b2f17@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=1b8723defcccade771864aad4cbc0eaa372366ed commit 1b8723defcccade771864aad4cbc0eaa372366ed Author: Matt Delco AuthorDate: 2026-03-26 17:30:31 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-13 19:54:16 +0000 x86: Handle when MPERF/APERF MSRs aren't writable For performance and/or correct reasons some hypervisors allow MPERF/APERF MSRs to be read but not written to. This change modifies the handling of these MSRs to not rely on writes. This patch is part of Google Cloud Engine (GCE) C4-LSSD turnup. Sponsored by: Google Tested by: NetApp (previous) PR: 292808 MFC after: 3 days Co-authored-by: Jim Mattson Reviewed by: jrtc27, imp, kib, markj, olce, obiwac Differential Revision: https://reviews.freebsd.org/D55996 (cherry picked from commit 7e7d4e711ff94d114c93fd522d4125aa9bd9f5cd) --- sys/x86/x86/cpu_machdep.c | 14 +++++++------- sys/x86/x86/tsc.c | 9 ++++++--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 775fee97d3cd..422bdf9cfb0d 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -423,7 +423,7 @@ int cpu_est_clockrate(int cpu_id, uint64_t *rate) { uint64_t tsc1, tsc2; - uint64_t acnt, mcnt, perf; + uint64_t acnt_start, acnt_end, mcnt_start, mcnt_end, perf; register_t reg; int error = 0; @@ -453,20 +453,20 @@ cpu_est_clockrate(int cpu_id, uint64_t *rate) /* Calibrate by measuring a short delay. */ reg = intr_disable(); if (tsc_is_invariant) { - wrmsr(MSR_MPERF, 0); - wrmsr(MSR_APERF, 0); + mcnt_start = rdmsr(MSR_MPERF); + acnt_start = rdmsr(MSR_APERF); tsc1 = rdtsc(); DELAY(1000); - mcnt = rdmsr(MSR_MPERF); - acnt = rdmsr(MSR_APERF); + mcnt_end = rdmsr(MSR_MPERF); + acnt_end = rdmsr(MSR_APERF); tsc2 = rdtsc(); intr_restore(reg); - if (mcnt == 0) { + if (mcnt_end == mcnt_start) { tsc_perf_stat = 0; error = EOPNOTSUPP; goto err; } - perf = 1000 * acnt / mcnt; + perf = 1000 * (acnt_end - acnt_start) / (mcnt_end - mcnt_start); *rate = (tsc2 - tsc1) * perf; } else { tsc1 = rdtsc(); diff --git a/sys/x86/x86/tsc.c b/sys/x86/x86/tsc.c index 3b873d9dae73..f88ce60c6319 100644 --- a/sys/x86/x86/tsc.c +++ b/sys/x86/x86/tsc.c @@ -433,6 +433,8 @@ probe_tsc_freq_late(void) void start_TSC(void) { + uint64_t mperf, aperf; + if ((cpu_feature & CPUID_TSC) == 0 || tsc_disabled) return; @@ -442,11 +444,12 @@ start_TSC(void) /* * XXX Some emulators expose host CPUID without actual support * for these MSRs. We must test whether they really work. + * They may also be read-only, so test for increment. */ - wrmsr(MSR_MPERF, 0); - wrmsr(MSR_APERF, 0); + mperf = rdmsr(MSR_MPERF); + aperf = rdmsr(MSR_APERF); DELAY(10); - if (rdmsr(MSR_MPERF) > 0 && rdmsr(MSR_APERF) > 0) + if (rdmsr(MSR_MPERF) != mperf && rdmsr(MSR_APERF) != aperf) tsc_perf_stat = 1; } From nobody Mon Apr 13 19:54:49 2026 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 4fvdRL70dvz6ZdGK for ; Mon, 13 Apr 2026 19:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvdRL4fgFz3n6s for ; Mon, 13 Apr 2026 19:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fNrvrZ8xNVhwd1TWsua2Tyx8kDTZoPVRucs6/QX1L68=; b=GLhqTL4PKltI51y1d0UGZnVgE9pbfFsZCRiagqgWFFPowGEgesyNHMkXLCnZruzBo4l0P4 W7xd0CwPfmPdSUb/wH7Op3dACxZrVAAC9jX2ajpA7oixSV1fu1Lpdx50tnOC5DkrSzN4lP yYbymeJZkp+yNrJI5joQrjmJGgl7d1e5cCPkgQ/atfHVZM0fsjBV7ydbJp8QkptV7SMMmP I+ksqmKFFAxP8cAltDsQDv7b91rlfOTIiwEfmntMh5I7hESFK6uRrrkpHZQJQu1SU2Z6Sa 34jKtOJF8iGIQww+nPnHX8ZrkkxCx4ePYKDUXnMuCeWp1smkoQpMhqKnwje9EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776110094; a=rsa-sha256; cv=none; b=Q3r4Syyetr80J1U7f7k2xwxxRXDG+b0s/UXqajVvclVGEeC5dXOowZfP0B5gaPTe4VMVye bmjfz+ekhGJmtzuIsHGV4oCTh39JEF3r4fNVhQvmULKs3aRrjx0raMHVHtu6WxaWe0wvze W5HeBmCvU+N2Mn3UzW4ijgtXm4CJiRXO08Q0ukJnH/wS9YOZ70Cni0wkvATHS3XweBT/Wh 2s4jzizBCFO+p3rLLHLITlR7NB894LDDxWlylqX7YxV3gJGwBlhnIECkDm/eAdBLFOb5UD QOmTD7+11Boz3ydCPM2bKXol9VO/vUpjw89MekrpARNl+G5RbJtOzilRgf7JvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fNrvrZ8xNVhwd1TWsua2Tyx8kDTZoPVRucs6/QX1L68=; b=xeMcl2Ow+mhyGdclmWCX1CeqDeWPbgejdsWXitLs6iJ/T7W+2FJZg813pjQxulBiO4S+e9 vXfkFIsaTEe+Md2b6g0IHmUz5fI+30Lr6idUptkHYbdW1Hfo4+vYODcaSUmzs94lFLKEnJ 1sNgQvsHBX1xJhdywrpw8/4Jgw7H70q9QqfNkB3CtEJniroN6wfnYdpPVjQPIVno32AOra 1oJLGP/CjXk2y/ktUF0CV+mksZRZ6otpM5NtdwLvjyC9w4Bc7dNEM2WdTgZ9eHLltTv9Zi zXL/kNS7uPV6kbWr2oqJBHUHiV+d0Xp8c3z3K14OUhXuS1AkW/E4eHUPp4cxGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvdRL3sRpz3Mb for ; Mon, 13 Apr 2026 19:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 407fa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 19:54:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Matt Delco From: Alexander Ziaee Subject: git: 925387f94432 - stable/15 - nvme: Don't active memory space until all BARs are configured 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 925387f94432ce80daf9c7ab98e856df2d13657a Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 19:54:49 +0000 Message-Id: <69dd4a09.407fa.ea754fd@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=925387f94432ce80daf9c7ab98e856df2d13657a commit 925387f94432ce80daf9c7ab98e856df2d13657a Author: Matt Delco AuthorDate: 2026-03-06 17:23:03 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-13 19:54:16 +0000 nvme: Don't active memory space until all BARs are configured In the current current behavior the 2nd and 3rd BARs can be activated when they're configured with address zero. This change defers the activation of all BARs until after they've all been configured with an address. This enables FreeBSD on Google Compute Engine C4-LSSD Machines. Sponsored by: Google Tested by: NetApp (previous version) Reviewed by: gallatin, imp Discussed with: jrtc27 (improved error reporting) Differential Revision: https://reviews.freebsd.org/D55541 (cherry picked from commit b3d9e5013f3e5016ffbd3d3d6091194658af2b92) --- sys/dev/nvme/nvme_pci.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index cecb05ca0a92..8e5e64e1f0e0 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -151,24 +151,28 @@ nvme_pci_probe (device_t device) static int nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) { + int error; + ctrlr->resource_id = PCIR_BAR(0); ctrlr->msix_table_resource_id = -1; ctrlr->msix_table_resource = NULL; ctrlr->msix_pba_resource_id = -1; ctrlr->msix_pba_resource = NULL; + /* + * Using RF_ACTIVE will set the Memory Space bit in the PCI command register. + * The remaining BARs will get mapped in before they've been programmed with + * an address. To avoid this we'll not set this flag and instead call + * bus_activate_resource() after all the BARs have been programmed. + */ ctrlr->resource = bus_alloc_resource_any(ctrlr->dev, SYS_RES_MEMORY, - &ctrlr->resource_id, RF_ACTIVE); + &ctrlr->resource_id, 0); if (ctrlr->resource == NULL) { nvme_printf(ctrlr, "unable to allocate pci resource\n"); return (ENOMEM); } - ctrlr->bus_tag = rman_get_bustag(ctrlr->resource); - ctrlr->bus_handle = rman_get_bushandle(ctrlr->resource); - ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle; - /* * The NVMe spec allows for the MSI-X tables to be placed behind * BAR 4 and/or 5, separate from the control/doorbell registers. @@ -180,7 +184,7 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) if (ctrlr->msix_table_resource_id >= 0 && ctrlr->msix_table_resource_id != ctrlr->resource_id) { ctrlr->msix_table_resource = bus_alloc_resource_any(ctrlr->dev, - SYS_RES_MEMORY, &ctrlr->msix_table_resource_id, RF_ACTIVE); + SYS_RES_MEMORY, &ctrlr->msix_table_resource_id, 0); if (ctrlr->msix_table_resource == NULL) { nvme_printf(ctrlr, "unable to allocate msi-x table resource\n"); return (ENOMEM); @@ -190,13 +194,39 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) ctrlr->msix_pba_resource_id != ctrlr->resource_id && ctrlr->msix_pba_resource_id != ctrlr->msix_table_resource_id) { ctrlr->msix_pba_resource = bus_alloc_resource_any(ctrlr->dev, - SYS_RES_MEMORY, &ctrlr->msix_pba_resource_id, RF_ACTIVE); + SYS_RES_MEMORY, &ctrlr->msix_pba_resource_id, 0); if (ctrlr->msix_pba_resource == NULL) { nvme_printf(ctrlr, "unable to allocate msi-x pba resource\n"); return (ENOMEM); } } + error = bus_activate_resource(ctrlr->dev, ctrlr->resource); + if (error) { + nvme_printf(ctrlr, "unable to activate pci resource: %d\n", error); + return (error); + } + if (ctrlr->msix_table_resource != NULL) { + error = bus_activate_resource(ctrlr->dev, ctrlr->msix_table_resource); + if (error) { + nvme_printf(ctrlr, "unable to activate msi-x table resource: %d\n", + error); + return (error); + } + } + if (ctrlr->msix_pba_resource != NULL) { + error = bus_activate_resource(ctrlr->dev, ctrlr->msix_pba_resource); + if (error) { + nvme_printf(ctrlr, "unable to activate msi-x pba resource: %d\n", + error); + return (error); + } + } + + ctrlr->bus_tag = rman_get_bustag(ctrlr->resource); + ctrlr->bus_handle = rman_get_bushandle(ctrlr->resource); + ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle; + return (0); } From nobody Mon Apr 13 19:55:37 2026 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 4fvdS96GpVz6Zd5q for ; Mon, 13 Apr 2026 19:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvdS95Jtyz3phm for ; Mon, 13 Apr 2026 19:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1LYZbvWHkz3PTkVXa6jazjhACsD+LW1Ts/bdQy6VIKY=; b=mEn1HtswWzz6PA5U729cENZk7ambb5s1aXhs0pU+xfPUuzdFEQGPylQ7v0siN2FacviowX 1/DqeCzbaQA3nMfx5mLk8iNOPG58UdecD152Y/mTj+z0dHzjqlPIWydV+sBRHgyiRyantz cg3QZvNc4sG517W2wDVgIaMkESyN+gfuUIqK2VwV6KKQ6ISS1AP1KnyrczOWvlWb0/fT6k kcRVnkjXO8SqhjyiamYQP0voIoqjb5DHNz81XR0N13CWIjXbHUFy7UI9GHmUtfyL1hD+jE vNAo78Gsxdgdhqr0JbEupqxe31+G3WtNJ3JUpcF654HFVVQAtuXxRhep2H+UMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776110137; a=rsa-sha256; cv=none; b=sQzqulbL8d/CYted+3/oVehR9qNolFWnNjRLMbL4r/e2Lx+JXmWuMVLYxpk4sMS/wsjFPF fvblOsKMqmDFJl6zhdDjEm0O7blwftCoSxSoDzUWLPL0UBek7Tob4GELzxtg2/fshjwHTJ txyvp+FsACs7bAKA20Y48ykPmoHMpCtzXJUx/xzeNlROHbP+45wFeitQLAck6hX+bRoljU m08sg1/IVQZt2QNGP9S0JE9+/hDCC/zZHYtLyXsVC17hWtu55UXChWvmMuUrgyDbxDGyFz h13rcpAjVMydzgeNzA8Pr+Zg8531u+8r+OVFJesSkCaHaXsB3u+PXxHe/OqQ0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1LYZbvWHkz3PTkVXa6jazjhACsD+LW1Ts/bdQy6VIKY=; b=N2izJJHvjCiNoJSgOBww12prvxutFdTOB6Q+4v3l77k6Sra0h56HhREH60bB0BDQe3I4J2 271MRsO/MIBjb5yklLrSWRTib8bZ6OmMOJesUrljL/4WZobBZ75LaKNJyndhqiKlYZqrRE S/sSRIvojxgzv0wwAb/zlCw4FFAo22kSN57/f2UOn4azLPxK57H5hxT1MyLyWbUF5MK38F UgWpuqbSFDxF+0tle8T2vwshL7KakutoDwi+CLAtGNf0E+qtdwJUSp2KTO4TOsKK+o8Ugf DXRlYhn6h8T+W5TUtzHjrGOA3MfLduDqFy+pBN0QFuWIqYKJSzKAX8HElH7zjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvdS94s8Nz3Mj for ; Mon, 13 Apr 2026 19:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41a53 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 19:55:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 99aa0cdd9eff - stable/15 - arcmsr.4: Improve HARDWARE introductory sentence 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 99aa0cdd9eff3260a8a94d0e9aea3e3866137f4c Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 19:55:37 +0000 Message-Id: <69dd4a39.41a53.587b7f7@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=99aa0cdd9eff3260a8a94d0e9aea3e3866137f4c commit 99aa0cdd9eff3260a8a94d0e9aea3e3866137f4c Author: Alexander Ziaee AuthorDate: 2026-04-10 15:26:29 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-13 19:55:31 +0000 arcmsr.4: Improve HARDWARE introductory sentence MFC after: 3 days (cherry picked from commit ff32dbb1d14f05bf77e356ae68c82c048c88888f) --- share/man/man4/arcmsr.4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man4/arcmsr.4 b/share/man/man4/arcmsr.4 index 9356f4f23c8b..c2e7b4376ca7 100644 --- a/share/man/man4/arcmsr.4 +++ b/share/man/man4/arcmsr.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 15, 2020 +.Dd April 5, 2026 .Dt ARCMSR 4 .Os .Sh NAME @@ -66,7 +66,8 @@ Management tools for i386 and amd64 are available from Areca. .Sh HARDWARE The .Nm -driver supports the following cards: +driver supports the following +Areca PCI-X/PCIe SATA/SAS/NVMe RAID host adapters: .Pp .Bl -bullet -compact .It From nobody Mon Apr 13 20:02:59 2026 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 4fvdcg2thbz6ZdrD for ; Mon, 13 Apr 2026 20:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvdcg2Bjyz3t3j for ; Mon, 13 Apr 2026 20:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NZDJJMsGSG1Ph3WLXl3TZScEFTLbp6ZXgRF5xeCUhz8=; b=PlevAygPbQab2yyRY5iLuL1qtHfiJLYRHHgtV79JBpJSd5XYJfw9uHHbi2md1RCWtXeV4L CXFqMUnVmz+9DCJc5LNHwyMaI/QPsdwBbR9msMg69e0mPU6ctWQ0USuWgSaewCkxukU6Lz QJxaeJRNaWvNkfUtiUi4bIw+JtZo/KiK64uIzOEq5Zu7lGl1/npKJavaYvBj27iZ9qpe80 ndd56FwzX3i/7Ybd7EfY65NcM0g6FnADkeLro5nmh/jS58SRMQIrMrE89HBfYpKThhNWll 1jXglNaGnb6N22fMJUmrwuFicpBTVaVS1VUQ0BY9y2jzsLkjUbQnrsk9L+jvfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776110579; a=rsa-sha256; cv=none; b=heoShIBmin7YRdfaRSZJTHTX/br/UTOFmgpsJ8WnNM687LoXFDsbwdeQtmoXZiichzN1pI 8zx51/mYxaYSHsmCLCEk0nB2unwQfNKQUdf/9dhT2slfyRurOHCbr+ZZzxwMLlG6nBDXz1 AvhPlQlHHahNbtzXsojOlszFBagW5Bxc6lGIejRmVpnWMsOpITNdJfTdyvfZT3SsUe20UT k9unmMXs+emJrxO7APs9vGoqAh5q2qd/iinWhR2UmxPGLIj8orIuRFucCC8EnbiIowqzkK 04iCnW129RD3tLn5GC2g+25GeWAOnjmAXWon3Oadg6wthfgKaWqN4IuURKzDFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NZDJJMsGSG1Ph3WLXl3TZScEFTLbp6ZXgRF5xeCUhz8=; b=rdzd7SN9/sBGHUM97JtwocL7Ns7nKooCSnu3RmWa9nLu8yrhtA+yrKxg8JiUWhIy0ecqyO X/VzTPG3b9yljUG51sd0NF4c3yPdbMvESUpSEs2xjZK+dDAqpch3DIqeIUhM9LngybtGqb B3/mRggBxR+JA4IhyVXKr6lNFc+qTQTTFYBquJCU7fHDQ1xRqXcoByp66VLdF7MjHBuTl+ asUpAkMGK7ayTwvhy5mYMLazu1/u/FtVECqfYXeKT07dXdfYQz0Vy65ut8H5BS/p6vE2++ 6I8gPCNa5YUh1e5yJKcoUrFdiSdVVsRe8tLw37C9V3Nblbm5D8/5E5OqDwSaJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvdcg1l04z3DY for ; Mon, 13 Apr 2026 20:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42e48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 20:02:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 07b00bed8312 - stable/15 - manuals: System message vs kernel message 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 07b00bed83121043ffc88889edc15aad183227ba Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 20:02:59 +0000 Message-Id: <69dd4bf3.42e48.ca13288@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=07b00bed83121043ffc88889edc15aad183227ba commit 07b00bed83121043ffc88889edc15aad183227ba Author: Alexander Ziaee AuthorDate: 2026-03-08 07:23:17 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-13 20:02:32 +0000 manuals: System message vs kernel message Wordsmith mentions throughout the manual of syslog and dmesg, to clearly differentiate them in an externally consisteny way, increasing operator onboarding speed and elegance. The daemon that handles general system messages, syslog, describes them as "system messages", and "messages" is the standard filename. Rewrite syslog related manual titles to align search results with this, and hier entries to align the index. Use care to maintain keywords and not add extra lines. Newsyslog trades "maintain" with "rotate" for visibility. MFC after: 3 days (resolved newsyslog.8 merge conflict) Reviewed by: markj Closes: https://github.com/freebsd/freebsd-src/pull/2067 (cherry picked from commit 04d58d529a61f3bba2c1a843bc2793923a005759) --- lib/libc/gen/syslog.3 | 4 ++-- sbin/dmesg/dmesg.8 | 6 +++--- share/man/man7/hier.7 | 6 +++--- usr.sbin/newsyslog/newsyslog.8 | 4 ++-- usr.sbin/newsyslog/newsyslog.conf.5 | 6 ++---- usr.sbin/syslogd/syslog.conf.5 | 6 ++---- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3 index 62140554f4f5..1e316c20d8d8 100644 --- a/lib/libc/gen/syslog.3 +++ b/lib/libc/gen/syslog.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 3, 2023 +.Dd March 8, 2026 .Dt SYSLOG 3 .Os .Sh NAME @@ -34,7 +34,7 @@ .Nm openlog , .Nm closelog , .Nm setlogmask -.Nd control system log +.Nd control system message log .Sh LIBRARY .Lb libc .Sh SYNOPSIS diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8 index f9b9fce82ffc..d84587b61475 100644 --- a/sbin/dmesg/dmesg.8 +++ b/sbin/dmesg/dmesg.8 @@ -25,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 7, 2022 +.Dd March 7, 2026 .Dt DMESG 8 .Os .Sh NAME .Nm dmesg -.Nd "display the system message buffer" +.Nd display the kernel message buffer .Sh SYNOPSIS .Nm .Op Fl ac @@ -38,7 +38,7 @@ .Sh DESCRIPTION The .Nm -utility displays the contents of the system message buffer. +utility displays the contents of the kernel message buffer. If the .Fl M option is not specified, the buffer is read from the currently running kernel diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index c438511678d4..d4b8c0019b81 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -327,7 +327,7 @@ Explicitly distrusted certificates; see kernel state defaults; see .Xr sysctl.conf 5 .It Pa syslog.conf -system log configuration +system message log configuration .It Pa ttys tty creation configuration; see .Xr getty 8 @@ -851,7 +851,7 @@ default log for system daemons .It Pa devd.log default log for device state change daemon .It Pa dmesg.today -system message buffer log, rotates to +kernel message buffer log, rotates to .Pa dmesg.yesterday .It Pa debug.log undiscarded debug syslog messages @@ -862,7 +862,7 @@ logs for the line printer spooler daemon; see .Xr sendmail 8 log, rotates and compresses to maillog.0.bz2 .It Pa messages -general system log; see +general system message log; see .Xr syslogd 8 .It Pa mount.today currently loaded diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8 index 7429e3b8eb01..fd389ccdbac0 100644 --- a/usr.sbin/newsyslog/newsyslog.8 +++ b/usr.sbin/newsyslog/newsyslog.8 @@ -14,12 +14,12 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd September 1, 2025 +.Dd March 8, 2026 .Dt NEWSYSLOG 8 .Os .Sh NAME .Nm newsyslog -.Nd maintain system log files to manageable sizes +.Nd rotate system message log files to maintain manageable sizes .Sh SYNOPSIS .Nm .Op Fl CFNPnrsv diff --git a/usr.sbin/newsyslog/newsyslog.conf.5 b/usr.sbin/newsyslog/newsyslog.conf.5 index a6c0e75b209d..be146c6d5081 100644 --- a/usr.sbin/newsyslog/newsyslog.conf.5 +++ b/usr.sbin/newsyslog/newsyslog.conf.5 @@ -18,14 +18,12 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd February 4, 2026 +.Dd March 8, 2026 .Dt NEWSYSLOG.CONF 5 .Os .Sh NAME .Nm newsyslog.conf -.Nd -.Xr newsyslog 8 -configuration file +.Nd system message log rotator configuration file .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5 index 691f2cdd7062..f641aedee3e5 100644 --- a/usr.sbin/syslogd/syslog.conf.5 +++ b/usr.sbin/syslogd/syslog.conf.5 @@ -25,14 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 10, 2020 +.Dd March 8, 2026 .Dt SYSLOG.CONF 5 .Os .Sh NAME .Nm syslog.conf -.Nd -.Xr syslogd 8 -configuration file +.Nd syslogd system message log configuration file .Sh DESCRIPTION The .Nm From nobody Tue Apr 14 01:49:42 2026 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 4fvnJr6k9Jz6YgcS for ; Tue, 14 Apr 2026 01:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvnJr5f1hz3cMg for ; Tue, 14 Apr 2026 01:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776131388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZuzF/6PkWdxaQiITSddifcmksRKN44aZp3fXn6927HY=; b=kgLoywmTB0YTUkEh01h2RlFzIXFbz/ZCmngoPaI+BiC5fgAIupfzD/TXC3pe/Ab97voO/M 08vp9xu4VzjkdNwnt5BUGq2NaVdg05npaxuDbsHwnauj5IOR+w+SEWsn+iX9oYsEjlSA2O iaS030crOUQNt8w2l4b2gk8zgSUhZoffRJYNsTjxiYjOzeyykwmBBt0UqkyEkZ2Mok8ftx Per8Q96OTH6W23HcYczS44ig3xZBwGuAj8dAj422P56q1mywWqIrFVGqnU3tLDlnx8aw/Y JaGg9vp6gWzjafUfxNdFknjT3UWIHnWq+cvy9V9WIoaTwY73f57SouQV849bSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776131388; a=rsa-sha256; cv=none; b=ORSVQbI73JAzEsDkdzQqY24C/Bs1k3MgFOErFGc77iEwitDb/RNxhOclL77w+wuF/w5tXE jX8/gQjRkR4Z/5pO17lFlY5/IdJqroGiF7a5cHqjWCfcBtjUrGf7b6Rm804u9aKApwmLw4 z2EXsUx0Z3I6rT46dB7AeksxGKAlIJNeeBi32ePjWIxcBGCKetWTUhvgdQ8XelkjH5+GsI rpn/lrdlMQ7yt5Aa8jdpr/xE5u0caBsmC8eMJDWeEiM2TfJKVX503WMfBcD86WzPGByErP SdPXcKGut0ypBfqrief7A4IlhB4a4ndMezqx9eaEInqQAeOX/B7cVeOEuXo80g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776131388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZuzF/6PkWdxaQiITSddifcmksRKN44aZp3fXn6927HY=; b=TOPEUH2wi2e4YHRFpRPWnQ8o4ontHsU+BASN/cd72tLt8GERlxZWka/wil2cyOOgWS4mCX ejGV2x8Vj+y1EOo+EPzLt6OLviLYsfdEtCUmj1OpwiV0bqrhflcjDG+n3Oax8e0ZYIIpZk /ls6SJ+M02nB6pOuxxeooBvv1xLIObgVl1MKVLMDGgssT/lX7j3G1kSQwEuEBhB33iKxnd +Ny4fzE/78Y0dH4O4PHpeV7ToGG/3FPzydyg22Gn4wrQVfhVE0T428GKBUhSliA1CT8BdL PNQfYaM9o4Q3FtPdh+Q6LBQrsGmqnun6HFByQ/MklUZUqXje4xCp+m56sKfRhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvnJr5BzzzTTN for ; Tue, 14 Apr 2026 01:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f99d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 01:49:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Enji Cooper Subject: git: 8de7c76ee02f - stable/14 - ncurses: merge update to ncurses 6.6 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8de7c76ee02fcc7a405d47cc4b816c27de0dc2e4 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 01:49:42 +0000 Message-Id: <69dd9d36.3f99d.45192d16@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=8de7c76ee02fcc7a405d47cc4b816c27de0dc2e4 commit 8de7c76ee02fcc7a405d47cc4b816c27de0dc2e4 Author: Baptiste Daroussin AuthorDate: 2026-01-14 13:48:32 +0000 Commit: Enji Cooper CommitDate: 2026-04-14 01:49:17 +0000 ncurses: merge update to ncurses 6.6 6.6 is ABI compatible with 6.5 (tested with abidiff) Remove html documentation to ease updates MFC After: 1 month (cherry picked from commit 68ad2b0d7af2a3571c4abac9afa712f9b09b721c) --- ObsoleteFiles.inc | 5 + contrib/ncurses/AUTHORS | 7 +- contrib/ncurses/COPYING | 4 +- contrib/ncurses/INSTALL | 111 +- contrib/ncurses/MANIFEST | 23 +- contrib/ncurses/Makefile.in | 17 +- contrib/ncurses/Makefile.os2 | 6 +- contrib/ncurses/NEWS | 615 +- contrib/ncurses/VERSION | 2 +- contrib/ncurses/aclocal.m4 | 1380 ++- contrib/ncurses/announce.html.in | 1015 +- contrib/ncurses/config.guess | 26 +- contrib/ncurses/config.sub | 749 +- contrib/ncurses/configure | 10856 ++++++++++--------- contrib/ncurses/configure.in | 318 +- contrib/ncurses/dist.mk | 12 +- contrib/ncurses/doc/html/hackguide.html | 962 -- contrib/ncurses/doc/html/ncurses-intro.html | 3390 ------ contrib/ncurses/doc/ncurses-intro.doc | 5 +- contrib/ncurses/form/Makefile.in | 28 +- contrib/ncurses/form/fld_arg.c | 6 +- contrib/ncurses/form/fld_attr.c | 6 +- contrib/ncurses/form/fld_current.c | 12 +- contrib/ncurses/form/fld_def.c | 30 +- contrib/ncurses/form/fld_dup.c | 6 +- contrib/ncurses/form/form.priv.h | 15 +- contrib/ncurses/form/frm_data.c | 8 +- contrib/ncurses/form/frm_driver.c | 91 +- contrib/ncurses/form/frm_post.c | 6 +- contrib/ncurses/form/frm_req_name.c | 6 +- contrib/ncurses/form/frm_sub.c | 15 +- contrib/ncurses/form/frm_win.c | 16 +- contrib/ncurses/form/fty_enum.c | 53 +- contrib/ncurses/form/fty_generic.c | 17 +- contrib/ncurses/form/fty_int.c | 14 +- contrib/ncurses/form/fty_num.c | 16 +- contrib/ncurses/form/fty_regex.c | 8 +- contrib/ncurses/include/Caps | 44 +- contrib/ncurses/include/Caps.aix4 | 26 +- contrib/ncurses/include/Caps.hpux11 | 26 +- contrib/ncurses/include/Caps.keys | 26 +- contrib/ncurses/include/Caps.osf1r5 | 20 +- contrib/ncurses/include/Caps.uwin | 20 +- contrib/ncurses/include/MKkey_defs.sh | 8 +- contrib/ncurses/include/MKterm.h.awk.in | 57 +- contrib/ncurses/include/Makefile.in | 9 +- contrib/ncurses/include/capdefaults.c | 6 +- contrib/ncurses/include/curses.h.in | 104 +- contrib/ncurses/include/curses.tail | 54 +- contrib/ncurses/include/curses.wide | 7 +- contrib/ncurses/include/headers | 9 +- contrib/ncurses/include/nc_alloc.h | 25 +- contrib/ncurses/include/nc_termios.h | 91 +- contrib/ncurses/include/nc_tparm.h | 5 +- .../ncurses/include/{nc_win32.h => nc_win32.h.in} | 131 +- contrib/ncurses/include/ncurses_cfg.hin | 6 +- contrib/ncurses/include/ncurses_defs | 23 +- contrib/ncurses/include/ncurses_mingw.h | 82 - contrib/ncurses/include/term_entry.h | 9 +- contrib/ncurses/include/tic.h | 10 +- contrib/ncurses/include/unctrl.h.in | 10 +- contrib/ncurses/include/win32_curses.h | 75 - contrib/ncurses/install-sh | 27 +- contrib/ncurses/man/MKada_config.in | 8 +- contrib/ncurses/man/MKncu_config.in | 4 +- contrib/ncurses/man/MKterminfo.sh | 66 +- contrib/ncurses/man/Makefile.in | 24 +- contrib/ncurses/man/captoinfo.1m | 159 +- contrib/ncurses/man/clear.1 | 12 +- contrib/ncurses/man/curs_add_wch.3x | 735 +- contrib/ncurses/man/curs_add_wchstr.3x | 139 +- contrib/ncurses/man/curs_addch.3x | 529 +- contrib/ncurses/man/curs_addchstr.3x | 122 +- contrib/ncurses/man/curs_addstr.3x | 101 +- contrib/ncurses/man/curs_addwstr.3x | 107 +- contrib/ncurses/man/curs_attr.3x | 512 +- contrib/ncurses/man/curs_beep.3x | 85 +- contrib/ncurses/man/curs_bkgd.3x | 243 +- contrib/ncurses/man/curs_bkgrnd.3x | 196 +- contrib/ncurses/man/curs_border.3x | 239 +- contrib/ncurses/man/curs_border_set.3x | 96 +- contrib/ncurses/man/curs_clear.3x | 46 +- contrib/ncurses/man/curs_color.3x | 524 +- contrib/ncurses/man/curs_delch.3x | 56 +- contrib/ncurses/man/curs_deleteln.3x | 126 +- contrib/ncurses/man/curs_extend.3x | 93 +- contrib/ncurses/man/curs_get_wch.3x | 175 +- contrib/ncurses/man/curs_get_wstr.3x | 431 +- contrib/ncurses/man/curs_getcchar.3x | 384 +- contrib/ncurses/man/curs_getch.3x | 441 +- contrib/ncurses/man/curs_getstr.3x | 598 +- contrib/ncurses/man/curs_getyx.3x | 150 +- contrib/ncurses/man/curs_in_wch.3x | 85 +- contrib/ncurses/man/curs_in_wchstr.3x | 139 +- contrib/ncurses/man/curs_inch.3x | 148 +- contrib/ncurses/man/curs_inchstr.3x | 179 +- contrib/ncurses/man/curs_initscr.3x | 677 +- contrib/ncurses/man/curs_inopts.3x | 939 +- contrib/ncurses/man/curs_ins_wch.3x | 110 +- contrib/ncurses/man/curs_ins_wstr.3x | 179 +- contrib/ncurses/man/curs_insch.3x | 71 +- contrib/ncurses/man/curs_insstr.3x | 175 +- contrib/ncurses/man/curs_instr.3x | 188 +- contrib/ncurses/man/curs_inwstr.3x | 239 +- contrib/ncurses/man/curs_kernel.3x | 467 +- contrib/ncurses/man/curs_legacy.3x | 35 +- contrib/ncurses/man/curs_mouse.3x | 554 +- contrib/ncurses/man/curs_move.3x | 64 +- contrib/ncurses/man/curs_opaque.3x | 33 +- contrib/ncurses/man/curs_outopts.3x | 414 +- contrib/ncurses/man/curs_overlay.3x | 53 +- contrib/ncurses/man/curs_pad.3x | 244 +- contrib/ncurses/man/curs_print.3x | 105 +- contrib/ncurses/man/curs_printw.3x | 139 +- contrib/ncurses/man/curs_refresh.3x | 33 +- contrib/ncurses/man/curs_scanw.3x | 129 +- contrib/ncurses/man/curs_scr_dump.3x | 192 +- contrib/ncurses/man/curs_scroll.3x | 143 +- contrib/ncurses/man/curs_slk.3x | 77 +- contrib/ncurses/man/curs_sp_funcs.3x | 272 +- contrib/ncurses/man/curs_termattrs.3x | 199 +- contrib/ncurses/man/curs_termcap.3x | 446 +- contrib/ncurses/man/curs_terminfo.3x | 842 +- contrib/ncurses/man/curs_threads.3x | 8 +- contrib/ncurses/man/curs_touch.3x | 70 +- contrib/ncurses/man/curs_trace.3x | 14 +- contrib/ncurses/man/curs_util.3x | 446 +- contrib/ncurses/man/curs_variables.3x | 298 +- contrib/ncurses/man/curs_window.3x | 318 +- contrib/ncurses/man/define_key.3x | 108 +- contrib/ncurses/man/form.3x | 21 +- contrib/ncurses/man/form_driver.3x | 9 +- contrib/ncurses/man/form_field.3x | 15 +- contrib/ncurses/man/form_field_buffer.3x | 8 +- contrib/ncurses/man/form_field_new.3x | 7 +- contrib/ncurses/man/form_field_opts.3x | 20 +- contrib/ncurses/man/form_field_userptr.3x | 7 +- contrib/ncurses/man/form_field_validation.3x | 30 +- contrib/ncurses/man/form_fieldtype.3x | 23 +- contrib/ncurses/man/form_hook.3x | 27 +- contrib/ncurses/man/form_new.3x | 11 +- contrib/ncurses/man/form_opts.3x | 20 +- contrib/ncurses/man/form_page.3x | 8 +- contrib/ncurses/man/form_requestname.3x | 8 +- contrib/ncurses/man/form_userptr.3x | 7 +- contrib/ncurses/man/form_win.3x | 16 +- contrib/ncurses/man/infocmp.1m | 299 +- contrib/ncurses/man/infotocap.1m | 62 +- contrib/ncurses/man/key_defined.3x | 60 +- contrib/ncurses/man/keybound.3x | 79 +- contrib/ncurses/man/keyok.3x | 88 +- contrib/ncurses/man/legacy_coding.3x | 42 +- contrib/ncurses/man/make_sed.sh | 10 +- contrib/ncurses/man/man_db.renames.in | 28 +- contrib/ncurses/man/manhtml.aliases | 29 +- contrib/ncurses/man/manhtml.externs | 15 +- contrib/ncurses/man/manlinks.sed | 13 +- contrib/ncurses/man/menu.3x | 60 +- contrib/ncurses/man/menu_driver.3x | 11 +- contrib/ncurses/man/menu_hook.3x | 28 +- contrib/ncurses/man/menu_items.3x | 13 +- contrib/ncurses/man/menu_mark.3x | 17 +- contrib/ncurses/man/menu_new.3x | 11 +- contrib/ncurses/man/menu_opts.3x | 20 +- contrib/ncurses/man/menu_pattern.3x | 9 +- contrib/ncurses/man/menu_requestname.3x | 8 +- contrib/ncurses/man/menu_spacing.3x | 8 +- contrib/ncurses/man/menu_userptr.3x | 7 +- contrib/ncurses/man/menu_win.3x | 16 +- contrib/ncurses/man/mitem_current.3x | 10 +- contrib/ncurses/man/mitem_name.3x | 7 +- contrib/ncurses/man/mitem_new.3x | 8 +- contrib/ncurses/man/mitem_opts.3x | 20 +- contrib/ncurses/man/mitem_userptr.3x | 7 +- contrib/ncurses/man/ncurses.3x | 896 +- contrib/ncurses/man/new_pair.3x | 14 +- contrib/ncurses/man/panel.3x | 27 +- contrib/ncurses/man/resizeterm.3x | 59 +- contrib/ncurses/man/scr_dump.5 | 22 +- contrib/ncurses/man/tabs.1 | 73 +- contrib/ncurses/man/term.5 | 431 +- contrib/ncurses/man/term.7 | 16 +- contrib/ncurses/man/term_variables.3x | 228 +- contrib/ncurses/man/terminfo.head | 11 +- contrib/ncurses/man/terminfo.tail | 409 +- contrib/ncurses/man/tic.1m | 612 +- contrib/ncurses/man/toe.1m | 23 +- contrib/ncurses/man/tput.1 | 410 +- contrib/ncurses/man/tset.1 | 22 +- contrib/ncurses/man/user_caps.5 | 584 +- contrib/ncurses/man/wresize.3x | 105 +- contrib/ncurses/menu/Makefile.in | 28 +- contrib/ncurses/menu/m_driver.c | 14 +- contrib/ncurses/menu/m_global.c | 14 +- contrib/ncurses/menu/m_item_new.c | 14 +- contrib/ncurses/menu/m_item_vis.c | 6 +- contrib/ncurses/menu/m_pattern.c | 6 +- contrib/ncurses/menu/m_post.c | 42 +- contrib/ncurses/menu/m_req_name.c | 6 +- contrib/ncurses/menu/menu.priv.h | 7 +- contrib/ncurses/menu/mf_common.h | 8 +- contrib/ncurses/misc/Makefile.in | 79 +- contrib/ncurses/misc/gen-pkgconfig.in | 14 +- contrib/ncurses/misc/gen_edit.sh | 16 +- contrib/ncurses/misc/magic | 9 +- contrib/ncurses/misc/makellib | 28 +- contrib/ncurses/misc/ncurses-config.in | 134 +- contrib/ncurses/misc/run_tic.in | 145 +- contrib/ncurses/misc/terminfo.src | 4424 ++++---- contrib/ncurses/mk-1st.awk | 105 +- contrib/ncurses/ncurses/Makefile.in | 36 +- contrib/ncurses/ncurses/base/MKkeyname.awk | 30 +- contrib/ncurses/ncurses/base/MKlib_gen.sh | 77 +- contrib/ncurses/ncurses/base/MKunctrl.awk | 10 +- contrib/ncurses/ncurses/base/define_key.c | 12 +- contrib/ncurses/ncurses/base/key_defined.c | 10 +- contrib/ncurses/ncurses/base/keybound.c | 8 +- contrib/ncurses/ncurses/base/keyok.c | 10 +- contrib/ncurses/ncurses/base/legacy_coding.c | 6 +- contrib/ncurses/ncurses/base/lib_addch.c | 12 +- contrib/ncurses/ncurses/base/lib_addstr.c | 14 +- contrib/ncurses/ncurses/base/lib_beep.c | 10 +- contrib/ncurses/ncurses/base/lib_bkgd.c | 6 +- contrib/ncurses/ncurses/base/lib_chgat.c | 7 +- contrib/ncurses/ncurses/base/lib_color.c | 84 +- contrib/ncurses/ncurses/base/lib_colorset.c | 6 +- contrib/ncurses/ncurses/base/lib_delch.c | 8 +- contrib/ncurses/ncurses/base/lib_delwin.c | 29 +- contrib/ncurses/ncurses/base/lib_dft_fgbg.c | 12 +- contrib/ncurses/ncurses/base/lib_driver.c | 50 +- contrib/ncurses/ncurses/base/lib_echo.c | 8 +- contrib/ncurses/ncurses/base/lib_endwin.c | 6 +- contrib/ncurses/ncurses/base/lib_erase.c | 6 +- contrib/ncurses/ncurses/base/lib_flash.c | 8 +- contrib/ncurses/ncurses/base/lib_freeall.c | 18 +- contrib/ncurses/ncurses/base/lib_getch.c | 51 +- contrib/ncurses/ncurses/base/lib_getstr.c | 12 +- contrib/ncurses/ncurses/base/lib_initscr.c | 12 +- contrib/ncurses/ncurses/base/lib_insch.c | 10 +- contrib/ncurses/ncurses/base/lib_insnstr.c | 8 +- contrib/ncurses/ncurses/base/lib_instr.c | 16 +- contrib/ncurses/ncurses/base/lib_mouse.c | 170 +- contrib/ncurses/ncurses/base/lib_mvwin.c | 6 +- contrib/ncurses/ncurses/base/lib_newterm.c | 47 +- contrib/ncurses/ncurses/base/lib_newwin.c | 80 +- contrib/ncurses/ncurses/base/lib_nl.c | 12 +- contrib/ncurses/ncurses/base/lib_overlay.c | 10 +- contrib/ncurses/ncurses/base/lib_pad.c | 22 +- contrib/ncurses/ncurses/base/lib_printw.c | 12 +- contrib/ncurses/ncurses/base/lib_redrawln.c | 6 +- contrib/ncurses/ncurses/base/lib_refresh.c | 8 +- contrib/ncurses/ncurses/base/lib_restart.c | 12 +- contrib/ncurses/ncurses/base/lib_screen.c | 104 +- contrib/ncurses/ncurses/base/lib_set_term.c | 128 +- contrib/ncurses/ncurses/base/lib_slk.c | 22 +- contrib/ncurses/ncurses/base/lib_slkatr_set.c | 8 +- contrib/ncurses/ncurses/base/lib_slkatrof.c | 6 +- contrib/ncurses/ncurses/base/lib_slkatron.c | 6 +- contrib/ncurses/ncurses/base/lib_slkatrset.c | 6 +- contrib/ncurses/ncurses/base/lib_slkattr.c | 6 +- contrib/ncurses/ncurses/base/lib_slkclear.c | 6 +- contrib/ncurses/ncurses/base/lib_slkcolor.c | 8 +- contrib/ncurses/ncurses/base/lib_slklab.c | 8 +- contrib/ncurses/ncurses/base/lib_slkrefr.c | 18 +- contrib/ncurses/ncurses/base/lib_slkset.c | 16 +- contrib/ncurses/ncurses/base/lib_slktouch.c | 6 +- contrib/ncurses/ncurses/base/lib_touch.c | 12 +- contrib/ncurses/ncurses/base/lib_ungetch.c | 6 +- contrib/ncurses/ncurses/base/lib_wattron.c | 6 +- contrib/ncurses/ncurses/base/lib_winch.c | 6 +- contrib/ncurses/ncurses/base/lib_window.c | 14 +- contrib/ncurses/ncurses/base/nc_panel.c | 6 +- contrib/ncurses/ncurses/base/new_pair.c | 22 +- contrib/ncurses/ncurses/base/resizeterm.c | 47 +- contrib/ncurses/ncurses/base/safe_sprintf.c | 19 +- contrib/ncurses/ncurses/base/tries.c | 20 +- contrib/ncurses/ncurses/base/vsscanf.c | 8 +- contrib/ncurses/ncurses/base/wresize.c | 22 +- contrib/ncurses/ncurses/build.priv.h | 6 +- contrib/ncurses/ncurses/curses.priv.h | 331 +- contrib/ncurses/ncurses/llib-lncurses | 26 +- contrib/ncurses/ncurses/llib-lncursest | 26 +- contrib/ncurses/ncurses/llib-lncursestw | 40 +- contrib/ncurses/ncurses/llib-lncursesw | 40 +- contrib/ncurses/ncurses/llib-ltinfo | 20 +- contrib/ncurses/ncurses/llib-ltinfot | 20 +- contrib/ncurses/ncurses/llib-ltinfotw | 20 +- contrib/ncurses/ncurses/llib-ltinfow | 20 +- contrib/ncurses/ncurses/modules | 18 +- contrib/ncurses/ncurses/new_pair.h | 10 +- .../{include/nc_mingw.h => ncurses/report_ctype.c} | 116 +- contrib/ncurses/ncurses/report_hashing.c | 6 +- contrib/ncurses/ncurses/report_offsets.c | 19 +- contrib/ncurses/ncurses/term.priv.h | 8 +- contrib/ncurses/ncurses/tinfo/MKcaptab.awk | 6 +- contrib/ncurses/ncurses/tinfo/MKcaptab.sh | 22 +- contrib/ncurses/ncurses/tinfo/MKcodes.awk | 12 +- contrib/ncurses/ncurses/tinfo/MKfallback.sh | 35 +- contrib/ncurses/ncurses/tinfo/MKkeys_list.sh | 26 +- contrib/ncurses/ncurses/tinfo/MKnames.awk | 12 +- contrib/ncurses/ncurses/tinfo/MKuserdefs.sh | 10 +- contrib/ncurses/ncurses/tinfo/access.c | 188 +- contrib/ncurses/ncurses/tinfo/add_tries.c | 18 +- contrib/ncurses/ncurses/tinfo/alloc_entry.c | 27 +- contrib/ncurses/ncurses/tinfo/alloc_ttype.c | 43 +- contrib/ncurses/ncurses/tinfo/captoinfo.c | 87 +- contrib/ncurses/ncurses/tinfo/comp_error.c | 16 +- contrib/ncurses/ncurses/tinfo/comp_expand.c | 22 +- contrib/ncurses/ncurses/tinfo/comp_hash.c | 14 +- contrib/ncurses/ncurses/tinfo/comp_parse.c | 59 +- contrib/ncurses/ncurses/tinfo/comp_scan.c | 68 +- contrib/ncurses/ncurses/tinfo/db_iterator.c | 66 +- contrib/ncurses/ncurses/tinfo/doalloc.c | 6 +- contrib/ncurses/ncurses/tinfo/entries.c | 30 +- contrib/ncurses/ncurses/tinfo/getenv_num.c | 14 +- contrib/ncurses/ncurses/tinfo/hashed_db.c | 49 +- contrib/ncurses/ncurses/tinfo/home_terminfo.c | 12 +- contrib/ncurses/ncurses/tinfo/init_keytry.c | 10 +- contrib/ncurses/ncurses/tinfo/lib_acs.c | 24 +- contrib/ncurses/ncurses/tinfo/lib_baudrate.c | 21 +- contrib/ncurses/ncurses/tinfo/lib_cur_term.c | 22 +- contrib/ncurses/ncurses/tinfo/lib_data.c | 44 +- contrib/ncurses/ncurses/tinfo/lib_has_cap.c | 8 +- contrib/ncurses/ncurses/tinfo/lib_kernel.c | 18 +- contrib/ncurses/ncurses/tinfo/lib_napms.c | 10 +- contrib/ncurses/ncurses/tinfo/lib_options.c | 30 +- contrib/ncurses/ncurses/tinfo/lib_print.c | 15 +- contrib/ncurses/ncurses/tinfo/lib_raw.c | 39 +- contrib/ncurses/ncurses/tinfo/lib_setup.c | 148 +- contrib/ncurses/ncurses/tinfo/lib_termcap.c | 60 +- contrib/ncurses/ncurses/tinfo/lib_termname.c | 10 +- contrib/ncurses/ncurses/tinfo/lib_tgoto.c | 18 +- contrib/ncurses/ncurses/tinfo/lib_ti.c | 12 +- contrib/ncurses/ncurses/tinfo/lib_tparm.c | 52 +- contrib/ncurses/ncurses/tinfo/lib_tputs.c | 32 +- contrib/ncurses/ncurses/tinfo/lib_ttyflags.c | 46 +- contrib/ncurses/ncurses/tinfo/lib_win32con.c | 414 +- contrib/ncurses/ncurses/tinfo/lib_win32util.c | 11 +- contrib/ncurses/ncurses/tinfo/make_hash.c | 51 +- contrib/ncurses/ncurses/tinfo/make_keys.c | 25 +- contrib/ncurses/ncurses/tinfo/name_match.c | 16 +- contrib/ncurses/ncurses/tinfo/obsolete.c | 14 +- contrib/ncurses/ncurses/tinfo/parse_entry.c | 56 +- contrib/ncurses/ncurses/tinfo/read_entry.c | 42 +- contrib/ncurses/ncurses/tinfo/read_termcap.c | 78 +- contrib/ncurses/ncurses/tinfo/strings.c | 14 +- contrib/ncurses/ncurses/tinfo/tinfo_driver.c | 125 +- contrib/ncurses/ncurses/tinfo/trim_sgr0.c | 98 +- contrib/ncurses/ncurses/tinfo/write_entry.c | 76 +- contrib/ncurses/ncurses/trace/lib_trace.c | 22 +- contrib/ncurses/ncurses/trace/lib_traceatr.c | 35 +- contrib/ncurses/ncurses/trace/lib_tracebits.c | 22 +- contrib/ncurses/ncurses/trace/lib_tracechr.c | 10 +- contrib/ncurses/ncurses/trace/lib_tracedmp.c | 8 +- contrib/ncurses/ncurses/trace/lib_tracemse.c | 10 +- contrib/ncurses/ncurses/trace/trace_buf.c | 26 +- contrib/ncurses/ncurses/trace/trace_tries.c | 10 +- contrib/ncurses/ncurses/trace/varargs.c | 38 +- contrib/ncurses/ncurses/trace/visbuf.c | 24 +- contrib/ncurses/ncurses/tty/MKexpanded.sh | 11 +- contrib/ncurses/ncurses/tty/hardscroll.c | 16 +- contrib/ncurses/ncurses/tty/hashmap.c | 26 +- contrib/ncurses/ncurses/tty/lib_mvcur.c | 84 +- contrib/ncurses/ncurses/tty/lib_tstp.c | 16 +- contrib/ncurses/ncurses/tty/lib_twait.c | 12 +- contrib/ncurses/ncurses/tty/lib_vidattr.c | 12 +- contrib/ncurses/ncurses/tty/tty_update.c | 48 +- contrib/ncurses/ncurses/wcwidth.h | 966 +- contrib/ncurses/ncurses/widechar/charable.c | 9 +- contrib/ncurses/ncurses/widechar/lib_add_wch.c | 12 +- contrib/ncurses/ncurses/widechar/lib_box_set.c | 6 +- contrib/ncurses/ncurses/widechar/lib_cchar.c | 8 +- contrib/ncurses/ncurses/widechar/lib_get_wch.c | 10 +- contrib/ncurses/ncurses/widechar/lib_get_wstr.c | 8 +- contrib/ncurses/ncurses/widechar/lib_hline_set.c | 6 +- contrib/ncurses/ncurses/widechar/lib_in_wch.c | 8 +- contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c | 10 +- contrib/ncurses/ncurses/widechar/lib_ins_wch.c | 53 +- contrib/ncurses/ncurses/widechar/lib_inwstr.c | 33 +- contrib/ncurses/ncurses/widechar/lib_key_name.c | 6 +- contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c | 6 +- contrib/ncurses/ncurses/widechar/lib_slk_wset.c | 8 +- contrib/ncurses/ncurses/widechar/lib_unget_wch.c | 10 +- contrib/ncurses/ncurses/widechar/lib_vid_attr.c | 26 +- contrib/ncurses/ncurses/widechar/lib_vline_set.c | 6 +- contrib/ncurses/ncurses/widechar/lib_wacs.c | 8 +- contrib/ncurses/ncurses/widechar/lib_wunctrl.c | 13 +- contrib/ncurses/ncurses/widechar/widechars.c | 12 +- contrib/ncurses/ncurses/win32con/gettimeofday.c | 9 +- contrib/ncurses/ncurses/win32con/wcwidth.c | 13 +- contrib/ncurses/ncurses/win32con/win32_driver.c | 101 +- contrib/ncurses/ncurses/win32con/win_driver.c | 2282 ---- contrib/ncurses/panel/Makefile.in | 28 +- contrib/ncurses/panel/p_above.c | 16 +- contrib/ncurses/panel/p_below.c | 18 +- contrib/ncurses/panel/p_new.c | 6 +- contrib/ncurses/panel/panel.c | 18 +- contrib/ncurses/panel/panel.priv.h | 6 +- contrib/ncurses/progs/Makefile.in | 67 +- contrib/ncurses/progs/capconvert | 44 +- contrib/ncurses/progs/clear.c | 6 +- contrib/ncurses/progs/clear_cmd.c | 69 +- contrib/ncurses/progs/dump_entry.c | 66 +- contrib/ncurses/progs/infocmp.c | 295 +- contrib/ncurses/progs/modules | 28 +- contrib/ncurses/progs/progs.priv.h | 4 +- contrib/ncurses/progs/reset_cmd.c | 90 +- contrib/ncurses/progs/tabs.c | 51 +- contrib/ncurses/progs/tic.c | 183 +- contrib/ncurses/progs/toe.c | 82 +- contrib/ncurses/progs/tput.c | 156 +- contrib/ncurses/progs/tset.c | 70 +- lib/ncurses/tinfo/Makefile | 16 +- lib/ncurses/tinfo/ncurses_cfg.h | 30 +- tools/build/mk/OptionalObsoleteFiles.inc | 3 - 415 files changed, 30494 insertions(+), 25899 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index fcde02df0b6d..feac4ca5a746 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -55,6 +55,11 @@ OLD_FILES+=usr/tests/usr.bin/m4/legacy_test OLD_FILES+=usr/tests/usr.bin/m4/regress.sh +# 20260114: remove ncurses html documentation +OLD_FILES+=usr/share/doc/ncurses/hackguide.html +OLD_FILES+=usr/share/doc/ncurses/ncurses-intro.html +OLD_DIRS+=usr/share/doc/ncurses + # 20251218: Remove old MLINK to apmconf(8) OLD_FILES+=usr/share/man/man8/apmconf.8.gz diff --git a/contrib/ncurses/AUTHORS b/contrib/ncurses/AUTHORS index 09dfc9a9efa6..f588fc44f2f4 100644 --- a/contrib/ncurses/AUTHORS +++ b/contrib/ncurses/AUTHORS @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2020,2021 Thomas E. Dickey -- +-- Copyright 2020-2024,2025 Thomas E. Dickey -- -- Copyright 2006,2017 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: AUTHORS,v 1.5 2021/06/17 21:20:30 tom Exp $ +-- $Id: AUTHORS,v 1.8 2025/11/12 01:25:55 tom Exp $ ------------------------------------------------------------------------------- These are the principal authors/contributors of ncurses since 1.9.9e, in decreasing order of their contribution: @@ -36,5 +36,6 @@ JPF Juergen Pfeifer ESR Eric S Raymond AVL Alexander V Lukyanov PB Philippe Blain +GBR Branden Robinson SV Sven Verdoolaege -NB Nicolas Boulenguez +NB Nicolas Boulenguez diff --git a/contrib/ncurses/COPYING b/contrib/ncurses/COPYING index 540047f121f1..6182a3bc671f 100644 --- a/contrib/ncurses/COPYING +++ b/contrib/ncurses/COPYING @@ -1,4 +1,4 @@ -Copyright 2018-2023,2024 Thomas E. Dickey +Copyright 2018-2024,2025 Thomas E. Dickey Copyright 1998-2017,2018 Free Software Foundation, Inc. Permission is hereby granted, free of charge, to any person obtaining a @@ -26,4 +26,4 @@ sale, use or other dealings in this Software without prior written authorization. -- vile:txtmode fc=72 --- $Id: COPYING,v 1.13 2024/01/05 21:13:17 tom Exp $ +-- $Id: COPYING,v 1.14 2025/01/04 10:53:46 tom Exp $ diff --git a/contrib/ncurses/INSTALL b/contrib/ncurses/INSTALL index a2076eeec261..fea738a4c465 100644 --- a/contrib/ncurses/INSTALL +++ b/contrib/ncurses/INSTALL @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2018-2023,2024 Thomas E. Dickey -- +-- Copyright 2018-2024,2025 Thomas E. Dickey -- -- Copyright 1998-2017,2018 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: INSTALL,v 1.254 2024/04/27 14:21:05 tom Exp $ +-- $Id: INSTALL,v 1.263 2025/12/30 20:42:25 tom Exp $ --------------------------------------------------------------------- How to install Ncurses/Terminfo on your system --------------------------------------------------------------------- @@ -550,8 +550,8 @@ CONFIGURE OPTIONS: problem. --enable-bsdpad - Recognize BSD-style prefix padding. Some ancient BSD programs (such as - nethack) call tputs("50") to implement delays. + Recognize BSD-style prefix padding. Some programs written using + the BSD curses API use tputs("50") to implement delays. --enable-check-size Compile-in feature to detect screensize for terminals which do not @@ -587,7 +587,8 @@ CONFIGURE OPTIONS: as such to the debugger. See also the --disable-macros option. --enable-exp-win32 - When configuring for MinGW, use the experimental Windows 10 driver. + This is an obsolete option used for configuring the Windows 10 driver + for MinGW. --enable-ext-colors Extend the cchar_t structure to allow more than 16 colors to be @@ -650,6 +651,12 @@ CONFIGURE OPTIONS: may not be accurate, or that your stty settings have disabled the use of tabs. + --enable-install-prefix + Extend the --with-install-prefix feature to replace the prefix value + with $DESTDIR rather than simply prepending $DESTDIR to install + pathnames. This works with any "make" which supports AT&T style + variable substitution. + --enable-interop Compile-in experimental interop bindings. These provide generic types for the form-library. @@ -660,6 +667,10 @@ CONFIGURE OPTIONS: systems). If you do not specify this option, the configure script checks the current filesystem. + --enable-named-pipes + Compile-in support for named pipes, used to connect to Windows 10 + pseudo-console. + --enable-no-padding Compile-in support for the $NCURSES_NO_PADDING environment variable, which allows you to suppress the effect of non-mandatory padding in @@ -703,7 +714,7 @@ CONFIGURE OPTIONS: Use rpath option when generating shared libraries, and (with some restrictions) when linking the corresponding programs. This originally (in 1997) applied mainly to systems using the GNU linker (read the - manpage). + man page). More recently it is useful for systems that require special treatment shared libraries in "unusual" locations. The "system" libraries reside @@ -768,9 +779,9 @@ CONFIGURE OPTIONS: unless you have disabled the extended functions. --enable-term-driver - Enable experimental terminal-driver. This is currently used for the - MinGW port, by providing a way to substitute the low-level terminfo - library with different terminal drivers. + Enable terminal-driver. This is required for the MinGW port, by + providing a way to substitute the low-level terminfo library with + different terminal drivers. --enable-termcap Compile in support for reading terminal descriptions from termcap if no @@ -1097,34 +1108,35 @@ CONFIGURE OPTIONS: ./configure --enable-static --with-manpage-aliases - Tell the configure script you wish to create entries in the - man-directory for aliases to manpages which list them, e.g., the - functions in the panel manpage. This is the default. You can disable - it if your man program does this. You can also disable - --with-manpage-symlinks to install files containing a ".so" command - rather than symbolic links. + Create files in subdirectories of the installation "man" directory that + alias the man pages documenting them. For example, the "beep" man page + also documents the function "flash". This is the default. You can + disable this procedure if your system's makewhatis(8) or mandb(8) + program indexes the directory to which the pages are installed. If you + disable man page symlinks by specifying "--without-manpage-symlinks", + the alias pages are created as stubs containing ".so" *roff requests. --with-manpage-format=XXX - Tell the configure script how you would like to install man-pages. The - option value must be one of these: gzip, compress, BSDI, normal, - formatted. If you do not give this option, the configure script + Tell the configure script how you would like to install man pages. The + option value must be one of these: "gzip", "compress", "BSDI", "normal", + "formatted". If you do not specify this option, the configure script attempts to determine which is the case. --with-manpage-renames=XXX - Tell the configure script that you wish to rename the manpages while - installing. Currently the only distribution which does this is Debian. + Tell the configure script that you wish to rename the man pages when + installing them. Debian and distributions descended from it do this. The option value specifies the name of a file that lists the renamed - files, e.g., $srcdir/man/man_db.renames + files, e.g., "$srcdir/man/man_db.renames". --with-manpage-symlinks Tell the configure script that you wish to make symbolic links in the - man-directory for aliases to the man-pages. This is the default, but - can be disabled for systems that provide this automatically. Doing - this on systems that do not support symbolic links will result in - copying the man-page for each alias. + man-directory for aliases to the man pages. This is the default, but + can be disabled for systems that provide this service automatically. + Doing this on systems that do not support symbolic links creates a copy + of the target man page for each alias. --with-manpage-tbl - Tell the configure script that you wish to preprocess the manpages + Tell the configure script that you wish to preprocess the man pages by running them through tbl to generate tables understandable by nroff. @@ -1182,11 +1194,11 @@ CONFIGURE OPTIONS: --with-pkg-config-libdir[=DIR] If pkg-config was found, override the automatic check for its library path. The optional DIR value can be - + "auto", automatically use pkg-config's library directory, or - + "libdir", use a ${libdir}/pkgconfig (based on the configuration), or - + a directory path, i.e., beginning with "/". The configure script allows only a single directory, because @@ -1351,11 +1363,9 @@ CONFIGURE OPTIONS: several builds, some symbols will be listed in the the ".map" files that do not happen to be present in one configuration or another. - The sample ".map" (and ".sym") files are generated using a set of - scripts which build several configurations for each release version, - checking to see which of the "_nc_" symbols can be made local. In - addition to the ncurses libraries and programs, the symbols used - by the "tack" program before version 1.08 are made global. + The sample ".map" (and ".sym") files were generated using a set of + scripts which built several configurations for each release version, + checking to see which of the "_nc_" symbols can be made local. These sample ".map" files will not cover all possible combinations. In some cases, e.g., when using the --with-weak-symbols option, you @@ -1393,10 +1403,10 @@ CONFIGURE OPTIONS: --without-curses-h Don't install the ncurses header with the name "curses.h". Rather, - install as "ncurses.h" and modify the installed headers and manpages + install as "ncurses.h" and modify the installed headers and man pages accordingly. - Likewise, do not install an alias "curses" for the ncurses manpage. + Likewise, do not install an alias "curses" for the ncurses man page. --without-cxx XSI curses declares "bool" as part of the interface. C++ also declares @@ -1419,7 +1429,7 @@ CONFIGURE OPTIONS: Do not use dlsym() to load GPM dynamically. --without-manpages - Tell the configure script to suppress the install of ncurses' manpages. + Tell the configure script to suppress the install of ncurses' man pages. --without-progs Tell the configure script to suppress the build of ncurses' application @@ -1451,7 +1461,32 @@ COMPATIBILITY WITH OLDER RELEASES: you may encounter when building a system with different versions of ncurses: - 6.5 (Apt 27, 2024) + 6.6 (Dec 30, 2025) + Interface changes: + + + none + + Added extensions: + + + none + + Added internal functions (other than "_sp" variants): + + + _nc_is_path_found + + Removed internal functions: + + + none + + Modified internal functions: + + + These now pass a const parameter: _nc_has_mouse, + _nc_reset_color_pair, _nc_free_entry, and _nc_timed_wait. + + These now use a NCURSES_BOOL where an int was used: + _nc_setupscreen, _nc_keypad, _nc_unicode_locale, and + _nc_retrace_bool. + + 6.5 (Apr 27, 2024) Interface changes: + the WINDOW structure and some related internal data types declared diff --git a/contrib/ncurses/MANIFEST b/contrib/ncurses/MANIFEST index a9395d2f8a09..dc791dbe0f1c 100644 --- a/contrib/ncurses/MANIFEST +++ b/contrib/ncurses/MANIFEST @@ -36,6 +36,8 @@ ./Ada95/mk-pkg.awk ./Ada95/package/AdaCurses-doc.spec ./Ada95/package/AdaCurses.spec +./Ada95/package/debian/adacurses.lintian-overrides +./Ada95/package/debian/adacurses.triggers ./Ada95/package/debian/compat ./Ada95/package/debian/control ./Ada95/package/debian/copyright @@ -556,21 +558,18 @@ ./include/headers ./include/nc_access.h ./include/nc_alloc.h -./include/nc_mingw.h ./include/nc_panel.h ./include/nc_string.h ./include/nc_termios.h ./include/nc_tparm.h -./include/nc_win32.h +./include/nc_win32.h.in ./include/ncurses_cfg.hin ./include/ncurses_defs ./include/ncurses_dll.h.in -./include/ncurses_mingw.h ./include/term_entry.h ./include/termcap.h.in ./include/tic.h ./include/unctrl.h.in -./include/win32_curses.h ./install-sh ./man/MKada_config.in ./man/MKncu_config.in @@ -900,6 +899,7 @@ ./ncurses/llib-ltinfow ./ncurses/modules ./ncurses/new_pair.h +./ncurses/report_ctype.c ./ncurses/report_hashing.c ./ncurses/report_offsets.c ./ncurses/term.priv.h @@ -1007,12 +1007,11 @@ ./ncurses/win32con/gettimeofday.c ./ncurses/win32con/wcwidth.c ./ncurses/win32con/win32_driver.c -./ncurses/win32con/win_driver.c ./package/debian-mingw/changelog ./package/debian-mingw/compat ./package/debian-mingw/control ./package/debian-mingw/copyright -./package/debian-mingw/mingw32-ncurses6.lintian-overrides +./package/debian-mingw/mingw32-ncurses6td.lintian-overrides ./package/debian-mingw/rules ./package/debian-mingw/source/format ./package/debian-mingw/watch @@ -1020,7 +1019,7 @@ ./package/debian-mingw64/compat ./package/debian-mingw64/control ./package/debian-mingw64/copyright -./package/debian-mingw64/mingw64-ncurses6.lintian-overrides +./package/debian-mingw64/mingw64-ncurses6td.lintian-overrides ./package/debian-mingw64/rules ./package/debian-mingw64/source/format ./package/debian-mingw64/watch @@ -1028,10 +1027,10 @@ ./package/debian/compat ./package/debian/control ./package/debian/copyright -./package/debian/ncurses6.lintian-overrides -./package/debian/ncurses6.triggers -./package/debian/ncursest6.lintian-overrides -./package/debian/ncursest6.triggers +./package/debian/ncurses6td.lintian-overrides +./package/debian/ncurses6td.triggers +./package/debian/ncursest6td.lintian-overrides +./package/debian/ncursest6td.triggers ./package/debian/rules ./package/debian/source/format ./package/debian/watch @@ -1190,6 +1189,8 @@ ./test/package/debian/control ./test/package/debian/copyright ./test/package/debian/docs +./test/package/debian/ncurses-examples.lintian-overrides +./test/package/debian/ncursest-examples.lintian-overrides ./test/package/debian/rules ./test/package/debian/source/format ./test/package/debian/watch diff --git a/contrib/ncurses/Makefile.in b/contrib/ncurses/Makefile.in index 1303e171cfa1..9a55006e0331 100644 --- a/contrib/ncurses/Makefile.in +++ b/contrib/ncurses/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.46 2022/10/01 22:53:36 tom Exp $ +# $Id: Makefile.in,v 1.51 2025/10/25 18:01:01 tom Exp $ ############################################################################## -# Copyright 2018-2021,2022 Thomas E. Dickey # +# Copyright 2018-2022,2025 Thomas E. Dickey # # Copyright 1998-2014,2015 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -35,11 +35,10 @@ SHELL = @SHELL@ VPATH = @srcdir@ -DESTDIR=@DESTDIR@ -RPATH_LIST=@RPATH_LIST@ -TOP_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" - @SET_MAKE@ +@SET_DESTDIR@ +RPATH_LIST = @RPATH_LIST@ +TOP_MFLAGS = DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" NCURSES_MAJOR = @NCURSES_MAJOR@ NCURSES_MINOR = @NCURSES_MINOR@ @@ -93,6 +92,7 @@ preinstall : @ echo '' @ echo ' extended funcs: '`test @NCURSES_EXT_FUNCS@ != 0 && echo yes || echo no` @ echo ' xterm terminfo: '@WHICH_XTERM@ + @ echo ' ABI suffix: '`if test -n "@ABI_SUFFIX@"; then echo @ABI_SUFFIX@; else echo "(none)"; fi` @ echo '' @ echo ' bin directory: '$(bindir) @ echo ' lib directory: '$(libdir) @@ -114,13 +114,10 @@ preinstall : distclean \ realclean :: -check : - @ echo The test-programs are interactive - - # Put the common rules here so that we can easily construct the list of # directories to visit. all \ +check \ clean \ distclean \ mostlyclean \ diff --git a/contrib/ncurses/Makefile.os2 b/contrib/ncurses/Makefile.os2 index bc3407d65750..68d4f898413d 100644 --- a/contrib/ncurses/Makefile.os2 +++ b/contrib/ncurses/Makefile.os2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2020,2021 Thomas E. Dickey # +# Copyright 2020-2021,2025 Thomas E. Dickey # # Copyright 1998-2000,2006 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ################################################################################ -# $Id: Makefile.os2,v 1.13 2021/06/17 21:20:30 tom Exp $ +# $Id: Makefile.os2,v 1.15 2025/07/12 10:48:01 tom Exp $ # # Wrapper Makefile for ncurses library under OS/2. # Author: Juan Jose Garcia Ripoll . @@ -247,7 +247,7 @@ OS2NAME=ncurses-$(NCURSES_MAJOR).$(NCURSES_MINOR)-emx os2dist : $(MAKE) -f Makefile.os2 os2clean ./configure --without-debug --with-install-prefix=`pwd|sed -e 's@^.:@@'`/$(OS2NAME) - $(MAKE) -f Makefile.os2 $(CF_MFLAGS) install.os2 + $(MAKE) -f Makefile.os2 install.os2 -rm -f $(OS2NAME).zip echo NCurses-$(NCURSES_MAJOR).$(NCURSES_MINOR)-$(NCURSES_PATCH) for emx > $(OS2NAME)/FILE_ID.DIZ echo Binary release. >> $(OS2NAME)/FILE_ID.DIZ diff --git a/contrib/ncurses/NEWS b/contrib/ncurses/NEWS index 8bedbc8264e1..c10767b675c8 100644 --- a/contrib/ncurses/NEWS +++ b/contrib/ncurses/NEWS @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2018-2023,2024 Thomas E. Dickey -- +-- Copyright 2018-2024,2025 Thomas E. Dickey -- -- Copyright 1998-2017,2018 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.4114 2024/04/27 18:00:35 tom Exp $ +-- $Id: NEWS,v 1.4390 2025/12/30 20:31:07 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,575 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20251230 6.6 release for upload to ftp.gnu.org + + update announcement + + corrected an ifdef needed for mouse support in MinGW/Windows + + eliminate remaining duplicate code between MinGW/Windows drivers + +20251227 + + make win32_curses.h obsolete in favor of nc_win32.h + + modify MinGW32 configuration to account for its use of Windows-style + pathnames in filesystem checks. + + replace --enable-exp-win32 option with --enable-named-pipes + +20251220 + > in-progress work to merge MinGW/Windows port. + + eliminate EXP_WIN32_DRIVER with USE_NAMED_PIPES + + change MS_TERMINAL to DEFAULT_TERM_VAR + +20251213 + + in-progress work to merge MinGW/Windows port. + + add a null-pointer check in tic -c option. + + add a limit-check in infocmp -i option (report/example by Yixuan Cao). + +20251206 + + in-progress work to merge MinGW/Windows port. + +20251129 + + in-progress work to merge MinGW/Windows port. + +20251123 + + revert change using NCURSES_SBOOL in tic.h which interfered with + sign-extension in tigetflag (Debian #1121191, cf: 20251101). + +20251122 + + in-progress work to merge MinGW/Windows port. + + correct expression for TINFO_LIB variable in misc/ncurses-config.in + (Debian #1121208, cf: 20251004). + +20251115 + + check for special case of wcrtomb() converting a single byte code to + a different single byte code, which glibc does for code 160 in the + KOI8-R encoding (report by Yury V Zaytsev). + + improve formatting/style of manpages (patches by Branden Robinson). + + amend recent changes to mouse handling to avoid a case which caused + a loop in wgetch until additional input is provided (htop #1769, + cf: 20250913). + +20251101 + + adjust generated terminfo.5 to omit tbl "x" column modifier if that + is unsupported, i.e., with old nroff/tbl (adapted from patch by + Branden Robinson). + + in-progress work to merge MinGW/Windows port. + +20251025 + + amend locale-portability fix in tty_update.c (MidnightCommander #4799, + cf: 20240203). + + add testing utility report_ctype + + update configure macros, improving check for $host_os + + correct a recent change to curs_termino.3x, along with formatting + fixes for manpages. + + corrected note about box() in curs_border.3x (patch by Jakub Horky, + cf: 20250201). + +20251018 + + add check for build-time utilities, in case cross-compiling is setup + with an invalid $BUILD_CC (prompted by discussion with Stas Sergeev). + + modify configure-script and makefiles to make it easier to override + the "--with-install-prefix" default with environment variable + (report by Stas Sergeev). + +20251010 *** 103520 LINES SKIPPED *** From nobody Tue Apr 14 03:29:04 2026 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 4fvqWP0L8tz6Z44M for ; Tue, 14 Apr 2026 03:29: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvqWN6XXgz3rMH for ; Tue, 14 Apr 2026 03:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776137345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y/UzqBo+/S/SjnOuCiF98TYC+HHEvUg+OehqztXm7D4=; b=fp3ZDLekHFyVVUqlOTW1vy6TtBtgdfpFUQ+jNq6Hl6JJvEsqynAtxK58GU10rB27zfnt+3 usSf+PiSo1V/JEFTMpoNVC6diwCq/XAXGtQB7ki+WbCoHoh7L6ME5E5c0wbQxvz/ZAUErt Z5olu4voVbsai+onx2fnnunda8Xs+CdzHmN7RPMQgfD5o3B/5GQE4qfZgnDXMx60uQau7p oMFyc9tfb9HRoomGfejFkapE3wIFpCXd513guOvDHopXx3Aa0N9gTFsr+2cUYauJP6/r0E OVh0V0U0BjHwpWLhWYhe4vW3n+JpqAeGEguPvT/tI552YVXGVSt57arf9M6SIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776137345; a=rsa-sha256; cv=none; b=aKGSbegNmKNDEslEYqHEVRAKuo5RGHfuPmAFVdn0ANHVv8K9AqLOKmZ+aPs0uFjznqycZP lhlvHs9n5OlVAhBlJN0JLguk3RmI3s8QvIwCBxxrJa+I6vOykTQKldMbn/p0A9/aM5jvkR 1MwK2Y236ErgbPqvTtf5o11lAB7ShJn2Bxbbe2ZkHOxT7TmfCwSZUGLgHBZPF4iY8hPOII 7uwn1UXzIel6BmS4PgOXpzxi+s1BKj1UyQn//2ZTousW2Bej1a6+ZwHrjjGmzu5xIeA5Cd JR3KxWqLPim31N6gF/LqBfTnqwyFcCAKxmjxhx70nKvLEGbRqw5hlB8WpVhliw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776137345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y/UzqBo+/S/SjnOuCiF98TYC+HHEvUg+OehqztXm7D4=; b=KmY5psLS+nT5gWzBN4tlnRrJvZNDa6His13r4HQWRnECQFmZzLcZoEIxeAfy49ajCT8JqW P34lALEM50chjfPD2tkwBd3vLV1EaWwNPuMYbhGzLlJiBwds/Df+bQR/64eFAYS9lmFYqJ UrHM9I5ZLW0xray0RMzTIrxqQKPSdrCAmG0gK8SvsmKq72PfYqgB0kDiMawVUZGp/hIsRr N3l0S6iL4fvhkGBmjsT5XNrZVvlNvIYs42+zB7cRcSJ9YmPTe+SQxOvfikTLNv9A5KIV0I DRsB48q2nOaIR//Z24gcHnOetCeUjoNJwEj62p2z+fa5DSntdcVDd384ven7cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvqWN5qvTzZ51 for ; Tue, 14 Apr 2026 03:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2362a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 03:29:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 692a289922d2 - stable/15 - nfs_diskless: Fix handling of nfsuserd case for NFSv4 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 692a289922d2a7005357e01d5c770a0abcd777cc Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 03:29:04 +0000 Message-Id: <69ddb480.2362a.1a80e80b@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=692a289922d2a7005357e01d5c770a0abcd777cc commit 692a289922d2a7005357e01d5c770a0abcd777cc Author: Rick Macklem AuthorDate: 2026-04-07 15:50:21 +0000 Commit: Rick Macklem CommitDate: 2026-04-14 03:26:32 +0000 nfs_diskless: Fix handling of nfsuserd case for NFSv4 Commit 8b9775912cbc added support for an NFSv4 mounted root file system, but only if the NFSv4 configuration used id numbers in the strings. This patch adds support for the case where the NFSv4 configuration uses name<-->id mappings via nfsuserd(8) by priming the mapping cache with just enough entries so that it works until the nfsuserd(8) is running. They are listed in nfs_prime_userd[] in sys/fs/nfs/nfs_commonsubs.c. The entries in nfs_prime_userd[] are also wired into the kernel's cache for name<-->id mappings when nfsuserd(8) starts up. This is necessary, since an upcall to the nfsuserd(8) daemon for a mapping when looking up the path to the passwd/group database files (/etc) will hang the system, due to a vnode lock being held on the entry in the path which blocks nfsuserd(8) from accessing files. To enable this case, the following must be put in the NFS root file system's /boot/loader.conf: boot.nfsroot.options="nfsv4" boot.nfsroot.user_domain="" where must be the same as nfsuserd uses (usually set via the -domain flag). If boot.nfsroot.user_domain does not exist or is the empty string, ids is strings is configured. (cherry picked from commit 53b4ae3bf0f7e625d51fa263a5bd3859792d61e3) --- sys/fs/nfs/nfs_commonsubs.c | 76 +++++++++++++++++++++++++++++++++++++++------ sys/fs/nfs/nfsid.h | 13 ++++++++ sys/fs/nfs/nfsrvstate.h | 1 + sys/nfs/nfs_diskless.c | 44 ++++++++++++++++++++++++++ 4 files changed, 124 insertions(+), 10 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 78e2fbb72bdb..39d7cb447d6a 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -70,6 +70,7 @@ struct nfsreqhead nfsd_reqq; int nfsrv_lease = NFSRV_LEASE; int ncl_mbuf_mlen = MLEN; int nfsrv_doflexfile = 0; +bool nfs_nfsv4root = false; NFSNAMEIDMUTEX; NFSSOCKMUTEX; extern int nfsrv_lughashsize; @@ -80,6 +81,21 @@ extern struct nfsdevicehead nfsrv_devidhead; extern struct nfsstatsv1 nfsstatsv1; extern uint32_t nfs_srvmaxio; +/* + * Define just enough NFSv4 id<-->name mappings to make things work + * until the nfsuserd(8) is running. + * XXX These name/ids must be kept the same as what is in /etc/passwd + * and /etc/group. + */ +struct nfs_prime_userd nfs_prime_userd[] = { + { NFSID_INITIALIZE, UID_NOBODY, GID_NOGROUP, NULL }, + { NFSID_ADDUID, UID_ROOT, GID_NOGROUP, "root" }, + { NFSID_ADDUID, UID_BIN, GID_NOGROUP, "bin" }, + { NFSID_ADDGID, UID_NOBODY, GID_WHEEL, "wheel" }, + { NFSID_ADDGID, UID_NOBODY, GID_OPERATOR, "operator" }, + { 0, 0, 0, NULL }, +}; + NFSD_VNET_DEFINE(int, nfsd_enable_stringtouid) = 0; NFSD_VNET_DEFINE(struct nfssockreq, nfsrv_nfsuserdsock); NFSD_VNET_DEFINE(nfsuserd_state, nfsrv_nfsuserd) = NOTRUNNING; @@ -233,6 +249,7 @@ static int nfsrv_skipace(struct nfsrv_descript *nd, acl_type_t, int *acesizep); static void nfsv4_wanted(struct nfsv4lock *lp); static uint32_t nfsv4_filesavail(struct statfs *, struct mount *); static int nfsrv_getuser(int procnum, uid_t uid, gid_t gid, char *name); +static bool nfs_in_prime(int flag, uid_t uid, gid_t gid); static void nfsrv_removeuser(struct nfsusrgrp *usrp, int isuser); static int nfsrv_getrefstr(struct nfsrv_descript *, u_char **, u_char **, int *, int *); @@ -3667,7 +3684,8 @@ tryagain: mtx_lock(&hp->mtx); TAILQ_FOREACH(usrp, &hp->lughead, lug_numhash) { if (usrp->lug_uid == uid) { - if (usrp->lug_expiry < NFSD_MONOSEC) + if (!usrp->lug_wired && + usrp->lug_expiry < NFSD_MONOSEC) break; /* * If the name doesn't already have an '@' @@ -3759,7 +3777,8 @@ tryagain: mtx_lock(&hp->mtx); TAILQ_FOREACH(usrp, &hp->lughead, lug_numhash) { if (usrp->lug_uid == uid) { - if (usrp->lug_expiry < NFSD_MONOSEC) + if (!usrp->lug_wired && + usrp->lug_expiry < NFSD_MONOSEC) break; if (usrp->lug_cred != NULL) { newcred = crhold(usrp->lug_cred); @@ -3859,7 +3878,8 @@ tryagain: TAILQ_FOREACH(usrp, &hp->lughead, lug_namehash) { if (usrp->lug_namelen == len && !NFSBCMP(usrp->lug_name, str, len)) { - if (usrp->lug_expiry < NFSD_MONOSEC) + if (!usrp->lug_wired && + usrp->lug_expiry < NFSD_MONOSEC) break; hp2 = NFSUSERHASH(usrp->lug_uid); mtx_lock(&hp2->mtx); @@ -3936,7 +3956,8 @@ tryagain: mtx_lock(&hp->mtx); TAILQ_FOREACH(usrp, &hp->lughead, lug_numhash) { if (usrp->lug_gid == gid) { - if (usrp->lug_expiry < NFSD_MONOSEC) + if (!usrp->lug_wired && + usrp->lug_expiry < NFSD_MONOSEC) break; /* * If the name doesn't already have an '@' @@ -4081,7 +4102,8 @@ tryagain: TAILQ_FOREACH(usrp, &hp->lughead, lug_namehash) { if (usrp->lug_namelen == len && !NFSBCMP(usrp->lug_name, str, len)) { - if (usrp->lug_expiry < NFSD_MONOSEC) + if (!usrp->lug_wired && + usrp->lug_expiry < NFSD_MONOSEC) break; hp2 = NFSGROUPHASH(usrp->lug_gid); mtx_lock(&hp2->mtx); @@ -4282,6 +4304,23 @@ out: return (error); } +/* Check to see if the uid/gid is in the nfs_prime_userd list. */ +static bool +nfs_in_prime(int flag, uid_t uid, gid_t gid) +{ + int i; + + for (i = 0; nfs_prime_userd[i].flag != 0; i++) { + if ((nfs_prime_userd[i].flag & flag) == NFSID_ADDUID && + nfs_prime_userd[i].uid == uid) + return (true); + if ((nfs_prime_userd[i].flag & flag) == NFSID_ADDGID && + nfs_prime_userd[i].gid == gid) + return (true); + } + return (false); +} + /* * This function is called from the nfssvc(2) system call, to update the * kernel user/group name list(s) for the V4 owner and ownergroup attributes. @@ -4305,7 +4344,11 @@ nfssvc_idname(struct nfsd_idargs *nidp) } if (nidp->nid_flag & NFSID_INITIALIZE) { cp = malloc(nidp->nid_namelen + 1, M_NFSSTRING, M_WAITOK); - error = copyin(nidp->nid_name, cp, nidp->nid_namelen); + error = 0; + if ((nidp->nid_flag & NFSID_SYSSPACE) == 0) + error = copyin(nidp->nid_name, cp, nidp->nid_namelen); + else + NFSBCOPY(nidp->nid_name, cp, nidp->nid_namelen); if (error != 0) { free(cp, M_NFSSTRING); goto out; @@ -4403,8 +4446,12 @@ nfssvc_idname(struct nfsd_idargs *nidp) */ newusrp = malloc(sizeof(struct nfsusrgrp) + nidp->nid_namelen, M_NFSUSERGROUP, M_WAITOK | M_ZERO); - error = copyin(nidp->nid_name, newusrp->lug_name, - nidp->nid_namelen); + error = 0; + if ((nidp->nid_flag & NFSID_SYSSPACE) == 0) + error = copyin(nidp->nid_name, newusrp->lug_name, + nidp->nid_namelen); + else + NFSBCOPY(nidp->nid_name, newusrp->lug_name, nidp->nid_namelen); if (error == 0 && nidp->nid_ngroup > 0 && (nidp->nid_flag & NFSID_ADDUID) != 0) { grps = NULL; @@ -4522,7 +4569,11 @@ nfssvc_idname(struct nfsd_idargs *nidp) newusrp->lug_expiry = NFSD_MONOSEC + nidp->nid_usertimeout; else newusrp->lug_expiry = NFSD_MONOSEC + 5; + newusrp->lug_wired = false; if (nidp->nid_flag & (NFSID_ADDUID | NFSID_ADDUSERNAME)) { + if (nfs_nfsv4root && nfs_in_prime(NFSID_ADDUID, nidp->nid_uid, + nidp->nid_gid)) + newusrp->lug_wired = true; newusrp->lug_uid = nidp->nid_uid; thp = NFSUSERHASH(newusrp->lug_uid); mtx_assert(&thp->mtx, MA_OWNED); @@ -4532,6 +4583,9 @@ nfssvc_idname(struct nfsd_idargs *nidp) TAILQ_INSERT_TAIL(&thp->lughead, newusrp, lug_namehash); atomic_add_int(&NFSD_VNET(nfsrv_usercnt), 1); } else if (nidp->nid_flag & (NFSID_ADDGID | NFSID_ADDGROUPNAME)) { + if (nfs_nfsv4root && nfs_in_prime(NFSID_ADDGID, nidp->nid_uid, + nidp->nid_gid)) + newusrp->lug_wired = true; newusrp->lug_gid = nidp->nid_gid; thp = NFSGROUPHASH(newusrp->lug_gid); mtx_assert(&thp->mtx, MA_OWNED); @@ -4580,7 +4634,8 @@ nfssvc_idname(struct nfsd_idargs *nidp) TAILQ_FOREACH_SAFE(usrp, &NFSD_VNET(nfsuserhash)[i].lughead, lug_numhash, nusrp) - if (usrp->lug_expiry < NFSD_MONOSEC) + if (!usrp->lug_wired && + usrp->lug_expiry < NFSD_MONOSEC) nfsrv_removeuser(usrp, 1); } for (i = 0; i < nfsrv_lughashsize; i++) { @@ -4610,7 +4665,8 @@ nfssvc_idname(struct nfsd_idargs *nidp) TAILQ_FOREACH_SAFE(usrp, &NFSD_VNET(nfsgrouphash)[i].lughead, lug_numhash, nusrp) - if (usrp->lug_expiry < NFSD_MONOSEC) + if (!usrp->lug_wired && + usrp->lug_expiry < NFSD_MONOSEC) nfsrv_removeuser(usrp, 0); } for (i = 0; i < nfsrv_lughashsize; i++) { diff --git a/sys/fs/nfs/nfsid.h b/sys/fs/nfs/nfsid.h index bd9807ca1acc..349fdecfc596 100644 --- a/sys/fs/nfs/nfsid.h +++ b/sys/fs/nfs/nfsid.h @@ -61,6 +61,19 @@ struct nfsd_idargs { #define NFSID_SYSSPACE 0x0200 #if defined(_KERNEL) || defined(KERNEL) +/* + * Define just enough NFSv4 id<-->name mappings to make things work + * until the nfsuserd(8) is running. + * XXX These name/ids must be kept the same as what is in /etc/passwd + * and /etc/group. + */ +struct nfs_prime_userd { + int flag; + uid_t uid; + gid_t gid; + char *nam; +}; + int nfssvc_idname(struct nfsd_idargs *); #endif diff --git a/sys/fs/nfs/nfsrvstate.h b/sys/fs/nfs/nfsrvstate.h index cc19ed6fa1d2..858c52ec6218 100644 --- a/sys/fs/nfs/nfsrvstate.h +++ b/sys/fs/nfs/nfsrvstate.h @@ -317,6 +317,7 @@ struct nfsusrgrp { } lug_un; struct ucred *lug_cred; /* Cred. with groups list */ int lug_namelen; /* Name length */ + bool lug_wired; /* Wired into cache */ u_char lug_name[1]; /* malloc'd correct length */ }; #define lug_uid lug_un.un_uid diff --git a/sys/nfs/nfs_diskless.c b/sys/nfs/nfs_diskless.c index d5278612d8d9..32dd7f3e997f 100644 --- a/sys/nfs/nfs_diskless.c +++ b/sys/nfs/nfs_diskless.c @@ -54,6 +54,7 @@ #include #include #include +#include #define NFS_IFACE_TIMEOUT_SECS 10 /* Timeout for interface to appear. */ @@ -70,6 +71,9 @@ struct nfs_diskless nfs_diskless = { { { 0 } } }; struct nfsv3_diskless nfsv3_diskless = { { { 0 } } }; int nfs_diskless_valid = 0; +extern struct nfs_prime_userd nfs_prime_userd[]; +extern bool nfs_nfsv4root; + /* * Validate/sanity check a rsize/wsize parameter. */ @@ -292,11 +296,51 @@ match_done: return; } } else { + struct nfsd_idargs nid; + int ret; + /* * For NFSv4, the file handle is derived from the * boot.nfsroot.path during mounting by NFSv4. */ nd3->root_fhsize = 0; + nfs_nfsv4root = true; + + /* + * Prime the id<-->name mappings just enough to + * make things work until the nfsuserd(8) daemon + * is started, if the nfsuserd_domain is set to a + * non-empty string. + */ + if ((cp = kern_getenv("boot.nfsroot.user_domain")) != + NULL) { + for (cnt = 0; *cp != '\0' && + nfs_prime_userd[cnt].flag != 0; cnt++) { + nid.nid_flag = + nfs_prime_userd[cnt].flag | + NFSID_SYSSPACE; + if (nfs_prime_userd[cnt].flag == + NFSID_INITIALIZE) { + nid.nid_name = cp; + nid.nid_usermax = 10; + } else { + nid.nid_name = + nfs_prime_userd[cnt].nam; + nid.nid_usertimeout = 3600; + } + nid.nid_namelen = strlen(nid.nid_name); + nid.nid_uid = nfs_prime_userd[cnt].uid; + nid.nid_gid = nfs_prime_userd[cnt].gid; + nid.nid_ngroup = 0; + nid.nid_grps = NULL; + ret = nfssvc_idname(&nid); + if (ret != 0) + printf("nfs_diskless: " + "nfssvc_idname failed %d\n", + ret); + } + freeenv(cp); + } } if ((cp = kern_getenv("boot.nfsroot.path")) != NULL) { strncpy(nd3->root_hostnam, cp, MNAMELEN - 1); From nobody Tue Apr 14 07:12:03 2026 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 4fvwSg4Sygz6ZLK7 for ; Tue, 14 Apr 2026 07: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvwSg3WB8z4FPp for ; Tue, 14 Apr 2026 07: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=1776150723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJeqMzJWsA8zQD8lg9wyDeQRmFh1NJxNFyWtOJstYVs=; b=ambo13ao9/jW0gAO4kMYncqnH3hjDg5cGNfFqhSzhfTWzswYcdDx8Ebi27CGhOONjP7E+2 5yDf32vGAXnRmMIHNiJiU3QorfKQhH8NstX4deO6tDvp56E3hs8Av3ufXGSjU2I0Tl5t77 dD4SQHqumorHaQLocLNp+Dh91GxqF3w9mHrAwsUl20ZIXf1VW0QlwUiidmnCjOzfq1ly45 tXfL0iEC+8SVkObTHDbDMssNJIdKbOuPTjbeA1hObulEnRIle2XdaFABCP/fpoubAwhB9h a7aomwyaXG0swHbjN9DDpyFjMVHPtrvDDwEhzx5VvCXuSY52hI719i1Xprc6dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776150723; a=rsa-sha256; cv=none; b=LKUa93ubiYasI6OJmmY6P9cDXsaisnSnHfGmXdofbvZGckzJQMdX3obs3or0XH6ngMgkuo gSC0t/HFcW+8ApZ0TksfMhCf6U6vpHvzbhSf3NGGwXNeUZlx4wOfyxPTqiPmjE3YPi32GV nFwf05xrUUvuUgROZPpPdQoe4q2N9FwL2zHO6+nQ5c4gj4Z0um7yT+W+y/zuJ55HlfoxrP 6LpbVXd5sSJ79KqUzSFEM7FEBSsDTgDRwakAMG710UnEXAdGRhhT87fge+wELMg928Hnz0 QkjiMHghYOVob0vDN4pbcY7jjGfQv0tTAw8CUy9T2EwMb//CB9nntV8uvnVVzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776150723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJeqMzJWsA8zQD8lg9wyDeQRmFh1NJxNFyWtOJstYVs=; b=EJW7iqO8pxn/ZiGdblLswiO1s/EAJqPf0VX/KXvideJSYjktovFg0OVH8r461ijC/Kb3j1 qntzksZp2Qs5iZgi8yoPK1r0zWBaAu+iD0b4UTUmWzRpe25yTI9kQgRj6K1IQM2kRoT3z3 vZTNvP9UqgIEiLMLJksJ3ALUlqb+DJ6ZLxkE10YtNQPZHUeuHYDzwxgkabtdQZgd8EhUfh JcwUMhGhLdbdIzljOKlXlxxC25gkkYa26WcQpUmUZPGeXaPoITEMZRtSULjshd9B4jXpEZ 6NUVbfNPqgcqz3H42PpxVMwELq7nyBA7Gy4Zh6q6gGacrWGTfX/d03bCyJFlDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvwSg34Tmzgy8 for ; Tue, 14 Apr 2026 07:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42cee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 07:12:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 80a97bc62250 - stable/15 - loader.efi.8/efibootmgr.8: Don't use contradicting term 'EFI BIOS' 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 80a97bc622509ac56a6e49c9254441de7817e16d Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 07:12:03 +0000 Message-Id: <69dde8c3.42cee.114a8218@gitrepo.freebsd.org> The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=80a97bc622509ac56a6e49c9254441de7817e16d commit 80a97bc622509ac56a6e49c9254441de7817e16d Author: Michael Osipov AuthorDate: 2026-04-09 11:39:41 +0000 Commit: Michael Osipov CommitDate: 2026-04-14 07:11:00 +0000 loader.efi.8/efibootmgr.8: Don't use contradicting term 'EFI BIOS' Both (U)EFI and BIOS are completely different things, be precise and don't use them together. Reviewed by: imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56329 (cherry picked from commit 4f684e929de1275b1099b17b2a2cff0d3f4af223) --- stand/efi/loader/main.c | 8 ++++---- stand/man/loader.efi.8 | 12 ++++++------ usr.sbin/efibootmgr/efibootmgr.8 | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 65a45d241fe4..b5851680ad8e 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -977,10 +977,10 @@ parse_uefi_con_out(void) * If we don't have any Con* variable use both. If we have GOP * make video primary, otherwise set serial primary. In either * case, try to use both the 'efi' console which will use the - * GOP, if present and serial. If there's an EFI BIOS that omits - * this, but has a serial port redirect, we'll unavioidably get - * doubled characters, but we'll be right in all the other more - * common cases. + * GOP, if present and serial. If there's a UEFI firmware that + * omit this, but has a serial port redirect, we'll unavoidably + * get doubled characters, but we'll be right in all the other + * more common cases. */ if (efi_has_gop()) how |= RB_MULTIPLE; diff --git a/stand/man/loader.efi.8 b/stand/man/loader.efi.8 index 80d16d45670a..8bb88dd2e24f 100644 --- a/stand/man/loader.efi.8 +++ b/stand/man/loader.efi.8 @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 3, 2024 +.Dd April 11, 2026 .Dt LOADER.EFI 8 .Os .Sh NAME @@ -64,7 +64,7 @@ process. .Xr boot1.efi 8 is deprecated for new installations. .Ss Console Considerations -The EFI BIOS provides a generic console. +The UEFI firmware provides a generic console. In .Nm this is selected by specifying @@ -114,8 +114,8 @@ primary if a UEFI graphics device is detected, or the serial console as primary if not. .Pp On x86 platforms, if you wish to redirect the loader's output to a serial port -when the EFI BIOS doesn't support it, or to a serial port that isn't the one the -EFI BIOS redirects its output to, set +when the UEFI firmware doesn't support it, or to a serial port that isn't the +one the UEFI firmware redirects its output to, set .Dv console to .Dq comconsole . @@ -135,9 +135,9 @@ If this causes a doubling of characters, set .Dv console to .Dq efi , -since your EFI BIOS is redirecting to the serial port already. +since your UEFI firmware is redirecting to the serial port already. .Pp -If your EFI BIOS redirects the serial port, you may need to tell the kernel +If your UEFI firmware redirects the serial port, you may need to tell the kernel which address to use. EFI uses ACPI's UID to identify the serial port, but .Nm diff --git a/usr.sbin/efibootmgr/efibootmgr.8 b/usr.sbin/efibootmgr/efibootmgr.8 index e5054023e40c..62ca0d6da3b2 100644 --- a/usr.sbin/efibootmgr/efibootmgr.8 +++ b/usr.sbin/efibootmgr/efibootmgr.8 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 22, 2024 +.Dd April 11, 2026 .Dt EFIBOOTMGR 8 .Os .Sh NAME @@ -84,7 +84,7 @@ boot method to be tried once upon the next boot. The UEFI standard defines how hosts may control what is used to bootstrap the system. Each method is encapsulated within a persistent UEFI variable, -stored by the UEFI BIOS of the form +stored by the UEFI firmware of the form .Cm Boot Ns Em XXXX (where XXXX are uppercase hexadecimal digits). These variables are numbered, each describing where to load the bootstrap From nobody Tue Apr 14 07:29:13 2026 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 4fvwrT5nrfz6ZMdG for ; Tue, 14 Apr 2026 07:29: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvwrT3Qqdz4JBF for ; Tue, 14 Apr 2026 07:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776151753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ug8H9IoS/JvUFmYFEsczAxW0K/KZAiBJKpWJ11YaLr0=; b=xUWPRh5qkQUhQnoX9zzCGccIuF0Bs9KyGegAHnzr/8ZU4QkL4HtxplcP2bfd4BL5tC4LbH kjiANRWu/aqJlAPfnQsn8jrhS51dMI+amfzmoBcs7x6B+YSyLS0Ab3Pb/n/NEZsCDeCWtV uivu9mmGYWD7YnHkghsQvSXFMlzRaV9oEwaUa6ljQdCA5H4foA1pRMI2T8jI7GpgZzHRLp UZgCcjvBLXQvexNPuYQ42Rz9t9HAmQPvnstHzVeNjnkJqydhSIoKzqMpI3zonLvz8iQZsR X3/SgodDzN9U2b/cflMqYj4/97BrHngTAV4+VsNBgs69u/8CAda6qHrkA5D4BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776151753; a=rsa-sha256; cv=none; b=GqGX2b1XmFhgYro1f5rojX2fdEkmNqt1yWAG0pJa3ebQkVrM6NafY9jCeVeU+EGWUi9aZN cgb8dRAK3jhpW4Azb+2sLY8w35fJUTzLvppEv29T9MBIn2LxqeCNATN2QmrCZlnqMvVDGE /86T1liZPOCrvpzlep4WwRGo1Hbis6+zHihIBvkdiPvVb2/geR0ae11ULWljstxxEUk4No XNpEwGwYPQLWTjD0t2Gpk0x0rtUY/6f8Xjd0QY7Z1f04S11K3XroM2nEJHWLPGW8lcX6Ea ROq8ZFtMPSfCnX2szZSZUdp4ubpTuiEr0QGdpx2fsibUtgMuNyVfmo5T8MqI2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776151753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ug8H9IoS/JvUFmYFEsczAxW0K/KZAiBJKpWJ11YaLr0=; b=UrlF+Kp2bCFc+bTGfEO2mUbed1pYLbCl+Bjpu3sQU4TYn/8HDGaUDN2bCzrFxYOPf9cnSA zxfL7glcEW3yxQ0hRdnz8p1g1Pso3i7/jA3q6G7Ve508tJ57PvK51DlpR4nRw4sryPG9Ac XGm/AezTwcUY8YHfhjunCpn5RKyGCZDomK8VmUSvEivokxdBGiH4cipafDzcY10QLIlpaV Tb8Yv5RvvtOarqgXHgbnBo9RVo/o4uh7eBIVNVjeqK8o/1y4VwNR8GLZ4FnvImaVn0rkRg oU6veW/hejsriACbJHR9gU3Tt4Je8nYPWBiYDNVc5GLuEPHNNXiid7LZPiSX0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvwrT32C0zhLS for ; Tue, 14 Apr 2026 07:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44053 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 07:29:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 55243172c190 - stable/14 - loader.efi.8/efibootmgr.8: Don't use contradicting term 'EFI BIOS' 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 55243172c19047530f9377505e8b759caff17925 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 07:29:13 +0000 Message-Id: <69ddecc9.44053.35374dda@gitrepo.freebsd.org> The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=55243172c19047530f9377505e8b759caff17925 commit 55243172c19047530f9377505e8b759caff17925 Author: Michael Osipov AuthorDate: 2026-04-09 11:39:41 +0000 Commit: Michael Osipov CommitDate: 2026-04-14 07:27:40 +0000 loader.efi.8/efibootmgr.8: Don't use contradicting term 'EFI BIOS' Both (U)EFI and BIOS are completely different things, be precise and don't use them together. Reviewed by: imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56329 (cherry picked from commit 4f684e929de1275b1099b17b2a2cff0d3f4af223) --- stand/efi/loader/main.c | 4 ++-- stand/man/loader.efi.8 | 12 ++++++------ usr.sbin/efibootmgr/efibootmgr.8 | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index d6a42c0241fc..0fdfeab118f2 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -756,8 +756,8 @@ parse_uefi_con_out(void) * If we don't have any ConOut default to both. If we have GOP * make video primary, otherwise just make serial primary. In * either case, try to use both the 'efi' console which will use - * the GOP, if present and serial. If there's an EFI BIOS that - * omits this, but has a serial port redirect, we'll + * the GOP, if present and serial. If there's an EFI firmware + * that omits this, but has a serial port redirect, we'll * unavioidably get doubled characters (but we'll be right in * all the other more common cases). */ diff --git a/stand/man/loader.efi.8 b/stand/man/loader.efi.8 index f2278247b648..e02ed4720be2 100644 --- a/stand/man/loader.efi.8 +++ b/stand/man/loader.efi.8 @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 3, 2024 +.Dd April 11, 2026 .Dt LOADER.EFI 8 .Os .Sh NAME @@ -64,7 +64,7 @@ process. .Xr boot1.efi 8 is deprecated for new installations. .Ss Console Considerations -The EFI BIOS provides a generic console. +The UEFI firmware provides a generic console. In .Nm this is selected by specifying @@ -114,8 +114,8 @@ primary if a UEFI graphics device is detected, or the serial console as primary if not. .Pp On x86 platforms, if you wish to redirect the loader's output to a serial port -when the EFI BIOS doesn't support it, or to a serial port that isn't the one the -EFI BIOS redirects its output to, set +when the UEFI firmware doesn't support it, or to a serial port that isn't the +one the UEFI firmware redirects its output to, set .Dv console to .Dq comconsole . @@ -135,9 +135,9 @@ If this causes a doubling of characters, set .Dv console to .Dq efi , -since your EFI BIOS is redirecting to the serial port already. +since your UEFI firmware is redirecting to the serial port already. .Pp -If your EFI BIOS redirects the serial port, you may need to tell the kernel +If your UEFI firmware redirects the serial port, you may need to tell the kernel which address to use. EFI uses ACPI's UID to identify the serial port, but .Nm diff --git a/usr.sbin/efibootmgr/efibootmgr.8 b/usr.sbin/efibootmgr/efibootmgr.8 index 68eef1c9cbb5..654b14e9ff7a 100644 --- a/usr.sbin/efibootmgr/efibootmgr.8 +++ b/usr.sbin/efibootmgr/efibootmgr.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 15, 2023 +.Dd April 11, 2026 .Dt EFIBOOTMGR 8 .Os .Sh NAME @@ -80,8 +80,8 @@ boot method to be tried once upon the next boot. .Pp The UEFI standard defines how hosts may control what is used to bootstrap the system. -Each method is encapsulated within a persistent UEFI variable, stored -by the UEFI BIOS of the form +Each method is encapsulated within a persistent UEFI variable, +stored by the UEFI firmware of the form .Cm Boot Ns Em XXXX (where XXXX are uppercase hexadecimal digits). These variables are numbered, each describing where to load the bootstrap From nobody Tue Apr 14 07:31:11 2026 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 4fvwtl355lz6ZMdN for ; Tue, 14 Apr 2026 07:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvwtl2P3Fz4JmN for ; Tue, 14 Apr 2026 07:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776151871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yWgQHF4UDazMFBdnprWRbfwBNIK2Emzc58OOHgjczhc=; b=uznN/FNBdKTrEI/g1NyiwPfDzV4Iz0eNFXAlQC0lOkjbOmYeDRXWorZhV0GOd5+qrO/3tB OPbChkB+rIOH02by0TR4hqgE6Qxl58TXBKZiCTMj2s4jXD2txX/YretVO6wnGZ155QNc/i TMB3vWkE14pNugLtvt3kIpbFM0CfLxo+UudWCgi9CV85aQ0ICwP7+lCiw5hhVDeUSX1keJ nseQLhoHsTKURxdMCEjJ/URNj3w9jBcXITNcWXw8C5kBNCj/6B+9ft1lHeBzTN+Q/9L5sd X3JgrgvZ+6N8cpayylxxYi1WWagcX6s7VtW7JyDiELRTJsONSWieRIkogJqPNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776151871; a=rsa-sha256; cv=none; b=DECdEJGUYxQYsn83kn3HJ68KRWp1yBzXfig55kU92SFf2anQEg4kfBjV2Awza96ed4+BUw kqpQnjnIYG/5GACXTJtuP3iz2wUjiQ5WjgG5y+mUBCeV6GTJMozSsTQAjjRw4oiSyr2BFO /plRc2ujGF5rQjUXKuvXwRs/M0vb7GBH4AUZ3owSGszXguW0WK+p11y6Xb0dtpFp4RzIci aaVoUopWwEJASJIYutBk3Tx5yTDYZGmq+eLw6dQBtlfdx6zbWd29xEmpEkoWZwrnbqsYN1 o69SFWOC5kq+u9nIiJMb9w96G6MBDgFZ/N+Iz6jaAsM6ZURgFVo/1W/MUVcgsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776151871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yWgQHF4UDazMFBdnprWRbfwBNIK2Emzc58OOHgjczhc=; b=EWM9F/U/8QtOfnAafUrvyHSnNFiZsBGq00zGxyzX8A/17XkrrU5iiXRUCd+malSvx7vs56 DUoBf7/PXiaYXVF+THuM4l4XLf4SzZg39FvrrmyE+YxntTxOFbgL9YuhVB0ND3JC5aNovR AxbAtY11slGelJAhsIKRI4JRTKdpU4HZmsyW2WO+bCqOl4M1K0qF5UwVlQ6HzzmA+pkWrV EeskPDy3JmNONTfpgw6GHNdpjanLA3S9/IYi7C+JTiU6kyNirIN2Ec2PWAizAB1EZzIDhA br5nkr+fX+JmaJpiJenptmIMChLEvGcvKMHhaftabiQDlux1IxH5w8zRXGKUCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvwtl20bXzgsr for ; Tue, 14 Apr 2026 07:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44910 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 07:31:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: c2a961723f83 - stable/13 - loader.efi.8/efibootmgr.8: Don't use contradicting term 'EFI BIOS' 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c2a961723f830dac095a5d6fef69a7b1ad911335 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 07:31:11 +0000 Message-Id: <69dded3f.44910.46e0c553@gitrepo.freebsd.org> The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=c2a961723f830dac095a5d6fef69a7b1ad911335 commit c2a961723f830dac095a5d6fef69a7b1ad911335 Author: Michael Osipov AuthorDate: 2026-04-09 11:39:41 +0000 Commit: Michael Osipov CommitDate: 2026-04-14 07:30:06 +0000 loader.efi.8/efibootmgr.8: Don't use contradicting term 'EFI BIOS' Both (U)EFI and BIOS are completely different things, be precise and don't use them together. Reviewed by: imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56329 (cherry picked from commit 4f684e929de1275b1099b17b2a2cff0d3f4af223) --- stand/efi/loader/main.c | 4 ++-- stand/man/loader.efi.8 | 12 ++++++------ usr.sbin/efibootmgr/efibootmgr.8 | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 0330ab15db9a..511829059f0c 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -753,8 +753,8 @@ parse_uefi_con_out(void) * If we don't have any ConOut default to both. If we have GOP * make video primary, otherwise just make serial primary. In * either case, try to use both the 'efi' console which will use - * the GOP, if present and serial. If there's an EFI BIOS that - * omits this, but has a serial port redirect, we'll + * the GOP, if present and serial. If there's an EFI firmware + * that omits this, but has a serial port redirect, we'll * unavioidably get doubled characters (but we'll be right in * all the other more common cases). */ diff --git a/stand/man/loader.efi.8 b/stand/man/loader.efi.8 index 82b9aa091de8..8455ff0864d4 100644 --- a/stand/man/loader.efi.8 +++ b/stand/man/loader.efi.8 @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 3, 2024 +.Dd April 11, 2026 .Dt LOADER.EFI 8 .Os .Sh NAME @@ -56,7 +56,7 @@ When a system is built using .Nm will be used directly. .Ss Console Considerations -The EFI BIOS provides a generic console. +The UEFI firmware provides a generic console. In .Nm this is selected by specifying @@ -106,8 +106,8 @@ primary if a UEFI graphics device is detected, or the serial console as primary if not. .Pp On x86 platforms, if you wish to redirect the loader's output to a serial port -when the EFI BIOS doesn't support it, or to a serial port that isn't the one the -EFI BIOS redirects its output to, set +when the UEFI firmware doesn't support it, or to a serial port that isn't the +one the UEFI firmware redirects its output to, set .Dv console to .Dq comconsole . @@ -127,9 +127,9 @@ If this causes a doubling of characters, set .Dv console to .Dq efi , -since your EFI BIOS is redirecting to the serial port already. +since your UEFI firmware is redirecting to the serial port already. .Pp -If your EFI BIOS redirects the serial port, you may need to tell the kernel +If your UEFI firmware redirects the serial port, you may need to tell the kernel which address to use. EFI uses ACPI's UID to identify the serial port, but .Nm diff --git a/usr.sbin/efibootmgr/efibootmgr.8 b/usr.sbin/efibootmgr/efibootmgr.8 index 68eef1c9cbb5..654b14e9ff7a 100644 --- a/usr.sbin/efibootmgr/efibootmgr.8 +++ b/usr.sbin/efibootmgr/efibootmgr.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 15, 2023 +.Dd April 11, 2026 .Dt EFIBOOTMGR 8 .Os .Sh NAME @@ -80,8 +80,8 @@ boot method to be tried once upon the next boot. .Pp The UEFI standard defines how hosts may control what is used to bootstrap the system. -Each method is encapsulated within a persistent UEFI variable, stored -by the UEFI BIOS of the form +Each method is encapsulated within a persistent UEFI variable, +stored by the UEFI firmware of the form .Cm Boot Ns Em XXXX (where XXXX are uppercase hexadecimal digits). These variables are numbered, each describing where to load the bootstrap From nobody Tue Apr 14 09:29:09 2026 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 4fvzVt0yfrz6ZVRl for ; Tue, 14 Apr 2026 09:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvzVs5qjCz3HjP for ; Tue, 14 Apr 2026 09:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776158949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eaQfWw7PbQZItQzVXKULJso/B/Kkx8snLmgtJfehcR8=; b=b5wp8DxvlKUDwXNI1P8yvmSLIvHmUQG7sAE6ui5gpei8ep7s9KpT/f5sS4sqfIg1+nboNE jZvKoyT5fCMUiUUD5Pda8CeKZ95hRR5jQiabWdW1GxQ2XNcSlWgmbA4r23y1+NuEp/aJiM nw/tu7DhUeKgjEBtjOSeVOb5ppAFHXYEfJLz0/N9qLtycAZLXfm1+coysamffXrRrsvw1O ud/vRKX0XEAFDqh3dO7KoqxpnXq4jRdDNYD7cqv3KU2aP0fvezpImLfIUZHXf9LWSrI4XX dwOjhKx7sVItvUvwPKUgJFkwkJiqK+33fAt4EljOLHK6zwBq+9gslUN4vCSHdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776158949; a=rsa-sha256; cv=none; b=ZlrUCa8Z6+mipui3lbqvdBj63IBds8Rc2x0MbOeIXCRXpJdHzA+t7VImFDG+G9O2CXp/gl 51OdgYl+ctBoUlVYZvZh37MgXUN/Vemfwe7CgcLhrVkKd/S1q3m+xISUurY1ykAt568r9y Mlwlz4avbIJJhMGmfKB4YObu1FNGhCVcfwqW8mL8mZhR5FNUKTA5brQ6w7avT1ZjNo+sdw 76A3fk+K8tg9q1cB1T9vct0Fm9j6f7wgiC9araxmPg9/SVsHf6Y0jI1vVa4kH6DgHBcxjN HPnbTx+WRqjTaj12CiwSLWm6OqHOB7GKhHVwnd3bdn/V5McI3t9opAEbkZW6NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776158949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eaQfWw7PbQZItQzVXKULJso/B/Kkx8snLmgtJfehcR8=; b=BrszGPYvl8j7pxdE8PayQ4edazNOQFACvksS+N7pwTflTfzLAZx4wJ0wpmduMTLJjx5mqK 0AxWlOVgA63PZo+lfOXTSKCcTDnYLMTpkNhBwYJc0gO4cUfgoHBtfz+J83MQLTILZ3lwv6 Gh7/cSOGA0fxBT4xcNUBYmfVJWlnDprcGkqVOLph3KE5viZ1NVAKFpv6lf4/7uVM740tOz sygYfOmEnb1QPba7VJEuvV8BVDyZ+5gKAAaM34M34AYReFysB+3hDZFM/3vwhpE+wA/zJV 3EiHSU/6UMMs/uBZ9aJJV79oWv9zNCZGQptp52fwlLX0njs1aGEoKeYn2dw8RQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvzVs5NLMzl9l for ; Tue, 14 Apr 2026 09:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 217fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 09:29:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Certner From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3bc0114674a5 - stable/14 - sys/abi_types.h: time32_t is 64-bit on non-x86 architectures 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3bc0114674a590bcec90f74b20115085ff914c8d Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 09:29:09 +0000 Message-Id: <69de08e5.217fc.5a2b852e@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3bc0114674a590bcec90f74b20115085ff914c8d commit 3bc0114674a590bcec90f74b20115085ff914c8d Author: Olivier Certner AuthorDate: 2026-02-13 17:20:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-14 09:15:35 +0000 sys/abi_types.h: time32_t is 64-bit on non-x86 architectures As long as 'sys/compat/freebsd32/freebsd32.h' is used unconditionally on all platforms (in 'kern_umtx.c' at least), the rule of thumb is to ensure that 'struct foo32' on a 32-bit arch is type-compatible with 'struct foo' on the same arch. In practice, this is very simple to achieve: All 'foo32' types should be compatible with 'foo' on 32-bit architectures, which is what we are supposed to do already for compat' structures by design. The recently introduced 'freebsd32_uint64_t' type typically supports that. This change fixes commit 87632ddf67b0 ("openzfs sys/types32.h: use abi_compat.h for time32_t") which was defining 'time32_t' to 'in32_t' for all 32-bit architectures, which is wrong but on i386. By luck, this did not change the size of whole 'struct ffclock_estimate32' (whose size is compile-time asserted) because 'struct bintime32''s one would stay the same, as even if its field 'sec' was incorrectly sized after that commit, the 'frac' one is 64-bit and 64-bit aligned on all non-x86 architectures so its offset in 'struct bintime32' would stay the same. Reviewed by: kib Fixes: 87632ddf67b0 ("openzfs sys/types32.h: use abi_compat.h for time32_t") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55283 (cherry picked from commit 4ccca2100887943b11187787004bc8efc2a149c6) --- sys/sys/abi_types.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/sys/abi_types.h b/sys/sys/abi_types.h index e449c86323f7..44d1bd733bbd 100644 --- a/sys/sys/abi_types.h +++ b/sys/sys/abi_types.h @@ -25,15 +25,11 @@ typedef struct { #endif } freebsd32_uint64_t; -#if __SIZEOF_LONG__ == 8 -#if defined __amd64__ +#if defined(__amd64__) || defined(__i386__) typedef __int32_t time32_t; #else typedef __int64_t time32_t; #endif -#else -typedef __int32_t time32_t; -#endif #define __HAVE_TIME32_T #endif From nobody Tue Apr 14 10:31:51 2026 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 4fw0vD0Hpvz6ZZ0n for ; Tue, 14 Apr 2026 10:31: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw0vC52V5z3SBm for ; Tue, 14 Apr 2026 10:31:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776162711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xwOyhFYhEirQMyYzjoEMafNRcCydOgEBIjElPHOGZ00=; b=f6bXmHWdQzwHM4yV4ITFZCUY/KWOEaJ+cxh4Zcxzra+l/4keAjvNExMns4klR1kDVkHOEF 8PjB/OIxoXNa6y++hvNbeqxEE+fNXI0GTgpJ8HKUAkAt7l3o4OIa6RMcteORqVAeR7dHgj cFXDXyhwAiyW7lTzyLDcNUCz0G2PBWjmttAlXqJy7i/MCeG8bQ6VEe+u6r6regio5yGCkS 6QpTIxZMvdnSJ6Qi+lVVsdSOiTAxZ8BjPSU067uwteWqz65P3+W1RcLslfL8weDU1FjyE2 oiXhbF8FPn0IyfJ5ZY3kXM5NWskUoWUeukPeKw1yuMwQXDMv3l7S3BBGvqqvYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776162711; a=rsa-sha256; cv=none; b=au7N2DpS/u5BcOj8LxCVI+lAlzBL32+ESuxAbBYWRO33/6031DtqTq8Ab3gbzuGyjoUoAW xAaHfQDR7IZO5dej1Whqw9zUVoyqxTJolON94Ewd5o18u9Lldg0IjE3+09fD4ijUy6G640 vNXsiG84OxiYnSdMlKDSPzh5d0usQ8pZ6iAPH54aBEB+aquv2Yawg3XIDiwwSEKMd3+Hxv o0eaNlc/K8HtRtN30DS+befveLFABXgLotRs9SEzntflQGI5V/YWsfgg2gG24ZSE6c+ttz x+rHmybwbNQ4LsZ5kxAkwumJFAdHEFj16C6uOnP8gQAo2mwHQN3/tYy6lNbp2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776162711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xwOyhFYhEirQMyYzjoEMafNRcCydOgEBIjElPHOGZ00=; b=xIWgJ6QFLfe69abNFobqhy69XNKs77v9UjljQJDzmK2PgItjkEfCh28Ljf0rXUpqdY1gJW WROkfesHkbbB0HAPxLD5dCMgfoJyMf39+JCvjGnlAHNzjI1wtMX33iKW5N5YhlxrfmGYcf MHPNFvoIhbwlX+nxVxXhFKCQc1EFLep/sY8WwsL3tPRl8vVCQWBja6LUVoy1ARZE1pxwlp 1YcOwuNR2oMre5H6szLTual8+ZfdDqt2ZK7T4COMoukFM4vTxlDAURYzNGhZYewq3qRIa/ i1GBjFIHlV3883FXI+L84ODmvf72lchKqwx8DhGvLMy9JU0fgesVrnChvtdExQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw0vC4ctTzmnN for ; Tue, 14 Apr 2026 10:31:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 277d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 10:31:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 8b87f38f1531 - stable/15 - sound: Mark some snd_fmt* functions as static 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8b87f38f1531ad65c587562d27a92d6a3ee385af Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 10:31:51 +0000 Message-Id: <69de1797.277d7.1a47061b@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8b87f38f1531ad65c587562d27a92d6a3ee385af commit 8b87f38f1531ad65c587562d27a92d6a3ee385af Author: Christos Margiolis AuthorDate: 2026-04-07 15:44:15 +0000 Commit: Christos Margiolis CommitDate: 2026-04-14 10:31:42 +0000 sound: Mark some snd_fmt* functions as static Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56238 (cherry picked from commit f369d4148b93410fe7f8ea989f66790403d23ce8) --- sys/dev/sound/pcm/feeder.c | 6 +++--- sys/dev/sound/pcm/feeder.h | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 2a7f54e5d30f..af6e367895a0 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -181,7 +181,7 @@ feeder_find(struct pcm_channel *c, u_int32_t type) #define score_val(s1) ((s1) & 0x3f00) #define score_cse(s1) ((s1) & 0x7f) -u_int32_t +static u_int32_t snd_fmtscore(u_int32_t fmt) { u_int32_t ret; @@ -257,13 +257,13 @@ snd_fmtbestfunc(u_int32_t fmt, u_int32_t *fmts, int cheq) return best; } -u_int32_t +static u_int32_t snd_fmtbestbit(u_int32_t fmt, u_int32_t *fmts) { return snd_fmtbestfunc(fmt, fmts, 0); } -u_int32_t +static u_int32_t snd_fmtbestchannel(u_int32_t fmt, u_int32_t *fmts) { return snd_fmtbestfunc(fmt, fmts, 1); diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index 834df463295d..e1e91d468455 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -63,9 +63,6 @@ struct pcm_feeder { void feeder_register(void *p); struct feeder_class *feeder_getclass(u_int32_t type); -u_int32_t snd_fmtscore(u_int32_t fmt); -u_int32_t snd_fmtbestbit(u_int32_t fmt, u_int32_t *fmts); -u_int32_t snd_fmtbestchannel(u_int32_t fmt, u_int32_t *fmts); u_int32_t snd_fmtbest(u_int32_t fmt, u_int32_t *fmts); int feeder_add(struct pcm_channel *c, struct feeder_class *fc, From nobody Tue Apr 14 10:31:52 2026 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 4fw0vF2Cyrz6ZZBh for ; Tue, 14 Apr 2026 10:31: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw0vD6jwLz3SMq for ; Tue, 14 Apr 2026 10:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776162712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XJegRrC1kSDIkF0MhgmON/NpV7II7ymu3Yu3b6HbGxo=; b=CzGNPxQSxSNC0+VzEpeQ6W1zFftB0PvFJ3WWH/exvSIO5tT6Vml7qOCd5QlNRy1WLpC3ty OICLVp0xCk4Jwr/xvw4gVtOIU98KJgzuRnsg9tAr37/KpWihyr7+PvYcesFNkNjuve5DUz mImtkGqlQAwApOCkm9Vu8gLDHARTwvCFwlxloQCUQmR2e/ylzSSLm78QBqJmjD9RAa9sb5 cVA4zUS7rVJoTBphum9U6C1Sknn9W4evS2DQqqoDiwLAjK+NB9VHASoBT10HcjxfSppKij fMqv9WkkW423AQixx5grh6fa4LvYjf3OJTHQL0zEL5LY76nf8GfBU9LhgifrDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776162712; a=rsa-sha256; cv=none; b=i06/PNITUQIK6SUjGnqjL6lee5Zc+kviTSyZtJ1cxaIfHcOTpg1QQOQl03Qaj1bYnXVsdf zRegOxwB3MIbVJs4kq2aoLTtxZhH8fUDrSDReShJw6gYzxc2ecbQTHQ5EnYZ8AKP+Q1ihI EEOnGukwH7O3lppw4/AFlxharYwQ/l92SfsRgYEq/7X1b8z9ZGft+lxEGcPUW9EkEBF5kr vj037PvZEEkXBoe1498GcqnrbIOVe0Gv9Df0nLbQHAzHnyNwQnmgn2lozZi5AYC1dQeVRT JN9x0/ajSO9Qnt/0MZRwHh9W6Q24qP/TRrJd/TjVTztu7cbRz9Ur9guxzrLcmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776162712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XJegRrC1kSDIkF0MhgmON/NpV7II7ymu3Yu3b6HbGxo=; b=VopDJ3x0Pvc+SAZFfRGqP3ORXBHgFlTriYx6baiIYUtaD875xJUZPf7In7zyFTs7xKxbZj GmIXH1DwRKD+1NNFLSnQAU+9FtFLChMghPQkzemrfzoSQOEL2L+DevM2cQGP+tRN3awpPa 34jDCjQoUHRi/9KLVtSqOKQ6Vq/sjxCNkP7RntR0L2Pqe0M/jQeXjJq+nVVwOKdAJ9QkvN yKhL8cr+g8UqcDCRtPylApTgdiHN0K45d8ZebGzoibFlI+DXNBCVtUf24oBWFNS0LTrmw2 YXr9qW9N2pD4FkTl9MEpPXN/lRYwWEAJ0j2voNaIrVG9X2utSCzFDaDXW9ip+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw0vD5R6Gzmfn for ; Tue, 14 Apr 2026 10:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30ff8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 10:31:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 573fd4252cc0 - stable/15 - sound: Retire unused CHN_N_* defines 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 573fd4252cc0cadb188eee07bec66d22e641c070 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 10:31:52 +0000 Message-Id: <69de1798.30ff8.6902990f@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=573fd4252cc0cadb188eee07bec66d22e641c070 commit 573fd4252cc0cadb188eee07bec66d22e641c070 Author: Christos Margiolis AuthorDate: 2026-04-07 15:44:21 +0000 Commit: Christos Margiolis CommitDate: 2026-04-14 10:31:42 +0000 sound: Retire unused CHN_N_* defines These still haven't been implemented by the original author, and there doesn't seem to be much use for them anyway. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56239 (cherry picked from commit 2d84c8a3d3d673081c803f8aadc4eae8f6a221d8) --- sys/dev/sound/pcm/channel.c | 26 +------------------------- sys/dev/sound/pcm/channel.h | 7 ++----- 2 files changed, 3 insertions(+), 30 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 67bbfba28177..c9edce27c8cd 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -2351,31 +2351,7 @@ chn_notify(struct pcm_channel *c, u_int32_t flags) */ run = (CHN_STARTED(c)) ? 1 : 0; if (run) - flags &= CHN_N_VOLUME | CHN_N_TRIGGER; - - if (flags & CHN_N_RATE) { - /* - * XXX I'll make good use of this someday. - * However this is currently being superseded by - * the availability of CHN_F_VCHAN_DYNAMIC. - */ - } - - if (flags & CHN_N_FORMAT) { - /* - * XXX I'll make good use of this someday. - * However this is currently being superseded by - * the availability of CHN_F_VCHAN_DYNAMIC. - */ - } - - if (flags & CHN_N_VOLUME) { - /* - * XXX I'll make good use of this someday, though - * soft volume control is currently pretty much - * integrated. - */ - } + flags &= CHN_N_TRIGGER; if (flags & CHN_N_BLOCKSIZE) { /* diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index f964480369a1..6fa4338dce4a 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -405,11 +405,8 @@ enum { -#define CHN_N_RATE 0x00000001 -#define CHN_N_FORMAT 0x00000002 -#define CHN_N_VOLUME 0x00000004 -#define CHN_N_BLOCKSIZE 0x00000008 -#define CHN_N_TRIGGER 0x00000010 +#define CHN_N_BLOCKSIZE 0x00000001 +#define CHN_N_TRIGGER 0x00000002 #define CHN_LATENCY_MIN 0 #define CHN_LATENCY_MAX 10 From nobody Tue Apr 14 10:31:53 2026 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 4fw0vG3YgKz6ZZK0 for ; Tue, 14 Apr 2026 10:31: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw0vF6l1jz3SZy for ; Tue, 14 Apr 2026 10:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776162714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bVzWdr3LKONaypWO/v53iveYcsfscxGvW6Q6uGPUtq0=; b=kDfikEP3s9ca+ubXXjHf8XQB+DGV2ilQl5u2IKFc5Ja63iYzZxm0Mz3ncEg+bfc8qskmch s0iyxRXSBnFbs6pU5MABq7NJKqkYFqwQ3d/AGHmIje0Gjf6aqSdLihxk5VzNlu5BrJlN5w /F7V46ZD7o72UNRcUsj3MhKY1+AlNW7PA5dc1D/zq4jtGZsD2jVK62vP85A0DFicPZDNUP 5o4b1Uxy6SMm/2g90TfobpQPUjHEmT7tpDthhJ3n/bQCdNh1z2j7pA+HUahIgzqRGnS+iQ FGOnfmGWeU5RMkQ2QOkT+z6p3oAkEYCcsft58QisssugJrkOVXvbVc9soe3ScA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776162713; a=rsa-sha256; cv=none; b=lM3SSw/pzt33TwZNXw7qdoUwTCR+5gembi030WwjJXTRVRhtW7lwWAvBV0F0birJNlGrZ4 gmu6w2tNRmf2vocBJSX5acDDMrQ4KvQlN1Vcxb9w2adHG4uDt7A5oRyrhFdVjca8MqZK1o kN4jue2g41IN/hA63h6jK5iFkDUc4B052or6oVcYxbimJ2NKdfkFHP30vCev0+BlM/k3WH HRVbFnlXOxVdlFJL8+vl8X0x8zX0CqHQb/WzfvUpVQc9Ne1pqgRKSYenlodQd12espmvVb cg94y2uxAC/KD2rZbw36+fEcWZ4kmb9L3RXWVirsOM1VXBmov8tjhI4ETPWnDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776162713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bVzWdr3LKONaypWO/v53iveYcsfscxGvW6Q6uGPUtq0=; b=eSnpat7EfAEx2TzlH+rJ40itejRXPtkoS3Tnfwa8CH0TrRt9/dtipRgh3L9l44ADwGfOCE txqhfFjGEQE71959yOprFNQlAJMW02frbHzaofssL0+n5zmUfyXNiM6V2hpg8lNNCPFW7u 0Vekunco9xb6ai8R64iH3z+vCVB9eWRjIa0j5M6Qs+pXF+6ZZdaPeydYv8tdhw5TuItYKs NKg7gM453xd9TFg7eZSMSOYQcKW/jy3IWZLCSdhlt8WMXzW68aKE+3p0CDmXormqO/Di7h xftq7O/OOYjOeRqIZbhW2A7FD8TToPThvSxxqCoIYBXbw5LdMXxnoPmn6BJ6tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw0vF6FbyznCZ for ; Tue, 14 Apr 2026 10:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30120 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 10:31:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 6e5c351e785d - stable/15 - sound: Simplify parts of chn_notify() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6e5c351e785d2f42d087f1f4adaad8bc0e4f9765 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 10:31:53 +0000 Message-Id: <69de1799.30120.233dad76@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=6e5c351e785d2f42d087f1f4adaad8bc0e4f9765 commit 6e5c351e785d2f42d087f1f4adaad8bc0e4f9765 Author: Christos Margiolis AuthorDate: 2026-04-07 15:44:29 +0000 Commit: Christos Margiolis CommitDate: 2026-04-14 10:31:43 +0000 sound: Simplify parts of chn_notify() Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56240 (cherry picked from commit 8b18fc456bb136112e166508a9182718cdd44be2) --- sys/dev/sound/pcm/channel.c | 47 +++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index c9edce27c8cd..9b71d93ac7f9 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -2349,7 +2349,7 @@ chn_notify(struct pcm_channel *c, u_int32_t flags) * If the hwchan is running, we can't change its rate, format or * blocksize */ - run = (CHN_STARTED(c)) ? 1 : 0; + run = CHN_STARTED(c); if (run) flags &= CHN_N_TRIGGER; @@ -2360,16 +2360,17 @@ chn_notify(struct pcm_channel *c, u_int32_t flags) chn_setlatency(c, chn_latency); } - if ((flags & CHN_N_TRIGGER) && !(c->flags & CHN_F_VCHAN_DYNAMIC)) { - nrun = CHN_EMPTY(c, children.busy) ? 0 : 1; - if (nrun && !run) - err = chn_start(c, 1); - if (!nrun && run) - chn_abort(c); - flags &= ~CHN_N_TRIGGER; - } - if (flags & CHN_N_TRIGGER) { + if (!(c->flags & CHN_F_VCHAN_DYNAMIC)) { + nrun = !CHN_EMPTY(c, children.busy); + if (nrun && !run) + err = chn_start(c, 1); + if (!nrun && run) + chn_abort(c); + + return (err); + } + if (c->direction == PCMDIR_PLAY) { vchanformat = &c->parentsnddev->pvchanformat; vchanrate = &c->parentsnddev->pvchanrate; @@ -2378,7 +2379,6 @@ chn_notify(struct pcm_channel *c, u_int32_t flags) vchanrate = &c->parentsnddev->rvchanrate; } - /* Dynamic Virtual Channel */ if (!(c->flags & CHN_F_VCHAN_ADAPTIVE)) { bestformat = *vchanformat; bestspeed = *vchanrate; @@ -2394,6 +2394,7 @@ chn_notify(struct pcm_channel *c, u_int32_t flags) vpflags = 0; CHN_FOREACH(ch, c, children.busy) { + nrun++; CHN_LOCK(ch); if ((ch->format & AFMT_PASSTHROUGH) && snd_fmtvalid(ch->format, caps->fmtlist)) { @@ -2401,7 +2402,6 @@ chn_notify(struct pcm_channel *c, u_int32_t flags) bestspeed = ch->speed; CHN_UNLOCK(ch); vpflags = CHN_F_PASSTHROUGH; - nrun++; break; } if ((ch->flags & CHN_F_EXCLUSIVE) && vpflags == 0) { @@ -2416,13 +2416,11 @@ chn_notify(struct pcm_channel *c, u_int32_t flags) } CHN_UNLOCK(ch); vpflags = CHN_F_EXCLUSIVE; - nrun++; continue; } if (!(c->flags & CHN_F_VCHAN_ADAPTIVE) || vpflags != 0) { CHN_UNLOCK(ch); - nrun++; continue; } if (ch->speed > bestspeed) { @@ -2433,7 +2431,6 @@ chn_notify(struct pcm_channel *c, u_int32_t flags) besthwformat = snd_fmtbest(ch->format, caps->fmtlist); if (!(besthwformat & AFMT_VCHAN)) { CHN_UNLOCK(ch); - nrun++; continue; } if (AFMT_CHANNEL(besthwformat) > @@ -2444,7 +2441,6 @@ chn_notify(struct pcm_channel *c, u_int32_t flags) AFMT_BIT(besthwformat) > AFMT_BIT(bestformat)) bestformat = besthwformat; CHN_UNLOCK(ch); - nrun++; } if (bestformat == 0) @@ -2464,17 +2460,16 @@ chn_notify(struct pcm_channel *c, u_int32_t flags) c->devinfo, bestspeed); err = chn_reset(c, bestformat, bestspeed); } - if (err == 0 && dirty) { - CHN_FOREACH(ch, c, children.busy) { - CHN_LOCK(ch); - if (VCHAN_SYNC_REQUIRED(ch)) - vchan_sync(ch); - CHN_UNLOCK(ch); - } - } if (err == 0) { - if (dirty) + if (dirty) { + CHN_FOREACH(ch, c, children.busy) { + CHN_LOCK(ch); + if (VCHAN_SYNC_REQUIRED(ch)) + vchan_sync(ch); + CHN_UNLOCK(ch); + } c->flags |= CHN_F_DIRTY; + } err = chn_start(c, 1); } } @@ -2491,8 +2486,6 @@ chn_notify(struct pcm_channel *c, u_int32_t flags) vchan_sync(ch); CHN_UNLOCK(ch); } - } - if (err == 0) { c->flags |= CHN_F_DIRTY; err = chn_start(c, 1); } From nobody Tue Apr 14 10:31:54 2026 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 4fw0vH2P43z6ZZBj for ; Tue, 14 Apr 2026 10:31: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw0vH0JZXz3SST for ; Tue, 14 Apr 2026 10:31:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776162715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GjIb040dr6AL1kOVLLaBPtQdNUYgaq0sejyHwNNjooc=; b=qEd8/CbrkHl7VA8n/AtGXcEDweQKoGTdvTvNwbFcQUiy/33x7j1N4tAC0OovHhb3X9k2ph OgbYh65Sf7t0w3ZPSmeciKg1CBd163U4hnPdCD22Fm8UJTlr8y1dgUzdggI0UhIsILKETx d6UMjcwkkcMaV2BawTmqZ6iP4A6aFr8OGxUR33+ufODiFqPKzGMGXFZxfuDRzFfOpcnmdI Ecr9O1A+JgRSyk0w1KpcKlfHA7cbM2lAS4BFvvWoOHg+XdBAopN7pFoLemqdiX8iak7Mp6 vmWWaO2ZzYrpkgLMP847+YqULRc2+O7LGku3n3NGbufyyXusLQsDm4UkT6XeDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776162715; a=rsa-sha256; cv=none; b=SSkA2SiVvKkDFCqWsBuHw+k75eQvhu7Mu+TNT+pmzAOmDSKn3YmYNaJaqtQ+7UtZpaERvH ct2dJT1bYKKu6FHD/hZZaOUDxcDFwgQrMAqWeVH0Dj6Q8aC01DGi0NrFK3jACJOT7eEJK5 TVFvONMQ4BwRSldW0IaUzDQTq2WcyexXgxI9PeaPA89YGPRhtfKXSH3dh83CI8iMruFjwC t7GvENx0PQaLpg/K6n7FXdaxvkzQfgQnljSzVw2TUYexwKSN2vezWtvQR10Y8EsOCxkoBF RedCeKmXLY3lBy/ZMFenlU2xUIhlxjLh/2zkLYcslzmQqJj87WdqnzzbJCOvWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776162715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GjIb040dr6AL1kOVLLaBPtQdNUYgaq0sejyHwNNjooc=; b=vzd2jCwVRpwIFnTW/g4CbUEyw9SmBlMplZi16gelqU3PQPpD038AUCmJOfVF5cN9zinQRO eaOjZDhQz4UFy4+cTycfg9WkXd2R8tZPpGoujQSp95bMUPLgdWZDCtLzUookrmE+EOzUey iYwpQKw9b+IL02wfuY0QfxeIjuRguLYeV5ueYkPx70WGfChtNso17VY/Hy/CSuKhc6z+xm y3DQXWwEZohAZ0V0UcdmMjiclj/4aFbKs0dz6W/U5x3VmrI3jaqN9SxdibYE8TPP5lIZt5 RPEZuewB81CGyTZvWqd3JHLhupGNjtoMMhBEp5lBrOJVwdNh25AGcV9mxfDDCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw0vG6zqszmnP for ; Tue, 14 Apr 2026 10:31:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2617d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 10:31:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 7bccc0df4bb0 - stable/15 - sound: De-macro array definitions in chn_calclatency() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7bccc0df4bb003ecb955e252bd3d7717b067d4e9 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 10:31:54 +0000 Message-Id: <69de179a.2617d.65f91da8@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7bccc0df4bb003ecb955e252bd3d7717b067d4e9 commit 7bccc0df4bb003ecb955e252bd3d7717b067d4e9 Author: Christos Margiolis AuthorDate: 2026-04-07 15:44:34 +0000 Commit: Christos Margiolis CommitDate: 2026-04-14 10:31:43 +0000 sound: De-macro array definitions in chn_calclatency() Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56263 (cherry picked from commit 66a82f5fa471b8eda018b7566c3725a6742dfc0c) --- sys/dev/sound/pcm/channel.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 9b71d93ac7f9..0b940fe4e843 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1748,19 +1748,6 @@ round_blksz(u_int32_t v, int round) * aggressively through possibly real time programming technique. * */ -#define CHN_LATENCY_PBLKCNT_REF \ - {{1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 1}, \ - {1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 1}} -#define CHN_LATENCY_PBUFSZ_REF \ - {{7, 9, 12, 13, 14, 15, 15, 15, 15, 15, 16}, \ - {11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 17}} - -#define CHN_LATENCY_RBLKCNT_REF \ - {{9, 8, 7, 6, 5, 5, 4, 3, 2, 1, 1}, \ - {9, 8, 7, 6, 5, 5, 4, 3, 2, 1, 1}} -#define CHN_LATENCY_RBUFSZ_REF \ - {{14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 16}, \ - {15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 17}} #define CHN_LATENCY_DATA_REF 192000 /* 48khz stereo 16bit ~ 48000 x 2 x 2 */ @@ -1768,14 +1755,22 @@ static int chn_calclatency(int dir, int latency, int bps, u_int32_t datarate, u_int32_t max, int *rblksz, int *rblkcnt) { - static int pblkcnts[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = - CHN_LATENCY_PBLKCNT_REF; - static int pbufszs[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = - CHN_LATENCY_PBUFSZ_REF; - static int rblkcnts[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = - CHN_LATENCY_RBLKCNT_REF; - static int rbufszs[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = - CHN_LATENCY_RBUFSZ_REF; + static int pblkcnts[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = { + {1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 1}, + {1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 1} + }; + static int pbufszs[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = { + {7, 9, 12, 13, 14, 15, 15, 15, 15, 15, 16}, + {11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 17} + }; + static int rblkcnts[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = { + {9, 8, 7, 6, 5, 5, 4, 3, 2, 1, 1}, + {9, 8, 7, 6, 5, 5, 4, 3, 2, 1, 1} + }; + static int rbufszs[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = { + {14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 16}, + {15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 17} + }; u_int32_t bufsz; int lprofile, blksz, blkcnt; From nobody Tue Apr 14 10:31:56 2026 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 4fw0vK0XLbz6ZZYG for ; Tue, 14 Apr 2026 10:31: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw0vJ1Stfz3SWj for ; Tue, 14 Apr 2026 10:31:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776162716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wMEp1o4hkiKxSgMRx4zEyRgxDwhlaWE+pW0VET+g7gU=; b=WN68rAfw8yzabHfRaXhIQf1OwE+pDiTHTk9DlQ6Eby6XTBKlQiBdLzfFbqQ998p/WW0XhH vvjJlxgDHlZV1L42HAgC+QJu8VAdPGAN2bgjONgBpBsxfnbAZXv63R09xbfm2lUJ/AugF9 vzRXevezbwquiyUzFg7Gow0vfz1TEsXPqE9uYAbs/QmjWREkGJ3fiBa/Iqq8MtMw2DiXds MvsbyUqJApQW1JXv/8DBqy+poKxATDo9OfAXDeGsI3V7qp2DNxLX4SjTnMHXaFrhwMUCGY ffMEBANB/w3QOMYrB3/mzsNyjkgrD6RfbWSaNfbkDNEEAtm44Oq1Nxnd0zdfxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776162716; a=rsa-sha256; cv=none; b=p6pD6B7YK7NCaYDeNnH8NkVm1MhOt7DImRARqyXuhjNw+Ww/kZCuy/Qd5460R+RaNFMBkk ZuJK9r3sPzRw0xlGt/6CySwRmBtt3PG1I+htepJSGttelGjk78W9VY+YZrAW+e7ibmZC9r XwRJkfiQTUyVjmicvkvzpGRmZETGB5mCoTOrJNUiYOMw+tEZhJ8wXrWvYHLPamltsiMNPa WJ4qA1DYtCVeWHETOwDvcpzs7tjQbNwAA+WX5yBzJ6Gdo54NfAQKgaZSX9T3moQCc05p9d 3Vm5uiF6cKy7XZhoOR2iu/sfIcBgYmNjhQhrhAhSxbNWlNxfLdqC0YMcU1n07Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776162716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wMEp1o4hkiKxSgMRx4zEyRgxDwhlaWE+pW0VET+g7gU=; b=WCYVt1Lj4yvFTDnYWLCjttLnlKGbZZMU+j9YgewISi2/jGQpOTy2HShctkJz3SkPmp/jNg Z4OFC1OhVqVUI1W3M965Bs7qKOg8sje/8O7nUE5W80G5+TX3JtTNGm4+C4LEl6/y1vRokg bPJwjCA0qwwVb9Sw4HA9gsJR29p5J3g7sb6P6VpTiYB2NzfV0185qsibAdYtUlnPcydNus AvHlgautkC7OYBKjNZ6w65jHm5jn3oVd0yXnO9jZoFdbr1gecPrGT+AauAlo429Pt8yUgN kUYDKYU3fx9Uk4CI8aR85tlGjDylS/MPjBk3OHZkZqh1ORwJc/rW3CHQTi2pvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw0vJ0VlBzmcr for ; Tue, 14 Apr 2026 10:31:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26b2a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 10:31:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: f56d0868bac3 - stable/15 - sound: Make chn_reset() control flow clearer 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f56d0868bac3fb889351ca489b31652c169ef92c Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 10:31:56 +0000 Message-Id: <69de179c.26b2a.1f1a5530@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f56d0868bac3fb889351ca489b31652c169ef92c commit f56d0868bac3fb889351ca489b31652c169ef92c Author: Christos Margiolis AuthorDate: 2026-04-07 15:44:39 +0000 Commit: Christos Margiolis CommitDate: 2026-04-14 10:31:43 +0000 sound: Make chn_reset() control flow clearer I think this is cleaner than playing around with return values. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56264 (cherry picked from commit 8007a78bfe1f41b7055f8677f8ac9ae4cc2fbc7c) --- sys/dev/sound/pcm/channel.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 0b940fe4e843..c1e0d8d3bc52 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1059,7 +1059,7 @@ snd_afmt2str(uint32_t afmt, char *buf, size_t len) int chn_reset(struct pcm_channel *c, uint32_t fmt, uint32_t spd) { - int r; + int err; CHN_LOCKASSERT(c); c->feedcount = 0; @@ -1071,23 +1071,26 @@ chn_reset(struct pcm_channel *c, uint32_t fmt, uint32_t spd) c->flags |= (pcm_getflags(c->dev) & SD_F_BITPERFECT) ? CHN_F_BITPERFECT : 0; - r = CHANNEL_RESET(c->methods, c->devinfo); - if (r == 0 && fmt != 0 && spd != 0) { - r = chn_setparam(c, fmt, spd); + if ((err = CHANNEL_RESET(c->methods, c->devinfo))) + return (err); + + if (fmt != 0 && spd != 0) { + if ((err = chn_setparam(c, fmt, spd))) + return (err); fmt = 0; spd = 0; } - if (r == 0 && fmt != 0) - r = chn_setformat(c, fmt); - if (r == 0 && spd != 0) - r = chn_setspeed(c, spd); - if (r == 0) - r = chn_setlatency(c, chn_latency); - if (r == 0) { - chn_resetbuf(c); - r = CHANNEL_RESETDONE(c->methods, c->devinfo); - } - return r; + if (fmt != 0 && (err = chn_setformat(c, fmt))) + return (err); + if (spd != 0 && (err = chn_setspeed(c, spd))) + return (err); + + if ((err = chn_setlatency(c, chn_latency))) + return (err); + + chn_resetbuf(c); + + return (CHANNEL_RESETDONE(c->methods, c->devinfo)); } static struct unrhdr * From nobody Tue Apr 14 10:58:15 2026 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 4fw1Th2N6cz6Zc9j for ; Tue, 14 Apr 2026 10:58: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw1Tg5TPVz3Wms for ; Tue, 14 Apr 2026 10:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776164295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U4ZJkNwUHvaHZuaLtOP+HyzgnxssJq+7dDNMokPYBgE=; b=mQQUuXjfwGf+6BZigpV6OokOAbSPg/v6jz1W0kjuaLgchbUhZK5EBhgp9sBjR+I8KoSeGV jcM8EcIi5yXvFMC8RHzQK2IjsZDz5Tdj7PzQmYbllxyWTCZc0K/HhAHG+oJ7fkp6Ihs1ET keh6AfUIcriIinLK1to3+ZMVSwr3dzREHcR2rEzg5RFAJW2t4J9MMAM+m2MltGYn6z6CUU cPLmJIKZWPiRAsNEXDoVLhK2jYN74iqICfmxkibgVByw2cyTcvqpV/Ns/YeBzHfPkK43bY qnIpKrIYL7F8JpEeZNFPCEx3SMfOIsSIWGfqcQ/bw+9zihAKhi4fv0hJQqvsmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776164295; a=rsa-sha256; cv=none; b=hlJOstSeDvZ4um4kpzYWq53GxbhsqSgRwreOYof2URqxP2ERMkvLBSiPt/51mExZo1KiDQ 7tf1aaNaqv/aoAbDmOB3oUCMYIUmmOF8Tc6PZY7mArVKbfFYu4EM8RFT0OhpMNzBAOPTB+ l51kNgbWsJXYrfJ+BBkIIAqr4e34/uJDbkO+2rs2xUAE6nKIlkCw2pML/FeouvHSnIl5Qm dfPctwNLqwLGNwHzu8qkn9OVyjJwU6rRvuswCAyYcMDjgkdLpyzDkj/3heLhic7IKKH032 blRp7YwpmeVfwI6kbLLDMN/VR+4cHphtB7teTKFEcRX8MmjtIQLH3HAnir6WNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776164295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U4ZJkNwUHvaHZuaLtOP+HyzgnxssJq+7dDNMokPYBgE=; b=JSt5/uUl78ytWJzo2O/qDaPyeqpBVh3zhEvergAoS1cMuqowGgzmp20gzvk1BwMiv5Bk60 +/vgSVIy2vwAAMu2fSUWdwlQhb6e0EY1kE0K3MqFWV4zTyfdB7KZg6wu2JUYhyzlsj15ZT 6t3IbZCidLkahAHw7CJMy4uKyagoq4FzALR0RBTvAeYD1gyNDeOavYq39LjPdAHYjG4bdf sZ3PtdAaUTsNSH3pKTIboscCKdYMu0f1ROV71myOoIHbO/3bykKhyUIO7ElLPbADeW15BZ nK9LdzSXQuc/gyxHOdbfRiXVecJ/PWbeLj7/X5Z+yfmmrxLVVBgL+1Ntl7HbvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw1Tg4q6QznHq for ; Tue, 14 Apr 2026 10:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32932 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 10:58:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: add68b405c17 - stable/15 - bridge(4): Remove epoch_enter during destruction 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: add68b405c179b162e1af72ce35c36cf06d7cea2 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 10:58:15 +0000 Message-Id: <69de1dc7.32932.8b661a9@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=add68b405c179b162e1af72ce35c36cf06d7cea2 commit add68b405c179b162e1af72ce35c36cf06d7cea2 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-03-19 11:18:42 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-04-14 10:56:15 +0000 bridge(4): Remove epoch_enter during destruction bridge doesn't require to enter epoch during destruction. Reviewed by: zlei, glebius Differential Revision: https://reviews.freebsd.org/D55935 (cherry picked from commit 17920f8335106487968d7928d01b34300756ea00) --- sys/net/if_bridge.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index c9ee7d742238..5d58948e70bc 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -936,7 +936,6 @@ bridge_clone_destroy(struct if_clone *ifc, struct ifnet *ifp, uint32_t flags) { struct bridge_softc *sc = ifp->if_softc; struct bridge_iflist *bif; - struct epoch_tracker et; BRIDGE_LOCK(sc); @@ -962,13 +961,9 @@ bridge_clone_destroy(struct if_clone *ifc, struct ifnet *ifp, uint32_t flags) BRIDGE_LIST_UNLOCK(); bstp_detach(&sc->sc_stp); - - NET_EPOCH_ENTER(et); #ifdef ALTQ IFQ_PURGE(&ifp->if_snd); #endif - NET_EPOCH_EXIT(et); - ether_ifdetach(ifp); if_free(ifp); From nobody Tue Apr 14 10:58:14 2026 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 4fw1Tm09NGz6Zc7g for ; Tue, 14 Apr 2026 10:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw1Tl5ntlz3Wmx for ; Tue, 14 Apr 2026 10:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776164299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VRpO+M4grXeW8G8vmV0LSN5Y+94eSJdrgJF+XzQxr7I=; b=UfsNlNnWGmT8JBh8zNzzwZdyRyS/Qx2j7Y4FmGi0Ns6PfZNuUAEwOijiGlDaVuuNCKhnZ6 SWGfNlZvXQ0tRYfszozDLHk68Dd0kvT2PKAFsrZfplYH6n1oqHVWe1m0j2GZlYP6BWy5sB cAnXEIwgHAzXASTM4F2vDJD3URZOUzmQxqy8jp8LlIdJbXPim+vpF3YKcDeBo+EUc5Vpzh 3zcX/2+Z74JE98RFQyqop55c1By7o9GcirpC1w+16v6OPMj71YUTU8lAB1dg0R4k0RLEzU OgPIXtDpCt0JvjQBlmb4z9WLbr9/2tJkYNNdSmYBb35ieWKm1UdFlJ7ape/mlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776164299; a=rsa-sha256; cv=none; b=a1k/CFOJ605XCh6BtReD3QkYzieGAPbXT+TlYpi4LNioq7zjr1/C0C+L1WnbMSZ1+qEBAq +xlPv0GGIbXlHVTbDUKmXeuRqFluaapade4BdXGKqSXjkSjR7tZoudaYrqpDVkTGfCvzsf 1NTCfLkgOCxt4CsN2nsnDbEg6ua+2toz6kLVe9NTJh3apb1BRdD47Brj6KX1+H1H8xdD0N 7Nuwc1g1OsMbnzD3gIsVl+Q+FHN6Ml4fNLlnhwFekM6hNX3/w+ARYv9ETPe8th+V+S50el DAp6YSeZ7ATbt87Mz9dFAxQiapMtE7sZ1I03H/b3VqYCO2gA/14OfFDmvkDUCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776164299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VRpO+M4grXeW8G8vmV0LSN5Y+94eSJdrgJF+XzQxr7I=; b=Rj/v2CSrawkrb6C9a/TLpcDSEdhtf7miHnuKaVRft6ghdQeHEbyrlU156GkwGvvtrPSo4E ktBOUsYganFxlXT9j4beqKl/2wbElq6/Db/z8uQApytUI3hU1+DpVBgEVDqDfKCkLxtamn IQGRBVXBgmdK4BG9YsjAVZpZfMvPb/wCJLYa3Lr/FVoyvtx9b3HHL3Hy1mQzz9gd0K5L8v 399zwwF3vZ0u25sxYxWAC3yVdXztyK+rwTN8n2q6GM1ahDKQqCzBHxo9cPnB5J30nsbrYv mLmwYdP5gCsGGx3Ac4N/6t//Z3gISxol5uaDsafuEs6Uf9ckxWwWHHA3W5+faw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw1Tl5B98zng5 for ; Tue, 14 Apr 2026 10:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31341 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 10:58:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 6af0ee7423bd - stable/15 - if_bridge(4): don't sleep under epoch(9) in destruction 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6af0ee7423bd1bbbad64fa033be3d4d0c675e331 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 10:58:14 +0000 Message-Id: <69de1dc6.31341.422f73e7@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=6af0ee7423bd1bbbad64fa033be3d4d0c675e331 commit 6af0ee7423bd1bbbad64fa033be3d4d0c675e331 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-03-16 12:53:45 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-04-14 10:52:29 +0000 if_bridge(4): don't sleep under epoch(9) in destruction bridge tries to run callout_drain(9) twice under epoch during destruction. once for bridge_timer, which is not required to be under epoch. second time for the BSTP callout, which is already disabled earlier inside bridge_delete_member. Reviewed by: glebius, zlei MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55876 (cherry picked from commit a8b9a05d3cad3bdcb9008232c9172a1aeffbe9fd) --- sys/net/if_bridge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index ca15deddaf7d..c9ee7d742238 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -955,8 +955,6 @@ bridge_clone_destroy(struct if_clone *ifc, struct ifnet *ifp, uint32_t flags) BRIDGE_UNLOCK(sc); - NET_EPOCH_ENTER(et); - callout_drain(&sc->sc_brcallout); BRIDGE_LIST_LOCK(); @@ -964,6 +962,8 @@ bridge_clone_destroy(struct if_clone *ifc, struct ifnet *ifp, uint32_t flags) BRIDGE_LIST_UNLOCK(); bstp_detach(&sc->sc_stp); + + NET_EPOCH_ENTER(et); #ifdef ALTQ IFQ_PURGE(&ifp->if_snd); #endif From nobody Tue Apr 14 11:10:30 2026 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 4fw1lq0QcNz6Zcbv for ; Tue, 14 Apr 2026 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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw1lp62Ltz3ZBF for ; Tue, 14 Apr 2026 11:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776165030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YohMdh45FeL/MbKR3MCxQSLOmMPI9Zm/X+JLtWiUnS8=; b=MZcLhvZydLYlLZxeSXcDr+mREvau/5JtVLkqR4HrMb68iwNvX2gcpQ1tl5eDKsB3Vfgr74 xon7rNz3zQQJbslu+QwCPOtUav4Xd8pivJCHecyjZMv0K4QEKjf5PQAWqdt35OrOssltCO HNOgTzXRPcjTGZaUGHqIVpZ9ZtIkFxCEA50uQhcbZw+zg2o4GKhLC1lLX13eV58J5QcUM8 vtWm/EEZ2fiWAtGGrXRIYW+4BP11Lr0JIZvLTpTEOaEUpbIkX6yCuraKidrpCKRRDtZBKH JyEPkiIwsEVNF0MVznFRsHHI7It90W43cION6vj6fz4feLHBlwUVbVZaFf7fcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776165030; a=rsa-sha256; cv=none; b=EIR+lJswmoG95S+1xviA8XBV7vMI8r2ktXM+7xNornbm2OQlMj7zznaVICc01BT7EFEKsJ oeAYQSpgxfp6ni3BwtNzg7ncYe9vliZT7gQZyVwadDCSIV1DQL/+OvrfKUq9zLLAQYKoh/ EgFgx/wgjgf7iibk+SsBB7RyzypQnQSvZfRnHq+tyYBUT4avQBakYDZoPk8GQntaURSPqk EeQEn8oFMIPZvo8vWTZzUV0xj1sAL6DE7c4zt1VqyhXtE5DA3hGqvPQgp/QJiFUot8ZBxt eWTF3BOitM7v1rr9WTbDGnFT1h0CESeWQTuW8Iu7NUWh7O7pn3e7YK7qqREOhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776165030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YohMdh45FeL/MbKR3MCxQSLOmMPI9Zm/X+JLtWiUnS8=; b=rghkLhGzdyi8s+kYmuwtc1snwt2YeoZ2o3nFKzEITCK/iP80/o+K+Xa5YYzoC/BKigmnqE rmvkYP2ZfiRfi4C90QXrKy3PjBTE9PFkDoZepyU6cQ1UkgRYje8G6wPrKcEx5wz7Bk9xIs DLTSc4OuWbcl3IKdq01SgBV+y1HfALW0AJXz4808jYzHOExa2QLcJhuOrO3oBad+4fxOPr gJotufujIOzJA9basVeX353SzuIsf1ZR+42qCxyFUEfLpvJ2GUUeoIORx0ktQZAxQdFOvE dpA7y7vbifNiMybAbyCD8b4pIdbWBvuLAzPiXZFIz45G7sYXM/2Thig4RDSvFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw1lp4wBCznSF for ; Tue, 14 Apr 2026 11:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34814 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 11:10:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bojan Novk=?utf-8?Q?ovi=C4=87?= Subject: git: 893b90cd9649 - stable/15 - netstat: Add -F support for -g 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 893b90cd96495f2a9a74ece2be248f16dcdde17e Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 11:10:30 +0000 Message-Id: <69de20a6.34814.35f5a42b@gitrepo.freebsd.org> The branch stable/15 has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=893b90cd96495f2a9a74ece2be248f16dcdde17e commit 893b90cd96495f2a9a74ece2be248f16dcdde17e Author: Bojan Novković AuthorDate: 2026-03-26 09:39:10 +0000 Commit: Bojan Novković CommitDate: 2026-04-14 11:09:50 +0000 netstat: Add -F support for -g This change adds the ability to examine the contents of multicast routing tables for other FIBs without the need for executing `netstat` with `setfib(1)`. MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D56205 Reviewed by: glebius, markj, zlei (cherry picked from commit cff675e83cdb6c9027e94df9d010439e42e27dee) --- usr.bin/netstat/main.c | 2 ++ usr.bin/netstat/netstat.1 | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index 79830049948a..f901ddfb2888 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -552,6 +552,8 @@ main(int argc, char *argv[]) if (gflag) { + if (fib != -1 && setfib(fib) < 0) + xo_errx(EX_DATAERR, "setfib: %s", strerror(errno)); xo_open_container("statistics"); xo_set_version(NETSTAT_XO_VERSION); if (sflag) { diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1 index 1931c38a1fad..42604cec0b16 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 16, 2025 +.Dd April 7, 2026 .Dt NETSTAT 1 .Os .Sh NAME @@ -94,6 +94,7 @@ .Op Fl j Ar jail .Op Fl -libxo .Op Fl 46W +.Op Fl F Ar fibnum .Op Fl f Ar address_family .It Nm Fl gs .Op Fl j Ar jail @@ -746,6 +747,7 @@ See .Nm .Fl g .Op Fl 46W +.Op Fl F Ar fibnum .Op Fl f Ar address_family .Op Fl M Ar core .Op Fl N Ar system @@ -772,6 +774,15 @@ See .Sx GENERAL OPTIONS . .It Fl W Avoid truncating addresses even if this causes some fields to overflow. +.It Fl F +Display the routing table with the number +.Ar fibnum . +If the specified +.Ar fibnum +is -1 or +.Fl F +is not specified, +the default routing table is displayed. .It Fl f Ar protocol_family Filter by .Ar protocol_family . From nobody Tue Apr 14 16:43:52 2026 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 4fw98S18PVz6Z65l for ; Tue, 14 Apr 2026 16:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw98S0dN7z3SLr for ; Tue, 14 Apr 2026 16:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776185032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fKB0bZqyT2kgkHY6wKq0BIASMcYSTNvR8Lk75oXqGDo=; b=OCoH10WCEiqzBRpDXzHKmB+wCzTcUqeZCbveXIXdJZDBzRmIh6FMammsazxJ3QLI1sTfU0 gloYFJpaPp0pOji+R0HuTV3Bo6WQW19wWIoPB0fElMa339S2c/TdP0CBXqQSM4l9d/xT7r AlhhyLOFE3Q5p4rhJtXqwQvnUI0EePKVGqtLt4XE76+nVeAGVr6bfWmW3KFd6KZTQHDYT4 9lLvRLfmct91LQQHhtKhwqpfkz84qTqSZTmTd68CKNEZ+veCYK/MjqD0NOqGhXwFUkvtRL A3ko6O42iadv5JvXyP+uIOtnGEWb+H5dQw9iwAGXNcoHJfeuro/XdIXaJuPjmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776185032; a=rsa-sha256; cv=none; b=UIUS+7kJyw1VRoxcsb76txidC36uHDcOfizoloIfFMeuuO9I3S0PBtyE8IyasqzODSf4W8 RYhc/opqjj57gJcpLlLm1wbeC89v8nCWyuiNNvJjmbhhNCwgTgQHtAiFlQMmpOa9kVxsCI zAeYQllLJjAKudFoDyZLny2Vm29M0Okb/PGlLYtGINLy4m8wPrAjMBecfjjPZGDMT6j+fD GEldOHrYqdlEfjJJVvt6zEq6/DfCgr8Ymk+iIN4npHQvpLs3UcxeXU1nn68OG2jGdJ3SOU TgOfafgbLrXKsLjJWNTT2pQAVSwS7LgybzXjgkXFeyilvQHxk+KaeYsi7aNHDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776185032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fKB0bZqyT2kgkHY6wKq0BIASMcYSTNvR8Lk75oXqGDo=; b=yz0jntFSgsEr5OkkYxQq0NHGW2YRm08SbJywgTjQH7t0frtbTZc0XTE/nZtNX1BHT17CXh 7uVKen+kp6D1IAgtCoR3V2mrN4PpuO24LEnc2nwxY1VskmSjB9+LV4ubmrv7OM69E6CafB 3LzcVH9tnAlf2iJTZQCNm9sbcaAeKTDwanoT6+JWcbuzjt5Nyp50YzPAxJYC5Ej9ZgAjl2 Zy47Qq3REcbqgxW1eAAvDltV5bnRjSs+Aj/k8tANtQJDs+0MimpUUvB2AjZNdHOvBTqHrj V4bUQHv8hGPOPwnybUdBG8RnJpzY7idtZM08Vq1ij2J+GV1GPVm0jSnZtxfsww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw98S03Sfzy1v for ; Tue, 14 Apr 2026 16:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25669 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 16:43:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 903c46ec05d1 - stable/15 - pause.3: Fix a typo in the manual page 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 903c46ec05d1e06cde18c349bf18e3721c7d3c21 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 16:43:52 +0000 Message-Id: <69de6ec8.25669.495b128f@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=903c46ec05d1e06cde18c349bf18e3721c7d3c21 commit 903c46ec05d1e06cde18c349bf18e3721c7d3c21 Author: Gordon Bergling AuthorDate: 2026-04-04 07:02:01 +0000 Commit: Gordon Bergling CommitDate: 2026-04-14 16:43:40 +0000 pause.3: Fix a typo in the manual page - s/reimplemeted/reimplemented/ (cherry picked from commit 9eea5eccf40d408ad22ac06d9962b3a98a0f0628) --- lib/libc/gen/pause.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/gen/pause.3 b/lib/libc/gen/pause.3 index 6b17ae10777d..85257071ce2f 100644 --- a/lib/libc/gen/pause.3 +++ b/lib/libc/gen/pause.3 @@ -77,7 +77,7 @@ A system call first appeared in the Programmer's Workbench (PWB/UNIX) and was then ported to .At v7 . -It was reimplemeted as a wrapper around the +It was reimplemented as a wrapper around the .Fn sigpause and .Fn sigblock From nobody Tue Apr 14 16:44:32 2026 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 4fw99D3tQnz6Z5nL for ; Tue, 14 Apr 2026 16:44: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw99D2nnNz3SWy for ; Tue, 14 Apr 2026 16:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776185072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KK2zC7LBFh0sIUqrg3B8mBLQ+YQG/mTtXoV/N2+qEJQ=; b=r4IUaAOKjFIM+dSivciBbEpSvbeKQ/P3KJCGgMIK9w4T0iAhc/cal2fEHhVS0i3R9a+oSU NQ9WVO+7yPtGPVURy2ZOi8Jn0HfuiUWpW+6K/0f27ci/IhogVNuIa8E1Q+ClF+ZcxbTmYN X0IOIkAUe/+Gdr64cQE/QZs+L14/GhS3pn2UXHlmkFLfVwefuZY+AWs1JwgV2yfv9PbwHz JumEfaJHrJ/pIGnZ8yo+d6rEXXAgT1a1XZhkCRjUzEyGUz4uSGNprciZ7CZxvh4BKgIgrI s36+DEw/rwBhHGkdot85OAm+wd4Og3ezzKxEPDcAspr3Cpao5TfAmRnHSC5zRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776185072; a=rsa-sha256; cv=none; b=YmLmoXRakHkoZk6kGwWGIXL7O58nzANYyTtAprSlFe7diX6Q8Vv41dEQVJwubSZlIL4Y17 GjB2r26MWAqVEDJdR+6xZQd/ZPQZ3X9mhYQQKQI/vR1rrp+NI7UXLDRCA4h6CHktRMYcJ+ 2Ao24mRPd3bbGHX+qzhPPmPJQSysT66NQZ2PWNkPsPhz0otMdO95jydFNVOqC9ZNUJE+8O N+v2MyjjRugQU3BxHtvObjjtat4Hl+HkdpuxN2jVSLPtnI6usXo2mMIqp2OLPWrgMaNsah 8wV//qoGbvp/l1WC+fgjO3hhxdf5MvXcPrBQpiHAPRobQMT9RG8vALA0kC/BpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776185072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KK2zC7LBFh0sIUqrg3B8mBLQ+YQG/mTtXoV/N2+qEJQ=; b=Mz4lBiopG5EfwuO2adRxx/+ZTExr4YE7mc1X6kAyDsLA3TE0ezWcVQA4Op9FkE9PMUzILf p2iS+U0KF3Q6m7ETY8MIiX2gjGxRcrcWIcGDX4qyTVdZv4J+OC3naahZ6l0Re0wbGD/Wz0 i4lc/rJQ8LkFfg660JoZvK98AhfHF2X1IiBen9H4m8NgJHfHmbdN0vhVs1gAh7ICJJq1vQ gIxGQOwaiOsy/JCtVEZuYE+vudcNxuNYfBkGH/qemA699JQLDM1dC/7npCSUxSDXcATUPl kutqc/BCKCetOTFNvFUXJUcJGwhb4g9geq03OQWW00euHiyKI8N5im87tyQJwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw99D2LbCzyj7 for ; Tue, 14 Apr 2026 16:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27708 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 16:44:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 20786556405c - stable/15 - bsdconfig(8): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 20786556405c7bb061c2362482359880c587a805 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 16:44:32 +0000 Message-Id: <69de6ef0.27708.564f32a1@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=20786556405c7bb061c2362482359880c587a805 commit 20786556405c7bb061c2362482359880c587a805 Author: Gordon Bergling AuthorDate: 2026-04-04 07:09:56 +0000 Commit: Gordon Bergling CommitDate: 2026-04-14 16:44:03 +0000 bsdconfig(8): Fix a typo in a source code comment - s/THis/This/ (cherry picked from commit b427b661be01e7b112531ba0b1ea27377a963bb8) --- usr.sbin/bsdconfig/share/common.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdconfig/share/common.subr b/usr.sbin/bsdconfig/share/common.subr index 830279168ff2..f4fda1a22ac2 100644 --- a/usr.sbin/bsdconfig/share/common.subr +++ b/usr.sbin/bsdconfig/share/common.subr @@ -440,7 +440,7 @@ f_yesno() # f_noyes $format [$arguments ...] # # Display a message in a dialog yes/no box using printf(1) syntax. -# NOTE: THis is just like the f_yesno function except "No" is default. +# NOTE: This is just like the f_yesno function except "No" is default. # f_noyes() { From nobody Tue Apr 14 16:44:33 2026 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 4fw99F5Vq9z6Z61K for ; Tue, 14 Apr 2026 16: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw99F3bGkz3Scn for ; Tue, 14 Apr 2026 16: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=1776185073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QMFLKZmrBEqohUes12y1jPYSbGekADHpK2P+CDBx3pc=; b=ygnWPuHaIGSaPKKsmzQB8lutWGFhT6aFz6vDqOcjjNp3Y51yx9hM8vwFNVTLUf//w9xq6i yM9JfqFfQzYH4PFnGyEN7s7P6MflGXtTzPtcuf888bPC4HYNtgQAZvqS7NIqt8I8RwHqZ1 kND3SUIi6T6DelI16n+7zIneGHvloZt3aBRxhOlMC8BcWE6tIbL0MQfDU7l6+QgHNo2l/3 aG2BYlSgTk2MRVgx2umhaIPw8V4PdkAVtblYJJg7dEfGDh4HeCLGp0b7pM5nGTEA6n3AXH Mn25t3bRHwpPSR+VYYmCQou4PwKS3uWks+FoMf7+K/MRft0WDDrJi9vddJzSFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776185073; a=rsa-sha256; cv=none; b=l2OUyzzQA1yuH8WVTNT53zSKQB8iS4ajSe9R8nr+EWNGOhM7rtYatl/NUQk/vnp+D9ck+I YDAASZyiSbv2Z1hUVF8mwztXTQA5rDAMMw0b+9YL3MnruBb4jvve2nxEa3YlSwlwjj+EBM 7x64ZWzcj5TqzKKEfgRsIrnWIHrCXlJ67D9a4pRsa2MbRpPkXzRdgVHEmmzkL0HrwRdcpG tdJV3X8HVlkaCXmPOw0zIv+GtpKe7rYoJrKtk6hnZF+lhQaaJ0iiACXVVC1eSyjNZ+dJZi Xe/cSMVnlrSo94ymmOQpAcKIsP89C6rzWglQ4CSAonCm4XorYOFFYFthR7UcXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776185073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QMFLKZmrBEqohUes12y1jPYSbGekADHpK2P+CDBx3pc=; b=NLZyyumJNXGFMkNAANJkBKepPNC+vyhLL92WP489Pbc0umKaHHd3etJgTKvzFKq7WmGh3d 5cFuQAqeK04Cn5RswIa9OnnkKnNu312UDplFSpOoPw/IUtDGxBHF0ZWiJNMphQHflYK1Ml 3XgLVbU9DKyX75gvP0A4fZhJuAvA+cbRYlvKFeVlao2UEnoO80mEBBNpGamtv1gKSWa5Ce cvmJVKmz/CfGMz8IYuVvWSveSLz409izn1xTmjw/tGgwvoQgn3RtXQR7J8bkl62KFUTBFj 2/IUF0o+aL+qKDLDEbggeIa93ej/EVOVmsvFSiYGuPS048IMBuABeAGDPpSYWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw99F39NLzy1w for ; Tue, 14 Apr 2026 16:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25ac5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 16:44:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a8fac98444a7 - stable/15 - bhnd(4): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: a8fac98444a7b76489a7a32793d4da10493bae11 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 16:44:33 +0000 Message-Id: <69de6ef1.25ac5.784f814f@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a8fac98444a7b76489a7a32793d4da10493bae11 commit a8fac98444a7b76489a7a32793d4da10493bae11 Author: Gordon Bergling AuthorDate: 2026-04-04 07:03:51 +0000 Commit: Gordon Bergling CommitDate: 2026-04-14 16:44:09 +0000 bhnd(4): Fix a typo in a source code comment - s/impementations/implementations/ (cherry picked from commit 04be4d04bbcbd061455b4424488b06927487a948) --- sys/dev/bhnd/bhnd_bus_if.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bhnd/bhnd_bus_if.m b/sys/dev/bhnd/bhnd_bus_if.m index adb2af9c4d85..6b917003b547 100644 --- a/sys/dev/bhnd/bhnd_bus_if.m +++ b/sys/dev/bhnd/bhnd_bus_if.m @@ -533,7 +533,7 @@ METHOD int read_board_info { /** * Notify a bhnd bus that a child was added. * - * This method must be called by concrete bhnd(4) driver impementations + * This method must be called by concrete bhnd(4) driver implementations * after @p child's bus state is fully initialized. * * @param dev The bhnd bus whose child is being added. From nobody Tue Apr 14 16:44:35 2026 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 4fw99H6pgQz6Z5vt for ; Tue, 14 Apr 2026 16:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw99H4w80z3SX1 for ; Tue, 14 Apr 2026 16:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776185075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bbUHweKwfwHO2c/QWvNLmB+RUd7PwAUZUIYuKzN5Cx8=; b=VBLT7aQzPapK0+220p6H2K3ELUhQYW9QMdvy+sR3AahG5jSj2tHBOUdpnPRskghRRUNg3B wBnE2DScp7ckJ6WxvXmFIn1Rk58LJUnXbXcvVRrvXUyLXIjdaOFZNKnTG5+tWneKxKOOeK Q++nXEMzfWScf7JDzDx4irZphIqhdXoNW1Y1vXxHppW2FeO9aZCPg4gZrYiTy60615SDUM WDyy8ynVKYprLtCg72yeIwwEAq7c9fyhuRBoFPkZyfS4vljgpdnY3oyflX/s4nU5L+lMgj 1FUEiw91GdTpPgENsvZV80FphWuk1vVS4RC/3lde7Nn8vR4CD1k/9ZxF58ageA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776185075; a=rsa-sha256; cv=none; b=lk86gsOTplETKHZcat4BbX5kUSf6w7wniA/zSAQ1zlya3LkL/peypN10/RwYHkZANUHN4q uXzEbZGlpkdXI/moAdrMRMVHv9x6gZBn/J3bFDhsTCsT8Xz4rnY8EMp7h17uLIf/l7LB5a M9bMynHAlQPqPe/3P44zpHQ2K9R5W4j4i/blUaHogyjP9CE6M9NQd4ueXTXwvxSY8LQ3+K W4iyT8QWCFrYzWsX7Bx2tQtBf/3xJeqD9rdxNrEqoYNSbZsTUjNGpu0/ikENCxQFj2P6T1 62R3IHF3EnXh8suxjLVeAcik0QUAakltW1+jRNwAf1N1OB2aNsCywWOG3hnyVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776185075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bbUHweKwfwHO2c/QWvNLmB+RUd7PwAUZUIYuKzN5Cx8=; b=hFEnmkvy3FE3Ch5szxcBAcVqVOmDJtJv1TTsUxjIKD1Gl/JAoKSCVXh87gu7G5vIQqykjW Kd7jEDl9cxFxbGhKcESPFO3NPv+xL9FPpO+JVsc4VAsaAexfMneAv/fzEaT+LsLxgSAYq+ VxAq6w2+6QueFwUFkDDNokvEytwd3t2PiSIBt0S2PvOMBGGCdUEec5RKNTjDnztabAdvnr 9g1wdR7Q0bxAoAMJlvBDkkl03HZq1tDKVtMUzZj0BoVNggHbP14G+dYqkDTSRNFzIqS6cD jyVtYaP4wvDqWPl8emYITq6WgnFrNP8Hq5fLX1g888kgATFr4NxOcFYu+LskdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw99H4Rj4zyJM for ; Tue, 14 Apr 2026 16:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 277c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 16:44:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: eb44833e2561 - stable/15 - shlib-compat: Fix two typos in error messages 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: eb44833e25619b32773ebd7d5e8daf73b4be0952 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 16:44:35 +0000 Message-Id: <69de6ef3.277c4.27bc722f@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=eb44833e25619b32773ebd7d5e8daf73b4be0952 commit eb44833e25619b32773ebd7d5e8daf73b4be0952 Author: Gordon Bergling AuthorDate: 2026-04-04 07:08:25 +0000 Commit: Gordon Bergling CommitDate: 2026-04-14 16:44:25 +0000 shlib-compat: Fix two typos in error messages - s/implemeted/implemented/ (cherry picked from commit 3957e233dd9cf7b7599dd0a5efc59a78adfa9441) --- tools/tools/shlib-compat/shlib-compat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tools/shlib-compat/shlib-compat.py b/tools/tools/shlib-compat/shlib-compat.py index ba506f6c0c24..2b9b34071372 100755 --- a/tools/tools/shlib-compat/shlib-compat.py +++ b/tools/tools/shlib-compat/shlib-compat.py @@ -307,11 +307,11 @@ class Def(object): return vals[param] def _pp_ex(self, pp): - raise NotImplementedError('Extended pretty print not implemeted: %s' % + raise NotImplementedError('Extended pretty print not implemented: %s' % str(self)) def _pp(self, pp): - raise NotImplementedError('Pretty print not implemeted: %s' % str(self)) + raise NotImplementedError('Pretty print not implemented: %s' % str(self)) class AnonymousDef(Def): def __init__(self, id, **kwargs): From nobody Tue Apr 14 16:44:34 2026 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 4fw99G62tgz6Z5q0 for ; Tue, 14 Apr 2026 16:44: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw99G4TKLz3ShJ for ; Tue, 14 Apr 2026 16:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776185074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xQ6vImv0WZiiJCSkHYwBk8gXAYDpfqKOTVpcZ0wp9GY=; b=n5eFGOJA7EhXiISpeKxe/Ky/23hcknqRBao7ENQtEff9dNmchqAYw9kwd+gMWA9SsSGS+D wmpBceUixnui4gHT24n6Q9fRupHITOQtCxXy9aHedX27QeI8qkTaEfZxyXUQ6R4gh7989/ rPkmni3uLsnRbyfntqbeDcNo5tYPFnwb2KKvImg1JBV+nNJ2srFTLVuT30Pk4aJ3N7ZKrz vnpCeosQ55BRh+HkLyAqZn4D2E+e615lMD1m5Ih6P8TuQsF7HJJi4zTTDUvpToFWF9lIcf JDs8M2srtzO89AG2751NP6QeARCrooVuCyJrZIVOwsShGNdDb2BdFpJ7bYWK0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776185074; a=rsa-sha256; cv=none; b=WXjWJngqh1oCUCUl2BXGVaRjpSIU7HC+5TnwtP4N7kngQWnriYZ2ClV3StBLASUrahXUyr 9+EhQAunOnj7HduR911f6mlIen3T5Sc6Ga+hMX1r7R6f9/kAeeVsGY1KlBw3+G/xZTnbe5 2eWUkHgo0yQzk8wE8eAL8vrBB2gEtPDnybyGrzDk4bTbKJxVGSqQYX1YCvLsR9VhNOSHav 1Bq+8W0PLGCO61+UfWeex28JprXwfz/glb+8VPp4/v/KqlJjFgxB7KS0fLlhOpbtXB22a+ m2dr7umTfnUSJzllqP8bYMlWjM0Rzdevu643apBXl9nTR+KG9SLi3hIMR7SUzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776185074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xQ6vImv0WZiiJCSkHYwBk8gXAYDpfqKOTVpcZ0wp9GY=; b=Zac5JLh2BerrpZt46rYaWgaClZir3KecXH9lC7AFDTQM4OmpODRHdiayDcOhXKsN+jjGiM 4l+GDPedEOHJaGAQZ8uQPVvu2HmDEUazi4epXD5V40bBH98Xj7uahNHPqVAmsYroBaHBO0 y8uHy0DQF9CtfScMqPzx3KgudCZlq0RhyR1BRweJLijkkS9bEVvIwD5sBuEHRESlXMJx2T Szo57eWCWhQmZ4hlrFOQPLnlHKZcaxRpKnxOVp8qjumTY+KShbQmCphTLVCYValTqKQh+H +lQi8e8N9NVFzHrSssS1mVH0fHzoG0n2+qgswiSVuy/hvVQponEvMTmtO07QUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw99G3z9tzyX8 for ; Tue, 14 Apr 2026 16:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2751c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 16:44:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 54cfd9cab9ae - stable/15 - ixl(4): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 54cfd9cab9ae8fb682e18a858d408399b2342407 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 16:44:34 +0000 Message-Id: <69de6ef2.2751c.190353c4@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=54cfd9cab9ae8fb682e18a858d408399b2342407 commit 54cfd9cab9ae8fb682e18a858d408399b2342407 Author: Gordon Bergling AuthorDate: 2026-04-04 07:06:58 +0000 Commit: Gordon Bergling CommitDate: 2026-04-14 16:44:15 +0000 ixl(4): Fix a typo in a source code comment - s/seperated/separated/ (cherry picked from commit ef3703a8cd9ade13d0c7a685577100e1fc18ee09) --- sys/dev/ixl/ixl_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ixl/ixl_txrx.c b/sys/dev/ixl/ixl_txrx.c index f971a3073265..d5ec81499308 100644 --- a/sys/dev/ixl/ixl_txrx.c +++ b/sys/dev/ixl/ixl_txrx.c @@ -33,7 +33,7 @@ /* ** IXL driver TX/RX Routines: -** This was seperated to allow usage by +** This was separated to allow usage by ** both the PF and VF drivers. */ From nobody Tue Apr 14 16:44:55 2026 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 4fw99g4hnTz6Z5qG for ; Tue, 14 Apr 2026 16:44: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw99g2yfCz3Tgc for ; Tue, 14 Apr 2026 16:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776185095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNJK3LfMIXNBH9vPwposVZRtPvmYzJvP9+qZqjf0EzQ=; b=BuMWonRgbJpEmekQsE/OhFohJ5m9a/diQIyHuRVocFxZBIyjrSSzBXkOsZ29U0P2RYht/1 BwZuiQ0b46aCaW6Ek+LXTLPIX5wgtb5pO5RXMNoBJdF/R6iR5TPx4wuAKTayBl3ojIlqAt u0XbA+Z1DvvcrlXgJPNqdoooTpfqruSja8v402z7cSt2mkSZ31JelBHYA5NNT0UnmqUWmA jkYdDMBeeqq9scOIyAGWWWzvHUMD9646nfi2M4ohHyGftlSAGt1Puhv9FuCeiasyGotR8Z e+Xpt280UdEg0gqfU+aZE8w+L52UNz5O7kJfsOBhNiI7f0dNjJGPLGuEbZCNZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776185095; a=rsa-sha256; cv=none; b=Ld77G3ZALJ/FzrqhzztbJHZ9e7HatUW3vERjPRVbJpLCZzLVcpnirlvhlwa6o8D7+7p8UH CZdHcUUpGZTNnS9VIXDiYr9X7zYyHBIfNvvVg9T6VXtnqgspTRd8HitaTdXYNfGvbgdcC6 O+zm+xvsIBmnDJYyUyBm5FvZxCi1nYyQT/a8FSafPE7thqSygJ18TcUP5lDGeD2Sv4xtUc FssIHBm5nuZt4NGJHbPz1W+Fkv1YVwu8gCs75a96SYmJEuM4BRiDrzM0Oof6kTs4I6hU2p SOKFkMsv/m6jqz3oPipav90lqnHlz6fVD/PdYjBqn9ThHmQvu1J/kMzTY950VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776185095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNJK3LfMIXNBH9vPwposVZRtPvmYzJvP9+qZqjf0EzQ=; b=ewjJRP5GJ/aZGXUo1WRIwt/m4ijB2D41LTkkJykEcGiWnu3aTJAHe8V4ABGqoYLJPMadxq ZyXqkJcoj9py9IodJ9RyBKy8JoxFIwQDHkewKeBZF//BKi05m8Gp+QkCDBUf/1KMNpgPtX 5Y/+ex/A7bJQeaF6+wT1qZ7bRiiHlqkdXJ/Lx/U/JwPkqYIYqc9TeqIfhi04sSIQvmWXGs tJ1go6uxRgGMj24JhcQ2P3llzQJS/XhYRyou4KyD1Gtw7ErD5raOnI6SBio7FJ+doiijAa itzxl6Pvh3EiQSLcSwvvIZYpHVCgId721p/3+baO8RTc/2R/XwipxRmWclLIeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw99g2CC6zyZj for ; Tue, 14 Apr 2026 16:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2768f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 16:44:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: c52f56527d43 - stable/15 - isci(4): Fix a couple of typos in source code comments 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: c52f56527d43081dec95ee2c41a095df78ba2553 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 16:44:55 +0000 Message-Id: <69de6f07.2768f.5c1f09a7@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c52f56527d43081dec95ee2c41a095df78ba2553 commit c52f56527d43081dec95ee2c41a095df78ba2553 Author: Gordon Bergling AuthorDate: 2026-04-04 07:05:51 +0000 Commit: Gordon Bergling CommitDate: 2026-04-14 16:44:49 +0000 isci(4): Fix a couple of typos in source code comments - s/THis/This/ - s/impementation/implementation/ (cherry picked from commit adc41a72b8843047d02265a6ab2d8a5025a9ce89) --- sys/dev/isci/scil/scic_sds_phy_registers.h | 2 +- sys/dev/isci/scil/scic_sds_remote_node_table.c | 4 ++-- sys/dev/isci/scil/scic_sds_stp_request.h | 2 +- sys/dev/isci/scil/scif_remote_device.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/isci/scil/scic_sds_phy_registers.h b/sys/dev/isci/scil/scic_sds_phy_registers.h index c0467325eb3b..29b04133d19b 100644 --- a/sys/dev/isci/scil/scic_sds_phy_registers.h +++ b/sys/dev/isci/scil/scic_sds_phy_registers.h @@ -137,7 +137,7 @@ extern "C" { //***************************************************************************** /** - * THis macro requests the SCU register write for the specified link layer + * This macro requests the SCU register write for the specified link layer * register. */ #define scu_link_layer_register_read(phy, reg) \ diff --git a/sys/dev/isci/scil/scic_sds_remote_node_table.c b/sys/dev/isci/scil/scic_sds_remote_node_table.c index a29cbefa5057..e447d5d952af 100644 --- a/sys/dev/isci/scil/scic_sds_remote_node_table.c +++ b/sys/dev/isci/scil/scic_sds_remote_node_table.c @@ -276,7 +276,7 @@ void scic_sds_remote_node_table_clear_group( } /** - * THis method sets an entire remote node group in the remote node table. + * This method sets an entire remote node group in the remote node table. * * @param[in] remote_node_table * @param[in] group_index @@ -471,7 +471,7 @@ U16 scic_sds_remote_node_table_allocate_single_remote_node( * * @param[in] remote_node_table This is the remote node table from which to * allocate the remote node entries. - * @param[in] group_table_index THis is the group table index which must equal + * @param[in] group_table_index This is the group table index which must equal * two (2) for this operation. * * @return The remote node index that represents three consecutive remote node diff --git a/sys/dev/isci/scil/scic_sds_stp_request.h b/sys/dev/isci/scil/scic_sds_stp_request.h index e8a64868a3b1..8cf60c8dd1b3 100644 --- a/sys/dev/isci/scil/scic_sds_stp_request.h +++ b/sys/dev/isci/scil/scic_sds_stp_request.h @@ -175,7 +175,7 @@ enum SCIC_SDS_STP_REQUEST_STARTED_NON_DATA_SUBSTATES /** * @enum SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_SUBSTATES * - * @brief THis enumeration depicts the various sub-states associated with a + * @brief This enumeration depicts the various sub-states associated with a * SATA/STP soft reset operation. */ enum SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_SUBSTATES diff --git a/sys/dev/isci/scil/scif_remote_device.h b/sys/dev/isci/scil/scif_remote_device.h index b6ac032c8234..4c21654ce42a 100644 --- a/sys/dev/isci/scil/scif_remote_device.h +++ b/sys/dev/isci/scil/scif_remote_device.h @@ -240,7 +240,7 @@ SCI_REMOTE_DEVICE_HANDLE_T scif_remote_device_get_scic_handle( /** * @brief This method returns the maximum queue depth supported for the - * supplied target by this SCI Framework impementation. + * supplied target by this SCI Framework implementation. * * @param[in] remote_device This parameter specifies the framework * device for which to return the maximum queue depth. From nobody Tue Apr 14 17:32:17 2026 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 4fwBDK2pw4z6Z8yW for ; Tue, 14 Apr 2026 17:32: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwBDK1mgHz3dVS for ; Tue, 14 Apr 2026 17:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776187937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yISfcaY/kWpQnG/CCci7nTLGi3PALnoqBroQOWG4M4Q=; b=qHSwJT5WRPWvh//UjZq8A0d28jq+YAaQ8yGshQU2olKGvRDBSUgR+6L5TbqeqFDZx7QMg0 LVhbOwb/t/CDcLcsVrA7dFuQDU4wxxrOWOGCKNcOtDx3Djw2FzLYYxqyY4ouJ4CiqLGsRK P60vGg8Ld1f/AoGdBjOcy72mBCNUS6Cg/X1MMPh8+SRyPFrlpw3/iaEnGzsOioV/LVlsEx K3YlSc+04uDRDnV+HZYeoQ13rZDh8TJ7w/AkzxdZmBYGCprhGtBElDXZhrNYJX0LofDBXI xeod7XwWom2lNTi1LLA12JMB3mAtL9uu3GuSfcRjsxwHWWbMwIEGfDW9r4ocew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776187937; a=rsa-sha256; cv=none; b=e6OUf73xl3KZ/xwSb35oMbdu1FT6Ufb3r35A325B+JjqX9wY9EMzFOcR1I1AF1kSQkTRw+ FXR7hOreWWxjSXt2UonUTtizQfeh67J3nCr12RiDdDbAIaLdWV01WrH+ViTRLjfgv6yVzn 4CVX1oEjRdBOF4td6/l2xAsA9zULn8bTsB3dNlO4SUAWjLtqh8iG3bK/8xqV1pEPWTCuRe 4ipsM30Q//1lUR4h/2T1feVsIeVimzj95aZptSBvrlp0sQ290coS0TeHRttO/31jHMvAEj tOqsjPK4nWACkOfxG4w3cGanrntmKGdmUgbfIlUH56A4mS0O6J4WYXPfNJcpUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776187937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yISfcaY/kWpQnG/CCci7nTLGi3PALnoqBroQOWG4M4Q=; b=s2EzxstdrbsXDuMlxORkc//TzbB+7XqDcJs7EghIJMyF4ttRjcp637Dh9An9Vti1cPJJgY 5oqga1dnsWqQHUDkriW2g4u0V6m7gI0lMsydR2Tf6wgwXscdKhH3P8Lz586hsc4Puk3m31 CFTxvnoIPCE2Y08IbtK374xmI7GcAdup+MmHJS6rokVJ2Ig1lvFRSr/wkXf7XTarUTNq3B WeVx1CQJQLqzEfqVHIgkU5TaondmS6hCRpTXETaSwaElhjsClhFAACQK2AFZtap1cc6FAW GP3BhxZ+1d5DyZWyTb33NFQ4v/+1JDwIAzmpGf2RqrcXNGTmfvvuT+Y29F0srw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwBDK1KGTz10M8 for ; Tue, 14 Apr 2026 17:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3480f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 17:32:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 82333a559ea8 - stable/14 - bsdconfig(8): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 82333a559ea8cf793ee55c2001c6bf3f1818061d Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 17:32:17 +0000 Message-Id: <69de7a21.3480f.3275159b@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=82333a559ea8cf793ee55c2001c6bf3f1818061d commit 82333a559ea8cf793ee55c2001c6bf3f1818061d Author: Gordon Bergling AuthorDate: 2026-04-04 07:09:56 +0000 Commit: Gordon Bergling CommitDate: 2026-04-14 17:32:10 +0000 bsdconfig(8): Fix a typo in a source code comment - s/THis/This/ (cherry picked from commit b427b661be01e7b112531ba0b1ea27377a963bb8) --- usr.sbin/bsdconfig/share/common.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdconfig/share/common.subr b/usr.sbin/bsdconfig/share/common.subr index ba4d4fce4abb..fb554b07998e 100644 --- a/usr.sbin/bsdconfig/share/common.subr +++ b/usr.sbin/bsdconfig/share/common.subr @@ -440,7 +440,7 @@ f_yesno() # f_noyes $format [$arguments ...] # # Display a message in a dialog yes/no box using printf(1) syntax. -# NOTE: THis is just like the f_yesno function except "No" is default. +# NOTE: This is just like the f_yesno function except "No" is default. # f_noyes() { From nobody Tue Apr 14 17:32:38 2026 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 4fwBDl1fpZz6Z91j for ; Tue, 14 Apr 2026 17:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwBDk5YGzz3dZr for ; Tue, 14 Apr 2026 17:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776187958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LfpcHzNbn1wy93Ai2guDQu3gCwwERoQhADU89nhEcko=; b=sMbLzXjGR5IvL3r34jsNBENtBcchGcWTfkcxhpwp8AzPHONawb/xEkTP1yHUk5vgD0sP+5 7zd2ZPRGVF4sl9g+rWABsOWaWVCj5qMn6H5jMh0NnBrs0Nv55bXR0GTtv+eKAC+86/Kpq5 sjOScwU2z/gPMjNtoQcv0/gE0MqXgy2vxTIRP0Zs+oQdpeHyZd3cW3zh+6pSdHQ+eYIWvk eOUzog4D1Cx8oynyFikZhLy3+SLdUK13bhJsiXBxRHxcvH1pxx88aBUdBhwCNXk/YpzmwP lKltQDDvIdqKNQmc+ijJGT8e2gj9xO75OyORHpnHMQypS/U/zXRIwu+m4Bthbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776187958; a=rsa-sha256; cv=none; b=Xd7XVNrOhfrEPq0WuWmMyBv+YJU3cUbd/FS7N45M+NPPBw8NTsrpkKrXo0D6Uh/QQJ9g6B X8Q3WHR/G5VMAIf4qEmyJ7QRe3D/PANNjYEkMntv0D5BXwxjGt9QEDVaF9GOXEdbrwMubh ItVVDE7KxH1JY73vvwTIb1EKlbul/Y822hU4fa41VMqqFetvw8Rb7+fZ8tgIKCDwnM2Pw1 N3qYQW0YS6qLJud5nZo1oVthliPC5dEqpLQkg0kghofV61sUDzjTYxPRMIbuWdRjcN80Kj 83LiZ2rqLWMajT+gnF24XbBkz8gCXe5FFtp7t7oUXnLNC9WD6aCeW630kpsAzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776187958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LfpcHzNbn1wy93Ai2guDQu3gCwwERoQhADU89nhEcko=; b=SnabYMaz/SyjcZQzWV6oiL5+SeY5U/XwOTJDqv/yJ+mhFLQ5mLuBdRi/7J8BMdtNAdBFh6 EvIjzWnEhP4Da+S/Q/oOaPlR6dk/G1jcL5lO3Z0jovU48NKjxroxIWmRYsYemoXc7uoQ/3 2JqYJDZPaMd4CAczJm90A03YiB/JZnIT5HfNEm4U5Wd958/2fMUuql8MSKCMnmC7qyamLO IWhgbMeQ8ozcQlVvxJdRuNanhROzVGk7xhZOGJzrO7CXGa+vpj516nWP9EdomnqPfF4JfT u2S5DqyF85KPyDH7asukbgzw7/O7D6DdeGFoOeAx0kOkBL9RVy0rhmjlppSorw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwBDk561gz10xW for ; Tue, 14 Apr 2026 17:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 329f6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 17:32:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: cbddd425af7d - stable/14 - bhnd(4): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: cbddd425af7da1559275599fb564c98fb80e3450 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 17:32:38 +0000 Message-Id: <69de7a36.329f6.77cd14d6@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=cbddd425af7da1559275599fb564c98fb80e3450 commit cbddd425af7da1559275599fb564c98fb80e3450 Author: Gordon Bergling AuthorDate: 2026-04-04 07:03:51 +0000 Commit: Gordon Bergling CommitDate: 2026-04-14 17:32:31 +0000 bhnd(4): Fix a typo in a source code comment - s/impementations/implementations/ (cherry picked from commit 04be4d04bbcbd061455b4424488b06927487a948) --- sys/dev/bhnd/bhnd_bus_if.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bhnd/bhnd_bus_if.m b/sys/dev/bhnd/bhnd_bus_if.m index adb2af9c4d85..6b917003b547 100644 --- a/sys/dev/bhnd/bhnd_bus_if.m +++ b/sys/dev/bhnd/bhnd_bus_if.m @@ -533,7 +533,7 @@ METHOD int read_board_info { /** * Notify a bhnd bus that a child was added. * - * This method must be called by concrete bhnd(4) driver impementations + * This method must be called by concrete bhnd(4) driver implementations * after @p child's bus state is fully initialized. * * @param dev The bhnd bus whose child is being added. From nobody Tue Apr 14 17:32:48 2026 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 4fwBDx0sQqz6Z9Qp for ; Tue, 14 Apr 2026 17:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwBDw5hHYz3dpQ for ; Tue, 14 Apr 2026 17:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776187968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A4pjL0L7MBA/LRUeKw0eK/FH6kBow54KBUVaHmFmFCw=; b=DbdFFUTlAMBOqQpO3TtQFAt/1BMaXupV7EFZUhvJeK5EjF+8QqMGSthdjiRSGADcjVNt40 ZTWSP2EgqVl6BUAk68gFPq+DakhFmID0v0Z3Qma9LiKZk/YZlwKj7/HI/8ZpOj7VJ8L2K6 Qcb3hqSpoM/swl+vICQVtegNvsQyU+qqj6cj6QHnQHZv+yudIFnu65Zgo5SUoySOzGvjWm 7RjquJuCWw/iInchk8hhkrgx9EoABKxra1im594FxfPuyn1P8FPmijf+LAOaUSWJIBomNI AttWnX2WsnHGRVAqCj28vHgBpOnB3Y2EPEESZ0UYu/BuOwqW82CdpCZkMAPqJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776187968; a=rsa-sha256; cv=none; b=E7az0CXY1fvPCOC+UavxE+nquFhK+aO5r/OuINeQhh682ixHyOjB+pEP+dCYvEIeaFwmbk mxJL5D8F33s7DYs01A+fQJGwwteyI9iIGMN9t8Vu0YzdjsffgMw7MlL8Kb6URIIXKlOuOG q2e1HSP3YX9ZqrrKHqDfUn9gBzCQMAVGxLAbYCvHYtcLWsfqvrdpXry3UXNBnWpbH+Os3m JDijfr9yYGj+uVyTjxbX25073oHqLLjy0tOmnMk0kmQofOaXnVDm5YckKHx+pCW5HqzSLb +fSSZdqfJMVgyR3yAwMRourpBeaVX2/d84cilwKBffE+mR02BLfmyj+7eRmopw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776187968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A4pjL0L7MBA/LRUeKw0eK/FH6kBow54KBUVaHmFmFCw=; b=bpPxfm2QFGXV7ukjeyNZJLUO6MD3cl+5NZ9GQhTzkbK4SZXPrK0Cv8mwCNru22TZy9f6R5 rkAt4KKxpe/utAUGwQ0R1+hOeDGZZj624GGem0Scpw+Una4e+3Wb/xSAhMqblepJ1ddZpI LAsF95bAiVSlmBQ+Eg2PT2nc4GlOChSArZomk4twwIA9Ht1ZBD5JA1ODWuZ3odgHY9zeWX navYCDku4d8sjRk+p1oNXkOoFrioYHqi7+11KovqYzZz0cLyLR/fRRxcoed+T1UopzCDCr O4M/LBc7vQoW4dHGrho7E7UQg7Tx5Y7paqtU9Tdr/zb0luPsiJaCp39XkqVSrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwBDw1Jp2z10m4 for ; Tue, 14 Apr 2026 17:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 331c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 17:32:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d23e0bc9c400 - stable/14 - ixl(4): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: d23e0bc9c4004364b573c03d674cb73588c6c014 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 17:32:48 +0000 Message-Id: <69de7a40.331c9.10c0fafa@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d23e0bc9c4004364b573c03d674cb73588c6c014 commit d23e0bc9c4004364b573c03d674cb73588c6c014 Author: Gordon Bergling AuthorDate: 2026-04-04 07:06:58 +0000 Commit: Gordon Bergling CommitDate: 2026-04-14 17:32:41 +0000 ixl(4): Fix a typo in a source code comment - s/seperated/separated/ (cherry picked from commit ef3703a8cd9ade13d0c7a685577100e1fc18ee09) --- sys/dev/ixl/ixl_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ixl/ixl_txrx.c b/sys/dev/ixl/ixl_txrx.c index f971a3073265..d5ec81499308 100644 --- a/sys/dev/ixl/ixl_txrx.c +++ b/sys/dev/ixl/ixl_txrx.c @@ -33,7 +33,7 @@ /* ** IXL driver TX/RX Routines: -** This was seperated to allow usage by +** This was separated to allow usage by ** both the PF and VF drivers. */ From nobody Tue Apr 14 17:33:05 2026 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 4fwBFF46s7z6Z900 for ; Tue, 14 Apr 2026 17:33: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwBFF1WL4z3fJ4 for ; Tue, 14 Apr 2026 17:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776187985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XpqMSl5wq/EnZya6X3/NY/b/9KJuQyrzGzYmZAkB7Us=; b=wJCuhfWffC5VGm/e3YCz0jiG6fSgiwTnIHl7nsTjPTXzLRmZGsR4PZAdWArSGJTFfn7tyN srDlxhhmEZKiMY/70IaTB2LFrwfjPXv3TvpedyVtsmyhV89kEk+JC525bjC1yYh5gzF/KA vfsdt2z86Zc03cKlktIDmKdhMMN5No5vi3yLtOmcQHfAmvZRhQkAhBTRYECmjOF5CZM+VS zB2VzM2B6zEY7bkRvSnYrp+5CKjf81oi3xLmvFRwuVWb0NqOPFp/6yA4YAlyrsYFVfWi6U Xq2ZG9s2yZrJRIebEXjSKdDGradU3pRWZxMJ62Ius/24iuovlnFzNhZh604iSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776187985; a=rsa-sha256; cv=none; b=W6jZxAWPOcxpXIo5UXwV1goj2gqfPDrT0bUlqoL8KyL4MUh+vvj5CLAaRhEHiXYdTaRHoM xJNXu7npfS6GARqE6F9p0NALD6YlPYt8s2M0k0D61FqjxejnmTYoNsHe4uk5+8drhIo8+0 ji6LEgu2R8HC7pZTyyb6ZhxljNp6YAXHgNso6hWQhH3FCxfnucdwk4mNHUC8hq/fTqSI9Y 1SkvhzKOlqUumuwDlY9/Kv5xRGXwuUphiHgadEge8jp74CdQaqdYjm/WL/ExyAwxi+KbWK Mj04uw46AT4LILpx+uR6tFNgPrBvWoiAm7aBkJF4OJLFyH4HWKCsOjWf9//E8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776187985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XpqMSl5wq/EnZya6X3/NY/b/9KJuQyrzGzYmZAkB7Us=; b=am2bMytmH7g1KXCd4NjbT7Mz2haMzPIaDbkJL9WDKPclYlCsIBYsnHcydsvzmMjsKt69L4 uX61NiOaadBYixVXvOPkVTMUJwbFMaWARHIRahxzYwhIkoRoxQsohHUDWf3mfZJieb5DcL ypR9vPld4heB5U5ykk/GomvtaW6pEO2VVIMtNa+UH4zduxHaIgXsj6sUzHzrQ9nizgbcoL /s+Wohu/0SszgdVAodzGJuw1NVMHOv0dLTJZjKegUaA3Y4Cpjn+MhflH3dqVh/ZryVEZUb EEOPF77fEBPlDiw47Z36/S2jxoGkwPhP5fAVd0RH2PsvbR2QDLt6sfs4oods4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwBFF0r2Vz10xX for ; Tue, 14 Apr 2026 17:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 346db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 17:33:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 3b6f570e36ef - stable/14 - shlib-compat: Fix two typos in error messages 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 3b6f570e36efb60e587ce020e67a354c56e8ccf7 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 17:33:05 +0000 Message-Id: <69de7a51.346db.403a026f@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3b6f570e36efb60e587ce020e67a354c56e8ccf7 commit 3b6f570e36efb60e587ce020e67a354c56e8ccf7 Author: Gordon Bergling AuthorDate: 2026-04-04 07:08:25 +0000 Commit: Gordon Bergling CommitDate: 2026-04-14 17:32:59 +0000 shlib-compat: Fix two typos in error messages - s/implemeted/implemented/ (cherry picked from commit 3957e233dd9cf7b7599dd0a5efc59a78adfa9441) --- tools/tools/shlib-compat/shlib-compat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tools/shlib-compat/shlib-compat.py b/tools/tools/shlib-compat/shlib-compat.py index ba506f6c0c24..2b9b34071372 100755 --- a/tools/tools/shlib-compat/shlib-compat.py +++ b/tools/tools/shlib-compat/shlib-compat.py @@ -307,11 +307,11 @@ class Def(object): return vals[param] def _pp_ex(self, pp): - raise NotImplementedError('Extended pretty print not implemeted: %s' % + raise NotImplementedError('Extended pretty print not implemented: %s' % str(self)) def _pp(self, pp): - raise NotImplementedError('Pretty print not implemeted: %s' % str(self)) + raise NotImplementedError('Pretty print not implemented: %s' % str(self)) class AnonymousDef(Def): def __init__(self, id, **kwargs): From nobody Wed Apr 15 00:38:35 2026 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 4fwMhC46LRz6YxCL for ; Wed, 15 Apr 2026 00:38:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwMhC1RNhz3X0v for ; Wed, 15 Apr 2026 00:38:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776213515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YDwtCLhUlrbvTdObuV79yjOv9d+GNzG/zllFey/z1Ps=; b=oPp462hrblQVThyufFDyzNLK5MwJgo5/PEvu2K71FZ6EEVmzq33OLLqmeIWuhcCFZ++k4s vN7rqRTgiDZr4qsP+pp/Q7tApAZI5Pk1fbMquoDMLW2EIVpSVY2SMUFFdPUhDv0BlG6D6X 9m8dZOTcff1GT7+Xr+z9UL5jX2eOEA3l63UKiF5Y0s2vUFxyddT7GhQJahOqMJwe2+cCVv VWka+w+IA/1RJ81lS1f6xlky4hKqa4SWD03T6Ec5gGVZUn/KY9hWNTQeJsu1YS24Wp9m1D caYDINmV4HDF7+waYdrOd615bfrziIUbjDoblUWOffAWvYNKDm2cqI7TEFpOcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776213515; a=rsa-sha256; cv=none; b=T+xqemJOd+D+ulCPHyFdPKbJCN+G2wX+1oE9gAX/lq+UKj/36U59G5Ru66S6GpgIXDwAA8 D6Kn0I2GW0kbY0Y+xpZkX7HW4tsV5/LHNpUCrZPmA/jM1v3/uogBf3bd2xw+zPpYqQh3T9 8knU7/UjKtoke/BE9xs7Rc3puoBGul3ZJYVvMms4WJLsi4fG8AWGIC73QXMlJX67zV5DNc nEoHCmcHRVmYF9JUgW42GqmZecmofpsxgEdpbWhO/+ShvHIYeQsq9Kwklxb6oABf8zLuyW iOkUx60HhMM2BzPgCQQyLWo1KA+wKBYmTo3Ys0o44qaeLMdP6yjS66PqJBYI1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776213515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YDwtCLhUlrbvTdObuV79yjOv9d+GNzG/zllFey/z1Ps=; b=xqMjxgWcPO9BrWRDVV8aKFa32n70tu4DB4KPQqox+MXiZVAyLbGrBxyza02k/ddCRrdF6A 7dNX3Zj1UdzTT2fKXzn0iE6/FgFqO8neX/80YksuDxmwp0Ouv/RIjT9tRD5THqHNbQ4whe SOhgWJNxBmQC7fSPH1FDxlx3zGwQPq6k+BjsiyE5ooV6GkScp8SbOmbMLe+k3IImwxIrAY hX22jd/k2di663WG3uCATJwAKjlNXfhLGc41ysXL+LuL49t7aKJZ/Y2tTsXRIRp81Dw4kC /p7EoWZPq1ZfbzFmV3LiMr7ud08L/nUnv+mx4d0JSLPx4YLo7/YsDRApc/nD4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwMhC12fNz1CYG for ; Wed, 15 Apr 2026 00:38:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38fcf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Apr 2026 00:38:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 68c6a735983f - stable/15 - lib/msun/aarch64: provide export file for arch-specific fenv methods 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 68c6a735983f7eec991c8ca63782de892af75200 Auto-Submitted: auto-generated Date: Wed, 15 Apr 2026 00:38:35 +0000 Message-Id: <69dede0b.38fcf.523966ae@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=68c6a735983f7eec991c8ca63782de892af75200 commit 68c6a735983f7eec991c8ca63782de892af75200 Author: Konstantin Belousov AuthorDate: 2026-04-06 16:41:23 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-14 23:31:30 +0000 lib/msun/aarch64: provide export file for arch-specific fenv methods (cherry picked from commit 96a685c229f2ce440591f98d33d36776e56dd55c) --- lib/msun/aarch64/Symbol.map | 10 ++++++++++ lib/msun/aarch64/fenv.c | 18 ++++++++++++++++++ lib/msun/aarch64/fenv.h | 14 +++++++++----- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/lib/msun/aarch64/Symbol.map b/lib/msun/aarch64/Symbol.map new file mode 100644 index 000000000000..b468c814ff06 --- /dev/null +++ b/lib/msun/aarch64/Symbol.map @@ -0,0 +1,10 @@ +FBSD_1.9 { + fesetexceptflag; + feraiseexcept; + fegetenv; + feholdexcept; + feupdateenv; + feenableexcept; + fedisableexcept; + fegetexcept; +}; diff --git a/lib/msun/aarch64/fenv.c b/lib/msun/aarch64/fenv.c index a428a9d8a271..3d7e467880c7 100644 --- a/lib/msun/aarch64/fenv.c +++ b/lib/msun/aarch64/fenv.c @@ -98,3 +98,21 @@ int { return (__feupdateenv_int(envp)); } + +int +(feenableexcept)(int mask) +{ + return (__feenableexcept_int(mask)); +} + +int +(fedisableexcept)(int mask) +{ + return (__fedisableexcept_int(mask)); +} + +int +(fegetexcept)(void) +{ + return (__fegetexcept_int()); +} diff --git a/lib/msun/aarch64/fenv.h b/lib/msun/aarch64/fenv.h index 32a03ee1eb49..5d47940cf9eb 100644 --- a/lib/msun/aarch64/fenv.h +++ b/lib/msun/aarch64/fenv.h @@ -92,6 +92,9 @@ int fegetenv(fenv_t *); int feholdexcept(fenv_t *); int fesetenv(const fenv_t *); int feupdateenv(const fenv_t *); +int feenableexcept(int); +int fedisableexcept(int); +int fegetexcept(void); #define feclearexcept(a) __feclearexcept_int(a) #define fegetexceptflag(e, a) __fegetexceptflag_int(e, a) @@ -104,6 +107,9 @@ int feupdateenv(const fenv_t *); #define feholdexcept(e) __feholdexcept_int(e) #define fesetenv(e) __fesetenv_int(e) #define feupdateenv(e) __feupdateenv_int(e) +#define feenableexcept(a) __feenableexcept_int(a) +#define fedisableexcept(a) __fedisableexcept_int(a) +#define fegetexcept() __fegetexcept_int() __fenv_static inline int __feclearexcept_int(int __excepts) @@ -233,10 +239,8 @@ __feupdateenv_int(const fenv_t *__envp) #if __BSD_VISIBLE -/* We currently provide no external definitions of the functions below. */ - static inline int -feenableexcept(int __mask) +__feenableexcept_int(int __mask) { fenv_t __old_r, __new_r; @@ -247,7 +251,7 @@ feenableexcept(int __mask) } static inline int -fedisableexcept(int __mask) +__fedisableexcept_int(int __mask) { fenv_t __old_r, __new_r; @@ -258,7 +262,7 @@ fedisableexcept(int __mask) } static inline int -fegetexcept(void) +__fegetexcept_int(void) { fenv_t __r; From nobody Wed Apr 15 00:38:36 2026 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 4fwMhD6mVLz6YxKs for ; Wed, 15 Apr 2026 00:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwMhD2Nx4z3XDr for ; Wed, 15 Apr 2026 00:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776213516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=goB2wmALI6kI+EehRBuo2fW9eBPR4uvuerexp1x2Kig=; b=bTfQMbmAI0HKJBms7v11V2rmgqbuSI6lxRtbLbmR97n8GAVXGRc9l9YHouRFy3d50J6rYY UoQXBbvHJwbtVWgUxRi86Tcotfk3tNy7CGx28DQtE5lg2ziAy70gokdFrkRJi1Gjkx3TnT qjXiH9ldEcf8DBHaM7niXfYkvkGKxd3ghGnbJfmtmmZd7zQ93NslNWYFGb1ewwGO1R+5LC JxVEO48cilnlj7qD5QTscM/TSFtTiQRMGT/nsXczH/4pv76AL7+smcgWl5cbUtDVAv+Hlo 4rX9mnBwm8tsv1WedybSHiGCrxwlqXsjYsP54Uv4MLnkKA+5WcJStNhFDcKpug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776213516; a=rsa-sha256; cv=none; b=iJV1rdyz66Gw3RHwuqLZwOKaoMZAMSOCgchRY1kS50maN011jvFeNg31nHPcEVFcQ8YPRL kk7wKxDi1CKsKuWZd5FJeZPfl+5UwUFnvFdeB1KMBhyc+Z3As87Ypt/Ol8tUdXqtie7p2J Pgeyfdv5tvUjrCNmG7llxzMy9r/CQPmL4jp/XVe0YKDSNPd1gh20KG3YDflqVn8L0T6Tfo GwIFGdpnnRYte5UlUNDRK2pseq/wOCes3BHVxyachjVsAcCX8szASu2oytFtQWUYcV69RM XDkaJtFW8YewQF/kSyxz0+9Wq4kgZrWQkdfmlF2XPuYLurUFH9w+JKT+uMvHmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776213516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=goB2wmALI6kI+EehRBuo2fW9eBPR4uvuerexp1x2Kig=; b=KwEKdTxRmTeYI6KHClg2P4uEZ5qvkk5R7jUW5isym1DoIVURLAFjbEKV/CQqqwVCEwu5zy 1YkvZbTxD13VqE5nu63FlCADPd+04tHXpcG9Y0IBE8CgY0UYLCp+raMvFGwpgZOlrA7UyN Vh97HHwhh68C/Hcgj2XODnAZtn2Y3jlmroKZjqHdpzB+h/PQlOYcafLsC4IHj/cTh+7LRv VA/d2zmCvRjdEVMREb6n66IFUuPpxbFcKFbIPd4jaFGBXg4g9cJsIwSkz8KtDw4kHLjvbN N9dRMCf/n5cMoRFBeL3KUrfnnFngehszy41rOBYbLpAKbNVlwYEeR1ffUFdrIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwMhD1sjFz1CqJ for ; Wed, 15 Apr 2026 00:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39025 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Apr 2026 00:38:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1e7e0335af4d - stable/15 - lib/msun: centralize addition of the arch-specific symbol map files 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 1e7e0335af4d7dbb77b418fdf6aca5f923bd7aae Auto-Submitted: auto-generated Date: Wed, 15 Apr 2026 00:38:36 +0000 Message-Id: <69dede0c.39025.1affebc8@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1e7e0335af4d7dbb77b418fdf6aca5f923bd7aae commit 1e7e0335af4d7dbb77b418fdf6aca5f923bd7aae Author: Konstantin Belousov AuthorDate: 2026-04-06 17:46:45 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-14 23:31:30 +0000 lib/msun: centralize addition of the arch-specific symbol map files (cherry picked from commit c913dce86e7b6ff9c0c3265631529586aaf8520a) --- lib/msun/Makefile | 1 + lib/msun/amd64/Makefile.inc | 1 - lib/msun/arm/Makefile.inc | 1 - lib/msun/i387/Makefile.inc | 1 - lib/msun/powerpc/Makefile.inc | 1 - lib/msun/riscv/Makefile.inc | 1 - 6 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/msun/Makefile b/lib/msun/Makefile index 24989749a502..4dc815ce87fb 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -114,6 +114,7 @@ LIBC_ARCH=${MACHINE_CPUARCH} CFLAGS+= -I${.CURDIR}/src -I${LIBC_SRCTOP}/include \ -I${LIBC_SRCTOP}/${LIBC_ARCH} SYM_MAPS+= ${.CURDIR}/Symbol.map +SYM_MAPS+= ${.CURDIR}/${ARCH_SUBDIR}/Symbol.map VERSION_DEF= ${LIBC_SRCTOP}/Versions.def SYMBOL_MAPS= ${SYM_MAPS} diff --git a/lib/msun/amd64/Makefile.inc b/lib/msun/amd64/Makefile.inc index dcdc2495d690..f1e6aef552ca 100644 --- a/lib/msun/amd64/Makefile.inc +++ b/lib/msun/amd64/Makefile.inc @@ -6,4 +6,3 @@ ARCH_SRCS = e_fmod.S e_fmodf.S e_fmodl.S \ s_remquo.S s_remquof.S s_remquol.S \ s_rintl.S s_scalbn.S s_scalbnf.S s_scalbnl.S LDBL_PREC = 64 -SYM_MAPS += ${.CURDIR}/amd64/Symbol.map diff --git a/lib/msun/arm/Makefile.inc b/lib/msun/arm/Makefile.inc index 6e3ddb351dd3..e155f1a2cae4 100644 --- a/lib/msun/arm/Makefile.inc +++ b/lib/msun/arm/Makefile.inc @@ -1,5 +1,4 @@ LDBL_PREC = 53 -SYM_MAPS += ${.CURDIR}/arm/Symbol.map .if defined(CPUTYPE) && ${CPUTYPE:M*soft*} != "" ARCH_SRCS = fenv-softfp.c fenv-vfp.c diff --git a/lib/msun/i387/Makefile.inc b/lib/msun/i387/Makefile.inc index 73feb52de6a2..f70c6b1bb569 100644 --- a/lib/msun/i387/Makefile.inc +++ b/lib/msun/i387/Makefile.inc @@ -17,4 +17,3 @@ ARCH_SRCS+= e_fmodl.S \ s_logbl.S s_lrintl.S s_remquol.S s_rintl.S s_scalbnl.S s_truncl.S LDBL_PREC = 64 # XXX 64-bit format, but truncated to 53 bits -SYM_MAPS += ${.CURDIR}/i387/Symbol.map diff --git a/lib/msun/powerpc/Makefile.inc b/lib/msun/powerpc/Makefile.inc index 35747abb7087..2ae9bacdaab0 100644 --- a/lib/msun/powerpc/Makefile.inc +++ b/lib/msun/powerpc/Makefile.inc @@ -1,2 +1 @@ LDBL_PREC = 53 -SYM_MAPS += ${.CURDIR}/powerpc/Symbol.map diff --git a/lib/msun/riscv/Makefile.inc b/lib/msun/riscv/Makefile.inc index 6262cfd6981e..ee32db47286d 100644 --- a/lib/msun/riscv/Makefile.inc +++ b/lib/msun/riscv/Makefile.inc @@ -1,2 +1 @@ LDBL_PREC = 113 -SYM_MAPS += ${.CURDIR}/riscv/Symbol.map From nobody Wed Apr 15 07:53:51 2026 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 4fwYLR2lx7z6ZT9c for ; Wed, 15 Apr 2026 07:53: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwYLR1xvMz49Y9 for ; Wed, 15 Apr 2026 07:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776239631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gKdyVLNAoDBHdUGyzpKHzd71uB4HATto+UILjANUp3E=; b=fZmC2AVft1Ktud5RT7D4f4l+xdyfzvomcUTaZ1PsBUNDdT8JcS1Jibub+/t/3o2brnkJBy F3wjXY1NzpQcsYIMteGFTqmwoSB9snQ3vsf9ShMcdnrqid4ekxj5x1GqpIT5AXy47kHG+b fWPFt/R/KPVDheXIsNY6fJRUR+Gdjb60WY/LTBC4uaH8SmSvehi4KpCwnAzOGQXBeloQ+k Hnt0+/IJmLpS2g713tuu0B55I4EJwOk7T0UDuy2vvCEx10l+aJE1Nrzk0cgqLZr/2pgb2L 9WsAawbfaCsuxsuHQmhzAmr2z6nr5rqe+1bLf7kDJtCJ41AIPgvNoLLsXKtArw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776239631; a=rsa-sha256; cv=none; b=vw9D0GdRty/OE7obEwBYcvcktMl8SyWj51v7Zm7qgth/O70BFMIQVmTbGeq/PpjYT8B6FC KdzGSM/uUbIflrnw6mprjqgktZBVYc9anQtr4TnWeu/3eeuLCYl31ZJrQ8l9d1XjFT/WmJ VlEGCEwFJoVjmN95+e1nGaf7s6rrn542cHIPG17YMFY0Gntygnb1bn3XHXs3FbmU1uBWQZ RjPl8CLzcIhKYhgVnSOU/4I/1JfgDaa+kZNWw63PqszQHcg7Rhw7ot8xeDsWAOz1s7GWLp pZ9rtEu3XFjvDONFmFxu6FhW9DDbDySFX9bNP8219fUMS6G8KcnKvXIM6iFNrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776239631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gKdyVLNAoDBHdUGyzpKHzd71uB4HATto+UILjANUp3E=; b=BGVQOy/gqJ05uEv2p0Es79LNnowgQKqAC5BpARd55/H6qmWOGVXlA9C4tsgF8eerzMyZlZ FZT8FklRUbngDTCATbNXB6G6vYXigOal+3YPeY+mjHlgRjHXxg/HaII/l0eOh1/doQp3hp u49ZP2PSRJ7L9OppwGQix5LBUQ14A6uFuY54YWvvTSKp3yo/CdHN5nrMqXlOmDh4tfhBv/ 9OlO9QsGxh3lSHKvkbQABvSS7UNPxVNgsuy81Hf6c5iAoIMyVN8GwBiloL/3N2ipBJaro/ uSOJrgoskglHGe73+4eFpRrEVV8g8WjxbFUT0wieq6nT+YlwWcFKJacog0yReg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwYLR1KClz1QvW for ; Wed, 15 Apr 2026 07:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 472e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Apr 2026 07:53:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 9d89e57a241d - stable/15 - stat: Nits in readlink tests 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9d89e57a241d17ee5c09d6899fd5a0bba47ee757 Auto-Submitted: auto-generated Date: Wed, 15 Apr 2026 07:53:51 +0000 Message-Id: <69df440f.472e5.7a25a0f2@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9d89e57a241d17ee5c09d6899fd5a0bba47ee757 commit 9d89e57a241d17ee5c09d6899fd5a0bba47ee757 Author: Dag-Erling Smørgrav AuthorDate: 2026-04-08 11:26:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-15 07:52:18 +0000 stat: Nits in readlink tests * The f_flag test may fail if a component of the full path to the temporary directory is a symbolic link. * The n_flag test had an empty head; give it a description. * Use consistent quoting. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D56293 (cherry picked from commit 1c793e7cbe2ecded388fd51fb20274891620a6f4) --- usr.bin/stat/tests/readlink_test.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/usr.bin/stat/tests/readlink_test.sh b/usr.bin/stat/tests/readlink_test.sh index d0107e0d655e..8eff21fa7a16 100755 --- a/usr.bin/stat/tests/readlink_test.sh +++ b/usr.bin/stat/tests/readlink_test.sh @@ -33,7 +33,7 @@ basic_head() basic_body() { atf_check ln -s foo bar - atf_check -o inline:'foo\n' readlink bar + atf_check -o inline:"foo\n" readlink bar } atf_test_case f_flag @@ -44,6 +44,7 @@ f_flag_head() } f_flag_body() { + cd "$(realpath "$PWD")" atf_check touch A.file atf_check ln -s nonexistent A.link atf_check -o inline:"nonexistent\n" \ @@ -55,13 +56,15 @@ f_flag_body() atf_test_case n_flag n_flag_head() { + atf_set "descr" "Verify that calling readlink with -n will not emit " \ + "a newline character." } n_flag_body() { atf_check ln -s nonexistent.A A atf_check ln -s nonexistent.B B - atf_check -o 'inline:nonexistent.A\nnonexistent.B\n' readlink A B - atf_check -o 'inline:nonexistent.Anonexistent.B' readlink -n A B + atf_check -o inline:"nonexistent.A\nnonexistent.B\n" readlink A B + atf_check -o inline:"nonexistent.Anonexistent.B" readlink -n A B } atf_init_test_cases() From nobody Wed Apr 15 07:53:52 2026 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 4fwYLS3qCTz6ZTd4 for ; Wed, 15 Apr 2026 07:53: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwYLS2bnBz49s7 for ; Wed, 15 Apr 2026 07:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776239632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N+Vqm4/FAmdChYBau9bRYm6bXXYEcK0ThXUdCux6zaU=; b=vG9OHmIsIVOn2PPvCwQkRFYGTMsGBKNKKjlqNgOlSRZws12dS/X8P3XjW0YwME/bCyYf4O i5PMK1C8TRRylklSBj3Y5BceTiH8Ak6ROvXvxJiYAx9xi+4UdeMEdS8Apgs9ghKhSCehOm PR9Jn5yBP8QYhdP9W05bjBCBq5MhAfzILwhCm+UFvCAYPO4pk4020xN4O2uV9I5wrO7s7B hMbREqhuzdWQedPmE3hT842q0z4g+UN27N3CWUUNk2ICGXa/yoB8xhHwc/C8vbcNRvEqD4 3fLgbdtyygkoSi4dufM/lGF8hDg83YgepIvzPaMO9lwIhp9y/ouB9mvUY9ui4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776239632; a=rsa-sha256; cv=none; b=O+3g1hEepggRpQS9i79yLdQ45n1ulCdx49gepfEYueT7MM7v30/nSmcesF5XUvBdj5lMIB I53t0HqaVLOERD2wvWt6FfzbOvB0k53ikdBBiEInEanexCKJAv+Ut5Nu/B4fOC8AHuGbjH snXRDQVaiaz6PjUVS5uLTML5w57uGC2M1zTuZ7R2RfeHLoVGdb9ogYywPYsKfjds3t1vkZ fG574moCYlKluAd6eleue6aL1RBBmNy5D/rcYk2jQteExdnraUTBnlpuo4I8uhyB+ucpAC hQ9DVkgL5bKsVtnZhJXNhfkhGofaDbtMCJSoCU0MKKSpOhrj26/1CIuF+zAKwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776239632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N+Vqm4/FAmdChYBau9bRYm6bXXYEcK0ThXUdCux6zaU=; b=Rms4wHpPFbLFzPIpt/vg6TKKIScvtQe6M+Kysh3N22UScoMMpDhLj8UJzzDhUS8c4DF+Bw 4CJkS1p2wl9fjLXlgALC3Y3KxCljk/Gk/iK1OcyWqGTXU2CfESSBPGEb8ezPObaHD6EXTh u3pEbz2LtKm4dlC2XW+jSHPKRuSViRsEzSIG9NZZQ8n4OxHkRIK/nSQKZ9wwEMuenZRuyn zo4/W2COb3dgmArQlinulZBd7MPmjs2q/AUjJma88pg4bofpywGGCp9TxMMi2qGvnqAUdl l3khTQoN6EeFh1qvaFX6L18B8LGBm/RYVLTK3PCROB0oSJXX+MZCp5QEtejkjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwYLS262nz1R2N for ; Wed, 15 Apr 2026 07:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45765 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Apr 2026 07:53:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 94d4be9a166a - stable/15 - stat: Nits in stat tests 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 94d4be9a166ab8761e607f8cce1a9402b8438892 Auto-Submitted: auto-generated Date: Wed, 15 Apr 2026 07:53:52 +0000 Message-Id: <69df4410.45765.4773ec79@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=94d4be9a166ab8761e607f8cce1a9402b8438892 commit 94d4be9a166ab8761e607f8cce1a9402b8438892 Author: Dag-Erling Smørgrav AuthorDate: 2026-04-08 15:35:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-15 07:52:19 +0000 stat: Nits in stat tests * Use ourselves as test file instead of /COPYRIGHT, which may or may not be present in the test environment. * atf-check understands \n in strings, use it. * Some file systems don't like creating small holes, so create large ones instead. This means we need two variables: ps (page size) is the minimum size of a data region and the alignment for a hole, while hs (hole size) is the minimum size of the holes we create. This makes no difference on FreeBSD but makes it easier to port the test to other platforms. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D56304 (cherry picked from commit 8cbd3949297d56e3960dcde73bd7e2277ac4bee8) --- usr.bin/stat/tests/stat_test.sh | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/usr.bin/stat/tests/stat_test.sh b/usr.bin/stat/tests/stat_test.sh index afe698575034..6043686396be 100755 --- a/usr.bin/stat/tests/stat_test.sh +++ b/usr.bin/stat/tests/stat_test.sh @@ -54,6 +54,7 @@ h_flag_head() } h_flag_body() { + file=$(realpath $0) # POSIX defines a hole as “[a] contiguous region of bytes # within a file, all having the value of zero” and requires # that “all seekable files shall have a virtual hole starting @@ -82,27 +83,27 @@ h_flag_body() atf_check -o inline:"$((ps)) .\n" stat -h . atf_check -o inline:"$((ps)) ." stat -hn . - # For a file, prints a list of holes. + # For a file, prints a list of holes. Some file systems don't + # like creating small holes, so we create large ones instead. + hs=$((16*1024*1024)) atf_check truncate -s 0 foo atf_check -o inline:"0 foo" \ stat -hn foo - atf_check truncate -s "$((ps))" foo - atf_check -o inline:"0-$((ps-1)) foo" \ + atf_check truncate -s "$((hs))" foo + atf_check -o inline:"0-$((hs-1)) foo" \ stat -hn foo - atf_check dd status=none if=/COPYRIGHT of=foo \ - oseek="$((ps))" bs=1 count=1 - atf_check -o inline:"0-$((ps-1)),$((ps+1)) foo" \ + atf_check dd status=none if="${file}" of=foo \ + oseek="$((hs))" bs=1 count=1 + atf_check -o inline:"0-$((hs-1)),$((hs+1)) foo" \ stat -hn foo - atf_check truncate -s "$((ps*3))" foo - atf_check -o inline:"0-$((ps-1)),$((ps*2))-$((ps*3-1)) foo" \ + atf_check truncate -s "$((hs*3))" foo + atf_check -o inline:"0-$((hs-1)),$((hs+ps))-$((hs*3-1)) foo" \ stat -hn foo # Test multiple files. - atf_check dd status=none if=/COPYRIGHT of=bar + atf_check dd status=none if="${file}" of=bar sz=$(stat -f%z bar) - atf_check -o inline:"0-$((ps-1)),$((ps*2))-$((ps*3-1)) foo -$((sz)) bar -" \ + atf_check -o inline:"0-$((hs-1)),$((hs+ps))-$((hs*3-1)) foo\n$((sz)) bar\n" \ stat -h foo bar # For a device, fail. From nobody Wed Apr 15 08:46:21 2026 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 4fwZW71YQJz6ZXKV for ; Wed, 15 Apr 2026 08:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwZW70XG8z4JFF for ; Wed, 15 Apr 2026 08:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776242787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YP8ffKwsz6OnnKeALDOyvxaRbUsg6dt84n3iqVSWyks=; b=wkwK/CCT/yFmozCzHN2fyl+1dnEDa9hL1gsBX2T1SSdqP1QxEEhdYQDYebnFSEydA4O4Yr KKGvJArlKf9E/pjpenu2CnnFIji4G0NpUEZLvcNoPn/POPI6ktSG2P4jTuuLxbVrON/ohn GW0ncEaWI4YgH5eJK8rBxXsK5FejDG4x2dwgRdfaL5TUF2j+MFbLntGVXRbwBpI/i+NWms MMKozeI+Hs4jO1AlzqKXvAA1HN8url025ucraVl5VAH6fREmrRAQedBFw379VWh5PfIPun wyRyFJnGtIEcDPqfOsEQjez4y24D4Au8vKSor7Rk3INHP0ojRYnqLqz79GyfYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776242787; a=rsa-sha256; cv=none; b=aL2DmduCFfLVtZbL6BoKQPNa/Ue1r/F0m/WQBmNuzUPFl+faC65QZ2NLBVLxrLNhRjeOIT jGIqVqZWc7Bso1KFw/awjatK0IKnPPI9RTvMicchokD3oz2pTEMNlVIci3s2g5AgEBjEJ3 LAGnvX/E/CnQp6EZUnKgPXUajgbilQmlF+JWewoI+RSIDBnkLYfvGlyH7AvU0PMNnaf6np cRkxBdfUFSLSiRJshhC+iVUat51Qn8ru19jrkcwiuXl62CHOlyVNxadaexmc0/35BNRr54 o+s9dU7AeTMPOxspmElkEOFfdpZ4S7CbYX3buyLxx8SzhkmyGHkRKPtqTujdXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776242787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YP8ffKwsz6OnnKeALDOyvxaRbUsg6dt84n3iqVSWyks=; b=VdzL3RnQT2TDXzVz0EhRJtHKpMRxe+GtU9WUon0YNQEeh1R+ryOFQ75J1ps5nfBFvXGgz1 dSRrNt/E9zZsYw8v4JEDP+hO+nkeHCe9SRFdOubedl4+MK2a10KWDeZG50OqCr0AVBH/fl RdP5HnZnjmFtk1B5jJ+fW4Vegfxrobkjcw64J//TD92gbiL8X3pV5i2QMRtctY06LQW3g+ YyT4In/GCKZaPSgKEHM6H1exx5rRMTp0NnZdVZxokJZFzWKkn2FH2wW6mizqNcMkAxZGsp /l9TK9MhSO9PmUlvtWd1cjY3HH9LLH2K31uKlGWPUN/lbM5+FzxxQ0snDjY60Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwZW706M6z1S83 for ; Wed, 15 Apr 2026 08:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c23c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Apr 2026 08:46:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andre Albsmeier From: Michael Osipov Subject: git: 5aa751c6556f - stable/15 - daemon(8): Add "--output-file -o" to list of options enabling supervision mode 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5aa751c6556f9ad9db651bee83f3089f53269b63 Auto-Submitted: auto-generated Date: Wed, 15 Apr 2026 08:46:21 +0000 Message-Id: <69df505d.1c23c.78621f62@gitrepo.freebsd.org> The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=5aa751c6556f9ad9db651bee83f3089f53269b63 commit 5aa751c6556f9ad9db651bee83f3089f53269b63 Author: Andre Albsmeier AuthorDate: 2026-04-12 16:10:59 +0000 Commit: Michael Osipov CommitDate: 2026-04-15 08:45:33 +0000 daemon(8): Add "--output-file -o" to list of options enabling supervision mode This is the small internal doc fix from https://reviews.freebsd.org/D46313 Reviewed by: michaelo Approved by: (blanket; comment fix) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55325 (cherry picked from commit e9a69948a8837601d71e556550a272ca85c03e48) --- usr.sbin/daemon/daemon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 341438730a6d..9158d6404b29 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -194,6 +194,7 @@ main(int argc, char *argv[]) /* * Supervision mode is enabled if one of the following options are used: + * --output-file -o * --child-pidfile -p * --supervisor-pidfile -P * --restart -r / --restart-delay -R From nobody Wed Apr 15 08:47:48 2026 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 4fwZXn3flvz6ZXsr for ; Wed, 15 Apr 2026 08:47:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwZXn2yrrz4JXp for ; Wed, 15 Apr 2026 08:47:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776242873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BGQ3UlL57kl0UfLAWTTzf3c2sOH5kOmJFq9FaaAYKeg=; b=A11CQ66sxlS2Xq9S7pfG7LuyKCrb8uOqfPRe/B7mhx8/d03vfhtHEZHOJXE7ypH+nj1Adv cqeIeZG/xCUjDqGHSzpc7B6MiuaqKhIAuEHajL8EuqVapP1yusBBtjCcrr/uO2zorHqKuQ DtF6DeLXLE7mTa7pSdxHQhtq/T2zGGyjT3rDLwTWqy8ORuctn+AEhslxQaAY87Wh2rAk0q JwNOgOJKcSIyp3tmTmVlIHbuNBrwqyL9TenuVEhjh9YY8qOOAJEgHYwc2F8xqsTMhcit5a EzZxk/shCPqYjkINBqx4GKfr9iSDH85/1gL37P4YJoL73eS8ljh2b7tK8N+5Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776242873; a=rsa-sha256; cv=none; b=k3cExFrSNO3SayToCS0Se+Ne57M2u8jVjNPy3/YnGSquXoHUQmXL1mr3Y6pOOAp4+P+C/9 /zAS2CTUDvVKcJt/JYmAUlANgjmAIA4ToGdUWLCpXhyb5CZkiMs23jVqUHHt1lPecMBcEe 0z0RXxQU1S64UZ4Sknnfo5IA/bKjVC09WK5OWc/S7VfLYBhM1vMoYzfxPhiocW1qEoxsvW 0J4S5QQT11ij1FNPOA+H0Yw1EoQYBDNfGOzjlySRYlGwYtANxGVZ1v9fe1uDepDEB+8PFi vIeTbnWFZIPNKYS9Z4ZPo/0riyZ+ajN1JXxqkHbGRHRYwzQ4Y01AELBdEh78Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776242873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BGQ3UlL57kl0UfLAWTTzf3c2sOH5kOmJFq9FaaAYKeg=; b=syn++zxZvGRRe7zCfjnP673pbaIla7RT0lZpy+JOSdi2rmy6N2tgujTYTuUUM3kwYHzZl1 EQDf+YGupI27+01glp1+3nR7/B0T6E67reUX34VFeLkzCjYo9I63O73JYbHYqzTX+Cp818 ApILhhKP1FXFAO/Fy/5VdXkOAmsegLJ0Vd0zMeMWdukeYazi7trLq5IffxozTtwOk+BKAk RGN5RYRc1WPNFaACqCg9CaGUwmSPxqkmZBdHhX0iL8M7osapOoaccN/mRKzHLyGKrvYMdn 6+XUmL2EAbvds1NY6CWt2YuDKNC1mbPlEZYgaP/hLepA25XGBuNwH8bNMm2K5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwZXn2Jjpz1S3x for ; Wed, 15 Apr 2026 08:47:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d29c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Apr 2026 08:47:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andre Albsmeier From: Michael Osipov Subject: git: 2620eb7a3d42 - stable/14 - daemon(8): Add "--output-file -o" to list of options enabling supervision mode 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2620eb7a3d42c56a0dc681c48475ebd84be18283 Auto-Submitted: auto-generated Date: Wed, 15 Apr 2026 08:47:48 +0000 Message-Id: <69df50b4.1d29c.308ba928@gitrepo.freebsd.org> The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=2620eb7a3d42c56a0dc681c48475ebd84be18283 commit 2620eb7a3d42c56a0dc681c48475ebd84be18283 Author: Andre Albsmeier AuthorDate: 2026-04-12 16:10:59 +0000 Commit: Michael Osipov CommitDate: 2026-04-15 08:46:45 +0000 daemon(8): Add "--output-file -o" to list of options enabling supervision mode This is the small internal doc fix from https://reviews.freebsd.org/D46313 Reviewed by: michaelo Approved by: (blanket; comment fix) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55325 (cherry picked from commit e9a69948a8837601d71e556550a272ca85c03e48) --- usr.sbin/daemon/daemon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index c83d9ed8f35c..2aa51b539805 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -182,6 +182,7 @@ main(int argc, char *argv[]) /* * Supervision mode is enabled if one of the following options are used: + * --output-file -o * --child-pidfile -p * --supervisor-pidfile -P * --restart -r / --restart-delay -R From nobody Wed Apr 15 08:48:40 2026 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 4fwZYh6L9xz6ZXQt for ; Wed, 15 Apr 2026 08:48: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwZYh3TByz4Jtj for ; Wed, 15 Apr 2026 08:48:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776242920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fyyyrnuLB0tJfcu2x6TyGhwCATVyfl82ffZfJTYUTwI=; b=vWEgbQa3qdmd4kh8qS4W0zo/znGd6pDVubT3Hl8OgE3sM0jfl6YgcEOu9tKnrzVADLghW7 YhhCISQIn11BelmN+fhKThH556c2HkXWhkfwMdklOyagFUL+gxCCA7TBhmGEJgfrGBpPbM aRn8G3gO7EtJXIExnOp8MbdvgPaW8VbiHWM6lyVZFrPF916vKBejGBlD8p4Q5mWQsKZBc5 Ij+tClS9u9/EEKuj3V4TUPxkTCZyBC/aAaQ+N7m5Y/1FH3UVMptt6xGgIsmvYj3rdYcfEk zxKEIpn5UfMYpcDWjUgcVcOZrgFBBRRpaFXr1pi8IHA5gWAuMFFL/fmg5oM67A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776242920; a=rsa-sha256; cv=none; b=PwqPlCACBA8tEy68Mg8w98yY6JJ4HFBsp1SzWqYqyuYNvcyOoC6/1dMa3Hc/rfxTkb20JL gO8F0X/rvY4FBy/uGHDrzeym4eZdjG2gjkGXbQWyKKHHnDyUT1JkGCVIoM4ebwzjh9eSP0 aE1FIJ55Z1a63tD4s9947B5Y/CvIF96YJ4adCQbXB+xYfQr9C3GKvx/6qpciDRTvZv3Y6t 91sh7eyZCmap9CRJvWznCk1XYUwwzezHEvS6WgRNE3Dhx1eKL46rr/vwN7SWwB2vWS3c/k iKgtYPH7BAK3ODlyMFtjpWgPvt7WVlWIuVF3QLveaFPj01HdFpCmXMrY2T85yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776242920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fyyyrnuLB0tJfcu2x6TyGhwCATVyfl82ffZfJTYUTwI=; b=jC9aeDbXtPw5X+SPmcr78sMOq1OTXB4Nr+JJyhbUaGHMmw6tlKH71Htiqxw1Ids/8bno0Z tOGpoxCD1Iq80A8zQtTJysDAfO3u6wHn4guIl8uxkAiQL0vVpBy63Vv8MKTsV+fkUqCjMn dhNi0wgvHuF71Q+jzn5edX1JBUctULhFDGSPG9eqrPXr8EEqcND2tEIFePn0/I9ZH6gLDt n3H6SO8GwFzpLw7odKb/+Ap5zM+wSzDpx3JgyNVq4miQUebuTRhlzxfROMab9TMsxV3VPm P7P799ki+kMuQ8d0rL2OsIj0q2CYW/kGYpbNo8wRE3zq2Kp93O5yYcBqyrqNxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwZYh2pZPz1SKr for ; Wed, 15 Apr 2026 08:48:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bfd5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Apr 2026 08:48:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andre Albsmeier From: Michael Osipov Subject: git: c80f52565bc8 - stable/13 - daemon(8): Add "--output-file -o" to list of options enabling supervision mode 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c80f52565bc8bd3deb95dc863666d89449cb364f Auto-Submitted: auto-generated Date: Wed, 15 Apr 2026 08:48:40 +0000 Message-Id: <69df50e8.1bfd5.ee18da2@gitrepo.freebsd.org> The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=c80f52565bc8bd3deb95dc863666d89449cb364f commit c80f52565bc8bd3deb95dc863666d89449cb364f Author: Andre Albsmeier AuthorDate: 2026-04-12 16:10:59 +0000 Commit: Michael Osipov CommitDate: 2026-04-15 08:48:11 +0000 daemon(8): Add "--output-file -o" to list of options enabling supervision mode This is the small internal doc fix from https://reviews.freebsd.org/D46313 Reviewed by: michaelo Approved by: (blanket; comment fix) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55325 (cherry picked from commit e9a69948a8837601d71e556550a272ca85c03e48) --- usr.sbin/daemon/daemon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index c83d9ed8f35c..2aa51b539805 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -182,6 +182,7 @@ main(int argc, char *argv[]) /* * Supervision mode is enabled if one of the following options are used: + * --output-file -o * --child-pidfile -p * --supervisor-pidfile -P * --restart -r / --restart-delay -R From nobody Wed Apr 15 09:11:19 2026 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 4fwb3w5LNFz6ZZJT for ; Wed, 15 Apr 2026 09:11: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwb3w1x82z4MtY for ; Wed, 15 Apr 2026 09:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776244284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U17pNYkHOc1JjHaYYFpBAQB+sp/eg4HQl/Nqg/qxETI=; b=Y7AHSnGHeJNVrbUVOxDLg0x3KiC1iAKRzL0st4rxnNCG69/At978iowwaCWHNrjOCanRve Qsvrkw5K4axuBX3HGh9NrO3H4rCSkkCe/fdYMqSF4am0or7rzJ/J60N+5LAGrXXrZo3SuL fuAMfsmQX121OVPE1qBo71KWQ7I418ZLP9jnfNPG6JxgEyBklKWgUjRaAOEMtkToWNKRWI pC0Z1qY6fsOXHg0/Qzy1AwpUa2SsGcudqae6/fvhzViQueM1VfzVytHKTpaZkFwtZ7Cb/P RtAlUhqP/fdG3hxCBZfyu51jg3BI4/7NFXpLbzX0r5StL09IAc3UneiNeqOUpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776244284; a=rsa-sha256; cv=none; b=QD7FFfns3/fA82h7KJjbTMP9pRVK9k0F0M9FG8qR4CHhv4dIz9IUGusJgMozpX78ykg3D2 CgesPg1XbLPGWGvtuV0C7uxQh3+dryHPwpzbEZUgeikv2qTGZso4E5Xgk95quha4ZyrJyU 6YaI8m5gsGvW7BQDoim12P0DpNsCi68IcplEk/9vLTK4ufykQMSYbHibZnoqYn/86cTUy6 UhC2Kt+uH5KGZiqU66GJiOTzLXTjNvgqRpWB1n9V4MzO3NI558Qq51/PqSW0poWnXdsT8U e7VZ1MlpOqUxha6BGuwdSBj9kXIR8qa8tiY51owiJCd8VqpptBEYCrxdd3qjRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776244284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U17pNYkHOc1JjHaYYFpBAQB+sp/eg4HQl/Nqg/qxETI=; b=qbkPOHF7Gng1co0Fji9+fw3xeVOEXRQ7HfhkGw0s/3VY6O4hgoESaKm0dxFwm/dp3gGdex jjw4g/A4ySW87T9WIaYjfBIM0RWTpyPtBOUDZ4pHZm+XTzbwiH3lEz4meEUAJUiTNuhwKC +kbMvys8qGlMru1hJlu+FE9SL1OB9VXtEXN30ymWdTeE3nD2krkPeo0KDg9/2Hd7JFiS3V 7um7o1rGIczWZ+ojN4NFPMzbdzw8DVQwu94CGlLdbRj2E57BqtEpr9FVYAQe15hCFO72CH lUCvh6jvw23oohrvTLJIQCtNqmkG0IgYE+T6+xOEBt+JSe0QjXKkeNCG/k76/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwb3w0rV1z6B for ; Wed, 15 Apr 2026 09:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20422 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Apr 2026 09:11:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: ab57518e50d9 - stable/14 - sys/abi_types.h: Stick with 32-bit time32_t 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ab57518e50d9b711a65fa6a843dd851ee170aee3 Auto-Submitted: auto-generated Date: Wed, 15 Apr 2026 09:11:19 +0000 Message-Id: <69df5637.20422.1eb899c@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ab57518e50d9b711a65fa6a843dd851ee170aee3 commit ab57518e50d9b711a65fa6a843dd851ee170aee3 Author: Konstantin Belousov AuthorDate: 2026-04-15 09:08:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-15 09:10:35 +0000 sys/abi_types.h: Stick with 32-bit time32_t This unbreaks zfs on non-x86 64-bit architectures. --- sys/sys/abi_types.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/sys/abi_types.h b/sys/sys/abi_types.h index 44d1bd733bbd..56e4b86f6346 100644 --- a/sys/sys/abi_types.h +++ b/sys/sys/abi_types.h @@ -25,11 +25,13 @@ typedef struct { #endif } freebsd32_uint64_t; +#if !defined(IN_BASE) && !defined(__OPENZFS__) #if defined(__amd64__) || defined(__i386__) typedef __int32_t time32_t; #else typedef __int64_t time32_t; #endif #define __HAVE_TIME32_T +#endif #endif From nobody Wed Apr 15 10:03:28 2026 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 4fwcD04h6Xz6ZdRV for ; Wed, 15 Apr 2026 10:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwcD03nXXz3D6t for ; Wed, 15 Apr 2026 10:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776247408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Id1ZF1DTcFmzhFtvy0fQu8toe/TV+5ijcVNRWZVmW78=; b=X8xcJ7DW/GV6idQVW20iw+ToMvlofD1fm0RykJ0dWMvszAsaaa72dAGbAsZdQoKoJm+vwj stJg7wDXeeTJk92Qtcuxntuslshd5Kjte4U/w8AS1dYLJEQziWNOP2lW5wNtxepN6xPQIa rkq1ybQDAK9ll0WARLjCVDeqXkOSU0e6KD5h7LJYtbVtYsS7Z/vcQodk6xHvXjzzzcqTGk SiPLJYbnT0qR9FvIgduMI9G3knxxw/AOOXaM8P2qt6KvgOeX5rxzWtFxvtl1A4XH+UfuFz Xqu95s7MJND1c4mvrBZH0IbWCb+wWir9L95DwFCcuGCmZLZEudG7ntEtohOGog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776247408; a=rsa-sha256; cv=none; b=dLjY7k280FLkvP4O8DHCbd8HZRoA2m7lX8ta7SihAlnmK0vBol0Ssfww6K9Sy52uMjrHoU PkJTHvwsYlmh/8Q5TW9kGw47tp0ODg253SGkUtGGsIO3bUvFMPa8BbvRXq4dvHy2kwtrfj HvnaXY41+4DNmElrsucQkxhNVdqpZ5Tor2d7kvN4ZQhI1ID+Kma96oL8W2CpKqIHQnFEIu MnVYfRxkM8N/nS6raaWriIWkUWF+plWalojQKjBmc8+lRuuh2gQQBTRpuOBLK9qUh7MDtY +H4B25AA1d58OpRHH9dwimKIQIeOa9NGtJSejTtB5uOV5ibB4EGxk8R86mWRbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776247408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Id1ZF1DTcFmzhFtvy0fQu8toe/TV+5ijcVNRWZVmW78=; b=W2k8ChECw4yrv3QDihXfWDP7gDqOYkA7uFu1TlKpusAWmwrdl3w28YsLyPTnOxyPZuKf2g aiSQbEi9TU9QmlAaOMplH/90cBC6mXjr/On77HqusEYCYIftPhRLtTfpOEmb+jGPyekh5+ LEegiRvqSVL5NgsiFr5oINlsRXClOTsjdCZi1e3sT1WenpdJoOJn93DjS/G6h5eY6zKE4G 5pYDz5+odHDc7NeuQGV2qrbYckWmL/anDjhHV8kcM6//0cy8rvdV+zswKn+aODwcBLQiGT 3+M5h5XVRfLRfM0wD3hPcMVc0XAfhHEBc9PJuh1473yiqDKjRi3m37agx3yiZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwcD03KRxz1P2 for ; Wed, 15 Apr 2026 10:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25cac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Apr 2026 10:03:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: e4f02a72f7f6 - stable/15 - libc/tests/string: add a more comprehensive unit test for strrchr() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e4f02a72f7f6ef3a9965427679aec191e2ce34d9 Auto-Submitted: auto-generated Date: Wed, 15 Apr 2026 10:03:28 +0000 Message-Id: <69df6270.25cac.6f20d26c@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=e4f02a72f7f6ef3a9965427679aec191e2ce34d9 commit e4f02a72f7f6ef3a9965427679aec191e2ce34d9 Author: Robert Clausecker AuthorDate: 2026-03-22 21:39:42 +0000 Commit: Robert Clausecker CommitDate: 2026-04-15 10:03:07 +0000 libc/tests/string: add a more comprehensive unit test for strrchr() The unit tests are patterned after those for memrchr(). This catches the issue found in 293915. PR: 293915 Reviewed by: strajabot Reported by: safonov.paul@gmail.com MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56037 (cherry picked from commit 8b5d77bbcbd98e684226950be1c779e108059d8d) --- lib/libc/tests/string/Makefile | 2 + lib/libc/tests/string/strrchr_test.c | 156 +++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index a019939c30af..a4d23b2dcfe1 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -20,6 +20,7 @@ ATF_TESTS_C+= strcmp2_test ATF_TESTS_C+= strcspn_test ATF_TESTS_C+= strerror2_test ATF_TESTS_C+= strlcpy_test +ATF_TESTS_C+= strrchr2_test ATF_TESTS_C+= strspn_test ATF_TESTS_C+= strverscmp_test ATF_TESTS_C+= strxfrm_test @@ -49,6 +50,7 @@ NETBSD_ATF_TESTS_C+= swab_test SRCS.memset2_test= memset_test.c SRCS.strcmp2_test= strcmp_test.c SRCS.strerror2_test= strerror_test.c +SRCS.strrchr2_test= strrchr_test.c .include "../Makefile.netbsd-tests" diff --git a/lib/libc/tests/string/strrchr_test.c b/lib/libc/tests/string/strrchr_test.c new file mode 100644 index 000000000000..1c3d912ec3f8 --- /dev/null +++ b/lib/libc/tests/string/strrchr_test.c @@ -0,0 +1,156 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023, 2026 Robert Clausecker + * + * Adapted from memrchr_test.c. + */ + +#include + +#include +#include +#include +#include + +#include + +static char *(*strrchr_fn)(const char *, int); + +/* + * Check that when looking for the character NUL, we find the + * string terminator, and not some NUL character after it. + */ +ATF_TC_WITHOUT_HEAD(nul); +ATF_TC_BODY(nul, tc) +{ + size_t i, j, k; + char buf[1+15+64]; /* offset [0+15] + 64 buffer bytes + sentinels */ + + buf[0] = '\0'; + memset(buf + 1, '-', sizeof(buf) - 1); + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) + for (k = j; k < 64; k++) { + buf[i + j + 1] = '\0'; + buf[i + k + 1] = '\0'; + ATF_CHECK_EQ(strrchr_fn(buf + i + 1, '\0'), buf + i + j + 1); + buf[i + j + 1] = '-'; + buf[i + k + 1] = '-'; + } +} + +/* + * Check that if the character 'X' does not occur in the string + * (but occurs before and after it), we correctly return NULL. + */ +ATF_TC_WITHOUT_HEAD(not_found); +ATF_TC_BODY(not_found, tc) +{ + size_t i, j; + char buf[1+15+64+2]; /* offset [0..15] + 64 buffer bytes + sentinels */ + + buf[0] = 'X'; + memset(buf + 1, '-', sizeof(buf) - 1); + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) { + buf[i + j + 1] = '\0'; + buf[i + j + 2] = 'X'; + ATF_CHECK_EQ(strrchr_fn(buf + i + 1, 'X'), NULL); + buf[i + j + 1] = '-'; + buf[i + j + 2] = '-'; + } +} + +static void +do_found_test(char buf[], size_t first, size_t second) +{ + /* invariant: first <= second */ + + buf[first] = 'X'; + buf[second] = 'X'; + ATF_CHECK_EQ(strrchr_fn(buf, 'X'), buf + second); + buf[first] = '-'; + buf[second] = '-'; +} + +/* + * Check that if the character 'X' occurs in the string multiple + * times (i. e. twice), its last encounter is returned. + */ +ATF_TC_WITHOUT_HEAD(found); +ATF_TC_BODY(found, tc) +{ + size_t i, j, k, l; + char buf[1+15+64+2]; + + buf[0] = 'X'; + memset(buf + 1, '-', sizeof(buf) - 1); + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) + for (k = 0; k < j; k++) + for (l = 0; l <= k; l++) { + buf[i + j + 1] = '\0'; + buf[i + j + 2] = 'X'; + do_found_test(buf + i + 1, l, k); + buf[i + j + 1] = '-'; + buf[i + j + 2] = '-'; + } +} + +static void +do_values_test(char buf[], size_t len, size_t i, int c) +{ + /* sentinels */ + buf[-1] = c; + buf[len] = '\0'; + buf[len + 1] = 'c'; + + /* fill the string with some other character, but not with NUL */ + memset(buf, c == UCHAR_MAX ? c - 1 : c + 1, len); + + if (i < len) { + buf[i] = c; + ATF_CHECK_EQ(strrchr_fn(buf, c), buf + i); + } else + ATF_CHECK_EQ(strrchr_fn(buf, c), c == 0 ? buf + len : NULL); +} + +/* + * Check that the character is found regardless of its value. + * This catches arithmetic (overflow) errors in incorrect SWAR + * implementations of byte-parallel character matching. + */ +ATF_TC_WITHOUT_HEAD(values); +ATF_TC_BODY(values, tc) +{ + size_t i, j, k; + int c; + char buf[1+15+64+2]; + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) + for (k = 0; k <= j; k++) + for (c = 0; c <= UCHAR_MAX; c++) + do_values_test(buf + i + 1, j, k, c); +} + +ATF_TP_ADD_TCS(tp) +{ + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + strrchr_fn = dlsym(dl_handle, "test_strrchr"); + if (strrchr_fn == NULL) + strrchr_fn = strrchr; + + ATF_TP_ADD_TC(tp, nul); + ATF_TP_ADD_TC(tp, not_found); + ATF_TP_ADD_TC(tp, found); + ATF_TP_ADD_TC(tp, values); + + return (atf_no_error()); +} From nobody Wed Apr 15 10:05:50 2026 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 4fwcGk3zfPz6ZdN6 for ; Wed, 15 Apr 2026 10:05:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwcGk3Cf6z3DjD for ; Wed, 15 Apr 2026 10:05:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776247550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=234SSiUUqZDaZRWycC7kdd2I/6bTT2hz6X+UynhZs5A=; b=JI/5s307ORs82EumV+ytIiH0ueTDlYYc3Xvqaqnqbss+lATnKg5Vb7yTr5w8qm+YJyD/xN NWAaDnuFniAsyYtnFsg94VzO5VFaUG7zBCndUmMTOvo2abzVmYcBO90zSDqli/mhHJ13WC BHI9Cl1Efug/Q9Bptr0Vzv53jjWr1Dp7BkKlIt3fmJMJTl6r4B75XV+2tLntTRY0yBTC3W gqtRDbTG7TUbdoh49fY5S0azc1StbTD4Cd8xLNkR9Geov2cD6hkrMxS0NBLG29EdWTYr1v TYJM6wGSpK4N1f9Wz2aLcRZ4PKRuMeAp2F7cCFgvLVG/gt26pmLRjZE0iE8v7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776247550; a=rsa-sha256; cv=none; b=rGA4rjCDUstq8UkSjof7Xnw3r+FZ4o3uen+wf9Ot4VPriRV5A58yqtT2zyEdGzXvjDc4Ts Oh+azFGwBYHvoLvZB4AIYqYNefkEAYsTRurxi7BYIduWNk8N9LfyEhL0lquFy0yKCoD1YL WCxmXv+Al3rbXePkmbGemsSWaOkDqbUQ1giLpy8UyEawQcX1KKGtA3iAYyhk7ukHppjOl7 7Dcgmr309LJMDGol+Tv25zLYooBNC34cOTZ/f3FVDzYkWChXzHG3P+SQJvqUsoh3jwxpLl v6z39uLviV9/ucyFvJbgDrsE02+wQA48j3T/OsowNWEIX+YdKVX2Xk5i3EVK8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776247550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=234SSiUUqZDaZRWycC7kdd2I/6bTT2hz6X+UynhZs5A=; b=ysCYAGCFvhsHhmpqSpHwcixDAtLInW+QwTp3QgrrL69vd4xbUU+CKEfvty/q2PEaHGhHNK H6Z//aHMutFwCkZSbpFTmI9/6xg2W5kKG1Pl5KgB2fQn9zMMf2c4kvsvwBssU+DXmadEt1 rz83Bfep+YXDMLYWJJlhhgiRf3nd+TuQmaBQDANgcoOvDwLzLwO2TwBAtIklFvLlCob/BK ai3fdqVra3Jid9koyIpTncdE0fQ7l2Wz3+X4onq7lwjJWbwBiuvryMhtRRPwEnFzQT9G5C On4FXc9nxQiCrSWzH3DMZzibP+Ai1t1CBa5dpMUmS5+XR4qJQwprj/eXSplABA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwcGk2YRdz1Jb for ; Wed, 15 Apr 2026 10:05:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 267c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Apr 2026 10:05:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 78bf20d2e2cf - stable/14 - libc/tests/string: add a more comprehensive unit test for strrchr() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 78bf20d2e2cf7b59752567cea5ed98ad7fd5efc1 Auto-Submitted: auto-generated Date: Wed, 15 Apr 2026 10:05:50 +0000 Message-Id: <69df62fe.267c0.5e409ff0@gitrepo.freebsd.org> The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=78bf20d2e2cf7b59752567cea5ed98ad7fd5efc1 commit 78bf20d2e2cf7b59752567cea5ed98ad7fd5efc1 Author: Robert Clausecker AuthorDate: 2026-03-22 21:39:42 +0000 Commit: Robert Clausecker CommitDate: 2026-04-15 10:04:34 +0000 libc/tests/string: add a more comprehensive unit test for strrchr() The unit tests are patterned after those for memrchr(). This catches the issue found in 293915. PR: 293915 Reviewed by: strajabot Reported by: safonov.paul@gmail.com MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56037 (cherry picked from commit 8b5d77bbcbd98e684226950be1c779e108059d8d) --- lib/libc/tests/string/Makefile | 2 + lib/libc/tests/string/strrchr_test.c | 156 +++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index 4fce79685c0e..4b25dce74c17 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -19,6 +19,7 @@ ATF_TESTS_C+= strcmp2_test ATF_TESTS_C+= strcspn_test ATF_TESTS_C+= strerror2_test ATF_TESTS_C+= strlcpy_test +ATF_TESTS_C+= strrchr2_test ATF_TESTS_C+= strspn_test ATF_TESTS_C+= strverscmp_test ATF_TESTS_C+= strxfrm_test @@ -47,6 +48,7 @@ NETBSD_ATF_TESTS_C+= swab_test SRCS.strcmp2_test= strcmp_test.c SRCS.strerror2_test= strerror_test.c +SRCS.strrchr2_test= strrchr_test.c .include "../Makefile.netbsd-tests" diff --git a/lib/libc/tests/string/strrchr_test.c b/lib/libc/tests/string/strrchr_test.c new file mode 100644 index 000000000000..1c3d912ec3f8 --- /dev/null +++ b/lib/libc/tests/string/strrchr_test.c @@ -0,0 +1,156 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023, 2026 Robert Clausecker + * + * Adapted from memrchr_test.c. + */ + +#include + +#include +#include +#include +#include + +#include + +static char *(*strrchr_fn)(const char *, int); + +/* + * Check that when looking for the character NUL, we find the + * string terminator, and not some NUL character after it. + */ +ATF_TC_WITHOUT_HEAD(nul); +ATF_TC_BODY(nul, tc) +{ + size_t i, j, k; + char buf[1+15+64]; /* offset [0+15] + 64 buffer bytes + sentinels */ + + buf[0] = '\0'; + memset(buf + 1, '-', sizeof(buf) - 1); + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) + for (k = j; k < 64; k++) { + buf[i + j + 1] = '\0'; + buf[i + k + 1] = '\0'; + ATF_CHECK_EQ(strrchr_fn(buf + i + 1, '\0'), buf + i + j + 1); + buf[i + j + 1] = '-'; + buf[i + k + 1] = '-'; + } +} + +/* + * Check that if the character 'X' does not occur in the string + * (but occurs before and after it), we correctly return NULL. + */ +ATF_TC_WITHOUT_HEAD(not_found); +ATF_TC_BODY(not_found, tc) +{ + size_t i, j; + char buf[1+15+64+2]; /* offset [0..15] + 64 buffer bytes + sentinels */ + + buf[0] = 'X'; + memset(buf + 1, '-', sizeof(buf) - 1); + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) { + buf[i + j + 1] = '\0'; + buf[i + j + 2] = 'X'; + ATF_CHECK_EQ(strrchr_fn(buf + i + 1, 'X'), NULL); + buf[i + j + 1] = '-'; + buf[i + j + 2] = '-'; + } +} + +static void +do_found_test(char buf[], size_t first, size_t second) +{ + /* invariant: first <= second */ + + buf[first] = 'X'; + buf[second] = 'X'; + ATF_CHECK_EQ(strrchr_fn(buf, 'X'), buf + second); + buf[first] = '-'; + buf[second] = '-'; +} + +/* + * Check that if the character 'X' occurs in the string multiple + * times (i. e. twice), its last encounter is returned. + */ +ATF_TC_WITHOUT_HEAD(found); +ATF_TC_BODY(found, tc) +{ + size_t i, j, k, l; + char buf[1+15+64+2]; + + buf[0] = 'X'; + memset(buf + 1, '-', sizeof(buf) - 1); + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) + for (k = 0; k < j; k++) + for (l = 0; l <= k; l++) { + buf[i + j + 1] = '\0'; + buf[i + j + 2] = 'X'; + do_found_test(buf + i + 1, l, k); + buf[i + j + 1] = '-'; + buf[i + j + 2] = '-'; + } +} + +static void +do_values_test(char buf[], size_t len, size_t i, int c) +{ + /* sentinels */ + buf[-1] = c; + buf[len] = '\0'; + buf[len + 1] = 'c'; + + /* fill the string with some other character, but not with NUL */ + memset(buf, c == UCHAR_MAX ? c - 1 : c + 1, len); + + if (i < len) { + buf[i] = c; + ATF_CHECK_EQ(strrchr_fn(buf, c), buf + i); + } else + ATF_CHECK_EQ(strrchr_fn(buf, c), c == 0 ? buf + len : NULL); +} + +/* + * Check that the character is found regardless of its value. + * This catches arithmetic (overflow) errors in incorrect SWAR + * implementations of byte-parallel character matching. + */ +ATF_TC_WITHOUT_HEAD(values); +ATF_TC_BODY(values, tc) +{ + size_t i, j, k; + int c; + char buf[1+15+64+2]; + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) + for (k = 0; k <= j; k++) + for (c = 0; c <= UCHAR_MAX; c++) + do_values_test(buf + i + 1, j, k, c); +} + +ATF_TP_ADD_TCS(tp) +{ + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + strrchr_fn = dlsym(dl_handle, "test_strrchr"); + if (strrchr_fn == NULL) + strrchr_fn = strrchr; + + ATF_TP_ADD_TC(tp, nul); + ATF_TP_ADD_TC(tp, not_found); + ATF_TP_ADD_TC(tp, found); + ATF_TP_ADD_TC(tp, values); + + return (atf_no_error()); +} From nobody Thu Apr 16 00:36:17 2026 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 4fwzb56ZKRz6Zm7L for ; Thu, 16 Apr 2026 00:36: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwzb55qgvz44SD for ; Thu, 16 Apr 2026 00:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776299777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GIq42ZdDtB3WDHQB/AFALG2JBHMlZ9exoiVPjXWLMO8=; b=jjmWOQMJBZJOzpkDFJhKBuAoykgDg+nd0xV6x6CKn7eVffhqYRot6JZ17RviHQv4cB+6UF T/517JXDMFzOXXZHWE1CTqcan7wtwz9u2taACwhLCXa//9Gaj6+WtqP9FPBbCPfo4KrSw6 htpmnnLiWJ8+/WJ3IAjgXiXeymI9gfliydCGxP2LEwfpbHrbcRS3HHPidk48NV8qGwjhMP LkF9/BcTSGwbYQ9wlf1iV0/yHxwYIjZ/CBQiEeoGWVxp0jrWCgQM7Q8XnMvUYcxJVfVmFX /LnxBGMrxV8GfhNNwgB+0Em7weYWG+/79Oq75fi7FPYumf3Gu7r4BExK5UJadQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776299777; a=rsa-sha256; cv=none; b=ctDbHiOo8rl2JbgL0OCdvbJ6+1SXX3JbFH4n+93lqQbo9kSoBXf/M1r2oUkiYqcmHu/1nb uArY9dd6JVUytxytHt9zqo7zaU3ytXLVZNkIcDbJUxQ2NUwrL7XNtG4nTs3asQk+nYH0Dq JGJL/+hCOkrGOdG2ZSP7/GLMEjFnsFKlZkFdpbBgGp9F57E7Z59hoEL/3wFr2TspKzjSN5 gCniBYqLd1c58CMqUHqw29DKQeSLhgGTzz6M3N3g4GUarLqLnjt6f9gZ334nm8TGhO6GYk h2BC/thWFhfL+ibj+haPxJ7FrZnqNjs5Chav8Oe+uH0xqQvS5sLLQhMAPsGSTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776299777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GIq42ZdDtB3WDHQB/AFALG2JBHMlZ9exoiVPjXWLMO8=; b=UR1nGb6hG4I/3J6EmglgZuNybj8EX7bhcxQPDDM8L9TPkygKR+9b/UVoFfT80OSAPMU2VC aBqjCbJi54Uq8jkj/BJt067FzdMTf4wQdP0v37DMK0K3j7n8vXZRvu7C+ZXV3hcWcxqtxN fjUsc9kZE2OwDzWtsF2kZNAZXyFrCfmj/XHpm9e/rKpx+3LPiaX6D18xkoXUpQJ7SgO9vA DUwGX217ecMudXHCNBF887s4DOy8rAphEx96f+jWmWc8yYR3s7MKXZhq7pW4mwar8wsb6P m+k58KHuqhsJRjo+CwlGhoFXNdrkpOegAUnuyTAd1EmHCYz4zUIAbRm5MDtBHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwzb55Q0Szl4Y for ; Thu, 16 Apr 2026 00:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42105 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 00:36:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: d51d91780b61 - stable/14 - packages: Fix build with libucl 0.9.3 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d51d91780b61180fbeae406a29e9a02ec74d56df Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 00:36:17 +0000 Message-Id: <69e02f01.42105.2144fda0@gitrepo.freebsd.org> The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=d51d91780b61180fbeae406a29e9a02ec74d56df commit d51d91780b61180fbeae406a29e9a02ec74d56df Author: Lexi Winter AuthorDate: 2026-04-06 17:11:22 +0000 Commit: Lexi Winter CommitDate: 2026-04-15 23:27:05 +0000 packages: Fix build with libucl 0.9.3 In libucl 0.9.3, macros and includes are disabled by default when creating a new UCL parser. This breaks the package build, which relies on includes. Fix this by explicitly passing zero flags to ucl.parser(). MFC after: 3 days Fixes: abda442d92fd ("contrib/libucl: Import libucl 0.9.3") Reviewed by: kevans, bapt Reported by: freebsd@walstatt-de.de Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56266 (cherry picked from commit 63d0e3e3aa2483420f828686336d6615616363d5) --- release/packages/generate-ucl.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua index de52802913f8..c62dd8a8dbce 100755 --- a/release/packages/generate-ucl.lua +++ b/release/packages/generate-ucl.lua @@ -16,7 +16,7 @@ if #arg < 2 or #arg % 2 ~= 0 then os.exit(1) end -local parser = ucl.parser() +local parser = ucl.parser(0) for i = 2, #arg - 2, 2 do parser:register_variable(arg[i - 1], arg[i]) end From nobody Thu Apr 16 01:33:57 2026 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 4fx0sd2kW2z6ZrLR for ; Thu, 16 Apr 2026 01:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fx0sd26N4z3CKZ for ; Thu, 16 Apr 2026 01:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776303237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UUbK/JH6OLTAD5U0wqZTKCkEyo2MeIDvnOCNuSOY4m4=; b=pRGquRXX08aA+0C8IjQIxMRUpuYP8hQPFJaB72HhQ+SbTJkVKXX74fl/aHhHq66q+wXD2k QvgABxVgf2W8eMAImtqx+O1F6xaZE4pUOk9pNlkobwd4HIdTpP+6JIpdU3FOv86yvlk3Cj KUJ4tOBJVu92SmClwQJ1yIm1/yaPHMfY2HGMV1l0b8CTdlVwUQAYldCxzJAZsjsGlbCFJ0 XbbKxUy/s6YESrqfqDQrQgR8N/uM8eRJUQ3/eS01hTqKDm1S9KQTqkrHJjrlxhOy3G66gS 5p5NQ0JnvA+iNfhDVcpWnZ0Bh5ejw29v03GzH2mPgaefzety0/LayGjn8/tiKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776303237; a=rsa-sha256; cv=none; b=vRPzW8ttULR2++UIh/HZHredsgi0Rq/hyWFy5d9U0jm4PuM0aWNZgISG6YlGYRsWnXITGK 8XnzPyZQ4X5fBzywGVFdRbW2QO/3BFEcByVbRuACbdRgADofIf/LxyUbYpkWfdYq28KMhH xoII68RnIeneXRh77knAG864sU9ylIPr5PN73NlNJhNvEYT4AWez65Z3RnlpfJK+HNv04Y Es5pjJDPRtFZm+eCEusOuQG+Z5HCeup66UIKwoFMytcfUc2GhZnJmQPqogwjduruTIGSRS W8r0WnJ5dZysHXFu9heMy/E8U9uPs+8508oZKfdPetMtapli03i6Dvd5Ba5vnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776303237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UUbK/JH6OLTAD5U0wqZTKCkEyo2MeIDvnOCNuSOY4m4=; b=U+Je+F59dUhs0nPlOW5gwfO4l5qeCxqax4EgvgrcxPz41JoniMePe2+pBaojKfwkyy0kp8 RCG9Ujg2x/gy56MxBTYhc+f542ZnZSqPynogaVAeP6cTWswW3DHpNIaoBJWDDllbLp5p5k i8swEgq3iKYBQMK2nwfTqsfxyC3aKO2MewKgxUqloZfz3mtCRGCaI+DFXw6qrY1gX6+gKZ vWuOeZUjrRnRk6CYythMC6cFZFO4Kz9KE9zKsce2n6liYnZkUzE9kbHK4niHH0ycPL1Oyw pG8ZoLS5A2IF/MDdIphloV/qpgd252PHHzJOXJXzo/IQDpvaC26N8wZ9jId6jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fx0sd1P96zmKT for ; Thu, 16 Apr 2026 01:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 479dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 01:33:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 240c22909a06 - stable/15 - diskinfo: Align and alphabetize 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 240c22909a06d8b3d52fbc6d00bcf27fe9a1dc02 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 01:33:57 +0000 Message-Id: <69e03c85.479dc.6b9e02b4@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=240c22909a06d8b3d52fbc6d00bcf27fe9a1dc02 commit 240c22909a06d8b3d52fbc6d00bcf27fe9a1dc02 Author: Alexander Ziaee AuthorDate: 2026-04-13 01:59:33 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-16 01:33:35 +0000 diskinfo: Align and alphabetize options MFC after: 3 days (cherry picked from commit afe57c12e97d5c8773d829c2914f35462a7cdd0c) --- usr.sbin/diskinfo/diskinfo.8 | 12 ++++++------ usr.sbin/diskinfo/diskinfo.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/usr.sbin/diskinfo/diskinfo.8 b/usr.sbin/diskinfo/diskinfo.8 index 970bafd4f8e5..aea4c123048a 100644 --- a/usr.sbin/diskinfo/diskinfo.8 +++ b/usr.sbin/diskinfo/diskinfo.8 @@ -35,7 +35,7 @@ .Nd get information about disk device .Sh SYNOPSIS .Nm -.Op Fl citSvw +.Op Fl ciStvw .Ar disk ... .Nm .Op Fl l @@ -52,9 +52,7 @@ utility prints out information about a disk device, and optionally runs a naive performance test on the device. .Pp The following options are available: -.Bl -tag -width ".Fl v" -.It Fl v -Print fields one per line with a descriptive comment. +.Bl -tag -width "-c" .It Fl c Perform a simple measurement of the I/O read command overhead. .It Fl i @@ -70,16 +68,18 @@ character as a separator. Return the physical path of the disk. This is a string that identifies the physical path to the disk in the storage enclosure. -.It Fl s -Return the disk ident, usually the serial number. .It Fl S Perform synchronous random write test (ZFS SLOG test), measuring time required to write data blocks of different size and flush disk cache. Blocks of more then 128KB are written with multiple parallel operations. +.It Fl s +Return the disk ident, usually the serial number. .It Fl t Perform a simple and rather naive benchmark of the disks seek and transfer performance. +.It Fl v +Print fields one per line with a descriptive comment. .It Fl w Allow disruptive write tests. .El diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c index f091d0ccfbea..d8a79d430edb 100644 --- a/usr.sbin/diskinfo/diskinfo.c +++ b/usr.sbin/diskinfo/diskinfo.c @@ -58,7 +58,7 @@ static void usage(void) { - fprintf(stderr, "usage: diskinfo [-ciStvw] disk ...\n" + fprintf(stderr, "usage: diskinfo [-citSvw] disk ...\n" " diskinfo [-l] -p disk ...\n" " diskinfo [-l] -s disk ...\n" ); @@ -91,7 +91,7 @@ main(int argc, char **argv) u_int sectorsize, fwsectors, fwheads, zoned = 0, isreg; uint32_t zone_mode; - while ((ch = getopt(argc, argv, "cilpsStvw")) != -1) { + while ((ch = getopt(argc, argv, "cilpSstvw")) != -1) { switch (ch) { case 'c': opt_c = 1; @@ -107,13 +107,13 @@ main(int argc, char **argv) case 'p': opt_p = 1; break; - case 's': - opt_s = 1; - break; case 'S': opt_S = 1; opt_v = 1; break; + case 's': + opt_s = 1; + break; case 't': opt_t = 1; opt_v = 1; From nobody Thu Apr 16 01:33:58 2026 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 4fx0sf57ljz6ZrNw for ; Thu, 16 Apr 2026 01:33:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fx0sf2c3zz3CKb for ; Thu, 16 Apr 2026 01:33:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776303238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AcusDMwwSfNC7DeIpdlSEEHNA7cIgpUSw89BHHLQU8o=; b=xHHXdDQabBG3HVKZwLwtvy2X21Tiu13ohK+9NVWMsW1y+3bmyzGuziBxyj+i31XHyn9nCl CHzXd0fin0yCKG5APBuSz3LnjdxQJRl8nxUf7VnRgwp1Jf/BdcPDF5JzEL+vZr+CcRWU6P v7/7rJxuMYwzzLBA+T0VLvY9PzHiALBxJ0PpP76vCqvI8Aib/4anqRjSIt8CjBbnDkX/OS tEDZiO3aequgKmOpnnyyJ8NwMLo059rkHzqzymp5dWyYUoRHZCgQNRfGnhB78ramd19/J0 xVdP6hEInp/SaAyijCy0oW6qrkWjLEAmeUjBQQVQ2aiaxJ52BwNHr3rqnjKqWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776303238; a=rsa-sha256; cv=none; b=NgQZCaeHwhFnHWiHnzLTtF2XY7+fefdTGq3vYXTCKqTNgGL37+kpxx1ZQr6fBhwOM2QJSS FwvVKRqCYsYA3wpk8QiFpAHJkYHQiuM6n18D8Bd0fuiFYG+PIJ92Fj99re9xz8LDuczwHj 1TGG67qjD1oDjWG/c8Fg70fCLVrHuJxhhDI/NKtjPBjikrKi8sJ+F1bQ+mjMVhFt+gC5+A YuQmo2ncvTDEo/+D4xEkVBhYCH/3m/GyPDiDWudJ5w/F7Lgl4ULEny3KqzUDuPmSa9I9MX cQWTbMiooDm7TS6RZKTSqO5D2paiWo4ECeW+4a862J6ekQwg15sPPnrN3X1odA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776303238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AcusDMwwSfNC7DeIpdlSEEHNA7cIgpUSw89BHHLQU8o=; b=SZQPHNzRoOIaGUplz8RO+1nOtCEB/n6At0WN89IBOs0kzgw5b6pESL34XlqyADlkTIEbQi SULWt21qMQxlIk4Q+aKFlRLrHOv9x/rhXoKZBdBc5hijlycVIVhusIQXjGJ/D1D1BRDpE+ 7ZpU2ou/gtFXsBkwjGFoOM0YfpG62H6XeNGkEozb68Dyd/OttUi6w/SmRlwQ7CQgwBO5TF JoGdePrriphLlcxrWsKJ+9kBg1SQYX/B4kbGV83LWWAkWiJBR242vSj9t293Wn6nzZYPwU 0WYFfvvDUkjWkwjiInqtp+9kAi/xMct2FmQk5CErI0geEXGzgktldbqqI9Jf+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fx0sf2BcnzmQ5 for ; Thu, 16 Apr 2026 01:33:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45969 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 01:33:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kristofer Peterson From: Alexander Ziaee Subject: git: 4aef1ae2113c - stable/15 - sh: Increase default history size to POSIX mandated minimum of 128 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4aef1ae2113cdb02bde5180155c4c362c8115102 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 01:33:58 +0000 Message-Id: <69e03c86.45969.48e0cf5e@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=4aef1ae2113cdb02bde5180155c4c362c8115102 commit 4aef1ae2113cdb02bde5180155c4c362c8115102 Author: Kristofer Peterson AuthorDate: 2026-03-24 14:56:48 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-16 01:33:35 +0000 sh: Increase default history size to POSIX mandated minimum of 128 The default history size in bin/sh is currently 100 however POSIX.1-2024 mandates that a default greater than or equal to 128 shall be used, therefore this increases the default history size in /bin/sh to 128. POSIX standards reference: https://pubs.opengroup.org/onlinepubs/9799919799/utilities/sh.html#tag_20_110_08 MFC after: 3 days Reviewed by: emaste, jilles, jlduran, ziaee Signed-off-by: Kristofer Peterson Closes: https://github.com/freebsd/freebsd-src/pull/2093 (cherry picked from commit 81b2055c49dec8884d7bb23503f1dfeac37ac95d) --- bin/sh/histedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index 5aea58650c67..c18934be84bb 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -231,7 +231,7 @@ sethistsize(const char *hs) if (hist != NULL) { if (hs == NULL || !is_number(hs)) - histsize = 100; + histsize = 128; else histsize = atoi(hs); history(hist, &he, H_SETSIZE, histsize); From nobody Thu Apr 16 01:33:56 2026 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 4fx0sk5Hdnz6ZrLd for ; Thu, 16 Apr 2026 01:34: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fx0sj4JR1z3CQ6 for ; Thu, 16 Apr 2026 01:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776303241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PSe+fTj+DS24qeTen8X6f1MNNn9cu3wMAtzA0j9Qfro=; b=StV+X+63hf06Sw6QxgiVFDVs3JbnT86lSO9sq899i15vInNSOHUXXbSuCkvpmm0rlZlwY9 wjJcWi/k9sjdBaYUXo0waGDmhRmyHMda/LOJ2TLSGXyIE+/rzXFIfll+lFO87He/b96ypB uXQ+SBB69seMmYWExIJldfb8cs2pUlsSgrZVYSwbrBXojI/485pNkNBYPtvVDXjdzmBb90 p5ud3Fu1Pjzka1p6tefpo3ocBegCPpUxDzlSFP6KnR9oDUV/gNCFcej2X29uzeTWErwlmc 2ddmJ7470QLJrEhxdZ2WYCDRoWZMNjG//tCI7+n9/XyQGziXhHJtjGsucu58pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776303241; a=rsa-sha256; cv=none; b=Y6ndooPfq3NUSNhGmhVWy7AZLWTKelJFkANyXRdGMkJVYu/asUJgG2Bed+ID9LceVsHsQb OzHhr/w1t++1y3RNIMIvpvruCwI/oGsPbR3AMgmJhTgN0OBu+nWzsHnBlXmwPpnTyBdoCL 9UyWIyp7HLtl47LqtI1zTU8z53T4hTKSUiC6n6amsSRLjqFelpjfigYh6STzsX8j9ZlOe2 +5og9P8MK8BBPCNiQlmleSNQdZnRgr9qrKwKr/sCOdcgBBKxDMFKgyFSomzz8yUSI/iHFG qkmpCmVM5zZMBbrXLFj66sWlo6Lx0s9WIWyPUU95TgbSO06OW5eoZRiKEx/Pmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776303241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PSe+fTj+DS24qeTen8X6f1MNNn9cu3wMAtzA0j9Qfro=; b=cOEk4v8AtlTodTq3hL1CBUVScXXWFjIxAUUBizD93hXhRNr7JsDVtmURsKPykgxWk44LXg RJYC/6VDa2PzQ1hyINdDPD27/bPlDO25wa6AjiHqMT6t3RNmP+dSzJio1sB02YUhwPGdbB y6L1XwBGwrEABsyRnanxztHlJ4EIZ/gO0CtRHocZA/qlcJxPRNnuuNYxGV7VcwpExclzm0 r5cKHeAMmie3n7vCgYY4wLWUk4MXW87Nzj/tmSQmd/mYM8vkj+hwnAZB54U2dwFq7XmsuN CouCxysVmaHrpRWfPGd7NF+1EPdwYTO37vb9jipPycxQxDd378XAU1oF1i1mew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fx0sj15DMzm7g for ; Thu, 16 Apr 2026 01:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 479d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 01:33:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Artem Bunichev From: Alexander Ziaee Subject: git: 12ca9c6cb329 - stable/15 - timeout.1: Document non-POSIX 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 12ca9c6cb32967f3394cbca62e9d3a377965077d Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 01:33:56 +0000 Message-Id: <69e03c84.479d7.79963112@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=12ca9c6cb32967f3394cbca62e9d3a377965077d commit 12ca9c6cb32967f3394cbca62e9d3a377965077d Author: Artem Bunichev AuthorDate: 2026-04-13 01:15:41 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-16 01:33:31 +0000 timeout.1: Document non-POSIX options MFC after: 3 days Reviewed by: Aaron Li , ziaee Differential Revision: https://reviews.freebsd.org/D56090 (cherry picked from commit b1bc748430b5ee79ae103c464dbf5ebc8802f782) --- bin/timeout/timeout.1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/timeout/timeout.1 b/bin/timeout/timeout.1 index 0a9754a2cc4e..46a5a986cbce 100644 --- a/bin/timeout/timeout.1 +++ b/bin/timeout/timeout.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 3, 2025 +.Dd April 11, 2026 .Dt TIMEOUT 1 .Os .Sh NAME @@ -269,6 +269,10 @@ The utility is expected to conform to the .St -p1003.1-2024 specification. +.Pp +The +.Fl v +option and long option names are extensions to that specification. .Sh HISTORY The .Nm From nobody Thu Apr 16 11:43:29 2026 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 4fxGNx4qz0z6ZVrC for ; Thu, 16 Apr 2026 11:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxGNx2vG5z3lXv for ; Thu, 16 Apr 2026 11:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776339809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pjLz2IDhoG3Hlk5yExaJ9e1VNiw9f17eQFIqRouB5k8=; b=Rt508nVrZu+7TXAvcXpgrUGvCh32SKEnAPtQPF6sZtsxWZDB6dyNx7FNIbbZ5kLLjkpj1q ybK72Doae03h75ci9zDRpuxK/4ah5JI57JwdQDguE+C86khNJdfL3vpX5W2JKuOXYdW0lP WxRduJ2jMQ1JDB9gZ45pDsdLQ3bZ5EeWwUZmZypsTTi2APQpukdVGKecfne9Mg6O3+poLQ p9gayjk128WasmvSRf6ozI3r2zQNYj1FAkj510Ad0rKnJwlhEGPozvPzPCHgFsG6qJ0fJs UkRaGGktS83QNaMOHWvudGyhFU32aJVIJA+MSfHyLuzGN72KB5Oz/XB2sWkN4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776339809; a=rsa-sha256; cv=none; b=tEVBNyrwKY1aNEhY9x+vcsSOuDCjktIOq/jZNNv/QJSdRK5y0FaTmcT7smvkd/z+Nn612I LreJhsHljJkSJbYm9tlWolO4PHxpyyAAYcVCDB8KOZf79S3IWvXNVhEcGHU/inT/8hCrYv 0LEaz86Rzs82F3jTwH/+7/Rojm3ycykOguopAyxuIAdycu84oJTPVO4d8veRfPUemU2Rz2 DhwsemMD7+N3oDeB65RXQApL5k/eKnAsfJjpDxie7vP6k1PxLxHZhsf3OJlJJEgh5ZgsV3 207kc6RbLpTvWKBCSGrgo1vwM/HQsrUjpqYIdiJarN8QmlptB9hOfO6U2A9zkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776339809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pjLz2IDhoG3Hlk5yExaJ9e1VNiw9f17eQFIqRouB5k8=; b=OER+3rws8uI1DAkNrRmblyeLx+IjNlrLHXAmzFYFHoiISagyAbIPZ5V1p7A9+uyIGFV9mS vrfcN/GkrKMFQ92qHifHidVkRIh+zO5FvtfkzSskUgfipBivdWU0TTJPk/meICZBSt32Et wttG98AwgHmm/klil5KIuwA42sPqr7UK85F0dPENnab3f8vQW6Apz74nmPCSPyQGsu/wuw xY5IuKFOxRAYYKmm5LSg3hgy7YUkTMkQBh8n5MyR2j5L+Nc3Walh8smkyymptca3tLsN+X jeRPQDrxM3zSvufnj6EWLlo1r6TcqKZRCzf40aWnhPlnmrsvMbqc0aDjoitxwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxGNx2NQ3z15mg for ; Thu, 16 Apr 2026 11:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39546 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 11:43:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: 2702a3ac1ab6 - stable/15 - release: remove Oracle Cloud Infrastructure build targets 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2702a3ac1ab6170e10044eebecaafc2ebcabff9d Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 11:43:29 +0000 Message-Id: <69e0cb61.39546.7ddb9e5@gitrepo.freebsd.org> The branch stable/15 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=2702a3ac1ab6170e10044eebecaafc2ebcabff9d commit 2702a3ac1ab6170e10044eebecaafc2ebcabff9d Author: Dave Cottlehuber AuthorDate: 2026-04-12 22:29:44 +0000 Commit: Dave Cottlehuber CommitDate: 2026-04-16 11:40:49 +0000 release: remove Oracle Cloud Infrastructure build targets Oracle's previous support is no longer available to the project. Repeated attempts to find a sponsor within Oracle's cloud business have not been successful. The last published official images are from 15.0-RELEASE. https://marketplace.oracle.com/app/freebsd-release Relnotes: yes Sponsored by: SkunkWerks, GmbH Differential Revision: https://reviews.freebsd.org/D56360 MFC after: 3 days (cherry picked from commit 3b108068121ba30fb3dbed569d6757da2ab529a4) --- release/Makefile.oracle | 108 --------------------- release/Makefile.vm | 5 - release/release.conf.sample | 2 +- .../oracle/arm64_shape_compatibilities.json | 24 ----- .../oracle/default_shape_compatibilities.json | 1 - release/scripts/oracle/generate_metadata.lua | 74 -------------- release/scripts/oracle/image_capability_data.json | 96 ------------------ release/scripts/oracle/image_metadata.json | 21 ---- release/tools/oracle.conf | 105 -------------------- 9 files changed, 1 insertion(+), 435 deletions(-) diff --git a/release/Makefile.oracle b/release/Makefile.oracle deleted file mode 100644 index 6d792cc9fd30..000000000000 --- a/release/Makefile.oracle +++ /dev/null @@ -1,108 +0,0 @@ -# -# Makefile for preparing & uploading Oracle Cloud images from existing -# .raw files created by cloudware-release. -# -# Overview: -# -# The base image is already created by cloudware-release. -# -# Construct the custom OCI metadata, derived from exported official OCI images. -# It is architecture-specific but appears mostly stable over time. -# Compress the raw image and place it in the same directory as the metadata. -# Make a GNU format tarball of these files. -# Upload the tarball to Oracle Cloud via a pre-approved curl URI, into -# the FreeBSD Foundation's Oracle Cloud account. -# -# These images go into the "re" bucket in us-ashburn-1 region, which -# is mounted into the FreeBSD Foundation Oracle Marketplace account. -# Once uploaded, a manual step is needed to import the images as local -# custom images. These can then be tested within the us-ashburn-1 region. -# Once tested, follow the manual Oracle Marketplace import process to -# create a new FreeBSD version, attach the images, and initiate validation -# by Oracle. This can take up to 5 working days. Once complete, a final -# manual step is needed to mark the currently private images, public. -# Syncing to all sites should take 2-3 hours after this final step. - -ORACLE_BASENAME= ${OSRELEASE}-${BUILDDATE}${GITREV:C/^(.+)/-\1/} -CLEANFILES+= cw-oracle-portinstall - -cw-oracle-portinstall: .PHONY -.if (!exists(/usr/local/bin/curl) || !exists(/usr/local/bin/qemu-img)) && !exists(${PORTSDIR}/Makefile) -. if !exists(/usr/local/sbin/pkg-static) - env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf -. endif -.endif -.if !exists(/usr/local/bin/curl) -. if !exists(${PORTSDIR}/Makefile) - env ASSUME_ALWAYS_YES=yes pkg install -y ftp/curl -. else - env UNAME_r=${UNAME_r} make -C \ - ${PORTSDIR}/ftp/curl \ - BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ - all install clean -. endif -.endif -.if !exists(/usr/local/bin/qemu-img) -. if !exists(${PORTSDIR}/Makefile) - env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu@tools -. else - env UNAME_r=${UNAME_r} FLAVOR=tools make -C \ - ${PORTSDIR}/emulators/qemu \ - BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ - all install clean -. endif -.endif - -.for _FS in ${ORACLE_FSLIST} -ORACLE_OCI_LIST+= cw-oracle-${_FS}.oci -ORACLE_UPLOAD_LIST+= cw-oracle-upload-${_FS} -CLEANFILES+= cw-oracle-${_FS}.oci -ORACLE_TMP_${_FS}= cw-oracle-${_FS}.oci.tmpdir -CLEANDIRS+= ${ORACLE_TMP_${_FS}} -ORACLE_METADATA= ${.CURDIR}/scripts/oracle -ORACLE_CAPABILITY= ${.CURDIR}/scripts/oracle/image_capability_data.json -ORACLE_TEMPLATE= ${.CURDIR}/scripts/oracle/image_metadata.json -ORACLE_OUTPUT_${_FS}= ${ORACLE_TMP_${_FS}}/image_metadata.json -.if ${TARGET} == "arm64" -ORACLE_SHAPES= ${ORACLE_METADATA}/arm64_shape_compatibilities.json -.else -ORACLE_SHAPES= ${ORACLE_METADATA}/default_shape_compatibilities.json -.endif - -cw-oracle-${_FS}.oci: cw-oracle-portinstall cw-oracle-${_FS}-raw - mkdir -p ${ORACLE_TMP_${_FS}} - # create architecture-specific JSON metadata - env TYPE="${TYPE}" \ - OSRELEASE="${OSRELEASE}" \ - ORACLE_CAPABILITY="${ORACLE_CAPABILITY}" \ - ORACLE_SHAPES="${ORACLE_SHAPES}" \ - ORACLE_TEMPLATE="${ORACLE_TEMPLATE}" \ - ORACLE_OUTPUT="${ORACLE_OUTPUT_${_FS}}" \ - ${ORACLE_METADATA}/generate_metadata.lua - - # convert raw to native qcow2 for zstd compression, saves ~ 8GiB - qemu-img convert -S 512b -p -O qcow2 -c -o compression_type=zstd \ - ${.OBJDIR}/${ORACLE${_FS:tu}RAWIMAGE} \ - ${ORACLE_TMP_${_FS}}/output.QCOW2 - - # Create GNU-compatible tarball using BSD tar - tar --format=gnutar -cf ${.TARGET} -C ${ORACLE_TMP_${_FS}} \ - image_metadata.json output.QCOW2 - - echo "Oracle image ${.TARGET} is ready for upload." - -cw-oracle-upload-${_FS}: cw-oracle-${_FS}.oci -.if !defined(ORACLE_PAR_URL) || empty(ORACLE_PAR_URL) - @echo "--------------------------------------------------------------" - @echo ">>> ORACLE_PAR_URL must be set for Oracle image upload" - @echo ">>> for testing, use a file:/// URL to a local directory" - @echo "--------------------------------------------------------------" - @false -.endif - echo "Please wait ... uploading cw-oracle-${_FS}.oci to ${ORACLE_BASENAME}-${_FS}.oci" - curl -s ${ORACLE_PAR_URL}/${ORACLE_BASENAME}-${_FS}.oci --upload-file cw-oracle-${_FS}.oci - echo "Uploaded cw-oracle-${_FS}.oci as ${ORACLE_BASENAME}-${_FS}.oci" - touch ${.TARGET} -.endfor - -cw-oracle-upload: cw-oracle-portinstall ${ORACLE_UPLOAD_LIST} diff --git a/release/Makefile.vm b/release/Makefile.vm index abbfcb341afc..d937783f02fe 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -24,7 +24,6 @@ CLOUDWARE_TYPES?= AZURE \ BASIC-CLOUDINIT \ EC2 \ GCE \ - ORACLE \ VAGRANT AZURE_FORMAT= vhdf AZURE_FSLIST?= ufs zfs @@ -45,9 +44,6 @@ EC2-SMALL_DESC= Amazon EC2 small image GCE_FORMAT= raw GCE_FSLIST?= ufs zfs GCE_DESC= Google Compute Engine image -ORACLE_FORMAT= raw -ORACLE_FSLIST?= ufs zfs -ORACLE_DESC= Oracle Cloud Infrastructure image OPENSTACK_FORMAT=qcow2 OPENSTACK_FSLIST?= ufs OPENSTACK_DESC= OpenStack platform image @@ -315,6 +311,5 @@ cloudware-release: .include "${.CURDIR}/Makefile.ec2" .include "${.CURDIR}/Makefile.firecracker" .include "${.CURDIR}/Makefile.gce" -.include "${.CURDIR}/Makefile.oracle" .include "${.CURDIR}/Makefile.vagrant" .include "${.CURDIR}/Makefile.inc1" diff --git a/release/release.conf.sample b/release/release.conf.sample index 337019db6fa6..9fd0ecd0184f 100644 --- a/release/release.conf.sample +++ b/release/release.conf.sample @@ -113,7 +113,7 @@ PORTBRANCH="main" ## If WITH_CLOUDWARE is set to a non-empty value, this is a list of providers ## to create disk images. -#CLOUDWARE="EC2 GCE ORACLE VAGRANT-VIRTUALBOX VAGRANT-VMWARE" +#CLOUDWARE="EC2 GCE VAGRANT-VIRTUALBOX VAGRANT-VMWARE" ## If WITH_OCIIMAGES is set to a non-empty value, build Open Container ## Initiative (OCI) base images as part of the release. diff --git a/release/scripts/oracle/arm64_shape_compatibilities.json b/release/scripts/oracle/arm64_shape_compatibilities.json deleted file mode 100644 index dfd066b5474f..000000000000 --- a/release/scripts/oracle/arm64_shape_compatibilities.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - { - "internalShapeName": "VM.Standard.A1.Flex", - "ocpuConstraints": { - "min": 1, - "max": 80 - }, - "memoryConstraints": { - "minInGBs": 1, - "maxInGBs": 512 - } - }, - { - "internalShapeName": "VM.Standard.A2.Flex", - "ocpuConstraints": { - "min": 1, - "max": 78 - }, - "memoryConstraints": { - "minInGBs": 1, - "maxInGBs": 946 - } - } -] diff --git a/release/scripts/oracle/default_shape_compatibilities.json b/release/scripts/oracle/default_shape_compatibilities.json deleted file mode 100644 index fe51488c7066..000000000000 --- a/release/scripts/oracle/default_shape_compatibilities.json +++ /dev/null @@ -1 +0,0 @@ -[] diff --git a/release/scripts/oracle/generate_metadata.lua b/release/scripts/oracle/generate_metadata.lua deleted file mode 100755 index 751b9680cc29..000000000000 --- a/release/scripts/oracle/generate_metadata.lua +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/libexec/flua - -local ucl = require("ucl") - --- read from environment variables -local os_type = os.getenv("TYPE") -local os_version = os.getenv("OSRELEASE") --- the raw file -local capability_file = os.getenv("ORACLE_CAPABILITY") --- the platform-specific file -local shapes_file = os.getenv("ORACLE_SHAPES") --- base template -local template_file = os.getenv("ORACLE_TEMPLATE") -local output_file = os.getenv("ORACLE_OUTPUT") - -if not os_type or not os_version or not capability_file or - not shapes_file or not template_file or not output_file then - io.stderr:write("Error: Oracle metadata script is missing required environment variables:\n") - io.stderr:write("TYPE, OSRELEASE, ORACLE_CAPABILITY, ORACLE_SHAPES, ORACLE_TEMPLATE, ORACLE_OUTPUT\n") - os.exit(1) -end - --- read files -local function read_file(path) - local f = io.open(path, "r") - if not f then - io.stderr:write("Error: Oracle metadata script cannot open file: " .. path .. "\n") - os.exit(1) - end - local content = f:read("*a") - f:close() - return content -end - --- parse the template -local template = read_file(template_file) -local metadata = ucl.parser() -metadata:parse_string(template) -local data = metadata:get_object() - --- update the simple fields -data.operatingSystem = os_type -data.operatingSystemVersion = os_version - --- capability data is actually JSON, but needs to be inserted as a raw blob -local caps = read_file(capability_file) --- remove all newlines and preceding spaces to match Oracle's format -caps = caps:gsub("\n", "") -caps = caps:gsub("%s+", "") --- is it still valid JSON? -local caps_parser = ucl.parser() -if not caps_parser:parse_string(caps) then - io.stderr:write("Error: Oracle metadata script found invalid JSON in capability file\n") - os.exit(1) -end --- insert as a raw blob -data.imageCapabilityData = caps - --- parse and insert architecture-dependent shape compatibilities data -local shapes_data = read_file(shapes_file) -local shapes = ucl.parser() -shapes:parse_string(shapes_data) -data.additionalMetadata.shapeCompatibilities = shapes:get_object() - --- save the metadata file -local dir = os.getenv("PWD") -local out = io.open(output_file, "w") -if not out then - io.stderr:write("Error: Oracle metadata script cannot create output file: " - .. dir .. "/" .. output_file .. "\n") - os.exit(1) -end -out:write(ucl.to_format(data, "json", {pretty = true})) -out:close() diff --git a/release/scripts/oracle/image_capability_data.json b/release/scripts/oracle/image_capability_data.json deleted file mode 100644 index 01af71f73031..000000000000 --- a/release/scripts/oracle/image_capability_data.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "capabilities": { - "Compute.AMD_SecureEncryptedVirtualization": { - "descriptorType": "boolean", - "defaultValue": false - }, - "Storage.BootVolumeType": { - "descriptorType": "enumstring", - "values": [ - "ISCSI", - "PARAVIRTUALIZED", - "SCSI", - "IDE", - "NVME" - ], - "defaultValue": "PARAVIRTUALIZED" - }, - "Storage.Iscsi.MultipathDeviceSupported": { - "descriptorType": "boolean", - "defaultValue": false - }, - "Storage.ParaVirtualization.EncryptionInTransit": { - "descriptorType": "boolean", - "defaultValue": true - }, - "Storage.ConsistentVolumeNaming": { - "descriptorType": "boolean", - "defaultValue": true - }, - "Compute.SecureBoot": { - "descriptorType": "boolean", - "defaultValue": false - }, - "Storage.ParaVirtualization.AttachmentVersion": { - "descriptorType": "enuminteger", - "values": [ - 1, - 2 - ], - "defaultValue": 2 - }, - "Storage.LocalDataVolumeType": { - "descriptorType": "enumstring", - "values": [ - "ISCSI", - "PARAVIRTUALIZED", - "SCSI", - "IDE", - "NVME" - ], - "defaultValue": "PARAVIRTUALIZED" - }, - "Network.AttachmentType": { - "descriptorType": "enumstring", - "values": [ - "PARAVIRTUALIZED", - "VDPA" - ], - "defaultValue": "PARAVIRTUALIZED" - }, - "Storage.RemoteDataVolumeType": { - "descriptorType": "enumstring", - "values": [ - "ISCSI", - "PARAVIRTUALIZED", - "SCSI", - "IDE", - "NVME" - ], - "defaultValue": "PARAVIRTUALIZED" - }, - "Compute.LaunchMode": { - "descriptorType": "enumstring", - "values": [ - "NATIVE", - "EMULATED", - "VDPA", - "PARAVIRTUALIZED", - "CUSTOM" - ], - "defaultValue": "PARAVIRTUALIZED" - }, - "Network.IPv6Only": { - "descriptorType": "boolean", - "defaultValue": false - }, - "Compute.Firmware": { - "descriptorType": "enumstring", - "values": [ - "BIOS", - "UEFI_64" - ], - "defaultValue": "UEFI_64" - } - } -} diff --git a/release/scripts/oracle/image_metadata.json b/release/scripts/oracle/image_metadata.json deleted file mode 100644 index eaea3dd1cad2..000000000000 --- a/release/scripts/oracle/image_metadata.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": 2, - "externalLaunchOptions": { - "firmware": "UEFI_64", - "networkType": "PARAVIRTUALIZED", - "bootVolumeType": "PARAVIRTUALIZED", - "remoteDataVolumeType": "PARAVIRTUALIZED", - "localDataVolumeType": "PARAVIRTUALIZED", - "launchOptionsSource": "PARAVIRTUALIZED", - "pvAttachmentVersion": 2, - "pvEncryptionInTransitEnabled": false, - "consistentVolumeNamingEnabled": false - }, - "imageCapabilityData": "REPLACE", - "imageCapsFormatVersion": "23cfd738-ad9c-4f56-9281-67be6c8cd14c", - "operatingSystem": "REPLACE", - "operatingSystemVersion": "REPLACE", - "additionalMetadata": { - "shapeCompatibilities": "REPLACE" - } -} diff --git a/release/tools/oracle.conf b/release/tools/oracle.conf deleted file mode 100644 index b289f4e4e7e7..000000000000 --- a/release/tools/oracle.conf +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh -# Set to a list of packages to install. -export VM_EXTRA_PACKAGES=" - comms/py-pyserial - converters/base64 - devel/oci-cli - devel/py-babel - devel/py-iso8601 - devel/py-pbr - devel/py-six - ftp/curl - lang/python - lang/python3 - net/cloud-init - net/py-eventlet - net/py-netaddr - net/py-netifaces - net/py-oauth - net/rsync - security/ca_root_nss - security/sudo@default - sysutils/firstboot-freebsd-update - sysutils/firstboot-pkgs - sysutils/panicmail - textproc/jq - " - -# Should be enough for base image, image can be resized in needed -export VMSIZE=8g - -# Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST=" - cloudinit - firstboot_pkgs - firstboot_freebsd_update - growfs - ntpd - ntpd_sync_on_start - sshd - zfs" - -# Hack for FreeBSD 15.0; should go away before 15.1. -MISSING_METALOGS=" -./usr/local/etc/cloud/cloud.cfg -./usr/local/etc/cloud/cloud.cfg.d/05_logging.cfg -./usr/local/etc/cloud/cloud.cfg.d/99_freebsd.cfg -./usr/local/etc/pam.d/sudo -./usr/local/etc/rsync/rsyncd.conf -./usr/local/etc/ssl/cert.pem -./usr/local/etc/sudo.conf -./usr/local/etc/sudo_logsrvd.conf -./usr/local/etc/sudoers -" - -vm_extra_pre_umount() { - cat <<-'EOF' >> ${DESTDIR}/etc/rc.conf - dumpdev=AUTO -EOF - - cat <<-'EOF' >> ${DESTDIR}/boot/loader.conf - autoboot_delay="5" - beastie_disable="YES" - boot_serial="YES" - loader_logo="none" - cryptodev_load="YES" - opensolaris_load="YES" - xz_load="YES" - zfs_load="YES" -EOF - metalog_add_data ./boot/loader.conf - - cat <<-'EOF' >> ${DESTDIR}/etc/ssh/sshd_config - # S11 Configure the SSH service to prevent password-based login - PermitRootLogin prohibit-password - PasswordAuthentication no - KbdInteractiveAuthentication no - PermitEmptyPasswords no - UseDNS no -EOF - - # S14 Root user login must be disabled on serial-over-ssh console - pw -R ${DESTDIR} usermod root -w no - # Oracle requirements override the default FreeBSD cloud-init settings - cat <<-'EOF' >> ${DESTDIR}/usr/local/etc/cloud/cloud.cfg.d/98_oracle.cfg - disable_root: true - system_info: - distro: freebsd - default_user: - name: freebsd - lock_passwd: True - gecos: "Oracle Cloud Default User" - groups: [wheel] - sudo: ["ALL=(ALL) NOPASSWD:ALL"] - shell: /bin/sh - network: - renderers: ['freebsd'] -EOF - metalog_add_data ./usr/local/etc/cloud/cloud.cfg.d/98_oracle.cfg - - # Use Oracle Cloud Infrastructure NTP server - sed -i '' -E -e 's/^pool.*iburst/server 169.254.169.254 iburst/' \ - ${DESTDIR}/etc/ntp.conf - - return 0 -} From nobody Thu Apr 16 15:04:23 2026 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 4fxLrm0dPwz6Zp7W for ; Thu, 16 Apr 2026 15:04: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxLrl6hHfz4Hvw for ; Thu, 16 Apr 2026 15:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y8QIj6r40T4GeKl9N2Zso6Vfsy+fgKZfibqOrbDAjmo=; b=bC3RcZPEg9r6fr4U2ruLckQxP/LG2bdfDPPotzw40/itbbCBQrEXnAaz1JXilqoi8cueAh CHBOkFl8S6jccpYET24zKaU5X3dTpDkYXHMSNMoOgFMCzQgZSuiW3ziUtNeX0/UgYyl3iC NAgsD/bLdeupkiVuyMmHfIdkMRcBcYIeQHAuW8GmkUw9Au4v7T9O2UVuaS8gj5g0ugwNd8 IU4XwaIoEjocJc11U44KGK4/rxNiy/e/DZwBX4Wwhg0J7VeOrHy3eGddNyMLg8TWjqrRed PT3TInCubM5rwdIu4g8pScYvzpp0x1X8t4TSbcXD2seFdgnoW6lKnp4V/Z65sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776351864; a=rsa-sha256; cv=none; b=d+Zgk6RrYij14OqvTxwwQqjWN1aOQYbkLWoKN2j0xZKc4adZ0xPD1zUndOvJGCqLNjWHj0 sJ3mARuItNmsCwboscEDmGLufYAJDfWJajhgfeIRBOI5chK7FxErCYtentF1aU7nRbYbvM GDFzvCy55MxlJvYMrXRsQVW3J3Wm99w8JEpUEGE31Z5R/jui1hSxWPALICJnNa2cK9sLQZ siBksmqsntC5967DPB68RVxzXK5O18sj1vxcwvEhzHy6DtkiMQ1rHll5XQISAkB7dGxxBk wGkJg1HgMotDp86Y+nJL5JM1TMjPzy0EfeflHfc2Ij/rzi7SawPQ8G4BIAXPNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y8QIj6r40T4GeKl9N2Zso6Vfsy+fgKZfibqOrbDAjmo=; b=dl1v8Qo4be+Jdcm8otmb8t/jnTmc1ShtRpPmOPdSQNC0DyKbE7qbLfZSeVCmaiK0jwUDuQ BLAqkSI3m0sNB/SL1D4r3PmrlSO00PN20D0Mz1mzjU7X+iW+00rKYKN0XME2mc2namCaQz n68iAhRAS9Uk5D4oQ+SwHEEGi/UmitNK20T8CsPuNDLtxEDb673+unNQAvzRAOQIKayyEf G/1xTY3s/3PaIRbEp71WTZXidxcxL2yYVsKkXnvtwCc/FB6UjXTHW6rv8OMAXQOi6ILm76 yepyL5eUjnR/YcJ+CTTyo2ZuN/G8RnXfs2os/2vb5aWZUrZsmMcqYXGaIBqpig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxLrl5ZbXz1BlY for ; Thu, 16 Apr 2026 15:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d89d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:04:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 644665e4b013 - stable/15 - x86: Add struct ioapic_intsrc.io_valid 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 644665e4b0136b13d44859f9252368f753ecebd3 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:04:23 +0000 Message-Id: <69e0fa77.1d89d.29e2702@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=644665e4b0136b13d44859f9252368f753ecebd3 commit 644665e4b0136b13d44859f9252368f753ecebd3 Author: Colin Percival AuthorDate: 2026-03-20 22:02:29 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:03:58 +0000 x86: Add struct ioapic_intsrc.io_valid As of this commit, io_valid is always set to 1; but a future commit will set it to 0, at which point IOART_INTMSET will be set to forcibly disable interrupt sources regardless of whether they are requested to be "masked". Reviewed by: kib MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D56006 (cherry picked from commit 1d0ccd61563d48e914dccf3dd5cf0280d8331ec1) --- sys/x86/x86/io_apic.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index d0f47f82011a..03d85acabb1a 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -85,6 +85,7 @@ struct ioapic_intsrc { u_int io_activehi:1; u_int io_edgetrigger:1; u_int io_masked:1; + u_int io_valid:1; int io_bus:4; uint32_t io_lowreg; u_int io_remap_cookie; @@ -193,7 +194,7 @@ _ioapic_eoi_source(struct intsrc *isrc, int locked) ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(src->io_intpin), low1); low1 = src->io_lowreg; - if (src->io_masked != 0) + if (src->io_masked != 0 || src->io_valid == 0) low1 |= IOART_INTMSET; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(src->io_intpin), low1); @@ -268,7 +269,9 @@ ioapic_enable_source(struct intsrc *isrc) mtx_lock_spin(&icu_lock); if (intpin->io_masked) { - flags = intpin->io_lowreg & ~IOART_INTMASK; + flags = intpin->io_lowreg; + if (intpin->io_valid) + flags &= ~IOART_INTMASK; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 0; @@ -375,7 +378,7 @@ ioapic_program_intpin(struct ioapic_intsrc *intpin) low |= IOART_INTAHI; else low |= IOART_INTALO; - if (intpin->io_masked) + if (intpin->io_masked || !intpin->io_valid) low |= IOART_INTMSET; switch (intpin->io_irq) { case IRQ_EXTINT: @@ -697,11 +700,13 @@ ioapic_create(vm_paddr_t addr, int32_t apic_id, int intbase) intpin->io_activehi = 1; intpin->io_edgetrigger = 1; intpin->io_masked = 1; + intpin->io_valid = 1; } else { intpin->io_bus = APIC_BUS_PCI; intpin->io_activehi = 0; intpin->io_edgetrigger = 0; intpin->io_masked = 1; + intpin->io_valid = 1; } /* @@ -796,6 +801,7 @@ ioapic_set_nmi(ioapic_drv_t io, u_int pin) io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; io->io_pins[pin].io_irq = IRQ_NMI; io->io_pins[pin].io_masked = 0; + io->io_pins[pin].io_valid = 1; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; if (bootverbose) @@ -817,6 +823,7 @@ ioapic_set_smi(ioapic_drv_t io, u_int pin) io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; io->io_pins[pin].io_irq = IRQ_SMI; io->io_pins[pin].io_masked = 0; + io->io_pins[pin].io_valid = 1; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; if (bootverbose) @@ -841,6 +848,7 @@ ioapic_set_extint(ioapic_drv_t io, u_int pin) io->io_pins[pin].io_masked = 0; else io->io_pins[pin].io_masked = 1; + io->io_pins[pin].io_valid = 1; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; if (bootverbose) From nobody Thu Apr 16 15:04:22 2026 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 4fxLrk656cz6ZnrM for ; Thu, 16 Apr 2026 15:04: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxLrk5FxWz4Hvv for ; Thu, 16 Apr 2026 15:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=woxFPc+E5A63CMx8Vv+dxUKxZ5EbsRBKaRSeJC4OiJg=; b=rxr/MN8m9tUBJyvFN5c964niCG8LVQ+o7JXuThc4sgw0p2P9R7J3A5z3+rNqVm/rmqltbG J0rqwmpx7q2tNmRc8uxPfJldeRleusWIZXmfkpitKRg98KVc6MiaJz1paYFZ6VBy+g9qiO h3cYuWBVFexgfGJcfzWm/St8NiGY6FUQ93J/taKqIJcvPkF0hqbpTtOZJY6NHoc6Lxc0z2 GqY2O6ulBIbbBfRyHOpX/+jQyVqIZ3AUAcw68HCOjf20JOwHxmy56IlFTh7FClvVpLFS7t SufR8JsVuLogbHTLCrQHqpCz6gweH/GON+vfnicVuGmxB70rvuJMnIKwl6ZiQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776351862; a=rsa-sha256; cv=none; b=nBiCJxgS0W6gFIJcFOfe67Elr78wVFkmpQw830OVVFvFbcat5narBNjFfpkOK2FC8oERUF Y37MEgR2swP4xER33ycnhW3OIDkEgV19FESo3kZcZDj7+TKdwtZj2X96HQhvsJaqwrd5h/ 2qNksYzUn0j00PxPOFVKsWw9Jp+LrQMJsaHhWrqn2H5xHV8dApAOaT5FKp7S3lmDcCyrrC yeyaVscRVLIZ7q25bixWEHmrKIqjFbYehk4nibinCrZYeq+1RE6jnjhWHKCVmcfFC8CviG eXqj1FIZKvLZyzcemckwlcZoBsNVfQ96K7bsiIW//yVc+dvcwuYHGELG4WD/Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=woxFPc+E5A63CMx8Vv+dxUKxZ5EbsRBKaRSeJC4OiJg=; b=bmWdAY5Xoj3bo/tklpJk0SSriArk9Bg82kx9IwIw9bZuOq00EIkUIFpz/R0SAzhqAksIhC hVhZo2Or1j0E+7F9t4mM8an16m+3HWH4H/3lGVRJW71obUz+I0FEv/KWuRI5LN4KaFjuvI KF4qs2kmkJOU+46GJ10byB8yCSB3DUX2yqd47QlKnd67mCj54SUaOHTUDAOb358sbMvo/y SFKlGU0qAF9aXx9NuQbn+FCkmreMpwb1qmlo+MAilcZ32VLwfUfDICbeR46qNc2P9P3L8L 1VZjGePVXOHNTa4qUe8TKBYln13QEXPm62yr5utmDAyivVgLVUtxdP3f14xFWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxLrk4XFwz1BwN for ; Thu, 16 Apr 2026 15:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cb50 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:04:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 62a81003536e - stable/15 - clapic_handle_intr: KASSERT isrc != NULL 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 62a81003536ee6f06707b460e79cae348a7a71d2 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:04:22 +0000 Message-Id: <69e0fa76.1cb50.16a4b6d0@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=62a81003536ee6f06707b460e79cae348a7a71d2 commit 62a81003536ee6f06707b460e79cae348a7a71d2 Author: Colin Percival AuthorDate: 2026-03-14 01:03:44 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:03:58 +0000 clapic_handle_intr: KASSERT isrc != NULL If an interrupt arrives at a CPU which isn't expecting that particular vector, intr_lookup_source will return an isrc of NULL and we'll panic when intr_execute_handlers increments *isrc->is_count. Place a KASSERT a few nanoseconds earlier in order to leave some more breadcrumbs for the next person to trip over this behaviour. Tested on: EC2 r8i.96xlarge MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55851 (cherry picked from commit f350063a251c9da0c5ce437eb4c44a2d716b673e) --- sys/x86/x86/local_apic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 54026f83dc15..ed9f985dafd5 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -1426,6 +1426,9 @@ lapic_handle_intr(int vector, struct trapframe *frame) isrc = intr_lookup_source(apic_idt_to_irq(PCPU_GET(apic_id), vector)); + KASSERT(isrc != NULL, + ("lapic_handle_intr: vector %d unrecognized at lapic %u", + vector, PCPU_GET(apic_id))); intr_execute_handlers(isrc, frame); } From nobody Thu Apr 16 15:04:24 2026 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 4fxLrn22Mnz6ZnrN for ; Thu, 16 Apr 2026 15:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxLrm71cPz4Hmp for ; Thu, 16 Apr 2026 15:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gq5maO1pMQxxjja6Uy8hTh2xafzXpjKXfQhkLsyjo3M=; b=ThD1evht3/qO37WKrEBkbZuH9rNFjYL4leU5VY094OvKc6Jz56D0y6jC7uTs/3tYt86V0M nsLBQU6Z6V00XXX0Xoeh4+w4sTrgg04q3uHAOnqAuNBKYG/4qFOuUPxfGgPbGAccUanNAl PIrXkXqLqT/OFLbNx78qEqpcvvr/b/Xuqcm90xBjxlWkkwhwhQeieWstTwMscS/P40hDFi NXyhlPH3WCwvUNoCI4tqemtumUjl5Xmbk66j9UGSw+x5FmK+u8vnFpNp6fXAHG4YJF5uZt EjvrAx88GoalJjT9JQCZdRGOoM1QSwcNe6SaAISTO8qAXNaELSt6+rhiJuBglw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776351865; a=rsa-sha256; cv=none; b=KduMiIxQX9vpxK9Y2JowuOnOeTJ1EWH73XBZNUklg3XOPBVuNEEGpZnFEU9QP7FYBZCSXq kAIbwvHuRDGh+fJg2CGlCyFxWA8h/xQXSoagkkTeNmPRQllUGaasZzUcXDZ4TZ7MBk3ykO EtXf7ejC9K4LaqXVv7rzWBjnzEsOE+2fQh4thyzmXYLBDPc35JyyESQn6NoEtf8X/N4uK4 jwiEmig7HyZN9JwT6uzKPc+KdrBREly1O/fQLHe2jzmIorGS+JFf/XlWBY8m37naNP0RY/ SVO+SmuQYbx90BfQ1R55xj45WcyColaXVs4uwCx+XIjZSnidWM8qy04mU9j4OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gq5maO1pMQxxjja6Uy8hTh2xafzXpjKXfQhkLsyjo3M=; b=PwUsj7eKnqMmzx19krtI8ftDtyRMNqhLNsTr2/+mkXL0SyBwGRLmxV07V4poFHv/8pRjnD RK4ERFHL8bqsre5XdFDK7kA/zL1hxwwH5QCmmX9v/bS3gjvWaXdtnVAIJfcrj4VzAa4DGr 2tP5qGwEW+c3Rfta7Q0aPaMgTHgu9e0Gdh1ZJPmGI5eCL4nHsfueOjvdks0/N8lCWhthQs +VyMqmZ51cSSXT7aqHYF+lWdl0uP3gIUQlqp8MykN+OPfibGyRRoLGv4Lzlu8THmsyaNTZ 8FGQgpsrJM4BQZaQeNoUbJn08vVH6QpFtwyh++iOAooVphIadV95e50qG2v4Iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxLrm63Lcz1BxP for ; Thu, 16 Apr 2026 15:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e1cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:04:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b55fd9cdc25b - stable/15 - io_apic: Don't route to APIC ID > 255 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b55fd9cdc25ba0cfe41380c4aaf583938637b805 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:04:24 +0000 Message-Id: <69e0fa78.1e1cb.62daa6cf@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b55fd9cdc25ba0cfe41380c4aaf583938637b805 commit b55fd9cdc25ba0cfe41380c4aaf583938637b805 Author: Colin Percival AuthorDate: 2026-03-14 05:51:04 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:03:58 +0000 io_apic: Don't route to APIC ID > 255 I/O APIC Redirection Table Entries use 8 bits to encode the Destination ID. Attempting to route an IRQ to a higher APIC ID would result in it being silently routed to the value reduced modulo 256, causing a panic if the IRQ fired since the receiving CPU would not expect that IRQ. Instead, print a warning and mark the interrupt as invalid, resulting in it being forcibly masked. Reviewed by: kib Tested on: EC2 r8i.96xlarge MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55857 (cherry picked from commit 5809c9a77b2d3b83c056ba3ac5ba4e261c0af595) --- sys/x86/x86/io_apic.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index 03d85acabb1a..5d28b7e8c611 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -364,10 +364,20 @@ ioapic_program_intpin(struct ioapic_intsrc *intpin) /* * Set the destination. Note that with Intel interrupt remapping, * the previously reserved bits 55:48 now have a purpose so ensure - * these are zero. + * these are zero. If the CPU number (in fact, APIC ID) is too + * large, mark the interrupt as invalid, and target CPU #0. */ - low = IOART_DESTPHY; - high = intpin->io_cpu << APIC_ID_SHIFT; + if (intpin->io_cpu <= IOAPIC_MAX_ID) { + low = IOART_DESTPHY; + high = intpin->io_cpu << APIC_ID_SHIFT; + intpin->io_valid = 1; + } else { + printf("%s: unsupported destination APIC ID %u for pin %u\n", + __func__, intpin->io_cpu, intpin->io_intpin); + low = IOART_DESTPHY; + high = 0 << APIC_ID_SHIFT; + intpin->io_valid = 0; + } /* Program the rest of the low word. */ if (intpin->io_edgetrigger) From nobody Thu Apr 16 15:04:25 2026 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 4fxLrp28wgz6ZnrQ for ; Thu, 16 Apr 2026 15:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxLrn70wmz4Hhg for ; Thu, 16 Apr 2026 15:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HQzoFw3qr3om+ewTm8KSWbc3Ynso96KLuXhCMjn3oKk=; b=TGASOzd+fMzBbr73eA94z8ZPuswO71uMYwvk0VBGYsgV0rcU2mHW1gU4GgekMlQXQRLGqb 1e5LvOFs+CzAAk7514LvyqyENFApZrhoMdwjOXYfvdERxeYmSAXeErRDCPOo1QhrkCMP0m Zy2gfxSihfMC6kSEoXTx96DjAKIqTNrLoNFkVc9M0YFo5qXvqYhRBR3/U83qetakMGPyIR LSBlrpIcNhyHU9dWdL7c7wTPBk6BQMRCUuTOtNKVFZb+Hf+Uy4NSn9O7itZeluJXcTUQvG DgIOoAicVgQbfSUEt0Z4+chclcz4T9WiKPk9gDKVoOo/nasGmn0WmN02552uag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776351866; a=rsa-sha256; cv=none; b=ZCudKEt8XgYhVlYTlwr8Saj2GNrg+rzvI/k8q50sPF6GHP1fgbQkPTHkJuLcZhHT0ordS2 7iSURnswVotcO7Q61TdcQsUTGT8E1/pWImAnKgrhHzAOHi+5WNtDWzZRWqPBPtHd/ai9AC eNgb9vC1CC9qHuZLsO8v9xdAvvCNcUhVL8XHeQtEGNew0TbZU/Oltk13XogVueNZOM87Bi E/00/A2zsCcF4ZDmsKsfSDvESxEhVXCMP5q6FN5BN4ffis34yKVeUqJh9fY+Lqxqgz9Kos /9GMn1wCRXW+xlT37GVGHxrx519c9A0eYgKQvHpOtH1LFlFA9e0aDfeTUi9v9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HQzoFw3qr3om+ewTm8KSWbc3Ynso96KLuXhCMjn3oKk=; b=rI51U0lfl6li7Ym2Pf53fUP/6VYz6ebKmgPSj5Xc6ybjmh+kKTcBUoBHXQBNVY/rN25kGA B77caOQEKFLHp7d409RkCBhPgpDoEjJnncqPxC8+0ppzEnhR/hLqLM33xGUOB0ikdy6B9t npQsoECKEQMjOrRkNF7/LPwso3YUPK+56nQS76UxtQWvRVWun+YIvjqoFPKEp9AD8Pb0yY tFns1VrZL0Imd54ujyDIVTQVY+a9H5udrQRlnOPPZb4s4FxNOUO6IWkfLrU2El2ys3cgfv c/9NBidOFEAqFD2AolhvHQK6sL3uRwp6YEx5pzuZcyNE6XHOouP8O3nQAq/DTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxLrn6Qrpz1BxR for ; Thu, 16 Apr 2026 15:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e1cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:04:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: da6df572010c - stable/15 - x86: Add stub for Extended Destination ID support 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: da6df572010c423a4fbef76ebc972c83cb409e58 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:04:25 +0000 Message-Id: <69e0fa79.1e1cf.75f3894f@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=da6df572010c423a4fbef76ebc972c83cb409e58 commit da6df572010c423a4fbef76ebc972c83cb409e58 Author: Colin Percival AuthorDate: 2026-03-16 23:37:04 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:03:58 +0000 x86: Add stub for Extended Destination ID support Without an IOMMU, the APIC standard only allows 8 bits of Destination ID for MSI messages, limiting us to 256 CPUs. While IOMMUs can allow for more than 256 CPUs to be supported, they are not necessarily desirable in virtualized environments. The Extended Destination ID standard authored by David Woodhouse uses 7 "Reserved" bits for the high bits of a 15-bit Extended Destination ID in order to address this: http://david.woodhou.se/ExtDestId.pdf Add a loader tunable machdep.apic_ext_dest_id to control the use of this feature; the default value (-1) means "autodetect" while 0 and 1 mean disabled and enabled respectively. Code to detect host support in Xen, Hyper-V, KVM, and Bhyve will come in future commits, as will the code to use this setting in msi_map and ioapic_program_intpin. Tested on: EC2 r8i.96xlarge MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55890 (cherry picked from commit d9db6d759dfcf4a4559e66e777599bb3fa8ca14c) --- sys/x86/include/apicvar.h | 1 + sys/x86/x86/local_apic.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index c537d0ee0cdd..e088b3d53547 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -264,6 +264,7 @@ device_t ioapic_get_dev(u_int apic_id); extern int x2apic_mode; extern int lapic_eoi_suppression; +extern int apic_ext_dest_id; #ifdef _SYS_SYSCTL_H_ SYSCTL_DECL(_hw_apic); diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index ed9f985dafd5..cb7b03b313c1 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -2067,6 +2067,17 @@ apic_setup_local(void *dummy __unused) } SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL); +/* Are we in a VM which supports the Extended Destination ID standard? */ +int apic_ext_dest_id = -1; +SYSCTL_INT(_machdep, OID_AUTO, apic_ext_dest_id, CTLFLAG_RDTUN, &apic_ext_dest_id, 0, + "Use APIC Extended Destination IDs"); + +/* Detect support for Extended Destination IDs. */ +static void +detect_extended_dest_id(void) +{ +} + /* * Setup the I/O APICs. */ @@ -2078,6 +2089,10 @@ apic_setup_io(void *dummy __unused) if (best_enum == NULL) return; + /* Check hypervisor support for extended destination IDs. */ + if (apic_ext_dest_id == -1) + detect_extended_dest_id(); + /* * Local APIC must be registered before other PICs and pseudo PICs * for proper suspend/resume order. From nobody Thu Apr 16 15:04:27 2026 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 4fxLrq3QDhz6Zp01 for ; Thu, 16 Apr 2026 15:04: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxLrq0sGmz4J1v for ; Thu, 16 Apr 2026 15:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jXu592oYP5XhJCy8iZJ1AFzhu+1ZZ8215piFLNe285Q=; b=oUjy7yw4+1XRgPM4s/ETro145wsxU9b0Q130mEQohzwLc9JS3X4h+3HiZydq1p1cx2+TRt r9I2XmZSWNm59sS+VtKE49dTiOF+CldUYIWyBdgrVgTn3ivYSiIRxL8vHjFv7t88q9icpF c5FFn8kyMw5mOlAcsimclTYh2SnlJI+l7xq7beZqrKXvmadLtvf9D/cACXDKpAjH/bxCcQ M4/CtLl2qrQy8gKZhIdjJMcihhDNF2BL2aoL03Fyfj8ct3NYjmSMSfICA8uCLC1M1lKp9q sL62vQcpZaQm62Rm8Sn73gzHWECdow1kigYCYbtDcz9c2oECtwilPy79tk4Uug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776351867; a=rsa-sha256; cv=none; b=cNRTUZC5lazWCnIJGOopQMiQvM2pL0GJc7/B1BotFvHTXTb/KxD82Mz59dAJxPna4O2aS/ M8X6yDP/9eKhtLhnSSlz789g89ZhF8vIfHpejWkWtyLfXyvysbGFfVmnEKLN8aSUXgl944 t/Aofb01OrY6soc/p/U8b2AohUarKHfq1yOO4HMJn6uS7pzYHcWyvpDjkLo0lYtipfE9rI 8PqN/27BE1PMdlJ5ApRi+TQImWfhD5q8Kq0T2RQxaNi0HjYfDGdckZ6Vqa+Rf0dZCQwmiD 7CpxRA5RwpSLhamOGLfq9FcD0I20zebpGZKEUS3132ur1mKYcMVI/rWZSuykRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jXu592oYP5XhJCy8iZJ1AFzhu+1ZZ8215piFLNe285Q=; b=XmVRotrgN4Uqh4y0GTEV0+qh+lbSRpqLd+cWECKM4mQQMZLaQ1Lk9s5N++QpW3L7sFqxcC D9frg5bCepoRjka07plZ1pUm6NBUFyCeXge2VJGDQuFSFHmojCmofXo4cXNfutz3fyYHu+ zCg2MKebDJTpHFFQ4Rgs7TU+I9Gd4hQyn01BCIHycp7t5+EGlebOv6Nga48RfTI4flsQui KRQtnjA4ZqAK/0X7iSK38zfW+TbwJj6BVu5H75ZZtMqRq+xOGOMTlRrCySaAGgsMt7nzW5 gR0dP77WPLjl28y0wlQKtPWTbNmqqdxDaKKgarUi1Zaib+ycTkxDqnSWfaPlCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxLrq05jqz1BYt for ; Thu, 16 Apr 2026 15:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e7d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:04:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: bba179b0aac1 - stable/15 - msi: Support APIC Extended Destination IDs 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bba179b0aac1da000707f0f5d5de8670d0a529a5 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:04:27 +0000 Message-Id: <69e0fa7b.1e7d9.454690e2@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bba179b0aac1da000707f0f5d5de8670d0a529a5 commit bba179b0aac1da000707f0f5d5de8670d0a529a5 Author: Colin Percival AuthorDate: 2026-02-22 04:08:59 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:03:59 +0000 msi: Support APIC Extended Destination IDs If APIC Extended Destination ID support is enabled, use it in MSIs by allowing APIC IDs up to 2^15 - 1 and encoding the high bits into Intel "reserved" bits per the standard. Tested on: EC2 r8i.96xlarge MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55426 (cherry picked from commit 02f29c1324cf5193c3aec181cb409917b541f7fe) --- sys/x86/x86/msi.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index 9d5a51f9753c..9ecdfca3e01b 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -92,6 +92,10 @@ #define INTEL_ADDR(msi) \ (MSI_INTEL_ADDR_BASE | (msi)->msi_cpu << 12 | \ MSI_INTEL_ADDR_RH_OFF | MSI_INTEL_ADDR_DM_PHYSICAL) +#define INTEL_ADDR_EXT(msi) \ + (MSI_INTEL_ADDR_BASE | ((msi)->msi_cpu & 0xff) << 12 | \ + ((msi)->msi_cpu & 0x7f00) >> 3 | \ + MSI_INTEL_ADDR_RH_OFF | MSI_INTEL_ADDR_DM_PHYSICAL) #define INTEL_DATA(msi) \ (MSI_INTEL_DATA_TRGREDG | MSI_INTEL_DATA_DELFIXED | (msi)->msi_vector) @@ -644,13 +648,16 @@ msi_map(int irq, uint64_t *addr, uint32_t *data) mtx_unlock(&msi_lock); error = EOPNOTSUPP; #endif - if (error == EOPNOTSUPP && msi->msi_cpu > 0xff) { + if (error == EOPNOTSUPP && + (msi->msi_cpu > 0x7fff || + (msi->msi_cpu > 0xff && apic_ext_dest_id != 1))) { printf("%s: unsupported destination APIC ID %u\n", __func__, msi->msi_cpu); error = EINVAL; } if (error == EOPNOTSUPP) { - *addr = INTEL_ADDR(msi); + *addr = (apic_ext_dest_id == 1) ? + INTEL_ADDR_EXT(msi) : INTEL_ADDR(msi); *data = INTEL_DATA(msi); error = 0; } From nobody Thu Apr 16 15:04:28 2026 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 4fxLrr4ljHz6ZnrV for ; Thu, 16 Apr 2026 15:04: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxLrr1smGz4J6S for ; Thu, 16 Apr 2026 15:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bt6CCaMwiP1KXDEZMVdEBIbv8mnkYHvSxMiXu9NYm94=; b=QDZq7juNawvc5DnJviiusPKnAONGS2FAxC0NdhUR/x5K2Q4+aAA7lQNGhwxhvJFuixjhze OPh0pDRJcN2CmUptXW7QyINX7WuJlIspMcYuXT6vfKmVKStQTscIF3GbjOUTJkp9wcG0/D DiUdxYH56TPYU5xhgNk12SL20haVG6j7eiKYcYI1estWRP13QS+uOHHt//QI89+bFaryyG Iu1Y44jpKZ6OawSsYpdVzkP3TwBloW27JZV8zweEE1kGwr+8Z5mF1n8MIm5WdZtl3awNDc Z/436ZB1NtnQjKa10mXgI7V2pPrTxwjYyzoT2pMWyrjupH1P4QVok4LvV5V7mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776351868; a=rsa-sha256; cv=none; b=Cv7dl1ICT0twATc9ipoVcclal6d9zYyQTLnw/rlFs4aJp1KnckjUFGuZN6jmB6OripKO5O rhKYmB0Sq1ZYjH4S53Zy9Pyy3VlhQ80IFZ1D/JuSC028bAn/nnBho7KRYCCX+oH4+jDazT M8GVvxgpo0smAM/rBNd8GTBpN2TceX6IGg8HYl6w1PIVG+pZdTNm7owKDo3HdRzFqF4dyH Ebi/iom6MjghZEY4jeJBUppaLWmCjbBq/eSDcRxASYGUXPyeXshQ3VU+9doVUYP1dSPqmT 5pp3lkKfJr752O+3kIYHzyPuz1vH+e/NLmUGF3reDBzoBLQRkJIug5DFLPAsFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bt6CCaMwiP1KXDEZMVdEBIbv8mnkYHvSxMiXu9NYm94=; b=Oc+3KvyFXNC2/h+AgtaZzQ3lE4G+5/mSZHvQj2yotXrOGXew2mKm3BXmnucR0mtEtHF/ur eCWKP5YAmxYCt7KVraI/iDt2p8wunLxNEPgGiboPKqP0oKOPSoxqdcW3msmVg+uR3lIk/S hHxOnl9ldX8Yqalv4TepRIPiQexxDk0j1ZTBL3r87JkFMleus6GsCauPTUpKVDqPYXbn/i Zl+d3HMHvaFuQj0rtRSwgufotQK9uZ83vl1AmKBJqMVdSdgspDnU7vOJCF3Xf+jVIyamcU EtZygdjNTyxjakaxCswFBvUlZaZZH21vKlGagUrL5rV9MmoDK8CzIJ/XUoAaZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxLrr0vmLz1BwP for ; Thu, 16 Apr 2026 15:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:04:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 02b20e538267 - stable/15 - io_apic: Support APIC Extended Destination IDs 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 02b20e538267312811ddb8fd0f3d6b63915ffb7e Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:04:28 +0000 Message-Id: <69e0fa7c.1a5ef.5ad5747c@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=02b20e538267312811ddb8fd0f3d6b63915ffb7e commit 02b20e538267312811ddb8fd0f3d6b63915ffb7e Author: Colin Percival AuthorDate: 2026-03-16 23:45:32 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:03:59 +0000 io_apic: Support APIC Extended Destination IDs If APIC Extended Destination ID support is enabled, use it in APIC RTEs by allowing APIC IDs up to 2^15 - 1 and encoding the high bits into Intel "reserved" bits per the standard. Reviewed by: kib MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55889 (cherry picked from commit b0e1b1069d655f12ab69cf3a1dc1904dd35ad1da) --- sys/x86/include/apicvar.h | 1 + sys/x86/x86/io_apic.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index e088b3d53547..b905aee6a8ed 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -84,6 +84,7 @@ * to use that ID. */ #define IOAPIC_MAX_ID 0xff +#define IOAPIC_MAX_EXT_ID 0x7fff /* I/O Interrupts are used for external devices such as ISA, PCI, etc. */ #define APIC_IO_INTS (IDT_IO_INTS + 16) diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index 5d28b7e8c611..28841cfc0e21 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -371,6 +371,13 @@ ioapic_program_intpin(struct ioapic_intsrc *intpin) low = IOART_DESTPHY; high = intpin->io_cpu << APIC_ID_SHIFT; intpin->io_valid = 1; + } else if (intpin->io_cpu <= IOAPIC_MAX_EXT_ID && + apic_ext_dest_id == 1) { + low = IOART_DESTPHY; + high = intpin->io_cpu << APIC_ID_SHIFT & APIC_ID_MASK; + high |= (intpin->io_cpu >> 8) << APIC_EXT_ID_SHIFT + & APIC_EXT_ID_MASK; + intpin->io_valid = 1; } else { printf("%s: unsupported destination APIC ID %u for pin %u\n", __func__, intpin->io_cpu, intpin->io_intpin); From nobody Thu Apr 16 15:04:29 2026 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 4fxLrs5Zz8z6ZpBG for ; Thu, 16 Apr 2026 15:04: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxLrs28Xjz4Hwk for ; Thu, 16 Apr 2026 15:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B3Gy9dWFH+M+4vSWNRea3Gwgt9/QGBlfz5IxqdL1ftw=; b=EjpeYbQuC28A1WY2beWv4AIPMNLAMmil+fkEuHERjGq1GZZvqxxI78umL7zmr7hHeYCfeo NtAJBcJsliKZJhTZGSN79fJbNRg7IjpWM/hKfC1meIU/ZGtFkbAtsD7Rbab/kh8BILENhs m/7BR/+Ee8lr4LjfqfrIzxK6XzbTHEOipDuMeinQudPRi/cZHUMTdhnjT4uvhzN4DUd/c6 PuroLvqYiYC3Owne9jMkx8NBTybphJWwREy3msbLIt0sg4ncq24oXjnNxCVPFrLFDllAyN zu/qRcR4Y/AhybUTGhfYnck+3lkVD8iFvS8kKBoOcD4UXh3m3ofZnBvQzlxOaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776351869; a=rsa-sha256; cv=none; b=GXkEAkj615hp9F/SoUh7Muezm6Sz9DdP+LtnhWAStV0VAFNS3jTgEQ13o5DwKhY2B5gQH9 LN30N+9GhlaWHEqsArYG0BoBBtOV8aMhg4I+VrU5bGbOOlzW7FWaBdts29g92Hcm8cMZLB j5rOTlX8mqsx87Jj04C5DpUyHZJqbocrnYQKHDal7bPwZdxjrOLQsCXM1TdJkY1a7CQ04/ gEAg2SptRqsdoMTSwDGXkIDi8NX4GSR0r24DevcbphtXhSdytJ939zlQFi+SjOeo10t/3/ j2b94KoPFTQDKrxTvNqVKlWQ94VohI5vdp3vG8T4w4Ok9nmfz4ufKDw7HFGGIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B3Gy9dWFH+M+4vSWNRea3Gwgt9/QGBlfz5IxqdL1ftw=; b=C+1JyW1H4JwcYXgqxyg57PK7Ya6WGPZoFkIKtEhaWndi3P2etyYvQvK3KLflPmg5CGFS55 3UTbdfZnUHriq2Afrdc8A1aBMwHpJKqc0oOMRJmT04QZU4vuHyw6cuHnXoiy5wra7uwfC3 XWHfxUXNLdloCCkH5agBVOG9Q1IcIgQo1ZXOvCIUy9S8/YmJojLATlE1KjVu1NKsJ9tNOR f++VlE79CoyPUSAM8fMSIkFaqszcEmEZ3eXtcS5NjuHj6/xIp80bWpHAlkU9EpcheiE6tY Qa8NoNlTpMGnB3IZ2oqZEJ9TRny7O8BKsJAFgyFfSjfY+wG+iNQl9KzOMoMGdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxLrs1j8Yz1BYv for ; Thu, 16 Apr 2026 15:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e130 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:04:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 2931aabc40ea - stable/15 - KVM: Detect Extended Destination ID support 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2931aabc40ea380781f882e0909fed75f8530b64 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:04:29 +0000 Message-Id: <69e0fa7d.1e130.60479750@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2931aabc40ea380781f882e0909fed75f8530b64 commit 2931aabc40ea380781f882e0909fed75f8530b64 Author: Colin Percival AuthorDate: 2026-02-22 04:09:00 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:03:59 +0000 KVM: Detect Extended Destination ID support KVM advertises support for the Extended Destination ID standard via bit 15 of the value returned in the EAX register when KVM features are queried via CPUID. Tested on: EC2 r8i.96xlarge MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55427 (cherry picked from commit 9ab5aa3d4c7879d5518afc7587a864ba880e7ee9) --- sys/x86/include/kvm.h | 1 + sys/x86/x86/local_apic.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/sys/x86/include/kvm.h b/sys/x86/include/kvm.h index fef26bde226a..83dd20fa8d23 100644 --- a/sys/x86/include/kvm.h +++ b/sys/x86/include/kvm.h @@ -49,6 +49,7 @@ #define KVM_FEATURE_CLOCKSOURCE 0x00000001 #define KVM_FEATURE_CLOCKSOURCE2 0x00000008 +#define KVM_FEATURE_MSI_EXT_DEST_ID 0x00008000 #define KVM_FEATURE_CLOCKSOURCE_STABLE_BIT 0x01000000 /* Deprecated: for the CLOCKSOURCE feature. */ diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index cb7b03b313c1..ea5b14d92262 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -72,6 +72,7 @@ #include #include #include +#include #ifdef DDB #include @@ -2076,6 +2077,16 @@ SYSCTL_INT(_machdep, OID_AUTO, apic_ext_dest_id, CTLFLAG_RDTUN, &apic_ext_dest_i static void detect_extended_dest_id(void) { + u_int regs[4]; + + /* Check if we support extended destination IDs. */ + switch (vm_guest) { + case VM_GUEST_KVM: + kvm_cpuid_get_features(regs); + if (regs[0] & KVM_FEATURE_MSI_EXT_DEST_ID) + apic_ext_dest_id = 1; + break; + } } /* From nobody Thu Apr 16 15:04:30 2026 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 4fxLrt5sZNz6ZpD7 for ; Thu, 16 Apr 2026 15:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxLrt37vDz4Hx2 for ; Thu, 16 Apr 2026 15:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dXJUNAqJicINFaHqExLyAGcDJfOjmlvdp9himdz75wU=; b=D4ATyGDvQygoGBFMYkTcbkTMKHp6D0vkyNlVDTghZ7DDqFZdI3Icn+U2MQFmq4GBgabd2e obB9Ky4Sw7N2BXTS84bQ9dTcO8/mrG30ERLiBYojxydnAun/KQ/gQAV1jfHwmkaBpMoS2g BYgcZEdnff9HxyLvTJKH5nqI1fgs+cKqLGyml/24BbZKAxsAoPdw4V+EBPMU7UdykxPD11 ylvDf70YSVkKmQhgugcnEAW+8wQlQD+zsAd9K7DKvn4vL+1fDd4I659MNKQIrtz56/55ac TKluDRMgGfR0ANA4RrwMyg3MUNDXtKxK1Qiiw8tZjyF5SAeDuAFMYvbxRyxBEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776351870; a=rsa-sha256; cv=none; b=CVVq4x0PTz/J1d0node7k3htA5sAg6XvVHNvrFHiAjPHJOLcBIiCJXtza1hAXjWbIgG2Vd xK2BryuyBxvRQtwes8rDuDKN8lBawM2PufG6Q02xhucWfNpwrdAnJCvU/4aTGS85o/cz8E IvF/DQ5VQxhjQdp1HACLw9BTzsXM0DdP06kPAny5STyObPjy9zPpB77HGM8D6XUKPGheeJ +04eAAWyzTIUAjJT6BWTLv6fALPJGf1iCbfYojb3MuiAtlaeXSTxSA3+lZXHLBNAyoXsdk GPMFn+2FE7nXHGWau2qvx7KrFUvNFdoXcFUjK9sT/bE301qXSlz0yjx6/PVlUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dXJUNAqJicINFaHqExLyAGcDJfOjmlvdp9himdz75wU=; b=pDWk8vwdLzx91R8zhMtNME4qvcKRt3R+Gy3mTPkIgLdzrnzo15kIv6m6vgKMWxoCeTgVBW Oe1ZrRw5GjmhLIcsNINFgYjCGFtsOZkNcMrAJS8i2GFOpicK4FHgReb7kIp+TBnZUq/0O1 ZCcib0APdwYrlIdfF4Hx1BP45tLBPY46dL+i4pu5wWsmfSoRpz4LZNf/j0fR/pJ7xXtYzt M6jcUh9lfBKG7gX69q88HvTPBnCzKx046pBPdsQkzhFLo/v3owQQ8GizsEOsplQ+f32sef p0AhlGofqMxAYCuJindLP5HcNSuTgHFrovXl0ET63kbS4KebcPfVDKO3ToDJ5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxLrt2Zx1z1BSq for ; Thu, 16 Apr 2026 15:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e284 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:04:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Roger Pau =?utf-8?Q?Monn=C3=A9?= From: Colin Percival Subject: git: b54646e37a2b - stable/15 - x86/cpuid: add CPUID flag for Extended Destination ID support 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b54646e37a2b65025151e04a5c4a3b3c23e0202c Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:04:30 +0000 Message-Id: <69e0fa7e.1e284.666e342c@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b54646e37a2b65025151e04a5c4a3b3c23e0202c commit b54646e37a2b65025151e04a5c4a3b3c23e0202c Author: Roger Pau Monné AuthorDate: 2022-02-18 08:17:47 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:03:59 +0000 x86/cpuid: add CPUID flag for Extended Destination ID support Introduce the CPUID flag to be used in order to signal the support for using an extended destination ID in IO-APIC RTEs and MSI address fields. Such format expands the maximum target APIC ID from 255 to 32768 without requiring the usage of interrupt remapping. The design document describing the feature can be found at: http://david.woodhou.se/15-bit-msi.pdf Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich (cherry picked from commit 8c986d1645312487adf21a9104d667ac1e19c25f) --- sys/contrib/xen/arch-x86/cpuid.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/contrib/xen/arch-x86/cpuid.h b/sys/contrib/xen/arch-x86/cpuid.h index ce46305bee99..f2b2b3632c2d 100644 --- a/sys/contrib/xen/arch-x86/cpuid.h +++ b/sys/contrib/xen/arch-x86/cpuid.h @@ -102,6 +102,13 @@ #define XEN_HVM_CPUID_IOMMU_MAPPINGS (1u << 2) #define XEN_HVM_CPUID_VCPU_ID_PRESENT (1u << 3) /* vcpu id is present in EBX */ #define XEN_HVM_CPUID_DOMID_PRESENT (1u << 4) /* domid is present in ECX */ +/* + * With interrupt format set to 0 (non-remappable) bits 55:49 from the + * IO-APIC RTE and bits 11:5 from the MSI address can be used to store + * high bits for the Destination ID. This expands the Destination ID + * field from 8 to 15 bits, allowing to target APIC IDs up 32768. + */ +#define XEN_HVM_CPUID_EXT_DEST_ID (1u << 5) /* * Leaf 6 (0x40000x05) From nobody Thu Apr 16 15:04:31 2026 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 4fxLrv6srgz6ZnpQ for ; Thu, 16 Apr 2026 15:04: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxLrv3t8Wz4J2n for ; Thu, 16 Apr 2026 15:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B1YVRPEOD7f2nZF9kxb8c8yuuM1OKJV1UO00Nf24Nv4=; b=Rd4IKdPGPmgdqEIgrj8FqcrRxZg1Z/Z19squXjYP5jQsiKdy67iT/9PL5SBUFe0+EFWOYv ETRcLchbYIiA+fV27U40qgn95WNv4QP3VLHGU6MuGbWcW+bXf+hbwkXBwH1T4jHIAntbMo 8QYSdoCOGF+2RxgcDaOYjoNlRQ3aLiMqFgjGWDIRjyf6m/0Agwbx+I4KHi503XpJRMx0gF gr+dclBBnYeyUOvYD9HQfzyH/bD9eazbG5BI5AL1kQstD2Gber6/CpWrc77DqBn5SdnEsN px/xKy5Swzl1FLATMZtTptQ6oEtgP/V0WaXq1kCzEyN02GJXwdoLE0/g0431sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776351871; a=rsa-sha256; cv=none; b=PUGZnWPUNhuXoDGYC2/+oXpG644dSkfKrQXInLIwJojyVw09rI7gUCwWa+89qU6+zvqsOY DcM2SNQDZ9wqOi8RQRS9w5G4BIRG+V2Ecyywq95STgIUv5radEL5PVLb8mpu0v9UQiofy5 IdIyXmQi552nQhQgKp1lVOV/L73HugWjfnHQIKRutc0WlovC/yHZdLT4fRYbXnFyoWD1tq 8nISo0lTlJZr60N3vUwTAH3YI5g8aLP8F9eODt8bKX5vCsRGuot8lVrc1wC5tt+Ot1u8dK 6nvZHoQLhS+El7hB+uLzaqcdY8HD505aJFKkT+6W9IXPeZgSLEmjuE/XCUD8BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B1YVRPEOD7f2nZF9kxb8c8yuuM1OKJV1UO00Nf24Nv4=; b=o9QkSk3KRXtfxaMj4p7Wcu/vyMyDdUTTgqUWX4dtwD07ieuIN+54WCLZJzYIN8iz4RBJJ3 etX47EzLZkuhEkk526Islm1s/X5YS+YOmFoEaK62auEyHkS/VReSFniXXFFsoo0iMQLPiw F7LcHgdHkcS+ObtLzHK3kxBdMQKtODZMzJLwbLSjxsk30gF3YxofA9wRWytiHjVH4X0dra 30EwkT5JMbxkdRXESljwVDm2YKNlFoTliZpH9KhO2EZVL/JR9Bf+7UxGuASc8qpGd4350o u1ufW0ZldxrJ15E8Df3tEYpIO9oxv/zl8RAbdGNoLqHsqNIv4M/zSNDRvYLHbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxLrv3MsXz1BSr for ; Thu, 16 Apr 2026 15:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:04:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: d78de8bb7966 - stable/15 - Xen: Detect Extended Destination ID support 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d78de8bb79667b97262e6b580865041e51db6204 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:04:31 +0000 Message-Id: <69e0fa7f.1a5f3.3312478a@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d78de8bb79667b97262e6b580865041e51db6204 commit d78de8bb79667b97262e6b580865041e51db6204 Author: Colin Percival AuthorDate: 2026-02-22 04:09:00 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:03:59 +0000 Xen: Detect Extended Destination ID support Xen advertises support for the Extended Destination ID standard via bit 5 (aka XEN_HVM_CPUID_EXT_DEST_ID) of the value returned in the EAX register when Xen features are queried via CPUID. MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55429 (cherry picked from commit 9b18ba2c16a0750e6c78f348845368284ef1a704) --- sys/x86/x86/local_apic.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index ea5b14d92262..9bdf343886da 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -73,6 +73,7 @@ #include #include #include +#include #ifdef DDB #include @@ -2081,6 +2082,11 @@ detect_extended_dest_id(void) /* Check if we support extended destination IDs. */ switch (vm_guest) { + case VM_GUEST_XEN: + cpuid_count(hv_base + 4, 0, regs); + if (regs[0] & XEN_HVM_CPUID_EXT_DEST_ID) + apic_ext_dest_id = 1; + break; case VM_GUEST_KVM: kvm_cpuid_get_features(regs); if (regs[0] & KVM_FEATURE_MSI_EXT_DEST_ID) From nobody Thu Apr 16 15:04:32 2026 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 4fxLrx3tLsz6Zp7v for ; Thu, 16 Apr 2026 15:04: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxLrw4YK6z4J33 for ; Thu, 16 Apr 2026 15:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=22NhhYdK59KFr9Ni4uy8X2dK2DdGjNnjFkjSvll5leU=; b=TcpfM35/AVtpWf3ovLFSnVo056Dvf4rf0+tNrHxzMnuogLYqgGPsF0Nx9TttJUNUPWKR8L v6D6PtQFY2Rza9cUyfLBcrYl9e8igaugxjKN9kIInUR5s3xHIw5z9EpXJUvmPx5mIwfEDr gS5EI7wT+iBUL0urUN4te1jdRb+nxxNs9bVIxaitkUXtvEBQH3ylxaaMUWqrtLe8yDCpER 5/Z+MJLyrXGq30kvH3e14m89ikfCqq1AzyTrvxAwcRaWYie7nR/GkNStJY+v/hyaUdNJ24 fDaxbjlOLxsQXCU0PIQNYogcWT3mDYOS8k6JcDBGwjbu7mltcspwguNmspEmsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776351872; a=rsa-sha256; cv=none; b=Dz5GHlk1pfv3jFW+GTDebmU76gG9Zyc91gUWr4TCVXISoC52iX0a7GTCSVo1tiNL5qXW9Q C8Zncw1Z+MxdFcUnAiIKnBWA5ZZq/PHOv1oZPf5yCm2Axwovb00zt57s+Gch833r0Fvu94 iPQ3mLoRQ3KDimAvzdY+zSP0hhcXEFuuKCSCt+gn/R+EZcVh4rbHBM5ZLwTZCavk9zt9Np QeRq51tWQZq1BzCQ8bfc9Txx+m0fxP1XYW64PeJAJTQmH6Iv1zbSE20XNzz9gMFE8Nz2dd UnuK+bKHq2qp3sDvUdVoJU4PxmSbpr5km6GGkRaENDv92yqoFzgV/yHwD4vaww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=22NhhYdK59KFr9Ni4uy8X2dK2DdGjNnjFkjSvll5leU=; b=lCCNgypemjRPwPp9cO0Pug4/Y83GrfXGOeBOYDADbWPi2mxM20ykcGW1t7ePIqxBl+E2iU Kh274WBM4wBTpwX3TT6mStJs8zPdHumIJu2qmXUWxUecxyfR4RPLz4sEgZxyi3OAd0ZZKk j/UtulXQi/5T6Zcrk90pv+roaBVcztfMBTwpHOUmThtwzWp1XzSIgHJ1CoKlOmcalmRNWx jY9CIvlTl01U87pIgEwFgmQf+xYURMAIYpYzpw7QYt4Qh21sAS1lc8F0q9/SJuV3WSvS2J FlWm1p2J0XKW/q//lOqnbZnayQI4V32Gj5BUAI6V4AhJLt9GrgGXx7/r1iLH3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxLrw43hSz1BwT for ; Thu, 16 Apr 2026 15:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c95f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:04:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 7d44ef361055 - stable/15 - vmm: Move defines from x86.c to x86/bhyve.h 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7d44ef361055cf235152104711f1d0d3ca27d77a Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:04:32 +0000 Message-Id: <69e0fa80.1c95f.2f48d88d@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7d44ef361055cf235152104711f1d0d3ca27d77a commit 7d44ef361055cf235152104711f1d0d3ca27d77a Author: Colin Percival AuthorDate: 2026-02-22 04:09:00 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:03:59 +0000 vmm: Move defines from x86.c to x86/bhyve.h The values CPUID_BHYVE_FEATURES and CPUID_BHYVE_FEAT_EXT_DEST_ID are useful for guests, not just hosts; so they belong in a header file in sys/x86/include rather than simply in the .c file implementing the bhyve host side. The original addition of these defines took place without adding a copyright statement, but since I'm moving them into a new file I've added the original author's standard copyright (Amazon). MFC after: 3 weeks Fixes: 313a68ea20b4 ("bhyve: Add CPUID_BHYVE_FEATURES leaf") Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55430 (cherry picked from commit 49b6254b3e09ee741f456617111ecb18803459fb) --- sys/amd64/vmm/x86.c | 5 +---- sys/x86/include/bhyve.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c index f32107124eb8..6794110f067a 100644 --- a/sys/amd64/vmm/x86.c +++ b/sys/amd64/vmm/x86.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -50,12 +51,8 @@ static SYSCTL_NODE(_hw_vmm, OID_AUTO, topology, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, NULL); #define CPUID_VM_SIGNATURE 0x40000000 -#define CPUID_BHYVE_FEATURES 0x40000001 #define CPUID_VM_HIGH CPUID_BHYVE_FEATURES -/* Features advertised in CPUID_BHYVE_FEATURES %eax */ -#define CPUID_BHYVE_FEAT_EXT_DEST_ID (1UL << 0) /* MSI Extended Dest ID */ - static const char bhyve_id[12] = "bhyve bhyve "; static uint64_t bhyve_xcpuids; diff --git a/sys/x86/include/bhyve.h b/sys/x86/include/bhyve.h new file mode 100644 index 000000000000..215bee90bd1a --- /dev/null +++ b/sys/x86/include/bhyve.h @@ -0,0 +1,35 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright © 2025 Amazon.com, Inc. or its affiliates. + * + * 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. + */ + +#ifndef _X86_BHYVE_H_ +#define _X86_BHYVE_H_ + +/* Bhyve feature detection */ +#define CPUID_BHYVE_FEATURES 0x40000001 +#define CPUID_BHYVE_FEAT_EXT_DEST_ID (1UL << 0) /* MSI Extended Dest ID */ + +#endif From nobody Thu Apr 16 15:04:33 2026 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 4fxLry2MNnz6ZpBQ for ; Thu, 16 Apr 2026 15:04: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxLrx5JQ6z4JGh for ; Thu, 16 Apr 2026 15:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NpX2n9FxI3KDgT2RAuGYGOhLGvxIVxK/yBwM/bS/J0U=; b=fJMXZkb+Y/LcW2zbJE/fInBVfjroz2Z/+/2YnVAvfK1zgwxTKSgf726Ve6hey4CTb06Twv isFc2SOBGzKjE7saVFLE7eqZgYmd6UHu0uf/zkyPw+EaM11jWoGaYvUDp5Pg/T+Ef02nca dfrXd7SDCSJbcu1PQr/MRrh9pQeCXeKiGfTkelnMr0k3JxpRmeFGboJrv9XJthlrv9fTeg Wo4URCG4sWvAETC8bAGl9clZcep9+/O4m3MRHvPmBNK8+LSJS5KfkRgDkCrCq9eOSOEGgL D/+tA/ZAoLKKhLpnwMcZuvzymyOESAS8d2c7JL4GwtcElWVUQIZuSrNVUEC53A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776351873; a=rsa-sha256; cv=none; b=OJ+s6NEiboD/Atz0IrBycNqeh7DNvICBH5Sqr75sTtRI1sd/otXm5adkNgXGe76K286jeM Jsw6qncW7nrWs6FQbsg+paxWlOT07nKWcLpaWnGMMVhI6k1FuUsH4E2wnmp+wpaj7O1bDi 3RutE0EcLR5p4MCeG+NxlAkwAOZxXI44uBpuQPgRgEhDpSf9n3DeEkjZu1ADGXICjPTamk PXBMzdb4Er0/VCP8PS3MNc2ZAtQcn78HYzOiacCWCjLAhiX8tIZUmGbeFdXJ27+qHzrM92 tHFw/9qLlCIjxxWZHt8+rFxyxOujsA6UDe/jRWMLzeJIeUIl0eMrjqTyEH7VNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NpX2n9FxI3KDgT2RAuGYGOhLGvxIVxK/yBwM/bS/J0U=; b=qEg6HQxou+HX6ZiZM1/SVK14SzkkHF+BOQlC/+tJvwO0C9DRQQz8FdC+XzQGR5HnATd8O5 UdeKdEs+IEYgLmNkIMdiBfJiRynl33UJp+qhAZTZZ4EVy+/ssezW1JOhzaPp8GRqhQVUY8 PLyikK/X/kdWvfUlsm2X+mwCxgzMLN6hGvnWLYdJs21SBshsZnYysSMzLg6v72eo6BDk3L PmJKGrKUD4I6APbsSbdLRDkuqJo1JWsMTmKz0VCXaAye5ZPcdUTZI1v82kmE4O5p0FCY/B HIRHkUn8PQ7FmeFrR6hEggZ7v2b7p5kGT9aGhibHXcR0yka9bWJpmlaxuFGxtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxLrx4mySz1BxW for ; Thu, 16 Apr 2026 15:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cb54 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:04:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: d2c7300800d0 - stable/15 - Bhyve: Detect Extended Destination ID support 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d2c7300800d01fb52c5280a746652cba34fe354a Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:04:33 +0000 Message-Id: <69e0fa81.1cb54.79e76e09@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d2c7300800d01fb52c5280a746652cba34fe354a commit d2c7300800d01fb52c5280a746652cba34fe354a Author: Colin Percival AuthorDate: 2026-02-22 04:09:00 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:04:00 +0000 Bhyve: Detect Extended Destination ID support Bhyve advertises support for the Extended Destination ID standard via bit 0 (aka CPUID_BHYVE_FEAT_EXT_DEST_ID) of the value returned in the EAX register when Bhyve features are queried via CPUID. MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55431 (cherry picked from commit 8dd9a0d52175fbc5dafed851fb95a289a94fb6cd) --- sys/x86/x86/local_apic.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 9bdf343886da..922809b38d78 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -74,6 +74,7 @@ #include #include #include +#include #ifdef DDB #include @@ -2092,6 +2093,13 @@ detect_extended_dest_id(void) if (regs[0] & KVM_FEATURE_MSI_EXT_DEST_ID) apic_ext_dest_id = 1; break; + case VM_GUEST_BHYVE: + if (hv_high < CPUID_BHYVE_FEATURES) + break; + cpuid_count(CPUID_BHYVE_FEATURES, 0, regs); + if (regs[0] & CPUID_BHYVE_FEAT_EXT_DEST_ID) + apic_ext_dest_id = 1; + break; } } From nobody Thu Apr 16 15:04:34 2026 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 4fxLrz1NbDz6ZnpT for ; Thu, 16 Apr 2026 15:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxLry5sP2z4JDY for ; Thu, 16 Apr 2026 15:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0fKsLqIlO4UlRW591QuWid/EXD1t/zkydiCtlcm64Y8=; b=hzgvm7ny5qz4JOr9VXOaAgor0tkJaIyAurTeQHBTNwwiUcH5ssIUoYjO28lvu7FqjGHr4F WfuwHJuqOLW2ONuCicblT9/CBvyzZh8a6zv3zITRoJzifAzYs60Wi8IsD3xuaEl+C6yxjP xqVLqmjQTY01MYhfJCXRQVWqmXMX1oqaZFYBxYAuC5OcElyG6uwy1DTmVJUI/4GQ+HEwDC UrFl+2BdesU/CUsyDEQ3xfmAxlZEf9lHKR/ocB1sjxE+0oGwCWBHrSV5piFEs8MEiJ5F3g 8dqNGch/+CPpvknT+u74Ipr3Xdp63yWSBdIUbdWJZyGvqmrTNIlUJzq0QKmGXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776351874; a=rsa-sha256; cv=none; b=srWEzQflo3BHD+egTucPYNlftrNuKLF+vcpugiVqvE894p3n9xdSpxoG6vR19CxH/ZL6kx T6T87OkI3JrFNyuciennfdVOgQbGQX40j+RnUeYD6yVJ7Bg0wa2UVTeruHm1vQOwNrhAl7 DA2RwxNu/PdV+Hy4TsemaSvBdlZOl11RwVG6+7eZDCQ+seOMF8nIR1QZqd3ewTuQK0LbZh eSsaMhD+RgpUVQhK3dx1B1KfgMF8Tn1p5U/McaNI433vzBrePiQ3R4phkw2sfTRK0gav+z GG0WFC0XRth5d/RrGgmetXc/F9iZ7QqnmNSW1v6bC0hrY5F6eVtRFXLLwwT1Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776351874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0fKsLqIlO4UlRW591QuWid/EXD1t/zkydiCtlcm64Y8=; b=s97rsCzfy4KiCJX5b2L6/wj6eyyIhuVDpAw0YG5YmipYr8LLIfM26QgHmm3ee9C4FNxd/x ZJrEajO81zD2iCt2GGDS+jQwlasAixWuPEbAeYwLAzsLTg7QjID9BrwMMk2qJqeaWEh9qG pDk/odqzHLXzxS+vWGimjXojO9Yuqw+w4AFMEXVZSgsvuqA25KWl/9p1XE5v6dNMworPgG oTbIM8K65fByhLRrG9Mr86gitQaYFiZPzyy9tvmJnB1F+lKqC55uSQxmA0No0dLLUC8LVz eNPV9zi8n2CtYnf6NWW70rFTK3XRS0ZYye1JFEGef9UgBz9HXWRbzDwELtTH0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxLry5Pw3z1BB8 for ; Thu, 16 Apr 2026 15:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d033 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:04:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c7d6c74fb89b - stable/15 - Hyper-V: Detect Extended Destination ID support 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c7d6c74fb89bf04c541ca1144d3c78392d1603b6 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:04:34 +0000 Message-Id: <69e0fa82.1d033.75e58b57@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c7d6c74fb89bf04c541ca1144d3c78392d1603b6 commit c7d6c74fb89bf04c541ca1144d3c78392d1603b6 Author: Colin Percival AuthorDate: 2026-02-22 04:09:01 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:04:00 +0000 Hyper-V: Detect Extended Destination ID support Hyper-V advertises support for the Extended Destination ID standard via bit 2 of the value returned in the EAX register when the hypervisor stack properties are queried via CPUID. This is based on a commit to the Linux kernel, as there does not seem to be any other documentation of this feature. Reviewed by: Souradeep Chakrabarti MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55432 (cherry picked from commit 7b6be0014a4eb81943491122bae70914b7fd82b6) --- sys/dev/hyperv/vmbus/x86/hyperv_reg.h | 6 ++++++ sys/x86/x86/local_apic.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/sys/dev/hyperv/vmbus/x86/hyperv_reg.h b/sys/dev/hyperv/vmbus/x86/hyperv_reg.h index 0597a1fea953..e7560d00f25e 100644 --- a/sys/dev/hyperv/vmbus/x86/hyperv_reg.h +++ b/sys/dev/hyperv/vmbus/x86/hyperv_reg.h @@ -45,4 +45,10 @@ #define CPUID_LEAF_HV_IDENTITY 0x40000002 #define CPUID_LEAF_HV_FEATURES 0x40000003 #define CPUID_LEAF_HV_RECOMMENDS 0x40000004 + +#define CPUID_LEAF_HV_STACK_INTERFACE 0x40000081 +#define HYPERV_STACK_INTERFACE_EAX_SIG 0x31235356 /* "VS#1" */ +#define CPUID_LEAF_HV_STACK_PROPERTIES 0x40000082 +#define HYPERV_PROPERTIES_EXT_DEST_ID 0x00000004 + #endif /* !_HYPERV_REG_H_ */ diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 922809b38d78..c7a967067e0d 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -75,6 +75,7 @@ #include #include #include +#include #ifdef DDB #include @@ -2088,6 +2089,14 @@ detect_extended_dest_id(void) if (regs[0] & XEN_HVM_CPUID_EXT_DEST_ID) apic_ext_dest_id = 1; break; + case VM_GUEST_HV: + cpuid_count(CPUID_LEAF_HV_STACK_INTERFACE, 0, regs); + if (regs[0] != HYPERV_STACK_INTERFACE_EAX_SIG) + break; + cpuid_count(CPUID_LEAF_HV_STACK_PROPERTIES, 0, regs); + if (regs[0] & HYPERV_PROPERTIES_EXT_DEST_ID) + apic_ext_dest_id = 1; + break; case VM_GUEST_KVM: kvm_cpuid_get_features(regs); if (regs[0] & KVM_FEATURE_MSI_EXT_DEST_ID) From nobody Thu Apr 16 15:12:14 2026 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 4fxM1p6cxkz6Zpr9 for ; Thu, 16 Apr 2026 15:12: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM1p48dkz4NCR for ; Thu, 16 Apr 2026 15:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=70+ZJqPXZeknOWMFx7FPA804NSu6gqorTzMxFKqpBIk=; b=jFeMJPIexi40syJjpQXK0MVe3mhZWtlCwyZAeDlDy/uNchncxMvN1237Uouxd1ycJgJP2J apwJN+VKUA0ONmU1F8F6xhQ6TSR6b2R+2EwzWB7uWPcKOTRq4FlJphq4ZsEJrAg/RaHDnK 5ETEHZWyzqH6a9+AX8XvoJjfMWWWRvO4tjMpBg7qhLyKuKwcRuh16+aw0feT8AdIBvwBWB JNW5EcelyMDYbI7OsD6JleJ0ja2/93hqAV3PAgYSt3KvPtrmI3FpVibAND9Jb/ZWvLQ0+g xnmsga1ja06HbCV+UDVviUjBJlP3cjB4u+Qi2NU9jBIKSJktw6uMBVaXqBYolg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352334; a=rsa-sha256; cv=none; b=con09Nel0CbQRMgoMCw89YJrdfea8A+4dyCXXfBOscVkFct9vzC6DMtC8RnTxw8BcpWeU3 s/kztv02015wCt5XkSkOTXkXDB9A+j7uDwbqpmOUOaXLWhTi7qpc97ImHwVsbRnZ3F4bRS nSK3lE7pVYNwfM20oWanXnH5KJj3f5dTyxVS/PaUiZ5EAJRujAPSQwqiYsMQpFLcqf6RwA Y+QFV6+l8incuxkh8SjbMajp7lP9IPkf3+gMWr7MIWwtDIGgqpv6hLGOU2BSkrgll8fXQx 31O9eR4UQpQUTHmioIgImiLY71qyR3/yxoZgPwr9zjovjvDtp8/jrCy6/hyekA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=70+ZJqPXZeknOWMFx7FPA804NSu6gqorTzMxFKqpBIk=; b=gi++BmDgcOLh9Uyna/Th68gEvXMTTK8bEdH0xVy4F9wFlS5oS6PKrxpToc++yaQM74IGQK dp3/hnjN12CGeGS/FoQ4p43PxUWl6bDNVVXeRR59ItuLcB4r3pvxI0AnzO5EcwpHny3j81 ndzqTBhsl1/z/RGfgjWgGFaulifsyjEMBvUEuqq9l1k1P8ZUZOlKoe7xy2CWahuaalriOq q9kfqs08C1lDlYqb9tg4pchD9tDOhm0ZFT/DIKPf35zfePuYo8jj6xzQSXB5+gqajvilut QvHPU3F9dODN667I3gNHstQHlySIyR3f7WbOKhkCV3kq0bBO22k05te8kGU+TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM1p2vGjz1C7v for ; Thu, 16 Apr 2026 15:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c6f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: David Woodhouse From: Colin Percival Subject: git: 020a2480f553 - stable/14 - bhyve: Add CPUID_BHYVE_FEATURES leaf 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 020a2480f55303f757e9683d05213ae3266e7831 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:14 +0000 Message-Id: <69e0fc4e.1c6f7.1a36b66e@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=020a2480f55303f757e9683d05213ae3266e7831 commit 020a2480f55303f757e9683d05213ae3266e7831 Author: David Woodhouse AuthorDate: 2025-08-11 10:44:05 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:41 +0000 bhyve: Add CPUID_BHYVE_FEATURES leaf This allows the hypervisor to advertise features to the guest. The first such feature is CPUID_BHYVE_EXT_DEST_ID which advertises that 15 bits of target APIC ID are available in MSI (and I/O APIC) interrupts, as documented in http://david.woodhou.se/ExtDestId.pdf This defines the guest ABI. The actual implementation will come in a subsequent commit. Reviewed by: kib Pull Request: https://github.com/freebsd/freebsd-src/pull/1797 Signed-off-by: David Woodhouse (cherry picked from commit 313a68ea20b48629f655cf38987f4a6ff822f1ab) --- sys/amd64/vmm/x86.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c index 744e2bfd57db..eea334562784 100644 --- a/sys/amd64/vmm/x86.c +++ b/sys/amd64/vmm/x86.c @@ -49,7 +49,12 @@ SYSCTL_DECL(_hw_vmm); static SYSCTL_NODE(_hw_vmm, OID_AUTO, topology, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, NULL); -#define CPUID_VM_HIGH 0x40000000 +#define CPUID_VM_SIGNATURE 0x40000000 +#define CPUID_BHYVE_FEATURES 0x40000001 +#define CPUID_VM_HIGH CPUID_BHYVE_FEATURES + +/* Features advertised in CPUID_BHYVE_FEATURES %eax */ +#define CPUID_BHYVE_FEAT_EXT_DEST_ID (1UL << 0) /* MSI Extended Dest ID */ static const char bhyve_id[12] = "bhyve bhyve "; @@ -102,7 +107,7 @@ x86_emulate_cpuid(struct vcpu *vcpu, uint64_t *rax, uint64_t *rbx, if (cpu_exthigh != 0 && func >= 0x80000000) { if (func > cpu_exthigh) func = cpu_exthigh; - } else if (func >= 0x40000000) { + } else if (func >= CPUID_VM_SIGNATURE) { if (func > CPUID_VM_HIGH) func = CPUID_VM_HIGH; } else if (func > cpu_high) { @@ -603,13 +608,20 @@ x86_emulate_cpuid(struct vcpu *vcpu, uint64_t *rax, uint64_t *rbx, regs[3] = 0; break; - case 0x40000000: + case CPUID_VM_SIGNATURE: regs[0] = CPUID_VM_HIGH; bcopy(bhyve_id, ®s[1], 4); bcopy(bhyve_id + 4, ®s[2], 4); bcopy(bhyve_id + 8, ®s[3], 4); break; + case CPUID_BHYVE_FEATURES: + regs[0] = 0; /* No features to advertise yet */ + regs[1] = 0; + regs[2] = 0; + regs[3] = 0; + break; + default: default_leaf: /* From nobody Thu Apr 16 15:12:15 2026 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 4fxM1r2Rq5z6Zpt9 for ; Thu, 16 Apr 2026 15:12: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM1q4c8tz4MnV for ; Thu, 16 Apr 2026 15:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mpuWHL8pijT8LluR3ITrfdb2DUfqFzrvF3o1PubNtDQ=; b=Zcc+vl/8n6PhLqIvfEbCNHTlJJ5bT4mZhQnfORT+VO/JtgjBFaFSwbSZTJ7Ignu1QKSvPm J2G+LeKMnhKXSUc6iVzCvYh/wSv28/lMkwRc3aI2Gss1PeQcVqV4E5EGHQ68/gd8JQhVSg b/No522pzomNH3AlvRJBz0gdYOS/vEwjElgB2S/uwNlLP5slqWP4RzrPfAcmFw8wwvN4uY PD0u+3hkX5D5YWNq1j/rKTYj8YDQnBsLTZEUiaSlf1k7ewSr7TtmVFLb5a4j+BjzKXGyts nVSr4DJErziTy3q/LzC5uZdgKWXFtFoA2V37aM7uD1LhlBqR8AcVxvmMAh8vvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352335; a=rsa-sha256; cv=none; b=GAyyd+tOJSKjfBGi46aAUYxRVp1PrQjZWqesaVoVkg8Cl4HzEbZZPhOMiPssw3kjm6THPj HQ6IPgiau559/iM4TMBKFK/xOGvMX+1zR8mTKT3rUFugmQjt3tYJXSgwlL4dp1HyCmqPk8 PBFfSkBGbnKGBN6nwUZD1Dwyki4RLmW/TNf0kWHwNO39ie7WerT50yS6Brqb7zl2ajM36g UzseNVQwbMtyZ5qbOlcfFc99KPlHNAMzuk7KPaUsEMzhDh9ga3yo9nMLFjZkJB35DobxE4 /OS3udfE3+a/bXFyr3NTkcuMoa4+MifVrxaq9trnsWOJCC5QcntPwAFiEDLvWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mpuWHL8pijT8LluR3ITrfdb2DUfqFzrvF3o1PubNtDQ=; b=gSgiwpZaywPxosSG0g2ZmiIeQzWwD+MbPqA5wIgkXm9WbefC8Bt80jdbc0HS1BbbmXRxbT NUfYX0o0uEFK1IFpS1koyPt01GKMEvb1grBjbGp1mGJIA+XsC2rUGY7iRaTMJjOXkx2KyJ LQYvMixEYZLdpIfCtoO2vDNLO48q5sE09Iz3RO1KOuLjzh+P2QlOZ1zGTN1P/nt+glr+Jf zXIbunEeMApcHu4zVaXS2POaWB+aetZnXiETt672tSPKSBYMNQqzyM3hetOFOCagX3wLqE iwz0oKuuUY7/ji/RQ+DwTnyAKxorkaG2CJLXYN111ByP3xyLiPzUeThEJKYs+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM1q3jl2z1C7w for ; Thu, 16 Apr 2026 15:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1dfcf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: David Woodhouse From: Colin Percival Subject: git: e77e112a3e20 - stable/14 - bhyve: Support and advertise 15-bit MSI Extended Destination ID 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e77e112a3e2084918befee20645e6dcc81dea07b Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:15 +0000 Message-Id: <69e0fc4f.1dfcf.5969c047@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e77e112a3e2084918befee20645e6dcc81dea07b commit e77e112a3e2084918befee20645e6dcc81dea07b Author: David Woodhouse AuthorDate: 2025-07-31 07:33:54 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:41 +0000 bhyve: Support and advertise 15-bit MSI Extended Destination ID To support guests with more than 255 vCPUs, allow bits 5-11 of the MSI address to be used as additional destination ID bits. This is compatible with Hyper-V, KVM and Xen's implementation of the same enlightenment, as documented at http://david.woodhou.se/ExtDestId.pdf Reviewed by: kib Pull Request: https://github.com/freebsd/freebsd-src/pull/1797 Signed-off-by: David Woodhouse (cherry picked from commit 4322d597453d63d638675b8612d7aaabd65dcadd) --- sys/amd64/vmm/io/vioapic.c | 9 +++++++++ sys/amd64/vmm/vmm_lapic.c | 5 +++++ sys/amd64/vmm/x86.c | 2 +- sys/x86/include/apicreg.h | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/sys/amd64/vmm/io/vioapic.c b/sys/amd64/vmm/io/vioapic.c index e1503b6a699b..539cd41478c3 100644 --- a/sys/amd64/vmm/io/vioapic.c +++ b/sys/amd64/vmm/io/vioapic.c @@ -129,6 +129,15 @@ vioapic_send_intr(struct vioapic *vioapic, int pin) vector = low & IOART_INTVEC; dest = high >> APIC_ID_SHIFT; + /* + * Ideally we'd just call lapic_intr_msi() here with the + * constructed MSI instead of interpreting it for ourselves. + * But until/unless we support emulated IOMMUs with interrupt + * remapping, interpretation is simple. We just need to mask + * in the Extended Destination ID bits for the 15-bit + * enlightenment (http://david.woodhou.se/ExtDestId.pdf) + */ + dest |= ((high & APIC_EXT_ID_MASK) >> APIC_EXT_ID_SHIFT) << 8; vlapic_deliver_intr(vioapic->vm, level, dest, phys, delmode, vector); } diff --git a/sys/amd64/vmm/vmm_lapic.c b/sys/amd64/vmm/vmm_lapic.c index c4217bd00792..2fc927a4f7aa 100644 --- a/sys/amd64/vmm/vmm_lapic.c +++ b/sys/amd64/vmm/vmm_lapic.c @@ -115,6 +115,11 @@ lapic_intr_msi(struct vm *vm, uint64_t addr, uint64_t msg) * physical otherwise. */ dest = (addr >> 12) & 0xff; + /* + * Extended Destination ID support uses bits 5-11 of the address: + * http://david.woodhou.se/ExtDestId.pdf + */ + dest |= ((addr >> 5) & 0x7f) << 8; phys = ((addr & (MSI_X86_ADDR_RH | MSI_X86_ADDR_LOG)) != (MSI_X86_ADDR_RH | MSI_X86_ADDR_LOG)); delmode = msg & APIC_DELMODE_MASK; diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c index eea334562784..8afd213e3824 100644 --- a/sys/amd64/vmm/x86.c +++ b/sys/amd64/vmm/x86.c @@ -616,7 +616,7 @@ x86_emulate_cpuid(struct vcpu *vcpu, uint64_t *rax, uint64_t *rbx, break; case CPUID_BHYVE_FEATURES: - regs[0] = 0; /* No features to advertise yet */ + regs[0] = CPUID_BHYVE_FEAT_EXT_DEST_ID; regs[1] = 0; regs[2] = 0; regs[3] = 0; diff --git a/sys/x86/include/apicreg.h b/sys/x86/include/apicreg.h index d610d7f11a1c..1252647fbab3 100644 --- a/sys/x86/include/apicreg.h +++ b/sys/x86/include/apicreg.h @@ -296,6 +296,8 @@ typedef struct IOAPIC ioapic_t; /* constants relating to APIC ID registers */ #define APIC_ID_MASK 0xff000000 #define APIC_ID_SHIFT 24 +#define APIC_EXT_ID_MASK 0x00fe0000 +#define APIC_EXT_ID_SHIFT 17 #define APIC_ID_CLUSTER 0xf0 #define APIC_ID_CLUSTER_ID 0x0f #define APIC_MAX_CLUSTER 0xe From nobody Thu Apr 16 15:12:16 2026 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 4fxM1s2nscz6ZprF for ; Thu, 16 Apr 2026 15:12: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM1r4tDVz4Mvf for ; Thu, 16 Apr 2026 15:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Jr5SfG2SrWFH46MKm9NfKbTe+KRsO/s3ZDuTWNJcLY=; b=tJ5JC4i6MEiLiKEigzfS1jdqIex7HJ3o/ZanyEE4TT7qk7CSqFcMIr/wyuLT9zCbuFA05i R8eWJj+TbrgpFq04BMG8aYzMfvjvwqkbPv1d9z81bajBqMM1608plsr6ZFirN9IWE/96qu kEPzkQnZOuqCb3acsqpaUm4Mb4MN8nbXJ+8r/o5WcdmNCohj4mESdecTTDaIzIr7GkexQR P4CSP4X23Ft6Ym6a8rdVZHtgIsvnk+WpTSrP/B1FFSsMzYX5llciL7rWC3ukFAWCiMiLiX QeHw00zFGk42cIpyR10/fozN4xvYHE2lagdwKs8NjxMhrmwyJ5iJyDe6ciYuDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352336; a=rsa-sha256; cv=none; b=Ocd9/MMjtvmsKCC3lESnKIvv3ycr9jutq82lan6YV39DRXCgFwnk2t5M5Gq//DDnJPONCz jkFXWURg0qwJN8ntVslG8D1X8mRBq4iZdlQYfHD3bXLNTxMTNvEiDjObJDKZOruoYNeo75 8uey7J3YDgoO8IHZb8zjydBjEJv49+ToFSBvYyqNYGzJNyvfTI++rAsxvDMg2qnNGL5tUQ LLY6eJlkpfzynfdGfOnl/eWJfu1EkQ++xULWvZQo16oecnglTEVW2k/HXyzwoWq1NZw4nj qjS3pKY4vPSlej4n8VbpOjTZpd+LXg8hTkr2NgdJSCvKa84CguanYlM5eUEHZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Jr5SfG2SrWFH46MKm9NfKbTe+KRsO/s3ZDuTWNJcLY=; b=U6FlA1koqOxiX3QgV7qxm3ASEoIg+Yt/zuYHYqZdCLKPYafTVyPiDlYmcwxR3n1zXOhSvS eVANLpUMVsoxTOQ6a0vAThD1NuRXQ1E/X8cfh6yspMrvwjRQfYd8AYYEwTsEW0pQHsofKh b7kx7AxvVhnR70DIBnLtEscuspQ7kT2dR9v5HhutL6ASvlu1wOmNfx/4gR/tBGBcwK+Mtz PXEzaK3ZOlSk2eJYkF596PQd71H/flqHDGvVC5YKENP76U1/xwHZ5l1fKSjHideullsYO8 vQRcxZ3sJ/p7Fmc8ad20coihoITGcT2XtnyTADyccSF8ltj9DJpyDMRvX2MEyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM1r4Tj8z1BmF for ; Thu, 16 Apr 2026 15:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eeb8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: a25f78eafe47 - stable/14 - clapic_handle_intr: KASSERT isrc != NULL 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a25f78eafe472cb161d1405f63ad8c4491416a6b Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:16 +0000 Message-Id: <69e0fc50.1eeb8.36b2d901@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a25f78eafe472cb161d1405f63ad8c4491416a6b commit a25f78eafe472cb161d1405f63ad8c4491416a6b Author: Colin Percival AuthorDate: 2026-03-14 01:03:44 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:54 +0000 clapic_handle_intr: KASSERT isrc != NULL If an interrupt arrives at a CPU which isn't expecting that particular vector, intr_lookup_source will return an isrc of NULL and we'll panic when intr_execute_handlers increments *isrc->is_count. Place a KASSERT a few nanoseconds earlier in order to leave some more breadcrumbs for the next person to trip over this behaviour. Tested on: EC2 r8i.96xlarge MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55851 (cherry picked from commit f350063a251c9da0c5ce437eb4c44a2d716b673e) --- sys/x86/x86/local_apic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index bf05855439bc..2efa0b9b5c1d 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -1287,6 +1287,9 @@ lapic_handle_intr(int vector, struct trapframe *frame) isrc = intr_lookup_source(apic_idt_to_irq(PCPU_GET(apic_id), vector)); + KASSERT(isrc != NULL, + ("lapic_handle_intr: vector %d unrecognized at lapic %u", + vector, PCPU_GET(apic_id))); intr_execute_handlers(isrc, frame); } From nobody Thu Apr 16 15:12:17 2026 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 4fxM1t1hq7z6ZprG for ; Thu, 16 Apr 2026 15:12: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM1s69LPz4My2 for ; Thu, 16 Apr 2026 15:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MphIP0PAi1CXMfndd5levI+PtD8ZNJsqT5rmz1N6+gw=; b=VJd0/fjit6if0Pu/wLse6oypD7z9HkVTx2d6etIWut7SZIMGKDp6zkWYkbBz4JWS6o+/LK rZSWnhEOZWlwID0pzWrMvm6Mt9vREa+Rymlk+PURj3wRYztgpHHb8afXgO/Cx63feAOayh Ckp9d5138LHsYzT4H+9+5UAumq/Xmh4dGpa5gMM9PEh0H/yZgy7uVO9W7A+LZgASMJ+BN/ vI6pIdtmwxkqOKjl5pLZYV6wBxEbhqvX0jIEDfRW9O+z2Ss6oF9gdy+Z7nZK10MUV3W5R1 5leiSdUqxnaaktMed9gFcR8Ei35hsjuEyqt8Ed1w9fMQ1spwaoaQ/ijbmjj/tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352337; a=rsa-sha256; cv=none; b=ReXvxI+xNekjGO93L8hesSYMgyxV+oH0tSi7mBSpCnd/NMFaih4CJyy9gmu41mXkoyIRKy CWfnnUXqlpe/ccDHcAdQj8Nv91PHw5ITL6EA/fIt+8jG5oLdd6slw4NJv5ouJA7NP9fxnA Jf9nqXeAbKtTMo0L7irrWs3GoDTiLnBNFQoB6uXygR1rexxsHac4eik+EdJnLDSVohS4cN rbms2xWo2Gkrzjx2X27SsZfu7kXqWbzUKh2MRkdjCkDqVVFHag8R0aeGUnbuD/y9XtJSjs N7sA9upIT89M8j/ZpigFrW5hEfnyEg/IYX6lz+9/dxinmxFWM8Ja1/c3OmGCdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MphIP0PAi1CXMfndd5levI+PtD8ZNJsqT5rmz1N6+gw=; b=Zoq8BOD9IossQar9bEZvGkg6mnmwd2akhieUlVpHkN6lA7ZKCGDHOCgQli1D26UvPqqtfg B48KrGCHKChbM1s9EgzECDXAzIeytJbGtDRx4cCIxOBWQ6dNb+Qbl1qGn0fEMcs74HLvwf 6P5DAyEanS8jURq390YQqXBsV6qc5D7BtMwoOVmkxWhw4JFqkVdiyonBvcpOi7jPgFXJHP XMicopqA6SF70nyuGhTUKYPRN/GzF0XgWbP1JPz6p7EtWSrYtqvppjQL5U7OqRQVJJWG4r qt0WcYu7r/bIGnu32rLBinHXhpH75PzwuHnaa8uNjR67+H1WhrI8LFWNAuDHMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM1s5HZgz1ByL for ; Thu, 16 Apr 2026 15:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e98f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b75a566d1fa8 - stable/14 - x86: Add struct ioapic_intsrc.io_valid 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b75a566d1fa800d8307a7faa50ec22c2a93145bf Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:17 +0000 Message-Id: <69e0fc51.1e98f.7a384c40@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b75a566d1fa800d8307a7faa50ec22c2a93145bf commit b75a566d1fa800d8307a7faa50ec22c2a93145bf Author: Colin Percival AuthorDate: 2026-03-20 22:02:29 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:54 +0000 x86: Add struct ioapic_intsrc.io_valid As of this commit, io_valid is always set to 1; but a future commit will set it to 0, at which point IOART_INTMSET will be set to forcibly disable interrupt sources regardless of whether they are requested to be "masked". Reviewed by: kib MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D56006 (cherry picked from commit 1d0ccd61563d48e914dccf3dd5cf0280d8331ec1) --- sys/x86/x86/io_apic.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index 525547f9482a..5dd1bfc3a068 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -85,6 +85,7 @@ struct ioapic_intsrc { u_int io_activehi:1; u_int io_edgetrigger:1; u_int io_masked:1; + u_int io_valid:1; int io_bus:4; uint32_t io_lowreg; u_int io_remap_cookie; @@ -193,7 +194,7 @@ _ioapic_eoi_source(struct intsrc *isrc, int locked) ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(src->io_intpin), low1); low1 = src->io_lowreg; - if (src->io_masked != 0) + if (src->io_masked != 0 || src->io_valid == 0) low1 |= IOART_INTMSET; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(src->io_intpin), low1); @@ -268,7 +269,9 @@ ioapic_enable_source(struct intsrc *isrc) mtx_lock_spin(&icu_lock); if (intpin->io_masked) { - flags = intpin->io_lowreg & ~IOART_INTMASK; + flags = intpin->io_lowreg; + if (intpin->io_valid) + flags &= ~IOART_INTMASK; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 0; @@ -375,7 +378,7 @@ ioapic_program_intpin(struct ioapic_intsrc *intpin) low |= IOART_INTAHI; else low |= IOART_INTALO; - if (intpin->io_masked) + if (intpin->io_masked || !intpin->io_valid) low |= IOART_INTMSET; switch (intpin->io_irq) { case IRQ_EXTINT: @@ -697,11 +700,13 @@ ioapic_create(vm_paddr_t addr, int32_t apic_id, int intbase) intpin->io_activehi = 1; intpin->io_edgetrigger = 1; intpin->io_masked = 1; + intpin->io_valid = 1; } else { intpin->io_bus = APIC_BUS_PCI; intpin->io_activehi = 0; intpin->io_edgetrigger = 0; intpin->io_masked = 1; + intpin->io_valid = 1; } /* @@ -806,6 +811,7 @@ ioapic_set_nmi(void *cookie, u_int pin) io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; io->io_pins[pin].io_irq = IRQ_NMI; io->io_pins[pin].io_masked = 0; + io->io_pins[pin].io_valid = 1; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; if (bootverbose) @@ -829,6 +835,7 @@ ioapic_set_smi(void *cookie, u_int pin) io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; io->io_pins[pin].io_irq = IRQ_SMI; io->io_pins[pin].io_masked = 0; + io->io_pins[pin].io_valid = 1; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; if (bootverbose) @@ -855,6 +862,7 @@ ioapic_set_extint(void *cookie, u_int pin) io->io_pins[pin].io_masked = 0; else io->io_pins[pin].io_masked = 1; + io->io_pins[pin].io_valid = 1; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; if (bootverbose) From nobody Thu Apr 16 15:12:18 2026 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 4fxM1v2SHfz6Zq3h for ; Thu, 16 Apr 2026 15:12: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM1t6v4Bz4N9H for ; Thu, 16 Apr 2026 15:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DZj/A9Lu242PJAZIderivQkhptGaR8K97tRzlzXn+tU=; b=PPe1fPLL2DoBSgNXACxNsAwzlCf/w13rolWefJs+8R4vmBKN8+twGkrfUIuWR75dkAE9Nd HuSWhUENaZT8g7IcwjOpE/6+Z+5keK84MdRJJW1Z92uB9C4hmIeWZjkI9GwKQtOu7Du6/z ZKjeNCxK5DaPl6oux2EOy844wzOIHLUm9TAHxNgPlJP2G8BqV2pQxI2/pwzlYx1BWvcF8r 5W5oitqrBZE+oKV3NmVoQPdbSg5wHJrEWj2p89v/gTg39LxWsOdIEsSEjELZAsQjGIaM0a 1G+6puj7UJCQv8lQKoGmK70EfZ+NxnqrLOrznaW7m6Er7YaXRBaLF5fK2icqyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352339; a=rsa-sha256; cv=none; b=FUlrLExQvgpp1QrRN1AHNGvKeBqX6aFKtQlpSTjZMpEcpYif26tKo6G/X87b2a8IE27GgU Hs1Drdez2s0m3TecYkdlJCX/Qjl036F2xC3GCrDMLeDCbaXwHfoRCZc3vt90X8huRtn+e1 w2eNN+Qv0y3H+L4nDmNTokP9NtJljubhZjIHC8EwfO7oM9JDgBNL6+iXnXF7t9IQJaKfD1 5qGp52poSOBaEgOJaSCTs8z6/PKgox3elSoBcQPAlQ6lxsP+vNpJKKqRqe1zWF6jf/83ib vHPyK03xaHf1XImXqtQsGi+ZMDZkwjQXsJU2F7B34qT20J1JL8SjxtpxBB4tyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DZj/A9Lu242PJAZIderivQkhptGaR8K97tRzlzXn+tU=; b=D3KJpl/q8Sso5JNwt6Jl54nUgCn98cIc2SNVY6KXOHbBlPrut9uA5vWcNBU3v7RKuLd7op au2viscH7gy9PEkHbXyVgRmTsYnzy5VckVLUJ2+uQd7SGj2OyHkHXqw1hamb60RwhGrHT3 2pXFVRGTbvAG169gNAEoYJOPIk+4jGwzhIGSk5ZaLeqHws1SsDh0meBE2dS8IqZ9Z2i7wk ivSaYTNhynm1SlrYMsfN1g7p9pqcZD1KLw99xUvOoDfR/0dIc5yEP3euXaACrhCY3JE8vs AOsiJoC8E9miQUvzPrlHg6XvEQ28f01LpJN6DhHoIBJ/uVUX7Xd6rpbutTzHDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM1t65H5z1ByM for ; Thu, 16 Apr 2026 15:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e993 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 693ee9fca3bf - stable/14 - io_apic: Don't route to APIC ID > 255 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 693ee9fca3bf915a2b82d3da751bcbeaf489094e Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:18 +0000 Message-Id: <69e0fc52.1e993.106bf908@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=693ee9fca3bf915a2b82d3da751bcbeaf489094e commit 693ee9fca3bf915a2b82d3da751bcbeaf489094e Author: Colin Percival AuthorDate: 2026-03-14 05:51:04 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:54 +0000 io_apic: Don't route to APIC ID > 255 I/O APIC Redirection Table Entries use 8 bits to encode the Destination ID. Attempting to route an IRQ to a higher APIC ID would result in it being silently routed to the value reduced modulo 256, causing a panic if the IRQ fired since the receiving CPU would not expect that IRQ. Instead, print a warning and mark the interrupt as invalid, resulting in it being forcibly masked. Reviewed by: kib Tested on: EC2 r8i.96xlarge MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55857 (cherry picked from commit 5809c9a77b2d3b83c056ba3ac5ba4e261c0af595) --- sys/x86/x86/io_apic.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index 5dd1bfc3a068..ae104beadf6a 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -364,10 +364,20 @@ ioapic_program_intpin(struct ioapic_intsrc *intpin) /* * Set the destination. Note that with Intel interrupt remapping, * the previously reserved bits 55:48 now have a purpose so ensure - * these are zero. + * these are zero. If the CPU number (in fact, APIC ID) is too + * large, mark the interrupt as invalid, and target CPU #0. */ - low = IOART_DESTPHY; - high = intpin->io_cpu << APIC_ID_SHIFT; + if (intpin->io_cpu <= IOAPIC_MAX_ID) { + low = IOART_DESTPHY; + high = intpin->io_cpu << APIC_ID_SHIFT; + intpin->io_valid = 1; + } else { + printf("%s: unsupported destination APIC ID %u for pin %u\n", + __func__, intpin->io_cpu, intpin->io_intpin); + low = IOART_DESTPHY; + high = 0 << APIC_ID_SHIFT; + intpin->io_valid = 0; + } /* Program the rest of the low word. */ if (intpin->io_edgetrigger) From nobody Thu Apr 16 15:12:21 2026 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 4fxM1x4fxdz6Zq6T for ; Thu, 16 Apr 2026 15:12: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM1x0lz9z4NCq for ; Thu, 16 Apr 2026 15:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kzL+6XjkkUz8nLw7c+4Hk51dAgGDV5HRs0d2opq1wRI=; b=qml3ORd8gllvESeWWLnmipTb0o7KbQxZhm5zRBhFE06cQG8q0zO7RuZmWZZTD7BkWWnHJ0 m7GkgZwYPIJfooOVDAzPqa19D+7U55TkjA3odhE9q7wor0rN/1hozwIQc/B8BUQ8FmxWwR kJK4wIaM4hotBTCasEha25rnz9n1dhS00hQ3SxpCQWB1wazgh035tz+iaNBeQ+SqDIBPMf zpu6C+vLQudu2hxxj7ACV0CgFwv4xpTxNWqcnG3o91uHgNGBrfbizT7dKqygCVYVOiWTb4 leMJhX4JXooVUWDiVKWGDxI8iTKM01V1sSBd2i0HvkXAg/sFhhcGuRWvRSI38Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352341; a=rsa-sha256; cv=none; b=TZPTR+8ypShE6FGPDAPYe4eFH68YrSk5+opzWhhUnwvQYYXcPKHbTNWksWwEQS/ondJOaT +FezJeGDXxeG991YUnmAD80TJj+RfvUrsLo3iqeEZAIehoDKJAYSdGljyNJQjNKGthuXsi iEK26HLqy99cB1RQG/pz8Jn1R2n8Ir8baTmsk3kYZa1pmQJppIj0PPyp3WHJBGCS1O7vCj JpRQDpHfnwpDo4RF+o2axM+DbDhMi+5Ziec3oK+1ZUg076f0mtv3IipVWNYwAQ9IZZ70bv V5pG9KxgWvHqNuT6JsodfWbOnWCF8QNe2SZT9hvTfMfGJz/9rTt15Yaikoagug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kzL+6XjkkUz8nLw7c+4Hk51dAgGDV5HRs0d2opq1wRI=; b=lUuBsahNxBaxAj0XIHzR/H6flwze7BpXY/4jmNNBsOAwwmQAbrCSBx7d8q/66PRT8Kwt30 e/NlFACQ9JhlKLep26ZsXGfZfZYOXWLEqvXmN4JA/Nva1R8ilYugW1FJgWnEYDnKaTUx2o Dul+c0VJzrcqP7PZL6ZSDPzqlTVVLfGS43gub70RPu4Jgv17SrKeorrHwjYctOFXBNV5KL BUUe4f5sManKySW0wLBOVPH5taoVnGzcwm5g4j55dx/aOkstezaLEysVo0nSjEkj8i58su W7Q1QEZMmLq6CG3ElILbLA3QEsqXxRMhHH6FA8srD+nthqsW/NZ0M/OXou/KsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM1x0Cydz1C4w for ; Thu, 16 Apr 2026 15:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1efc3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 3007e4a7dd49 - stable/14 - msi: Support APIC Extended Destination IDs 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3007e4a7dd495151df4ef87792f51572cbb52c6b Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:21 +0000 Message-Id: <69e0fc55.1efc3.520afc5a@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3007e4a7dd495151df4ef87792f51572cbb52c6b commit 3007e4a7dd495151df4ef87792f51572cbb52c6b Author: Colin Percival AuthorDate: 2026-02-22 04:08:59 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:54 +0000 msi: Support APIC Extended Destination IDs If APIC Extended Destination ID support is enabled, use it in MSIs by allowing APIC IDs up to 2^15 - 1 and encoding the high bits into Intel "reserved" bits per the standard. Tested on: EC2 r8i.96xlarge MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55426 (cherry picked from commit 02f29c1324cf5193c3aec181cb409917b541f7fe) --- sys/x86/x86/msi.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index 9d5a51f9753c..9ecdfca3e01b 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -92,6 +92,10 @@ #define INTEL_ADDR(msi) \ (MSI_INTEL_ADDR_BASE | (msi)->msi_cpu << 12 | \ MSI_INTEL_ADDR_RH_OFF | MSI_INTEL_ADDR_DM_PHYSICAL) +#define INTEL_ADDR_EXT(msi) \ + (MSI_INTEL_ADDR_BASE | ((msi)->msi_cpu & 0xff) << 12 | \ + ((msi)->msi_cpu & 0x7f00) >> 3 | \ + MSI_INTEL_ADDR_RH_OFF | MSI_INTEL_ADDR_DM_PHYSICAL) #define INTEL_DATA(msi) \ (MSI_INTEL_DATA_TRGREDG | MSI_INTEL_DATA_DELFIXED | (msi)->msi_vector) @@ -644,13 +648,16 @@ msi_map(int irq, uint64_t *addr, uint32_t *data) mtx_unlock(&msi_lock); error = EOPNOTSUPP; #endif - if (error == EOPNOTSUPP && msi->msi_cpu > 0xff) { + if (error == EOPNOTSUPP && + (msi->msi_cpu > 0x7fff || + (msi->msi_cpu > 0xff && apic_ext_dest_id != 1))) { printf("%s: unsupported destination APIC ID %u\n", __func__, msi->msi_cpu); error = EINVAL; } if (error == EOPNOTSUPP) { - *addr = INTEL_ADDR(msi); + *addr = (apic_ext_dest_id == 1) ? + INTEL_ADDR_EXT(msi) : INTEL_ADDR(msi); *data = INTEL_DATA(msi); error = 0; } From nobody Thu Apr 16 15:12:19 2026 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 4fxM1w3dZCz6Zpf7 for ; Thu, 16 Apr 2026 15:12: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM1w09qBz4NG2 for ; Thu, 16 Apr 2026 15:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TL/IAAQjef6Y42aAAF5scSeZD3KTN4Zsb2iUqgLQ6Rc=; b=ZngSz7RS41wnUBk5Pk4rpIcjO7tH6zUWjWowT19R8SpOZtkumVAg93GeIKUf7Mo5VptRLA /cRYTTFkpZLO8Cro0tA2+02SYiPvWtCPyK2NZN74WJKi4gnECogjM2xcSAJOFOVPMPHWZR I8RVlshCmacdT3nF/XJwbbxGQPZVlmMwuIKiPdOZ6r+TmUkLFOxrykJEQRbvh+vhKZc6d7 ra9oH+hfQvoU0jBJ+UfuB4weyRPwmybaWiA5xWVGRQpaDpeU3PP1wynS4ygScliFgx8Mwp iOplx5Nvwe/X9MFeFdHQxxDB1DNMYXsW2MD+GlWGxsarWbjqTIbyuB6tx3DYxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352340; a=rsa-sha256; cv=none; b=khDDb9p2o2tVjxDuKxiuK4jukeQ8/TfltpeB9PAypQLPhLWyaTQSEneN7Hy0hwmxq/QUh9 DAjGZ6dNmE7j5X7WQXNXVELsWJqZF6DAeQjwS10qnBRlk+dVIcvTE5bkrLLLdreqheiftL PyDNeSUmccJ3Pyvg/uDcvIcL1No/zignpzuVVRAtKkYCmLW1H4gWFFbe90qL7q0WgrzbSC eQrX9U5mQefBoqF6Si0XzHjtGx2OboUMYldBwWY0HHnaKlTTA7DPIZn1CzHxQxD+S1LhVT nsrAExOcVXBjvFzkKvqLUOPewXVtsdBnkhrMPyhYJRojsnAwws8AOnMyKanKWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TL/IAAQjef6Y42aAAF5scSeZD3KTN4Zsb2iUqgLQ6Rc=; b=CP3S3s48wVKZIAyUxTa/lYsTSw6aqTWwYAqzBpZp7LVqza2B2zDzCgZBLgSd+97wX0boi9 o/VwE/EqQbFgdEm88VSpqx2jhWRw0a3+p3WktPhcZWeTmBS103CginytiXUAc6tf6P5Tox w/fxnM1UkkUAyKvqOu4vpAe1NOPnW3uvJcP2LMn3EGgP9ZXnKKu96Ja1h7BV++PuxBYIQo b7CyqiOqjcDzDp0ABpaKgHDX8uq8Jar2HEA8E7iWmbEO+V/t8CPrDl936EDX6qpxdhIWH/ uidzTCkS7XRYP7asY5R77W5oDrTg1bGV+Gd4uGadiXkGiTYOWy77/mvswaDRTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM1v6ZKqz1BHy for ; Thu, 16 Apr 2026 15:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e997 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 70be695384d9 - stable/14 - x86: Add stub for Extended Destination ID support 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 70be695384d917f3ce2645b383fa9db6ccf8b0ca Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:19 +0000 Message-Id: <69e0fc53.1e997.2fbdb37b@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=70be695384d917f3ce2645b383fa9db6ccf8b0ca commit 70be695384d917f3ce2645b383fa9db6ccf8b0ca Author: Colin Percival AuthorDate: 2026-03-16 23:37:04 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:54 +0000 x86: Add stub for Extended Destination ID support Without an IOMMU, the APIC standard only allows 8 bits of Destination ID for MSI messages, limiting us to 256 CPUs. While IOMMUs can allow for more than 256 CPUs to be supported, they are not necessarily desirable in virtualized environments. The Extended Destination ID standard authored by David Woodhouse uses 7 "Reserved" bits for the high bits of a 15-bit Extended Destination ID in order to address this: http://david.woodhou.se/ExtDestId.pdf Add a loader tunable machdep.apic_ext_dest_id to control the use of this feature; the default value (-1) means "autodetect" while 0 and 1 mean disabled and enabled respectively. Code to detect host support in Xen, Hyper-V, KVM, and Bhyve will come in future commits, as will the code to use this setting in msi_map and ioapic_program_intpin. Tested on: EC2 r8i.96xlarge MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55890 (cherry picked from commit d9db6d759dfcf4a4559e66e777599bb3fa8ca14c) --- sys/x86/include/apicvar.h | 1 + sys/x86/x86/local_apic.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index 61c726f150df..bb2986c3bf67 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -262,6 +262,7 @@ device_t ioapic_get_dev(u_int apic_id); extern int x2apic_mode; extern int lapic_eoi_suppression; +extern int apic_ext_dest_id; #ifdef _SYS_SYSCTL_H_ SYSCTL_DECL(_hw_apic); diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 2efa0b9b5c1d..063ba0d43686 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -1925,6 +1925,17 @@ apic_setup_local(void *dummy __unused) } SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL); +/* Are we in a VM which supports the Extended Destination ID standard? */ +int apic_ext_dest_id = -1; +SYSCTL_INT(_machdep, OID_AUTO, apic_ext_dest_id, CTLFLAG_RDTUN, &apic_ext_dest_id, 0, + "Use APIC Extended Destination IDs"); + +/* Detect support for Extended Destination IDs. */ +static void +detect_extended_dest_id(void) +{ +} + /* * Setup the I/O APICs. */ @@ -1936,6 +1947,10 @@ apic_setup_io(void *dummy __unused) if (best_enum == NULL) return; + /* Check hypervisor support for extended destination IDs. */ + if (apic_ext_dest_id == -1) + detect_extended_dest_id(); + /* * Local APIC must be registered before other PICs and pseudo PICs * for proper suspend/resume order. From nobody Thu Apr 16 15:12:23 2026 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 4fxM1z6vKjz6Zq3k for ; Thu, 16 Apr 2026 15:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM1z2D3dz4NLH for ; Thu, 16 Apr 2026 15:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JGInpRxxbvrwbZRZVvKCkgu2F6B+Uxfsc4Z5pj0lkgA=; b=VkXYzOEcktTR6J2kblaW6hQo4zU2hplLRg8kRhxdwU86Z3GkYk/C7NOubYycjtXa4k408p 5joyqPFjfBN6FyB4ywcD9IBqLbKukCejLy81/rKpk3NZ3xBjJtAV5ezhQa4WuwWgzCYSfd X+HiMAqcHyjJW6xndiKgWmFmtK6YeQW6L5gRuVhod11L/CHzxo8Q51dSpRdW+zG/FJURfA Izva9oCGGjQC5RUVE3KxHoTufrQwwHnMqjaRE9kA5qevvL8pBgiWCH+3ajIa51J+RHNxx4 Oeh0HGjqK9W+xHXO1fVO9+0QXnazJG2cPuneXJ5rtrEQjh5s9aiLDDFO6okfqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352343; a=rsa-sha256; cv=none; b=OGY/IiJSbLvwE8fl7CqSZ0ubJLrCiTbt31XqE7vkUpe78ycubc8U+NK7exRoiTDKE/q7nT JaBI/z8IAtAn9CZm1ODe4ZyxIj3P8Sf9jiVuCTov6Vzqqx3yV+SpOu26eWGnPml3fAx+yg vG6gquPgkoTSjj9a2MZFkVPl7dYJrBMpoJgA0lujY8VD+WFGP3aouqTsdhSPMzDjwJqhZx TS95un8PWtMkcP2EqmXpnLzBgAnFhTw6vxO5TN/3YiyTUmFQ2qgkIStwqZJhI/q20w/Q8V 5nz0Pcd8kgDLp7nCbNX4VpZ3yFOl8MgaANB81G/lTkM6qJHHeNMoRdEJBR3sjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JGInpRxxbvrwbZRZVvKCkgu2F6B+Uxfsc4Z5pj0lkgA=; b=WefkYOlAvTtZvYhdqeyKTdhNzWhqQplx+F9ShiumzK1X4fVmKrVL7yyhkTWVQb4R+830LQ S/jrCKbV2PBpAn4b3BSYSUVznIEQAv15L9Jf1zN1nKQZH8OvqPHXgPyN6Rx7pE0rJoDpjB OUGvjnjlVToj2V+sfUHT6mVRQtZ3CRil4T/SurJKQJdEc0unMphlphzXsBAfYO0zq2I8C9 qPGSs2ZD50oPFTaLC/KnegpYKa4WOQW3QgmyYKJRx462G6Ry1IquORGrH74G9uWTraKkJ8 z2jNIppJx9298M2Iwge19RlRCO/P+LB19wmvesTD5hQ6WMEKPOHjQSuNRwWVAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM1z1pY6z1C50 for ; Thu, 16 Apr 2026 15:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f204 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: fa4faeb0249c - stable/14 - KVM: Detect Extended Destination ID support 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fa4faeb0249cf224409bb844d2c814d375dc1435 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:23 +0000 Message-Id: <69e0fc57.1f204.7c8f2a92@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fa4faeb0249cf224409bb844d2c814d375dc1435 commit fa4faeb0249cf224409bb844d2c814d375dc1435 Author: Colin Percival AuthorDate: 2026-02-22 04:09:00 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:55 +0000 KVM: Detect Extended Destination ID support KVM advertises support for the Extended Destination ID standard via bit 15 of the value returned in the EAX register when KVM features are queried via CPUID. Tested on: EC2 r8i.96xlarge MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55427 (cherry picked from commit 9ab5aa3d4c7879d5518afc7587a864ba880e7ee9) --- sys/x86/include/kvm.h | 1 + sys/x86/x86/local_apic.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/sys/x86/include/kvm.h b/sys/x86/include/kvm.h index fef26bde226a..83dd20fa8d23 100644 --- a/sys/x86/include/kvm.h +++ b/sys/x86/include/kvm.h @@ -49,6 +49,7 @@ #define KVM_FEATURE_CLOCKSOURCE 0x00000001 #define KVM_FEATURE_CLOCKSOURCE2 0x00000008 +#define KVM_FEATURE_MSI_EXT_DEST_ID 0x00008000 #define KVM_FEATURE_CLOCKSOURCE_STABLE_BIT 0x01000000 /* Deprecated: for the CLOCKSOURCE feature. */ diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 063ba0d43686..d54bfbbd43c7 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -72,6 +72,7 @@ #include #include #include +#include #ifdef DDB #include @@ -1934,6 +1935,16 @@ SYSCTL_INT(_machdep, OID_AUTO, apic_ext_dest_id, CTLFLAG_RDTUN, &apic_ext_dest_i static void detect_extended_dest_id(void) { + u_int regs[4]; + + /* Check if we support extended destination IDs. */ + switch (vm_guest) { + case VM_GUEST_KVM: + kvm_cpuid_get_features(regs); + if (regs[0] & KVM_FEATURE_MSI_EXT_DEST_ID) + apic_ext_dest_id = 1; + break; + } } /* From nobody Thu Apr 16 15:12:22 2026 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 4fxM1y63ggz6Zq2S for ; Thu, 16 Apr 2026 15:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM1y1TYMz4NGW for ; Thu, 16 Apr 2026 15:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHLXSqClK7kMNUhqfssTEa7pqJYtvrycsTQ8zXp2D5o=; b=Szk1QC5iVUnubxU+TI7T/U4EUTgu+CUlhYEYXKuLHR8U/n7Gi/ukCMXZaiiwHqFmvxSP1E O2lwx/xJF3F8NIwboySojsR/S/Ca26G5JhWfDUcX4oJuSYHcXW9SjP1GbglsyZGEe1vfcH V4vTHSdQKwv7sC4QCSLgSGXMZRncMRIfSfCI/OjfcF/YvU61oM2hK9Tzlu5Pu01JCwV5Cp 1QDh7azeZTDAJ0tU7KjoX9CzbNEummOWW7EQExQFqjAINmP+GhDkkOUsaovfKQ4WCvHZu2 hzgSMP/q3g2XU2XwLipGNczY0aKVDv33wmZHm0gY3VPsi8cnfRZrK+sGTdSpDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352342; a=rsa-sha256; cv=none; b=NgKiOs2KO6YhvxV0MYKYBoBPUaWr/UpllB9NM1bTn2Aewdu36enBYgcuPzdd78Q9SKPTJa wAu/3RwQmGdR3YdRqS4iHbDPCI3nRvdjSdELTAnWOBaTWN4/JirbHRrSfBti3SMjxtOlby w5OI0OUYGxuAOkho+D7IsXTfJ6R9rYoVgv/6zBiCCFeIswC+nuToaWvvOhfi9a9RKPa0xj dA+wxaop5j/xJG43Z8JicnlfgkQeFZO8xPlcR7UigxBsGFmZ2ya1fyVupq2lAtvbr5+0Bu Lz/109TumDi/uayzmftSicXj0zrXR71IhUbWgcWQsTtFMa3CB9jiSUmiu+6ssw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHLXSqClK7kMNUhqfssTEa7pqJYtvrycsTQ8zXp2D5o=; b=O15YZeh9B3yQNPnuwdwjD6ZeTbTzv198ABaLMIWlxEQDVE1U1sDwY4j9ERK1BX+44vIq55 HPFrZGhuJEVw1PXBxnH3Zs8I0yOiVcVG+Wl7hSyUxT4v19VDCTrCfhk4puCLTDQQqRQSmh FnRx63wi3+GNYnr16Uh5iFDl6pJ2WtIierlC1qpzoEEa7cQzV9B5Tum1kyqbFvomTmHdDD 2omXKmPy4MvgUtb/KZYjMsBt6bIsxm6LYKkAD9dtSd4AoZ41vILSa8CrPklNOkXjfCMXZb YHsTwG/gCW/bfs5onIxd+CcNJFRxz4bjb1u63zdYULRwvyi0aCOqo5czIWaUZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM1y11hlz1BTS for ; Thu, 16 Apr 2026 15:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f172 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0ef872c9353e - stable/14 - io_apic: Support APIC Extended Destination IDs 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0ef872c9353e83bfbfe4cba15a1960fa391cb5a4 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:22 +0000 Message-Id: <69e0fc56.1f172.4ff80197@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0ef872c9353e83bfbfe4cba15a1960fa391cb5a4 commit 0ef872c9353e83bfbfe4cba15a1960fa391cb5a4 Author: Colin Percival AuthorDate: 2026-03-16 23:45:32 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:54 +0000 io_apic: Support APIC Extended Destination IDs If APIC Extended Destination ID support is enabled, use it in APIC RTEs by allowing APIC IDs up to 2^15 - 1 and encoding the high bits into Intel "reserved" bits per the standard. Reviewed by: kib MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55889 (cherry picked from commit b0e1b1069d655f12ab69cf3a1dc1904dd35ad1da) --- sys/x86/include/apicvar.h | 1 + sys/x86/x86/io_apic.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index bb2986c3bf67..36ce48339ad4 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -84,6 +84,7 @@ * to use that ID. */ #define IOAPIC_MAX_ID 0xff +#define IOAPIC_MAX_EXT_ID 0x7fff /* I/O Interrupts are used for external devices such as ISA, PCI, etc. */ #define APIC_IO_INTS (IDT_IO_INTS + 16) diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index ae104beadf6a..56acd091c205 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -371,6 +371,13 @@ ioapic_program_intpin(struct ioapic_intsrc *intpin) low = IOART_DESTPHY; high = intpin->io_cpu << APIC_ID_SHIFT; intpin->io_valid = 1; + } else if (intpin->io_cpu <= IOAPIC_MAX_EXT_ID && + apic_ext_dest_id == 1) { + low = IOART_DESTPHY; + high = intpin->io_cpu << APIC_ID_SHIFT & APIC_ID_MASK; + high |= (intpin->io_cpu >> 8) << APIC_EXT_ID_SHIFT + & APIC_EXT_ID_MASK; + intpin->io_valid = 1; } else { printf("%s: unsupported destination APIC ID %u for pin %u\n", __func__, intpin->io_cpu, intpin->io_intpin); From nobody Thu Apr 16 15:12:24 2026 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 4fxM204kbxz6Zpw4 for ; Thu, 16 Apr 2026 15:12: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM2036lGz4NGj for ; Thu, 16 Apr 2026 15:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aE8IPpB3tH5q6SPksbmmmy57goOn+52x3v8NnwSsJVY=; b=db1ny4eELKgkHFCzR9hCB+Yg7hPhVxzhaUrHHQMOT7qzfFHSVIvyebur3jDjPIEwr5XeSW Loh+fOO4FFJh4kEXYD+7S+8zZjzC0p0xh4cOdbdLcNiACwPDJPsljWcAnj0Wc1zwZDsa/F K3dblmh4a5HHXKxxZzfC5fWt2e82C3gD4lWsL0+bsatTzUjmn86aZQxOVVF9mdWgparNMA 88aWGWnwYqHRE6/qUBmbQTMwDwAwPzpwiY6UPtzuLw7flML8l6oyeTkaXaG0Jq/vPvCyOd WWopItYUmt7pbmD6kmYjbqUXhk52on9xLLlrqFyjsY/IcqpPt2hOIIGyoKUoIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352344; a=rsa-sha256; cv=none; b=NTwSIAJh1RaXEyzyWFc0CtSit3ahWjkQFA4hvMKRbZxBngBxrk9XbZ6SgNTVPGwSRXZfCD a3t39n7bWkWqfddHj5bWGxWsgIhGR/ix9/L6Hz28CwAngAX04pK2A7plf3jBDSJ4xiJ9JO hz1HjoW4ADtB0P5oH+hu1jvzQyRWXSAx9W0MI9UXmkfzXm/nclzMu9RZ0KuLx8U9EQc/+6 FP5/V8/Q8SxUmBTZ0MGEWk3OyzxbfXZxu5r7dPcDijusq07WWH20XOQwNiMhSwSoxRc1CY Gb6fA5WAMYUJv/SFnXQahYu6D6ZVClgEq1j1aos58Sn/9tAi/fK6eH6xVDteZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aE8IPpB3tH5q6SPksbmmmy57goOn+52x3v8NnwSsJVY=; b=KV5mW0NjcQYGuvtrcShZXqb5+S7MBr6uH9E3sihOiq5wAhPkI0NLnHXvEzozFdloI8b7gm 6A7nUin6ym0OO7ohw+FAnznK3FrWsRhMLSPZhwh8cs/FFdYXrpoEG6FwZzfegwPpRkQojK XJC36VzIaY+shZD3LZV8ws19pXs4pse0jVgjNHzoWGHPR5dVfigtEN213SkFAG1NCQGiDy BAKm2dTMIZ6nOExmaNx4PffeNil3PdKcJJWfG66eCtUAn1rO0T6nL7o4Fc9QjPE/MR5q8w 6hwhqJsa39QBOCaDkXm/gK45LdYUm6+AqnF/4A5x2Lsh+2BhZzXfQWPS6jGFWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM202grZz1C51 for ; Thu, 16 Apr 2026 15:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e99b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Roger Pau =?utf-8?Q?Monn=C3=A9?= From: Colin Percival Subject: git: f3490b827e05 - stable/14 - x86/cpuid: add CPUID flag for Extended Destination ID support 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f3490b827e051aff60930bc7596b790b24fbb7db Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:24 +0000 Message-Id: <69e0fc58.1e99b.3a9589da@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f3490b827e051aff60930bc7596b790b24fbb7db commit f3490b827e051aff60930bc7596b790b24fbb7db Author: Roger Pau Monné AuthorDate: 2022-02-18 08:17:47 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:55 +0000 x86/cpuid: add CPUID flag for Extended Destination ID support Introduce the CPUID flag to be used in order to signal the support for using an extended destination ID in IO-APIC RTEs and MSI address fields. Such format expands the maximum target APIC ID from 255 to 32768 without requiring the usage of interrupt remapping. The design document describing the feature can be found at: http://david.woodhou.se/15-bit-msi.pdf Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich (cherry picked from commit 8c986d1645312487adf21a9104d667ac1e19c25f) --- sys/contrib/xen/arch-x86/cpuid.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/contrib/xen/arch-x86/cpuid.h b/sys/contrib/xen/arch-x86/cpuid.h index ce46305bee99..f2b2b3632c2d 100644 --- a/sys/contrib/xen/arch-x86/cpuid.h +++ b/sys/contrib/xen/arch-x86/cpuid.h @@ -102,6 +102,13 @@ #define XEN_HVM_CPUID_IOMMU_MAPPINGS (1u << 2) #define XEN_HVM_CPUID_VCPU_ID_PRESENT (1u << 3) /* vcpu id is present in EBX */ #define XEN_HVM_CPUID_DOMID_PRESENT (1u << 4) /* domid is present in ECX */ +/* + * With interrupt format set to 0 (non-remappable) bits 55:49 from the + * IO-APIC RTE and bits 11:5 from the MSI address can be used to store + * high bits for the Destination ID. This expands the Destination ID + * field from 8 to 15 bits, allowing to target APIC IDs up 32768. + */ +#define XEN_HVM_CPUID_EXT_DEST_ID (1u << 5) /* * Leaf 6 (0x40000x05) From nobody Thu Apr 16 15:12:25 2026 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 4fxM2203dbz6Zq6Z for ; Thu, 16 Apr 2026 15:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM213wTXz4NLd for ; Thu, 16 Apr 2026 15:12:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xSds+pmKSIcdtgp3qm71e5+gHoGw9TiV2nE2Ippmaz0=; b=ZnnalTmn5AMa6+jzpiYvqqRTJzTUdI+l+GL6+AgtZvaJ9cdVOQQwpwKxrJy4pzHH5WTYIV uG+MmiB/7G9539TeT/uyj3fDA1w2jmtyND3z31+bE0DH5U6zKWUHb4Vs+JF7mmUAZV0k4L DO1mOxoozrcOrn8VjKdg5Pd+UCG/CW1azdnKh5NcaUP0gufkgkvcGGRwOLiqguEUOO0DLx ZaBIvXUwcdAm28MkP0G6aGW0x9/nfgf+qTZykq514Qhg6zVhEHJOUsLPtiK2qARLv6sMCF qBOYyzcJv5eEsaX/6PICVod38g7ldSRZaD2cJU9AeYhIdqwGbONkFcIXFLRNOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352345; a=rsa-sha256; cv=none; b=rnIITKjZ906Z2Lp7EtOG/MlEPa9UPKPiuNxmsbjnluFhk2RSiZ5s5fxqtiTVJsdKSVxnLL I5bxchlxqAD0KKenDichonSj033uIUFn3fmvqJw+3uC2T0IAYe3nYBrHrGv3P1/Ap4DrJl PNFWfYU1uSDH8iCMyN/TcpKYZXZ8UCK7obbmSR2N729Mj8eE6t5oe7zL5hTsBeugNNVoKN WEfKQw1hN8rW/6ORYbKWcTO3MLLlKClF+FuuCkXvre/EqoR/+Bjc0Jp7T72pD4GIKPLCR9 8vWr42g1/laZfjjDrkLN539OObWHy1WwBkqS11xckpvTiVqgtmC5/cobxH34OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xSds+pmKSIcdtgp3qm71e5+gHoGw9TiV2nE2Ippmaz0=; b=yeKG7yyEtIOQL1DFmGtnKHDFvKfwg0FT1ItJQKSWTstxm6fl+tHZWr5GTDl/ikr5EVLzdb dp1fT4rpUzS2SUIRz+AJ/w9Fv7iBOWiNhR/kKhq4knmyAUqw3+WhD6EMNrTg/Hq+i85nP1 PK1xHSWsHNuLFnl7PxCR72UVkJ3e7dUbdq5woRSABHvFMEwWJKG+GAdRuaGVtZRq/sjUAp kl51X1JkytDbOdILzLDzCtP4niz2tDRt1vSMTVd0jhsXevmFICSxScx1WhXLouinhqwI2M lR4kqrZSjSAq9FR7gcG1hFyid7JfaBJ2kJuzoUsz5pHvsolq0KGosN/qkY61TQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM213Sggz1C82 for ; Thu, 16 Apr 2026 15:12:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cb7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: ce4eff190473 - stable/14 - Xen: Detect Extended Destination ID support 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ce4eff190473b582ab987dcae4ec17e5750ed5c5 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:25 +0000 Message-Id: <69e0fc59.1cb7b.5a72a3a6@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ce4eff190473b582ab987dcae4ec17e5750ed5c5 commit ce4eff190473b582ab987dcae4ec17e5750ed5c5 Author: Colin Percival AuthorDate: 2026-02-22 04:09:00 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:55 +0000 Xen: Detect Extended Destination ID support Xen advertises support for the Extended Destination ID standard via bit 5 (aka XEN_HVM_CPUID_EXT_DEST_ID) of the value returned in the EAX register when Xen features are queried via CPUID. MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55429 (cherry picked from commit 9b18ba2c16a0750e6c78f348845368284ef1a704) --- sys/x86/x86/local_apic.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index d54bfbbd43c7..d073dcd1c98a 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -73,6 +73,7 @@ #include #include #include +#include #ifdef DDB #include @@ -1939,6 +1940,11 @@ detect_extended_dest_id(void) /* Check if we support extended destination IDs. */ switch (vm_guest) { + case VM_GUEST_XEN: + cpuid_count(hv_base + 4, 0, regs); + if (regs[0] & XEN_HVM_CPUID_EXT_DEST_ID) + apic_ext_dest_id = 1; + break; case VM_GUEST_KVM: kvm_cpuid_get_features(regs); if (regs[0] & KVM_FEATURE_MSI_EXT_DEST_ID) From nobody Thu Apr 16 15:12:26 2026 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 4fxM231mjSz6ZqBx for ; Thu, 16 Apr 2026 15:12: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM224v80z4N0V for ; Thu, 16 Apr 2026 15:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PAf8Rte0p1SEaVde4br7U0N4wpPqOWEptwWuPXX58Lk=; b=SNyZ7Z+dBi6/hS9cKukAUJ9/etIA4VL31Bvh06lvJLZGyUG0sbGFL10VCJYaGMWxQDCTY+ SPk4aHuZEZdFFnDEmetAn2Yf7tzP8qDBQIpXfcKwUbvnjODUxXKBL8sJWD17FCcnTyx1aG c3cUv1pmQ0fFXR51N1DtDA2gEySMZIuHfTvURluqUOMOrEeATZ3/jCzTR4GWotJw+3PiGO zRIZvKPssr/Ww/njZpsBdqxJ0Wv0I7Zib+9wekz1AKwJaoNjGBAEfygBYlobhYWr/9Knr/ b8fdZbZHoR81KVVPM7vVeNEjcHBw1FFQQSGVErXjOQpb+kLO3cx+XONXA3Gqdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352346; a=rsa-sha256; cv=none; b=QxBBpcW8F2Nfy9oEMnoSlqwIx6yqOU8xQsLnN975DeL1UP1n9gZ6EvVIVQUWSZwPDt5epq WIKvzInDyeJtBetkUpKaUxpZ+zHYCrch5W3Nmk5hfaSPav3Aoephs3Hb8JwsUD+Ckrankn DQ8lQTF+/xz93wT/nlgn9Z7xhN8bEOvRJ6t//EvSh52b/HoYaH67WD23SXSxiwsrYMDLsV GkshAYvwvqM2b9+b7crY0viSXOmokDUUBQnGZDg+RjEzMDYDedIylQcB3ji90AsaxrJImm wo3hEZ8s2qQZDw/Mgauu0vH+8CaPb9PJzSBJ5iT09u4gogwQ5qsga11rswSbqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PAf8Rte0p1SEaVde4br7U0N4wpPqOWEptwWuPXX58Lk=; b=UgWu2GKJ42athE7U+fj/9j7Kgwc6My0r2h1YMP9HEpvR9SY62fWQCefCPj4RkY343IxWDM NI9DcG2jOMCznGBs2/VrXh3FDbitG+1NIYd/w+e1hHT93ap75UsPwGEQcU9z4rXFqglZxk RVPf/Fh6nsx/As6PDhz6hbt30joD2pcQ7dM/CEztvMPn5Qu8q7wjjGmaDsh5ZMbSIL609D MwKTnD0XLLrjNlunZWdEojPDPHsg4wpUK/nifvAEy3jS9ta4v5Hm8sWuzOncVUwLqTG+V/ W1vKwo7xSSYMqc/Xuor4P7mONVXTMVNjrhy8sHu4dPlIQwso55EBlfIri9CF8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM2249Mbz1ByT for ; Thu, 16 Apr 2026 15:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1efc7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 075909e9faed - stable/14 - vmm: Move defines from x86.c to x86/bhyve.h 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 075909e9faed3cc5568a31cc049fba708e2a2d9c Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:26 +0000 Message-Id: <69e0fc5a.1efc7.753f71b0@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=075909e9faed3cc5568a31cc049fba708e2a2d9c commit 075909e9faed3cc5568a31cc049fba708e2a2d9c Author: Colin Percival AuthorDate: 2026-02-22 04:09:00 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:55 +0000 vmm: Move defines from x86.c to x86/bhyve.h The values CPUID_BHYVE_FEATURES and CPUID_BHYVE_FEAT_EXT_DEST_ID are useful for guests, not just hosts; so they belong in a header file in sys/x86/include rather than simply in the .c file implementing the bhyve host side. The original addition of these defines took place without adding a copyright statement, but since I'm moving them into a new file I've added the original author's standard copyright (Amazon). MFC after: 3 weeks Fixes: 313a68ea20b4 ("bhyve: Add CPUID_BHYVE_FEATURES leaf") Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55430 (cherry picked from commit 49b6254b3e09ee741f456617111ecb18803459fb) --- sys/amd64/vmm/x86.c | 5 +---- sys/x86/include/bhyve.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c index 8afd213e3824..00ac3c207b6f 100644 --- a/sys/amd64/vmm/x86.c +++ b/sys/amd64/vmm/x86.c @@ -39,6 +39,7 @@ #include #include +#include #include "vmm_host.h" #include "vmm_ktr.h" @@ -50,12 +51,8 @@ static SYSCTL_NODE(_hw_vmm, OID_AUTO, topology, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, NULL); #define CPUID_VM_SIGNATURE 0x40000000 -#define CPUID_BHYVE_FEATURES 0x40000001 #define CPUID_VM_HIGH CPUID_BHYVE_FEATURES -/* Features advertised in CPUID_BHYVE_FEATURES %eax */ -#define CPUID_BHYVE_FEAT_EXT_DEST_ID (1UL << 0) /* MSI Extended Dest ID */ - static const char bhyve_id[12] = "bhyve bhyve "; static uint64_t bhyve_xcpuids; diff --git a/sys/x86/include/bhyve.h b/sys/x86/include/bhyve.h new file mode 100644 index 000000000000..215bee90bd1a --- /dev/null +++ b/sys/x86/include/bhyve.h @@ -0,0 +1,35 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright © 2025 Amazon.com, Inc. or its affiliates. + * + * 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. + */ + +#ifndef _X86_BHYVE_H_ +#define _X86_BHYVE_H_ + +/* Bhyve feature detection */ +#define CPUID_BHYVE_FEATURES 0x40000001 +#define CPUID_BHYVE_FEAT_EXT_DEST_ID (1UL << 0) /* MSI Extended Dest ID */ + +#endif From nobody Thu Apr 16 15:12:27 2026 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 4fxM244gpNz6Zq3t for ; Thu, 16 Apr 2026 15:12: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM2367BFz4NLx for ; Thu, 16 Apr 2026 15:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XFcWjfAgeaPlFIboi1HKERMjVmUaQLCEmKOTHrn9Y3Y=; b=k+SRMzQ7hbvW5s6/OOV7EDxVyBEXCLYRvSmHTSCulLcPUiIMCWn65J/N+z+E2d8O47mx7U n4lj33XGgztCybZGQsfhwS7n+/Aqcbk6x96mGs3KKGM88TdnmzEzbIR+V22ftZNX41AdMV vH1ONX6SS7nuJ0n327t8tWgE+rNmlTUDhaGSSpHxQIDCBYtZ9FEocytJ9qgsxNK/Szi0b0 ULbO1cU3INBtH8mR5lA7iR0y7xCkhLq1dnuwnXIzxPcWRGQMdLvGZeMVx2g60KY5IE4GZs 5Ns5MawZPMzz/QT002/VEsLgx/10Tr+SYkF4BsypnLZ0Jnmba/KKXLV07+mCPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352347; a=rsa-sha256; cv=none; b=KNt0CvU+pciMDYWSwKHHn6TZcXa6ZbpPrBaYG74A01hGtvd0NMmZkY+1xrV4wSRT7OHQW4 e/izJH2MDBX9K3dw6r0biyPe5aps7R2FgSTHM4s13tsrlGCIpUFmlBW2tfXFspqCrILNSC mO/kfBnQxny8M08u32l91WHK1Jd33/AkRidfPMSULs6JJlmY7EFB7TuxGRyzirlvj7Cv8O sud+pBusvXuPyK+Eq6oaT/scsZu++/DglVOVNUC2FgHPZNyMjeFfODwx4fbREIF6QarOTo oScJ5VXb+Rvj1UytL06z9pfHxnS6tif/HOX1Vyq5U3JWFBG8P5xVpeKcduM1Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XFcWjfAgeaPlFIboi1HKERMjVmUaQLCEmKOTHrn9Y3Y=; b=jl2pPBzv/7Bz20ZrMH1TT5m/jN0RnJakGeMpVNK5oR1vUPz3KFQmq4xdWYlN2xEEAnZguY H5JAon/fAPwD/OeOHf2jPROf2wwZM2seKdxWmgieJnP7eB2s8o46CIBNNobtJ0RAHV37nM P3wuhHxSmv5eBUW/Tp67ThRzGtGRMZRmKN8qkuTPsRpRnTOFcTyFFic5oqsJjdyx756PZc SCehGmMwYA96qsbbEOD4U9Eu5t0bRRpWosLlFcrCDaMn9DpoMImmno9HcAk19NoaOiOhFy s7r2bnJHcX++6RU1NNLZ8z6C/1Dw+knwETzBRDM2rLuiu4INt0nVAZhp/n7Wdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM234z7gz1BmP for ; Thu, 16 Apr 2026 15:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1efcb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 2b82661c9792 - stable/14 - Bhyve: Detect Extended Destination ID support 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2b82661c9792949c9cdcc32587e0e1ad37776d48 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:27 +0000 Message-Id: <69e0fc5b.1efcb.2d39a6d6@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2b82661c9792949c9cdcc32587e0e1ad37776d48 commit 2b82661c9792949c9cdcc32587e0e1ad37776d48 Author: Colin Percival AuthorDate: 2026-02-22 04:09:00 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:55 +0000 Bhyve: Detect Extended Destination ID support Bhyve advertises support for the Extended Destination ID standard via bit 0 (aka CPUID_BHYVE_FEAT_EXT_DEST_ID) of the value returned in the EAX register when Bhyve features are queried via CPUID. MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55431 (cherry picked from commit 8dd9a0d52175fbc5dafed851fb95a289a94fb6cd) --- sys/x86/x86/local_apic.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index d073dcd1c98a..4330d0108af6 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -74,6 +74,7 @@ #include #include #include +#include #ifdef DDB #include @@ -1950,6 +1951,13 @@ detect_extended_dest_id(void) if (regs[0] & KVM_FEATURE_MSI_EXT_DEST_ID) apic_ext_dest_id = 1; break; + case VM_GUEST_BHYVE: + if (hv_high < CPUID_BHYVE_FEATURES) + break; + cpuid_count(CPUID_BHYVE_FEATURES, 0, regs); + if (regs[0] & CPUID_BHYVE_FEAT_EXT_DEST_ID) + apic_ext_dest_id = 1; + break; } } From nobody Thu Apr 16 15:12:28 2026 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 4fxM252NcBz6ZpyZ for ; Thu, 16 Apr 2026 15:12: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM246ff9z4NM9 for ; Thu, 16 Apr 2026 15:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LjOZ5SC2AuqfF0SP+BHDdLFT089R/of65jbBvR5zlhc=; b=Ajlqu3gWclHZHzhnjx70x8JF6/rDn6BtHthhodTA9XdIrAKEzdZLrTd7RMz0THqKumMJIC f2+Uh6onKhX119WSoYUYRc+rg7HEjhrNDnh+weQzafAnjjNzfp1LdEe30w6//y8cO8rdDY yl5iImnUGCpOBqhoKNYHeK5gE5NQOHap/bvuoT/R3p40P7leGeq7OBbyXWAdttqYK9wMg/ +zJtHkEXwaffoqR7RW/RyiUpnjYgCOi3kiW/WFb0xUjX2GfDrybSKmnugWKgEG+Lm9uzsy WoODdQYy9+B4X9ibf+TnnAqb8edyyQxofQVcd7l/D2tcu3lXo2/Uq2h+/lxojQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352349; a=rsa-sha256; cv=none; b=hXR5gAnfndqfItwtwlyBZxZVzYOcN4B04tp000f9ww0LPg4SKmggRd6uz+1Wa2TMmlADVa odfh4rEUIUILkmxyw+R6xrs4hVCONL2AnhCoMybB2Ru/6HRaSIKZOMRgtvfJBK3tAiCRcz cdxOKDjMHqusKO+gFdy5N5JGMW4u4wXhqF2dwSKb+jCTx5Pr4QrVvXspZ3TcmufyxVXpXw oT+iLh8gpVf6S9FpnNq6DUUqhMLBLv16gdnmHDs6txfV2/e7DOLn4Y4C9Gj/GQeTBfg1Nd P9E5Ly101kKjiw7n9dJSonEN1eyz53wDW11vsX2+9lhBc9zNmHaTotGmkcFGqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LjOZ5SC2AuqfF0SP+BHDdLFT089R/of65jbBvR5zlhc=; b=ktHHPZ/gM7DfpM6mxEPVJDZlVoHuZ3gCnQVoaVOA8uuwW4KSmjXebkUxjPEA5jT1q2ddQj 1R649gND1oVVpFO3tCEBhy7119RkS7Wui2BYU5gJZJ7wWMeV5MEpvZy+Xjy76jEC8HwIng +UEigT+EfJ6pi/7Y5zvmCSO9kGwcNqyB4kvnkS+d2M59H2xNtQy1dTpeJ+Y5CGErk1Om78 hcAGsk1wABy+JgyylIO7gPAfiQ4cMiZ0+EACRMBe77xIUx7kgVeprDL9fz0KQeS9mKqPI6 fgG+rvylF82lbxw/T85bGfFCF6roTCzCvPhf0K2LEzXlgEKVQ2LTlxfTln/tmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM245mKFz1Bjw for ; Thu, 16 Apr 2026 15:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e0fa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 7dfe77679c0a - stable/14 - Hyper-V: Detect Extended Destination ID support 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7dfe77679c0a15b2fead422b862bd85905311b8f Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:28 +0000 Message-Id: <69e0fc5c.1e0fa.664688f0@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7dfe77679c0a15b2fead422b862bd85905311b8f commit 7dfe77679c0a15b2fead422b862bd85905311b8f Author: Colin Percival AuthorDate: 2026-02-22 04:09:01 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:55 +0000 Hyper-V: Detect Extended Destination ID support Hyper-V advertises support for the Extended Destination ID standard via bit 2 of the value returned in the EAX register when the hypervisor stack properties are queried via CPUID. This is based on a commit to the Linux kernel, as there does not seem to be any other documentation of this feature. Reviewed by: Souradeep Chakrabarti MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55432 (cherry picked from commit 7b6be0014a4eb81943491122bae70914b7fd82b6) --- sys/dev/hyperv/vmbus/x86/hyperv_reg.h | 6 ++++++ sys/x86/x86/local_apic.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/sys/dev/hyperv/vmbus/x86/hyperv_reg.h b/sys/dev/hyperv/vmbus/x86/hyperv_reg.h index 0597a1fea953..e7560d00f25e 100644 --- a/sys/dev/hyperv/vmbus/x86/hyperv_reg.h +++ b/sys/dev/hyperv/vmbus/x86/hyperv_reg.h @@ -45,4 +45,10 @@ #define CPUID_LEAF_HV_IDENTITY 0x40000002 #define CPUID_LEAF_HV_FEATURES 0x40000003 #define CPUID_LEAF_HV_RECOMMENDS 0x40000004 + +#define CPUID_LEAF_HV_STACK_INTERFACE 0x40000081 +#define HYPERV_STACK_INTERFACE_EAX_SIG 0x31235356 /* "VS#1" */ +#define CPUID_LEAF_HV_STACK_PROPERTIES 0x40000082 +#define HYPERV_PROPERTIES_EXT_DEST_ID 0x00000004 + #endif /* !_HYPERV_REG_H_ */ diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 4330d0108af6..b9c699965b09 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -75,6 +75,7 @@ #include #include #include +#include #ifdef DDB #include @@ -1946,6 +1947,14 @@ detect_extended_dest_id(void) if (regs[0] & XEN_HVM_CPUID_EXT_DEST_ID) apic_ext_dest_id = 1; break; + case VM_GUEST_HV: + cpuid_count(CPUID_LEAF_HV_STACK_INTERFACE, 0, regs); + if (regs[0] != HYPERV_STACK_INTERFACE_EAX_SIG) + break; + cpuid_count(CPUID_LEAF_HV_STACK_PROPERTIES, 0, regs); + if (regs[0] & HYPERV_PROPERTIES_EXT_DEST_ID) + apic_ext_dest_id = 1; + break; case VM_GUEST_KVM: kvm_cpuid_get_features(regs); if (regs[0] & KVM_FEATURE_MSI_EXT_DEST_ID) From nobody Thu Apr 16 15:28:23 2026 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 4fxMNR5ZNtz6ZrKw for ; Thu, 16 Apr 2026 15:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxMNR4xZxz3Fhs for ; Thu, 16 Apr 2026 15:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TrSOF4IRQUWalLPyMT7FvfMcxN0ALnq+h6siE+nN5bA=; b=uPQLdWDeG2cd2F/lXtryPAC/1aXcfyzflI5c6wz64M15WmaOad52rX8/6WCiqDXMIuWhVX KeKpKamEf70zie9DYp/clANBm8t9COJn7cdcQqSm0CeIKwk+kPr7nmEOU9rZSr4LSoV0Jh WRaOL8DsNvTYNgn5H8eGeOYACHGd1r38lcTvSqhjJ9Yx6tzufpAn69u5UM4VBpGAibUpkO +dXIn1ogMafBNr1D1yRK6A9gtyCwei7tGaob6wniqBM6gTEloznWII5xAX2n8fNIphjw4A iYeMuWJswDgeSqEMmfiKR+kvFQI/7mfaZNI7Y+F3M5V9tuar56U7F5NvdPf6sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776353303; a=rsa-sha256; cv=none; b=S6NPOpzW6rrb1N+jKoa/ZCauATV7Zg3iZ/97zqnxa4HKddhPF5ee+XyL4usRPDT05KOfje ye1UEHYurSYZ1ruNCOnd/yTL2GImF1mPnngiSJtWtWGc3Y4foM/ER0E8OnVIKr8XiHDjLi iJj8nuyFiSoaJFgdKKp5c9IsyrbLrhCSETN+oa6qtfB9U9TADX9MVOeZzV4kYxUvtGbfM+ IhIcYp9B2L/Zre2YwC1bv7Yr9f8H9jQULVsroC5MQgDDHmD6P5csNAQ0U+lbPCLxxnLDRy jZv2qdt62WiqbgKKBRl9AZocvMlJ+jimjxJ1MYzhlM6T+I30cdIWXIUWiiVzuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TrSOF4IRQUWalLPyMT7FvfMcxN0ALnq+h6siE+nN5bA=; b=nNK29s8HGQizJLqNx1Ebuv+xtniRDttKCqvLkDke/j/IVDzlsX2WsOJvHsHBjmqc+JodCN a/r6jkZPLMHdjTVCPUQ/nxQUWNRKoz0enD+VBzanGe5bfQHE/THc4QO5wQWX6JMGrmKs2V 5hcIPju+k77Lm9vqjlxxd/nAMhm0z53ztZQ6SsNPW6hCv/bFBzmppwqLeyAiE+M3VCzTso Rcdf1O9TqCulro7AkXVFqmsR91TysSaLnOeACpciVJx2eYWBnZgYaOfDWYTDyAqgpLLqYE uNkHqsugD5M169pFKTOXv84Im29hefE2gXMIYHLla93j1+OG/kMQNtSf0Oc30Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxMNR4G6vz1C0G for ; Thu, 16 Apr 2026 15:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ef25 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:28:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 43f87c1ba8a0 - stable/15 - usr.sbin/jail/Makefile: remove riscv linker workaround 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 43f87c1ba8a0cddbf9b5b3611423fdcb0a5cd433 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:28:23 +0000 Message-Id: <69e10017.1ef25.60f81345@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=43f87c1ba8a0cddbf9b5b3611423fdcb0a5cd433 commit 43f87c1ba8a0cddbf9b5b3611423fdcb0a5cd433 Author: Mitchell Horne AuthorDate: 2026-02-05 16:41:31 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 15:11:33 +0000 usr.sbin/jail/Makefile: remove riscv linker workaround It links fine with newer binutils 2.44 (and GCC 15), so the workaround can be dropped. Reviewed by: emaste PR: 242109 MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55083 (cherry picked from commit 39148cbead211163f7e5a203d7c88ece5c3e30e0) --- usr.sbin/jail/Makefile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile index babe7b9459c0..37400368da76 100644 --- a/usr.sbin/jail/Makefile +++ b/usr.sbin/jail/Makefile @@ -14,13 +14,6 @@ CWARNFLAGS.jailparse.c= ${NO_WUNUSED_BUT_SET_VARIABLE} YFLAGS+=-v CFLAGS+=-I. -I${.CURDIR} -# workaround for GNU ld (GNU Binutils) 2.33.1: -# relocation truncated to fit: R_RISCV_GPREL_I against `.LANCHOR2' -# https://bugs.freebsd.org/242109 -.if defined(LINKER_TYPE) && ${LINKER_TYPE} == "bfd" && ${MACHINE} == "riscv" -CFLAGS+=-Wl,--no-relax -.endif - .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif From nobody Thu Apr 16 15:28:24 2026 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 4fxMNT2Fkjz6Zr8j for ; Thu, 16 Apr 2026 15:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxMNS5qKYz3FM9 for ; Thu, 16 Apr 2026 15:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6RfKs1F6wDeeTNs4jbs/QpXS6lXe8ngk4+IYIdAGSgY=; b=q7ILypDSnnRJMB78afOwFDFRh1KV56gOCrqZvqgiqh2phv61cI/OkZhYusJ2jLHyWuN9je dw8GAEViAAzaA3Eip8LZyKZGsDaWco7X/HbXE9oIlmgufWX5ZVoqTUHBziK9lEZL1Ia6He XD8aQVkeqsqb0Inm9qwaz0UxuzEfxolr7LIJWAkL4VsEg8YPmdmtyyyNubyte5PaYRxq5Q 71rRF8WGWaQuEWVXz50iZAEpBBm7Ic8kkxo7tQjJF3/CviaWCY0e/MUQSvy+SiUNmEJApY nH8FIx6H8ne9yVkkVCFXy1cKq7EI7qo0fxBQmRZ9rQgSYj/44Qz58DV86MKhdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776353304; a=rsa-sha256; cv=none; b=iNUX9gYvCYnjmtk0670im6PrGI3j8UxyM85CYEPsb42leqqE1zp/fj4/ps3ydpH2YXWIXt tRNjCq2im6XGP6dwcrhWUhNpxAZ0FEKmYZ6YMUsrq83A/rDfLd1fpeI8jM1nOk8HeBgI4d thclJPeSvwRI3u5YrYpN6bHsfWB/nQ58H9O6Zmf0xCtLw0lvnkam6eeCGmPVKfDu1Nqx27 hYkoP65g9sydd36G1MAQ+ir55CNB8r0BzibRlnMBmYq5aqPo7MSdLn7dz9iT9tXVNat+5o 65HIXyurfrvcAu+/S9kgU2PFVnH4OXPNV5e/eHVhg2eMfDOjkwBB0/Zs0fOcGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6RfKs1F6wDeeTNs4jbs/QpXS6lXe8ngk4+IYIdAGSgY=; b=fJ7RNRbickrBk7IYAjho+/+JH3K1s2opG/hlTizWT+Q0XpwEoxAanfFXS3x2EjINvPxFmp w/VleJu3JhvZCe6AxpWelp7j1MReJu+xmtAjPmkLZHcoipW4LOCNVE+YlmBjfrJoUKw8tS V5THxM38Rj4rJjxhReWrfHgFBCRZMWtRNWLEUNaVseSBKMBvePDijw+nGi3rcrMqvUMwdw lxtsS3q+P10ZaC9Ha5AQNvfw6A8NkmW/kV/3UgaRub46qce5ixDnLufcQWN/ZzxKim1UUa 68BYCKcO7y+Il0xSVX0Qlkqw5FftQ0NGZZ/HkAtbTavmWfNH94Wnm4n6zW+pmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxMNS57Bcz1C8Y for ; Thu, 16 Apr 2026 15:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 201f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:28:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Herbert J. Skuhra From: Mitchell Horne Subject: git: 21a8bd08db9a - stable/15 - ObsoleteFiles.inc: correct entry for zpfind.9.gz 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 21a8bd08db9a21446748c4852094946d04cc1151 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:28:24 +0000 Message-Id: <69e10018.201f3.7c0736b6@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=21a8bd08db9a21446748c4852094946d04cc1151 commit 21a8bd08db9a21446748c4852094946d04cc1151 Author: Herbert J. Skuhra AuthorDate: 2026-02-09 19:50:04 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 15:17:33 +0000 ObsoleteFiles.inc: correct entry for zpfind.9.gz It needs the .gz suffix. Fixes: 2ace05b65a2c9 ("pfind(9): follow-up fixes and improvements") (cherry picked from commit 9c800a103c03dd4a32f1f6ac8f409fe38f304848) --- ObsoleteFiles.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 87cf56fe1972..a1e9939801ac 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -83,7 +83,7 @@ OLD_FILES+=usr/share/man/man8/apmconf.8.gz OLD_FILES+=boot/firmware/iwm8000C # 20251204: zpfind.9 alias to pfind.9 removed -OLD_FILES+=usr/share/man/man9/zpfind.9 +OLD_FILES+=usr/share/man/man9/zpfind.9.gz # 20251121: Remove duplicate pam_krb5 manual page OLD_FILES+=usr/share/man/man8/pam-krb5.8.gz From nobody Thu Apr 16 15:28:25 2026 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 4fxMNV5TJsz6Zr8q for ; Thu, 16 Apr 2026 15:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxMNT6TNmz3FMK for ; Thu, 16 Apr 2026 15:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V978QkXy9N6RvkmTvhNghN7VCkdHkWnQWMQLPjCdxrY=; b=FP/L2/hd5/0y6ZaG5RJrLcFqsIS3WcN/K4nPR+JzVTUw5xxcnzvE6cCIUJ5FDJdCqNnQZa DGaD/YdSALzxI666boZcsCHqNw0NTbSqv6/J2bS6nAqJrGaO81EzV+UVLvWAPkShgkyAVN 2JPa9CfTvPXAR0DBPR1oI2z4U9QMMH58BG/tEHIF5xHWcC9bN8F+vrwcvAXMsDyd/JKsHm pH/AxUdup7PIA2U7/c+4cnT6EQ75b8imHe5aOuLhV5wjV7snt1kahinaJNjq1SdZFNY7si ccwDbkw9M6am1WkiHQc1+MFTei4if+hTTfDpj30M4Y/RjWoVdJ5MwuuI77vl6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776353305; a=rsa-sha256; cv=none; b=dpidoJJC1C2+VQURUJrSsKiKzcqLnEv5k1Dle/uQ76LXXpF4ojY8pwmnyXQvI9+hqqDT+m qhm5D/RQR4l5THFHYI/d1lTZv7fDXgeqhdtumGdLm6Nh7/nc+Xmh5es+8XkbZPMJI2WCIz BlqsS+uyKItJEphObFHUr2s7sfxv+sz/RTZVghoo8vl5gxWB8g89m+6ClSzYzl79caauMA r1WndnSLAw8mlx1u8cu1UjEamnXGphojYTcCkJK/IeipLDFETjl9aedqg4SU2fTv2JruDR FnGzPGJvuIb6QduTqBbch291ezL4601nESObWAhX6ONuGmuzAB5PZrzgYNdHAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V978QkXy9N6RvkmTvhNghN7VCkdHkWnQWMQLPjCdxrY=; b=Rmw2dGAyuyLKqkl5kkIsyAZn41PbZu6WERGferqZ718oov1fBNoP2ppqSnEgiTcdFpNhNW rMAlbyh/5z7/jnwGa3tV5RVAYQZ77g/WrHjiznakBVsFpyv5zfJlDUF8XqNseeiwzjQ0E+ K3L3wzo8q7mru0fPoh2Wc9XGPNBqolT76HM77KTvYzANCnsMIUARMtsCEkn+xTRN03vn3L Y91tgsw1F8rzDk1Fgh1yRceWxN1kcVW/6+zHkRnR3+ZTL1hoXTW0bNvgqZcYtIskpjbzzw MZj1lb3DcKll8vSCD8Msrah1dbD6qP1DSIvpve/4iSsqTHarHwR5bsVkOXeBmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxMNT5yJ9z1Bkl for ; Thu, 16 Apr 2026 15:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f927 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:28:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Herbert J. Skuhra From: Mitchell Horne Subject: git: 88c2e9749db6 - stable/15 - ObsoleteFiles.inc: remove stale allwinner pages 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 88c2e9749db6211bdaf83c135847764a650e9851 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:28:25 +0000 Message-Id: <69e10019.1f927.5a690efd@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=88c2e9749db6211bdaf83c135847764a650e9851 commit 88c2e9749db6211bdaf83c135847764a650e9851 Author: Herbert J. Skuhra AuthorDate: 2026-02-09 19:56:47 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 15:17:35 +0000 ObsoleteFiles.inc: remove stale allwinner pages These were moved out of man/man4/arm into man/man4. Add entries to catch the stale copies. Fixes: 15c79c6fa608 ("man4: move allwinner pages and logic to a standard place") (cherry picked from commit 1c9ca4cf71841d5f6cee070143b9e29d541e4124) --- ObsoleteFiles.inc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index a1e9939801ac..661cdd3884a0 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,7 @@ # xargs -n1 | sort | uniq -d; # done + # 20260402: posix_spawn_file_actions_addchdir lost _np suffix OLD_FILES+=usr/share/man/man3/posix_spawn_file_actions_addchdir_np.3.gz OLD_FILES+=usr/share/man/man3/posix_spawn_file_actions_addfchdir_np.3.gz @@ -60,6 +61,14 @@ OLD_FILES+=usr/share/doc/ncurses/hackguide.html OLD_FILES+=usr/share/doc/ncurses/ncurses-intro.html OLD_DIRS+=usr/share/doc/ncurses +# 20260209: Moved allwinner pages to share/man/man4 +OLD_FILES+=usr/share/man/man4/arm/aw_gpio.4.gz +OLD_FILES+=usr/share/man/man4/arm/aw_mmc.4.gz +OLD_FILES+=usr/share/man/man4/arm/aw_rtc.4.gz +OLD_FILES+=usr/share/man/man4/arm/aw_sid.4.gz +OLD_FILES+=usr/share/man/man4/arm/aw_spi.4.gz +OLD_FILES+=usr/share/man/man4/arm/aw_syscon.4.gz + # 20260204: replaced with ATF test OLD_FILES+=usr/tests/usr.bin/m4/legacy_test OLD_FILES+=usr/tests/usr.bin/m4/regress.sh From nobody Thu Apr 16 15:28:26 2026 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 4fxMNX5Z2dz6ZrHV for ; Thu, 16 Apr 2026 15:28: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxMNW06Vxz3FqH for ; Thu, 16 Apr 2026 15:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RHZ4qWUX6HJtmwCYy/Dvn/F0/BCaLh5YNvLaSqALMpc=; b=grXEjrth1XSYh9RjPMxe/2h74Paoumfzae86ar5t2KRtbdUjit8ZQv9XsKI3akKdgw3R3v cnlH6Fzymf+KKa2xsKizMgV7anTtxCOc1Jgm2+GOjy7igcO3ynqNxPhr4r3dcryXv8NrJk BtsGVrj+NACk4TzMwsxEWpATB8YPOp1njjFdl1lwFYHrIOuiQUYgJ3VydyI6o0yKESRj/3 0A3kvsEmJ1/Mif+gSJX8XZRRZtKngyOGYHZBT69hMXPsjqAPwYPO/jEXgxWKwuhRd8P56r BPZR3EN7a4tXrTkiodUrwPkA3OAhieUnSvlqQNXOho/llWje6REjK63x71usxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776353307; a=rsa-sha256; cv=none; b=pDgv4g+Ts+Vl774+5kzo5j1V5OzMtXWmcSWTZyGPm3L7wD4bkWJY5UpvBLI7e0mXt4ZYbK v89YwfJRURVAHoltZgO36wrgIFRlpTNDu5qYr0RB0wP/G/s542TsK4ELp2+L+hyGawcZwN MRshJSShL1G+KBWYERk4gfZMRM5wZwtDp2qY96tybbqf+95CZUQ6gyBAROn5O9Rz6Sfq5U Ve4GgIn+T/Wt4eY4ZO9UL7L6MsXFzi0P5iB9x0ZYf69IH7iWAeAv5APmR5GCC+r9mm23mE 2oBUMQ35k1yT1RfXDdnYalPB2cKxNshM/K9X5YdHkzddmMFpH2Ffu23Frz6wAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RHZ4qWUX6HJtmwCYy/Dvn/F0/BCaLh5YNvLaSqALMpc=; b=UjpsvI31GmhhBYOkZgfZWWiEKpcLMC4AslRS+/CXzbvI9gKmqpSEbowjpwmbhBVyFzTvvK WQFY2S+8Z0IqDsrmumtHZnN1pxSYAQOF23b8nS9/FBQvdR8QagyK4qZdF3Z5rpa+LlNVVP 0uIs9CX05ahTmnEulxte425oaZT0mKIL7yrmi1llLDDr9ohGoeY034YVyFQQfEeK6y4At0 vlAps8oQIeqh1sk5FveVqhsSV1qySUGn8O3DVB/rAQC5/z86DnakNkszZR1pHOSFf/cW9t 6CDqWzZwTJFjqXuK6//NTmaAuuBs9f43psqiI8I+TT7c9Et80l3+a0m15GzGBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxMNV6ZB9z1CHf for ; Thu, 16 Apr 2026 15:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ebdc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:28:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ali Mashtizadeh From: Mitchell Horne Subject: git: f72a16118608 - stable/15 - hwpmc: Use rdtsc instead of rdtscp for timestamps 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: f72a161186084f170de8ace22722e848cb1073fa Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:28:26 +0000 Message-Id: <69e1001a.1ebdc.3682fc90@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f72a161186084f170de8ace22722e848cb1073fa commit f72a161186084f170de8ace22722e848cb1073fa Author: Ali Mashtizadeh AuthorDate: 2026-03-23 20:21:21 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 15:18:24 +0000 hwpmc: Use rdtsc instead of rdtscp for timestamps No need for a barrier here, we are inside an NMI handler and executing a number of serializing instructions with stronger semantics. Reducing this overhead will increase our maximum safe sampling rate. Tested by: Paulo Fragoso Reviewed by: mhorne MFC after: 1 week Sponsored by: Netflix Pull Request: https://github.com/freebsd/freebsd-src/pull/2076 (cherry picked from commit 39515d8b623a2be39d0c42a537fd9a17c417ff6e) --- sys/dev/hwpmc/hwpmc_mod.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index a6a6ae68996c..04e23ae24c31 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -812,11 +812,9 @@ pmc_force_context_switch(void) uint64_t pmc_rdtsc(void) { -#if defined(__i386__) || defined(__amd64__) - if (__predict_true(amd_feature & AMDID_RDTSCP)) - return (rdtscp()); - else - return (rdtsc()); +#if defined(__i386__) + /* Unfortunately get_cyclecount on i386 uses cpu_ticks. */ + return (rdtsc()); #else return (get_cyclecount()); #endif From nobody Thu Apr 16 15:28:28 2026 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 4fxMNY01Qbz6Zr8w for ; Thu, 16 Apr 2026 15:28: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxMNX0zCfz3Fy1 for ; Thu, 16 Apr 2026 15:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wafuA60enj0j3iuqIwYzSXQeqZL8Pjy7g/TdY9GQGBE=; b=OYJ3VEPzguN13RfZlO8J2PBBkNW9ZQDNzT886s0o1z8/6j2EQ/9enEd8r/FXxqnuTT07tH dXVznO82Qbs+W5GZp1XOgq/0zm7JoqtwRv5n8YHb5VVEjy7mkuydIlzeCnC0uRpUK9wwic rkiKK58zwWw4BGWTLhUmEhwEaaAi9jGe/yWtb4dqOTOXRQ34T5lCQoBqaeplNbHtKcp+18 SOe2oD8lB6y5L8hqOGk15TLCpzUg9gSd2tK+Ty5gVtIrJi3XcJDdcP84X8eYs8RaNvvRZa c4FAHUaQTyhxWHsuZ2zSJiFLpmypD0dm4LWZ+DPW89wZnTkJ9pf9Ztqt2IEq+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776353308; a=rsa-sha256; cv=none; b=VIRhBHsnEPk4Cffyk0GG3y573Y1XD3v7pJ+3KbV+q6nXoVpJUASGlseyV/8AmAd2G04e7q YCh9VotRhFJcAfGB0ghRfsoUSZP2a6xrKcqBBn9ITR5N91i7LEC2l1D9XGQ6Gti4SvFcbX z/AeitqIz2NlhyvndCSA+I7Grvldol1SdflvUdR4ChaAxkUfVEj9DWbYmcNOB7xCiQa+vD kneqNYdX4ELI/PXfjva/aZzLdoqIUw0T+R/EGIzJHUadlwa7EbPQfvRVsZ3Rqm+doiKC11 sm7we/pu/u2JvzIbVMO0mGhBVDXS2WoWSOo7MfGJfeQ1bvWP++ZHtIy7CIQ1mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wafuA60enj0j3iuqIwYzSXQeqZL8Pjy7g/TdY9GQGBE=; b=C32iFAqN/3VI5RxHqogKGYE/5FtzNcPZdxNezXhVxKNBWLSzMAO2eXZNi3X5HOmiItbQHo wZk3GEHHN2+vdfBGMYlrr75e03Ut+S18mr6JrlVuaH3lKBapLgXqZJ5PE26H/UcRtwxhGW OSS2vWakGBYmBr2KCW2eMEvxNvqU45gIG7VKWoziEwmn3HcYc0NoReSVw1AcTk3b2cuZTQ AjepJJ5+H1rn854wPakMdez1PelV7R3ZBFyIiQm3tASXJrqshBatgKrxbpWOCfTUMyG0ZN vQUsSn+wjU4iBP4IgflEQXp27lrUt1Hgm6qlA76X3SgdjSdVk5PPYxNavS8S9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxMNX0BF0z1C0H for ; Thu, 16 Apr 2026 15:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 201f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:28:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Paulo Fragoso From: Mitchell Horne Subject: git: 928091964581 - stable/15 - hwpmc.4: correct stale default values and update diagnostics 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 9280919645816261823f5c4bc5ec6dd19c072e80 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:28:28 +0000 Message-Id: <69e1001c.201f8.c9aa4a@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9280919645816261823f5c4bc5ec6dd19c072e80 commit 9280919645816261823f5c4bc5ec6dd19c072e80 Author: Paulo Fragoso AuthorDate: 2026-03-23 20:17:54 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 15:18:25 +0000 hwpmc.4: correct stale default values and update diagnostics The default values documented for kern.hwpmc.logbuffersize (4KB) and kern.hwpmc.nbuffers_pcpu (64) have been incorrect since 2981a3420cb1 (2018), which updated the compiled defaults but did not update the man page. - Correct logbuffersize default from 4KB to 256KB, add 16MB maximum - Correct nbuffers_pcpu default from 64 to 32, document 32MB per-CPU product limit with kern.hwpmc.logbuffersize - Update DIAGNOSTICS section to reflect current warning messages Reviewed by: mhorne MFC after: 1 week Sponsored by: NLINK (nlink.com.br) Differential Revision: https://reviews.freebsd.org/D56050 (cherry picked from commit 2318ea10a3afb66c51078483f74c1a622811a619) --- share/man/man4/hwpmc.4 | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/share/man/man4/hwpmc.4 b/share/man/man4/hwpmc.4 index 54a251dcca76..8bb1cb96f694 100644 --- a/share/man/man4/hwpmc.4 +++ b/share/man/man4/hwpmc.4 @@ -441,7 +441,8 @@ The default is 16. The size in kilobytes of each log buffer used by .Nm Ns 's logging function. -The default buffer size is 4KB. +The default buffer size is 256KB. +The maximum value is 16MB. .It Va kern.hwpmc.mincount Pq integer, read-write The minimum sampling rate for sampling mode PMCs. The default count is 1000 events. @@ -449,10 +450,15 @@ The default count is 1000 events. The size of the spin mutex pool used by the PMC driver. The default is 32. .It Va kern.hwpmc.nbuffers_pcpu Pq integer, read-only -The number of log buffers used by +The number of log buffers per CPU used by .Nm for logging. -The default is 64. +The default is 32. +The product of +.Va kern.hwpmc.nbuffers_pcpu +and +.Va kern.hwpmc.logbuffersize +must not exceed 32MB per CPU. .It Va kern.hwpmc.nsamples Pq integer, read-only The number of entries in the per-CPU ring buffer used during sampling. The default is 512. @@ -518,16 +524,23 @@ was not configured with the required configuration option .It "hwpmc: tunable hashsize=%d must be greater than zero." A negative value was supplied for tunable .Va kern.hwpmc.hashsize . -.It "hwpmc: tunable logbuffersize=%d must be greater than zero." +.It "hwpmc: logbuffersize=%d must be greater than zero and less than or equal to %d, resetting to %d." A negative value was supplied for tunable .Va kern.hwpmc.logbuffersize . -.It "hwpmc: tunable nlogbuffers=%d must be greater than zero." +.It "hwpmc: nbuffers_pcpu=%d must be greater than zero, resetting to %d." A negative value was supplied for tunable -.Va kern.hwpmc.nlogbuffers . +.Va kern.hwpmc.nbuffers_pcpu . .It "hwpmc: tunable nsamples=%d out of range." The value for tunable .Va kern.hwpmc.nsamples was negative or greater than 65535. +.It "hwpmc: nbuffers_pcpu=%d * logbuffersize=%d exceeds %dMB per CPU limit, resetting to defaults (%d * %d)." +The product of tunables +.Va kern.hwpmc.nbuffers_pcpu +and +.Va kern.hwpmc.logbuffersize +exceeds the maximum per-CPU memory limit. +Both tunables are reset to their compiled defaults. .El .Sh DEBUGGING The From nobody Thu Apr 16 15:28:22 2026 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 4fxMNX2ylGz6Zr3n for ; Thu, 16 Apr 2026 15:28: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxMNW4hswz3FsW for ; Thu, 16 Apr 2026 15:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YRwGIqNiZ1mV9427WFnhXshrdGNsaATJtNAzAW3NU14=; b=ID61AFZBQFjnxAEngbzUmBAvLcjifQP8Ws4UfmrCSm2ygpqCTlN3/Fs79p/1u1/+c6k9/J +Cmcfpbn+aWTTcgQ9aWW4FYMAfzemrcaxqP/LxrCk2Y3BkR8yObeClcaI4BHp1r2tVn8tH FiDMeOOI8Nol35myUSS79zXDckuIHddk+ZBZHNG95F1OGpczxmeGGk8nF62T5FBL7jEwFZ 7eUO3snVoHOPLAssdDUO3F5dUfwwgJBBNilQngHJJc11wutzy01f5iAewsWFT+s+nnsTQy IjIp82BBeD7+UbIgYZznmck7hQeiFrNjHjqTNdTZJS8oG8VBEk+MeNKmNVUf5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776353307; a=rsa-sha256; cv=none; b=lb+Pk60OGX4z77BUwgNfAF8YFHzOkG6lB1f4Nam4f3ZRj4/MdBX5juzVQW6yYIY3bpTk8t b7MmyreZbN7angEnLSSen8E8M6jgcgso/ArtwZ0/v7FV0VrOa7RgnEuyI0sBpDwmKPA2Gh p1afcxmiskrDXcWM+2TiTk0GiMRsLL692npABwrRNDMtxDRXv4W6Ud2sa7sGXrdpr1MRnb f46njE6uLXJVpgOe+lfEfbXNDOlvs3wnoPJ307JLxNP86DP6bFDrDEBVSiQs0MGn4Xd284 rZeiXHLMuFRN459P5z7qgO3Jp2Dg/eoLLGnhSPyAzWlQ7P001DyOoYlSeY12Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YRwGIqNiZ1mV9427WFnhXshrdGNsaATJtNAzAW3NU14=; b=RXxRiioOqrkxxrwbHtXtFH0svd91sXWX1pulnkL2y/gQQnZTYkN3sJCoMhhsUaqzG5C8yL JqYRrDUQwIFfSsMnPWeoxdDuY8JEP45UeqSKC+pnDwQGfEugov2upET82waGeOJFqEpXiU GK4YpGQlHyHiwuzdIehFWnyiAT2a3eiEaxB/jbqOheslu0UiQiiHbBrZfZDmG/tFnRuL5s 7UjeiApFinoAa8xlgXi9qUkgh+hdFmAgTIAUnQBZDgdS/4/ql+g2oGFx9pKwPbb4qIV/l6 0GvvdZR+euP93wHSra6jxmJlOLuRkrYi0RfdWoihGbl7pJmkkdhVnAkYuiidfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxMNW4JGzz1C8b for ; Thu, 16 Apr 2026 15:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 201ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:28:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ali Mashtizadeh From: Mitchell Horne Subject: git: f0b8806a73fd - stable/15 - libpmc: Fix the L3 counters for AMD Zen 1-4 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: f0b8806a73fddef14757469dfb383130c636897f Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:28:22 +0000 Message-Id: <69e10016.201ee.a1ba7a4@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f0b8806a73fddef14757469dfb383130c636897f commit f0b8806a73fddef14757469dfb383130c636897f Author: Ali Mashtizadeh AuthorDate: 2026-01-23 05:34:13 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 15:10:59 +0000 libpmc: Fix the L3 counters for AMD Zen 1-4 On AMD processors libpmc was using the topic field (based on filename) to determine the counter's subclass. Unfortunately, the JSON definitions for AMD Zen 1-4 have the L3 counters in files shared with other counters. This change has libpmc to use the pmu field (which is derived from the Unit field in JSON) to determine the correct counter subclass. Reviewed by: mhorne MFC after: 2 weeks Sponsored by: Netflix Pull Request: https://github.com/freebsd/freebsd-src/pull/1984 (cherry picked from commit c215eef345501ce7dda374909b3195d9d69a4e9f) --- lib/libpmc/libpmc_pmu_util.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index 74a93ae963d7..de642aa71a18 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -498,18 +498,7 @@ pmc_pmu_amd_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, pm->pm_class = PMC_CLASS_K8; pe = pmu_event_get(NULL, event_name, &idx); - if (strcmp("l3cache", pe->topic) == 0){ - amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK(ped->ped_event); - amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_L3_CACHE; - amd->pm_amd_config |= AMD_PMC_TO_L3SLICE(ped->ped_l3_slice); - amd->pm_amd_config |= AMD_PMC_TO_L3CORE(ped->ped_l3_thread); - } - else if (strcmp("data fabric", pe->topic) == 0){ - - amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK_DF(ped->ped_event); - amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_DATA_FABRIC; - } - else{ + if (pe->pmu == NULL) { amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK(ped->ped_event); amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_CORE; if ((pm->pm_caps & (PMC_CAP_USER|PMC_CAP_SYSTEM)) == 0 || @@ -526,7 +515,19 @@ pmc_pmu_amd_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, amd->pm_amd_config |= AMD_PMC_INVERT; if (pm->pm_caps & PMC_CAP_INTERRUPT) amd->pm_amd_config |= AMD_PMC_INT; + } else if (strcmp("amd_l3", pe->pmu) == 0) { + amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK(ped->ped_event); + amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_L3_CACHE; + amd->pm_amd_config |= AMD_PMC_TO_L3SLICE(ped->ped_l3_slice); + amd->pm_amd_config |= AMD_PMC_TO_L3CORE(ped->ped_l3_thread); + } else if (strcmp("amd_df", pe->pmu) == 0) { + amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK_DF(ped->ped_event); + amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_DATA_FABRIC; + } else { + printf("PMC pmu '%s' is not supported!\n", pe->pmu); + return (EOPNOTSUPP); } + return (0); } From nobody Thu Apr 16 15:28:30 2026 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 4fxMNZ4WtRz6ZrBx for ; Thu, 16 Apr 2026 15:28: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxMNZ2c1kz3FyQ for ; Thu, 16 Apr 2026 15:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l50M0Iydf8vKEF2qNC9ymTDjfXalMYEIiJVMQUIFqGk=; b=PXdEqiXHEpGWRVYJtO6IFernNOVeWgLT6u+vv09XXDR2u1IJ39uy1hMZEr89PWrJ9u2s5O MMzvI4UAchHjPiYBfqYtreWFEMsVyISRKn/fpshV+DF8aoVGlTqyiVbgY+s555TCNCWhNk 9ZQ8aQ64ETRJKRH0FlaAK31fIOlL0boDTAGMAMH7YYHEtPDYp/fyEtJQiCqzTsD06Uw0+u zDIoEJtVcQ0clWkPBxUTy1zXWvtUdcJgWcXVpZW+myEUeLE7sg2WAATdMxjwcQxkBNttJq 9OhZ/CORzD5MgOljhD3zZJWxiFrC0VcBA1dEFKvY7j1Sv1JH6O3/vGiI1oUE0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776353310; a=rsa-sha256; cv=none; b=EA+U6VgTu25K87Jyx/DaTcLkm7W49f2yrqmoxuV9OwPQCaMlHI9LmZ76pdIzhcXE1+gWRs s5mFm2CiI1KnMcWu6OgszyJ5gh8exq2wCAXTMJEMPe8w9BEr/mP+6A/4N8u6+9DyHU5Vv9 YP+BQ+dZqcSRvEjOUf/iocuB2hft7g4JfYXhAwGvY96WiObKeuGv0SvbFCF4c/RVSdKFZ4 USxTxewhHCZhq+qQ6iDEpjmb8Oi2QCJiSkQm20LU0/zE9wc3/JW/vrEFuFzVoORrv07STH DNHOceuTpphLdsZdykfC3KY/UBoFkNkcNiE9RJaCUYo7wTwRFtvF5RWJOzfqkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l50M0Iydf8vKEF2qNC9ymTDjfXalMYEIiJVMQUIFqGk=; b=F+PTh4bCaSSmbmE8emFnWKFMLN8JPo/qbO+4cPHOCI04R57cpC2adqwcbR51kEBCYfHj+q TdjVWrvnrf1EcRWM34FXv1jA+6nsXl3SHzXJPN7cj2vL7ym/Q3DMhVnycWM9ohUfnT8LY0 RH2Jd+lQsuV93/S3aD7uIrjGXWJLjVn8bGZ9P8bw91/5PNMsLT144Gd8Yhq4QrAxMPPx/1 qJReX8gNpKX60Ko5+VlR/r3PFW+PSb8hUoA+KuoZV3sHPej/KkI8u40CZ79v3kgK8lajhj +1OHhCXknmUiuV1437CZVuEsDJYVkI6B7Xr8TKlKLEZtYiFBmRWlo74O13ItxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxMNZ1pGGz1CTf for ; Thu, 16 Apr 2026 15:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20395 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:28:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Turner From: Mitchell Horne Subject: git: 14b182448926 - stable/15 - conf: Mark vchiq as depending on fdt 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 14b18244892678e6d6765fd233658339bedd207e Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:28:30 +0000 Message-Id: <69e1001e.20395.5e840cd4@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=14b18244892678e6d6765fd233658339bedd207e commit 14b18244892678e6d6765fd233658339bedd207e Author: Andrew Turner AuthorDate: 2025-11-18 18:00:33 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 15:24:52 +0000 conf: Mark vchiq as depending on fdt Fix an ACPI only kernel by only building the vchiq files when FDT is enabled. Fixes: 745c4aa5e8f0 ("Make BRCM2837 port conform FreeBSD/ARM64 guidelines") Sponsored by: Arm Ltd (cherry picked from commit 7446569bbcb42c08c650a5e1015f544f13066d7f) --- sys/conf/files.arm64 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 06dc1c42d901..ab6d0c91c947 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -590,23 +590,23 @@ arm/broadcom/bcm2835/bcm283x_dwc_fdt.c optional dwcotg fdt soc_brcm_bcm2837 | arm/broadcom/bcm2835/bcm2838_pci.c optional soc_brcm_bcm2838 fdt pci arm/broadcom/bcm2835/bcm2838_xhci.c optional soc_brcm_bcm2838 fdt pci xhci arm/broadcom/bcm2835/raspberrypi_gpio.c optional soc_brcm_bcm2837 gpio fdt | soc_brcm_bcm2838 gpio fdt -contrib/vchiq/interface/compat/vchi_bsd.c optional vchiq soc_brcm_bcm2837 \ +contrib/vchiq/interface/compat/vchi_bsd.c optional vchiq soc_brcm_bcm2837 fdt \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c optional vchiq soc_brcm_bcm2837 \ +contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c optional vchiq soc_brcm_bcm2837 fdt \ compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_arm.c optional vchiq soc_brcm_bcm2837 \ +contrib/vchiq/interface/vchiq_arm/vchiq_arm.c optional vchiq soc_brcm_bcm2837 fdt \ compile-with "${NORMAL_C} -Wno-unused ${NO_WDEFAULT_CONST_INIT_FIELD_UNSAFE} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_connected.c optional vchiq soc_brcm_bcm2837 \ +contrib/vchiq/interface/vchiq_arm/vchiq_connected.c optional vchiq soc_brcm_bcm2837 fdt \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_core.c optional vchiq soc_brcm_bcm2837 \ +contrib/vchiq/interface/vchiq_arm/vchiq_core.c optional vchiq soc_brcm_bcm2837 fdt \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c optional vchiq soc_brcm_bcm2837 \ +contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c optional vchiq soc_brcm_bcm2837 fdt \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c optional vchiq soc_brcm_bcm2837 \ +contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c optional vchiq soc_brcm_bcm2837 fdt \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_shim.c optional vchiq soc_brcm_bcm2837 \ +contrib/vchiq/interface/vchiq_arm/vchiq_shim.c optional vchiq soc_brcm_bcm2837 fdt \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" -contrib/vchiq/interface/vchiq_arm/vchiq_util.c optional vchiq soc_brcm_bcm2837 \ +contrib/vchiq/interface/vchiq_arm/vchiq_util.c optional vchiq soc_brcm_bcm2837 fdt \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" # Cavium From nobody Thu Apr 16 15:28:29 2026 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 4fxMNY3s8yz6Zr6q for ; Thu, 16 Apr 2026 15:28: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxMNY1T69z3FwP for ; Thu, 16 Apr 2026 15:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WGIYAot2eMmf84bLLBjUtXNowpVLeXeH1ETPh93h7Sc=; b=t24kE//hH+gelSwOLvzZSvhFQI1wt/+sK1lhMJx6YB25UJhLbMc+qq5RlAQaoksq7T9OO1 xr4EZXvWJ1GuTo8ugtbuWY5epzp/8xXTg6Q6JDI/esXrR4bhIH//saOCeHr5xqTDKf1ef8 dsA1cG9ZFJ6Of9ZHnWJxwuXg/G0zg348QtqfJJGdPldch8liOcqOk+dH5GTLGOk1yuE5P9 aLdqu6t+XbdjcRNkI4Vx9IcHBCtLCVGpq9+AJDVy8wq8IIvqag6sXZVoDQi24GdDyfbF7o 7SIzGHcQHMV1M0ssI5vBfIJSj40FbnkvZEzAD8PVYY3QqKRkOpYbLudvjBvXvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776353309; a=rsa-sha256; cv=none; b=Y35SHzGh0mXDDxMANot7ja03ts4Jwvx8QtW7o6mhoyLLQNTF13s902ue6wJ8XvZJc0pw3y tcARHxYP8BhXlZ3pOeFrAtTnK+AXaWbKW31rwCLHYGWa9P2WzaH1BIYY9RNQ3aW88ksPZB 89r9CbXyCxFNseXIaMfjnXo3LOJBSiJZYTqfk0YHZF5fxMPbt2Nk49wSVVhf1UrjEXfJLK EAk9o3p4IVJDCk8TfUs6kuVmRiOARlsQtS0lf8dJBKHTyyugU3NhlOmmrGN9NBl/c2UwI/ kI+07lyuiHHFtMoUbjwtpzRMIGwSqH9X9BoVqIXMniYyUUdck/czigZpN0/L/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WGIYAot2eMmf84bLLBjUtXNowpVLeXeH1ETPh93h7Sc=; b=E01UUsoNpUC2sbeP83JDrHsy7uP/+CYqjwXr1UqQjfr46PZ7X41Xq1nNthGZ5lO6wXmp2D WJyBVWS2IceaoaqW9oJP1oCy5NfJWQEk3NI5GtnzX531BMCiqNxxuqQHMwe39Jsyyh3R86 PPkflKDKnOlOsHFbyoTxehOmV+fiYW3NhZf6XD+5vfDICa3vTkrsfluuezbMFNZKNkEvxp S6+2TqI8w9fRUXoByiqRI6YZP9XcVI6vJ2kOWEX/PRuE7nB4pgdwmKXQiuHo4er4doAuS8 EqrZmVBgJOCSxgFMjY84iWDClShNGgSHZ4vsmO7lBUqDOoLS9oQsmuHzZrMy8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxMNY11D0z1CCb for ; Thu, 16 Apr 2026 15:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20236 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:28:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Paulo Fragoso From: Mitchell Horne Subject: git: 290a7adfb1df - stable/15 - hwpmc: improve diagnostic messages for invalid tunables 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 290a7adfb1df0fb0e8ee4161cf002db929a10fc5 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:28:29 +0000 Message-Id: <69e1001d.20236.25139544@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=290a7adfb1df0fb0e8ee4161cf002db929a10fc5 commit 290a7adfb1df0fb0e8ee4161cf002db929a10fc5 Author: Paulo Fragoso AuthorDate: 2026-03-23 14:54:18 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 15:18:25 +0000 hwpmc: improve diagnostic messages for invalid tunables Replace printf() with log(LOG_WARNING, ...) in pmclog_initialize() so that tunable validation failures are visible in dmesg and /var/log/messages rather than only on the early console. Also improve the messages to report both the invalid value and the default it resets to, making it easier for users to understand why their tunable was ignored. While here, adjust some whitespacing/style. Reviewed by: Ali Mashtizadeh , mhorne MFC after: 1 week Sponsored by: NLINK (nlink.com.br) Differential Revision: https://reviews.freebsd.org/D56029 (cherry picked from commit b3a18736ec2fc2bd097995dedd8d09e79bcb2056) --- sys/dev/hwpmc/hwpmc_logging.c | 35 ++++++++++++++++++++++++++--------- sys/sys/pmc.h | 2 ++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_logging.c b/sys/dev/hwpmc/hwpmc_logging.c index 8fd7ef06a977..4f507523b6ab 100644 --- a/sys/dev/hwpmc/hwpmc_logging.c +++ b/sys/dev/hwpmc/hwpmc_logging.c @@ -58,6 +58,7 @@ #include #include #include +#include #if defined(__i386__) || defined(__amd64__) #include @@ -1236,24 +1237,39 @@ pmclog_initialize(void) struct pmclog_buffer *plb; int domain, ncpus, total; - if (pmclog_buffer_size <= 0 || pmclog_buffer_size > 16*1024) { - (void) printf("hwpmc: tunable logbuffersize=%d must be " - "greater than zero and less than or equal to 16MB.\n", - pmclog_buffer_size); + if (pmclog_buffer_size <= 0 || + pmclog_buffer_size > PMC_LOG_BUFFER_SIZE_MAX) { + log(LOG_WARNING, + "hwpmc: logbuffersize=%d must be greater than zero " + "and less than or equal to %d, resetting to %d\n", + pmclog_buffer_size, PMC_LOG_BUFFER_SIZE_MAX, + PMC_LOG_BUFFER_SIZE); + pmclog_buffer_size = PMC_LOG_BUFFER_SIZE; } if (pmc_nlogbuffers_pcpu <= 0) { - (void) printf("hwpmc: tunable nlogbuffers=%d must be greater " - "than zero.\n", pmc_nlogbuffers_pcpu); + log(LOG_WARNING, + "hwpmc: nbuffers_pcpu=%d must be greater than zero, " + "resetting to %d\n", + pmc_nlogbuffers_pcpu, PMC_NLOGBUFFERS_PCPU); + pmc_nlogbuffers_pcpu = PMC_NLOGBUFFERS_PCPU; } - if (pmc_nlogbuffers_pcpu*pmclog_buffer_size > 32*1024) { - (void) printf("hwpmc: memory allocated pcpu must be less than 32MB (is %dK).\n", - pmc_nlogbuffers_pcpu*pmclog_buffer_size); + + if (pmc_nlogbuffers_pcpu * pmclog_buffer_size > + PMC_NLOGBUFFERS_PCPU_MEM_MAX) { + log(LOG_WARNING, + "hwpmc: nbuffers_pcpu=%d * logbuffersize=%d exceeds " + "%dMB per CPU limit, resetting to defaults (%d * %d)\n", + pmc_nlogbuffers_pcpu, pmclog_buffer_size, + PMC_NLOGBUFFERS_PCPU_MEM_MAX / 1024, + PMC_NLOGBUFFERS_PCPU, PMC_LOG_BUFFER_SIZE); + pmc_nlogbuffers_pcpu = PMC_NLOGBUFFERS_PCPU; pmclog_buffer_size = PMC_LOG_BUFFER_SIZE; } + for (domain = 0; domain < vm_ndomains; domain++) { ncpus = pmc_dom_hdrs[domain]->pdbh_ncpus; total = ncpus * pmc_nlogbuffers_pcpu; @@ -1270,6 +1286,7 @@ pmclog_initialize(void) pmc_plb_rele_unlocked(plb); } } + mtx_init(&pmc_kthread_mtx, "pmc-kthread", "pmc-sleep", MTX_DEF); } diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h index 12b8ddcb156f..69399ec24743 100644 --- a/sys/sys/pmc.h +++ b/sys/sys/pmc.h @@ -649,7 +649,9 @@ struct pmc_op_getdyneventinfo { #define PMC_HASH_SIZE 1024 #define PMC_MTXPOOL_SIZE 2048 #define PMC_LOG_BUFFER_SIZE 256 +#define PMC_LOG_BUFFER_SIZE_MAX (16 * 1024) #define PMC_NLOGBUFFERS_PCPU 32 +#define PMC_NLOGBUFFERS_PCPU_MEM_MAX (32 * 1024) #define PMC_NSAMPLES 256 #define PMC_CALLCHAIN_DEPTH 128 #define PMC_THREADLIST_MAX 128 From nobody Thu Apr 16 15:28:31 2026 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 4fxMNc26P3z6ZrL5 for ; Thu, 16 Apr 2026 15:28:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxMNb3G8fz3Fns for ; Thu, 16 Apr 2026 15:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RS2hg+tuTdN8Y9dskW+d/p+EoIQv0CUxT15AOE9R1Dc=; b=lQlutxObrps1iWQlQ/kZRuotEzrF6jUN1VIPZIhCgr+/7fzjhZ8O+v8WIWTlPManGwZJ5o 2GGOAc34+UOm5Q3nrOw4PzgZl29qfNm5A+AeKybXaoteDAL8RL+lnug5vnIVB19xLvB9fE 3SSb7VOJYyInxT848liBhl0heOgEBo7Hk6SL/5d6w9I/IFoxHg+U1Pmy1Lij+TWu/Z5c9v t/l5jgig7+5q6nbGBrLlok/yRlyhcj+u+u7WgjEsPsTbgY4nhtjwfFmgDqGu7YB2XBMC0s h/BowZ4nj94/uARrjbGcHOXNHsGpCnu0nyviID4oM5+YAob3GRQcTiqI9ZSHbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776353311; a=rsa-sha256; cv=none; b=pvrMm6pIWBrXods8GzlD04AMAwMViJSIW5HvJscerRfwidcUCftWyZLRaF6hzB7xHQm4F2 cLglOG4QktUc74//kIHwgYkQWO6/7CFy12j1wQ2HwPn+5r6MkCcZqpkh2CS6yfeyGSwiEE Hcye9/V3k+2hVCQhwybmIVbcGsb16uXSsvCbYD3syI7LMkiffAFDhlvduHmJ1MfOE+20tp 20ytE9zE2MSJbgdIlcaCJvBTS5+xnpQjIz3siHTavtyicGLobRQz+Iw7YqHczjlcmSAGCO cdE9G+FvNn5wFgPAAW2LBfQ+umQyclvEK9MVJWtjHXIx+pn5dsvksRbQsg0JnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RS2hg+tuTdN8Y9dskW+d/p+EoIQv0CUxT15AOE9R1Dc=; b=eA40hcANLV72h1w9zLCG4gD4CT39fFlMtkb1vQx2gE4H/WNvzTATwXGJ/Lcs7GtggQ7DF5 mzC4arge+9q35e62anJq/fELJTKDo7vdr5hCq6C6MlH1R0DpWToltsTm6oL5k5mXdeB/0Z 6ujv/o+IPoo1k/2B8SLfTM28Wt7iQcOmplyw+1CWBO7WSgKoA4XRnAKG08RqhhiwE/cl+u ApiZ95Cx1U7MogA5LMBsw28Dawh8XQGVs9NOhtl9swbTQL1acRBv1NIQKtKU4y/9iXZPkj HYjK9/uX5LPZLSBLkKp199XvvzrVoo3kdzlq0HbkI9HJUpilZfUpw3PkjyGD/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxMNb2gXyz1CHh for ; Thu, 16 Apr 2026 15:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f92c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:28:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tetsuya Uemura From: Mitchell Horne Subject: git: fb10574334ca - stable/15 - bcm2835_virtgpio: Add driver for virtual GPIO controller on some RPi models 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: fb10574334caedc02819f1bcbe0f13ea558689be Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:28:31 +0000 Message-Id: <69e1001f.1f92c.715a7656@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=fb10574334caedc02819f1bcbe0f13ea558689be commit fb10574334caedc02819f1bcbe0f13ea558689be Author: Tetsuya Uemura AuthorDate: 2026-03-30 15:24:38 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 15:25:07 +0000 bcm2835_virtgpio: Add driver for virtual GPIO controller on some RPi models This driver enables bcm2835-virtgpio GPIO controller found on RPi3B and some CM boards. On which, the ACT (green) LED is connected to this controller. It is essential for FreeBSD to have this driver to control this LED. It will be exposed via gpioled(4). Reviewed by: mhorne MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51456 (cherry picked from commit 84c68dbb59df81d5371f0d1eea888d30561d428d) --- sys/arm/broadcom/bcm2835/bcm2835_firmware.h | 12 + sys/arm/broadcom/bcm2835/raspberrypi_virtgpio.c | 347 ++++++++++++++++++++++++ sys/conf/files.arm64 | 1 + 3 files changed, 360 insertions(+) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_firmware.h b/sys/arm/broadcom/bcm2835/bcm2835_firmware.h index 8c77dac7d710..13116999d38c 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_firmware.h +++ b/sys/arm/broadcom/bcm2835/bcm2835_firmware.h @@ -195,6 +195,18 @@ union msg_set_gpio_config { } resp; }; +#define BCM2835_FIRMWARE_TAG_GET_GPIOVIRTBUF 0x00040010 +#define BCM2835_FIRMWARE_TAG_SET_GPIOVIRTBUF 0x00048020 + +union msg_gpiovirtbuf { + struct { + uint32_t addr; + } req; + struct { + uint32_t addr; + } resp; +}; + int bcm2835_firmware_property(device_t, uint32_t, void *, size_t); #endif diff --git a/sys/arm/broadcom/bcm2835/raspberrypi_virtgpio.c b/sys/arm/broadcom/bcm2835/raspberrypi_virtgpio.c new file mode 100644 index 000000000000..64ce6fda6306 --- /dev/null +++ b/sys/arm/broadcom/bcm2835/raspberrypi_virtgpio.c @@ -0,0 +1,347 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Tetsuya Uemura + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * This is a driver for bcm2835-virtgpio GPIO controller device found on some + * Raspberry Pi models (listed below but not limited to). On which, the green + * LED (ACT) is connected to this controller. With the help of this driver, a + * node corresponding to the green LED will be created under /dev/led, allowing + * us to control it. + * + * Applicable models (according to the FDTs of those models): + * Compute Module 2 (CM2) + * 3 Model B (not 3B+) + * Compute Module 3 (CM3) and possibly 3+ (CM3+) + * Compute Module 4 SODIMM (CM4S) + */ + +#include "opt_platform.h" + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include + +#include +#include + +#include "gpio_if.h" + +#define RPI_VIRT_GPIO_PINS 2 + +struct rpi_virt_gpio_softc { + device_t busdev; + device_t firmware; + struct mtx sc_mtx; + + void *vaddr; /* Virtual address. */ + vm_paddr_t paddr; /* Physical address. */ + + struct gpio_pin gpio_pins[RPI_VIRT_GPIO_PINS]; + uint32_t state[RPI_VIRT_GPIO_PINS]; +}; + +#define RPI_VIRT_GPIO_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx) +#define RPI_VIRT_GPIO_UNLOCK(_sc) mtx_unlock_spin(&(_sc)->sc_mtx) + +static struct ofw_compat_data compat_data[] = { + {"brcm,bcm2835-virtgpio", 1}, + {NULL, 0} +}; + +static device_t +rpi_virt_gpio_get_bus(device_t dev) +{ + struct rpi_virt_gpio_softc *sc; + + sc = device_get_softc(dev); + + return (sc->busdev); +} + +static int +rpi_virt_gpio_pin_max(device_t dev, int *maxpin) +{ + *maxpin = RPI_VIRT_GPIO_PINS - 1; + + return (0); +} + +static int +rpi_virt_gpio_pin_getcaps(device_t dev, uint32_t pin, uint32_t *caps) +{ + if (pin >= RPI_VIRT_GPIO_PINS) + return (EINVAL); + + *caps = GPIO_PIN_OUTPUT; + + return (0); +} + +static int +rpi_virt_gpio_pin_getflags(device_t dev, uint32_t pin, uint32_t *flags) +{ + if (pin >= RPI_VIRT_GPIO_PINS) + return (EINVAL); + + *flags = GPIO_PIN_OUTPUT; + + return (0); +} + +static int +rpi_virt_gpio_pin_set(device_t dev, uint32_t pin, uint32_t value) +{ + struct rpi_virt_gpio_softc *sc; + uint32_t *ptr; + uint16_t on, off; + + if (pin >= RPI_VIRT_GPIO_PINS) + return (EINVAL); + + sc = device_get_softc(dev); + + RPI_VIRT_GPIO_LOCK(sc); + on = (uint16_t)(sc->state[pin] >> 16); + off = (uint16_t)sc->state[pin]; + + if (bootverbose) + device_printf(dev, "on: %hu, off: %hu, now: %d -> %u\n", + on, off, on - off, value); + + if ((value > 0 && on - off != 0) || (value == 0 && on - off == 0)) { + RPI_VIRT_GPIO_UNLOCK(sc); + return (0); + } + + if (value > 0) + ++on; + else + ++off; + + sc->state[pin] = (on << 16 | off); + ptr = (uint32_t *)sc->vaddr; + ptr[pin] = sc->state[pin]; + RPI_VIRT_GPIO_UNLOCK(sc); + + return (0); +} + +static int +rpi_virt_gpio_pin_get(device_t dev, uint32_t pin, uint32_t *val) +{ + struct rpi_virt_gpio_softc *sc; + uint32_t *ptr, v; + + if (pin >= RPI_VIRT_GPIO_PINS) + return (EINVAL); + + sc = device_get_softc(dev); + + ptr = (uint32_t *)sc->vaddr; + RPI_VIRT_GPIO_LOCK(sc); + v = ptr[pin]; + RPI_VIRT_GPIO_UNLOCK(sc); + *val = ((uint16_t)(v >> 16) - (uint16_t)v) == 0 ? 0 : 1; + + return (0); +} + +static int +rpi_virt_gpio_pin_toggle(device_t dev, uint32_t pin) +{ + int rv; + unsigned int val; + + if (pin >= RPI_VIRT_GPIO_PINS) + return (EINVAL); + + rv = rpi_virt_gpio_pin_get(dev, pin, &val); + if (rv != 0) + return (rv); + + rv = rpi_virt_gpio_pin_set(dev, pin, val == 0 ? 1 : 0); + + return (rv); +} + +static int +rpi_virt_gpio_probe(device_t dev) +{ + device_t firmware; + phandle_t gpio; + union msg_gpiovirtbuf cfg; + int rv; + + if (ofw_bus_status_okay(dev) == 0) + return (ENXIO); + + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) + return (ENXIO); + + gpio = ofw_bus_get_node(dev); + if (OF_hasprop(gpio, "gpio-controller") == 0) + return (ENXIO); + + /* Check whether the firmware is ready. */ + firmware = device_get_parent(dev); + rv = bcm2835_firmware_property(firmware, + BCM2835_FIRMWARE_TAG_GET_GPIOVIRTBUF, &cfg, sizeof(cfg)); + if (rv != 0) + return (ENXIO); + + device_set_desc(dev, "Raspberry Pi Virtual GPIO controller"); + + return (BUS_PROBE_DEFAULT); +} + +static int +rpi_virt_gpio_attach(device_t dev) +{ + struct rpi_virt_gpio_softc *sc; + union msg_gpiovirtbuf cfg; + int i, rv; + + sc = device_get_softc(dev); + sc->firmware = device_get_parent(dev); + mtx_init(&sc->sc_mtx, "Raspberry Pi virtgpio", NULL, MTX_SPIN); + + /* + * According to the Linux source at: + * https://github.com/raspberrypi/linux/blob/rpi-6.12.y/drivers/gpio/gpio-bcm-virt.c + * it first attempts to set the pre-allocated physical memory address + * in the firmware. If it is successfully acquired, access virtgpio via + * the virtual memory address mapped to that physical address. + * + * If the above fails, then as a fallback, attempts to obtain a + * physical memory address for accessing virtgpio from the firmware. + * And if obtained, link it to a virtual memory address and access + * virtgpio via it. + * + * An OpenWRT virtgpio driver I happened to see at first only + * implemented the fallback method. Then I implemented this method on + * FreeBSD and tested it with the 20240429 firmware, but it didn't + * work. + * + * At this point, I realised the first method in the source above. So I + * implemented this method on FreeBSD and tested it, and it worked. In + * my opinion, the second method was used until some time prior to + * 20240429, and then the firmware was modified and the first method + * was introduced. In my driver, only the first method exists. + */ + + /* Allocate a physical memory range for accessing virtgpio. */ + sc->vaddr = contigmalloc( + PAGE_SIZE, /* size */ + M_DEVBUF, M_ZERO, /* type, flags */ + 0, BCM2838_PERIPH_MAXADDR, /* low, high */ + PAGE_SIZE, 0); /* alignment, boundary */ + if (sc->vaddr == NULL) { + device_printf(dev, "Failed to allocate memory.\n"); + return ENOMEM; + } + sc->paddr = vtophys(sc->vaddr); + /* Mark it uncacheable. */ + pmap_change_attr((vm_offset_t)sc->vaddr, PAGE_SIZE, + VM_MEMATTR_UNCACHEABLE); + + if (bootverbose) + device_printf(dev, + "KVA alloc'd: virtual: %p, phys: %#jx\n", + sc->vaddr, (uintmax_t)sc->paddr); + + /* Set this address in firmware. */ + cfg.req.addr = (uint32_t)sc->paddr; + rv = bcm2835_firmware_property(sc->firmware, + BCM2835_FIRMWARE_TAG_SET_GPIOVIRTBUF, &cfg, sizeof(cfg)); + if (bootverbose) + device_printf(dev, "rv: %d, addr: 0x%x\n", rv, cfg.resp.addr); + if (rv != 0 || cfg.resp.addr != 0) + goto fail; + + /* Pins only support output. */ + for (i = 0; i < RPI_VIRT_GPIO_PINS; i++) { + sc->gpio_pins[i].gp_pin = i; + sc->gpio_pins[i].gp_caps = sc->gpio_pins[i].gp_flags + = GPIO_PIN_OUTPUT; + } + sc->busdev = gpiobus_add_bus(dev); + if (sc->busdev == NULL) + goto fail; + + bus_attach_children(dev); + return (0); + +fail: + /* Release resource if necessary. */ + free(sc->vaddr, M_DEVBUF); + mtx_destroy(&sc->sc_mtx); + + return (ENXIO); +} + +static int +rpi_virt_gpio_detach(device_t dev) +{ + return (EBUSY); +} + +static device_method_t rpi_virt_gpio_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, rpi_virt_gpio_probe), + DEVMETHOD(device_attach, rpi_virt_gpio_attach), + DEVMETHOD(device_detach, rpi_virt_gpio_detach), + + /* GPIO protocol */ + DEVMETHOD(gpio_get_bus, rpi_virt_gpio_get_bus), + DEVMETHOD(gpio_pin_max, rpi_virt_gpio_pin_max), + DEVMETHOD(gpio_pin_getcaps, rpi_virt_gpio_pin_getcaps), + DEVMETHOD(gpio_pin_getflags, rpi_virt_gpio_pin_getflags), + DEVMETHOD(gpio_pin_set, rpi_virt_gpio_pin_set), + DEVMETHOD(gpio_pin_get, rpi_virt_gpio_pin_get), + DEVMETHOD(gpio_pin_toggle, rpi_virt_gpio_pin_toggle), + + DEVMETHOD_END +}; + +static driver_t rpi_virt_gpio_driver = { + "gpio", + rpi_virt_gpio_methods, + sizeof(struct rpi_virt_gpio_softc), +}; + +EARLY_DRIVER_MODULE(rpi_virt_gpio, bcm2835_firmware, rpi_virt_gpio_driver, + 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index ab6d0c91c947..0ae122332e1f 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -590,6 +590,7 @@ arm/broadcom/bcm2835/bcm283x_dwc_fdt.c optional dwcotg fdt soc_brcm_bcm2837 | arm/broadcom/bcm2835/bcm2838_pci.c optional soc_brcm_bcm2838 fdt pci arm/broadcom/bcm2835/bcm2838_xhci.c optional soc_brcm_bcm2838 fdt pci xhci arm/broadcom/bcm2835/raspberrypi_gpio.c optional soc_brcm_bcm2837 gpio fdt | soc_brcm_bcm2838 gpio fdt +arm/broadcom/bcm2835/raspberrypi_virtgpio.c optional soc_brcm_bcm2837 gpio fdt | soc_brcm_bcm2838 gpio fdt contrib/vchiq/interface/compat/vchi_bsd.c optional vchiq soc_brcm_bcm2837 fdt \ compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c optional vchiq soc_brcm_bcm2837 fdt \ From nobody Thu Apr 16 15:28:32 2026 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 4fxMNc6wDbz6Zr2M for ; Thu, 16 Apr 2026 15:28:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxMNc43Ywz3Fyp for ; Thu, 16 Apr 2026 15:28:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWsQCWR9vVw5Lg4bzuPnXmGldLxy8GVRJCKDcgklkNg=; b=WxPulnj3ygnO40C10AnqQEu/Hk+bzxjCuWK6OuQW6f8ghwf2dj/V8WJ7H10Qcv9GgT+lKO ikQQRnHjWVF0CY8sT5ljwGoXYDgZ+2ufXyNhLj+ohXKRTahAASCGJKfaOm6tIUSjLd1fJz EKJqAE0CZWKsSCY/XmT8HNEHKirliyiiG37CnGWYkWizR3rfzzaNNQrUteLIjnQ9SF1VyP O+IesUTzIvOvaP58yaM0CI1KFEh3xIyOPT0GQTDD2VFuyhjnE78WDGuLCWwLs93djLfNf3 eXZQFQJ2ab9pWdHD1oJesoI53hdan6OBINFuBVVANoRBwUeIxYkdNoxz+vUsEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776353312; a=rsa-sha256; cv=none; b=iWN5y+P0JT8hi8svdo1jWigaerucRu6BKVuhOEwMJNo75ugNvInNFoEekWDMG28+EkbIFS QarswndEnMlG7S0yHUXGM0NJGl+ySCOr0SkzIkc6kmW+NQTUfgU+Lw/tf4TFjPmKjNx7Ho e0NGglhFPzj02MrE3VYm1JDvoMgYNLz/YDIMFZD4RJcdALiY8hJlsp/eDifhXTXLiToCZm IElqCv09PDhdNde/58+V98BoXGQkjW9+4qWiQ/YX0oblWl4GmHYEqx09rm7QL8BTEXXMU9 jICwfbKGsl9vfAI2Bjh/Uv0Fr8BvxxAQB8b75qBq/6+PRY6mnQjx2uQ46F43Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWsQCWR9vVw5Lg4bzuPnXmGldLxy8GVRJCKDcgklkNg=; b=eWp7N3tw5Ta7HlMiO1Hkls9qxZTeUsclopqMvKcWPg4vZknqpItZ9PRG5o3Aracm+e+bWQ 0ZYU3a4iepY3ydZiVURN08CBiSeZIfKdcL3eNf8offyHgqhZglZXda7vfKdGaHN+c6woS5 2BSCPmuDLwzyal46J1g5yJHxsZIHuMBu18ds0MchJDXPa8mrNxZyZGTg36/VmEw2/3rac0 gRaRMCMtd4QJr+ie0egujOBLKgPdzOu2s3Sz/UPM11lfXmc5Vx8z+B58JhtTQMlobcF2j0 onWmxQ86U/onBUEYBRDO137f7pS/rPK1gKwk4Eeh0fX+oRXNu7YEkDF2suYjKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxMNc3SJPz1CRb for ; Thu, 16 Apr 2026 15:28:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20bf9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:28:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 00e025341abb - stable/15 - malloc.9: adjust flag table indentation 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 00e025341abbde2ae49ea3dabd5c58212dc6aecb Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:28:32 +0000 Message-Id: <69e10020.20bf9.6de1e101@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=00e025341abbde2ae49ea3dabd5c58212dc6aecb commit 00e025341abbde2ae49ea3dabd5c58212dc6aecb Author: Mitchell Horne AuthorDate: 2026-03-31 19:42:55 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 15:25:07 +0000 malloc.9: adjust flag table indentation The current indentation is shorter than all but one of these flags. This renders much more nicely. MFC after: 3 days (cherry picked from commit be79a42275cad21c6087d8bbd6a328735ea813fa) --- share/man/man9/malloc.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9 index 01d224fc3cb3..06f5ed4ef360 100644 --- a/share/man/man9/malloc.9 +++ b/share/man/man9/malloc.9 @@ -222,7 +222,7 @@ The argument further qualifies .Fn malloc Ns 's operational characteristics as follows: -.Bl -tag -width indent +.Bl -tag -width "M_USE_RESERVE" .It Dv M_ZERO Causes the allocated memory to be set to all zeros. .It Dv M_NODUMP From nobody Thu Apr 16 15:28:33 2026 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 4fxMNf230hz6Zr98 for ; Thu, 16 Apr 2026 15:28: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxMNd5lcWz3G01 for ; Thu, 16 Apr 2026 15:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fhnhs32H56j0druWFIeXaIHZoEdttN62BYkdrOi/Pzw=; b=Oz9uNmg7Ai9aGhgNKpHcfbpgJKEdBv3VO7uA5BlhXxzendPG0Ypyu1J4q0+3YLZS8sQqiX RRIA5dTJJf1iu0OQ0EMDyvBn3Fa7W2awn+rNOG2iIr4b85sY7gu/XjWhqOyKOHTpRkKQV8 391KKDPmSplPSeL9X4E5N6Ied8jCk8PEhdgDhqbN2zAi8u5BhEltUJXEaJVpxTNgRL3Krf a4+2KIzQZhonkGMJFnt0PfyffWZVbydr4xP4MbZ8miJ6BHUwLv/iAOYRYxH+wyC5AcJ6Op Ys8z3doNU6iy5DhSRZBabAUuKDT7fWmWIDuU6dt6tTM542RWTe3ZbPM0lb0WHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776353314; a=rsa-sha256; cv=none; b=Y+oblWZWKbLOfzo1UpjEvAHEzSYLDsd+3WKiiYvliZ+36S2ERjNJbvrAG9+XcLYm9WGFgP sGd2sxiTs34zJByHFwzaCb7Umz9gh6TegXVKmh5Y9lba7QN37CoJn4Y4f778/Tl+6O03vc veS9TaWExXECOcFMKi3YD97qthWJQJMzQk/89zufCBhYZ+aG96XYmXd4/GhUIjGfJ3MAZI +k/aEvnz1xbb20nEGTNm3HxdfTWs4+hibWBi7H4h9cCuI5NNz1k7nfLNF/coG++Gmp4KrH j89CcQ6zFcOKWJJWSh0g3n8tbQcZdXRNx/iXpq9cgO/32PU5NngzB26TWyZK0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fhnhs32H56j0druWFIeXaIHZoEdttN62BYkdrOi/Pzw=; b=lda5evUpSmfr3gtbwZf/pIm2O/AkbyWNBrhP8n2ufmfHAKC+vSCUe2Kv5QMP/Sor2C/kLo 2tmPA7W2F14AKBlAgTrHHJz6P9NZwNGi/XjCL5/Y5JjXYVedBB8RBx7i2yVxNjNoJjHGFp BN1RoDmVrZMYBDGlGPevEdK+rU3bNTVevFOgI119XGdc6r/jqTJHZDmEJh6Xb63R7QOHHV nbyjm8zTBb9u1bbCxpQYDLAfebPxQ8TrfQKQgKMhA6auHnbDWMQViyrrZqiU1/B6xMqFYq XGB4WIrbwck37+pq4fVd+5beXRs316EM7SD70HpiujO8Q+vag4qTd8FgkBLNPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxMNd4DdFz1CTg for ; Thu, 16 Apr 2026 15:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e973 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:28:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kit Dallege From: Mitchell Horne Subject: git: 0a5c45744e21 - stable/15 - mq_open(2): document sysctl limit EINVAL and ENFILE conditions 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 0a5c45744e214275279b97f15b72fc8b9bd4da71 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:28:33 +0000 Message-Id: <69e10021.1e973.24a50abb@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=0a5c45744e214275279b97f15b72fc8b9bd4da71 commit 0a5c45744e214275279b97f15b72fc8b9bd4da71 Author: Kit Dallege AuthorDate: 2026-04-02 17:37:49 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 15:25:07 +0000 mq_open(2): document sysctl limit EINVAL and ENFILE conditions Document two missing error conditions for mq_open(2): - EINVAL: returned when mq_maxmsg exceeds kern.mqueue.maxmsg or mq_msgsize exceeds kern.mqueue.maxmsgsize. - ENFILE: add kern.mqueue.maxmq sysctl name to the existing entry. PR: 243209 Reviewed by: mhorne MFC after: 1 week Signed-off-by: Kit Dallege Pull Request: https://github.com/freebsd/freebsd-src/pull/2098 (cherry picked from commit 3e9f4fd6fc50300d052d5619d82a14d3488483d5) --- lib/libsys/mq_open.2 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/libsys/mq_open.2 b/lib/libsys/mq_open.2 index 4800ab18de59..f0b8618f62a5 100644 --- a/lib/libsys/mq_open.2 +++ b/lib/libsys/mq_open.2 @@ -35,7 +35,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.Dd May 15, 2024 +.Dd April 2, 2026 .Dt MQ_OPEN 2 .Os .Sh NAME @@ -282,6 +282,24 @@ and either or .Va mq_msgsize was less than or equal to zero. +.It Bq Er EINVAL +.Dv O_CREAT +was specified in +.Fa oflag , +the value of +.Fa attr +is not +.Dv NULL , +and either +.Va mq_maxmsg +exceeds the +.Va kern.mqueue.maxmsg +sysctl limit, +or +.Va mq_msgsize +exceeds the +.Va kern.mqueue.maxmsgsize +sysctl limit. .It Bq Er EMFILE Too many message queue descriptors or file descriptors are currently in use by this process. @@ -295,6 +313,9 @@ is longer than .Brq Dv NAME_MAX . .It Bq Er ENFILE Too many message queues are currently open in the system. +The system limit is controlled by the +.Va kern.mqueue.maxmq +sysctl. .It Bq Er ENOENT .Dv O_CREAT is not set and the named message queue does not exist. From nobody Thu Apr 16 15:28:34 2026 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 4fxMNg0WhMz6Zr6y for ; Thu, 16 Apr 2026 15:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxMNf5Gcfz3FrX for ; Thu, 16 Apr 2026 15:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hiTMTzA6mONjJgGUcdv5Wkul70YGvowWShyooZr2EhY=; b=bHLVPq//5YEHGr5j1XjYsPqlgj22Oo/NBKXXbhrj0kkNwBKSXHYc846nKtiQKI7Utw8TCH TnPm/UEerLLfTYJvP7PdAMM2onpfHUalx4JtkK24lTaXtJ37DkHGl3b2FGu/NZ8s+gwACP lagu9byNRXcj0XQk53MGzeqLNbTiKWXoseRVsA9JW8P43DHmmaqzcS8FBUvp2xTbQ4pmjL QngMqcTpzxYwgVcF2zJ49xQQnnQpqaS5+h62IbOhSpbPIKgXUa8D+mqotLuNJ1wTUxyM8f BIEaJhHKLJ7nPkTp/d6bGTJPzJH80XS8xlJuCzZ3mmmvVpLTeanfP5Id7jDmIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776353314; a=rsa-sha256; cv=none; b=a1mMQXb1k2PetWYT0exWXMi6avMRJ98aXLHT4ux+bfp0x2QWNMcGw2YAI8kXRtcAw2STae +aQU3aqw5PyQnyy4MnPn9hgbkYvoiY9VdkwsEbBB44Nwjjjb90zclTdCmRpiyRpcGEJ3pl m2yHRHpcVbnriwKezvU/s3Pyl3NPMVUQ9IYs1YZh3js4TDiHGhgoOJI/w/g1oG2llvCxqH tc8tVcmPx4I0J0fL0qik/axr60skKY5rdlszerWOAG4h2nhqv3bck5KwrUo9f3rBZLa7uj WVcZ5rw0uF/jj9R8LVkAdRReyZ592itoPvMorCmEo/DbWyBwRQp75SLHIXRgFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hiTMTzA6mONjJgGUcdv5Wkul70YGvowWShyooZr2EhY=; b=lj8pArp7aCTdVbs6E2bb1GtqqYNKgbv2JhYRCTH6qnx9ehy3ZCQjit3TYcrqWCx7pmm4GC bHuTBmy/7rKaIDnl5Lifzv+0ZgTnLqT6e+Dk1vEHu41gwtbOhRX2VQE68GirLQUaptI5fQ l5mKaYI0izIKgFVqjmFcjUjHPJ2gwx/AFCAHpvCqBn7MSSUHHJPm7dHVkOpFYB0jnMMU8H /bt+jPsHjynHN56A5l4+Wsd8ni/3QBhgblfmdIfg+EfLYeY0+8py6nuhbx2TS9laCtJcTc CyhZUheLpEM4oLyF6stFncH4HbuJoU/05mWwSotEwdIrDofnCrnKBp8CuccSfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxMNf4swqz1CTh for ; Thu, 16 Apr 2026 15:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fbb0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:28:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Weixie Cui From: Mitchell Horne Subject: git: 3f68410ae7a5 - stable/15 - freebsd32: Fix freebsd11_nstat copyout condition 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 3f68410ae7a574c5ac7a4409646e8a0e80e5c5c8 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:28:34 +0000 Message-Id: <69e10022.1fbb0.89178e9@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3f68410ae7a574c5ac7a4409646e8a0e80e5c5c8 commit 3f68410ae7a574c5ac7a4409646e8a0e80e5c5c8 Author: Weixie Cui AuthorDate: 2026-03-31 10:12:32 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 15:25:58 +0000 freebsd32: Fix freebsd11_nstat copyout condition freebsd11_freebsd32_nstat() invoked copyout(2) when freebsd11_cvtnstat32() failed and skipped copyout on success. This is backwards. Fix this to match freebsd11_freebsd32_nlstat() and freebsd11_nstat(), and only copy the nstat32 result to userspace when conversion succeeds. Signed-off-by: Weixie Cui Reviewed by: mhorne MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/2109 (cherry picked from commit c6224994ac70b4f71ef9e11903bb2e50ed2b1bfe) --- sys/compat/freebsd32/freebsd32_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 4ec6dd452b32..a0b6118900ed 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -2649,7 +2649,7 @@ freebsd11_freebsd32_nstat(struct thread *td, if (error != 0) return (error); error = freebsd11_cvtnstat32(&sb, &nsb); - if (error != 0) + if (error == 0) error = copyout(&nsb, uap->ub, sizeof (nsb)); return (error); } From nobody Thu Apr 16 15:56:49 2026 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 4fxN1G0llZz6ZtCV for ; Thu, 16 Apr 2026 15:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxN1F67fzz3NY4 for ; Thu, 16 Apr 2026 15:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776355009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VTitpA+xJioxWYX7JNKN91nhvYg6b5J3eaZPZkTpKQw=; b=hkhLvDuzZWr8dbaXr0Jzlc06oocTPzS9UyoJOfa+1mQhmoh72XrE1WtTPYVSXek5ovR5Z4 xK2QBw4fA7GXTP8oVWlg/zANcXl92xo1pK7Obuvn15AKLVgyC+4pS0s1w2ZxibuAp8wrh8 TxRvSXc24A5rb+83hxqAS2UeqnNgScO2DdoZ9o8JzEMC/zb1dyLaa+g0fa0TgNed7FO2Z9 mQoBypzx+aQiF+Dgmojr6uMwtqfdoEgMHSwnGNAdxJ1X1lRaGBBFthU8tyFwyf8K0fisHJ Ww0T8CHnvj68vbzRwk38EC88G9qSddhdlWuL91jCqu1Dc30xekDbEQwoNOpIzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776355009; a=rsa-sha256; cv=none; b=JpopKrnMUtoM75BR/PJpW+Ii8wDsk74XJanxsm9bg09HCmjxXGvB5VY738uydHhrRVD/Z1 R2aYeMLlxmvUdgnXzsqlboKAB1TT3BAtNRlMsGgryai20EAknAfjexI6mHLeatl8yGgRQe 9p9X75okAwIx3jBVqPxc3P+oNVFwQ1GNl5q39rvWnTorP/IWqS33j9gnQbin79Kac9Vn5E dxpXCGK0jHbuhZ6jf0VZ05tb4C45Ln0nU2mnF0MJeGLd3p2dNKCZRdthMORQbCyEFlpR21 4F5nVOfBsQgj5Z0k9i0m1d8nhofb5Sw2eWGbb/3hBti4nVAfK3Mare/G11hwpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776355009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VTitpA+xJioxWYX7JNKN91nhvYg6b5J3eaZPZkTpKQw=; b=NtoCLUzF1tp3qdh+0Bwxv8ap3k90RQWWia97BGLwU7zAmhWObyHyBIw4GMptgRB9dzUB4/ O004pXRMMl2uQtikYXgXyPNpNfJ5h3Oi6Q1wcvzY2fTqjk+A6AMxG80CqX5u3qH8ZDI4fo zmTvYHSgd6da71Y7gLQ1N6dUlXFTpsTwAW2d+40lz+zrv3abfKZapp1l2M3ogJrkavNgFe nOy4a7Q3xM5+4futmtrvWt1fWg7/iA0SVRbxpkGLbQHd3sylw0k/2Us6iSz58S03m1DKBe HMfcCjZEmGwWktmMdPd4w0IxWdbMRZnZIAjcSD2bBIUhn9/hcK3BpqoI/C6xZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxN1F1btgz98 for ; Thu, 16 Apr 2026 15:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2227b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:56:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1379cde85f61 - stable/15 - imgact_elf: Unconditionally initialize a variable in a note handler 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 1379cde85f6177fa457aec9bd7a100424a990a60 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:56:49 +0000 Message-Id: <69e106c1.2227b.27d49071@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1379cde85f6177fa457aec9bd7a100424a990a60 commit 1379cde85f6177fa457aec9bd7a100424a990a60 Author: Mark Johnston AuthorDate: 2026-04-08 04:19:56 +0000 Commit: Mark Johnston CommitDate: 2026-04-16 15:56:26 +0000 imgact_elf: Unconditionally initialize a variable in a note handler In the sb == NULL case, we are computing the size of the note using a dummy sbuf drain handler which counts bytes and discards the contents of the buffer, so the fact that "structsize" is uninitialized doesn't matter. But, the compiler may complain about this, so we might as well just initialize it unconditionally to silence the warning, as other handlers already do. PR: 292811 MFC after: 1 week (cherry picked from commit 8a68c2509c00ae0dbeab64064bb600cfac787a73) --- sys/kern/imgact_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 7410efca4807..c91fd8089487 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -2714,6 +2714,7 @@ __elfN(note_procstat_auxv)(void *arg, struct sbuf *sb, size_t *sizep) int structsize; p = arg; + structsize = sizeof(Elf_Auxinfo); if (sb == NULL) { size = 0; sb = sbuf_new(NULL, NULL, AT_COUNT * sizeof(Elf_Auxinfo), @@ -2727,7 +2728,6 @@ __elfN(note_procstat_auxv)(void *arg, struct sbuf *sb, size_t *sizep) sbuf_delete(sb); *sizep = size; } else { - structsize = sizeof(Elf_Auxinfo); sbuf_bcat(sb, &structsize, sizeof(structsize)); PHOLD(p); proc_getauxv(curthread, p, sb); From nobody Thu Apr 16 15:56:50 2026 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 4fxN1G5Z76z6ZstS for ; Thu, 16 Apr 2026 15:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxN1G41z6z3NY5 for ; Thu, 16 Apr 2026 15:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776355010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cARPZNQzgrUtvvN7DkDecLQ3//syto4jt/lL+FoMOsM=; b=MVFw22x0BOjqihxqYVgv5r28DHX4o87+XYkBz4tfBvv54Dm4R63aGGpKTiYqBkQv9oV10i EfucO2p7r0Joyz7lsEWc9ZgDIiiMcmdxomFiRm9qa6kHrDdcArXx1MkRbe+t4wj0qX3E7p c60FOCnoaaSwTNr+4iLfd/zkVk0uuqfXUgozBQ1U0VXrRIpqAXke2fPJSRZI/6BScUSRCm OjxLnSx1p3HMqiKE6Y5/Y96xbn07YWA/J6PR+dmEg4iMeqY6lioelwaSbcCKjdxbvW4OwV FcGT96iqxKecY32LDKctpfxaEoRLVYq73lc+HqOzzSRNTFLhmRYtx9g4Bg6NKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776355010; a=rsa-sha256; cv=none; b=A9aMa6F1uJtqXnYvJYePXIZoMlghqWyuju3Xa0oYoF2EGMjNmcdiE9/9GNhymOQzeBvP+B W2OfbZZu4mw1+y+tSsRyO2b+BDSLt5SZvXWQpWdEuftL8xcno44taPK9+gRxWzLu76alRz yJp2x85uCEIjawULRd+dIjGSjXd4+N/tmmCkyyUzKvLaWhIZ+3cPK3eNPBgsoNx5LQG63e Qmdldlhz7FQBPywtqp4r5N6nI74WQ8TDCix0Q+3A3RQSkfGnexHVAA3tYE39uPbaS1zHzR 2nVKoXcxyMajYojyxIKAvAgM7pdqYE0+IRYpF0tQPZzZppjJN6oNju07PGogKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776355010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cARPZNQzgrUtvvN7DkDecLQ3//syto4jt/lL+FoMOsM=; b=ToimpByWYAu9BUsNmv5fl1B4YNbjQEXsm7bEdvzrDffGdprlhmsQlH2ZlhU5gi6R2l+FW+ dsSoMM1yBj6omdr6e0VdqFrH/rmSSpJCGeRjiiLMDnof5If4Xto7BG+WFD96ED9MVG1KSk BtTxq4/a3tc71MNJLBV76vI7gHCmTYqN9ctZLr4HDklHCxCi8vTuphchYScYriRZPQl0S+ nv4z2jT5vtdNI1OmHpaRxqei4VupSREvPqN+F9ahl+z1ZK83aocK/rxBomPwOTmeypllnF dheSilENe64q/PDU+CmGql9aDBa6eeNqi6uPB1K6s7qRtR5QrcjQJlqao2JZEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxN1G360XzCY for ; Thu, 16 Apr 2026 15:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2361b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:56:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 90fc3831af15 - stable/15 - pmap: Do not use PMAP_LOCK_INIT with kernel_pmap 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 90fc3831af1568a465d6be3dc0f40c1a87285c7c Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:56:50 +0000 Message-Id: <69e106c2.2361b.7287d73d@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=90fc3831af1568a465d6be3dc0f40c1a87285c7c commit 90fc3831af1568a465d6be3dc0f40c1a87285c7c Author: Mark Johnston AuthorDate: 2026-04-01 09:15:26 +0000 Commit: Mark Johnston CommitDate: 2026-04-16 15:56:26 +0000 pmap: Do not use PMAP_LOCK_INIT with kernel_pmap The kernel_pmap lock is a bit special: it does not need the DUPOK flag, and it really belongs to a different lock class. If it belongs to the same class as regular pmap locks, then witness may report warnings when performing UMA allocations under a regular pmap lock, if the allocation triggers a pmap_growkernel() call. Replace instances of PMAP_LOCK_INIT(kernel_pmap) with inline mtx_init() calls to silence some witness warnings for harmless behaviour I see with some uncommitted test programs. Reviewed by: alc, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56185 (cherry picked from commit c6a1c1260f02e44b7f44b1e3735ce5dbd785544d) --- sys/amd64/amd64/pmap.c | 2 +- sys/arm/arm/pmap-v6.c | 2 +- sys/arm64/arm64/pmap.c | 2 +- sys/i386/i386/pmap.c | 2 +- sys/powerpc/aim/mmu_oea.c | 2 +- sys/powerpc/aim/mmu_oea64.c | 2 +- sys/powerpc/aim/mmu_radix.c | 2 +- sys/powerpc/booke/pmap.c | 2 +- sys/riscv/riscv/pmap.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 8695dd61316e..956e9c5e78d2 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -2127,7 +2127,7 @@ pmap_bootstrap(vm_paddr_t *firstaddr) * DMAP_TO_PHYS()/PHYS_TO_DMAP() are functional only after * kva_layout is fixed. */ - PMAP_LOCK_INIT(kernel_pmap); + mtx_init(&kernel_pmap->pm_mtx, "kernel pmap", NULL, MTX_DEF); if (la57) { kva_layout = kva_layout_la57; vtoptem = ((1ul << (NPTEPGSHIFT + NPDEPGSHIFT + NPDPEPGSHIFT + diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index d67267bba4e2..00f9766e9a54 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -1173,7 +1173,7 @@ pmap_bootstrap(vm_offset_t firstaddr) /* * Initialize the kernel pmap (which is statically allocated). */ - PMAP_LOCK_INIT(kernel_pmap); + mtx_init(&kernel_pmap->pm_mtx, "kernel pmap", NULL, MTX_DEF); kernel_l1pa = (vm_paddr_t)kern_pt1; /* for libkvm */ kernel_pmap->pm_pt1 = kern_pt1; kernel_pmap->pm_pt2tab = kern_pt2tab; diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 44ec9f1672fe..cae46f7c2f1e 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1347,7 +1347,7 @@ pmap_bootstrap(void) /* Set this early so we can use the pagetable walking functions */ kernel_pmap_store.pm_l0 = pagetable_l0_ttbr1; - PMAP_LOCK_INIT(kernel_pmap); + mtx_init(&kernel_pmap->pm_mtx, "kernel pmap", NULL, MTX_DEF); kernel_pmap->pm_l0_paddr = pmap_early_vtophys((vm_offset_t)kernel_pmap_store.pm_l0); TAILQ_INIT(&kernel_pmap->pm_pvchunk); diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 2f9e6ccf43a8..fd5ac272a441 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -630,7 +630,7 @@ __CONCAT(PMTYPE, bootstrap)(vm_paddr_t firstaddr) * Count bootstrap data as being resident in case any of this data is * later unmapped (using pmap_remove()) and freed. */ - PMAP_LOCK_INIT(kernel_pmap); + mtx_init(&kernel_pmap->pm_mtx, "kernel pmap", NULL, MTX_DEF); kernel_pmap->pm_pdir = IdlePTD; #ifdef PMAP_PAE_COMP kernel_pmap->pm_pdpt = IdlePDPT; diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index ae17b3289593..2783f460402b 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -878,7 +878,7 @@ moea_bootstrap(vm_offset_t kernelstart, vm_offset_t kernelend) /* * Initialize the kernel pmap (which is statically allocated). */ - PMAP_LOCK_INIT(kernel_pmap); + mtx_init(&kernel_pmap->pm_mtx, "kernel pmap", NULL, MTX_DEF); for (i = 0; i < 16; i++) kernel_pmap->pm_sr[i] = EMPTY_SEGMENT + i; CPU_FILL(&kernel_pmap->pm_active); diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index 01bf4c7e90a8..3eb9de8a16c2 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -1124,7 +1124,7 @@ moea64_mid_bootstrap(vm_offset_t kernelstart, vm_offset_t kernelend) CPU_FILL(&kernel_pmap->pm_active); RB_INIT(&kernel_pmap->pmap_pvo); - PMAP_LOCK_INIT(kernel_pmap); + mtx_init(&kernel_pmap->pm_mtx, "kernel pmap", NULL, MTX_DEF); /* * Now map in all the other buffers we allocated earlier diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c index a12142fc2d7b..387c172b446c 100644 --- a/sys/powerpc/aim/mmu_radix.c +++ b/sys/powerpc/aim/mmu_radix.c @@ -1843,7 +1843,7 @@ mmu_radix_setup_pagetables(vm_size_t hwphyssz) vm_paddr_t l1phys; bzero(kernel_pmap, sizeof(struct pmap)); - PMAP_LOCK_INIT(kernel_pmap); + mtx_init(&kernel_pmap->pm_mtx, "kernel pmap", NULL, MTX_DEF); vm_radix_init(&kernel_pmap->pm_radix); ptpages = allocpages(3); diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index f76f17bd8450..08516b151e6b 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -901,7 +901,7 @@ mmu_booke_bootstrap(vm_offset_t start, vm_offset_t kernelend) /*******************************************************/ /* Initialize (statically allocated) kernel pmap. */ /*******************************************************/ - PMAP_LOCK_INIT(kernel_pmap); + mtx_init(&kernel_pmap->pm_mtx, "kernel pmap", NULL, MTX_DEF); debugf("kernel_pmap = 0x%"PRI0ptrX"\n", (uintptr_t)kernel_pmap); kernel_pte_alloc(virtual_avail, kernstart); diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 3fc261a15c06..e9f88f5d653e 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -921,7 +921,7 @@ pmap_bootstrap(vm_paddr_t kernstart, vm_size_t kernlen) printf("pmap_bootstrap %lx %lx\n", kernstart, kernlen); - PMAP_LOCK_INIT(kernel_pmap); + mtx_init(&kernel_pmap->pm_mtx, "kernel pmap", NULL, MTX_DEF); TAILQ_INIT(&kernel_pmap->pm_pvchunk); vm_radix_init(&kernel_pmap->pm_root); From nobody Thu Apr 16 16:35:24 2026 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 4fxNsn3BhTz6ZCh8 for ; Thu, 16 Apr 2026 16:35:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxNsn0kWZz3V59 for ; Thu, 16 Apr 2026 16:35:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776357325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Om1F85/0WAG54C3I/UOfwtNSNp90h13DdeX9h33g/aQ=; b=BYBkAOYXlA2lg1Lz72E17b4jUPkJIbLi9wkJbz1I+G7lFArCYh97H+N8cHthoUmM+XEf02 zaarbhPc5smdT8mImbtpaucZdWEozGV69+Debf7HTaD+FjxiCLYg/mGSrdA8DOkJa4qO+l hFoiAqnM4lre17wjA0DwBhPGlYuHy2CkAq0sr+hWxKGDHhnGB6QwJDFBHP/ZsjFQ0JMb0C v6If55IQvCnRD8MuUciZWG9OPwZSo23pJ+AqStn8z7E+CdxkMaV6uYXo69k7YsJMIMP8P2 VEydeZw/fHteLY3dH7AWaSsDN5CQTN5BZTK6jMSAuqOe2+BbkmN57/ToJiXexw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776357325; a=rsa-sha256; cv=none; b=bUxXIlbu1Q3twNZbBAaYrTjUSs08ebweGTnCCl+JrszA96b110d0E0mhUNtbTJqmZNvyrj K+mrQWqiw9dMNwTH3e4q/QtCJZgMwebsH/zkebcRE4AFu5HK47xKJaVdAZ2fXsjQn1+4Bd lsOALY3swo4pWAGHAGCR3K17ytiWyHNQyl2aSPbU2hv6AdQyexO9RPv8GOsG6C/ZgERSlC xjRz8n8TC0oCeahuwUIS4Y7AtAV84BNl3H2Pk3/Rj9vdrHOZww3hV/jFRgBlPUJPnFD5o5 O6sFPeGMU5KMqhAEekF6LTxi/H8Ip9KTwPifphYVlNxfX6TSjHDoy7JT3YVE1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776357325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Om1F85/0WAG54C3I/UOfwtNSNp90h13DdeX9h33g/aQ=; b=GRrVPOY8ai0fXGJT4y8D17+xpS2cpJyAUm+6SNJJnl3gPbLHKOoRb6tlCC3K9EREv8zXZt ln6WjWzw+Zm9NZ7WO0RogZ68YM1f+I2F1wOZRPsCIGdrKIw6KycpsNImuZBwMlJG/kDMPx KLtmu8/CRfOtsub5+Jzp5KcEjB4ScnlD78aXv9qPGLW56oc5rbBLYQCgpdqamGwsFiwIa6 pNQ+/dtjmL705N75NGCjnSSN+ZRLLQ9xg+YN1llm50D4T9rsig3Pn5vjftEaQeORlW9t5p i5wIQaDNsWciVJ3dCpUDoLGzQYrf9gEBQG48mbiAUxsvrm/U7yC5F/hIkhusQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxNsm6zztzxN for ; Thu, 16 Apr 2026 16:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27f00 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 16:35:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 95d661225dfc - stable/14 - malloc.9: adjust flag table indentation 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 95d661225dfc032fabf9d1f7b1e885e2bd582bdc Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 16:35:24 +0000 Message-Id: <69e10fcc.27f00.38a32dba@gitrepo.freebsd.org> The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=95d661225dfc032fabf9d1f7b1e885e2bd582bdc commit 95d661225dfc032fabf9d1f7b1e885e2bd582bdc Author: Mitchell Horne AuthorDate: 2026-03-31 19:42:55 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 16:32:23 +0000 malloc.9: adjust flag table indentation The current indentation is shorter than all but one of these flags. This renders much more nicely. MFC after: 3 days (cherry picked from commit be79a42275cad21c6087d8bbd6a328735ea813fa) --- share/man/man9/malloc.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9 index 0ab5b2ed6e8d..6a80df66e1f5 100644 --- a/share/man/man9/malloc.9 +++ b/share/man/man9/malloc.9 @@ -222,7 +222,7 @@ The argument further qualifies .Fn malloc Ns 's operational characteristics as follows: -.Bl -tag -width indent +.Bl -tag -width "M_USE_RESERVE" .It Dv M_ZERO Causes the allocated memory to be set to all zeros. .It Dv M_NODUMP From nobody Thu Apr 16 16:35:26 2026 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 4fxNsp4Q9Yz6ZC8q for ; Thu, 16 Apr 2026 16:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxNsp3GtWz3V7P for ; Thu, 16 Apr 2026 16:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776357326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jHxNpWruAeIAr0jOzRIkmpdA97Kr9xuKovus4eldlxQ=; b=eSGTM35XiicvoyjPQsRLVy238UlxgOhDHcB3oOVGfDobxZeBX66PAJ+t2KihjPLZSWbrPh TIw4pTsyQMEV+59uX9R+5+LMq+LMCKzXpKuPyMGjYOIjdUhwNCauzamJ1jFUlceZ4nhIHv hPEZkwbekXklfO1qXfpGkzkmWn5Co6rwMqDEQsgk5OdCj+b/1mKxwfKSe9dc8LZzf6kvhp 9hxEIeXsLj/qns7MsQd60HOH8RkpoEdsNWBJ+9ZLD+Lilbkr5JZCrpWxFTxSZdejj9RGW/ XghDDKAtRZ38VSsebPjWNKrzJ5qKD0Oi9xZSkalta+V/diCsZaNMXYTW2crQkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776357326; a=rsa-sha256; cv=none; b=gZMo4njpeNOVs1JmbRvY0xFsG8D97q5inXqRBTqw3GeuGLE8/wMQ3pTbJohnKGKEhpPLLq cMRGd4nF0pVe4MT5x1IAr11/qT0fQnJJWWf4iIDJP2+RSSVfegGwDSfOB2/srosHMGUJx3 wAwasO+QZezY4cukPSsOjFNnhop7Npc0+JniTKzletQJMHqI1EjNm0vh00F3w+A2ACgb0a l/73R0AOi6WHagf9nFkeOdUzTeYHrxvpA4gh4kt8RsH4m0yxwUEKX67/qU7ta/lCTLy6r+ S7jtk08Pl11CMHvHs0S1nMWB+lmKa0hrizzWkxMH/bV31egFsVmKwgJDp8gkOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776357326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jHxNpWruAeIAr0jOzRIkmpdA97Kr9xuKovus4eldlxQ=; b=NGjEo5ftLA9hR4lrdAfL9fZNoV+3zCtcYC4Uz9ZupdmBor2MmlFRoxw34+58SKyvRHAOGj vqoGh7yRw+ucoCkySdcpgZyDPuOdBuF6fcHF6ja+8MnNyDGQfrMtN5meh8fIJ4RwtumHKj EOLYPSo39w5aBOGSBctTM1va2SXqfJHA/5nLxJHkQqMeBBMS38ahrUT4BOvGjptH60JCGt ymvE54BjrijHZr51YzLwT2iZ9JOmvRP2j2DLARCF8ALc7cT1XRg6InwxVfGMWx9aDYSI52 hpJWEzeI2PXWWFjSaG8rNApFB02Ysq7EEph3ViUezWjq1n4pTLOcnNEMS8ofAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxNsp0NyMz157 for ; Thu, 16 Apr 2026 16:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26641 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 16:35:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Weixie Cui From: Mitchell Horne Subject: git: b77bd0e70d2f - stable/14 - freebsd32: Fix freebsd11_nstat copyout condition 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: b77bd0e70d2ff3d771a53af82348cdde3f399707 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 16:35:26 +0000 Message-Id: <69e10fce.26641.3bc9660f@gitrepo.freebsd.org> The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b77bd0e70d2ff3d771a53af82348cdde3f399707 commit b77bd0e70d2ff3d771a53af82348cdde3f399707 Author: Weixie Cui AuthorDate: 2026-03-31 10:12:32 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 16:35:00 +0000 freebsd32: Fix freebsd11_nstat copyout condition freebsd11_freebsd32_nstat() invoked copyout(2) when freebsd11_cvtnstat32() failed and skipped copyout on success. This is backwards. Fix this to match freebsd11_freebsd32_nlstat() and freebsd11_nstat(), and only copy the nstat32 result to userspace when conversion succeeds. Signed-off-by: Weixie Cui Reviewed by: mhorne MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/2109 (cherry picked from commit c6224994ac70b4f71ef9e11903bb2e50ed2b1bfe) --- sys/compat/freebsd32/freebsd32_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 9aaca6853859..0d35d1291316 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -2617,7 +2617,7 @@ freebsd11_freebsd32_nstat(struct thread *td, if (error != 0) return (error); error = freebsd11_cvtnstat32(&sb, &nsb); - if (error != 0) + if (error == 0) error = copyout(&nsb, uap->ub, sizeof (nsb)); return (error); } From nobody Thu Apr 16 16:48:29 2026 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 4fxP8s2V9vz6ZDr7 for ; Thu, 16 Apr 2026 16:48: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxP8s1qrYz3WfH for ; Thu, 16 Apr 2026 16:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776358109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ur22aU1YTenEBOUkfZWiHXG6BSVb2Igo7QvgNFPYDjg=; b=Tq0eaNmYRJE35305BKjKcFYU71fQuzaxOCB6qPcB4xyLkwdOSA1PfXwCT9Ay26FjFreXys sr5+cLyNEhqt8JGtMmipsVKAhq4SkNNAVY9ZrumfgEdmkzjIMOfXkKiB6473y/TeHbq9t1 FUUjjpUWWlpeOdz/6wBkg+DF3+okFm/xtDV186Hx2FJewqW2dJRz/QyhJjslI3uabEYjLz Zoptf0pRWcAqwW2qPhZ653PLZtmf2flPGu9COOBKsWOjL+rptdl7pTUztn8WjzbgEj75W7 x1VxYgzUSR1gna9BKyonh5g7KxmlrMm8SzpI9alK04XRkYLr9FVpZkTVP3yYoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776358109; a=rsa-sha256; cv=none; b=X62JKBzo8uKiAGlrzV2Yl21eseGc46IA6sI91D5JmM0KCJG38EoLzfGf+HyICM8wj6Gjdw FFS8YncHNo69PhpKnKS/twqo91qBncomobrk4UvgV4+Ump5krwmuGIniwUmTxgThBJ/XP4 8Ad+1faOwVFjij/2H79R7E4DaG0F8OIlH2Vddz1g2wCV1tKIv8tZFPQQi/v52x2mfIgVHn /nYSP7xh3xTwuDN8JdqREVj3+M/9teqc2jUh/YmQKbJj8ir/Mg+ZcTN8jhnFOgaOvEuRc7 FBlyZU/qL7xIgt3t7m4/kkz5flr5nMpd09W9AdaOlSY6SZuTMQgjbM6Ed5gVVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776358109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ur22aU1YTenEBOUkfZWiHXG6BSVb2Igo7QvgNFPYDjg=; b=TU+dV+EhD5yhIwvB76H6Fd/DZZ0M8bYvforyWpmCASfNuXy5hQ86cjbas/cCkl0eU6J3oe U3+e3UOu81UFmiKqTTFHyu/KOQB7cZjjpx5Ys4cMngxrgXgGdUnizR1sqQS/syrUX4kHac ZlBZQn3Di/bkpQLH9XqK+kurpKsx8BncKFbXeGWd1GAAwn1kki4xUA2hPqtUNm1Xh5JSKA O54ecfNC9buxC1IJwp2v/aAV8JuDYeGf/BsJ8jeerwZWDhmhvPBQU+90ucf/z6xhmMYRnX 1syHLOcZKZlsypdY64fz68rcMRGfS37IiWw4LdlbRnpqYZdtBC0vlaUwea7nGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxP8s16gMz187 for ; Thu, 16 Apr 2026 16:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 262f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 16:48:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 62fbb17e0dd0 - stable/14 - imgact_elf: Unconditionally initialize a variable in a note handler 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 62fbb17e0dd03ece12e3e4baad5d0c65bdbde3da Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 16:48:29 +0000 Message-Id: <69e112dd.262f1.487abadb@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=62fbb17e0dd03ece12e3e4baad5d0c65bdbde3da commit 62fbb17e0dd03ece12e3e4baad5d0c65bdbde3da Author: Mark Johnston AuthorDate: 2026-04-08 04:19:56 +0000 Commit: Mark Johnston CommitDate: 2026-04-16 16:48:20 +0000 imgact_elf: Unconditionally initialize a variable in a note handler In the sb == NULL case, we are computing the size of the note using a dummy sbuf drain handler which counts bytes and discards the contents of the buffer, so the fact that "structsize" is uninitialized doesn't matter. But, the compiler may complain about this, so we might as well just initialize it unconditionally to silence the warning, as other handlers already do. PR: 292811 MFC after: 1 week (cherry picked from commit 8a68c2509c00ae0dbeab64064bb600cfac787a73) --- sys/kern/imgact_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index a71359a929fb..5261e94846a0 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -2685,6 +2685,7 @@ __elfN(note_procstat_auxv)(void *arg, struct sbuf *sb, size_t *sizep) int structsize; p = arg; + structsize = sizeof(Elf_Auxinfo); if (sb == NULL) { size = 0; sb = sbuf_new(NULL, NULL, AT_COUNT * sizeof(Elf_Auxinfo), @@ -2698,7 +2699,6 @@ __elfN(note_procstat_auxv)(void *arg, struct sbuf *sb, size_t *sizep) sbuf_delete(sb); *sizep = size; } else { - structsize = sizeof(Elf_Auxinfo); sbuf_bcat(sb, &structsize, sizeof(structsize)); PHOLD(p); proc_getauxv(curthread, p, sb); From nobody Thu Apr 16 16:51:33 2026 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 4fxPDQ1MZvz6ZF8N for ; Thu, 16 Apr 2026 16:51: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxPDQ0VJmz3X5l for ; Thu, 16 Apr 2026 16:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776358294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4E1ZQMW9SBd8GljF9zpVRBVbEbZ5pMT0qhgQiuWC+lE=; b=X04JUknQpFg9b+9INTE1BDQ1O3Fkqx9kHQZhUV4ZWkCOnN76Ue0pXRQJpsPuxHEMydL6us Gep5Z1UvDh1QAcQzBAVIdlD2/SQdjc/ayajmMxNuuGpgW1qC0yhuFREXyZ9+68fZS6zVB5 rEcvN4p9+MXaVoU967dCoLm95apf05axuKiHeR/3JTR8Csgh2F7S16SS7FsP8v8BvxU6EB d7dsOG9MYLs72GLL73B/WQ1IfvLUb+WujEDm3OnP4h1ugz9ChBzbVFNwW2kQ8XzfLcYgbu GWvaTdI6ymDrZLs2YFddhMf8uSjZjYELbvHE+PJBTOta/KGphVFPVink6DayUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776358294; a=rsa-sha256; cv=none; b=T4DXkLQHFHY9E++7tK8DZ0MMsaJ4iMWvE+QeXAeoT3wRbMiscZQMBvCqImnfwW8B20ql7W aGIuc21K5De67KqKrgbla9xhxEWTKicLtvi8qVUqvQov34TwFV99ht/IoQiQ83FKHVHIYw tfsSoKMHvKADekqLTQr9xk8pOaDTBVgyGanGyGt0lsczPwMTnUVi5Syk0otyPb6oGNspL1 htfT2x2Gi4bKpUn6v/Xh+F69Bvvd4W8Bmlqkx574oDTNORGzbe1/b17CPEzGNK/+DYEJiX Pi51kihf9gdnINFjeYSe+OPNQCN5RR7nRSg9YqSCHzJFlep3gZnfZHqbXq+QMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776358294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4E1ZQMW9SBd8GljF9zpVRBVbEbZ5pMT0qhgQiuWC+lE=; b=vwoKxWxKg+SvUjGS30nipAkSTFOdekOt8U8lPWKyR5L/yp0kkEOvpptKqo/EamJ15BBPDs 9yom42et1zSExzD2Ar3X+W23O+cVKsCdA8aog4AVP4X2aRsSiOewUdugLR/ympQ6XEtcjN +oJ3yE8ARDcyN3+zumrspUrX/IUhoV93PmCRMmNtMfJPVypVyhNItRmhq9XK6yoQQkBxfJ on+FMZmmJKIX7mgaAgfYtqzSOB5b9joPgN6Yj4QfFdZwd5WAtDoMD4muz3J3LA9Wn8z8Uq jUDL5qV0xwU6jeDdKmpHjSqTOm9yykKVXVbOpW0lL9fxUyMJRTyrnYAMLA9KPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxPDP6tg5z1C0 for ; Thu, 16 Apr 2026 16:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31588 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 16:51:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 547d7095fac1 - stable/14 - divert: Use a better source identifier for netisr_queue_src() calls 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 547d7095fac1395664aaa41ffae032ffe7b6a783 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 16:51:33 +0000 Message-Id: <69e11395.31588.647d7280@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=547d7095fac1395664aaa41ffae032ffe7b6a783 commit 547d7095fac1395664aaa41ffae032ffe7b6a783 Author: Mark Johnston AuthorDate: 2026-02-26 20:25:35 +0000 Commit: Mark Johnston CommitDate: 2026-04-16 16:48:50 +0000 divert: Use a better source identifier for netisr_queue_src() calls These opaque IDs are used by netisr to distribute work among threads. The mapping function is simply SourceID % numthreads, so using socket addresses as source IDs isn't going to distribute packets well due to alignment. Use the divert socket's generation number instead, as that suits this purpose much better. Reviewed by: zlei, glebius MFC after: 1 week Sponsored by: OPNsense Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55537 (cherry picked from commit 5547a7bb39accd8f151b53e90b41d13b55f84c95) --- sys/netinet/ip_divert.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 78ca36fc2a0f..b9a9f0edc946 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -502,8 +502,10 @@ static int div_output_inbound(int family, struct socket *so, struct mbuf *m, struct sockaddr_in *sin) { + struct divcb *dcb; struct ifaddr *ifa; + dcb = so->so_pcb; if (m->m_pkthdr.rcvif == NULL) { /* * No luck with the name, check by IP address. @@ -540,14 +542,14 @@ div_output_inbound(int family, struct socket *so, struct mbuf *m, m->m_flags |= M_MCAST; else if (in_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) m->m_flags |= M_BCAST; - netisr_queue_src(NETISR_IP, (uintptr_t)so, m); + netisr_queue_src(NETISR_IP, (uintptr_t)dcb->dcb_gencnt, m); DIVSTAT_INC(inbound); break; } #endif #ifdef INET6 case AF_INET6: - netisr_queue_src(NETISR_IPV6, (uintptr_t)so, m); + netisr_queue_src(NETISR_IPV6, (uintptr_t)dcb->dcb_gencnt, m); DIVSTAT_INC(inbound); break; #endif From nobody Thu Apr 16 16:51:35 2026 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 4fxPDR2lmWz6ZDgK for ; Thu, 16 Apr 2026 16:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxPDR1QRnz3X80 for ; Thu, 16 Apr 2026 16:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776358295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WYxrHu/LgxSEMkvRr7s1sECWgCx3SQFGKgJq5PH8Eto=; b=EQWYXMwOzWoCbvM4SonKCubZ+8zA59Wxs32bGZH1twT9YDAOggc5CVuz6+vWnoq1/Uts6d CXG5+GZ6RZhoxnvYKbnfK/hNvraQSX/nyTEAP8rynvN1R0oxysLrYUheuHT+/+acJ/tO9S /bFmBX93p6rSbOGxh/5sbbXJjzk0ZCUhVgkDAO3IvHbk3nYxHm4qjWI8If9+LyD5YgfIe1 Vc/yjcvUtn7pBfyH34dcjlltAb4I0naIakKA25FgdXXPu2BgRm9erGSz2kgxTrKRV8zcDC 4pD7u+KP627IdpafCVcwthgGvnaqRKxAxj+GRLVIs3YBKAygAJSHjZ+wMrfsxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776358295; a=rsa-sha256; cv=none; b=gI+N6iJI9x3QFlWl75BWBO7OoJ0qW8owsmo93bdhh5OL7/Qe3n4ZpbO8GBTNLD8yFtWmzz irVcb4UhJA9wmQ1fmBrcwtpy5VeYm59W7F9jeSxDVr9oax9unzGnf14cP5es8D4trFlG/i t4PkoC6e2Xq2D5U0Fsgb6J0sIahg1FyuapPUhPN8fKcHAy6RoXYqeQK8lpzrSPfgRQPYXV YUb/gKEQlCU3LvdSJ6hNy/0jzufFsFsEwQ6i+KEfR2IiP3/jUFy/SXtdaz1kFwn1scJyXX nHuthmfhPS5Fk+N2Pr1qSCVu8wfKYSGgZA16HE+DNu8+GVMEA8wdlhaBvSXc3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776358295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WYxrHu/LgxSEMkvRr7s1sECWgCx3SQFGKgJq5PH8Eto=; b=HZ+NqMqTH995Y0Wx7QQLsDCd5LWCSOlx+I6bF2m++3nNqiwyc7Xjj+bEyCyudnf0mOi8AV Fm08geL0cozcj00HrfHRgsIfBQpfdwzGVXwZH9p/5q7oJzzmYhthvyZV6zLYjRHl7jXykP yWIKqFlvHaP1NoWuYyRIdbk5GOlBEnWjuextkLqf3S1qujbFOg5S+JMRiTMhJHMr4j5UW6 oeA8cfTS4lJ1Q/AIM27biiYPBDeaGU0x3UpPM8lYo67V6hEMqd9SshJ/lwu8DOXwkjH/zb 0EFZKhy1oFW9bgQHoD2LqhOHyaVtZVuwTEFPxKEXLo5tEMI3Fw0JDxtNS2ZQfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxPDR0cZpz1cS for ; Thu, 16 Apr 2026 16:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 302af by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 16:51:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 40dacfe45eee - stable/14 - rtadvd: Fix validation of the MTU parameter when parsing config 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 40dacfe45eeeec28fa62304e0e75abca90d726dd Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 16:51:35 +0000 Message-Id: <69e11397.302af.1c8c71f3@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=40dacfe45eeeec28fa62304e0e75abca90d726dd commit 40dacfe45eeeec28fa62304e0e75abca90d726dd Author: Mark Johnston AuthorDate: 2026-04-01 12:14:24 +0000 Commit: Mark Johnston CommitDate: 2026-04-16 16:48:50 +0000 rtadvd: Fix validation of the MTU parameter when parsing config MFC after: 1 week (cherry picked from commit 607f6be6ec19f49ff595226afe1c8aa6515c59a0) --- usr.sbin/rtadvd/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index a264858edaf7..fc7fdea9142d 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -613,7 +613,7 @@ getconfig_free_pfx: get_prefix(rai); MAYHAVE(val64, "mtu", 0); - if (val < 0 || val64 > 0xffffffff) { + if (val64 < 0 || val64 > 0xffffffff) { syslog(LOG_ERR, "<%s> mtu (%" PRIu64 ") on %s out of range", __func__, val64, ifi->ifi_ifname); From nobody Fri Apr 17 00:00:23 2026 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 4fxZlC1QP6z6ZwNp for ; Fri, 17 Apr 2026 00:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxZlC0frzz3YXg for ; Fri, 17 Apr 2026 00:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776384023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLQgUIxPlE4Euu/HFKIKexRm0RQAbZWoVX2nBiKAvW4=; b=gcJuE/bfBfocD6fhfEt+2NJNcdjUXNvw5Y5/0RYGgRG6CYL0s97UfMw78k/UqaZlbXrAKG 0CnMm2XLyBtuztPEcJe+NDF3QB6mArwM9LlfuhgGxYQT2wScuPLyUJecG/5ghf+C0ELGwu /s0v6CVSi15e9Uo/LD2tr8F6UN/+435zomV/ex+tV14dhw1uWqDJrxWbsFMKs94S34Dfk6 vCzQzMO1fbQi6uh+Z+wUSloXE9W3woRbiM7J3vOKln0YyEEZmx9bQGur9OOw8L8u9h/c7O du33Qs6NAW8YOp1MEOjtDuF+2IBjzN9gWG15dG0oQSIfgrkjTUZPSZJeMdb7Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776384023; a=rsa-sha256; cv=none; b=jQ0aQ8IGvvOEFFI6ENQzhuuIxRar13X87ghxAaqw4pzLZfDDNtvwd1WdxJiUojJHkrF7Y2 IgJABN65rkzNHSQS71xO6zy730Tv5npVsTi0fQ5rzz+UnPR1CRkmCWUF2gYg49op88CQVv /jOVZE0plKp50CHSLz4ihhkc/r5vwa41QyYFAxb24bR6HmGbkba5RKMRE/4quVmffLpnPF sxABU3N7X9kzzbnj1wCcIkjwnlr5wUb4l7+0uPiam8Ri5LIhK9RBkcpUZDSP59+Dq3qKbp HkJfOcV38A85ZaQ4iQFgvjEwcrsvdA2Cn07Ad8uZisYHVIslgPvucnS1s0iBng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776384023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLQgUIxPlE4Euu/HFKIKexRm0RQAbZWoVX2nBiKAvW4=; b=D2sO2btLgvbdl6ur35NgZTb76OsF+AfWRjKZ4Cen8HLzrATxDAF24t1ICQhbY5BBpPzs4S ZEstow5MYLInaWyCviqJO6WqcmUKg/c30qsSuQGHJNTMOHqQJWIh2PEnuaZ8gcRr0mb8ep TMey1i57S1ktvTTjBws5IHoK9Utmh9Y8l6feYq0Pqit+ckbaaUPjgS2A0UXJQLyFOW2CmJ dXMqaqxaZ9MuAYdBkLBVNWyCqxMlseYiwjwemixLVi3qhZMBdd0eaVZbeHbDd8YuoXPzdr 2tAA3iPhko4o8c9MScmrWDznZMl7HNofJDRJRG+9lJ47hOU+lqJOTNZNxpiylQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxZlC03cdzTkM for ; Fri, 17 Apr 2026 00:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e065 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 00:00:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: cddcca7e5ef6 - stable/15 - 15.1: Update stable/15 to -PRERELEASE 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cddcca7e5ef6de8d1b451e8b9cc19b9ede718839 Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 00:00:23 +0000 Message-Id: <69e17817.3e065.6800e3ba@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=cddcca7e5ef6de8d1b451e8b9cc19b9ede718839 commit cddcca7e5ef6de8d1b451e8b9cc19b9ede718839 Author: Colin Percival AuthorDate: 2026-04-17 00:00:00 +0000 Commit: Colin Percival CommitDate: 2026-04-17 00:00:00 +0000 15.1: Update stable/15 to -PRERELEASE This marks the start of the FreeBSD 15.1 release cycle; the stable/15 tree is now in "code slush". Developers are encouraged to prioritize fixing bugs (and/or merging bug fixes from HEAD) over new features at this time. Commit approval from re@ is not required but if new features introduce problems they may be removed from the release. Approved by: re (implicit) Sponsored by: OpenSats Initiative --- sys/conf/newvers.sh | 4 ++-- usr.bin/yacc/config.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 4b72cebf093b..960c7692a5c5 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -50,8 +50,8 @@ # TYPE="FreeBSD" -REVISION="15.0" -BRANCH="STABLE" +REVISION="15.1" +BRANCH="PRERELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/usr.bin/yacc/config.h b/usr.bin/yacc/config.h index c9a9fe59139b..9f5a1d68e19d 100644 --- a/usr.bin/yacc/config.h +++ b/usr.bin/yacc/config.h @@ -92,7 +92,7 @@ /* #undef STDC_NORETURN */ /* Define to the system name. */ -#define SYSTEM_NAME "freebsd14.0" +#define SYSTEM_NAME "freebsd15.1" /* "Define to 1 if you want to use dbmalloc for testing." */ /* #undef USE_DBMALLOC */ From nobody Fri Apr 17 00:42:44 2026 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 4fxbh44MSjz6b0r5 for ; Fri, 17 Apr 2026 00:42: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxbh43nHGz3f6P for ; Fri, 17 Apr 2026 00:42:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CG2r+W2tdB7+Mnbs1URfsZtm79IMxI+ICXrbJDcDxgc=; b=UfzQCRTR7OkJ5DD2tdQIGXYjaWObgUn45ZgoSfaVRUYHbGwiaag+pvkPa5U2CJtgtze4vO XHVlc5LB534VQGMUeWJwZfpZT+KEoK5a+m2XWGJ5d7o+KOEPp0KBwNhAmgEggLqIwIxLqt /ZLBwuCBn3Z5Bfn1aRsuXBLUyiWfaYM9my7uq0ZSTlGKUue5ZAMi+nzu2JbBp10ho9yVtT yNlQ71dYWDxWpTfA7PGlTBQp9aY1LIIDIcxMO4Kbzz8YZHCq6lAgBUd4Jumz/yW3ftAFiY f9z8QhcrVb0lDt0rq1aVfUiqOcGpD25L3O524Pj7wXFpV3/p/4g6p7VxaQ+Qbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776386564; a=rsa-sha256; cv=none; b=Bf1KlEbstMsvTbJYfE9YMzKELr28vFhbMljUPvBQDRBgEZ+oUDC03x4SJaUc/EIb119R/A U4NM208gHiNjw5vRirl1UPsiXZshJXovWUnWqg/QpkaKmVC68qYlBD76f3WInNalgVxguA k4aRA76olAC2AmfkYw9fcM0c48hrNTbYV/0Y4dMyuqVmBVI0xyc0LigW8O7CBpivZuKqY3 xdZDrbIT8j1bBZvj8AnwyK4e5GrKXEtf09TMiVPCc2Cce+lo9xVUA4e73eGxeSKjS0AogV 3DTegNYlPw3P+S0rvkqTKqY86fyWT10j0EPLre2ht0bi5TJ6F6caU5vAZlBDIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CG2r+W2tdB7+Mnbs1URfsZtm79IMxI+ICXrbJDcDxgc=; b=szeN9S1sutHrqmP3qYlyeDHKid/OgvkR4YkzuJIVN3pBb1V7pEfDdZ0fnWeV/OEGlSm6ix H1T2S+MIyjQ/WMDWI5v8ruTwibKcAmxQoBQY55WnxomMoGJejUZZSO6NWRBksI9PpK00Nw DQwMTvGAkjAmPUvoZ0rKyEXNPQhlM7+LOdmjJHP8Q0gq96dTXMXeVYz6PNrnlpw//bxkut 3HNQ8Xa9f90/Ti4w/kmL1Ib+wlQF7EIXHKbiYzfO7WyfKd2YEJseG9s+AXSJPzJuzE5n6w Pgqq6VspGs832RA7od9k9IuA66e01XDfg/wFirz4+rwD2sBu87T5496j5NMwpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxbh438RYzXQC for ; Fri, 17 Apr 2026 00:42:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43015 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 00:42:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6c1672a5b62a - stable/15 - subr_early.c: cleanup includes 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 6c1672a5b62aca2356dd0a674d2a91533f636bb3 Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 00:42:44 +0000 Message-Id: <69e18204.43015.4ba1f16b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6c1672a5b62aca2356dd0a674d2a91533f636bb3 commit 6c1672a5b62aca2356dd0a674d2a91533f636bb3 Author: Konstantin Belousov AuthorDate: 2026-04-10 10:16:28 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-17 00:42:38 +0000 subr_early.c: cleanup includes (cherry picked from commit 4da93b9a8a5411f7386e79053d9c46df29627594) --- sys/kern/subr_early.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/kern/subr_early.c b/sys/kern/subr_early.c index 62d271f56d75..ae06e4b4cbd2 100644 --- a/sys/kern/subr_early.c +++ b/sys/kern/subr_early.c @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include -#include #include #include From nobody Fri Apr 17 00:42:45 2026 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 4fxbh558qFz6b0Pb for ; Fri, 17 Apr 2026 00:42: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxbh54GBXz3f3s for ; Fri, 17 Apr 2026 00:42:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XvE5eVCeJoBqH6laUdMfw4fBm6FAtytaeFETXFnPzMc=; b=rMTTOl930N2t1CjnCMmWXGMX6Q3yZZ1fGp5rxaUghFulxir0vorLafWEVJbR+A5XX9Q+v+ YY3sdydg9UEzF4Y54yRoc9j/A29EAOG/UzjAuDOeLVWVAiqQjhHru5dQ3cTRrA3auNAcFf iMyXNC6R4TVtOkontUjR6jsbaqUTtqxUKDq9QRR49bfbDBjAlO/q0T0HBu9X2SuXC1CMBR 8a82ZlaDXgEyMjyBSjtdugYQaJI+IK8sAqwlMMM+5IWELOKQegPbB/TlV+rxsCFl0GPsrw 4o1LCaQ0vkb3OjiWM/sAx1oPc+MK1O6SpYXhZgSGwg1xDxxDTX2bK15tXIxrBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776386565; a=rsa-sha256; cv=none; b=hpN8dvLbeexjdiQKDZaLWJrvdYy5sWTGGan3kjsZsAFehJtQh/dNX0GtMkFPYgYUDqDiGG 1AEZn4lgC/TUqW7HwnzS441Jua7fD+YaRufbLHyWALWUWCSfvIsY7KNjSqztoIuVHAGJ4z ZZ9JBZ2nmlslgxjdE9OqxuSJxXzggQz85kEzUGYNXwJlzbpNp1gJzIrdPFeHcyAOpCwdqb ebhjC3QPaXNKLpnb9jlrqFr+8EBJF/f1Yw3DvQ05w2/CufCALY8sgBk0TX5FPiizpv15fA 3vk8+oDcVSXDH2xmORPAH5+zoABb5SX4LEHsQxuY3+SjoUEab5gs48DlzPfbqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XvE5eVCeJoBqH6laUdMfw4fBm6FAtytaeFETXFnPzMc=; b=OjtHieJrmC4YBrPo47Pp0GnXvuG0NOx+Kwf2eIGatb05paBjKhDzJUvh9oh4H+I/Ais74q nJsGyutk/7exYVJpDFC459Lqv3KHceDfOuF4GJrxmux+j+n/Ay35wB0F4fOparwdvSDfKJ K0DRkFYOUHvg8lrhS4J9AXOys/3u1Ojwnk5YXTh/sL3pn1MKOPRUtZgpS2ZWLEqHGRlcxN 5xpW4xdPDnsjYUQrAxuIRVimnrVUFbOi+kHO7wcmRJyRRlQpj+Pu/Ul1W3go88W5M5E8PQ 8zwnl5fNSnS7/lb5da4V5R+EzdPjOuvOpV3VD689Uceu35KqyogK9cEEmFTpFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxbh53lF1zXQF for ; Fri, 17 Apr 2026 00:42:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 420a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 00:42:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 090c9ea98d32 - stable/15 - kevent: do not check knote lists being empty before removing a knote 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 090c9ea98d320bc3fa7794d4f668c44ff6902117 Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 00:42:45 +0000 Message-Id: <69e18205.420a4.7e019a1c@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=090c9ea98d320bc3fa7794d4f668c44ff6902117 commit 090c9ea98d320bc3fa7794d4f668c44ff6902117 Author: Konstantin Belousov AuthorDate: 2026-04-10 08:27:51 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-17 00:42:38 +0000 kevent: do not check knote lists being empty before removing a knote (cherry picked from commit 31069fdbdae1027a6f1af7d56d418de4428ac6d9) --- sys/kern/kern_event.c | 3 +-- sys/kern/vfs_aio.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 01731ca46b6b..8c7a0949f024 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2953,8 +2953,7 @@ knote_drop_detached(struct knote *kn, struct thread *td) else list = &kq->kq_knhash[KN_HASH(kn->kn_id, kq->kq_knhashmask)]; - if (!SLIST_EMPTY(list)) - SLIST_REMOVE(list, kn, knote, kn_link); + SLIST_REMOVE(list, kn, knote, kn_link); if (kn->kn_status & KN_QUEUED) knote_dequeue(kn); KQ_UNLOCK_FLUX(kq); diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 2a790237d30e..da0e36fc1ec5 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -2668,8 +2668,7 @@ filt_aiodetach(struct knote *kn) knl = &kn->kn_ptr.p_aio->klist; knl->kl_lock(knl->kl_lockarg); - if (!knlist_empty(knl)) - knlist_remove(knl, kn, 1); + knlist_remove(knl, kn, 1); knl->kl_unlock(knl->kl_lockarg); } @@ -2718,8 +2717,7 @@ filt_liodetach(struct knote *kn) knl = &kn->kn_ptr.p_lio->klist; knl->kl_lock(knl->kl_lockarg); - if (!knlist_empty(knl)) - knlist_remove(knl, kn, 1); + knlist_remove(knl, kn, 1); knl->kl_unlock(knl->kl_lockarg); } From nobody Fri Apr 17 00:42:46 2026 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 4fxbh65zf5z6b0rB for ; Fri, 17 Apr 2026 00:42: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxbh64ncDz3f46 for ; Fri, 17 Apr 2026 00:42:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O/DKxw95L6kz9E2sp7WSKiouMN32LKaSeJttdFV+xuI=; b=bXvx/ZiQsAv/8Ej3OIlOIkVhGJQIgeRz6yF1qPIAcf0FDMD/QupPrHmbUP1RgvISXSH/DP IvPLvw2atxvxKP/LFjwvEiKLiXF1O5OIRD6qrttyasSwj+PiZhHnh9l+6mcxMjMX3lGl8k 8+tn3tZapVOfiCa6VemiF6uIlvnWh1VgVtYcCJcr1uo2AqAdlySqLpKR6zlS+adBO9FMwH y7abBUzDFz8DJoYptSCW6fwYjYUkV+qE83cODZaKhi5BmaQkBaTVo5IvlHSSDnf5/H8kWL 4gmjP+MrZzUKRnQSSF3ISWd1fCuqK7Wdl0zcP5B/LW2bR0+ASSQ3bSf0TqNVmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776386566; a=rsa-sha256; cv=none; b=wO7v2aNDv7pUu+o/0EuzRZOovFE7vltB+lX1r9xpY3nelW80TBs6dAuUYMAhth4kbePN4A nF4Ruh26ocGBSj6c4ukBW4gW8vH/W8oTt3Fk8x1BfP5/wPhKFHjgWHkAlAhrwtkjmfFgdd xxcG5tV7T924lqG5NOrNtzmTcQxnbB9MrIqnGxDcXISnLGSQCfftSlLckGihzRTKCzw1wP 0WfelWeyVOb8MYBA6V6/rMM/Vx2BSj6sCJFemLv/zux55D4p91+7xs2hDCfJshoFdDdZvd h4ZF/d+vameE6nMj4Z2T+odu5lQQZm+QV/4BDaKV43U/KoUKagZhw3ZNlHG8Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O/DKxw95L6kz9E2sp7WSKiouMN32LKaSeJttdFV+xuI=; b=TkYH4aT4uVVs3zGmK9NaP40BcZ1K3DMhFCEnshMz7wysFULEKYv2f1Tke7xvv4ngPPXzBq NuOzYft8r4k85auZ7lkFB+zhBksB3j8/n5/jrwi+11+3zUDeqXKRW0NmK5fXPJCWKND+5u LBzwu29yGG+Wamm7vG2dBgqcg5KLRwTfFZ0sL/3RZxnYc5wrwQyzdyZBXZCuK6jnYcpZNB AYnbB8BGLl6J9z6lRjASDFcFTkjd+CK4ePQCRKrBJkYAr5uURvvf8qv400qDkWiFjWyWYq 2KEOO+3raoge5EiZW3gsXmNAt7PYCnFWs7Jn92C5xRO5ILx2bauV/tMpJBK6fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxbh648W7zWpB for ; Fri, 17 Apr 2026 00:42:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43554 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 00:42:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 803a89285639 - stable/15 - unistd.h: _Fork(2) is required by POSIX 2024 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 803a892856398a1713886c09756803a8d148a470 Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 00:42:46 +0000 Message-Id: <69e18206.43554.16500a16@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=803a892856398a1713886c09756803a8d148a470 commit 803a892856398a1713886c09756803a8d148a470 Author: Konstantin Belousov AuthorDate: 2026-04-12 08:57:51 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-17 00:42:38 +0000 unistd.h: _Fork(2) is required by POSIX 2024 (cherry picked from commit f286933c950f6308117c8400f36f3160f6227491) --- include/unistd.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/unistd.h b/include/unistd.h index 21e3a7740607..797eac4c364d 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -453,6 +453,10 @@ int unlinkat(int, const char *, int); int symlink(const char * __restrict, const char * __restrict); #endif +#if __POSIX_VISIBLE >= 202405 +pid_t _Fork(void); +#endif + /* X/Open System Interfaces */ #if __XSI_VISIBLE char *crypt(const char *, const char *); @@ -594,7 +598,6 @@ int undelete(const char *); int unwhiteout(const char *); void *valloc(size_t); /* obsoleted by malloc() */ int funlinkat(int, const char *, int, int); -pid_t _Fork(void); #ifndef _OPTRESET_DECLARED #define _OPTRESET_DECLARED From nobody Fri Apr 17 00:42:47 2026 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 4fxbh82M42z6b0Pf for ; Fri, 17 Apr 2026 00:42:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxbh75WMZz3f6p for ; Fri, 17 Apr 2026 00:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X7bGV/Mu6vZVYkoQdlq4Fjoqr9HA37lo7kmNARE2jSU=; b=opQXlzDbhp3t/tPWRsOSsWJJTCYnjD5PumCy5u4oYnMMfMipX9M0cZAWROcQWNRw1TP0fW jrGejWXEyAOm+RK8EcI3nrF3C286H2ikYc1Z135wYWPc0po8YymNKNZJucXUgJzzYBFCUS kmFiQo8stDBOhllqe/SagdUiHp/DvgPk6wskJ/qcYQdQAu971aSYB6VO7foEmxvGA6Ev6J 3uQiK3bEnSMeHp18JWjbnnrr4nUJR+fkCwMICNkqrb5CYnjQIHqRY5DWqZyY+dSLhjwTn7 IeSfK+4/lUI8x2iqCYTW2AkFdrT2TXeh+Cw0SCfOJXZVTAuXe2QBlMeMntoRzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776386567; a=rsa-sha256; cv=none; b=VYY0nb8bPzOMWvBKXT5A0hxvFGHVNe/bykj+R9071G0JuBUyhZjVt5iGhOshc89POFehZY +USTr4jBylrcpn8FZcvaKIiwukELskQHl5oXcOlOlutGjAqDCeEFUXQe5epG0sZIcbUXWB fFRykoR8izuzI+td+wNDO5wNzpIiCPQnmXTe1cThioo4iVN/yQ5AW2yNBPmzGWbNyL1pb8 35tewyQpJLaA7gz0e19nd+a/ncOsEDBzZy4dwwey9OsNtotWIKDN5bwVMGAFA9jct84H1j N+S7ZEEqgTLAimMeC3wswE9vCqKmyYQk69CgUNhIlnBqW4T2HG4vMGuCsZjktg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X7bGV/Mu6vZVYkoQdlq4Fjoqr9HA37lo7kmNARE2jSU=; b=GDjOvgGe9KRss2ZMg42QAX130Dejv+aJx+xHM8/wzVciDzVC5AvcvifIba7alavtp3ZKcI v7Nm+zWguuE2ctfzljejZb71M9WFm59KOEbXBmR+a3uY44DA6Vf1wHG2GSjKwZ/Kqo6DTa eHEUQk85LcdzW6RAff48liwfwS0LXnLN4KmUwPSMrd0PRkdcm9m/jbR8RiAKTQ7NzxFn+K OgkZ4tducySo5HVWSSd5ndTkBaYw4QId1Ec+KsvGon3AA3jnf/4FxcrF1cJXiBwUbVAaxw 2hGKRHkPoJywYVT2OC5kijgsD1mtsscR7CPe4QhjCMZJVRkw5EBlaOK15o0+6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxbh750yQzXQF for ; Fri, 17 Apr 2026 00:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41ec2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 00:42:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ee3ef70c403e - stable/15 - fork.2: note that all methods to pre-resolve symbols have consequences 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: ee3ef70c403e4069f9c2958e5c3106c61e27f118 Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 00:42:47 +0000 Message-Id: <69e18207.41ec2.305806e9@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ee3ef70c403e4069f9c2958e5c3106c61e27f118 commit ee3ef70c403e4069f9c2958e5c3106c61e27f118 Author: Konstantin Belousov AuthorDate: 2026-04-12 09:16:13 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-17 00:42:38 +0000 fork.2: note that all methods to pre-resolve symbols have consequences (cherry picked from commit 660498986a8e56025d9d2f9c6a0813c09a27ba8e) --- lib/libsys/fork.2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libsys/fork.2 b/lib/libsys/fork.2 index e59b208a9ff5..89a5631d7daa 100644 --- a/lib/libsys/fork.2 +++ b/lib/libsys/fork.2 @@ -138,6 +138,7 @@ services ( or .Xr rtld 1 ) are available in the child if forked from multi-threaded parent. +.Pp In particular, if using dynamic linking, all dynamic symbols used by the child after .Fn _Fork @@ -151,6 +152,7 @@ option to the static linker or by using each symbol before the .Fn _Fork call to force the binding. +Either of the methods subtly changes the ABI of the resulting binary. .Sh RETURN VALUES Upon successful completion, .Fn fork From nobody Fri Apr 17 00:42:48 2026 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 4fxbh92dvxz6b0RV for ; Fri, 17 Apr 2026 00:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxbh86Qmkz3f1d for ; Fri, 17 Apr 2026 00:42:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YGIvbScSHkYtD1WMc3ijz3M3SpfVwptxm2QllbZwldk=; b=hszcXP+Ugn4RuAHbl6PHOAsLPo5nR50YQl82ecqLZlgl+s069z2lvw2zgOediEh+Mxmmx+ xrrHj5sAgnS3CvPIG6YJc5QudWiGTnq0Gv977QuOv5ZPhYWBic3GkRpHpl85Ob99RbPwrv d3rPKfRKlGQVjChfsMBpdccyOZX4Z2x72qFAbpOYIFeLwUyAn5R66DQyeGZi4G+0ajqMTF 6VMHvSZwKjgrmidiPzlZR+9ADrt+8lg114pJM70kCtgy3b7KVafg4siprVXEjGqttYvhaa m48h1Kt6xKKWUuBLFPm89mJmQcJeWbyAgvUyGQotoVKnh6ZhgAc53sbOeoTTrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776386568; a=rsa-sha256; cv=none; b=nrAVH2zwuvKTLz7qd+7SzcKGZXJCOwiErMTRjbh5mI1DSIW6Ydc75jqPuC+yx42h1zupjO YE7h0ojBJGLve0GS23u7hKSYGgCPzUMSuRaiat5AfRSc0XYVS4faR7p3AkwA98PxOs8SoW n7faAE/sGux7w/w7Vh/qWGhTJZ5FEjKotUviZdRGFyOnpbPbEbGGiggtE/w1w+h6AHviIf 3KfKz8qCUyS4likfP/96B6FZUdWRa1E/+pfa3KYQxLL1cnstsH7No+NqWJOzqBkna8Sgct eas1ei8ulJd1MozyVgTRbx6BjKQcB/f5S9mqNzbLSMfRkyTFrTRxboCkjanpVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YGIvbScSHkYtD1WMc3ijz3M3SpfVwptxm2QllbZwldk=; b=Aew6t0SXbRVma38AyjZOsW2wp+Rpnz37eaWrOmXtUdq+0HrjWoe09mDoHtIPR1Ehdq38EW c8sEQt6Vs0d9rtP8GJAmha7t5Z1A7hRAvIuKVlD0DYEXyfNSrx/OJ3OzctPr4SAVY80uW6 KhiacL5ThWQFHmWedd0pXIri3KAHJcd/5xfb8k3YQX+xBePM6NbdPzAgvGXbDglBcDx30I pKdqyKt8lgB4S4W4J3GuTDfIeqIer+6b7e2XsY+NAaB+xUulhTDQJ5IdPPcqSv7jndSoW6 XRxa60bHD3jddMhRBHG7wbfiNiozy/6ntAU+t8DP5ixnEbGydfwJg/Q7u92MDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxbh85p4SzXQN for ; Fri, 17 Apr 2026 00:42:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41130 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 00:42:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 46b2975cc7d0 - stable/15 - libthr.3: describe what we mean by C runtime 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 46b2975cc7d0dd518cc98bb48f09ea9eff4b7089 Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 00:42:48 +0000 Message-Id: <69e18208.41130.77d1a3e3@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=46b2975cc7d0dd518cc98bb48f09ea9eff4b7089 commit 46b2975cc7d0dd518cc98bb48f09ea9eff4b7089 Author: Konstantin Belousov AuthorDate: 2026-04-14 00:10:49 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-17 00:42:38 +0000 libthr.3: describe what we mean by C runtime environment. (cherry picked from commit fa912e3b9b5c074793bb1899f8256ea4baf72631) --- lib/libthr/libthr.3 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/libthr/libthr.3 b/lib/libthr/libthr.3 index b84176abcd32..8c7b84490547 100644 --- a/lib/libthr/libthr.3 +++ b/lib/libthr/libthr.3 @@ -52,6 +52,12 @@ The library is tightly integrated with the run-time link editor and .Lb libc ; all three components must be built from the same source tree. +Together, they constitute the base C runtime environment of +.Fx , +running on top of the +.Fx +kernel. +.Pp Mixing .Li libc and From nobody Fri Apr 17 00:42:49 2026 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 4fxbhB2GFhz6b0Vc for ; Fri, 17 Apr 2026 00:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxbhB06dmz3fCF for ; Fri, 17 Apr 2026 00:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nzkj2kjL2ZogTTikYvaITPRCMdoXdzEsVxMk7U578eU=; b=LWU2TCTG0BJuhUc++yVzbc5sJ9aIlJL2PORON8MGK+s4oAeyuL7cBONHVcPW9z0oIcuybt hiJJb8visvm4ITrO69GHtvVQ6XeJd4bw5GbyuateVbt+DOLXEcR5LZQxZq9h7x5B0hTDd9 /0rkVejn3I4uT9gaS+NQw2Fqwy1ZZrDWEfDx0rGSF/nAqCqRiTS5ntecKdI7+UGVhwoVVh D1tn/6abzTmsG6B7u4xrbdVmDaG47aW4k7n1PKLgnJjO3jonr6WWtLRJrn8Ld3njVfRIN4 QISDXIo48gPVwIEcdJCDiwByJyLwVuAtPw3s4LlDaxn5/XCPFwHNiIx++TR7Qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776386570; a=rsa-sha256; cv=none; b=bo6l3wHDcwuBDzDY+Xs6xB4WAofpk1PEovpXeaNngJeBeL88Uei+SgK1IPPAXILPCBEmly kYW2GqkeVpBQuSMTjD1/Lt59BMWr6wgNR63ICZTg7iLsbIA5SQuVXaya4O9h4vpVV9sFCT yqwaoOheVnmpSN0wFjcTP3g1FkLQvb4nHQpe8bCp0A29zEytRFCcZrJv+RY2kR2xfDuxlJ nRhhRdSEcqtu99cBgb7m++ddZGrXur8y0jo6H/VGhGJ+mxa8f/UEw6WEgwSOkd8jA4eoAz ejvrVl0SdCVg5eheQwP3qg1nXTrdJ9sG7rWuM3k8rK0cVFFxioIM2eRrK7L6LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nzkj2kjL2ZogTTikYvaITPRCMdoXdzEsVxMk7U578eU=; b=ZMchYduAvZ9ltglfpUbHGRsu0P5ZFcAxGRq4GgDgidgArPDBq/L7PA6yc7Zzc3vqlKivEz RIvvGv04001AB2oSzyeDEAwJfpZVvHLH9uS7WYfWLh2O1ufu1G4wH4JSDzMe5xY+GTvxQH dwVocq3ZVsq540ivHO6icKKB697vYIEinvH/+Ty1NtMd2LTwVoxKXnRBML6tLOITa1ch6e e2u30RMsuHSJHBN+4q+7FI95oGy/thSK4vGZ/V4kVCgX5TJKZjzhijANNX05l9PVw0yJvp Hzh0yVo8hJvHTbB/d1nHq0OY8RB/TjVZrVXbJ0ZcD5+V5ooZoHCK1yc1CrV5Lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxbh96Y15zXQQ for ; Fri, 17 Apr 2026 00:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 426b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 00:42:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 52aed375638d - stable/15 - libthr.3: describe SIGTHR 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 52aed375638dc5278a28c515fe9a0cdcf6c0aaa9 Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 00:42:49 +0000 Message-Id: <69e18209.426b8.5063a157@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=52aed375638dc5278a28c515fe9a0cdcf6c0aaa9 commit 52aed375638dc5278a28c515fe9a0cdcf6c0aaa9 Author: Konstantin Belousov AuthorDate: 2026-04-13 23:42:51 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-17 00:42:38 +0000 libthr.3: describe SIGTHR (cherry picked from commit 934a35ac2bbbcf8cd65d8824fa824eb5c6170c88) --- lib/libthr/libthr.3 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/lib/libthr/libthr.3 b/lib/libthr/libthr.3 index 8c7b84490547..5d9c5ec6706b 100644 --- a/lib/libthr/libthr.3 +++ b/lib/libthr/libthr.3 @@ -269,6 +269,25 @@ the critical section. This should be taken into account when interpreting .Xr ktrace 1 logs. +.Pp +The +.Nm +library uses the +.Va SIGTHR +signal for internal operations, in particular, +for cancellation requests. +This signal's masking and disposition is controlled by the library, +and user programs should not try to modify them. +The library interposes functions controlling signals to prevent +inadvertent modifications and to guard portable code against +exposure to +.Va SIGTHR . +.Pp +Note: similarly, the +.Va SIGLIBRT +signal is reserved for use by +.Lb librt , +and should be not modified by users. .Sh PROCESS-SHARED SYNCHRONIZATION OBJECTS In the .Li libthr From nobody Fri Apr 17 00:42:51 2026 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 4fxbhC2lRFz6b0Pr for ; Fri, 17 Apr 2026 00:42: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxbhC0lPBz3fCW for ; Fri, 17 Apr 2026 00:42:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z0x1Ra5OaqsOC5oEunT0Zcz7r+Nf9Ui6pJWpARiiItY=; b=j1J2Enit3E59pbsF4eIetZi5wjxnIDQ0eTj5tWp6pOJT42Dr7jDWf3pR1qj/0i070MuGJ2 w9BjLHyEh1xpvIXMwHb8dA7oK+GbM61gOYuVnJ+VaND8veDLXYugD/xiGVaRQg9B1ortfr wYt53g76sez9wAWYMiIJZ/aVx3KNt+xZfHHuMoB7oQ3mpD4Hl7PXatIW0s8LEDUWdKuUIz aLVceC193m6xxguiDFXMl3oIVK/dgMv3GSkNFTULmVS0jW+Jc3scLXV+jupI8RP1FL1Lqz EJxJuXMaDa0XolUGzZBvES2e2FmOpAHTR1ZOMUPTRkm5SA2tcP9iaTDQubJSxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776386571; a=rsa-sha256; cv=none; b=QzUYM58eGN7dniJPkBO9u5yEW1iW98TR4HhUMKBhjnH/eoSKUb3MDTKLoAngkWfnSLWIwy Tk8dI525mD9qCL51/vRfyHKOMw4njd6izbrwyAlZMCFkM6GJ90xUuG+Y3Ymd18RXsWtiA/ SsEbRySNsLInu4Zy7TrU8bVa65RsZRmkxIT98Y6OuTBx0CSke+/8HRXQJlxGLTUu7KJ8JG mE/Ks2lF28JbcNEEGtwTzSGVj9HOCz7Lx18bKjF1pNm5NHtiX2INuKoEcpVD/s7fWcVRmj pqMNu75sgrOUMsAMDz6vljSfVxJilIwc+/ywDnvx3gNN3Pare84j8KEcoEH4Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z0x1Ra5OaqsOC5oEunT0Zcz7r+Nf9Ui6pJWpARiiItY=; b=hbDXQtZAjQe3/KRzejZv4+QXQ12xiJPD23nhtkqjQeSdpegduie2HFH/RulEL9mp7zKi3V IuchL7rcDkUbr7iiH3w38bRzNaNxWWk+qQRUmq75sNJUzVVDbxS2HXEzuPp2ytpupsfng5 aDnOuIpIto2l7ZjTw+dIFYjaFAJw4lpotwQQY71YP1qL6WH/TBVuvWosyoy7OZpXoMw1on SrxWY7SK3tNJV9+eA2GstZ6WhAd4uYLB7YfDogqvfhhzQSa/I7qO2RM0xCvCUwmhErFKTL AyBf28TuC8RNsZRsTSCRPBupNBGl6jRr/eVPu8gCjKwidldoDDVsmU0Y+Di5WQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxbhC0HZKzXQH for ; Fri, 17 Apr 2026 00:42:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42da5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 00:42:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 65ccf925415f - stable/15 - openat(2): check that userspace pass known and allowed flags 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 65ccf925415fd3b88385da018f15e3c999bab003 Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 00:42:51 +0000 Message-Id: <69e1820b.42da5.82436e7@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=65ccf925415fd3b88385da018f15e3c999bab003 commit 65ccf925415fd3b88385da018f15e3c999bab003 Author: Konstantin Belousov AuthorDate: 2026-04-12 10:48:47 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-17 00:42:39 +0000 openat(2): check that userspace pass known and allowed flags (cherry picked from commit 8a5601cff1ea32ab63df1377f61620e4f91999b3) --- sys/kern/vfs_syscalls.c | 5 ++++- sys/sys/fcntl.h | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 92b43672bae0..dc02e3351fee 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1168,12 +1168,15 @@ openflags(int *flagsp) { int flags; + flags = *flagsp; + if ((flags & ~FUSERALLOWED) != 0) + return (EINVAL); + /* * Only one of the O_EXEC, O_RDONLY, O_WRONLY and O_RDWR flags * may be specified. On the other hand, for O_PATH any mode * except O_EXEC is ignored. */ - flags = *flagsp; if ((flags & O_PATH) != 0) { flags &= ~O_ACCMODE; } else if ((flags & O_EXEC) != 0) { diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h index 8f2fc1e2debb..0b13241f0ee3 100644 --- a/sys/sys/fcntl.h +++ b/sys/sys/fcntl.h @@ -171,6 +171,12 @@ typedef __pid_t pid_t; #define FOPENFAILED O_TTY_INIT /* Only for O_PATH files which passed ACCESS FREAD check on open */ #define FKQALLOWED O_RESOLVE_BENEATH +/* Flags userspace is allowed to pass to openat() */ +#define FUSERALLOWED (O_ACCMODE | O_NONBLOCK | O_APPEND | O_SHLOCK | \ + O_EXLOCK | O_ASYNC | O_SYNC | O_NOFOLLOW | O_CREAT | O_TRUNC | \ + O_EXCL | O_NOCTTY | O_DIRECT | O_DIRECTORY | O_EXEC | O_TTY_INIT | \ + O_CLOEXEC | O_VERIFY | O_PATH | O_RESOLVE_BENEATH | O_DSYNC | \ + O_EMPTY_PATH | O_NAMEDATTR | O_CLOFORK) /* convert from open() flags to/from fflags; convert O_RD/WR to FREAD/FWRITE */ #define FFLAGS(oflags) ((oflags) & O_EXEC ? (oflags) : (oflags) + 1) From nobody Fri Apr 17 06:32:56 2026 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 4fxlS9134hz6Z7Vr for ; Fri, 17 Apr 2026 06:32: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxlS90TQYz3KDg for ; Fri, 17 Apr 2026 06:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776407577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=huvkMoquZmnQUuHeApJfgEptL6/gOh+NN46t8l93Kj4=; b=DlxRzn91s1gBEoQKREdQYaOyl8yMhoNwqN5aFNaXX16+dRdr41QCRzPIe9ZRBvsHNdwdrh MKr1dDXudhYdXeZGvRIAacVF1ArxD8fCJMdXmoNFSOskY5cLtdYUQc2DKrUw9LI6I5o7p3 7ljuyyg5ZkPmEqb8b2WCxhBK5tiNRQ1BMzDMFihGQv5Zv+noamCBINbzcja9wEWVBFB9QS vlKCeGLdHt3yjDpYOZRzQeetuYjaYDYq6p7IcEInxbvxOAi2SoZlzUPXgsnXf71LN4n1UB /9UPArKZRscYef15jFr12EWdOJy3xI/KXcvMYiK7JMUO8iB0seby58+IlAYhfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776407577; a=rsa-sha256; cv=none; b=uBRDSQXvfbLoo/zW9xRLQJfP3bhZ1Tn0y1SrjdiHd+VRCUIla3MohFhNytr0ociKyheIw9 xzH9bjZHRTt2aOAa1cLG8zx4W50sA1oH8Qb0735lONWGsnTjmxXfE50eSFTt7bYiwUCz7m wshs4D60s8qhVd6UO6PH0xgeACLwJZ71ipQP4qn1dzRTPYDM9w123GAbUSEle14KS6zdqj h+OEc83ZZVTDp0ZAbmIdyPrGXMGerQAxhPR5Nt2WX/x8Av5yggDbNgV6JlXxmu81h7cnzt iUJt3q+0UO4HQd9ntKK/5DLHI6fqDNNt2yGHdg/thCl78O1uTVvUoTUAmW9pdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776407577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=huvkMoquZmnQUuHeApJfgEptL6/gOh+NN46t8l93Kj4=; b=gpoc6AAvjvN0An192OFVq6g0PhoZAW0BF/jOA7VZcsmudVX9oHGNwn9XtWqkJKLRIdFW1c WcTQV0jef79DApPe5gssBL1YQNoX0qv7fWiYvNbAcjkwGUyiH8YenqmsLTAp3qMVqWdldm dxlZ0ZTmJTDMXLV37OyudwRRdNz2sPspSzJq+BEstl9ZwaGnaOULo/9FJhGm9UmSCBdZ4B 1+WmivaR/x4Htz0pGTi9IyENPPp+1TaDQ+rh7FzZ8K1DmfZOlmXdk+1piupkBan/kuyOUB 3Fjma1HHDHDIj0P4evE8j6eoXrlylth6Oj39bSoHCEtsgV7eg87EH4p3VUHbbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxlS875hwzjmh for ; Fri, 17 Apr 2026 06:32:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 400b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 06:32:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: c775ed207fcd - stable/15 - routing: Fix use-after-free in finalize_nhop 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c775ed207fcd2036754b8f17a67cae61cf1977cd Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 06:32:56 +0000 Message-Id: <69e1d418.400b9.4b42bacb@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=c775ed207fcd2036754b8f17a67cae61cf1977cd commit c775ed207fcd2036754b8f17a67cae61cf1977cd Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-04-14 09:36:53 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-04-17 06:31:35 +0000 routing: Fix use-after-free in finalize_nhop FIB_NH_LOG calls the `nhop_get_upper_family(nh)` to read `nh->nh_priv->nh_upper_family` for failure logging. Call FIB_NH_LOG before freeing nh so failures are logged without causing a panic. MFC after: 3 days (cherry picked from commit 7d38eb720a8d8345949986d779e785984ae19ae0) --- sys/net/route/nhop_ctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c index 0c028c7ae877..30c73188600d 100644 --- a/sys/net/route/nhop_ctl.c +++ b/sys/net/route/nhop_ctl.c @@ -492,17 +492,17 @@ finalize_nhop(struct nh_control *ctl, struct nhop_object *nh, bool link) /* Allocate per-cpu packet counter */ nh->nh_pksent = counter_u64_alloc(M_NOWAIT); if (nh->nh_pksent == NULL) { + FIB_NH_LOG(LOG_WARNING, nh, "counter_u64_alloc() failed"); nhop_free(nh); RTSTAT_INC(rts_nh_alloc_failure); - FIB_NH_LOG(LOG_WARNING, nh, "counter_u64_alloc() failed"); return (ENOMEM); } if (!reference_nhop_deps(nh)) { + FIB_NH_LOG(LOG_WARNING, nh, "interface reference failed"); counter_u64_free(nh->nh_pksent); nhop_free(nh); RTSTAT_INC(rts_nh_alloc_failure); - FIB_NH_LOG(LOG_WARNING, nh, "interface reference failed"); return (EAGAIN); } From nobody Fri Apr 17 06:45:22 2026 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 4fxlkV3RM7z6Z8fp for ; Fri, 17 Apr 2026 06:45: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxlkV2t4Rz3Mc5 for ; Fri, 17 Apr 2026 06:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776408322; h=from:from:reply-to:subject:subject: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/o63NAU4NeAIasYn2Y/VvPDhU5DSIolmGIsYtdFCAE=; b=MJLJlvdfibbc2a5gmhtKdYvADelxfb584hzSTuV7dzauTQda9LvlNnTBdF5jAuGYj4UDy8 sYXeHWdwwDE6HFUxyy8PEDrvUY8vakogSbvOazKwb4QFDPRYplo0lXbvJKhF/kRRMZoYa+ Ck6MGFU6GrV7p/K0AJY+CshCRIc4nCWIYMTRKkEq4uB6zirGhCzxiVYEoWEJPPiGFRXPvq PbxWOaHfJH20QAQjh8VSFGIbP4rkOrfl1nRPliQqTKiN5M8gWl3k790yz7wUgdXapt3+iY 6p39RYmjNGLQPTcfQPCtdho4wCEj5vig30Jc1xFJ9nw+TldUh1JTxVr9xFhbPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776408322; a=rsa-sha256; cv=none; b=ssr8vlyi8KlHT7WjdAxU0REMqvFRGt/hcN48UXjUbrA2vsH1au4vHJaFZBNadT73Z0tDuR ZHUK8TYPnYVqE0lbh54dD43aS80TN8/Jps39v7BRMBhDKSb5jOb5AOU+Ph1Xjob4Fx7D0m 36TmeLnHsorZf+nCips+aei5uG3CyxUdMly4UZSWe/8fCeRl5zAA5E03ePAmbiVb1u+xIG u9wWAWBhR49dCs7Z2k6dnOMxQRmtzToqKcCYJVS9+puxVBLrryM48Q6Kr3Z1MUU2p7QDep jkDKs6vRQEOQbLo/Ji+i2suEpJjh2sH68Zn4r/+mW04gAQ4K8vivTJjmCrcMaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776408322; h=from:from:reply-to:subject:subject: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/o63NAU4NeAIasYn2Y/VvPDhU5DSIolmGIsYtdFCAE=; b=O7rrgvdqfOF0bwaiwl98GhspLODwyHyeJhYGgbBDHFrXdyl5xYI1A0dHjKHK59D5G3MJJL MFkBt1ohI0ABv5WM+MM6zYE3yZX/+biHU3dH3ZW4ojckm+BCfE02+GNK6bhQQhzH508+Hq Z9LzlZg8U2wLYjN/9861Rftf8MDEf31psXMOWMRUurBV9EZx+MAkAqDJTuAFBhLoAvLCnf TUsHZVAb3ZLNdP89VodtjTfg4fP7ooxglaEsixqxs6/Q5ksbuZyupgBv/TFxi0qDYzVr65 dO2T9CdhNsQzr7ByLkrCooYHkbK8PhJGZ/5ZdoJvOuE/y4ZUd/LWQt25QCii/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxlkV2GRvzk7J for ; Fri, 17 Apr 2026 06:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41a24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 06:45:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 67a7c5f70986 - stable/14 - routing: Fix use-after-free in finalize_nhop 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 67a7c5f70986a24a8374146e6bcce2005e767b6d Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 06:45:22 +0000 Message-Id: <69e1d702.41a24.9526035@gitrepo.freebsd.org> The branch stable/14 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=67a7c5f70986a24a8374146e6bcce2005e767b6d commit 67a7c5f70986a24a8374146e6bcce2005e767b6d Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-04-14 09:36:53 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-04-17 06:44:34 +0000 routing: Fix use-after-free in finalize_nhop FIB_NH_LOG calls the `nhop_get_upper_family(nh)` to read `nh->nh_priv->nh_upper_family` for failure logging. Call FIB_NH_LOG before freeing nh so failures are logged without causing a panic. MFC after: 3 days (cherry picked from commit 7d38eb720a8d8345949986d779e785984ae19ae0) --- sys/net/route/nhop_ctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c index 0c028c7ae877..30c73188600d 100644 --- a/sys/net/route/nhop_ctl.c +++ b/sys/net/route/nhop_ctl.c @@ -492,17 +492,17 @@ finalize_nhop(struct nh_control *ctl, struct nhop_object *nh, bool link) /* Allocate per-cpu packet counter */ nh->nh_pksent = counter_u64_alloc(M_NOWAIT); if (nh->nh_pksent == NULL) { + FIB_NH_LOG(LOG_WARNING, nh, "counter_u64_alloc() failed"); nhop_free(nh); RTSTAT_INC(rts_nh_alloc_failure); - FIB_NH_LOG(LOG_WARNING, nh, "counter_u64_alloc() failed"); return (ENOMEM); } if (!reference_nhop_deps(nh)) { + FIB_NH_LOG(LOG_WARNING, nh, "interface reference failed"); counter_u64_free(nh->nh_pksent); nhop_free(nh); RTSTAT_INC(rts_nh_alloc_failure); - FIB_NH_LOG(LOG_WARNING, nh, "interface reference failed"); return (EAGAIN); } From nobody Fri Apr 17 07:42:16 2026 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 4fxn090Gcsz6ZFxZ for ; Fri, 17 Apr 2026 07:42: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxn084l5mz3Wd5 for ; Fri, 17 Apr 2026 07:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776411736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0BRLqns+C3Rtxn6ct8aJ+wTqp4exJFAWHiV42M6lIV8=; b=PhHfO36QXObDa1nMgQ2/8VDnJ2LnRDPhpP9oDB53UP96QXoLlYAGxi4wX7rava/lQfu1ai 3D35So7GgNKHgQlLiZ/BfuEdhXEzbOcsad6UIeRM7WbJt+w04gUeStRxIo0x3OQSwcdDuZ xCjS1yhvkBNibefoAFHQ292rIF0su3EjdVDwbhJUS1OLVeDOUNVSenuE+xCknQ+ZSPcTbT pZkuK/XwTfeOn7DnRFOG3rXsqenEK42Hdv4zAWObzltDDFrTbBoJH4LU4d591eFdydhP05 yn2JMJLOdhLIeYZj1QZNlK/fKVXnyqbQkcnw5nC83CvvVUoABlehoprTXhWnFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776411736; a=rsa-sha256; cv=none; b=p8rIQGIGKfyQGqpo09UF8kQn2nDkZypqOVP2HoeBvW5af41QtQnUkxGrTaThKMXn9ugMBz QfQxahQuVfcgQV1vhpAkWVU/HeSEhCG9W8SD6ficuqZ2jrv724XFqCrG6XnszTsWwsn2KT Ff52neXyzql0cp1FYTZj7gfSEyezfeYhTdhJ7WLjZ5hOjuHcMMouWWRPQM8jZKq/rTnae5 99VTxRlEoXNX3Mg8Dyj9+JxlpL5E95QTZlpC7ez1mYT7/k1WJoyJE1KxGh8G9ghJaHr1Bc rNA06j/7tqDFnSXf+VAcAzAZ2UItiDnzVzHUdWDXfOz13iklt7OVGjPEjcKCBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776411736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0BRLqns+C3Rtxn6ct8aJ+wTqp4exJFAWHiV42M6lIV8=; b=tQYSuwHGBopAKyeCCzIvwm2hp9T92dt1KGtpCa7iSEUuCffp//wOC1kyfhjKEzeZC6Rhmu ew9Laym1K74zjhUGyHYre3wlh8b4UTWQ+IRnLDtXQqhT+Eyyc2Reptv9cSYcLv3pWHFBor Nl4GJrez/lfyNcY/7hVSTz7daXumZMBiK0M4ZlumMflMGVxJpXwQOkOqtSEENRYp28phXo 70BK2LnDflvh/7OLCfF7n92/pLe8RPmYeqxbNnRqzeRq4Op3SNu5I/IOdRZCCcubkmUGug uxmC53hMKX1XfdUyTD2MyVuiCORnRv6Q98k6jCZbrdJ2b3jCaU82yg64duhY7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxn0843BYzlXy for ; Fri, 17 Apr 2026 07:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45cd9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 07:42:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: d31fa76204fe - stable/15 - ciss.4: List all devices supported by ciss(4) 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d31fa76204fefad4abe9a38ea4d911460cb84e58 Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 07:42:16 +0000 Message-Id: <69e1e458.45cd9.2c748390@gitrepo.freebsd.org> The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=d31fa76204fefad4abe9a38ea4d911460cb84e58 commit d31fa76204fefad4abe9a38ea4d911460cb84e58 Author: Michael Osipov AuthorDate: 2026-04-06 18:21:48 +0000 Commit: Michael Osipov CommitDate: 2026-04-17 07:41:40 +0000 ciss.4: List all devices supported by ciss(4) PR: 285744 Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56285 (cherry picked from commit 54f5d20492d231b5c2ddc6f1d94dbffa1707d820) --- share/man/man4/ciss.4 | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4 index d731aaddad38..cf59836c47dd 100644 --- a/share/man/man4/ciss.4 +++ b/share/man/man4/ciss.4 @@ -1,7 +1,7 @@ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" -.Dd November 6, 2025 +.Dd April 6, 2026 .Dt CISS 4 .Os .Sh NAME @@ -116,6 +116,18 @@ HP Smart Array E200 .It HP Smart Array E200i .It +HP Smart Array E500 +.It +HP Smart Array H240 +.It +HP Smart Array H240ar +.It +HP Smart Array H240nr +.It +HP Smart Array H241 +.It +HP Smart Array H244br +.It HP Smart Array P212 .It HP Smart Array P220i @@ -124,6 +136,12 @@ HP Smart Array P222 .It HP Smart Array P230i .It +HP Smart Array P240nr +.It +HP Smart Array P244br +.It +HP Smart Array P246br +.It HP Smart Array P400 .It HP Smart Array P400i @@ -146,30 +164,56 @@ HP Smart Array P430i .It HP Smart Array P431 .It +HP Smart Array P440 +.It HP Smart Array P440ar .It +HP Smart Array P441 +.It HP Smart Array P530 .It HP Smart Array P531 .It +HP Smart Array P542d +.It HP Smart Array P600 .It +HP Smart Array P700m +.It +HP Smart Array P712m +.It HP Smart Array P721m .It HP Smart Array P731m .It +HP Smart Array P741m +.It HP Smart Array P800 .It HP Smart Array P812 .It +HP Smart Array P822 +.It HP Smart Array P830 .It HP Smart Array P830i .It +HP Smart Array P840 +.It +HP Smart Array P840ar +.It +HP Smart Array P841 +.It HP Modular Smart Array 20 (MSA20) .It HP Modular Smart Array 500 (MSA500) .El +.Pp +Additionally, several HP Smart Array controllers are supported by PCI +subdevice ID only, as no model name is available for them: +0x3220, 0x3222, 0x3230, 0x3231, 0x3232, 0x3233, 0x3236, 0x3238, +0x3239, 0x323A, 0x323B, 0x323C, and 0x324B +(all with PCI subvendor 0x103C). .Sh SEE ALSO .Xr cam 4 , .Xr pass 4 , From nobody Fri Apr 17 07:44:33 2026 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 4fxn2p074Mz6ZG5c for ; Fri, 17 Apr 2026 07:44: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxn2n6bwbz3XNG for ; Fri, 17 Apr 2026 07: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=1776411873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MoY7NKxNuyFcHKGQoqEwZOkPSBl3NPzVqFGlUpec+s8=; b=xH33X5ezaMqes8fl9/tFBJ2ZCc4ciVv+Zmluj2o9Cd9A/8HmNEj6tX91veKGvGiuCi06no i03ZRnABjrldggCChnOTdCZ5Jf5zmZ+Zof2VuQWByuzbA4DMH5X5MMnWuEdi8omAFyc63v n0wz1+ClUoH51SI8UQQsyE7rGEFNlFy3mVpSf3L3hiOaWT2/eyadbUnys4oiqaKUE2ttZc Uv3rAfzaoP1wgDBVEVGrGPrgb2DgSN4x4R6PjPUG/Zu5sXDYlPZgaYhl7fjYUFJX339nDX rulQ5KVo/8gyn8G0F74+y0rCLlEHnBjauJVDtexaJCLKdJrRnlADYpYmHqCdDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776411873; a=rsa-sha256; cv=none; b=H5ZQavDwopzxrxHtkLz4gPgNsCe/zWNU2HC52lTMlI0DuWUfJDQs87tLDv3yLz88kkJEPv 6iB7r9W5yrUFV48YdLSIQeVysHl3pDnICacSj9RPV2ji2LXfvJj4law61qo8eTiobiegex 5zOv6zMdHNxOK5r00I1UjBObmct5H3xEWR6A35bhDIETUZ+fd/hkYv2eJbLJooFE2ToA2j hCxHawLBbtx4to2O+HrCPGH00aBDtm7+7SqIRCshCznbk13QyN4jtUCjeAq7iEomAMMz7N a5Ek1veD5mnWfwosbLAbVjFoJT86ECByZiMGft6JGeCzFSgb5Pg10GUmNB8h6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776411873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MoY7NKxNuyFcHKGQoqEwZOkPSBl3NPzVqFGlUpec+s8=; b=q0esZxvnp+4fkr72J9CBH4FpG+HEsIVK0SjcOZRHgM5pHIyJhcZkKDPbdOOHVXl1HSR5av AgHC1TmN8FHrNjtkQKbONpE9/bl3NHHzxI8Y4u1J2dwogpMoFc24SsclxCWxkiK6waJAPU mtxBD/ofDnob1bMRxcBHc/lvDH6XGxPTw/NOFT4GEt8S8VkYyS1RO7aW7zVFsdiIUYML2b VaqWluk2HiJo5oPd/v9jAdpTZbTis6Dn8Mh5y02weIaJmvbYtDJNpBNuehYIfJ2oEYpU3z oY64EaZAahDTE5bTqBe3ATXmX/hneL674Qaq6FUSyDpLCa4RpSPBe1lbxwdFpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxn2n65MrzlBN for ; Fri, 17 Apr 2026 07:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45778 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 07:44:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 131a3e980004 - stable/14 - ciss.4: List all devices supported by ciss(4) 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 131a3e980004152a7c9748abe2235bbb7e07901b Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 07:44:33 +0000 Message-Id: <69e1e4e1.45778.86f7fa4@gitrepo.freebsd.org> The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=131a3e980004152a7c9748abe2235bbb7e07901b commit 131a3e980004152a7c9748abe2235bbb7e07901b Author: Michael Osipov AuthorDate: 2026-04-06 18:21:48 +0000 Commit: Michael Osipov CommitDate: 2026-04-17 07:44:18 +0000 ciss.4: List all devices supported by ciss(4) PR: 285744 Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56285 (cherry picked from commit 54f5d20492d231b5c2ddc6f1d94dbffa1707d820) --- share/man/man4/ciss.4 | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4 index d731aaddad38..cf59836c47dd 100644 --- a/share/man/man4/ciss.4 +++ b/share/man/man4/ciss.4 @@ -1,7 +1,7 @@ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" -.Dd November 6, 2025 +.Dd April 6, 2026 .Dt CISS 4 .Os .Sh NAME @@ -116,6 +116,18 @@ HP Smart Array E200 .It HP Smart Array E200i .It +HP Smart Array E500 +.It +HP Smart Array H240 +.It +HP Smart Array H240ar +.It +HP Smart Array H240nr +.It +HP Smart Array H241 +.It +HP Smart Array H244br +.It HP Smart Array P212 .It HP Smart Array P220i @@ -124,6 +136,12 @@ HP Smart Array P222 .It HP Smart Array P230i .It +HP Smart Array P240nr +.It +HP Smart Array P244br +.It +HP Smart Array P246br +.It HP Smart Array P400 .It HP Smart Array P400i @@ -146,30 +164,56 @@ HP Smart Array P430i .It HP Smart Array P431 .It +HP Smart Array P440 +.It HP Smart Array P440ar .It +HP Smart Array P441 +.It HP Smart Array P530 .It HP Smart Array P531 .It +HP Smart Array P542d +.It HP Smart Array P600 .It +HP Smart Array P700m +.It +HP Smart Array P712m +.It HP Smart Array P721m .It HP Smart Array P731m .It +HP Smart Array P741m +.It HP Smart Array P800 .It HP Smart Array P812 .It +HP Smart Array P822 +.It HP Smart Array P830 .It HP Smart Array P830i .It +HP Smart Array P840 +.It +HP Smart Array P840ar +.It +HP Smart Array P841 +.It HP Modular Smart Array 20 (MSA20) .It HP Modular Smart Array 500 (MSA500) .El +.Pp +Additionally, several HP Smart Array controllers are supported by PCI +subdevice ID only, as no model name is available for them: +0x3220, 0x3222, 0x3230, 0x3231, 0x3232, 0x3233, 0x3236, 0x3238, +0x3239, 0x323A, 0x323B, 0x323C, and 0x324B +(all with PCI subvendor 0x103C). .Sh SEE ALSO .Xr cam 4 , .Xr pass 4 , From nobody Fri Apr 17 07:48:36 2026 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 4fxn7S4nNNz6ZGHS for ; Fri, 17 Apr 2026 07:48: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxn7S3k4Zz3Xmv for ; Fri, 17 Apr 2026 07:48:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776412116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zGn0uUmAH7kjF3TeU4WX0fZOFbeJ99/mfxu3P4IZvbY=; b=RdtmTPRBOjJlqYNN2hxND0glZ1/TfmDyvieY8LgDr6FCalo+guzAaZjbdgjCbDXLOkmI0Z LwxMJgz4emP8E5ug5EzGVThkeI8LyMNhCci69LwkW8Gl8oQgNrReXh/6pjsZRRjCmWSivi 15RMRcEbiN7KhlCCagagEEDH4LBEqUIb1U9xzGVJMciesb14Q8qIF+NOn0y3fMSaOXSt0p HsN4urQLnM3E8SY9uYoqt2n+2lEOvTIbGi33MJDxCc1IzSg+0Q487DhG1Fn5K8nXp1Zy7Z bpHQeCcWLtJe8a22i2TXoxWa7TiMbPc5bRyvdGV8BHf5XTr5y+E6wnG8Mn5+fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776412116; a=rsa-sha256; cv=none; b=UvHPZtHg0e7YhhaKap+VwSvLEBILMjIkAwBFRf9aNANuvbm56EvT6i7LW2E6ypFNYv4lb1 9SbL2iPqQkCd22z1kxU3apAteMOG/jIoKsaJ4kKV6hFGMuC5hKSZ+JFTNCRbeNNwi4f5CM 3DDcKhCdjXlHt0jaspoCdX8xWIPJi0whPkerdKZK20IsvfCxcoAXs/prOhOuahbg4KUuvL apFimQCuzmvAPkS8Kf5GluOnQhPgxZQcbdMna4vFjgTD63TqZBuoEixZJ7qf3MrvXjhskb wIQIiGoU+1WauzJfLVNGgIBfpOzeQ21ATp4kj2KavVjguKlTApCDDIhKymYOOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776412116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zGn0uUmAH7kjF3TeU4WX0fZOFbeJ99/mfxu3P4IZvbY=; b=mLoNgEvVHQ4OsZg1Z+LMoxjSel8S5nHQXP4LeW7DQGvqsEm1By33HhEHxk6bruqD5ugaRM NPvRk1u2jTu51n+S+PlM6n/B135Pp7vD09uV2dlYWZacbBZncQXghheK4ZG+OhEq/yCreG 6nygQJNfqkqZ3gOJuWE+HaUkxE2m19Xn9DCqWg+KY476/qeNK4IN0OF9OKbmsBG+qyy14z i5VAP2PC400h5Z5p2SbhuB4AycGBQL/hTpefap/btaJBsCfWpicQScr+n/CC3XUuGPRkfk EYWNKfCTSF+og+Culk1RuFH2QFcwnTsXbb0l5XRdimc/R2PxDYhVnmo8xjCtfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxn7S2B2qzlY2 for ; Fri, 17 Apr 2026 07:48:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4577c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 07:48:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: cef2490a71ef - stable/13 - ciss.4: List all devices supported by ciss(4) 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cef2490a71efeb0a1b6ed7a03ecf19f2cbc97428 Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 07:48:36 +0000 Message-Id: <69e1e5d4.4577c.3c3a31cd@gitrepo.freebsd.org> The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=cef2490a71efeb0a1b6ed7a03ecf19f2cbc97428 commit cef2490a71efeb0a1b6ed7a03ecf19f2cbc97428 Author: Michael Osipov AuthorDate: 2026-04-06 18:21:48 +0000 Commit: Michael Osipov CommitDate: 2026-04-17 07:48:12 +0000 ciss.4: List all devices supported by ciss(4) PR: 285744 Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56285 (cherry picked from commit 54f5d20492d231b5c2ddc6f1d94dbffa1707d820) --- share/man/man4/ciss.4 | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4 index 28d6556ecd85..ac88a6d2c042 100644 --- a/share/man/man4/ciss.4 +++ b/share/man/man4/ciss.4 @@ -1,7 +1,7 @@ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" -.Dd January 26, 2012 +.Dd April 6, 2026 .Dt CISS 4 .Os .Sh NAME @@ -115,6 +115,18 @@ HP Smart Array E200 .It HP Smart Array E200i .It +HP Smart Array E500 +.It +HP Smart Array H240 +.It +HP Smart Array H240ar +.It +HP Smart Array H240nr +.It +HP Smart Array H241 +.It +HP Smart Array H244br +.It HP Smart Array P212 .It HP Smart Array P220i @@ -123,6 +135,12 @@ HP Smart Array P222 .It HP Smart Array P230i .It +HP Smart Array P240nr +.It +HP Smart Array P244br +.It +HP Smart Array P246br +.It HP Smart Array P400 .It HP Smart Array P400i @@ -145,28 +163,56 @@ HP Smart Array P430i .It HP Smart Array P431 .It +HP Smart Array P440 +.It +HP Smart Array P440ar +.It +HP Smart Array P441 +.It HP Smart Array P530 .It HP Smart Array P531 .It +HP Smart Array P542d +.It HP Smart Array P600 .It +HP Smart Array P700m +.It +HP Smart Array P712m +.It HP Smart Array P721m .It HP Smart Array P731m .It +HP Smart Array P741m +.It HP Smart Array P800 .It HP Smart Array P812 .It +HP Smart Array P822 +.It HP Smart Array P830 .It HP Smart Array P830i .It +HP Smart Array P840 +.It +HP Smart Array P840ar +.It +HP Smart Array P841 +.It HP Modular Smart Array 20 (MSA20) .It HP Modular Smart Array 500 (MSA500) .El +.Pp +Additionally, several HP Smart Array controllers are supported by PCI +subdevice ID only, as no model name is available for them: +0x3220, 0x3222, 0x3230, 0x3231, 0x3232, 0x3233, 0x3236, 0x3238, +0x3239, 0x323A, 0x323B, 0x323C, and 0x324B +(all with PCI subvendor 0x103C). .Sh SEE ALSO .Xr cam 4 , .Xr pass 4 , From nobody Sat Apr 18 01:01:24 2026 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 4fyD390GFGz6ZS84 for ; Sat, 18 Apr 2026 01:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fyD383yprz3kgm for ; Sat, 18 Apr 2026 01:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776474084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TNJFZkAvuZGKEqaDztFHC1RGPz3BMIBTMCKy/qEN6kU=; b=JPsH6rLFYXKqZZsGQkBh5Da0S5L1WTL1W7qp7H1obPMgFoFfI84znEs43Vi7b2Utdsd+FU J4Ww3gCxwMga26+I/P0fCOttItbPQ4CCGrEvruVnK7dUf5R/EhxPiGPj1GQcAc8QD+JQHu yyGvfztzeYfst1HBewQgheVGbVqCtpwo2Natu51UtQVtNF142L+OJzcxukZgzhBxleaiYv cvFfVhj5+b+tHgl4OBT8db2a+UInNK6juQvxa80E3PAy3wUSq0XCYVUphVjX+5uoZlAh/n SYOw7EHW+79nSvpP7zpp9IFDeewq6kj3CCIRxvykfqNPCK9DrT+57nHtCKZMKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776474084; a=rsa-sha256; cv=none; b=R/LuDMliIjWvv7u6eny4yb05pcNj94Ew5shQdiYK6njGCKxYiXv0vPNgnxEq8TO/I/fEV8 FMaWwynm3LHvDwDloxu1hldnFKcwIU2aZYs3EEClZLZyatWpDSd+/SJTiDoQ+F3qzJLycg aen7v4n3/A4RnPLfpMMu9tp0RKtwf5tvqZ7KOmOS+Nb1qOHkc+P7xcClFZVf7fXwQCd4xv nwe6wyRbdWi6+MppkrPZIdYVosPHtozMibEs8kMeXKtpuaCSoDe0EJWvLrwSReNg81Nd8z XGbOzT2KGNr06F7LzcJ/1nKokLe5Jas1J72EyQnwQRmbc2UpenlfxUSnf1C25Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776474084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TNJFZkAvuZGKEqaDztFHC1RGPz3BMIBTMCKy/qEN6kU=; b=Y59f5gmEo1aDeyFMGmxct70UWEHyvpsE085ERprtwCL5nAnmLVsJEobuYCBuQlPXu0vGQC HH+EqhJXpny3LdFrR0t6V10a1ItgmOfnxe3bZpuX4+MyrpGPxIigl99W3gDWM8g/DMOpSl +Dpmh8Qg1w1aMMTRXtGmVefSdwIQt7p6cExLgHWGUarHTYgVYMhfNgZKdse1ARTg9yqBsy WtBlMgEl21FgEH+TgiSSyOprW5thzZzoQ8YyurlPMO0LRsUVqMoy6j+nJ3eo5Ntv0yrmBK 1CdZSsexB3jF7Wn49cW2FcjwNHdSzCgXuJuPGBygB/FRyd9ObwoAhyZGpLfk2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyD383Vn4z2Yp for ; Sat, 18 Apr 2026 01:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 455bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 18 Apr 2026 01:01:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 6ef2df5e8e7a - stable/15 - nfsv4.4: Document setup of a NFSv4 root fs 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6ef2df5e8e7a753a8d88438c59df5005aea6b6b4 Auto-Submitted: auto-generated Date: Sat, 18 Apr 2026 01:01:24 +0000 Message-Id: <69e2d7e4.455bf.4dd8834f@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=6ef2df5e8e7a753a8d88438c59df5005aea6b6b4 commit 6ef2df5e8e7a753a8d88438c59df5005aea6b6b4 Author: Rick Macklem AuthorDate: 2026-04-11 19:36:56 +0000 Commit: Rick Macklem CommitDate: 2026-04-18 00:59:41 +0000 nfsv4.4: Document setup of a NFSv4 root fs Commit 8b9775912cbc added support for an NFSv4 mounted root file system. This patch documents how to set this up. It also includes some minor updates and fixes some formatting. This is a content change. (cherry picked from commit 6698596cd2abd9eae3ac02efe1c257766da5d24a) --- usr.sbin/nfsd/nfsv4.4 | 178 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 154 insertions(+), 24 deletions(-) diff --git a/usr.sbin/nfsd/nfsv4.4 b/usr.sbin/nfsd/nfsv4.4 index e96e507e23ad..9ec775613b47 100644 --- a/usr.sbin/nfsd/nfsv4.4 +++ b/usr.sbin/nfsd/nfsv4.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 8, 2024 +.Dd April, 8, 2026 .Dt NFSV4 4 .Os .Sh NAME @@ -106,16 +106,23 @@ The allows a limited subset of operations to be performed on non-exported subtrees of the local file system, so that traversal of the tree to the exported subtrees is possible. -As such, the ``'' can be in a non-exported file system. +As such, the +.Ql +can be in a non-exported file system. The exception is ZFS, which checks exports and, as such, all ZFS file systems -below the ``'' must be exported. +below the +.Ql +must be exported. However, the entire tree that is rooted at that point must be in local file systems that are of types that can be NFS exported. Since the .Nm -file system is rooted at ``'', setting this to anything other -than ``/'' will result in clients being required to use different mount +file system is rooted at +.Ql , +setting this to anything other than +.Ql / +will result in clients being required to use different mount paths for .Nm than for NFS Version 2 or 3. @@ -132,9 +139,12 @@ take the form: @ .Ed .sp -where ``'' is not the same as the DNS domain used +where +.Ql +is not the same as the DNS domain used for host name lookups, but is usually set to the same string. -Most systems set this ``'' +Most systems set this +.Ql to the domain name part of the machine's .Xr hostname 1 by default. @@ -154,26 +164,32 @@ either client or server, this daemon must be running. The form where the numbers are in the strings can only be used for AUTH_SYS. To configure your systems this way, the .Xr nfsuserd 8 -daemon does not need to be running on the server, but the following sysctls -need to be set to 1 on the server. +daemon should not be running on the NFS systems, +but the following sysctls +need to be set to 1 on the NFS server. .sp .Bd -literal -offset indent -compact vfs.nfs.enable_uidtostring vfs.nfsd.enable_stringtouid .Ed .sp -On the client, the sysctl +However, on the NFS client +only the sysctl .sp .Bd -literal -offset indent -compact vfs.nfs.enable_uidtostring .Ed .sp -must be set to 1 and the -.Xr nfsuserd 8 -daemon does not need to be running. +needs to be set to 1. .Pp -If these strings are not configured correctly, ``ls -l'' will typically -report a lot of ``nobody'' and ``nogroup'' ownerships. +If these strings are not configured correctly, +.Ql ls -l +will typically +report a lot of +.Ql nobody +and +.Ql nogroup +ownerships. .Pp Although uid/gid numbers are no longer used in the .Nm @@ -204,8 +220,12 @@ plus nfsuserd_enable="YES" .Ed .sp -if the server is using the ``@'' form of user/group strings or -is using the ``-manage-gids'' option for +if the server is using the +.Ql @ +form of user/group strings or +is using the +.Ql -manage-gids +option for .Xr nfsuserd 8 . .Pp In addition, you can set: @@ -216,7 +236,9 @@ nfsv4_server_only="YES" .sp to disable support for NFSv2 and NFSv3. .Pp -You will also need to add at least one ``V4:'' line to the +You will also need to add at least one +.Ql V4: +line to the .Xr exports 5 file for .Nm @@ -246,7 +268,9 @@ Disabling local locking can only be done if neither local accesses to the exported file systems nor the NLM is operating on them. .El .sp -Note that Samba server access would be considered ``local access'' for the above +Note that Samba server access would be considered +.Ql local access +for the above discussion. .Pp To build a kernel with the NFS server that supports @@ -263,12 +287,16 @@ file. .Sh CLIENT MOUNTS To do an .Nm -mount, specify the ``nfsv4'' option on the +mount, specify the +.Ql nfsv4 +option on the .Xr mount_nfs 8 command line. This will force use of the client that supports .Nm -plus set ``tcp'' and +plus set +.Ql tcp +and .Nm . .Pp The @@ -326,8 +354,8 @@ where the first 4 Ns are the host IP address and the last two are the port# in network byte order (all decimal #s in the range 0-255). .Pp For NFSv4.1 and NFSv4.2, the callback path (called a backchannel) uses the -same TCP connection as the mount, so none of the above applies and should -work through gateways without any issues. +same TCP connection as the mount and, as such, no additional +configuration is needed for the callback path. .Pp To build a kernel with the client that supports .Nm @@ -345,7 +373,10 @@ Options can be specified for the .Xr nfsuserd 8 and .Xr nfscbd 8 -daemons at boot time via the ``nfsuserd_flags'' and ``nfscbd_flags'' +daemons at boot time via the +.Ql nfsuserd_flags +and +.Ql nfscbd_flags .Xr rc.conf 5 variables. .Pp @@ -356,6 +387,105 @@ It occurs when an nfsd thread tries to do an NFSv4 / Close RPC as part of acquiring a new vnode. If all other nfsd threads are blocked waiting for lock(s) held by this nfsd thread, then there is no nfsd thread to service the Close RPC. +.Sh NFSv4 ROOT FILE SYSTEM +.Pp +For an +.Nm +root file system, there are a few things that need +to be done beyond what is needed for an NFSv3 root file system. +The NFS server must be configured with the +.Ql +as +.Pa / +so that +the mount path is the same for +.Nm +as NFSv3. +This is required because the bootstrap code still uses NFSv3. +.Pp +The following additional changes are required in the exported +root file system. +.sp +In +.Xr fstab 5 , +the +.Ql nfsv4 +mount option must be specified in +the line for the root mount. +.sp +In +.Pa /boot/loader.conf +the line +.sp +.Bd -literal -offset indent -compact +boot.nfsroot.options="nfsv4" +.Ed +.sp +is needed to tell the kernel to use +.Nm +for the root mount. +Additional mount options may be specified. +.sp +If your +.Nm +setup is using the form where the uid/gid numbers are in strings, +the sysctl +.Ql vfs.nfs.enable_uidtostring +must be set to one before any NFSv4 read/write mounts are done. +The recommended way to do this is to put +.sp +.Bd -literal -offset indent -compact +vfs.nfs.enable_uidtostring=1 +.Ed +.sp +in +.Pa /etc/sysctl.conf +in the FS exported root file system. +Alternately, if your +.Nm +setup is using +.Ql @ +via +.Xr nfsuserd 8 +for uids/gids, then you need the following additional line in +.Pa /boot/loader.conf +.sp +.Bd -literal -offset indent -compact +boot.nfsroot.user_domain="" +.Ed +.sp +which tells the booting kernel that you are going to be +doing mapping via +.Xr nfsuserd 8 +and what your +.Ql +is. +The booting kernel will set a few critical mappings to allow +the boot to proceed until the +.Xr nfsuserd 8 +daemon is started. +Then in +.Pa /etc/rc.conf +you need the lines +.sp +.Bd -literal -offset indent -compact +nfsuserd_enable="YES" +nfsuserd_flags="-domain " +.Ed +.sp +to start the daemon. +.Pp +Beyond this, the setup should be the same as would be used +for an NFSv3 root file system. +See section +.Ql Diskless Operation with PXE +in the +.Ql Advanced Networking +chapter of the +.Ql FreeBSD Handbook , +although configuring hosts as fixed addresses in your +.Ql dhcpd.conf +might be preferable. .Sh FILES .Bl -tag -width /var/db/nfs-stablerestart.bak -compact .It Pa /var/db/nfs-stablerestart From nobody Sat Apr 18 02:24:17 2026 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 4fyFtn3xbXz6ZbwX for ; Sat, 18 Apr 2026 02:24: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fyFtn3Rbqz468R for ; Sat, 18 Apr 2026 02:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776479057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S1oTxOTqORCNTeIA8MNc1rEsbdZ0Gu6Pi2iq8svCGc0=; b=QHseK5I5IR7pom3D0qasLfDCiqZ3on62oR/2B4j+A0LNVWgPbxfVL/5ZKCprvIA8bhXF6O fQ7IPkFGt3ikPIERw4y3+T6GW9FLmJsPaW90RSPYnll0pACfMWbFs8ETl7BIQUC6+N8Ta4 q3mpQMwfx7As2w6e+zyFibSXW2YVYMdoGmdDgGCw4XtuFBJTTZpCxbvtQGsYWJtjBu3H7G GWiChtLJfKMZ4h2RWABSLwJNLlHa5SjELZ1FgfVmI84J5Vbke8qlFksKEm/VK8RDFHm3wj 6f+A8dKKqAxhbTsYYfjW899SXPE3HATQ7WvKJGe2RVrX/U4WBU8kwby1UchW6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776479057; a=rsa-sha256; cv=none; b=C5sxvMSqIVbTA8R6Mo+m2aYseHf+Gr3L+r35RtFclHozCNsdoJlLJlVY2H8gkaWMv83zCp H+ZY1TGO4rVYX0BF22JAmqwI0MI/st0/dOireDcYZPiROklC4CFbjdjGbwpZMQI/B2OUdy naw2nW71Q9cRWBi+PgyPUiQ8PjQvklTUb4GBNSk38YeESivwOBFFJEXHaIPSJekNinRWxG 8CW/LkXDL+AXFYNOcMo/E04O0vEv3nP+dDUPLqF9KLQ5ZTFIFxlSin7NqgYblWC+UYAUbx 2+2cNRttd/RTpkKfKb67En8kgK85PGzj1/bmwI97LUfBEe+lw5+C+0G7EU6zPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776479057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S1oTxOTqORCNTeIA8MNc1rEsbdZ0Gu6Pi2iq8svCGc0=; b=IxrykGxhiQEtBLJLkMzu2ZKoje4jcJAYPqpKkajbFudvsqew+H9UfeSomYUS4alf1XUXjU nTUQEeIHaR6wCay3tT46hSU2QmOPNFYwuanF8kBYCnPwEQnAIyc31BwJwtQBUdOrZjZfoY F64417HyjIdn2NhqLqe2XuSw6iFKy1jGeP+2oGPT7H/G/aFZL4syvxqAtTVbjwSnPzUFvC kkxM3YNCurcJlCfW96l07d1KpZaf4ypxC2hVrI1DWjcaxmmOKVuSn0WeuMM0mjtBwUpgRQ XJRXqNfbn6pR/w5D4nj1RmY2bfOMOljqIqHF/FzHeuQKmcGsNjemjYudYmmB4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyFtn3331z4f7 for ; Sat, 18 Apr 2026 02:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f254 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 18 Apr 2026 02:24:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alfredo Dal'Ava Junior Subject: git: 23eaa98d6dc1 - stable/15 - br.lenovo.kdb: add it to Makefile 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alfredo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 23eaa98d6dc197321791fca49f5e31621ac41994 Auto-Submitted: auto-generated Date: Sat, 18 Apr 2026 02:24:17 +0000 Message-Id: <69e2eb51.1f254.12b2226e@gitrepo.freebsd.org> The branch stable/15 has been updated by alfredo: URL: https://cgit.FreeBSD.org/src/commit/?id=23eaa98d6dc197321791fca49f5e31621ac41994 commit 23eaa98d6dc197321791fca49f5e31621ac41994 Author: Alfredo Dal'Ava Junior AuthorDate: 2026-04-17 03:44:46 +0000 Commit: Alfredo Dal'Ava Junior CommitDate: 2026-04-18 02:23:04 +0000 br.lenovo.kdb: add it to Makefile This keyboard was implemented but wasn't actually installed to the system. Fixes: 9357c694e8dca627c25b15529e8435b2ab3dd48b MFC after: 1 day Relnotes: yes (cherry picked from commit 6fb5df548e4a581f958f60544b7fa8ba1716c4c6) --- share/vt/keymaps/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/vt/keymaps/Makefile b/share/vt/keymaps/Makefile index 117eadde9fac..e3f63bd37d5f 100644 --- a/share/vt/keymaps/Makefile +++ b/share/vt/keymaps/Makefile @@ -8,6 +8,7 @@ FILES= INDEX.keymaps \ bg.phonetic.kbd \ br.kbd \ br.noacc.kbd \ + br.lenovo.kbd \ by.kbd \ ca.kbd \ ca-fr.kbd \ From nobody Sat Apr 18 02:24:18 2026 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 4fyFtp5DPFz6ZbQW for ; Sat, 18 Apr 2026 02:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fyFtp4NJyz46FM for ; Sat, 18 Apr 2026 02:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776479058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fHMh93yg+z4hJ5nbGYAZtVagBct6BUJ1y1pUrJyTp54=; b=UF92uESpl4KOGyFefqaKf0rSCpXgJDGrT7lvNPtQ5S2+pwmqMu9aWvJtGbAuTE0oEpi6MD Zwycm/JZUMUE1QC8k5sCD2dgL7NueKQXNYCF3N+AaIU4GeNYhBaONkLoH8L0apDi8PuzhR QBtVNUCBCN3Og3Q9C5/KiJr1fn6XdNcUwZM6cpANQ2nPMyJWMAFnl/tw6mswffwDF3IFrR fxF+7IDnmIEfhjwqSPFKWoFHvOkeD9D5CEMovC6tUdNnm3vs3FbN9jSAVWQNtAU8oDxVSk LY8SE9QkN4W1ZOOR3Kqzex447lXPkjVEDmqjtFArv3Viumuqaj0YjbPZ6POjrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776479058; a=rsa-sha256; cv=none; b=KRd1x9x/0y5i29z+rHgXFoLTU181nReM3mOLKadxRkO6YR+4trJy8fNApmnlGnHM2JtgeV sP1msankKUgyKxn3Wz6JsGvXCMuRYIvd01/NnSH45iHkDzuJcUt3g4DNyu//vC4k3Z/Q3g Ce8I2N6R7NG9Uf4uDuZIE2/svx+wiV06edYSI0q87cuWhuyft1mPquB1iAzJKk4r0io2Kx 9Y0Ht6cE5NunSq4mjtBaCs8CRB9zIGC5fnRaQyULS+78Zeo/EPXIKR7Wrr09Fyh+G9nBC9 8b13hBA7JkyD6oT/ITRPKiiRNPsPOssBBvHPSoTAGahd5Ykzz5nHbb5Q+567DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776479058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fHMh93yg+z4hJ5nbGYAZtVagBct6BUJ1y1pUrJyTp54=; b=oe1oI0YfLSIbwQs071cbIgR9018S3a7Q1vysPJDcGzXFxo7MV1i9vuyC95CZ4ZpBir55NO XQSCblaogHcQCvmDBllLL8LukQ/PBnJZC7ZpJiCQO1d5qDuubzlDQZdvyENmSl6m4LyXjT y1Kx2+uSvLJCYv+VSRJz2qLPvCd2OJbg+6lKBIFON4q2CfqrwTfpsWAtGAhhaBY1SgsY5P kIqc+XwrIHyvVjO925V0ANQ0qBsKi0UPjioVWrXyQXTKXb+UgTPMdM7tSkKaZKls4M/qrl W8ze+fa9gPSW8IRHDXTBqPzi1/lpb2ypLc4MP4Sal9+rPd/AHGw1X8N6AnSYpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyFtp3qLMz4Wy for ; Sat, 18 Apr 2026 02:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ec09 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 18 Apr 2026 02:24:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alfredo Dal'Ava Junior Subject: git: 34196ce83f9c - stable/15 - us.intl.acc.kbd: add it to Makefile 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alfredo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 34196ce83f9c9cf0138ac792b522c22afc4384c6 Auto-Submitted: auto-generated Date: Sat, 18 Apr 2026 02:24:18 +0000 Message-Id: <69e2eb52.1ec09.7e73cb05@gitrepo.freebsd.org> The branch stable/15 has been updated by alfredo: URL: https://cgit.FreeBSD.org/src/commit/?id=34196ce83f9c9cf0138ac792b522c22afc4384c6 commit 34196ce83f9c9cf0138ac792b522c22afc4384c6 Author: Alfredo Dal'Ava Junior AuthorDate: 2026-04-17 05:01:54 +0000 Commit: Alfredo Dal'Ava Junior CommitDate: 2026-04-18 02:23:29 +0000 us.intl.acc.kbd: add it to Makefile This keyboard was implemented but wasn't actually installed to the system. Fixes: a049678039e40bdf523230852f78887a12435def Discussed with: imp MFC after: 1 day Relnotes: yes (cherry picked from commit 3b373d484046a94d050a7901feadc001f35fa97f) --- share/vt/keymaps/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/vt/keymaps/Makefile b/share/vt/keymaps/Makefile index e3f63bd37d5f..27291f7709fd 100644 --- a/share/vt/keymaps/Makefile +++ b/share/vt/keymaps/Makefile @@ -80,6 +80,7 @@ FILES= INDEX.keymaps \ uk.kbd \ uk.macbook.kbd \ us.acc.kbd \ + us.intl.acc.kbd \ us.ctrl.kbd \ us.dvorak.kbd \ us.dvorakl.kbd \ From nobody Sat Apr 18 02:25:47 2026 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 4fyFwW29NQz6Zc0D for ; Sat, 18 Apr 2026 02:25: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fyFwW1GdVz471q for ; Sat, 18 Apr 2026 02:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776479147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ipdIpQh/+k9wGFFDsjEnCE48VA4BiEheyDUw1kTwu1Q=; b=PGgDOR39YRwTwZ0nybaiRAo1dTsnCTl2zGagagIZupZ8w5bgzi2otv7YHne6SFLA+T9kSk QQ48lU3FqLeQESyeUKGP5FoNXWLZKp9cVLP1vMBecIRR08w2ro6nLWbFI7nANFHaOBRCk8 C4cuOFiIF2TEJJyo/5sLS9dIdGk/rvf9cwGITtLlkg37tW8teMlzYNT5cRXO7X5RkpOICA fL3jMtw5uA+4sZPhWUDScPcPqD+BsWv0z2h1ythIAv220nWKmUsaqLgehDw7/PGjV1uu4F L6j747pDFUQklxbZ71n6VGFbq2oFXNoXNq7+0En43ITTQWlmnvNZdvC8SQh91g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776479147; a=rsa-sha256; cv=none; b=jeaklvsAMALgp23COUCFor3B0fzPFVa3DgRekTVOX+nc7YbzHTst7+n6N1EoJddNW4b8ab MKh+up4eQbXtoAUxnWj9m3+3TiQdMlXsurVFlwqCkJxYmrRdNSvqdlLfmysUzsxCE8hvY4 OOBl0uzxTID7c5lKS7mhwdAQnphBMKDZZFvIN+zFZGKKxBdd8WGCu+Dfm3NPWygLCKSUAc r4IaA3bVJcRL/KpTGhrMOT8JkvjRK2tR0a9x9KU4WbmeSV1qveP38RvFdhGRtWGNShyHcc wittBZW3o6fdrdo/dSDeXmVMNWfubiRQJc2aJLvzn1nN/YGT50Z4drj+Jc9GXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776479147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ipdIpQh/+k9wGFFDsjEnCE48VA4BiEheyDUw1kTwu1Q=; b=kd3YpuQDD1SUq1hXow85W3boc1JCfCm4AMVestvH8Q5+qqK+Xdf9Br4UvLYmcdol0QligJ xKo0FHqZXhn98rsmC5z14XLwvEMx70buM4yu4VIaYgm7Z0K2INVmaR6k2REaQYamd4ygvc TEuQj6BMJCOFAjwRzX8YzooMmmE6jRW0p+Qg1MVXUqthbQitWSPy8Wc5YEpnsDdMLQsZeE 6oaNU2ToEWkLx7eDgjBYvjIHSomfyjK0T4XFAbD9IgDM31RhZ/GE0uaBvho1ldrY/BLFpF X49f/0VkBGJrcOifbof9ZBP8c5/8o3t8fkT+OrmnyN9uZ6WtN40pkxmbY3vIvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyFwW0b3Nz4f9 for ; Sat, 18 Apr 2026 02:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e90f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 18 Apr 2026 02:25:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alfredo Dal'Ava Junior Subject: git: ca42bd490891 - stable/14 - br.lenovo.kdb: add it to Makefile 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alfredo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ca42bd490891011556a9507b10ad205f6e7e5f30 Auto-Submitted: auto-generated Date: Sat, 18 Apr 2026 02:25:47 +0000 Message-Id: <69e2ebab.1e90f.151a141e@gitrepo.freebsd.org> The branch stable/14 has been updated by alfredo: URL: https://cgit.FreeBSD.org/src/commit/?id=ca42bd490891011556a9507b10ad205f6e7e5f30 commit ca42bd490891011556a9507b10ad205f6e7e5f30 Author: Alfredo Dal'Ava Junior AuthorDate: 2026-04-17 03:44:46 +0000 Commit: Alfredo Dal'Ava Junior CommitDate: 2026-04-18 02:25:14 +0000 br.lenovo.kdb: add it to Makefile This keyboard was implemented but wasn't actually installed to the system. Fixes: 9357c694e8dca627c25b15529e8435b2ab3dd48b MFC after: 1 day Relnotes: yes (cherry picked from commit 6fb5df548e4a581f958f60544b7fa8ba1716c4c6) --- share/vt/keymaps/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/vt/keymaps/Makefile b/share/vt/keymaps/Makefile index 8cedb1822efb..0dc03ca65a77 100644 --- a/share/vt/keymaps/Makefile +++ b/share/vt/keymaps/Makefile @@ -9,6 +9,7 @@ FILES= INDEX.keymaps \ bg.phonetic.kbd \ br.kbd \ br.noacc.kbd \ + br.lenovo.kbd \ by.kbd \ ca.kbd \ ca-fr.kbd \ From nobody Sat Apr 18 02:25:48 2026 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 4fyFwX4tKTz6ZbWr for ; Sat, 18 Apr 2026 02:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fyFwX22bfz478k for ; Sat, 18 Apr 2026 02:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776479148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R3101LZ9KqWOqegl2+BdslH/WWQyzYTRcwQ6uzLmNdY=; b=DCI4Xw3RohUrRxL+uDW2TBIiJ73ZxqiDu9BIPlnwEGFFwjkjzvE31t6yAfyMZ13WZTxr2x mJ5yspggTDBP4zzJBdqg/W2/JU4mRXPjT2w6IplpRuDAQE6N/oJSswpDd5d8TRH1lIka3v G/WnUy8vuJ0GvQz9s3+97FNhRmk7YMBeQis1xlpmeW8AdjveAfQtrkOesc0bfQEJO/WPos GNP1eIY3PrYq3071T9nJc74pf0v2X6fpSSKAsWXJ6xp+Cxr+6aBeiRjqihqbXB3BwcbGs1 eTSNrpewSHELtcdp1PAwv08Q3j2V2tEP3C6u2EXVBP9wd4GybxG0W7j/y2pnlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776479148; a=rsa-sha256; cv=none; b=am5BwAUqOR+asG/6HWDimZcxxItNuaWLn/7sCHrRKhhsQTwJAq+e1N/k3x8By+ZHUQ94qv FGX/yYgiWddBMj48MZ8dsR1H9i5xqMB1pXyeANqZFRo+OvevQ+8vFi16XjvBwvkxRIaf6G Emf+XuYx+oSzFeE/klzBpaAiVcuYWgrR08ZDuUvjjcp46M5cb9KVf8bKjrW+2tmcy3J7Z8 uumCP68c8K1q/UJK/gNwhKdTIxaDzE1ouW1mPiwTi1BfLas4RyoyhduJ9zHezqrHHDr2VR VbmKHKfiSSI5hKPK9WaIFf+0Fjp9stwWSUu9DNqEwsvDae3UrvD/kUs+7b/rDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776479148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R3101LZ9KqWOqegl2+BdslH/WWQyzYTRcwQ6uzLmNdY=; b=FLRvLq4d8BtKvbaR+vzaptzHrph5h5IbxWOH9U7lxqnLDaCfHqi9yyhnvozOwV8WfQfene 5Z9239dZBldHLKQV+lVVo57nscpQkMP1zSx+otQ7mSNCD1ElxWko2rVILDR1ZZzTbI6KFo IFvZ4SA6wuGt5o0lO19fLstI0W7T9WonkT1GeKNe8+wt36vM7Fw+f2u6ZfOAhR0d1Ibmpl 0qW9u2QLQHQ65rxYxl7d9SzlwEsBHIhbJ8yQ23vzyPKwVet7uLRnD0Fh8Nvw0w96Yxqscm OeXEELYraGDj/g//vJgZRjnArptRCPw759ApbtT3hbMLx9/Vx28RH+FgFqNKBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyFwX1PCGz4Vj for ; Sat, 18 Apr 2026 02:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eb92 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 18 Apr 2026 02:25:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alfredo Dal'Ava Junior Subject: git: 823889aaafa3 - stable/14 - us.intl.acc.kbd: add it to Makefile 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alfredo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 823889aaafa37ba63a6fb2c53b0dafe1373e221b Auto-Submitted: auto-generated Date: Sat, 18 Apr 2026 02:25:48 +0000 Message-Id: <69e2ebac.1eb92.1ef77621@gitrepo.freebsd.org> The branch stable/14 has been updated by alfredo: URL: https://cgit.FreeBSD.org/src/commit/?id=823889aaafa37ba63a6fb2c53b0dafe1373e221b commit 823889aaafa37ba63a6fb2c53b0dafe1373e221b Author: Alfredo Dal'Ava Junior AuthorDate: 2026-04-17 05:01:54 +0000 Commit: Alfredo Dal'Ava Junior CommitDate: 2026-04-18 02:25:29 +0000 us.intl.acc.kbd: add it to Makefile This keyboard was implemented but wasn't actually installed to the system. Fixes: a049678039e40bdf523230852f78887a12435def Discussed with: imp MFC after: 1 day Relnotes: yes (cherry picked from commit 3b373d484046a94d050a7901feadc001f35fa97f) --- share/vt/keymaps/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/vt/keymaps/Makefile b/share/vt/keymaps/Makefile index 0dc03ca65a77..60c9c9e62fd5 100644 --- a/share/vt/keymaps/Makefile +++ b/share/vt/keymaps/Makefile @@ -81,6 +81,7 @@ FILES= INDEX.keymaps \ uk.kbd \ uk.macbook.kbd \ us.acc.kbd \ + us.intl.acc.kbd \ us.ctrl.kbd \ us.dvorak.kbd \ us.dvorakl.kbd \ From nobody Sat Apr 18 11:01:18 2026 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 4fyTML6Xhwz6ZVjt for ; Sat, 18 Apr 2026 11:01: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fyTML5Njmz47wv for ; Sat, 18 Apr 2026 11:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776510078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VRYyPLV136jWk4036Kot8ElLuvAH45NnzoCFZm6QRZc=; b=LgQBAsp9DLhX9DRP+uwgExodFxIPVbrKAzE1jowDOyBe6iy9JQXpbMQneRpL8aAIoJupFn u0ynfnYGxrekmPUP2/PI6RCgy/pOtaXpXFuiTkZMMex3plZJau6ANH9rLu307aX8Gaqxxe Q0loY8UwQX3Mke0DFCpgusNe7DQ1EWlLGycV0YvBjy0rAwXg0km5SefwGkemcYNjGTtl+K mQEFVuJiZYPpPPHWESr1IUF+u3qAYsy88CyEORZgkLj1Pe3iyXkp1ezuGhVFUjjAoynZrB 0OhYU7bZPQezEraeVH7njLA9WnY+mTIxdEcDZV4RaFcJ6kjCcO1zAs0uLf94Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776510078; a=rsa-sha256; cv=none; b=qzznz9ekW2oFIL3j9sSg9ZL7cJgm0pVGCPcvS7mRv6VC37nW11JY3D1h+Axfo/2XQPT2H0 N0EuUXXYPCf+PFMFXgZZ1nApjCOTi+a2X/73SRMFzBNYEVNbXnXMcyvV8qM7aBSxrNCyTP MgEYT8B8Bame1u+tpAtmGjEDxxhNoSG0b+kbB29LYMvWbos1Oa+9yMBSrJ8HWWuXOQI3rj 72JRcZ+HHklwjIpukTex0D+TynkaK+ySK+yK+bYLheusyNw90iNcCu0EOGKcmlKv7zVKbC 7Y9KKkNnHBSMz6E4AWpLWO/S7VVyTr3Aw7WPUym16WTdu8xcgGA2xdOhruSquQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776510078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VRYyPLV136jWk4036Kot8ElLuvAH45NnzoCFZm6QRZc=; b=eCaGZ0bTUdHBsjw7xHr2b5krwYJx+8GA67ODfcBvajeVRH+TUWDPu3ufrW/pK+MhhphnJ3 lVTl9D4RJ5J1zrJO7jJP39um03/nyHocTq2atfmXmaqHsEN2s75vEDNiBNZR2eN59kra5e lE45DDObdC7WDU7hXAVwF0BzjqLi34+0sCOM2b6p6fKsR4Tog39ic+7obSKdnAw65HfyXa 4oefImc8Pkfp/EuCVp3oNZy8B+2vKDJ0Ezrkko29ErXx+bI5ds8IEVTbaaSkBJhDwdFovE heATF87bnTC1zHuKUnivX+g7Xil/z+BlR55K7Ol7SqLZuGVI5vbxOpj0+7S1vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyTML4z29zdH7 for ; Sat, 18 Apr 2026 11:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 346dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 18 Apr 2026 11:01:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 5f848eb6fd44 - stable/15 - LinuxKPI wlan drivers: update makefiles to not use WITH_ 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5f848eb6fd447dc7426c0cb30017925ab2eadb64 Auto-Submitted: auto-generated Date: Sat, 18 Apr 2026 11:01:18 +0000 Message-Id: <69e3647e.346dc.877951c@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5f848eb6fd447dc7426c0cb30017925ab2eadb64 commit 5f848eb6fd447dc7426c0cb30017925ab2eadb64 Author: Bjoern A. Zeeb AuthorDate: 2026-03-19 23:02:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-18 02:33:08 +0000 LinuxKPI wlan drivers: update makefiles to not use WITH_ Up to now the LinuxKPI wlan drivers were using local variables starting with a WITH_ prefix in their Makefiles. That is likely to collide with other mechanisms like WITH_ and WITHOUT_ from src.conf. Adjust the local variables to use a driver name prefix for now to control what is built and what is not. These variables are mainly for the time of development so we can turn off/on a feature or bus attachment while working on it. Otherwise they are there for documentation purposes. The only reason one would change them locally would be if someone was to build a very custom image and not want certain bits (e.g., USB support) being compiled into the modules. While here, try to harmonize some parts of the Makefiles. Suggested by: imp Discussed with: imp Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55977 (cherry picked from commit e8166d7f378bb449315aff535909c153f3e71daf) --- sys/modules/ath10k/Makefile | 38 ++++++++-------- sys/modules/ath11k/Makefile | 12 ++++- sys/modules/ath12k/Makefile | 8 +++- sys/modules/athk_common/Makefile | 13 +++--- sys/modules/brcm80211/brcmfmac/Makefile | 80 ++++++++++++++++++--------------- sys/modules/brcm80211/brcmutil/Makefile | 16 +++---- sys/modules/iwlwifi/Makefile | 18 ++++---- sys/modules/mt76/Makefile | 6 +++ sys/modules/mt76/Makefile.inc | 44 ++++++++++-------- sys/modules/mt76/core/Makefile | 34 +++++++------- sys/modules/mt76/mt7615/Makefile | 23 ++++++---- sys/modules/mt76/mt7915/Makefile | 35 +++++++++------ sys/modules/mt76/mt7921/Makefile | 36 ++++++++------- sys/modules/mt76/mt7925/Makefile | 24 +++++----- sys/modules/mt76/mt7996/Makefile | 31 ++++++++----- sys/modules/rtw88/Makefile | 58 ++++++++++++------------ sys/modules/rtw89/Makefile | 57 +++++++++++------------ 17 files changed, 300 insertions(+), 233 deletions(-) diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile index 16f481116357..2ffa8532ff47 100644 --- a/sys/modules/ath10k/Makefile +++ b/sys/modules/ath10k/Makefile @@ -3,11 +3,11 @@ DEVATH10KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath10k .PATH: ${DEVATH10KDIR} # Bus attachments. -WITH_PCI= 1 -WITH_USB= 0 # Never finished upstream, not working. +ATH10K_PCI= 1 +ATH10K_USB= 0 # Currently not working again, upstream kaputt. -WITH_CONFIG_FWLOG= 1 -WITH_LEDS= 0 +ATH10K_CONFIG_FWLOG= 1 +ATH10K_LEDS= 0 KMOD= if_ath10k @@ -17,31 +17,32 @@ SRCS+= txrx.c wmi.c wmi-tlv.c SRCS+= p2p.c swap.c # PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. -.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} +.if defined(ATH10K_PCI) && ${ATH10K_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= pci.c .endif # USB parts; USB can be loaded and is unconditional on any kernel config. -.if defined(WITH_USB) && ${WITH_USB} > 0 +.if defined(ATH10K_USB) && ${ATH10K_USB} > 0 SRCS+= usb.c .endif -# Other -SRCS+= ${LINUXKPI_GENSRCS} -SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h - -.if defined(WITH_CONFIG_FWLOG) && ${WITH_CONFIG_FWLOG} > 0 +.if defined(ATH10K_CONFIG_FWLOG) && ${ATH10K_CONFIG_FWLOG} > 0 SRCS+= fwlog.c -CFLAGS+= -DCONFIG_FWLOG=${WITH_CONFIG_FWLOG} +CFLAGS+= -DCONFIG_FWLOG .endif -.if defined(WITH_LEDS) && ${WITH_LEDS} > 0 +.if defined(ATH10K_LEDS) && ${ATH10K_LEDS} > 0 CFLAGS+= -DCONFIG_ATH10K_LEDS SRCS+= leds.c .endif -CFLAGS+= -DKBUILD_MODNAME='"ath10k"' -CFLAGS+= -DLINUXKPI_VERSION=61900 +# Always on for now. +CFLAGS+= -DCONFIG_ATH10K_DEBUG +CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI + +# Other +SRCS+= ${LINUXKPI_GENSRCS} +SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h CFLAGS+= -I${DEVATH10KDIR} CFLAGS+= -I${DEVATH10KDIR}/.. @@ -49,9 +50,7 @@ CFLAGS+= ${LINUXKPI_INCLUDES} # Helpful after fresh imports. #CFLAGS+= -ferror-limit=0 -CFLAGS+= -DCONFIG_ATH10K_DEBUG -CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI - +# TODO: further options and SRCS files. #CFLAGS+= -DCONFIG_ATH10K_AHB #CFLAGS+= -DCONFIG_ATH10K_DEBUGFS #CFLAGS+= -DCONFIG_ATH10K_DFS_CERTIFIED @@ -65,4 +64,7 @@ CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI #CFLAGS+= -DCONFIG_PM_SLEEP #CFLAGS+= -DCONFIG_THERMAL +CFLAGS+= -DKBUILD_MODNAME='"ath10k"' +CFLAGS+= -DLINUXKPI_VERSION=61900 + .include diff --git a/sys/modules/ath11k/Makefile b/sys/modules/ath11k/Makefile index d17e76255802..b1eb2422cc3d 100644 --- a/sys/modules/ath11k/Makefile +++ b/sys/modules/ath11k/Makefile @@ -2,6 +2,9 @@ DEVATH11KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath11k .PATH: ${DEVATH11KDIR} +ATH11K_PCI= 1 +ATH11K_AHB= 0 + ATH11K_DEBUGFS= 0 ATH11K_TRACE= 0 ATH11K_THERMAL= 0 @@ -18,10 +21,15 @@ SRCS+= ce.c peer.c dbring.c hw.c pcic.c SRCS+= fw.c p2p.c # PCI +.if defined(ATH11K_PCI) && ${ATH11K_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= mhi.c pci.c +CFLAGS+= -DCONFIG_ATH11K_PCI +.endif -# AHB -#SRCS+= ahb.c +.if defined(ATH11K_AHB) && ${ATH11K_AHB} > 0 +SRCS+= ahb.c +CFLAGS+= -DCONFIG_ATH11K_AHB +.endif .if defined(ATH11K_DEBUGFS) && ${ATH11K_DEBUGFS} > 0 SRCS+= debugfs.c debugfs_htt_stats.c debugfs_sta.c diff --git a/sys/modules/ath12k/Makefile b/sys/modules/ath12k/Makefile index ff61769bd99e..018504812995 100644 --- a/sys/modules/ath12k/Makefile +++ b/sys/modules/ath12k/Makefile @@ -2,8 +2,10 @@ DEVATH12KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath12k .PATH: ${DEVATH12KDIR} -ATH12K_ACPI= 0 +ATH12K_PCI= 1 ATH12K_AHB= 0 + +ATH12K_ACPI= 0 ATH12K_COREDUMP= 0 ATH12K_DEBUGFS= 0 ATH12K_PM= 0 @@ -16,7 +18,11 @@ SRCS+= wmi.c mac.c reg.c htc.c qmi.c SRCS+= dp.c dp_tx.c dp_rx.c dp_mon.c debug.c SRCS+= ce.c peer.c dbring.c hw.c fw.c p2p.c +.if defined(ATH12K_PCI) && ${ATH12K_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= mhi.c pci.c +.else +.error ath12k requires PCI support compiled in at this point +.endif .if defined(ATH12K_AHB) && ${ATH12K_AHB} > 0 CFLAGS+= -DCONFIG_ATH12K_AHB diff --git a/sys/modules/athk_common/Makefile b/sys/modules/athk_common/Makefile index 5400cfa7723d..d058d19cbe80 100644 --- a/sys/modules/athk_common/Makefile +++ b/sys/modules/athk_common/Makefile @@ -4,19 +4,19 @@ DEVDIR= ${SRCTOP}/sys/contrib/dev/athk KMOD= athk_common -WITH_ATH_DEBUG= 1 -WITH_ATH_TRACEPOINTS= 0 +ATHK_COMMON_ATH_DEBUG= 1 +ATHK_COMMON_ATH_TRACEPOINTS= 0 SRCS= main.c SRCS+= dfs_pattern_detector.c dfs_pri_detector.c SRCS+= hw.c key.c regd.c -.if defined(WITH_ATH_DEBUG) && ${WITH_ATH_DEBUG} > 0 +.if defined(ATHK_COMMON_ATH_DEBUG) && ${ATHK_COMMON_ATH_DEBUG} > 0 SRCS+= debug.c CFLAGS+= -DCONFIG_ATH_DEBUG .endif -.if defined(WITH_ATH_TRACEPOINTS) && ${WITH_ATH_TRACEPOINTS} > 0 +.if defined(ATHK_COMMON_ATH_TRACEPOINTS) && ${ATHK_COMMON_ATH_TRACEPOINTS} > 0 SRCS+= trace.c CFLAGS+= -DCONFIG_ATH_TRACEPOINTS .endif @@ -25,11 +25,12 @@ CFLAGS+= -DCONFIG_ATH_TRACEPOINTS SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h -CFLAGS+= -DKBUILD_MODNAME='"athk_common"' - CFLAGS+= -I${DEVDIR} CFLAGS+= ${LINUXKPI_INCLUDES} # Helpful after fresh imports. #CFLAGS+= -ferror-limit=0 +CFLAGS+= -DKBUILD_MODNAME='"athk_common"' +CFLAGS+= -DLINUXKPI_VERSION=61900 + .include diff --git a/sys/modules/brcm80211/brcmfmac/Makefile b/sys/modules/brcm80211/brcmfmac/Makefile index b0c4d75a3d17..107914c2dc27 100644 --- a/sys/modules/brcm80211/brcmfmac/Makefile +++ b/sys/modules/brcm80211/brcmfmac/Makefile @@ -3,14 +3,16 @@ DEVDIR= ${SRCTOP}/sys/contrib/dev/broadcom/brcm80211/brcmfmac .PATH: ${DEVDIR} # Should split this up into a core driver and 3 more -WITH_PCI=1 -WITH_SDIO=0 -WITH_USB=0 +BRCMFMAC_PCI= 1 +BRCMFMAC_USB= 0 +BRCMFMAC_SDIO= 0 -WITH_DMI=0 -WITH_OF=0 -WITH_DEBUG=1 -WITH_TRACING=0 # ftrace probes; simple enough to change possibly; keep 0! +BRCMFMAC_PROTO_BCDC= 0 # SDIO, USB -- do not set manually +BRCMFMAC_DEBUG= 1 +BRCMFMAC_TRACING= 0 # ftrace probes; simple enough to change possibly; keep 0! +BRCMFMAC_OF= 0 +BRCMFMAC_DMI= 0 +BRCMFMAC_ACPI= 0 KMOD= if_brcmfmac @@ -21,46 +23,57 @@ SRCS+= fweh.c fwil.c fwvid.c p2p.c pno.c proto.c vendor.c xtlv.c SRCS+= wcc/core.c cyw/core.c bca/core.c # PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. -.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} -SRCS+= pcie.c msgbuf.c commonring.c flowring.c -CFLAGS+= -DCONFIG_BRCMFMAC_PCIE=1 +.if defined(BRCMFMAC_PCI) && ${BRCMFMAC_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} +SRCS+= pcie.c +CFLAGS+= -DCONFIG_BRCMFMAC_PCIE +SRCS+= msgbuf.c commonring.c flowring.c +CFLAGS+= -DCONFIG_BRCMFMAC_PROTO_MSGBUF .endif # SDIO parts; SDIO depends on an MMCCAM kernel. -.if defined(WITH_SDIO) && ${WITH_SDIO} > 0 && ${KERN_OPTS:MMMCCAM} +.if defined(BRCMFMAC_SDIO) && ${BRCMFMAC_SDIO} > 0 && ${KERN_OPTS:MMMCCAM} SRCS+= sdio.c bcmsdh.c SRCS+= sdio_if.h SRCS+= sdiodevs.h -CFLAGS+= -DCONFIG_BRCMFMAC_SDIO=1 +CFLAGS+= -DCONFIG_BRCMFMAC_SDIO +BRCMFMAC_PROTO_BCDC= 1 .endif # USB parts; USB can be loaded and is unconditional on any kernel config. -.if defined(WITH_USB) && ${WITH_USB} > 0 +.if defined(BRCMFMAC_USB) && ${BRCMFMAC_USB} > 0 SRCS+= usb.c -CFLAGS+= -DCONFIG_BRCMFMAC_USB=1 +CFLAGS+= -DCONFIG_BRCMFMAC_USB +BRCMFMAC_PROTO_BCDC= 1 .endif -.if (defined(WITH_SDIO) && ${WITH_SDIO} > 0) || \ - (defined(WITH_USB) && ${WITH_USB} > 0) -CFLAGS+= -DCONFIG_BRCMFMAC_PROTO_BCDC=1 +.if defined(BRCMFMAC_PROTO_BCDC) && ${BRCMFMAC_PROTO_BCDC} > 0 +CFLAGS+= -DCONFIG_BRCMFMAC_PROTO_BCDC SRCS+= bcdc.c fwsignal.c .endif -.if defined(WITH_DMI) && ${WITH_DMI} > 0 -SRCS+= dmi.c +.if defined(BRCMFMAC_DEBUG) && ${BRCMFMAC_DEBUG} > 0 +CFLAGS+= -DDEBUG -DCONFIG_BRCMDBG +SRCS+= debug.c .endif -.if defined(WITH_OF) && ${WITH_OF} > 0 +.if defined(BRCMFMAC_TRACING) && ${BRCMFMAC_TRACING} > 0 +SRCS+= tracepoint.c +CFLAGS+= -DCONFIG_BRCM_TRACING +.endif + +.if defined(BRCMFMAC_OF) && ${BRCMFMAC_OF} > 0 SRCS+= of.c +CFLAGS+= -DCONFIG_OF .endif -.if defined(WITH_DEBUG) && ${WITH_DEBUG} > 0 -CFLAGS+= -DDEBUG=${WITH_DEBUG} -SRCS+= debug.c +.if defined(BRCMFMAC_DMI) && ${BRCMFMAC_DMI} > 0 +SRCS+= dmi.c +CFLAGS+= -DCONFIG_DMI .endif -.if defined(WITH_TRACING) && ${WITH_TRACING} > 0 -SRCS+= tracepoint.c +.if defined(BRCMFMAC_ACPI) && ${BRCMFMAC_ACPI} > 0 +SRCS+= acpi.c +CFLAGS+= -DCONFIG_ACPI .endif # Other @@ -68,25 +81,18 @@ SRCS+= bus_if.h device_if.h pci_if.h vnode_if.h SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h -CFLAGS+= -DKBUILD_MODNAME='"brcmfmac"' -CFLAGS+= -DLINUXKPI_VERSION=61700 - CFLAGS+= -I${DEVDIR} CFLAGS+= -I${DEVDIR}/../include CFLAGS+= ${LINUXKPI_INCLUDES} -CFLAGS+= -ferror-limit=0 - -#CFLAGS+= -DCONFIG_BRCM_TRACING=${WITH_TRACING} -CFLAGS+= -DCONFIG_BRCMFMAC_PROTO_MSGBUF=${WITH_PCI} -CFLAGS+= -DCONFIG_BRCMDBG=${WITH_DEBUG} - -#CFLAGS+= -DCONFIG_DMI=${WITH_DMI} -#CFLAGS+= -DCONFIG_OF=${WITH_OF} +# Helpful after fresh imports. +#CFLAGS+= -ferror-limit=0 #CFLAGS+= -DCONFIG_PM_SLEEP= -#CFLAGS+= -DCONFIG_ACPI=0 #CFLAGS+= -DCONFIG_PM #CFLAGS+= -DCONFIG_IPV6=0 +CFLAGS+= -DKBUILD_MODNAME='"brcmfmac"' +CFLAGS+= -DLINUXKPI_VERSION=61900 + .include diff --git a/sys/modules/brcm80211/brcmutil/Makefile b/sys/modules/brcm80211/brcmutil/Makefile index 3fc01f4894fd..7ef89be18bf9 100644 --- a/sys/modules/brcm80211/brcmutil/Makefile +++ b/sys/modules/brcm80211/brcmutil/Makefile @@ -2,27 +2,27 @@ DEVDIR= ${SRCTOP}/sys/contrib/dev/broadcom/brcm80211/brcmutil .PATH: ${DEVDIR} -WITH_DEBUG=1 +BRCMUTIL_DEBUG= 1 KMOD= brcmutil SRCS= d11.c utils.c +.if defined(BRCMUTIL_DEBUG) && ${BRCMUTIL_DEBUG} > 0 +CFLAGS+= -DDEBUG +.endif + # Other SRCS+= ${LINUXKPI_GENSRCS} SRCS+= bus_if.h device_if.h pci_if.h vnode_if.h SRCS+= opt_wlan.h opt_inet6.h opt_inet.h -CFLAGS+= -DKBUILD_MODNAME='"brcmutil"' -CFLAGS+= -DLINUXKPI_VERSION=61700 - -.if defined(WITH_DEBUG) && ${WITH_DEBUG} > 0 -CFLAGS+= -DDEBUG=${WITH_DEBUG} -.endif - CFLAGS+= -I${DEVDIR} CFLAGS+= -I${DEVDIR}/../include CFLAGS+= ${LINUXKPI_INCLUDES} #CFLAGS+= -ferror-limit=0 +CFLAGS+= -DKBUILD_MODNAME='"brcmutil"' +CFLAGS+= -DLINUXKPI_VERSION=61900 + .include diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile index b5441744d77a..399e35b79d61 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -4,10 +4,10 @@ DEVIWLWIFIDIR= ${SRCTOP}/sys/contrib/dev/iwlwifi .PATH: ${DEVIWLWIFIDIR} -WITH_CONFIG_PM= 0 -WITH_DEBUGFS= 0 +IWLWIFI_CONFIG_PM= 0 +IWLWIFI_DEBUGFS= 0 .if ${KERN_OPTS:MDEV_ACPI} -WITH_CONFIG_ACPI= 1 +IWLWIFI_CONFIG_ACPI= 1 .endif KMOD= if_iwlwifi @@ -49,21 +49,21 @@ SRCS+= mld/regulatory.c mld/roc.c mld/rx.c mld/scan.c SRCS+= mld/session-protect.c mld/sta.c mld/stats.c mld/thermal.c SRCS+= mld/time_sync.c mld/tlc.c mld/tx.c -.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 +.if defined(IWLWIFI_DEBUGFS) && ${IWLWIFI_DEBUGFS} > 0 SRCS+= fw/debugfs.c SRCS+= mvm/debugfs.c mvm/debugfs-vif.c SRCS+= mld/debugfs.c CFLAGS+= -DCONFIG_IWLWIFI_DEBUGFS CFLAGS+= -DCONFIG_MAC80211_DEBUGFS .endif -.if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0 +.if defined(IWLWIFI_CONFIG_PM) && ${IWLWIFI_CONFIG_PM} > 0 SRCS+= mvm/d3.c SRCS+= mld/d3.c CFLAGS+= -DCONFIG_PM CFLAGS+= -DCONFIG_PM_SLEEP .endif -.if defined(WITH_CONFIG_ACPI) && ${WITH_CONFIG_ACPI} > 0 +.if defined(IWLWIFI_CONFIG_ACPI) && ${IWLWIFI_CONFIG_ACPI} > 0 SRCS.DEV_ACPI+= fw/acpi.c CFLAGS+= -DCONFIG_ACPI .endif @@ -74,9 +74,6 @@ CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h -CFLAGS+= -DKBUILD_MODNAME='"iwlwifi"' -CFLAGS+= -DLINUXKPI_VERSION=61700 - CFLAGS+= -I${DEVIWLWIFIDIR} CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -DCONFIG_IWLDVM=0 @@ -96,6 +93,9 @@ CFLAGS+= -DCONFIG_IWLWIFI_DEVICE_TRACING=1 #CFLAGS+= -DCONFIG_THERMAL=1 #CFLAGS+= -DCONFIG_EFI=1 +CFLAGS+= -DKBUILD_MODNAME='"iwlwifi"' +CFLAGS+= -DLINUXKPI_VERSION=61900 + CWARNFLAGS.clang.drv.c+= -Wno-initializer-overrides CWARNFLAGS.drv.c+= -Wno-override-init ${CWARNFLAGS.${COMPILER_TYPE}.${.IMPSRC:T}} diff --git a/sys/modules/mt76/Makefile b/sys/modules/mt76/Makefile index 5abae4c5ad7c..726f7759e9be 100644 --- a/sys/modules/mt76/Makefile +++ b/sys/modules/mt76/Makefile @@ -1,8 +1,14 @@ +.include + SUBDIR= core SUBDIR+= mt7615 +.if ${KERN_OPTS:MDEV_PCI} SUBDIR+= mt7915 +.endif SUBDIR+= mt7921 SUBDIR+= mt7925 +.if ${KERN_OPTS:MDEV_PCI} SUBDIR+= mt7996 +.endif .include diff --git a/sys/modules/mt76/Makefile.inc b/sys/modules/mt76/Makefile.inc index 41b18651e985..b44dcd2e2e82 100644 --- a/sys/modules/mt76/Makefile.inc +++ b/sys/modules/mt76/Makefile.inc @@ -1,16 +1,21 @@ # Common information shared by all submodule builds. COMMONDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76 +DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/${MT76_DRIVER_NAME} -# Bus attachments. -WITH_PCI= 1 -WITH_USB= 0 -WITH_SDIO= 0 +KMOD?= if_${MT76_DRIVER_NAME} -# Options. -WITH_CONFIG_PM= 0 -WITH_DEBUGFS= 0 -WITH_SOC_WED= 0 +# Bus attachment for the core part and that each driver can check +# what the common code supports. +MT76_PCI= 1 +MT76_SDIO= 0 +MT76_USB= 0 + +# General options for common code so drivers can check. +MT76_ACPI?= 0 +MT76_CONFIG_PM?= 0 +MT76_DEBUGFS?= 0 +MT76_SOC_WED?= 0 # Other SRCS+= ${LINUXKPI_GENSRCS} @@ -19,23 +24,26 @@ SRCS+= opt_wlan.h opt_inet6.h opt_inet.h # This is true for all architectures we build for. CFLAGS+= -DCONFIG_ARCH_DMA_ADDR_T_64BIT -# Helpful after fresh imports. -#CFLAGS+= -ferror-limit=0 - -.if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0 -CFLAGS+= -DCONFIG_PM=${WITH_CONFIG_PM} +.if defined(MT76_CONFIG_PM) && ${MT76_CONFIG_PM} > 0 +CFLAGS+= -DCONFIG_PM .endif -.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 -CFLAGS+= -DCONFIG_MAC80211_DEBUGFS=${WITH_DEBUGFS} +.if defined(MT76_DEBUGFS) && ${MT76_DEBUGFS} > 0 +CFLAGS+= -DCONFIG_MAC80211_DEBUGFS .endif -.if defined(WITH_SOC_WED) && ${WITH_SOC_WED} > 0 -CFLAGS+= CONFIG_NET_MEDIATEK_SOC_WED +.if defined(MT76_SOC_WED) && ${MT76_SOC_WED} > 0 +CFLAGS+= -DCONFIG_NET_MEDIATEK_SOC_WED .endif CFLAGS+= -I${COMMONDIR} +.if ${MT76_DRIVER_NAME} != "mt76_core" +CFLAGS+= -I${DEVDIR} +.endif CFLAGS+= ${LINUXKPI_INCLUDES} +# Helpful after fresh imports. +#CFLAGS+= -ferror-limit=0 + +CFLAGS+= -DKBUILD_MODNAME='"${MT76_DRIVER_NAME}"' CFLAGS+= -DLINUXKPI_VERSION=61900 -# end diff --git a/sys/modules/mt76/core/Makefile b/sys/modules/mt76/core/Makefile index f2aec9dfcf4c..e4e65d8e3c24 100644 --- a/sys/modules/mt76/core/Makefile +++ b/sys/modules/mt76/core/Makefile @@ -1,25 +1,30 @@ +MT76_DRIVER_NAME= mt76_core + .include -.PATH: ${COMMONDIR} +KMOD= ${MT76_DRIVER_NAME} -KMOD= mt76_core +.PATH: ${COMMONDIR} # Basic stuff. -SRCS= mac80211.c mmio.c util.c dma.c eeprom.c tx.c agg-rx.c mcu.c +SRCS+= mac80211.c mmio.c util.c dma.c eeprom.c tx.c agg-rx.c mcu.c SRCS+= channel.c scan.c wed.c -#SRCS+= trace.c -# Bus stuff. # PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. -.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} +.if defined(MT76_PCI) && ${MT76_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= pci.c .endif -.if defined(WITH_USB) && ${WITH_USB} > 0 -SRCS+= usb.c # usb_trace.c +# SDIO parts; SDIO depends on an MMCCAM kernel. +.if defined(MT76_SDIO) && ${MT76_SDIO} > 0 && ${KERN_OPTS:MMMCCAM} +SRCS+= sdio.c sdio_txrx.c .endif -#SRCS+= sdio.c sdio_txrx.c +# USB parts; USB can be loaded and is unconditional on any kernel config. +.if defined(MT76_USB) && ${MT76_USB} > 0 +SRCS+= usb.c +#SRCS+= usb_trace.c +.endif # Connac-Lib stuff. SRCS+= mt76_connac_mac.c mt76_connac_mcu.c mt76_connac3_mac.c @@ -30,22 +35,21 @@ SRCS+= mt76_connac_mac.c mt76_connac_mcu.c mt76_connac3_mac.c # MT792X-LIB stuff. SRCS+= mt792x_core.c mt792x_mac.c mt792x_dma.c #SRCS+= mt792x_trace.c -.if defined(WITH_ACPI) && ${WITH_ACPI} > 0 +.if defined(MT76_ACPI) && ${MT76_ACPI} > 0 SRCS+= mt792x_acpi_sar.c .endif -.if defined(WITH_USB) && ${WITH_USB} > 0 +.if defined(MT76_USB) && ${MT76_USB} > 0 SRCS+= mt792x_usb.c .endif -.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 +.if defined(MT76_DEBUGFS) && ${MT76_DEBUGFS} > 0 SRCS+= mt792x_debugfs.c .endif -.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 +.if defined(MT76_DEBUGFS) && ${MT76_DEBUGFS} > 0 SRCS+= debugfs.c .endif -CFLAGS+= -DKBUILD_MODNAME='"mt76_core"' -CFLAGS+= -DCONFIG_MAC80211_DEBUGFS=${WITH_DEBUGFS} +#SRCS+= trace.c EXPORT_SYMS= YES diff --git a/sys/modules/mt76/mt7615/Makefile b/sys/modules/mt76/mt7615/Makefile index 6d7cb945a32d..6eb650a8439a 100644 --- a/sys/modules/mt76/mt7615/Makefile +++ b/sys/modules/mt76/mt7615/Makefile @@ -1,26 +1,31 @@ -DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7615 +MT76_DRIVER_NAME= mt7615 + +.include .PATH: ${DEVDIR} -WITH_DEBUGFS= 0 -WITH_DEV_COREDUMP= 0 +MT7615_PCI= 1 -KMOD= if_mt7615 +MT7615_DEBUGFS= 0 +MT7615_DEV_COREDUMP= 0 # Common stuff. -SRCS= init.c main.c mac.c mcu.c eeprom.c +SRCS+= init.c main.c mac.c mcu.c eeprom.c # PCIe (7622_WMAC ignored) +.if defined(MT76_PCI) && ${MT76_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} && \ + defined(MT7615_PCI) && ${MT7615_PCI} > 0 SRCS+= dma.c mmio.c pci.c pci_init.c pci_mac.c +.endif # USB + SDIO ignored currently. -.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 +.if defined(MT7615_DEBUGFS) && ${MT7615_DEBUGFS} > 0 SRCS+= debugfs.c -CFLAGS+= -DCONFIG_MT7915_DEBUGFS=${WITH_DEBUGFS} +CFLAGS+= -DCONFIG_MT7915_DEBUGFS .endif -CFLAGS+= -DKBUILD_MODNAME='"mt7615"' -CFLAGS+= -I${DEVDIR} +.if defined(MT7615_DEV_COREDUMP) && ${MT7615_DEV_COREDUMP} > 0 +.endif .include diff --git a/sys/modules/mt76/mt7915/Makefile b/sys/modules/mt76/mt7915/Makefile index 049c919949f6..580fde3b7aa7 100644 --- a/sys/modules/mt76/mt7915/Makefile +++ b/sys/modules/mt76/mt7915/Makefile @@ -1,30 +1,37 @@ -DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7915 +MT76_DRIVER_NAME= mt7915 + +.include .PATH: ${DEVDIR} -WITH_DEBUGFS= 0 -WITH_DEV_COREDUMP= 1 +MT7915_PCI= 1 + +MT7915_WMAC= 0 +MT7915_DEBUGFS= 0 +MT7915_DEV_COREDUMP= 1 -KMOD= if_mt7915 +SRCS+= init.c main.c mac.c mcu.c mmio.c eeprom.c -# Common stuff. -SRCS= init.c main.c mac.c mcu.c mmio.c eeprom.c +# PCI only driver so it better be there (otherwise nothing will attach at least). +.if defined(MT76_PCI) && ${MT76_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} && \ + defined(MT7915_PCI) && ${MT7915_PCI} > 0 SRCS+= pci.c dma.c +.endif # SOC+6E stuff. -#SRCS+= soc.c +.if defined(MT7915_WMAC) && ${MT7915_WMAC} > 0 +SRCS+= soc.c +CFLAGS+= -DCONFIG_MT798X_WMAC +.endif -.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 +.if defined(MT7915_DEBUGFS) && ${MT7915_DEBUGFS} > 0 SRCS+= debugfs.c -CFLAGS+= -DCONFIG_MT7915_DEBUGFS=${WITH_DEBUGFS} +CFLAGS+= -DCONFIG_MT7915_DEBUGFS .endif -.if defined(WITH_DEV_COREDUMP) && ${WITH_DEV_COREDUMP} > 0 +.if defined(MT7915_DEV_COREDUMP) && ${MT7915_DEV_COREDUMP} > 0 SRCS+= coredump.c -CFLAGS+= -DCONFIG_DEV_COREDUMP=${WITH_DEV_COREDUMP} +CFLAGS+= -DCONFIG_DEV_COREDUMP .endif -CFLAGS+= -DKBUILD_MODNAME='"mt7915"' -CFLAGS+= -I${DEVDIR} - .include diff --git a/sys/modules/mt76/mt7921/Makefile b/sys/modules/mt76/mt7921/Makefile index 1b53df04357c..b6dbe88204a3 100644 --- a/sys/modules/mt76/mt7921/Makefile +++ b/sys/modules/mt76/mt7921/Makefile @@ -1,35 +1,39 @@ -.include +MT76_DRIVER_NAME= mt7921 -DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7921 +.include .PATH: ${DEVDIR} -KMOD= if_mt7921 +MT7921_PCI= 1 +MT7921_SDIO= 0 +MT7921_USB= 0 + +MT7921_DEBUGFS= 0 # Common stuff. -SRCS= init.c main.c mac.c mcu.c +SRCS+= init.c main.c mac.c mcu.c # PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. -.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} +.if defined(MT76_PCI) && ${MT76_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} && \ + defined(MT7921_PCI) && ${MT7921_PCI} > 0 SRCS+= pci.c pci_mac.c pci_mcu.c .endif -# USB parts; USB can be loaded and is unconditional on any kernel config. -.if defined(WITH_USB) && ${WITH_USB} > 0 -SRCS+= usb.c -.endif - # SDIO parts; SDIO depends on an MMCCAM kernel. -.if defined(WITH_SDIO) && ${WITH_SDIO} > 0 && ${KERN_OPTS:MMMCCAM} +.if defined(MT76_SDIO) && ${MT76_SDIO} > 0 && ${KERN_OPTS:MMMCCAM} && \ + defined(MT7921_SDIO) && ${MT7921_SDIO} > 0 SRCS+= sdio.c sdio_mac.c sdio_mcu.c .endif -.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 -SRCS+= debugfs.c -CFLAGS+= -DCONFIG_MT7921_DEBUGFS=${WITH_DEBUGFS} +# USB parts; USB can be loaded and is unconditional on any kernel config. +.if defined(MT76_USB) && ${MT76_USB} > 0 && \ + defined(MT7921_USB) && ${MT7921_USB} > 0 +SRCS+= usb.c .endif -CFLAGS+= -DKBUILD_MODNAME='"mt7921"' -CFLAGS+= -I${DEVDIR} +.if defined(MT7921_DEBUGFS) && ${MT7921_DEBUGFS} > 0 +SRCS+= debugfs.c +CFLAGS+= -DCONFIG_MT7921_DEBUGFS +.endif .include diff --git a/sys/modules/mt76/mt7925/Makefile b/sys/modules/mt76/mt7925/Makefile index ee79f09dba1c..c8477eadd7f5 100644 --- a/sys/modules/mt76/mt7925/Makefile +++ b/sys/modules/mt76/mt7925/Makefile @@ -1,30 +1,32 @@ -.include +MT76_DRIVER_NAME= mt7925 -DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7925 +.include .PATH: ${DEVDIR} -KMOD= if_mt7925 +MT7925_PCI= 1 +MT7925_USB= 1 + +MT7925_DEBUGFS= 0 # Common stuff. -SRCS= init.c main.c mac.c mcu.c regd.c +SRCS+= init.c main.c mac.c mcu.c regd.c # PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. -.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} +.if defined(MT76_PCI) && ${MT76_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} && \ + defined(MT7925_PCI) && ${MT7925_PCI} > 0 SRCS+= pci.c pci_mac.c pci_mcu.c .endif # USB parts; USB can be loaded and is unconditional on any kernel config. -.if defined(WITH_USB) && ${WITH_USB} > 0 +.if defined(MT76_USB) && ${MT76_USB} > 0 && \ + defined(MT7925_USB) && ${MT7925_USB} > 0 SRCS+= usb.c .endif -.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 +.if defined(MT7925_DEBUGFS) && ${MT7925_DEBUGFS} > 0 SRCS+= debugfs.c -CFLAGS+= -DCONFIG_MT7925_DEBUGFS=${WITH_DEBUGFS} +CFLAGS+= -DCONFIG_MT7925_DEBUGFS .endif -CFLAGS+= -DKBUILD_MODNAME='"mt7925"' -CFLAGS+= -I${DEVDIR} - .include diff --git a/sys/modules/mt76/mt7996/Makefile b/sys/modules/mt76/mt7996/Makefile index a43721b6079e..97de923c84ab 100644 --- a/sys/modules/mt76/mt7996/Makefile +++ b/sys/modules/mt76/mt7996/Makefile @@ -1,27 +1,36 @@ -DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7996 +MT76_DRIVER_NAME= mt7996 + +.include .PATH: ${DEVDIR} -WITH_DEBUGFS= 0 -WITH_DEV_COREDUMP= 1 +MT7996_PCI= 1 -KMOD= if_mt7996 +MT7996_DEBUGFS= 0 +MT7996_DEV_COREDUMP= 1 +MT7996_NPU= 0 # Common stuff. -SRCS= init.c main.c mac.c mcu.c mmio.c eeprom.c +SRCS+= init.c main.c mac.c mcu.c mmio.c eeprom.c +# PCI only driver so it better be there (otherwise nothing will attach at least). +.if defined(MT76_PCI) && ${MT76_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} && \ + defined(MT7996_PCI) && ${MT7996_PCI} > 0 SRCS+= pci.c dma.c +.endif -.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 +.if defined(MT7996_DEBUGFS) && ${MT7996_DEBUGFS} > 0 SRCS+= debugfs.c -CFLAGS+= -DCONFIG_MT7996_DEBUGFS=${WITH_DEBUGFS} +CFLAGS+= -DCONFIG_MT7996_DEBUGFS .endif -.if defined(WITH_DEV_COREDUMP) && ${WITH_DEV_COREDUMP} > 0 +.if defined(MT7996_DEV_COREDUMP) && ${MT7996_DEV_COREDUMP} > 0 SRCS+= coredump.c -CFLAGS+= -DCONFIG_DEV_COREDUMP=${WITH_DEV_COREDUMP} +CFLAGS+= -DCONFIG_DEV_COREDUMP .endif -CFLAGS+= -DKBUILD_MODNAME='"mt7996"' -CFLAGS+= -I${DEVDIR} +.if defined(MT7996_NPU) && ${MT7996_NPU} > 0 +SRCS+= npu.c +CFLAGS+= -DCONFIG_MT7996_NPU +.endif .include diff --git a/sys/modules/rtw88/Makefile b/sys/modules/rtw88/Makefile index 2347093db1a5..04000dd66e95 100644 --- a/sys/modules/rtw88/Makefile +++ b/sys/modules/rtw88/Makefile @@ -5,14 +5,14 @@ DEVRTW88DIR= ${SRCTOP}/sys/contrib/dev/rtw88 .PATH: ${DEVRTW88DIR} # Bus attachments. -WITH_PCI= 1 -WITH_USB= 0 -WITH_SDIO= 0 +RTW88_PCI= 1 +RTW88_SDIO= 0 +RTW88_USB= 0 # Options. -WITH_CONFIG_PM= 0 -WITH_DEBUGFS= 1 -WITH_LEDS= 0 +RTW88_CONFIG_PM= 0 +RTW88_DEBUGFS= 1 +RTW88_LEDS= 0 KMOD= if_rtw88 @@ -22,11 +22,6 @@ SRCS+= bf.c coex.c debug.c efuse.c fw.c mac.c mac80211.c SRCS+= phy.c ps.c regd.c SRCS+= rx.c sar.c sec.c tx.c util.c -.if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0 -SRCS+= wow.c -CFLAGS+= -DCONFIG_PM=${WITH_CONFIG_PM} -.endif - # Common SRCS+= rtw8723x.c # 87x3 common SRCS+= rtw8703b.c rtw8703b_tables.c # 11n @@ -37,7 +32,7 @@ SRCS+= rtw8822b.c rtw8822b_table.c # 11ac SRCS+= rtw8822c.c rtw8822c_table.c # 11ac # PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. -.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} +.if defined(RTW88_PCI) && ${RTW88_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= pci.c SRCS+= rtw8723de.c SRCS+= rtw8814ae.c @@ -46,8 +41,17 @@ SRCS+= rtw8822be.c SRCS+= rtw8822ce.c .endif +# SDIO parts; SDIO depends on an MMCCAM kernel. +.if defined(RTW88_SDIO) && ${RTW88_SDIO} > 0 && ${KERN_OPTS:MMMCCAM} +SRCS+= rtw8723cs.c +SRCS+= rtw8723ds.c +SRCS+= rtw8821cs.c +SRCS+= rtw8822bs.c +SRCS+= rtw8822cs.c +.endif + # USB parts; USB can be loaded and is unconditional on any kernel config. -.if defined(WITH_USB) && ${WITH_USB} > 0 +.if defined(RTW88_USB) && ${RTW88_USB} > 0 SRCS+= usb.c SRCS+= rtw8723du.c SRCS+= rtw88xxa.c # 88xxa common @@ -57,41 +61,35 @@ SRCS+= rtw8821a.c rtw8821a_table.c rtw8821au.c SRCS+= rtw8821cu.c SRCS+= rtw8822bu.c SRCS+= rtw8822cu.c - CFLAGS+= -DCONFIG_RTW88_USB .endif -# SDIO parts; SDIO depends on an MMCCAM kernel. -.if defined(WITH_SDIO) && ${WITH_SDIO} > 0 && ${KERN_OPTS:MMMCCAM} -SRCS+= rtw8723cs.c -SRCS+= rtw8723ds.c -SRCS+= rtw8821cs.c -SRCS+= rtw8822bs.c -SRCS+= rtw8822cs.c +.if defined(RTW88_CONFIG_PM) && ${RTW88_CONFIG_PM} > 0 +SRCS+= wow.c +CFLAGS+= -DCONFIG_PM=${RTW88_CONFIG_PM} .endif -.if defined(WITH_LEDS) && ${WITH_LEDS} > 0 *** 134 LINES SKIPPED *** From nobody Sat Apr 18 11:01:17 2026 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 4fyTMR0gv8z6ZVQd for ; Sat, 18 Apr 2026 11:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fyTMQ6LwCz47vY for ; Sat, 18 Apr 2026 11:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776510083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8UGgE7GFdKiq/555n8EUCqNh17RsLLjSHNrc+4ZUSg4=; b=IFZMGYAsnKbnruPmm1ZxClNN0fF/9vc6hViSFCx1XUh49mkqCwvfjjhNJxlapSOo0/LJB8 GaONefkH5vhTuxa39G7+ev15QclTvFNc7dBs3WbI3ruSSfiKx+Jps8F80G+wEQLzRUmi1T 1fNGise7+7jJmY00Flb/8bv7vsBRXdXAgxILnS32WdIuUcJy5BHyWqpcGdiCV9+FX5CPd5 f6nYzepTbgUSd2PBH/yGG2nLA9j/wjMFCWrJuLzwLOGpFs05TIBo7SehVna+k0TdZt/fLs LsJIaAjdmdRwtwN4OgTo9zlC2C47NesPmyPfklKC56PUSh+sWtgveXDjTwN9oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776510083; a=rsa-sha256; cv=none; b=BChiFzwQ41Z+sZqNA7HOtWZBPZIHc3KxHGo6WHZPX5GigIu5pevIjprA+mW56w+zidFT/I kqH46sHfqVVnv1BMYkH2qbhmEqLLJbe/MoQxqln1AmYzZ3F5nRwSUTKEspOpxy3zzNVr4t /VLIgM9wjJnb0O0Y6AtgUlfb8Ir2GmGB1W0v+r49DiKFln8Y62dDq7kkZksBin9d/N5ag/ Hc2ZzPIORim6ee6umlhgQbkjIYpXvpV2txnj0j+mITg+dsWq2s1VOeTBT8w9zVLTHK5/HL b6+LJ3IcJD6aw6DTVGLgzwweadnnQy9HAX3UslfMmi9EZ0pQzhHjd/V6ldvybQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776510082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8UGgE7GFdKiq/555n8EUCqNh17RsLLjSHNrc+4ZUSg4=; b=QybgYaTMaNNxxm5pnnKoFSAoYAGK2ECls4rtPpJD3KQVxlQzdENMpJOMQAQy2GEhO7eMNE 0RncLVTyfu5HpJvMEEilEeE19goMWJ3jj4TACQdUqhN3yz5GbzSUFFpijlM04oomeeK1Ze xfsZ8x08u0JUk49CNjiJPd8QXd9lV66+OoSBmMf5rlKRZ2mvDSqfbFAS0ePvY2wDDo4ON0 giOq/h6Y5aEscMonY8lD9ouWf1sGuSflny8Zjx4SIsUojlg+0kIbpMEUbBOHbImslmUagP qQWWKH1+GzoK/h7shqMSTP/w/n8hwVJLtQDBRFH8T5b4/wzqZwhUq3OzrtzZLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyTMQ5FTyzdHH for ; Sat, 18 Apr 2026 11:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3424d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 18 Apr 2026 11:01:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f5f3c16d9256 - stable/15 - ath11k: restore module Makefile 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f5f3c16d9256fb8bb2c38e1dd91ca420f240bfd6 Auto-Submitted: auto-generated Date: Sat, 18 Apr 2026 11:01:17 +0000 Message-Id: <69e3647d.3424d.5be25e95@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f5f3c16d9256fb8bb2c38e1dd91ca420f240bfd6 commit f5f3c16d9256fb8bb2c38e1dd91ca420f240bfd6 Author: Bjoern A. Zeeb AuthorDate: 2026-03-20 00:17:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-18 02:33:01 +0000 ath11k: restore module Makefile During the subtree merge and checking out the updated version of ath12k parts of the previous ath11k merge were accidentally undone. Retore the ath11k Makefile as well after 3c4eef5d838b restored the driver bits. Fixes: a96550206e4b ("ath12k: update Atheros/QCA's ath12k ..") Sponsored by: The FreeBSD Foundation (cherry picked from commit f9795615415074b23faf8e5d937c2ef31045d3d0) --- sys/modules/ath11k/Makefile | 63 +++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/sys/modules/ath11k/Makefile b/sys/modules/ath11k/Makefile index 42aa9b9936cd..d17e76255802 100644 --- a/sys/modules/ath11k/Makefile +++ b/sys/modules/ath11k/Makefile @@ -2,30 +2,62 @@ DEVATH11KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath11k .PATH: ${DEVATH11KDIR} -WITH_DEBUGFS= 0 # Does not yet compile -WITH_CONFIG_PM= 0 +ATH11K_DEBUGFS= 0 +ATH11K_TRACE= 0 +ATH11K_THERMAL= 0 +ATH11K_SPECTRAL= 0 +ATH11K_PM= 0 +ATH11K_DEV_COREDUMP= 0 KMOD= if_ath11k SRCS+= core.c hal.c hal_tx.c hal_rx.c SRCS+= wmi.c mac.c reg.c htc.c qmi.c SRCS+= dp.c dp_tx.c dp_rx.c debug.c -SRCS+= ce.c peer.c dbring.c hw.c -SRCS+= coredump.c fw.c p2p.c +SRCS+= ce.c peer.c dbring.c hw.c pcic.c +SRCS+= fw.c p2p.c -SRCS+= mhi.c pci.c pcic.c +# PCI +SRCS+= mhi.c pci.c -.if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0 -CFLAGS+= -DCONFIG_PM=${WITH_CONFIG_PM} +# AHB +#SRCS+= ahb.c + +.if defined(ATH11K_DEBUGFS) && ${ATH11K_DEBUGFS} > 0 +SRCS+= debugfs.c debugfs_htt_stats.c debugfs_sta.c +CFLAGS+= -DCONFIG_ATH11K_DEBUGFS +CFLAGS+= -DCONFIG_MAC80211_DEBUGFS +.endif + +.if defined(ATH11K_TRACE) && ${ATH11K_TRACE} > 0 +SRCS+= trace.c +CFLAGS+= -DCONFIG_ATH11K_TRACING +.endif + +.if defined(ATH11K_THERMAL) && ${ATH11K_THERMAL} > 0 +SRCS+= thermal.c +CFLAGS+= -DCONFIG_ATH11K_THERMAL +.endif + +.if defined(ATH11K_SPECTRAL) && ${ATH11K_SPECTRAL} > 0 +SRCS+= spectral.c +CFLAGS+= -DCONFIG_ATH11K_SPECTRAL +.endif + +.if defined(ATH11K_PM) && ${ATH11K_PM} > 0 +CFLAGS+= -DCONFIG_PM SRCS+= wow.c .endif +.if defined(ATH11K_DEV_COREDUMP) && ${ATH11K_DEV_COREDUMP} > 0 +CFLAGS+= -DCONFIG_DEV_COREDUMP +SRCS+= coredump.c +.endif + # Other SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h -CFLAGS+= -DKBUILD_MODNAME='"ath11k"' - CFLAGS+= -I${DEVATH11KDIR} CFLAGS+= -I${DEVATH11KDIR}/.. CFLAGS+= ${LINUXKPI_INCLUDES} @@ -34,16 +66,7 @@ CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -DCONFIG_ATH11K_DEBUG -.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 -SRCS+= debugfs.c debugfs_htt_stats.c debugfs_sta.c -CFLAGS+= -DCONFIG_ATH11K_DEBUGFS=${WITH_DEBUGFS} -CFLAGS+= -DCONFIG_MAC80211_DEBUGFS=${WITH_DEBUGFS} -.endif - -#CFLAGS+= -DCONFIG_ATH11K_SPECTRAL -#CFLAGS+= -DCONFIG_ATH11K_TRACING -#CFLAGS+= -DCONFIG_NL80211_TESTMODE -#CFLAGS+= -DCONFIG_PM -#CFLAGS+= -DCONFIG_THERMAL +CFLAGS+= -DKBUILD_MODNAME='"ath11k"' +CFLAGS+= -DLINUXKPI_VERSION=61900 .include From nobody Sat Apr 18 12:12:19 2026 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 4fyVxH4YhBz6Zcq9 for ; Sat, 18 Apr 2026 12:12: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fyVxH3ZQRz4Lf7 for ; Sat, 18 Apr 2026 12:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776514339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y8RMoL4OCfIjGPO9PBw4MxSBKljANkYUBebPbTRrkIQ=; b=jYUm1f1M84/Wimo4OBr7e68S2HGUv9vglgSuBV/5T7FmHNybQ3LcQja5wQ6kpiMTVodmkl 5jwu69G/+Ozq93HbTwwyxKGRDZq1wKb2/Svz+D7B3fps3uJKnV7hU1AtQt3Y7W3/sHL9QC 3KmY/L2mXvujvQT8mcklv8vlgALD00eHsJFMsvK4IQfg1vdhHwaqrKT/i7K1rjPnoidKsL Vir/Us+rhFn8xUq3wFdqdNvXl1R+4pFddZSO8059IuXZ9UBZf8o6LgrpP0gdlJ6aORzwDX PKnhb3kggYNUeiOPJTkXIUgDkYoTw/jR/gS3zeIUvKlxJR8opxbXN8yFZ0Nu7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776514339; a=rsa-sha256; cv=none; b=SLB0dslANvh5Kwt+rg420jDbyv3bmOLdv4P00LJ4tuTCIoYylu4t7ABCYyA1YFRuprE81/ z3DTgpaTln+uzFpbtSCOzQ86S/rpfb+4BrKn2kBb3H3/NRpFsQLq1z4QZX1VpkmbpbgH8c qgcwn8ouOIBBz1t7Zu1rO+BL8hfN49Vl/4hGLLlSlE1k3abXO8lg4arR10Vg/OEE9uDP29 lfPQb0Bt037UW+kS531EjyiJ6ZYnxcOOJW/dZPPOICcTBchrWakk+d+7mrTnt312pG/CnT BHwyKVT2V6pYL/NiQmZmF3RrxrC4rOyWXLVwUWz8hXqdB/cgm+I/soxVtsP7cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776514339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y8RMoL4OCfIjGPO9PBw4MxSBKljANkYUBebPbTRrkIQ=; b=tcQQERUwMwE/XXJdT75FWU90zmzzxIAgbjZZa7UJhzE9Koag3skSkp9IL4VnPPtW+HU+va qofYbajERJeacmARZ3MUuF5dvrrW7MJrr2UV4V2dLqsMP9IYRxjMfJFwBIpidUnjslIkyl OVAYtw0JMKMctKaxTgIwoH8ysqqsMDeVAvg9oywXdZDebFOcV1HfA5AVGAtC0tahVbyHoD oHu33izAQHLIDDuq63Gcq2W/L/Ui7dIsm0WQK2ndGfS3Fkvfk/gNLMCOpB7I05lD1+VeD0 1fRTSHOzUvPjzrS1Fu4xbkC3kva3EKkOxFirJ40GVpSqGKHYGD4kMij7eynx4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyVxH32hnzg5M for ; Sat, 18 Apr 2026 12:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d95c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 18 Apr 2026 12:12:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ahmad Khalifa Subject: git: 89d68ee568eb - stable/15 - subr_module: account for MODINFOMD_EFI_ARCH 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 89d68ee568ebd900fa6561a9ceaf1047f8950e57 Auto-Submitted: auto-generated Date: Sat, 18 Apr 2026 12:12:19 +0000 Message-Id: <69e37523.3d95c.225c02d3@gitrepo.freebsd.org> The branch stable/15 has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=89d68ee568ebd900fa6561a9ceaf1047f8950e57 commit 89d68ee568ebd900fa6561a9ceaf1047f8950e57 Author: Ahmad Khalifa AuthorDate: 2026-04-03 07:13:29 +0000 Commit: Ahmad Khalifa CommitDate: 2026-04-18 11:27:26 +0000 subr_module: account for MODINFOMD_EFI_ARCH Fixes: b538d4911004ca541507166b8ec9689d2e87d1aa MFC after: 2 weeks (cherry picked from commit b3d6829f4998ad8ac8c65d39ac9513ba85a9974b) --- sys/kern/subr_module.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c index f8b6770e3189..ab1eefab30b1 100644 --- a/sys/kern/subr_module.c +++ b/sys/kern/subr_module.c @@ -443,6 +443,11 @@ preload_modinfo_type(struct sbuf *sbp, int type) case MODINFOMD_BOOT_HARTID: sbuf_cat(sbp, "MODINFOMD_BOOT_HARTID"); break; +#endif +#ifdef MODINFOMD_EFI_ARCH + case MODINFOMD_EFI_ARCH: + sbuf_cat(sbp, "MODINFOMD_EFI_ARCH"); + break; #endif default: sbuf_cat(sbp, "unrecognized metadata type"); @@ -465,6 +470,9 @@ preload_modinfo_value(struct sbuf *sbp, uint32_t *bptr, int type, int len) case MODINFO_NAME: case MODINFO_TYPE: case MODINFO_ARGS: +#ifdef MODINFOMD_EFI_ARCH + case MODINFO_METADATA | MODINFOMD_EFI_ARCH: +#endif sbuf_printf(sbp, "%s", (char *)bptr); break; case MODINFO_SIZE: From nobody Sat Apr 18 12:12:20 2026 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 4fyVxK0yXFz6Zcw1 for ; Sat, 18 Apr 2026 12:12: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fyVxJ4bFSz4M40 for ; Sat, 18 Apr 2026 12:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776514340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k0ZTKrtb0Fdss/weLS64pKUOrNsEPM7KZbGhVTkHGaU=; b=AzG0zrQbcfV69nZmTbypfhu5EAFu9fH8E7ozE2wGSNDv5AnyaVLhncHGF0370tPQ0gWf0W kVwTml9ahzN/e0v9t900PZACJS5rNBTPiBUEl/5fvcX1eCWO5kRaQeE7RAMBXZTU5gKhzD Ckh06Whj0y8V0tEZICwJ8J8pcKjd4ikTyAY8GdOqYc6CXB0PxhZTK3kWYzuGyrCPD+bCEl MBr9wLfKKDsLU/9h302UuDAmsbajj3VcY07IAbDcj22SMbjHwjpTjm6ExCwB2/qPs3YtIG cQP7Vx4SM++omGGcjWpC+BacNTO8+mmlaBmTb5PQftEMKGvjBMjquiI1/NsQbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776514340; a=rsa-sha256; cv=none; b=PKKdK5q/KSBq88HfYpxQK2m27pRTTxst7Pc4bbJgKUAgdeQOWMHLnP8BwtXHz2ldyCMzmO VFU9ziR6bNeCLd9VfFpQzrtgUTV48XOzxuX9APvz5Ae2R6W6jwTU0z5pyAaORjyl9+gM83 b6BN3BxHmR5RNYP8tnqIa+AvtgvGVFKviCCFCQDo4uKnXf4Vz/G07oQ/NX8YwrqPVGfYtg djhdJNO3JGzkzLiwiW1W476q1ZuGbLfCXdnz27NL7aplnPJbpau4L7vU6sPUDy4I2EYZPU GR3+Qft1YOACjHgzJASH3Q4vKhpGJmHqx0/FA/jbJjnfMvZycjIaMhlq4Y8BsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776514340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k0ZTKrtb0Fdss/weLS64pKUOrNsEPM7KZbGhVTkHGaU=; b=xZoWXsufCnBd1mqr0OsgK8y2HKxD5YhJl6kaUjQxSrmkzHYr7KdAq/G+Ol5FN3pPrh6icQ O74tenfYHL7dtpHgS0gVcMnDkxZdRIuHRDotOeZa/FzCi+Q0eoBCJZYUjAuwnKnp1AaPoO /8nUkuqRw3ZSLc9cP+VL2MYuhnQWyCp7CnjbrNDDUu/uOjknYaxtUpfUvmOoQFhJzyeMAf WPzgpi4zKmlVxxFAVomCLKM48+kS3W8/wdSsWxxHdToXm8d0g/rrW661YZWM2+UeVLtm9T Xhp+3lYn2/XoDgmE5bN0z7ZeW0tvHP6R7KRlg9CxZ/Fghlu2MdUBpIAZ6o+c+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyVxJ3fp7zgDs for ; Sat, 18 Apr 2026 12:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d960 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 18 Apr 2026 12:12:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Quent=?utf-8?Q?in Th=C3=A9?=bault From: Ahmad Khalifa Subject: git: 0bd9b26d19e2 - stable/15 - splash: add shutdown splash 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0bd9b26d19e256c1ef0de57b0fe7d1627e07f6dc Auto-Submitted: auto-generated Date: Sat, 18 Apr 2026 12:12:20 +0000 Message-Id: <69e37524.3d960.6b1e840e@gitrepo.freebsd.org> The branch stable/15 has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=0bd9b26d19e256c1ef0de57b0fe7d1627e07f6dc commit 0bd9b26d19e256c1ef0de57b0fe7d1627e07f6dc Author: Quentin Thébault AuthorDate: 2026-04-02 16:38:47 +0000 Commit: Ahmad Khalifa CommitDate: 2026-04-18 11:27:26 +0000 splash: add shutdown splash This commit adds a shutdown splash to the existing kernel startup splash(4) screen feature. It can be customized by providing a PNG image to the shutdown_splash directive loader.conf(5). Sponsored by: Defenso MFC after: 2 weeks Reviewed by: vexeduxr, ziaee, manu Differential Revision: https://reviews.freebsd.org/D55140 (cherry picked from commit 4b862c713ac5556ab4bd1828b47c5eb9cb28e067) --- share/man/man4/splash.4 | 14 +++++++++++--- stand/common/bootstrap.h | 4 +++- stand/common/gfx_fb.c | 20 ++++++++++++++++---- stand/defaults/loader.conf | 4 +++- stand/efi/loader/bootinfo.c | 7 ++++++- sys/dev/vt/vt_core.c | 20 +++++++++++++++++++- sys/kern/subr_module.c | 5 +++++ sys/sys/linker.h | 1 + 8 files changed, 64 insertions(+), 11 deletions(-) diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4 index 0e52d9eb83c4..0985385f5e08 100644 --- a/share/man/man4/splash.4 +++ b/share/man/man4/splash.4 @@ -24,14 +24,14 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 09, 2024 +.Dd April 03, 2026 .Dt SPLASH 4 .Os .Sh NAME .Nm splash .Nd splash screen / screen saver interface .Sh SYNOPSIS -.Cd "device splash" +.Cd device splash .Sh DESCRIPTION The .Nm @@ -254,6 +254,12 @@ and include the following lines: splash="/boot/images/freebsd-logo-rev.png" boot_mute="YES" .Ed +.Pp +A splash screen to be displayed at shutdown time can be specified with: +.Bd -literal -offset indent +shutdown_splash="/boot/images/freebsd-logo-rev.png" +boot_mute="YES" +.Ed .\".Sh DIAGNOSTICS .Sh SEE ALSO .Xr vidcontrol 1 , @@ -308,7 +314,9 @@ modules were written by png support for .Xr vt 4 was written by -.An Emmanuel Vadot Aq Mt manu@FreeBSD.org . +.An Emmanuel Vadot Aq Mt manu@FreeBSD.org +and extended for shutdown by +.An Quentin Thébault Aq Mt quentin.thebault@defenso.fr . .Sh CAVEATS The screen saver works with .Xr syscons 4 diff --git a/stand/common/bootstrap.h b/stand/common/bootstrap.h index 17887919089c..7be1d6897a9a 100644 --- a/stand/common/bootstrap.h +++ b/stand/common/bootstrap.h @@ -282,7 +282,9 @@ int tslog_init(void); int tslog_publish(void); vm_offset_t build_font_module(vm_offset_t); -vm_offset_t build_splash_module(vm_offset_t); +#define SPLASH_STARTUP 1 +#define SPLASH_SHUTDOWN 2 +vm_offset_t build_splash_module(vm_offset_t, int); /* MI module loaders */ #ifdef __elfN diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index 3ac3694ce5fe..93c7cb683270 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -3098,7 +3098,7 @@ build_font_module(vm_offset_t addr) } vm_offset_t -build_splash_module(vm_offset_t addr) +build_splash_module(vm_offset_t addr, int type) { struct preloaded_file *fp; struct splash_info si; @@ -3118,7 +3118,11 @@ build_splash_module(vm_offset_t addr) if (fp == NULL) panic("can't find kernel file"); - splash = getenv("splash"); + if (type == SPLASH_STARTUP) + splash = getenv("splash"); + if (type == SPLASH_SHUTDOWN) + splash = getenv("shutdown_splash"); + if (splash == NULL) return (addr); @@ -3137,7 +3141,15 @@ build_splash_module(vm_offset_t addr) /* Copy the bitmap. */ addr += archsw.arch_copyin(png.image, addr, png.png_datalen); - printf("Loading splash ok\n"); - file_addmetadata(fp, MODINFOMD_SPLASH, sizeof(splashp), &splashp); + if (type == SPLASH_STARTUP) { + printf("Loading splash ok\n"); + file_addmetadata(fp, MODINFOMD_SPLASH, + sizeof(splashp), &splashp); + } + if (type == SPLASH_SHUTDOWN) { + printf("Loading shutdown splash ok\n"); + file_addmetadata(fp, MODINFOMD_SHTDWNSPLASH, + sizeof(splashp), &splashp); + } return (addr); } diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf index a10c65f28eaf..bbabc5fb66a3 100644 --- a/stand/defaults/loader.conf +++ b/stand/defaults/loader.conf @@ -27,7 +27,9 @@ vesa_load="NO" # Set this to YES to load the vesa module bitmap_load="NO" # Set this to YES if you want splash screen! bitmap_name="splash.bmp" # Set this to the name of the file bitmap_type="splash_image_data" # and place it on the module_path -splash="/boot/images/freebsd-logo-rev.png" # Set boot_mute=YES to load it +# Set boot_mute=YES to load these +splash="/boot/images/freebsd-logo-rev.png" +shutdown_splash="/boot/images/freebsd-logo-rev.png" ### Screen saver modules ################################### # This is best done in rc.conf diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index b8f1a2ffd56c..78f94e0aa9b2 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -397,7 +397,12 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) /* Pad to a page boundary. */ addr = md_align(addr); - addr = build_splash_module(addr); + addr = build_splash_module(addr, SPLASH_STARTUP); + + /* Pad to a page boundary. */ + addr = md_align(addr); + + addr = build_splash_module(addr, SPLASH_SHUTDOWN); /* Pad to a page boundary. */ addr = md_align(addr); diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index ef95df208863..ccba43a821d1 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -1682,8 +1682,13 @@ vtterm_splash(struct vt_device *vd) uintptr_t image; vt_axis_t top, left; - si = MD_FETCH(preload_kmdp, MODINFOMD_SPLASH, struct splash_info *); if (!(vd->vd_flags & VDF_TEXTMODE) && (boothowto & RB_MUTE)) { + if (rebooting == 1) { + si = MD_FETCH(preload_kmdp, MODINFOMD_SHTDWNSPLASH, struct splash_info *); + vd->vd_driver->vd_blank(vd, TC_BLACK); + } else { + si = MD_FETCH(preload_kmdp, MODINFOMD_SPLASH, struct splash_info *); + } if (si == NULL) { top = (vd->vd_height - vt_logo_height) / 2; left = (vd->vd_width - vt_logo_width) / 2; @@ -1830,6 +1835,15 @@ vt_init_font_static(void) vt_font_assigned = font; } +#ifdef DEV_SPLASH +static int +vt_shutdown_splash(struct vt_window *vw) +{ + vtterm_splash(vw->vw_device); + return (0); +} +#endif + static void vtterm_cnprobe(struct terminal *tm, struct consdev *cp) { @@ -3175,6 +3189,10 @@ vt_upgrade(struct vt_device *vd) /* For existing console window. */ EVENTHANDLER_REGISTER(shutdown_pre_sync, vt_window_switch, vw, SHUTDOWN_PRI_DEFAULT); +#ifdef DEV_SPLASH + EVENTHANDLER_REGISTER(shutdown_pre_sync, + vt_shutdown_splash, vw, SHUTDOWN_PRI_DEFAULT); +#endif } } } diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c index ab1eefab30b1..92f22206f8cf 100644 --- a/sys/kern/subr_module.c +++ b/sys/kern/subr_module.c @@ -307,6 +307,7 @@ preload_bootstrap_relocate(vm_offset_t offset) case MODINFO_ADDR: case MODINFO_METADATA|MODINFOMD_FONT: case MODINFO_METADATA|MODINFOMD_SPLASH: + case MODINFO_METADATA|MODINFOMD_SHTDWNSPLASH: case MODINFO_METADATA|MODINFOMD_SSYM: case MODINFO_METADATA|MODINFOMD_ESYM: ptr = (vm_offset_t *)(curp + (sizeof(uint32_t) * 2)); @@ -439,6 +440,9 @@ preload_modinfo_type(struct sbuf *sbp, int type) case MODINFOMD_SPLASH: sbuf_cat(sbp, "MODINFOMD_SPLASH"); break; + case MODINFOMD_SHTDWNSPLASH: + sbuf_cat(sbp, "MODINFOMD_SHTDWNSPLASH"); + break; #ifdef MODINFOMD_BOOT_HARTID case MODINFOMD_BOOT_HARTID: sbuf_cat(sbp, "MODINFOMD_BOOT_HARTID"); @@ -503,6 +507,7 @@ preload_modinfo_value(struct sbuf *sbp, uint32_t *bptr, int type, int len) #endif case MODINFO_METADATA | MODINFOMD_FONT: case MODINFO_METADATA | MODINFOMD_SPLASH: + case MODINFO_METADATA | MODINFOMD_SHTDWNSPLASH: sbuf_print_vmoffset(sbp, *(vm_offset_t *)bptr); break; case MODINFO_METADATA | MODINFOMD_HOWTO: diff --git a/sys/sys/linker.h b/sys/sys/linker.h index 85c50be6c969..f8a5dda06512 100644 --- a/sys/sys/linker.h +++ b/sys/sys/linker.h @@ -259,6 +259,7 @@ void linker_kldload_unbusy(int flags); #define MODINFOMD_KEYBUF 0x000d /* Crypto key intake buffer */ #define MODINFOMD_FONT 0x000e /* Console font */ #define MODINFOMD_SPLASH 0x000f /* Console splash screen */ +#define MODINFOMD_SHTDWNSPLASH 0x0010 /* Console shutdown splash screen */ #define MODINFOMD_NOCOPY 0x8000 /* don't copy this metadata to the kernel */ #define MODINFOMD_DEPLIST (0x4001 | MODINFOMD_NOCOPY) /* depends on */ From nobody Sun Apr 19 10:40:38 2026 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 4fz4s74Tpfz6bNC5 for ; Sun, 19 Apr 2026 10:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fz4s72dtmz49bQ for ; Sun, 19 Apr 2026 10:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776595243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LbIhlUqb/J60JZARgL84J+MmPnu6WBar/6GgYKGHVtQ=; b=KShYLVv96swmxujqtJCVOAVoxgU6+mtD6zyohwaRIVwgDNJyQVfjpButtYGvcJKlz/BlfI KvNXN/IxFirxD5RKvt1e3RCGRlRLHemrfDqaxAYbIby5nhFCAsv/uaWotZuIXBjudtvLHa u28xoCbgpsjFS6IQwd+PXRMmrRuVtT/U7H2zl2grsNfkw1DyoAkprVriEjPjeLuPkerTdX GGfpzRhMfKH+c4adLVJbRLmj9InAc3/Hiyo1/dVsIumY87GcqiSKevQ3MqqPfPKhk8HgFY 4RMwhLEFjmIe0dvheuHbgBcLlW6Z+AQQkcK/i4ePwePygNfvG9+1h2Qg/P0H5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776595243; a=rsa-sha256; cv=none; b=aY4zZfJM7IICriD3GDsYdORZCPE3XTocnWwDJ7K7ZcFZL6TBehrsl14gQMFKT6NvkWIVFI +Y6DO6Gz+iVE4y6J/wy5th8hE5Lue7hTu6liIpRHyXSy45WCxlggHMvkBS1/qhPCmRlVn+ l9EnpoQb0r/KR2j375G3SbNUTzAIn7f+HV7pmAl5AUpJeZ5IB8hnfag+rbPPAgDSJh5TFT Uy7PppV330t8EGBsEebxMaNw8Ebt0PJzEqPnq0kxm1NcVl+t4lB4m9VA0k+5T6Pkf4XVrz uadfVAIcobfplQ97Z0CevnxDlA3AwAcW2esicd1rXMhEwRqvsz8qklmsBC51Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776595243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LbIhlUqb/J60JZARgL84J+MmPnu6WBar/6GgYKGHVtQ=; b=S8V04kyV2TzogQ7vpjDML0K3lH605vbvCIrlfXC8TNG73NnrBtF6zBfCiQgoKNGm/01vZj AfOnRsAJOAeD0tcaIm89SVvMvZe8dnw8X0HZbH/NmDlYNhK/2kSPGl2EWJWEp5bqOpj5rt w0ip9BztXNF5fdF8gqnoV5C+boiiI1VlOrX0uGJaFa42GDJxJvXQvF1GffyGR6mIUOs97P xAxu9QgxTAnfbHpQN/tzL0ATAu0W1C6jFsvZhpEynv6AzuP61qUta+rcD6rwG7TwKNgOcP yualfETWVDI/JeBpGyTVMzFdONbJpAyitRyEgEMylUSY/7i70kPdKYejb5EVzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fz4s726B5z1LbZ for ; Sun, 19 Apr 2026 10:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32d41 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 19 Apr 2026 10:40:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Yuichiro NAITO From: Kevin Bowling Subject: git: fa3958c92e94 - stable/15 - ixgbe: Fix MRQC register value. 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fa3958c92e948ce8c59801b5f6b8682585f20bb1 Auto-Submitted: auto-generated Date: Sun, 19 Apr 2026 10:40:38 +0000 Message-Id: <69e4b126.32d41.6159f948@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=fa3958c92e948ce8c59801b5f6b8682585f20bb1 commit fa3958c92e948ce8c59801b5f6b8682585f20bb1 Author: Yuichiro NAITO AuthorDate: 2026-04-07 15:25:09 +0000 Commit: Kevin Bowling CommitDate: 2026-04-19 10:40:10 +0000 ixgbe: Fix MRQC register value. Focus on the MRQE field of the MRQC register, which is 4 bits wide, and we use these 3 types of values. - IXGBE_MRQC_RSSEN 0x1 (non VF mode) - IXGBE_MRQC_VMDQRSS32EN 0xA (less than 33 VFs) - IXGBE_MRQC_VMDQRSS64EN 0xB (less than 65 VFs) If we always take a bitwise OR with IXGBE_MRQC_RSSEN, IXGBE_MRQC_VMDQRSS32EN will never be chosen. Select these 3 types of values for the proper case. Signed-off-by: Yuichiro NAITO Pull Request: https://github.com/freebsd/freebsd-src/pull/2132 (cherry picked from commit 938c076b9b0bc458a3877b52535527d37199fc09) --- sys/dev/ixgbe/if_ix.c | 4 ++-- sys/dev/ixgbe/if_sriov.c | 2 +- sys/dev/ixgbe/ixgbe_sriov.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index f94b43afbfd5..adc3458cedd6 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -709,7 +709,7 @@ ixgbe_initialize_rss_mapping(struct ixgbe_softc *sc) RSS_HASHTYPE_RSS_TCP_IPV6_EX; } - mrqc = IXGBE_MRQC_RSSEN; + mrqc = ixgbe_get_mrqc(sc->iov_mode); if (rss_hash_config & RSS_HASHTYPE_RSS_IPV4) mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4; if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV4) @@ -728,7 +728,7 @@ ixgbe_initialize_rss_mapping(struct ixgbe_softc *sc) mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_UDP; if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6_EX) mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP; - mrqc |= ixgbe_get_mrqc(sc->iov_mode); + IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc); } /* ixgbe_initialize_rss_mapping */ diff --git a/sys/dev/ixgbe/if_sriov.c b/sys/dev/ixgbe/if_sriov.c index 1998cdb016f7..47f1a1279e2f 100644 --- a/sys/dev/ixgbe/if_sriov.c +++ b/sys/dev/ixgbe/if_sriov.c @@ -170,7 +170,7 @@ ixgbe_get_mrqc(int iov_mode) mrqc = IXGBE_MRQC_VMDQRSS32EN; break; case IXGBE_NO_VM: - mrqc = 0; + mrqc = IXGBE_MRQC_RSSEN; break; default: panic("Unexpected SR-IOV mode %d", iov_mode); diff --git a/sys/dev/ixgbe/ixgbe_sriov.h b/sys/dev/ixgbe/ixgbe_sriov.h index e5a78a7220cc..3c456ee819f2 100644 --- a/sys/dev/ixgbe/ixgbe_sriov.h +++ b/sys/dev/ixgbe/ixgbe_sriov.h @@ -94,7 +94,7 @@ u32 ixgbe_get_mrqc(int); #define ixgbe_align_all_queue_indices(_a) #define ixgbe_vf_que_index(_a, _b, _c) (_c) #define ixgbe_get_mtqc(_a) IXGBE_MTQC_64Q_1PB -#define ixgbe_get_mrqc(_a) 0 +#define ixgbe_get_mrqc(_a) IXGBE_MRQC_RSSEN #endif /* PCI_IOV */ From nobody Sun Apr 19 10:41:14 2026 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 4fz4sk3m4Hz6bNCH for ; Sun, 19 Apr 2026 10:41: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fz4sk2ntHz49V4 for ; Sun, 19 Apr 2026 10:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776595274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V0N9OcL5MQHdPzVINUjS6GqBwCI+DZ8S1pMSbwgCIjs=; b=ayXzGdo1qkK3vYp0BN2QkelZ8PFa24z7NWqfbt9yo4xeCJ8BUWULuiCUCXlaLtFavF86z5 KskN2JGCwLUsK4G4wsKwpRMX9BW2xyduWk5A6PaVDugdEpvACqGgeDc7ibuHyK9Sx2kn2Z GJ8cAM0rKr/y171J5M2jnpyHJeys58R7v9s71oEX85Gt53OHyhlg/R73j1fLnMBx4MUD+7 8/GHHutkN3chIx0v+1P99IUBWYTPJfkUlEDQYdYyN7tFKucBRPirmjsQrWdIW8X9ZTy5D0 3pws8fM4KGZgmafH0WgevGS+VfotAEm3NBThjCiuaUE9C6OESzeNhOLdbkvHyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776595274; a=rsa-sha256; cv=none; b=P3ITSjTINiBCNeIx7VqUr6DvnYGbCIIKADAEZuD3S9Yx8DppH96HiM20pfNXaefSpnH51N YIQh01lQ8PWGESAQ9xJKl8rUciLpGSysfhGbnE/hDvOIY+1GL27bIacXHgjGy31HYy781P Hd7bBeCzAZN3SWqyNo+3FNEZZwi6Z+W1UCZ52c5PI3JWi9MTnQN9XT6sL92ombczvznm3R aFTkQZn1GTbr4L9BPIZIJfi8doe8fo2wX6zh2v7b+ymGjFEDFIwIJSCIGvOAqth8MOUk5E Xyxj6D3PF8lB/UIr5hKm3p39pGNV14BBGfpXvcWagwcN5vk1YxqPznZSC5kUww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776595274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V0N9OcL5MQHdPzVINUjS6GqBwCI+DZ8S1pMSbwgCIjs=; b=ONOWrfC/bchNgl5d0uC0JuMZzfc6Q101m73Tt8XxdjsAq8X9JmkK+t/b6xhPIzz/omG1Lx d0QoSLA6ZZAy4UJNI+ViCMvl2Iedqtdja6UdfPlc5U0x0WJ0Dz6GqKbkChDkHpWgbwGiXI W0kjZ0xZABk8TG9guowcP1/zX2XBTYUgiYEqzQVHIz9N4sbHFU5Ja/67Apo8IiRvL+OC8j fqTjfaxhVVioE2WWMWft3+lzJhSBoT2Xt39xe4yfbhcntke9Q+nHJ+IiFrwH/dWG5QUW91 PYNWy4HhYl9E7HfbV/RXnem8lAEtEAlphpIhKkeOfTRGrw8C8xTTol2To6d3bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fz4sk12Svz1Lby for ; Sun, 19 Apr 2026 10:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3324c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 19 Apr 2026 10:41:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Yuichiro NAITO From: Kevin Bowling Subject: git: d1160074500d - stable/14 - ixgbe: Fix MRQC register value. 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d1160074500d66d402951e93c35bab7dc4fc4b04 Auto-Submitted: auto-generated Date: Sun, 19 Apr 2026 10:41:14 +0000 Message-Id: <69e4b14a.3324c.d117768@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d1160074500d66d402951e93c35bab7dc4fc4b04 commit d1160074500d66d402951e93c35bab7dc4fc4b04 Author: Yuichiro NAITO AuthorDate: 2026-04-07 15:25:09 +0000 Commit: Kevin Bowling CommitDate: 2026-04-19 10:41:02 +0000 ixgbe: Fix MRQC register value. Focus on the MRQE field of the MRQC register, which is 4 bits wide, and we use these 3 types of values. - IXGBE_MRQC_RSSEN 0x1 (non VF mode) - IXGBE_MRQC_VMDQRSS32EN 0xA (less than 33 VFs) - IXGBE_MRQC_VMDQRSS64EN 0xB (less than 65 VFs) If we always take a bitwise OR with IXGBE_MRQC_RSSEN, IXGBE_MRQC_VMDQRSS32EN will never be chosen. Select these 3 types of values for the proper case. Signed-off-by: Yuichiro NAITO Pull Request: https://github.com/freebsd/freebsd-src/pull/2132 (cherry picked from commit 938c076b9b0bc458a3877b52535527d37199fc09) --- sys/dev/ixgbe/if_ix.c | 4 ++-- sys/dev/ixgbe/if_sriov.c | 2 +- sys/dev/ixgbe/ixgbe_sriov.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 7f234ce45dbd..1f41eca6ffcd 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -709,7 +709,7 @@ ixgbe_initialize_rss_mapping(struct ixgbe_softc *sc) RSS_HASHTYPE_RSS_TCP_IPV6_EX; } - mrqc = IXGBE_MRQC_RSSEN; + mrqc = ixgbe_get_mrqc(sc->iov_mode); if (rss_hash_config & RSS_HASHTYPE_RSS_IPV4) mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4; if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV4) @@ -728,7 +728,7 @@ ixgbe_initialize_rss_mapping(struct ixgbe_softc *sc) mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_UDP; if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6_EX) mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP; - mrqc |= ixgbe_get_mrqc(sc->iov_mode); + IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc); } /* ixgbe_initialize_rss_mapping */ diff --git a/sys/dev/ixgbe/if_sriov.c b/sys/dev/ixgbe/if_sriov.c index 1998cdb016f7..47f1a1279e2f 100644 --- a/sys/dev/ixgbe/if_sriov.c +++ b/sys/dev/ixgbe/if_sriov.c @@ -170,7 +170,7 @@ ixgbe_get_mrqc(int iov_mode) mrqc = IXGBE_MRQC_VMDQRSS32EN; break; case IXGBE_NO_VM: - mrqc = 0; + mrqc = IXGBE_MRQC_RSSEN; break; default: panic("Unexpected SR-IOV mode %d", iov_mode); diff --git a/sys/dev/ixgbe/ixgbe_sriov.h b/sys/dev/ixgbe/ixgbe_sriov.h index e5a78a7220cc..3c456ee819f2 100644 --- a/sys/dev/ixgbe/ixgbe_sriov.h +++ b/sys/dev/ixgbe/ixgbe_sriov.h @@ -94,7 +94,7 @@ u32 ixgbe_get_mrqc(int); #define ixgbe_align_all_queue_indices(_a) #define ixgbe_vf_que_index(_a, _b, _c) (_c) #define ixgbe_get_mtqc(_a) IXGBE_MTQC_64Q_1PB -#define ixgbe_get_mrqc(_a) 0 +#define ixgbe_get_mrqc(_a) IXGBE_MRQC_RSSEN #endif /* PCI_IOV */ From nobody Sun Apr 19 10:42:29 2026 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 4fz4vG5qGfz6bN5l for ; Sun, 19 Apr 2026 10:42: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fz4vG17dXz3C7G for ; Sun, 19 Apr 2026 10:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776595354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fHjz2Ear2tFAA+clX0rA6fvQDkCU+KneWP4NUq7Ofl4=; b=sRg7WNdLeO8D7DMbgrgPvOhdlpToKU2nIrX4FNcqMKRYBytOoWbOfLam2KTb8rJsCwuiPs 0+ScjE/sKQs8oNNjf8/zfwlRQZ7n4VXqp1s3sadrIn3T6Yc6PnQ42VpUVthvgHzAi2xEC/ gGcibWcxLYmx92li8eIoBiZmCDbj+YnhCbyLZm850ge6pcGFTbajvCOLL7oYyKwo5uiSzH y8QuY4AhNVnnLoOwsc4qJ086z0wV9wk2tORvKMDYRov42pVPLhuZZ6UpwnDxIRdx3WZ8Ox xzqZQQfGEUooMg9SuN7Ci0Et4s3xa7K+5YSXQDxEX0FhjlEZ4wdkWfzKSmo19A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776595354; a=rsa-sha256; cv=none; b=mmGhkLlIxECQxj0+wZZWo1WNuFqA8pwiW4ewCqTkIfZLydIkEYLlkjfHUSCA/joF876wu5 8YJMZzgPRcHEcIGMJR6zEgbxMMwVxBHsEAfCj+rWCZW8csmvxHlqJMr0/ny0xv1D0kJiYY YTCKB65e19QyDBWcggDHaiZJ/bHvwf+ZO9zcI6Du4h5yTfaR6CgOA8VqbptJ76V3GNu4vx UNypFiYlf8i1ZNxuDX8VzImka0m1F/rZTCX8wvIzSKq47O+M81VFmU911HpYUjN7xuP1V4 S9/iwTHBp9DiKFoDg3vp2ZsoYrgdP2yR3c7H0nXUA4ialuIREIjoqPej9kZR7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776595354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fHjz2Ear2tFAA+clX0rA6fvQDkCU+KneWP4NUq7Ofl4=; b=G4r5EqV6IlGvmJWR4PNDd//Q0e7T1Zfng8pd80hSwS1Ojlzffnas8p0UH5aGlDRzo/WgG7 OOH47xTSqbfE11h3q/0gYZCBO3WnO/I4rn9NUSRHlTTddECG1TNBuzYuonI+PQPG9+4eq0 POtMY+v0N59aQMSSWdEJViO/0MEGytk6HFTmViGv92dYUpR1FoA+SwzzPb+nZSco51/Bqk /+1+HFOlYTlxqnM0DQQ8LPzP0su0o2x3DJxFI+tb3gj7AafiTNM4TRG/xCeMxypbPWWqtV dcEQk4sfRdsPPdc7A/A5abWzhpUu9U8vfbNAj/wO0f8npsWR5d+HU1FEGF2Ziw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fz4vG0lB7z1Lfh for ; Sun, 19 Apr 2026 10:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32df3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 19 Apr 2026 10:42:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Yuichiro NAITO From: Kevin Bowling Subject: git: ead225cd3346 - stable/13 - ixgbe: Fix MRQC register value. 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ead225cd33461e5c0f126de43b2c7214ba132c66 Auto-Submitted: auto-generated Date: Sun, 19 Apr 2026 10:42:29 +0000 Message-Id: <69e4b195.32df3.198ebbde@gitrepo.freebsd.org> The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=ead225cd33461e5c0f126de43b2c7214ba132c66 commit ead225cd33461e5c0f126de43b2c7214ba132c66 Author: Yuichiro NAITO AuthorDate: 2026-04-07 15:25:09 +0000 Commit: Kevin Bowling CommitDate: 2026-04-19 10:42:17 +0000 ixgbe: Fix MRQC register value. Focus on the MRQE field of the MRQC register, which is 4 bits wide, and we use these 3 types of values. - IXGBE_MRQC_RSSEN 0x1 (non VF mode) - IXGBE_MRQC_VMDQRSS32EN 0xA (less than 33 VFs) - IXGBE_MRQC_VMDQRSS64EN 0xB (less than 65 VFs) If we always take a bitwise OR with IXGBE_MRQC_RSSEN, IXGBE_MRQC_VMDQRSS32EN will never be chosen. Select these 3 types of values for the proper case. Signed-off-by: Yuichiro NAITO Pull Request: https://github.com/freebsd/freebsd-src/pull/2132 (cherry picked from commit 938c076b9b0bc458a3877b52535527d37199fc09) --- sys/dev/ixgbe/if_ix.c | 4 ++-- sys/dev/ixgbe/if_sriov.c | 2 +- sys/dev/ixgbe/ixgbe_sriov.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index fb350302d0c3..55cfc1926b40 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -682,7 +682,7 @@ ixgbe_initialize_rss_mapping(struct ixgbe_softc *sc) RSS_HASHTYPE_RSS_TCP_IPV6_EX; } - mrqc = IXGBE_MRQC_RSSEN; + mrqc = ixgbe_get_mrqc(sc->iov_mode); if (rss_hash_config & RSS_HASHTYPE_RSS_IPV4) mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4; if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV4) @@ -701,7 +701,7 @@ ixgbe_initialize_rss_mapping(struct ixgbe_softc *sc) mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_UDP; if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6_EX) mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP; - mrqc |= ixgbe_get_mrqc(sc->iov_mode); + IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc); } /* ixgbe_initialize_rss_mapping */ diff --git a/sys/dev/ixgbe/if_sriov.c b/sys/dev/ixgbe/if_sriov.c index 9a907a82b9a1..f0dd29348e54 100644 --- a/sys/dev/ixgbe/if_sriov.c +++ b/sys/dev/ixgbe/if_sriov.c @@ -170,7 +170,7 @@ ixgbe_get_mrqc(int iov_mode) mrqc = IXGBE_MRQC_VMDQRSS32EN; break; case IXGBE_NO_VM: - mrqc = 0; + mrqc = IXGBE_MRQC_RSSEN; break; default: panic("Unexpected SR-IOV mode %d", iov_mode); diff --git a/sys/dev/ixgbe/ixgbe_sriov.h b/sys/dev/ixgbe/ixgbe_sriov.h index e5a78a7220cc..3c456ee819f2 100644 --- a/sys/dev/ixgbe/ixgbe_sriov.h +++ b/sys/dev/ixgbe/ixgbe_sriov.h @@ -94,7 +94,7 @@ u32 ixgbe_get_mrqc(int); #define ixgbe_align_all_queue_indices(_a) #define ixgbe_vf_que_index(_a, _b, _c) (_c) #define ixgbe_get_mtqc(_a) IXGBE_MTQC_64Q_1PB -#define ixgbe_get_mrqc(_a) 0 +#define ixgbe_get_mrqc(_a) IXGBE_MRQC_RSSEN #endif /* PCI_IOV */ From nobody Sun Apr 19 13:36:47 2026 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 4fz8mK4NdWz6bdPV; Sun, 19 Apr 2026 13:36:49 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fz8mK2mZFz3pZf; Sun, 19 Apr 2026 13:36:49 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776605809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eErEbvuJOKYY4xTTT0DOjreAjs6GOP+Em+gsso43iBE=; b=CZTFXI13R6AlL3sA1v+sD98F/bWanpIBX8FSFmOFO/vG9TkU8zlwzu0ef6zY/06u7kx982 +X5sVUmjkJemQBOVAXTA3R7tdKHpeM1In9q66rS3eJTHzVyYMPf+Nc7f64Fqr8P8EE74Hw JNtR1F/+gPOrIfcyiRuiz59ztGAR77xlnzC44EBehcU15IHblo64o0IqhynRZEjEZa3eQj CxqEKi+GuqBPxeKhZwvOuu2931uMm7c26zF9Abuz+xOG9TPG4bDrAjC0tkNp8jaG1qQG87 iueEDQg+PGstg6EmCP6TxGc6kEiBq4BMgz8aIYK3qZ3A5dJGiyL5xnbHCztdCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776605809; a=rsa-sha256; cv=none; b=W0zB13G7Muv6oHOi9EoWrNSTgE8taF6qmXx4I8BNVl10gtIByvK8+/1DzDq6WipyU5d/W1 NDDKo060Yau66QDqYddvIQKZ9anqmu4+xZ0yDlRXQQFBGVvD0NCRGax/1Jj/rdEawNlFw6 d5ZOCONQ3/C+dqMVLJorlSfmK1sm9ZyQyN6GmZhM76CqHPbSBsyjNqyd3MQbkixh+mLZYi V6Yg+VY+nGLLep/6r3OK0POvHG6/8+lMVDnn2QGYURAUK0/EY3lyNSikQafD7aaXBBLOgp 2fWvAK2ePoG4qzau2GYXxdKKif1l4ZNhf1zOAbfcvBZd9AsasPvVxFLm3ALa5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776605809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eErEbvuJOKYY4xTTT0DOjreAjs6GOP+Em+gsso43iBE=; b=hXlp0UZ7luNMqv2s+MSguw6w9ObMDFnNJlueqq59muVZr+soInKZ1L31SErlZ23KxIlJM8 PEq3SmDbEb+0GxoumgkFVBs9x80JGQpoQ+yEV/wc+dbzMXbaNVCcMBg9GqwVOx64P154Y1 JP5vQtwaQ14umwaEof/XMiY7+QDudFu6xE3L0bCu+yBIUnIpLrnZ1iKg5Y4rzPOspgJ+Hn G9gWkJSrAnBRUeSk0/vVYEyS7+wC5YGHBGI2BbR0A5i+RSTnscLIt4F4XMofFEZm7JGdYK P5b+2eyL5drY+h4bhmAP1DAdFQObmC8H59RKSbqn8DCgRMDYD6MyNZk7z/rMhw== Received: from ltc.des.dev (lfbn-nan-1-698-103.w86-236.abo.wanadoo.fr [86.236.35.103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fz8mK1NQfzxhZ; Sun, 19 Apr 2026 13:36:49 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 7F23A72BF7; Sun, 19 Apr 2026 15:36:47 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Enji Cooper Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org, Baptiste Daroussin Subject: Re: git: 8de7c76ee02f - stable/14 - ncurses: merge update to ncurses 6.6 In-Reply-To: <69dd9d36.3f99d.45192d16@gitrepo.freebsd.org> (Enji Cooper's message of "Tue, 14 Apr 2026 01:49:42 +0000") References: <69dd9d36.3f99d.45192d16@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sun, 19 Apr 2026 15:36:47 +0200 Message-ID: <86jyu3cbrk.fsf@ltc.des.dev> 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Enji Cooper writes: > commit 8de7c76ee02fcc7a405d47cc4b816c27de0dc2e4 > Author: Baptiste Daroussin > AuthorDate: 2026-01-14 13:48:32 +0000 > Commit: Enji Cooper > CommitDate: 2026-04-14 01:49:17 +0000 > > ncurses: merge update to ncurses 6.6 >=20=20=20=20=20 > 6.6 is ABI compatible with 6.5 (tested with abidiff) > Remove html documentation to ease updates >=20=20=20=20=20 > MFC After: 1 month >=20=20=20=20=20 > (cherry picked from commit 68ad2b0d7af2a3571c4abac9afa712f9b09b721c) You also need to merge 212272a43767c3d7be3ddb87605612f6164774c1. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Sun Apr 19 13:54:41 2026 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 4fz9933S9rz6bfQ0 for ; Sun, 19 Apr 2026 13:54: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fz99305Cxz3rJp for ; Sun, 19 Apr 2026 13:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776606887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kamICSplO0drPYixiBaoMqI9W6WM731YVi0uuf9RDKE=; b=OzuASYEmG/L+adbgbBPjy3+LI4gmJJxko4xkRLMxQN7Sq3guHnOvV/c21FGsy4O/Kwxo0B AL8gfaTG/gF77pLJkT5ls75mdZUoy9nCAAU45XP6wglB4jrDIoEZXkNy6vqLQusDLnDzUM //b8ef+Wan6mtqThckiZk6ePx570N02Kf77fA/Y+FuyRm9aYFDa8NB7diW6s/B2mchMw0y GZyyO066Ka8wJajG+ek6nABAT5Q7Zv5pceL7a/bVmpTO0Ob2CQN5UgflE3sJ96nEAMmmiC NwxA0RizRuGRdFTq9zTmQ3MRVd9RnbLuowdnhtXFF5PRi04s8P93wvpdiXAlJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776606887; a=rsa-sha256; cv=none; b=yHOiT67v2nPvOsTIftuQr8Q/I4emxZUKNB3boKy2P9natK0K7fHBlTaLLPpDJLTIk8bEZk /sM7zkmufqEcfnEk/cLUFGspIJS2d2iwWXKeoIA/jQLVj5rmsuL6h6Jf9EwfTJTR7LTEu7 X4m+z8ArGuxUnLC0N6VBXwzQlJKu1IzrSgAhiBKwCCRlUUwm6VnsaFXVlHa7PofVkQGCno TQg80x1fr84wb/gxJYqr8yj13NH8ccH/ABlU3LC2KaPvzFYx1UlQ8cejnoPz5ri5wUGx9O WviMVcqXTbB6PJDXW+NzN/GqNHAghkfc41Tdex1TAmXbzWkDRtG+SsfkguSTuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776606887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kamICSplO0drPYixiBaoMqI9W6WM731YVi0uuf9RDKE=; b=YvsTvt69OEOWSP6jqkd1U3u7cICLHi5N2W3SZ/cHv/OOBAoj6BBs8mwN2+xWG/mj9/YL5O yUK6Awq30hCopSRKicQg2D/8QsC3NkMB1o5+DNrP8Nt40MkYDSz/lxhMg4SbFKSYzgPgH0 XkQsiogfvSUCf0v/viKpZeSJCyJ50/FnqafS0wAb17/qgzXB5jOIkJhgLSZG+KLSzQiM28 o1r0ksAXNTqQnlUrhe4JJF674gfXnGLk5DXJTryUpsvhJ3V+dHlNYC3ZRjFAzBXxkrr9O1 637VF+Bk+R4KFdewtY/XivdMOd46HvV3H7Ja3UzaO8NwelQlAXSlphCvAGgFCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fz99265szz1RjG for ; Sun, 19 Apr 2026 13:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20337 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 19 Apr 2026 13:54:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Aymeric Wibo Subject: git: 237d5b05f5bb - stable/15 - acpi: Return "unknown D-state" in acpi_d_state_to_str() if unknown 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 237d5b05f5bb229db96fdafc59e7f504fc3d039a Auto-Submitted: auto-generated Date: Sun, 19 Apr 2026 13:54:41 +0000 Message-Id: <69e4dea1.20337.54481df9@gitrepo.freebsd.org> The branch stable/15 has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=237d5b05f5bb229db96fdafc59e7f504fc3d039a commit 237d5b05f5bb229db96fdafc59e7f504fc3d039a Author: Aymeric Wibo AuthorDate: 2026-04-16 07:12:33 +0000 Commit: Aymeric Wibo CommitDate: 2026-04-19 13:53:59 +0000 acpi: Return "unknown D-state" in acpi_d_state_to_str() if unknown Some ACPI debugging prints call acpi_d_state_to_str() on unset D-states (i.e. ACPI_STATE_UNKNOWN), so return a string explicitly saying "unknown D-state" instead of just panicking. Fixes: 84bbfc32a3f4 ("acpi_powerres: D3cold support") Sponsored by: The FreeBSD Foundation MFC after: 3 days (cherry picked from commit dc9ff9e5d078fd923adc3dc5426b5f219156ea43) --- sys/dev/acpica/acpivar.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 6887f080311d..ea416402f530 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -523,6 +523,8 @@ acpi_d_state_to_str(int state) const char *strs[ACPI_D_STATE_COUNT] = {"D0", "D1", "D2", "D3hot", "D3cold"}; + if (state == ACPI_STATE_UNKNOWN) + return ("unknown D-state"); MPASS(state >= ACPI_STATE_D0 && state <= ACPI_D_STATES_MAX); return (strs[state]); }