From nobody Mon Nov 17 00:18:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8pHl5KKwz6G7Qp; Mon, 17 Nov 2025 00:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8pHl2sLxz3l8m; Mon, 17 Nov 2025 00:18:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763338707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q99Z2d5CLBVLaLRXX0alolS4IQTQPZtvWP6iQqnfSig=; b=gMYDieX7Lz+X4vugT2GGpzsTRLTBcuSETgM6Lka3SIR9UphO8RTdYCMBAkMsikIRof1mOv u0eFF3beHjnrR+3z5CgMhMfcmawrcEHMaepUOlDm+3pFePauqxJEdj7lsqbnGZxAD4Tg+B 7SFNRm8TZry1O7nN3rhpC0XlbKgdXXSHULcOwlEDxnEPjVqTHJV963tlpkzA4nZponDGvN vrg4K/yZhCICKTd+Ok+xffaeLTKVoisWrrtwjDLMjSkO7PTsD/DRa+PxZObzVgMv6dPRdC PrrLOxP1TaRvLgnU9+7MpzRDP0LATs0dJWa8BEkf/9cPhJtA5H3R8b8TgLRkvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763338707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q99Z2d5CLBVLaLRXX0alolS4IQTQPZtvWP6iQqnfSig=; b=M8TsaCtJQmO1Pi64vXHJqfET++vZww0xHYTUrLEXFISSv5N12LXEynCK1joIqkBihNozQZ RZKEzDrAQGe2C6K5EQaTPNnA8tdvMXPqSOdEPZkPrBSxUFQpdspeqbbiKjHN8FSL6TNAFQ Btb5odu9heWI3WGmJ5ZCfT/YWh+3OluAbx5OWNGT5SeuqJB+OMt3BgHU6RwQ1vrulyU2wX 3H4kjG7wSkFh1FCWXix6Re5hFD2sfnhnNiO6rdtewcOVIP93SWcCSPfXhsSmYo1pgnRDeZ LrEAlXGXYGNGkbfFz58NzsrK5zX30TGteQjbg1wkr2eVQCWhkw5CJHq2oqsoag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763338707; a=rsa-sha256; cv=none; b=V175HU2ZFFDAt/AnZCJs5o87cEIWRzoE/WsV3mVaA+3h1yZi40WY3wFx60YTWbUzNaVrp5 AAXXoakKiT7u1LQrKy/NrukTbZ7qheiRF1ViJmSZzzCUGp99VgSwIVeGYu8QpmU0daCO0B IlgCfCJsJ7uh2l8LmTlA/7xX5LfZeTCvJEkUPXmSL1kzGqq+5eh9yquxDzdKkzjYn5arWq izlnMKWxpMjyGyuW2ZiZo9LGs1103BcJ+V800NJGrkir2wPr2m7/fmDWyN53kjhA8meWEz ssgZtKEPkc9oFUHPMRprRHk+g4VtbFdlfc6M8EVFZe6of4IIDQVrDSPMTpcmDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d8pHl25DXz10nJ; Mon, 17 Nov 2025 00:18:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AH0IRI3063828; Mon, 17 Nov 2025 00:18:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AH0IRM9063825; Mon, 17 Nov 2025 00:18:27 GMT (envelope-from git) Date: Mon, 17 Nov 2025 00:18:27 GMT Message-Id: <202511170018.5AH0IRM9063825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: af6d77c0bd01 - main - edk2: Bring in Guid/Fdt.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af6d77c0bd0166dc9376b98aab79dfe806d95106 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=af6d77c0bd0166dc9376b98aab79dfe806d95106 commit af6d77c0bd0166dc9376b98aab79dfe806d95106 Author: Warner Losh AuthorDate: 2025-11-16 23:49:59 +0000 Commit: Warner Losh CommitDate: 2025-11-16 23:55:13 +0000 edk2: Bring in Guid/Fdt.h This one is from EmbeddedPkg/Include/Guid/Fdt.h, which is our first EmbeddedPkg addition. For the moment, I'm doing this as an ad-hoc basis, but in the next import may need to reconsider the strategy. Sponsored by: Netflix --- sys/contrib/edk2/Include/Guid/Fdt.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sys/contrib/edk2/Include/Guid/Fdt.h b/sys/contrib/edk2/Include/Guid/Fdt.h new file mode 100644 index 000000000000..e0091468292a --- /dev/null +++ b/sys/contrib/edk2/Include/Guid/Fdt.h @@ -0,0 +1,22 @@ +/** @file +* +* Copyright (c) 2013-2014, ARM Limited. All rights reserved. +* +* SPDX-License-Identifier: BSD-2-Clause-Patent +* +**/ + +#ifndef __FDT_H__ +#define __FDT_H__ + +#define FDT_TABLE_GUID \ + { 0xb1b621d5, 0xf19c, 0x41a5, { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } } + +extern EFI_GUID gFdtTableGuid; + +#define FDT_VARIABLE_GUID \ + { 0x25a4fd4a, 0x9703, 0x4ba9, { 0xa1, 0x90, 0xb7, 0xc8, 0x4e, 0xfb, 0x3e, 0x57 } } + +extern EFI_GUID gFdtVariableGuid; + +#endif /* __FDT_H__ */ From nobody Mon Nov 17 00:18:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8pHm4RtWz6G7hQ; Mon, 17 Nov 2025 00:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8pHm2rNMz3l8p; Mon, 17 Nov 2025 00:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763338708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OP1qETGXDDOLp2UAlNNZkuxkwblH13uc5z1wO0WR/rA=; b=bEnnLhPi33VR5egdwWagAbVWd69KtAfUBlLCV08BsVYeZwodDEK3DfgnpB51tp4nRLZsIH yt/KNYaWPr6BTN+3SYljwDJ+4jniV7YF62AKuhxnB/dOsMe3wyE2bJyptHgwfKds6tf+3j La4NoSHV5JyO5n47osOo5pLqYigGlRmLGOwsMWqlrGE8zHSbJxl/lwoqplepZuZ6hMQ7NR hqBvqG8F4j7GhMcrgPYmT3P+n9tPKPGlgAmUvxCJSApHAD7Yvnkbem3zsLnnXBKgpRGCDD 6Y+Zwhj4mnT+YJ68HI12/kdcbKz3dSH/f8MGj/yUUmBWmdqRMkFISCkgnFvv9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763338708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OP1qETGXDDOLp2UAlNNZkuxkwblH13uc5z1wO0WR/rA=; b=WeIH//04AlerJstjpwQgqxHb2rwbtpDAMpoWMVVGd6rt4CWMyrsOBXm+43MZHxoMrT5eX+ WlBBvPo9YVyNJmT2soM8uzkznf4B59pDKo9yWeEB+vxwsQvxmMrxzK43TX2zDlYOxYF2/r +sZ7uNF97iQdhgioZogKAG2WBrPaJQoezOKvO2rQ3ZcCbv5oHncKk+MJtartWnAmqlVZwU ynHRiXwEwI3np0pF2j2STcMr2Ay9USAttmK6Hh1mpd76nxdLL3mEzKB75Obw7GhjEhBNNv Px/JNtVKhxn6XCUg+eS4u1a6DYHJQ3gZW70mxNgpkP/ndfUJPreC9ucnEXixBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763338708; a=rsa-sha256; cv=none; b=AyOZ0jpEYSkm95a5rj6M+6eYHNVg2v8NEivus5oPI4Z54UOOlm/uO7tQJnvbbNqlydXOd3 1wBrJeAm2nW3jtIfjhJ6Q74SZpAu/IeezntrIT5VvV6jXTXa1KYiU8fUBIBMQSfhm4rVHA GxUo7U7vXJYTi3wF7gam5UcQJd/PxFj/QDeNe25TskypUSaRp6Qghr/cq/uClGuBdi9iWV nTLvqkL43e7V+BG2iWAy2aT4PwUdsWMdGUh+Ar2DBBEj99a19G7TVlkHw2Gm1gu5Ek+izO Ihyi/An0LTQxoB6Rng7fHSq9KDF47OVCR0c/Vcxypu5yqMmKmBNg1bp5Nrj0qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d8pHm2NwCz10nK; Mon, 17 Nov 2025 00:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AH0ISYJ063861; Mon, 17 Nov 2025 00:18:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AH0ISNd063858; Mon, 17 Nov 2025 00:18:28 GMT (envelope-from git) Date: Mon, 17 Nov 2025 00:18:28 GMT Message-Id: <202511170018.5AH0ISNd063858@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 60f14d05d217 - main - edk2: Fix fdt build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60f14d05d217715240ba48bdf3c08f1aa5ead8d0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=60f14d05d217715240ba48bdf3c08f1aa5ead8d0 commit 60f14d05d217715240ba48bdf3c08f1aa5ead8d0 Author: Warner Losh AuthorDate: 2025-11-16 23:53:47 +0000 Commit: Warner Losh CommitDate: 2025-11-16 23:55:14 +0000 edk2: Fix fdt build x86 doesn't use FDT things by default, but aarch64 does. I thought I'd built the loader on aarch64 to test the EDK2 all the things series, but apparently not. This fixes the aarch64 build. Fixes: 43b8edb32051 Sponsored by: Netflix --- stand/efi/fdt/Makefile | 1 + stand/efi/fdt/efi_fdt.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/stand/efi/fdt/Makefile b/stand/efi/fdt/Makefile index bbb380f52184..15a42614a422 100644 --- a/stand/efi/fdt/Makefile +++ b/stand/efi/fdt/Makefile @@ -12,6 +12,7 @@ SRCS= efi_fdt.c # EFI library headers CFLAGS+= -I${EFISRC}/include CFLAGS+= -I${EFISRC}/include/${MACHINE} +CFLAGS+= -I${EDK2INC} # libfdt headers CFLAGS+= -I${FDTSRC} diff --git a/stand/efi/fdt/efi_fdt.c b/stand/efi/fdt/efi_fdt.c index adf830e44182..56e7361a8d9f 100644 --- a/stand/efi/fdt/efi_fdt.c +++ b/stand/efi/fdt/efi_fdt.c @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include "bootstrap.h" From nobody Mon Nov 17 00:18:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8pHq4VVmz6G7qT; Mon, 17 Nov 2025 00:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8pHp4wxpz3l2d; Mon, 17 Nov 2025 00:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763338710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YaLKI9BrPC9U1tDYj3kwNQvDETBa9WznzHd3StgTa8k=; b=XmEOO4McbWQXpYy15d0v+QNrv5WcESg3lJ785Zpzk9sIOWW/T8TJ68j02QUSxbWvIslY/k qDwjFNkS/xHYGm8YbTX33fZoHuxkmKpTXrqpiZ7FhW2zIAfoRQ8YQRIprCpP8dpNelWAIp ZL1E3pAap4pwLL1/Ce+VAnBb8dt39fpIdZG+GZDZE7jRT2uKPztTKzGR1bpk1BMOU+ly/d zz2u+wEWfK3sQ1UJBrirH7siOe28qKd7Iuwn6rXWRk1AgOgn167iSF7JF5dLNTEtHTpnT/ NXYeZGMayQ6930Sy2ksMFBCrKegeCR9jgf9iusTaPum4zd63v700u4X9zW+vEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763338710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YaLKI9BrPC9U1tDYj3kwNQvDETBa9WznzHd3StgTa8k=; b=LyGOeqY2E2HIpheLPg6Z8gIdDzWb68m3YT3JZPHQDCKOUgTk+qV/XAm1o1MCOtht6XK0t3 MEweBScCENSqlSvQUeyysX/lasVDBYKicFOQ5KLz86S479M9Tr2Ri15USTOrFsY2ldgk1H IkD62qC/ckeYE0Uk5iJMmksIAxboQ/M4LdESG48xGa3LzcPde6LLXUsP4B9i9IvJ1fqSzx k2kZo+UryNl9gYTMP+9StF/4GdrH2GZJI7dzd0WA21Sh1cWfcz9KD/waAG+KCe+emI2P4I 474MxeNG3Z9hngDE+nb3L3dQKbaJIy2ZqKsqiQbEImW2NgmWIiIqHh6LvePbKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763338710; a=rsa-sha256; cv=none; b=o144/00mB8gV1bcSsj5OrjAyPpvRI+hzY8UeQyDaSNjiIgRZCmOt03x3+lEgS/VWeQ4Re+ MJH6aoHKjz5U75ezJbdWH81sSAnOVb9D1QquJ38soqFry6tBphh58mu5dOqGTgsHMjiCp/ vpBO8PIAQPaq50FYn9VweTYMRLsLX0dUHYKrJu0sb1W4SXJaSHa/se8iXlH8byjE6U0E5i a+yOZidfJ27CuivQkn5K7WT7Q5VeWQV/TnIEilNgasX6IEpqT4bCS86cN9MNAuzVCayUTc ZRWuVVBS+6y4sekKksyk3regNfedSen2mHF/12FWoIf2x13/VCPV3iswQPPfug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d8pHp4H34z11Mh; Mon, 17 Nov 2025 00:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AH0IUiU063927; Mon, 17 Nov 2025 00:18:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AH0IUgP063924; Mon, 17 Nov 2025 00:18:30 GMT (envelope-from git) Date: Mon, 17 Nov 2025 00:18:30 GMT Message-Id: <202511170018.5AH0IUgP063924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: de060b6851a4 - main - efi.h: Bring in sys/types.h explicitly now List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de060b6851a4c96defaa5dde6a1b6e7468486c8c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=de060b6851a4c96defaa5dde6a1b6e7468486c8c commit de060b6851a4c96defaa5dde6a1b6e7468486c8c Author: Warner Losh AuthorDate: 2025-11-17 00:16:44 +0000 Commit: Warner Losh CommitDate: 2025-11-17 00:16:44 +0000 efi.h: Bring in sys/types.h explicitly now sys/types.h used to be brought in through namespace pollution, but no more. Fixes: 43b8edb32051 Sponsored by: Netflix --- sys/sys/efi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/sys/efi.h b/sys/sys/efi.h index 830cca9c1832..b76ca4918f81 100644 --- a/sys/sys/efi.h +++ b/sys/sys/efi.h @@ -27,6 +27,7 @@ #ifndef _SYS_EFI_H_ #define _SYS_EFI_H_ +#include #include #include From nobody Mon Nov 17 00:18:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8pHq3ZbFz6G7n1; Mon, 17 Nov 2025 00:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8pHn5yzbz3ktw; Mon, 17 Nov 2025 00:18:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763338709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m9qxMs/4uLWhGqegvYpPGfjc8fUql6yc1XUigBXfh/8=; b=A9SDsrVIr3yn0ciPLlWc56nE96iDA3EmRPN6K2Y8tcYDlhaB61Gx3DwD5kk8pH+rc82Ugv ePCnbgN/Tp033TpbiOab9qdo4FwDI3DgPiDVhH5Jg3t67JLMdznvhyR1gV+RZRwuHjgfyA RVJqCw5n6gBP8c1rg6GrplwpscV+zB63PiVIqYyx8XdMhn67e5uf0nyjhzOzjTqTEMGcuu PO61184hNZ1TSClzrkHzklCnFcAc8V9pkXjZRoUH/Hj4/pt/ebW3TefzCnHN94XA5NJroa mTOZ/Hq1gvX5o1XHgpDyW1UKTzFmX9zkK52s1ncxYsQ++8q1aa3c9h0OxGsGpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763338709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m9qxMs/4uLWhGqegvYpPGfjc8fUql6yc1XUigBXfh/8=; b=I2lBGzCb9QLUjWXSOHizrZnelQlOBd36vpu7pFwurons3g40sxa4gMxFLqMknDWVjKm188 GAcHzU19QszQ+eJk/I3l+9CJYyCrIDP87U2Y37dt2L9dfn2uOdzO0pYwtFlJyI4BK5Ead+ l3d64axyuMj3aT6+ygxiH9LoEomaIVXErH1fIRszEKWGHjc0mKuP8H84ojIAhnQjZzQAeB me3hz6Ls8BsF8vMe74W1w9hDnMwK7FkbzlzEO3yEt3YMTup0MWW+frc4pe4Cq0QOhNc+TR 2TQR3IxFmbxP2g5wDRE8D+9c4GIJmXmKpLxk3VICOIsiXwsbwYg2V47m8cxdvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763338709; a=rsa-sha256; cv=none; b=N9EmFJ/kaLIMX8XFJiU8m6zrnfYWQNsRhdevy8RzUMIOanED5rZU8sH+1kq1ROmv+0318q oIEiJrV7UD9x+OkMv5rb9OBPRSl+v8KUwNrNiuAxNTKSphgk6o3vGP7g6/8iBjWBXHWNZj HyQH1DgOODkXFQ7vyeMZRLdGAlweXarRw9/LMyP6NBFUmMtxu4DWO4RE9j/DkpW0OowNXh IcjVXIlNXOfZaxzXF2SHHjvThnGG+bhWMMjKDne3w8iWZgj3yntvP29ctTeg8yuQa1L3ki Sd/OGoOmJWYMk94gK3r0vib0Irtwl3UZMq9Bblhq8GN1XQu7wr4hzctLbjayBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d8pHn3KCGz11Mg; Mon, 17 Nov 2025 00:18:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AH0ITr1063894; Mon, 17 Nov 2025 00:18:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AH0ITWK063891; Mon, 17 Nov 2025 00:18:29 GMT (envelope-from git) Date: Mon, 17 Nov 2025 00:18:29 GMT Message-Id: <202511170018.5AH0ITWK063891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 44fb9f2701c7 - main - sys/efi_map.h: This is a kernel-only file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44fb9f2701c71ce6bba75810fc6b7e735ecd5868 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=44fb9f2701c71ce6bba75810fc6b7e735ecd5868 commit 44fb9f2701c71ce6bba75810fc6b7e735ecd5868 Author: Warner Losh AuthorDate: 2025-11-16 23:58:37 +0000 Commit: Warner Losh CommitDate: 2025-11-17 00:16:26 +0000 sys/efi_map.h: This is a kernel-only file Slap a #ifdef _KERNEL around it all since it's useless to userland. Fixes: 43b8edb32051 Sponsored by: Netflix --- sys/sys/efi_map.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/sys/efi_map.h b/sys/sys/efi_map.h index 8b458cd08b00..d2206056b1f8 100644 --- a/sys/sys/efi_map.h +++ b/sys/sys/efi_map.h @@ -7,6 +7,8 @@ #ifndef _SYS_EFI_MAP_H_ #define _SYS_EFI_MAP_H_ +#ifdef _KERNEL + #include #include @@ -21,4 +23,6 @@ void efi_map_add_entries(struct efi_map_header *efihdr); void efi_map_exclude_entries(struct efi_map_header *efihdr); void efi_map_print_entries(struct efi_map_header *efihdr); +#endif + #endif /* !_SYS_EFI_MAP_H_ */ From nobody Mon Nov 17 02:42:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8sTs6PsTz6GLmf; Mon, 17 Nov 2025 02:42: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8sTs5gBlz41tS; Mon, 17 Nov 2025 02:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763347345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ek4rk2uYDbe50SL5aXMN3v6fWCU0kpCA6E+EulqeNHQ=; b=wL4nZ4zu8DO3RLl5iHB5cT+DJw5VNofYbvu3KBQPkw3/Md7nxzIBN/HIDj7a3cSGVm+CAB xX9dfvZr41u/Tg+ZFVNB1Wqui3P1uQeDSZtVo3LCZQefZjQWfR8wR9gbOgMQzxEGkRSU26 9XSIbx1NeJgrGYqHky7iaaLUFdlHoeBJlP8G7QJFQE+UgCUxtvOELiwdnGRk29Zhgpb9g8 bd+ABZlEUDI4hLKEDdmBJkn1qbTOX1BARvkz996Io+ATimKeIWIXORxZuro9Y4CZbqbF6L ZJHbDClfmjXuE5I2i3vVxkkMAwlgaH8h1iiZ1DkmKc4Y5xeSi2PxbRhm3Jx0Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763347345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ek4rk2uYDbe50SL5aXMN3v6fWCU0kpCA6E+EulqeNHQ=; b=v17j8IG81Xi+xffdh4P18E/CbepE626Xp8ByXSwd8kgWknANFhkM/kTUC3b+T8W6vboqt0 +QINZ7apTPFcdIlBxVngei6Q8ANfutdP9QtxIPosZgBhs1kNNLg/W7Hjbc/tKyL1O3ZzoG /pmHDGGCI1M7HdFaihlzF7oj420xI+D+tZUuHt677sX9VAHJjY1HACkq7V8NXIHt0dzHEX Xl48XtJWXIjtbgYkpSwgzABvDTDNvaJNsvV8+h1+4knWM2plL5fGqIQFtF6VIukDpWfIXR uwddlXsmH5mABI5X9DuekV51n799PfBHek5EHBHb7AO1PHQI2Ma0V5urFT4eIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763347345; a=rsa-sha256; cv=none; b=ESzUXrn16ykZA6CUiLneNcs8M/ZJN3pAcJQ9PtJitA40+SMyrPeQ+11s3bXnFlZKXIdEn7 x2RdkF0HB8vreINDVQu74q5d25SkkeplPAqgXdL3RSQ814zG5zVaBWmYdg06O/5OvjrNc1 a8XUmgNFm065bDgGSE1tC4M0qB6I1I5UKzKqlHuX21zFwhpW2aPttw/eXTrN2eYSLDNYyh ukYkBu6SVnN7mgo58YFq1Wl7P2tjYZvRlLBxmOLQVSj7xQkh/mo9mFFCei2zI40QTXoWO6 FD37483SAY7F5wOVhKwnec3C8eFGjrqz0zBhzOHZ5EvaxzJ0zp+lGAICWeM0hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d8sTs5Dzmz15DB; Mon, 17 Nov 2025 02:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AH2gPVi043693; Mon, 17 Nov 2025 02:42:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AH2gPZi043690; Mon, 17 Nov 2025 02:42:25 GMT (envelope-from git) Date: Mon, 17 Nov 2025 02:42:25 GMT Message-Id: <202511170242.5AH2gPZi043690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 499d2ed109ef - main - Base.h: Ifdef out always char purity test. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 499d2ed109ef6f284de89f2c1ad54393ecc27056 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=499d2ed109ef6f284de89f2c1ad54393ecc27056 commit 499d2ed109ef6f284de89f2c1ad54393ecc27056 Author: Warner Losh AuthorDate: 2025-11-17 02:38:14 +0000 Commit: Warner Losh CommitDate: 2025-11-17 02:42:24 +0000 Base.h: Ifdef out always char purity test. Now that we've moved to always using this, it turns out the the funky thing we have for L'a' is everywhere. Removing this check until I can sort it out. This breaks the build on armv7 otherwise. Fixes: 43b8edb32051 Sponsored by: Netflix --- sys/contrib/edk2/Include/Base.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/edk2/Include/Base.h b/sys/contrib/edk2/Include/Base.h index 2b53e118b33f..3ae798db8429 100644 --- a/sys/contrib/edk2/Include/Base.h +++ b/sys/contrib/edk2/Include/Base.h @@ -829,7 +829,7 @@ STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specif * fail, but it also takes lengths to never use either of these constructs. The * boot loader, however, uses them and needs these assertionst o be correct. */ -#ifdef _STANDALONE +#if 0 STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements"); #endif From nobody Mon Nov 17 04:13:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8vWb1Y77z6GTNG; Mon, 17 Nov 2025 04:14:03 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp5.goneo.de [IPv6:2001:1640:5::8:30]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8vWZ6XCGz3Cr5; Mon, 17 Nov 2025 04:14:02 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub2.goneo.de (hub2.goneo.de [IPv6:2001:1640:5::8:53]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp5.goneo.de (Postfix) with ESMTPS id 8ACF5240865; Mon, 17 Nov 2025 05:13:51 +0100 (CET) Received: from hub2.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPS id ACBF0240123; Mon, 17 Nov 2025 05:13:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1763352829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=9FsiUrv9R8QnFDKWlnD8ByiK6/EE06kkqiO6qAgjHXQ=; b=pUORBkZolB4IEU5hSghdtBtSlL1/r3ZRHIRg5A4ueXL/dLj+xhCTjzSIjkRKgchIQfOVuh f/6tbdO66MDP6B7IYoJRMNGtkAqvAzQRFitWHiVkbQKOPbWGW3t4wE+Hbo65CIT4NQeEHU 5EQwm17OmmewkphvdPXCh/SnHW8WYFSeMAiiLxiLyhZGAspxoUwDwqnU5youtLx+HGXT36 2eAV2Y41C1ZUnTh+vvKV/Y05PlKVSwOigdv9jiB89c9RWt9tvbRXv0fWzd5PZ4k8coXHaj MeGHx2U4l1oyVq9qoK8xbLUs/QbhEJZ/11MMiKnaWwbvRCke7vVhTSDrSP7Rgw== Received: from thor.sb211.local (dynamic-2a02-3100-2ea1-7002-c9ce-c40c-ca26-229b.310.pool.telefonica.de [IPv6:2a02:3100:2ea1:7002:c9ce:c40c:ca26:229b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPSA id 5F9A424003C; Mon, 17 Nov 2025 05:13:49 +0100 (CET) Date: Mon, 17 Nov 2025 05:13:21 +0100 From: A FreeBSD User To: Warner Losh Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 44fb9f2701c7 - main - sys/efi_map.h: This is a kernel-only file Message-ID: <20251117051144.3d0c31d9@thor.sb211.local> In-Reply-To: <202511170018.5AH0ITWK063891@gitrepo.freebsd.org> References: <202511170018.5AH0ITWK063891@gitrepo.freebsd.org> X-Mailer: Claws Mail 3.21.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/osyfs5hVvPgne4ewuVDG6BP"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Rspamd-UID: d2b04c X-Rspamd-UID: 0361a7 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:2001:1640::/32, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4d8vWZ6XCGz3Cr5 --Sig_/osyfs5hVvPgne4ewuVDG6BP Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Am Tage des Herren Mon, 17 Nov 2025 00:18:29 GMT Warner Losh schrieb: > The branch main has been updated by imp: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D44fb9f2701c71ce6bba75810fc= 6b7e735ecd5868 >=20 > commit 44fb9f2701c71ce6bba75810fc6b7e735ecd5868 > Author: Warner Losh > AuthorDate: 2025-11-16 23:58:37 +0000 > Commit: Warner Losh > CommitDate: 2025-11-17 00:16:26 +0000 >=20 > sys/efi_map.h: This is a kernel-only file > =20 > Slap a #ifdef _KERNEL around it all since it's useless to userland. > =20 > Fixes: 43b8edb32051 > Sponsored by: Netflix > --- > sys/sys/efi_map.h | 4 ++++ > 1 file changed, 4 insertions(+) >=20 > diff --git a/sys/sys/efi_map.h b/sys/sys/efi_map.h > index 8b458cd08b00..d2206056b1f8 100644 > --- a/sys/sys/efi_map.h > +++ b/sys/sys/efi_map.h > @@ -7,6 +7,8 @@ > #ifndef _SYS_EFI_MAP_H_ > #define _SYS_EFI_MAP_H_ > =20 > +#ifdef _KERNEL > + > #include > #include > =20 > @@ -21,4 +23,6 @@ void efi_map_add_entries(struct efi_map_header *efihdr); > void efi_map_exclude_entries(struct efi_map_header *efihdr); > void efi_map_print_entries(struct efi_map_header *efihdr); > =20 > +#endif > + > #endif /* !_SYS_EFI_MAP_H_ */ >=20 Hello, tried a buildworld just now and it fails, something seems missing: [...] =3D=3D=3D> stand/libsa (all) mkdir -p xlocale arpa ssp; for i in a.out.h assert.h elf.h limits.h nlist.= h setjmp.h stddef.h stdbool.h string.h strings.h time.h uuid.h; do ln -sf /usr/src/include/$i = $i; done; ln -sf /usr/src/sys/sys/errno.h errno.h; ln -sf /usr/src/sys/sys/stdarg.h stdarg.= h; ln -sf /usr/src/sys/sys/stdint.h stdint.h; ln -sf /usr/src/include/arpa/inet.h ar= pa/inet.h; ln -sf /usr/src/include/arpa/tftp.h arpa/tftp.h; ln -sf /usr/src/include/ssp/ssp.= h ssp/ssp.h; for i in _time.h _strings.h _string.h; do [ -f xlocale/$i ] = || :> xlocale/$i; done; for i in ctype.h fcntl.h signal.h stdio.h stdlib.h unis= td.h; do ln -sf /usr/src/stand/libsa/stand.h $i; done cc -target x86_64-unknown-freebsd16.0 --sysroot=3D/usr/obj/usr/src/amd64.amd64/tmp -B/usr/obj/usr/src/amd64.amd64= /tmp/usr/bin -O2 -pipe -fno-common -nostdinc -I/usr/obj/usr/src/amd64.amd64/stand/libsa -I/usr/src/stand/libsa -D_STANDALONE -I/usr/src/sys -Ddouble=3Djagged-littl= e-pill -Dfloat=3Dfloaty-mcfloatface -ffunction-sections -fdata-sections -DLOADER_G= ELI_SUPPORT -I/usr/src/stand/libsa/geli -DLOADER_DISK_SUPPORT -ffreestanding -mno-mmx -= mno-sse -mno-avx -mno-avx2 -msoft-float -fPIC -mno-red-zone -mno-relax -I. -DLOADER_VERIEXEC -I/usr/src/lib/libsecureboot/h -DLOADER_VERIEXEC_VECTX -Iinclude -I/usr/src/contrib/bearssl/inc -Wno-deprecated-non-prototype -I/usr/src/con= trib/bearssl/src -I/usr/src/lib/libsecureboot/h -DHAVE_BR_X509_TIME_CHECK -DNO_STDIO -I/usr/src/contrib/bearssl/tools -I. -DTRUST_ANCHOR_STR=3Dta_PEM -DVE_SHA25= 6_SUPPORT -DVE_SHA384_SUPPORT -DVE_RSA_SUPPORT -DVE_PCR_SUPPORT -I/usr/src/stand/efi= /include -I/usr/src/lib/libsecureboot/efi/include -I/usr/src/stand/efi/include/amd6= 4 -DNDEBUG -MD -MF.depend.efi_variables.o -MTefi_variables.o -std=3Dgnu17 -Wno-format-zero= -length -Wsystem-headers -Wno-pointer-sign -Wdate-time -Wno-empty-body -Wno-string-= plus-int -Wno-unused-const-variable -Wno-error=3Dunused-but-set-parameter -Wno-error=3Dcast-function-type-mismatch -Wno-tautological-compare -Wno-unu= sed-value -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-un= used-local-typedef -Wno-address-of-packed-member -Wno-switch -Wno-switch-enum -Wno-knr-promote= d-parameter -Wno-parentheses -Oz -Qunused-arguments -c /usr/src/lib/libsecureboot/= efi/efi_variables.c -o efi_variables.o In file included from /usr/src/lib/libsecureboot/efi/efi= _variables.c:31: /usr/src/stand/efi/include/efi.h:47:10: fatal error: 'Uefi.h' file not foun= d 47 | #include [...] Greetings, oh --=20 A FreeBSD user --Sig_/osyfs5hVvPgne4ewuVDG6BP Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRQheDybVktG5eW/1Kxzvs8OqokrwUCaRqg/AAKCRCxzvs8Oqok r/+0AQCeI1TIZdNcsmm52SvhHi4sEkFTNv6SuIU+fMgB82XiwAD+Lpr1gd4DL1SK LAbM8GVefhccpmDADDgqUCvnu147LwA= =z653 -----END PGP SIGNATURE----- --Sig_/osyfs5hVvPgne4ewuVDG6BP-- From nobody Mon Nov 17 05:16:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8wwS1zjKz6GYvQ for ; Mon, 17 Nov 2025 05:17:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8wwR62Lyz3LFj for ; Mon, 17 Nov 2025 05:17:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-794e300e20dso3347765b3a.1 for ; Sun, 16 Nov 2025 21:17:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1763356626; x=1763961426; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=e8XlpNfcvyUx/Se6pwt3ZWbWjuf5pHG0+mobceRFvUM=; b=gq7B+csLu5G2wnwS6nmhvpLL6bDzZf6+fVHOOm8B1VgG+AMpa6c0Sgji3ZpGNcpMZH XpydjYW5e33eKLQZvNAHpHT/oMk7GpgRbKOSGKexqO2PVtKOqZV3uwJC+zUKHhXr5UCL r1ZyWYvCJMExu9Ok0PNqGjbuGbWo3csHGfzcWPrfg/2KXiddyUvzF6KKEHmRlxOnjnc8 bOmTU6A6dtY7LfdEjI1X396tlYHIxFUL5G+zIXBSWNqyecujQCesdg5TOZrOwDKMF1kl MBP1M4eSSyo9MqWiYFSwQ6gF4mfUsQyrjq5nLvdE8STmGeNzmD1WpXSHDlypyRE/BLEI kyCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763356626; x=1763961426; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=e8XlpNfcvyUx/Se6pwt3ZWbWjuf5pHG0+mobceRFvUM=; b=iHZx/97YX3nJbPNn3q6AQ+599H2UTk4jQCNBikJMUJo77AggqicG/Ttmpvf3huUygq 2JyBDOIc7ifpEQvDodnkzCVHL+f1rV3zO3VCSpfA4UlmI1+Xbgul2ht+EwKyWM1xfQxJ NWVb2QMjk/giwVI/otQMVgzfOwYuuT5O+SXhhEklkawNPy1y7aO7k9MiPEIrJy7w9od0 4gYV079Kay4v8hmOID1c1PQt8/3VBa8PrY6OjCXrtOPtBbhScHTqcKR5prcdNn9/hKQF 7S9iXSWW+Y4v9ARSIdKexxPEuxvh+47LF0dK4W/deEd4juNG82HdCnSQU2FYbPIu/jKm Vg3A== X-Forwarded-Encrypted: i=1; AJvYcCWok4JeprXkTVcCYgH9sLTGSSuU+ePykKhQkmVxQMSj0HdZrP++3Jngj5iZecYBXI9zp+5DvINEndLYqM2p0h1n/qgP@freebsd.org X-Gm-Message-State: AOJu0YzG+MUEBwIXE8lKJxXqoJdHFsctaKbPWzOjY6sb+7AA9ABGiWmo C1YZFxpw4V5Xxbbit2t6whA1d6SFpTnO0BO9fmHWMtSA0YWk8z98q6syXnX4IogoCK/3eq4tr9a OawDRKNR9813087BqcGLb1A2byrOifBXOzueWCp1rtOgh3LzTQtUZNKA= X-Gm-Gg: ASbGncspjUAVkADsFnGXod21Cs5Oj9JSTzaIHcB9NH+L18mc+vIzgy9VMoYpPzbIxmY 9hCzw0T92MRWCYI1rSVL30yeW5doVTHqHJj9cukyMKgpxJ8zJrd5z9VrSgqEiWKizGqTFR668TD OcIgq109zfjKVisbUA6D+b512cNFBt+faxptcKk7znq1IYbfMRFlj4Fy1uhhb716avljU/13YpP vAMTVEDS/VU8gWTBSElBnenDsfsBYCGzcSnj5ju5winfCVP3zl7nZ+jw+wyc4Azs8XJE0g= X-Google-Smtp-Source: AGHT+IHZy7Ink/+tyGMYMvE1hsgBYhm5rL8LcKoxyqmf7N8odaawOeqUrFAyIuecDlshXZB8er5zxjjBKI/8Qa5HVUw= X-Received: by 2002:a17:90b:4c44:b0:343:3898:e7c9 with SMTP id 98e67ed59e1d1-343eab041a1mr15470263a91.2.1763356625158; Sun, 16 Nov 2025 21:17:05 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202511170018.5AH0ITWK063891@gitrepo.freebsd.org> <20251117051144.3d0c31d9@thor.sb211.local> In-Reply-To: <20251117051144.3d0c31d9@thor.sb211.local> From: Warner Losh Date: Sun, 16 Nov 2025 22:16:58 -0700 X-Gm-Features: AWmQ_bk-bD48vVwLeHLfAxCfjqPPNVcYUHfgM1bN0BRahjWnIohHjZvXFW4fC44 Message-ID: Subject: Re: git: 44fb9f2701c7 - main - sys/efi_map.h: This is a kernel-only file To: A FreeBSD User Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000041538b0643c3753e" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4d8wwR62Lyz3LFj --00000000000041538b0643c3753e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Nov 16, 2025 at 9:14=E2=80=AFPM A FreeBSD User wrote: > Am Tage des Herren Mon, 17 Nov 2025 00:18:29 GMT > Warner Losh schrieb: > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D44fb9f2701c71ce6bba75810fc6b7e7= 35ecd5868 > > > > commit 44fb9f2701c71ce6bba75810fc6b7e735ecd5868 > > Author: Warner Losh > > AuthorDate: 2025-11-16 23:58:37 +0000 > > Commit: Warner Losh > > CommitDate: 2025-11-17 00:16:26 +0000 > > > > sys/efi_map.h: This is a kernel-only file > > > > Slap a #ifdef _KERNEL around it all since it's useless to userland. > > > > Fixes: 43b8edb32051 > > Sponsored by: Netflix > > --- > > sys/sys/efi_map.h | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/sys/sys/efi_map.h b/sys/sys/efi_map.h > > index 8b458cd08b00..d2206056b1f8 100644 > > --- a/sys/sys/efi_map.h > > +++ b/sys/sys/efi_map.h > > @@ -7,6 +7,8 @@ > > #ifndef _SYS_EFI_MAP_H_ > > #define _SYS_EFI_MAP_H_ > > > > +#ifdef _KERNEL > > + > > #include > > #include > > > > @@ -21,4 +23,6 @@ void efi_map_add_entries(struct efi_map_header > *efihdr); > > void efi_map_exclude_entries(struct efi_map_header *efihdr); > > void efi_map_print_entries(struct efi_map_header *efihdr); > > > > +#endif > > + > > #endif /* !_SYS_EFI_MAP_H_ */ > > > > Hello, > > tried a buildworld just now and it fails, something seems missing: > > [...] > =3D=3D=3D> stand/libsa (all) > mkdir -p xlocale arpa ssp; for i in a.out.h assert.h elf.h limits.h > nlist.h setjmp.h stddef.h > stdbool.h string.h strings.h time.h uuid.h; do ln -sf /usr/src/include/$= i > $i; done; ln -sf > /usr/src/sys/sys/errno.h errno.h; ln -sf /usr/src/sys/sys/stdarg.h > stdarg.h; ln -sf > /usr/src/sys/sys/stdint.h stdint.h; ln -sf /usr/src/include/arpa/inet.h > arpa/inet.h; ln -sf > /usr/src/include/arpa/tftp.h arpa/tftp.h; ln -sf > /usr/src/include/ssp/ssp.h ssp/ssp.h; for i in _time.h _strings.h > _string.h; do [ -f xlocale/$i ] || :> > xlocale/$i; done; for i in ctype.h fcntl.h signal.h stdio.h stdlib.h > unistd.h; do ln -sf > /usr/src/stand/libsa/stand.h $i; done cc -target > x86_64-unknown-freebsd16.0 > --sysroot=3D/usr/obj/usr/src/amd64.amd64/tmp > -B/usr/obj/usr/src/amd64.amd64/tmp/usr/bin -O2 > -pipe -fno-common -nostdinc -I/usr/obj/usr/src/amd64.amd64/stand/lib= sa > -I/usr/src/stand/libsa -D_STANDALONE -I/usr/src/sys > -Ddouble=3Djagged-little-pill > -Dfloat=3Dfloaty-mcfloatface -ffunction-sections -fdata-sections > -DLOADER_GELI_SUPPORT > -I/usr/src/stand/libsa/geli -DLOADER_DISK_SUPPORT -ffreestanding -mno-mmx > -mno-sse -mno-avx > -mno-avx2 -msoft-float -fPIC -mno-red-zone -mno-relax -I. -DLOADER_VERIEX= EC > -I/usr/src/lib/libsecureboot/h -DLOADER_VERIEXEC_VECTX -Iinclude > -I/usr/src/contrib/bearssl/inc -Wno-deprecated-non-prototype > -I/usr/src/contrib/bearssl/src > -I/usr/src/lib/libsecureboot/h -DHAVE_BR_X509_TIME_CHECK -DNO_STDIO > -I/usr/src/contrib/bearssl/tools -I. -DTRUST_ANCHOR_STR=3Dta_PEM > -DVE_SHA256_SUPPORT > -DVE_SHA384_SUPPORT -DVE_RSA_SUPPORT -DVE_PCR_SUPPORT > -I/usr/src/stand/efi/include > -I/usr/src/lib/libsecureboot/efi/include > -I/usr/src/stand/efi/include/amd64 -DNDEBUG -MD > -MF.depend.efi_variables.o -MTefi_variables.o -std=3Dgnu17 > -Wno-format-zero-length > -Wsystem-headers -Wno-pointer-sign -Wdate-time -Wno-empty-body > -Wno-string-plus-int > -Wno-unused-const-variable -Wno-error=3Dunused-but-set-parameter > -Wno-error=3Dcast-function-type-mismatch -Wno-tautological-compare > -Wno-unused-value > -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion > -Wno-unused-local-typedef > -Wno-address-of-packed-member -Wno-switch -Wno-switch-enum > -Wno-knr-promoted-parameter > -Wno-parentheses -Oz -Qunused-arguments -c > /usr/src/lib/libsecureboot/efi/efi_variables.c > -o efi_variables.o In file included from > /usr/src/lib/libsecureboot/efi/efi_variables.c:31: > /usr/src/stand/efi/include/efi.h:47:10: fatal error: 'Uefi.h' file not > found 47 | #include > > [...] I've done 20 buildworlds today. And on what architecture? What do you have in your src.conf since I'm not seeing this and I didn't think we built libsecureboot by default. I certainly didn't fix it and didn't expect it to include efi.h from stand. I'm skeptical about why since that file is tailored to the boot loader only. Warner --00000000000041538b0643c3753e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Sun, Nov 16,= 2025 at 9:14=E2=80=AFPM A FreeBSD User <freebsd@walstatt-de.de> wrote:
Am Tage des Herren Mon, 17 Nov 2025 00:18:= 29 GMT
Warner Losh <imp@FreeBSD.org> schrieb:

> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D44fb9f2701c71ce6bba75810fc6b7e735ecd5868<= /a>
>
> commit 44fb9f2701c71ce6bba75810fc6b7e735ecd5868
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2025-11-16 23:58:37 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2025-11-17 00:16:26 +0000
>
>=C2=A0 =C2=A0 =C2=A0sys/efi_map.h: This is a kernel-only file
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Slap a #ifdef _KERNEL around it all since it's = useless to userland.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 43b8edb320= 51
>=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0Netflix
> ---
>=C2=A0 sys/sys/efi_map.h | 4 ++++
>=C2=A0 1 file changed, 4 insertions(+)
>
> diff --git a/sys/sys/efi_map.h b/sys/sys/efi_map.h
> index 8b458cd08b00..d2206056b1f8 100644
> --- a/sys/sys/efi_map.h
> +++ b/sys/sys/efi_map.h
> @@ -7,6 +7,8 @@
>=C2=A0 #ifndef _SYS_EFI_MAP_H_
>=C2=A0 #define _SYS_EFI_MAP_H_
>=C2=A0
> +#ifdef _KERNEL
> +
>=C2=A0 #include <sys/efi.h>
>=C2=A0 #include <machine/metadata.h>
>=C2=A0
> @@ -21,4 +23,6 @@ void efi_map_add_entries(struct efi_map_header *efih= dr);
>=C2=A0 void efi_map_exclude_entries(struct efi_map_header *efihdr);
>=C2=A0 void efi_map_print_entries(struct efi_map_header *efihdr);
>=C2=A0
> +#endif
> +
>=C2=A0 #endif /* !_SYS_EFI_MAP_H_ */
>

Hello,

tried a buildworld just now and it fails, something seems missing:

[...]
=3D=3D=3D> stand/libsa (all)
mkdir -p xlocale arpa ssp;=C2=A0 for i in a.out.h assert.h elf.h limits.h n= list.h setjmp.h stddef.h
stdbool.h string.h strings.h time.h uuid.h; do=C2=A0 ln -sf /usr/src/includ= e/$i $i;=C2=A0 done;=C2=A0 ln -sf
/usr/src/sys/sys/errno.h errno.h;=C2=A0 ln -sf /usr/src/sys/sys/stdarg.h st= darg.h;=C2=A0 ln -sf
/usr/src/sys/sys/stdint.h stdint.h;=C2=A0 ln -sf /usr/src/include/arpa/inet= .h arpa/inet.h;=C2=A0 ln -sf
/usr/src/include/arpa/tftp.h arpa/tftp.h;=C2=A0 ln -sf /usr/src/include/ssp= /ssp.h ssp/ssp.h;=C2=A0 for i in _time.h _strings.h _string.h; do=C2=A0 [ -= f xlocale/$i ] || :>
xlocale/$i;=C2=A0 done;=C2=A0 for i in ctype.h fcntl.h signal.h stdio.h std= lib.h unistd.h; do=C2=A0 ln -sf
/usr/src/stand/libsa/stand.h $i;=C2=A0 done cc -target x86_64-unknown-freeb= sd16.0
--sysroot=3D/usr/obj/usr/src/amd64.amd64/tmp -B/usr/obj/usr/src/amd64.amd64= /tmp/usr/bin=C2=A0 -O2
-pipe -fno-common=C2=A0 =C2=A0-nostdinc=C2=A0 =C2=A0 -I/usr/obj/usr/src/amd= 64.amd64/stand/libsa
-I/usr/src/stand/libsa -D_STANDALONE -I/usr/src/sys -Ddouble=3Djagged-littl= e-pill
-Dfloat=3Dfloaty-mcfloatface -ffunction-sections -fdata-sections -DLOADER_G= ELI_SUPPORT
-I/usr/src/stand/libsa/geli -DLOADER_DISK_SUPPORT -ffreestanding -mno-mmx -= mno-sse -mno-avx
-mno-avx2 -msoft-float -fPIC -mno-red-zone -mno-relax -I. -DLOADER_VERIEXEC=
-I/usr/src/lib/libsecureboot/h -DLOADER_VERIEXEC_VECTX -Iinclude
-I/usr/src/contrib/bearssl/inc -Wno-deprecated-non-prototype -I/usr/src/con= trib/bearssl/src
-I/usr/src/lib/libsecureboot/h -DHAVE_BR_X509_TIME_CHECK -DNO_STDIO
-I/usr/src/contrib/bearssl/tools -I. -DTRUST_ANCHOR_STR=3Dta_PEM -DVE_SHA25= 6_SUPPORT
-DVE_SHA384_SUPPORT=C2=A0 -DVE_RSA_SUPPORT -DVE_PCR_SUPPORT -I/usr/src/stan= d/efi/include
-I/usr/src/lib/libsecureboot/efi/include=C2=A0 -I/usr/src/stand/efi/include= /amd64 -DNDEBUG -MD
-MF.depend.efi_variables.o -MTefi_variables.o -std=3Dgnu17 -Wno-format-zero= -length
-Wsystem-headers -Wno-pointer-sign -Wdate-time -Wno-empty-body -Wno-string-= plus-int
-Wno-unused-const-variable -Wno-error=3Dunused-but-set-parameter
-Wno-error=3Dcast-function-type-mismatch -Wno-tautological-compare -Wno-unu= sed-value
-Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-un= used-local-typedef
-Wno-address-of-packed-member -Wno-switch -Wno-switch-enum -Wno-knr-promote= d-parameter
-Wno-parentheses=C2=A0 -Oz -Qunused-arguments=C2=A0 =C2=A0 =C2=A0-c /usr/sr= c/lib/libsecureboot/efi/efi_variables.c
-o efi_variables.o In file included from /usr/src/lib/libsecureboot/efi/efi= _variables.c:31:
/usr/src/stand/efi/include/efi.h:47:10: fatal error: 'Uefi.h' file = not found 47 | #include
<Uefi.h>
[...]


--00000000000041538b0643c3753e-- From nobody Mon Nov 17 06:01:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8xvD6WVqz6Gd9s; Mon, 17 Nov 2025 06:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8xvD5l1nz3R9Q; Mon, 17 Nov 2025 06:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763359272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zvP8nPjpZA+WsOk2LXA3Tj4xc/19t2YDvGOtUksW5uo=; b=gfchi4qEgl3yhC9mcpJ89MQiFZU1WEegjzxHJrikKCrhYTjDJXLD5sp+rj1VZm9Eh/xoH1 enBAG+5/E7X3QN6g8G2Or3aPPUyhixJqJgfiX3TReLZ7/V/CybdL5J4x06w2fmoELEzrl9 KkwbNY96NvyO2bQaI7Szy4kD/wa/dGWM9JMjcju6v5t+lORa0JHheU1QPokzU65aG4RmwR dos2cvbIfjEI6b4oaW/VRGZl4VK5CqiCXeG7omeppo8iwX6BYpUdJzITKBFktpLAHRjmvH kObvDo8em5fDCbYluAWgIucJ+bz+mt+XW47XncB4DDIPoBV78tWcnm7QgeC7+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763359272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zvP8nPjpZA+WsOk2LXA3Tj4xc/19t2YDvGOtUksW5uo=; b=SkWk0tueterU+gdukqMXJn779nwbTJAkdEJJPymvrvV+a/DFo+yXu61E5yThujQzIO8XwO gNGQFvAAwuxq7J6DUaS36Vp8+dug70WL9QJxLy4xHJXxjgqFXYtc1AFTdClaidKIXGIAz/ GdIjWt9/cVapJ/B364qK3nzl+qWtvsFCHvB+1QBbLQQK/FDkLsN7BGnN4OV4iD78K26PNh AIuizl4M2+bOsbhtWH/TXQHVInUnB/LLdZeyRBB8JEOcBdRwpF4apJJ728tsG4apwNLYlz 8kuYrvorIeBU8Lb9f6T/pLIcJ7nn5o/1+h2yC8+5mpAY/mzQ4qAPGO60nEVcPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763359272; a=rsa-sha256; cv=none; b=AUkes1QjEE/ULKM3lPjiMGPHlF3pbmT/Nx9cs2SIwdgrr/Wo6uFTjnOWvp9V9Vrg5KYwE/ exzgJLAlQnpzsoBkuPm6P6FwdrtM3Ao4CuQM6YaCu5cjmE2IKlr/Y/H22ac7+X5inneqIP E4CYGk0d7hFBNSjp1z3zls9Plwj60fPDdfFetBS5ueMqyCyUpTRVcoD+LpFB8k7iR0Onch 6HR+iDNFYLj3s8BRPLYX/HFdA5woEVx/FmGeP4kmlqIh+TtObygrCM8IbFY1uGQu5LoiRH gREKrDDvBjfE/YfN57JFYPF+Cy9ZERr6CiIAyOr2cjHjxqKcZVfHIpVK81b30g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d8xvD5GRhz1BcW; Mon, 17 Nov 2025 06:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AH61C9U017788; Mon, 17 Nov 2025 06:01:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AH61CSe017775; Mon, 17 Nov 2025 06:01:12 GMT (envelope-from git) Date: Mon, 17 Nov 2025 06:01:12 GMT Message-Id: <202511170601.5AH61CSe017775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c570deb1cc31 - main - edk2: Import UefiCpuPkg/Include/Protocol/RiscVBootProtocol.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c570deb1cc3182b4643e56d7010a763cf6e0884d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c570deb1cc3182b4643e56d7010a763cf6e0884d commit c570deb1cc3182b4643e56d7010a763cf6e0884d Author: Warner Losh AuthorDate: 2025-11-17 05:08:22 +0000 Commit: Warner Losh CommitDate: 2025-11-17 05:08:22 +0000 edk2: Import UefiCpuPkg/Include/Protocol/RiscVBootProtocol.h Import UefiCpuPkg/Include/Protocol/RiscVBootProtocol.h to Include/Protocol. This is another direct copy that needs to be carefully considered in future imports. For now, it's easier to add this incrementally here. Sponsored by: Netflix --- .../edk2/Include/Protocol/RiscVBootProtocol.h | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/sys/contrib/edk2/Include/Protocol/RiscVBootProtocol.h b/sys/contrib/edk2/Include/Protocol/RiscVBootProtocol.h new file mode 100644 index 000000000000..ed223b852d34 --- /dev/null +++ b/sys/contrib/edk2/Include/Protocol/RiscVBootProtocol.h @@ -0,0 +1,34 @@ +/** @file + RISC-V Boot Protocol mandatory for RISC-V UEFI platforms. + + @par Revision Reference: + The protocol specification can be found at + https://github.com/riscv-non-isa/riscv-uefi + + Copyright (c) 2022, Ventana Micro Systems Inc. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef RISCV_BOOT_PROTOCOL_H_ +#define RISCV_BOOT_PROTOCOL_H_ + +typedef struct _RISCV_EFI_BOOT_PROTOCOL RISCV_EFI_BOOT_PROTOCOL; + +#define RISCV_EFI_BOOT_PROTOCOL_REVISION 0x00010000 +#define RISCV_EFI_BOOT_PROTOCOL_LATEST_VERSION \ + RISCV_EFI_BOOT_PROTOCOL_REVISION + +typedef +EFI_STATUS +(EFIAPI *EFI_GET_BOOT_HARTID)( + IN RISCV_EFI_BOOT_PROTOCOL *This, + OUT UINTN *BootHartId + ); + +typedef struct _RISCV_EFI_BOOT_PROTOCOL { + UINT64 Revision; + EFI_GET_BOOT_HARTID GetBootHartId; +} RISCV_EFI_BOOT_PROTOCOL; + +#endif From nobody Mon Nov 17 06:01:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8xvG2yBVz6GdRl; Mon, 17 Nov 2025 06:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8xvG02fKz3Qv1; Mon, 17 Nov 2025 06:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763359274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XAHQDEcBvrCPbrvgieVdej7CBvvszIWEaV3HjZTvgIY=; b=F2pSGWBB335uGYzaCuNBji+ulwqfX4NCe5p9qlJsIqHPs26984B5TXdzzRKPFrE7LbGG5E CMsZ2bKQjmXx3izp0Af2UYQBxU25kFKXvSj2fDNDozk3qvFWLXlx9u9qZ1ETrXYlXKZgcq qZWIADtzVNP8DpCdEeguE4P3il8HD7AF7c4Bi4jKdfl0KO8ChsE/tlijWM0Qg0L6vGlL+a LI58ZHjAj36f0i0L06V799lsi3RAY71EZCPjuP35StEnM3PdhO6FA1TNrs8ermN42FrEPP Eq3HIZj0HpVZODLUEjvMxVOzNDds6GoSCrXxT5tzATnnOLghN47sV5fbj0Kh4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763359274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XAHQDEcBvrCPbrvgieVdej7CBvvszIWEaV3HjZTvgIY=; b=UtkxZT6HuiykNNvXi1ZnWRxj6dAmsRsEscsvHH8LB6VGxIGYN7/ylngtTZ83kW/ZgMb8RJ uqQhNC8RJTzOESpDKqHSaw6OkTOvdG4Z/MKYIlOrPiLE/73/1eC/kTMjBELr80r1ZI8ONA JmygBNiM4PuaWU2aIflfio1/U+5a7kDAlDnQgMVB6tkvKvTcN0i309s4LInJZKsHXgDjNl D4GtOOt8NoU6d5ZKxZqS02jDwyADhFLzXmsftubQcxnPoFsJT74EiSx+zsgcJFymKBOc++ 9j6nSj5XDFcNcrGTYs2t9694Ej/f2uokkQJ0fbflUFfXSkgNhiDkYTsG+dngAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763359274; a=rsa-sha256; cv=none; b=dcWQ21j6oPZlfDtACoC5Cu+UAYU33ASgXC4djMPwR+HpjRWZq1nMMPxEnL22VJp+9F0cPv PRrYnHx7dt8e7eorA4NfFbEuKNmaPM/6qgw+DbS9Pe/CtCnOSOHXcrl+9aniUEUeEUNNU0 Xhqc3wUIhBiuIiO2nT0sL7HS2kEozvclE8sdcFHjzfqexc0lyWJosmOvMy90q1vbvAlfPu 1LH18V80evjV0gEWnkAIUZsAWPvC3RBo5DGy5fBQcVVyQt7jRQL4rPcDpw5rmWl2qmk9zs ztr3qvQtEmIirzK3KxO4NtW4WzwOR4TrbP57aa0yTDnFIVeZkvAnsV/pszSOmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d8xvF5tBLz1B2p; Mon, 17 Nov 2025 06:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AH61DUk018492; Mon, 17 Nov 2025 06:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AH61Dwh018489; Mon, 17 Nov 2025 06:01:13 GMT (envelope-from git) Date: Mon, 17 Nov 2025 06:01:13 GMT Message-Id: <202511170601.5AH61Dwh018489@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c62eaf8af905 - main - stand: Update riscv efi booting to edk2 includes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c62eaf8af9054b9f370bdd396cae411848bc617b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c62eaf8af9054b9f370bdd396cae411848bc617b commit c62eaf8af9054b9f370bdd396cae411848bc617b Author: Warner Losh AuthorDate: 2025-11-17 05:09:34 +0000 Commit: Warner Losh CommitDate: 2025-11-17 05:58:03 +0000 stand: Update riscv efi booting to edk2 includes Update to include the right includes for the riscv protocol to get the hypervisor details. Note: I expanded the GUID inline rather than using a #define because there was none. This is only listed in UefiCpuPkg/UefiCpuPkg.dec, so include it here inline until we can automate using those files. Fixes: 43b8edb32051 Sponsored by: Netflix --- stand/efi/loader/arch/riscv/exec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stand/efi/loader/arch/riscv/exec.c b/stand/efi/loader/arch/riscv/exec.c index a53fbd9442b0..8d1a0bd03de0 100644 --- a/stand/efi/loader/arch/riscv/exec.c +++ b/stand/efi/loader/arch/riscv/exec.c @@ -41,10 +41,14 @@ #include "bootstrap.h" #include "loader_efi.h" +#include +#include + static void riscv_set_boot_hart(struct preloaded_file *fp) { - EFI_GUID riscvboot = RISCV_EFI_BOOT_PROTOCOL_GUID; + // No #define in EDK2 for this + EFI_GUID riscvboot = { 0xccd15fec, 0x6f73, 0x4eec, { 0x83, 0x95, 0x3e, 0x69, 0xe4, 0xb9, 0x40, 0xbf }}; RISCV_EFI_BOOT_PROTOCOL *proto; EFI_STATUS status = 0; uint64_t boot_hartid = ULONG_MAX; From nobody Mon Nov 17 06:01:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8xvH2zDbz6GdRv; Mon, 17 Nov 2025 06:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8xvH0GDqz3QxL; Mon, 17 Nov 2025 06:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763359275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FPI4igahpMxyOamp6d2YHoxJ7/wZnxsLQSNL244OpPo=; b=LjjWqhRN+qa+1HlrQISK/+FnDEdCyK/LkuQeZyluwyqgYZK1QpfOsMmDdW2hII0axkDKUg gfMDzheUtoT/UJ3Ti/h6/IWzaA76DWWW8GFwEvgqq8njPMsnfvxhCtvtfEEGucuqX/+p3A NPm+ZiC3KVDyjgHNXITZbsncRdycWRdqX7A9E/rQXknvMKtKb8/9Wz3KthXOPSv868cKU3 Sr2m+4cH5DpsTK7jVM5IGUjzSzPgnUPIkD6CCqdYKpHXofKkwPpeffsSWexKMBxZiIiZhF HxpQi8G0cWwuxtH26KB5QAJCv5VTT1CX0eApfZMIYxcwnm7iYsJEZ7c3x593Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763359275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FPI4igahpMxyOamp6d2YHoxJ7/wZnxsLQSNL244OpPo=; b=oG8eZc87v+5vX9s3RVyHcDngN5r1ykF+ZSTrtlH/6NcPq2M0ctfs/oQEaGnMTXFVSqcvLq 5eSggsEr5NaQUllazVZZ2Bkr8EjKcP/0F6LZGwXoDLAO2KoZXUJK/MvmLbJavMDFbANh00 iEPq43XgwiVRQz/hK5JfGiFnxiCuLREEwk2cbu2BWJ9OBGSC1qwMXnZdc3d46fz2vGm8jB PNZkiXInaI7/d6qrKSzMEFLxUlyJy6wwvTU7b1UHj3krnyF2WOix9ATt0K8e3Sw7bQTyaO xdOAFHYLtaasXZZdGC6L/J1Gn1fVAqyFZ+8TDkvN44UN3eO2JUqtjJcGaTOxYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763359275; a=rsa-sha256; cv=none; b=B2GKj+dW59asn1xiq2mQjRFO7DZ/pT0q/4fziG3LplKZ5VQ0wTwJkdT15RZnxwD9CJfV6s 7XQywshqNFcKkdnxQKfie/Xl3yhW/JzNbp6aKTLg/A+XQ6xy3hWBW3t+PhE/Zvo3/k3Jxu 14BuA8DZ9A8J05plKVXsr2FT8QA+WMzwoQiPIdiTT7ATEdt1/FRiDLHFaBMRup+1hqzjpL L+hr/PLZH1KTeQzcyZ52cH30Amp6GcPFSn9zCDTyk0YKkPQEPPUoqJZ0CfgAlG9HpFGROT edpAK6akUrdFjIfCD9UEESb+vtnSuiOWEIGEy/LEUDlPD21Xr4LZTF1ptHtdWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d8xvG6yP1z1B2q; Mon, 17 Nov 2025 06:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AH61EWv018524; Mon, 17 Nov 2025 06:01:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AH61EkT018521; Mon, 17 Nov 2025 06:01:14 GMT (envelope-from git) Date: Mon, 17 Nov 2025 06:01:14 GMT Message-Id: <202511170601.5AH61EkT018521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 3c5ca68b9b7c - main - stand: Fix secureboot build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c5ca68b9b7ce68a5376b8456edf6af57ed18f91 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3c5ca68b9b7ce68a5376b8456edf6af57ed18f91 commit 3c5ca68b9b7ce68a5376b8456edf6af57ed18f91 Author: Warner Losh AuthorDate: 2025-11-17 05:49:21 +0000 Commit: Warner Losh CommitDate: 2025-11-17 05:58:36 +0000 stand: Fix secureboot build Make libesecureboot build, enabled when WITH_BEARSSL=y WITH_LOADER_EFI_SECUREBOOT=y. Copy EDK2 files related to secure boot to sys/contrib/edk2 and delete duplicates under libsecreboot/efi/include. Adjust efi_variables.c to build in the new environment. Undefine MIN and MAX before include sys/param.h in libsecureboot.h. I'm not sure that sys/param.h is needed here, but either the param.h or the Base.h definitions are fine. Fix include paths to reflect the new way. Fixes: 43b8edb32051 Sponsored by: Netflix --- lib/libsecureboot/Makefile.libsa.inc | 2 +- lib/libsecureboot/efi/efi_variables.c | 1 + .../efi/include/Guid/GlobalVariable.h | 192 ------ lib/libsecureboot/h/libsecureboot.h | 2 + .../edk2/Include}/Guid/ImageAuthentication.h | 735 +++++++++++---------- .../contrib/edk2/Include}/Protocol/Hash.h | 338 +++++----- sys/contrib/edk2/Include/Protocol/Hash2.h | 196 ++++++ 7 files changed, 754 insertions(+), 712 deletions(-) diff --git a/lib/libsecureboot/Makefile.libsa.inc b/lib/libsecureboot/Makefile.libsa.inc index 7397d0fc1144..b1b5d7dd1e30 100644 --- a/lib/libsecureboot/Makefile.libsa.inc +++ b/lib/libsecureboot/Makefile.libsa.inc @@ -22,8 +22,8 @@ SRCS+= \ # Add includes required by efi part CFLAGS+= \ + -I${SRCTOP}/sys/contrib/edk2/Include \ -I${SRCTOP}/stand/efi/include \ - -I${SRCTOP}/lib/libsecureboot/efi/include \ -I${SRCTOP}/stand/efi/include/${MACHINE} .endif diff --git a/lib/libsecureboot/efi/efi_variables.c b/lib/libsecureboot/efi/efi_variables.c index 3c36bc66f788..4b2b6b5c91ca 100644 --- a/lib/libsecureboot/efi/efi_variables.c +++ b/lib/libsecureboot/efi/efi_variables.c @@ -30,6 +30,7 @@ #include #include +#include #include #define NEED_BRSSL_H diff --git a/lib/libsecureboot/efi/include/Guid/GlobalVariable.h b/lib/libsecureboot/efi/include/Guid/GlobalVariable.h deleted file mode 100644 index 3bd0a815fcf6..000000000000 --- a/lib/libsecureboot/efi/include/Guid/GlobalVariable.h +++ /dev/null @@ -1,192 +0,0 @@ -/** @file - GUID for EFI (NVRAM) Variables. - Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - @par Revision Reference: - GUID defined in UEFI 2.1 -**/ - -#ifndef __GLOBAL_VARIABLE_GUID_H__ -#define __GLOBAL_VARIABLE_GUID_H__ - -#include -#ifndef EFI_GLOBAL_VARIABLE -#define EFI_GLOBAL_VARIABLE \ - { \ - 0x8BE4DF61, 0x93CA, 0x11d2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C } \ - } -#endif /* EFI_GLOBAL_VARIABLE */ - -extern EFI_GUID gEfiGlobalVariableGuid; - -// -// Follow UEFI 2.4 spec: -// To prevent name collisions with possible future globally defined variables, -// other internal firmware data variables that are not defined here must be -// saved with a unique VendorGuid other than EFI_GLOBAL_VARIABLE or -// any other GUID defined by the UEFI Specification. Implementations must -// only permit the creation of variables with a UEFI Specification-defined -// VendorGuid when these variables are documented in the UEFI Specification. -// -// Note: except the globally defined variables defined below, the spec also defines -// L"Boot####" - A boot load option. -// L"Driver####" - A driver load option. -// L"SysPrep####" - A System Prep application load option. -// L"Key####" - Describes hot key relationship with a Boot#### load option. -// The attribute for them is NV+BS+RT, #### is a printed hex value, and no 0x or h -// is included in the hex value. They can not be expressed as a #define like other globally -// defined variables, it is because we can not list the Boot0000, Boot0001, etc one by one. -// - -/// -/// The language codes that the firmware supports. This value is deprecated. -/// Its attribute is BS+RT. -/// -#define EFI_LANG_CODES_VARIABLE_NAME L"LangCodes" -/// -/// The language code that the system is configured for. This value is deprecated. -/// Its attribute is NV+BS+RT. -/// -#define EFI_LANG_VARIABLE_NAME L"Lang" -/// -/// The firmware's boot managers timeout, in seconds, before initiating the default boot selection. -/// Its attribute is NV+BS+RT. -/// -#define EFI_TIME_OUT_VARIABLE_NAME L"Timeout" -/// -/// The language codes that the firmware supports. -/// Its attribute is BS+RT. -/// -#define EFI_PLATFORM_LANG_CODES_VARIABLE_NAME L"PlatformLangCodes" -/// -/// The language code that the system is configured for. -/// Its attribute is NV+BS+RT. -/// -#define EFI_PLATFORM_LANG_VARIABLE_NAME L"PlatformLang" -/// -/// The device path of the default input/output/error output console. -/// Its attribute is NV+BS+RT. -/// -#define EFI_CON_IN_VARIABLE_NAME L"ConIn" -#define EFI_CON_OUT_VARIABLE_NAME L"ConOut" -#define EFI_ERR_OUT_VARIABLE_NAME L"ErrOut" -/// -/// The device path of all possible input/output/error output devices. -/// Its attribute is BS+RT. -/// -#define EFI_CON_IN_DEV_VARIABLE_NAME L"ConInDev" -#define EFI_CON_OUT_DEV_VARIABLE_NAME L"ConOutDev" -#define EFI_ERR_OUT_DEV_VARIABLE_NAME L"ErrOutDev" -/// -/// The ordered boot option load list. -/// Its attribute is NV+BS+RT. -/// -#define EFI_BOOT_ORDER_VARIABLE_NAME L"BootOrder" -/// -/// The boot option for the next boot only. -/// Its attribute is NV+BS+RT. -/// -#define EFI_BOOT_NEXT_VARIABLE_NAME L"BootNext" -/// -/// The boot option that was selected for the current boot. -/// Its attribute is BS+RT. -/// -#define EFI_BOOT_CURRENT_VARIABLE_NAME L"BootCurrent" -/// -/// The types of boot options supported by the boot manager. Should be treated as read-only. -/// Its attribute is BS+RT. -/// -#define EFI_BOOT_OPTION_SUPPORT_VARIABLE_NAME L"BootOptionSupport" -/// -/// The ordered driver load option list. -/// Its attribute is NV+BS+RT. -/// -#define EFI_DRIVER_ORDER_VARIABLE_NAME L"DriverOrder" -/// -/// The ordered System Prep Application load option list. -/// Its attribute is NV+BS+RT. -/// -#define EFI_SYS_PREP_ORDER_VARIABLE_NAME L"SysPrepOrder" -/// -/// Identifies the level of hardware error record persistence -/// support implemented by the platform. This variable is -/// only modified by firmware and is read-only to the OS. -/// Its attribute is NV+BS+RT. -/// -#define EFI_HW_ERR_REC_SUPPORT_VARIABLE_NAME L"HwErrRecSupport" -/// -/// Whether the system is operating in setup mode (1) or not (0). -/// All other values are reserved. Should be treated as read-only. -/// Its attribute is BS+RT. -/// -#define EFI_SETUP_MODE_NAME L"SetupMode" -/// -/// The Key Exchange Key Signature Database. -/// Its attribute is NV+BS+RT+AT. -/// -#define EFI_KEY_EXCHANGE_KEY_NAME L"KEK" -/// -/// The public Platform Key. -/// Its attribute is NV+BS+RT+AT. -/// -#define EFI_PLATFORM_KEY_NAME L"PK" -/// -/// Array of GUIDs representing the type of signatures supported -/// by the platform firmware. Should be treated as read-only. -/// Its attribute is BS+RT. -/// -#define EFI_SIGNATURE_SUPPORT_NAME L"SignatureSupport" -/// -/// Whether the platform firmware is operating in Secure boot mode (1) or not (0). -/// All other values are reserved. Should be treated as read-only. -/// Its attribute is BS+RT. -/// -#define EFI_SECURE_BOOT_MODE_NAME L"SecureBoot" -/// -/// The OEM's default Key Exchange Key Signature Database. Should be treated as read-only. -/// Its attribute is BS+RT. -/// -#define EFI_KEK_DEFAULT_VARIABLE_NAME L"KEKDefault" -/// -/// The OEM's default public Platform Key. Should be treated as read-only. -/// Its attribute is BS+RT. -/// -#define EFI_PK_DEFAULT_VARIABLE_NAME L"PKDefault" -/// -/// The OEM's default secure boot signature store. Should be treated as read-only. -/// Its attribute is BS+RT. -/// -#define EFI_DB_DEFAULT_VARIABLE_NAME L"dbDefault" -/// -/// The OEM's default secure boot blacklist signature store. Should be treated as read-only. -/// Its attribute is BS+RT. -/// -#define EFI_DBX_DEFAULT_VARIABLE_NAME L"dbxDefault" -/// -/// The OEM's default secure boot timestamp signature store. Should be treated as read-only. -/// Its attribute is BS+RT. -/// -#define EFI_DBT_DEFAULT_VARIABLE_NAME L"dbtDefault" -/// -/// Allows the firmware to indicate supported features and actions to the OS. -/// Its attribute is BS+RT. -/// -#define EFI_OS_INDICATIONS_SUPPORT_VARIABLE_NAME L"OsIndicationsSupported" -/// -/// Allows the OS to request the firmware to enable certain features and to take certain actions. -/// Its attribute is NV+BS+RT. -/// -#define EFI_OS_INDICATIONS_VARIABLE_NAME L"OsIndications" -/// -/// Whether the system is configured to use only vendor provided -/// keys or not. Should be treated as read-only. -/// Its attribute is BS+RT. -/// -#define EFI_VENDOR_KEYS_VARIABLE_NAME L"VendorKeys" - -#endif diff --git a/lib/libsecureboot/h/libsecureboot.h b/lib/libsecureboot/h/libsecureboot.h index d32df9594332..fa8360338cfc 100644 --- a/lib/libsecureboot/h/libsecureboot.h +++ b/lib/libsecureboot/h/libsecureboot.h @@ -27,6 +27,8 @@ #ifndef _LIBSECUREBOOT_H_ #define _LIBSECUREBOOT_H_ +#undef MIN /* Conflicts with EDK2 */ +#undef MAX #include #ifdef _STANDALONE #define _DEBUG_LEVEL_VAR DebugVe diff --git a/lib/libsecureboot/efi/include/Guid/ImageAuthentication.h b/sys/contrib/edk2/Include/Guid/ImageAuthentication.h similarity index 75% rename from lib/libsecureboot/efi/include/Guid/ImageAuthentication.h rename to sys/contrib/edk2/Include/Guid/ImageAuthentication.h index b1fc1f54cce1..9cf77466da09 100644 --- a/lib/libsecureboot/efi/include/Guid/ImageAuthentication.h +++ b/sys/contrib/edk2/Include/Guid/ImageAuthentication.h @@ -1,350 +1,385 @@ -/** @file - Image signature database are defined for the signed image validation. - Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - @par Revision Reference: - GUIDs defined in UEFI 2.5 spec. -**/ - -#ifndef __IMAGE_AUTHTICATION_H__ -#define __IMAGE_AUTHTICATION_H__ - -#include -#include -#include - -#define EFI_IMAGE_SECURITY_DATABASE_GUID \ - { \ - 0xd719b2cb, 0x3d3a, 0x4596, { 0xa3, 0xbc, 0xda, 0xd0, 0xe, 0x67, 0x65, 0x6f } \ - } - -/// -/// Varialbe name with guid EFI_IMAGE_SECURITY_DATABASE_GUID -/// for the authorized signature database. -/// -#define EFI_IMAGE_SECURITY_DATABASE L"db" -/// -/// Varialbe name with guid EFI_IMAGE_SECURITY_DATABASE_GUID -/// for the forbidden signature database. -/// -#define EFI_IMAGE_SECURITY_DATABASE1 L"dbx" -/// -/// Variable name with guid EFI_IMAGE_SECURITY_DATABASE_GUID -/// for the timestamp signature database. -/// -#define EFI_IMAGE_SECURITY_DATABASE2 L"dbt" - -#define SECURE_BOOT_MODE_ENABLE 1 -#define SECURE_BOOT_MODE_DISABLE 0 - -#define SETUP_MODE 1 -#define USER_MODE 0 - -//*********************************************************************** -// Signature Database -//*********************************************************************** -/// -/// The format of a signature database. -/// -#pragma pack(1) - -typedef struct { - /// - /// An identifier which identifies the agent which added the signature to the list. - /// - EFI_GUID SignatureOwner; - /// - /// The format of the signature is defined by the SignatureType. - /// - UINT8 SignatureData[1]; -} EFI_SIGNATURE_DATA; - -typedef struct { - /// - /// Type of the signature. GUID signature types are defined in below. - /// - EFI_GUID SignatureType; - /// - /// Total size of the signature list, including this header. - /// - UINT32 SignatureListSize; - /// - /// Size of the signature header which precedes the array of signatures. - /// - UINT32 SignatureHeaderSize; - /// - /// Size of each signature. - /// - UINT32 SignatureSize; - /// - /// Header before the array of signatures. The format of this header is specified - /// by the SignatureType. - /// UINT8 SignatureHeader[SignatureHeaderSize]; - /// - /// An array of signatures. Each signature is SignatureSize bytes in length. - /// EFI_SIGNATURE_DATA Signatures[][SignatureSize]; - /// -} EFI_SIGNATURE_LIST; - -typedef struct { - /// - /// The SHA256 hash of an X.509 certificate's To-Be-Signed contents. - /// - EFI_SHA256_HASH ToBeSignedHash; - /// - /// The time that the certificate shall be considered to be revoked. - /// - EFI_TIME TimeOfRevocation; -} EFI_CERT_X509_SHA256; - -typedef struct { - /// - /// The SHA384 hash of an X.509 certificate's To-Be-Signed contents. - /// - EFI_SHA384_HASH ToBeSignedHash; - /// - /// The time that the certificate shall be considered to be revoked. - /// - EFI_TIME TimeOfRevocation; -} EFI_CERT_X509_SHA384; - -typedef struct { - /// - /// The SHA512 hash of an X.509 certificate's To-Be-Signed contents. - /// - EFI_SHA512_HASH ToBeSignedHash; - /// - /// The time that the certificate shall be considered to be revoked. - /// - EFI_TIME TimeOfRevocation; -} EFI_CERT_X509_SHA512; - -#pragma pack() - -/// -/// This identifies a signature containing a SHA-256 hash. The SignatureHeader size shall -/// always be 0. The SignatureSize shall always be 16 (size of SignatureOwner component) + -/// 32 bytes. -/// -#define EFI_CERT_SHA256_GUID \ - { \ - 0xc1c41626, 0x504c, 0x4092, {0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28} \ - } - -/// -/// This identifies a signature containing an RSA-2048 key. The key (only the modulus -/// since the public key exponent is known to be 0x10001) shall be stored in big-endian -/// order. -/// The SignatureHeader size shall always be 0. The SignatureSize shall always be 16 (size -/// of SignatureOwner component) + 256 bytes. -/// -#define EFI_CERT_RSA2048_GUID \ - { \ - 0x3c5766e8, 0x269c, 0x4e34, {0xaa, 0x14, 0xed, 0x77, 0x6e, 0x85, 0xb3, 0xb6} \ - } - -/// -/// This identifies a signature containing a RSA-2048 signature of a SHA-256 hash. The -/// SignatureHeader size shall always be 0. The SignatureSize shall always be 16 (size of -/// SignatureOwner component) + 256 bytes. -/// -#define EFI_CERT_RSA2048_SHA256_GUID \ - { \ - 0xe2b36190, 0x879b, 0x4a3d, {0xad, 0x8d, 0xf2, 0xe7, 0xbb, 0xa3, 0x27, 0x84} \ - } - -/// -/// This identifies a signature containing a SHA-1 hash. The SignatureSize shall always -/// be 16 (size of SignatureOwner component) + 20 bytes. -/// -#define EFI_CERT_SHA1_GUID \ - { \ - 0x826ca512, 0xcf10, 0x4ac9, {0xb1, 0x87, 0xbe, 0x1, 0x49, 0x66, 0x31, 0xbd} \ - } - -/// -/// TThis identifies a signature containing a RSA-2048 signature of a SHA-1 hash. The -/// SignatureHeader size shall always be 0. The SignatureSize shall always be 16 (size of -/// SignatureOwner component) + 256 bytes. -/// -#define EFI_CERT_RSA2048_SHA1_GUID \ - { \ - 0x67f8444f, 0x8743, 0x48f1, {0xa3, 0x28, 0x1e, 0xaa, 0xb8, 0x73, 0x60, 0x80} \ - } - -/// -/// This identifies a signature based on an X.509 certificate. If the signature is an X.509 -/// certificate then verification of the signature of an image should validate the public -/// key certificate in the image using certificate path verification, up to this X.509 -/// certificate as a trusted root. The SignatureHeader size shall always be 0. The -/// SignatureSize may vary but shall always be 16 (size of the SignatureOwner component) + -/// the size of the certificate itself. -/// Note: This means that each certificate will normally be in a separate EFI_SIGNATURE_LIST. -/// -#define EFI_CERT_X509_GUID \ - { \ - 0xa5c059a1, 0x94e4, 0x4aa7, {0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72} \ - } - -/// -/// This identifies a signature containing a SHA-224 hash. The SignatureHeader size shall -/// always be 0. The SignatureSize shall always be 16 (size of SignatureOwner component) + -/// 28 bytes. -/// -#define EFI_CERT_SHA224_GUID \ - { \ - 0xb6e5233, 0xa65c, 0x44c9, {0x94, 0x7, 0xd9, 0xab, 0x83, 0xbf, 0xc8, 0xbd} \ - } - -/// -/// This identifies a signature containing a SHA-384 hash. The SignatureHeader size shall -/// always be 0. The SignatureSize shall always be 16 (size of SignatureOwner component) + -/// 48 bytes. -/// -#define EFI_CERT_SHA384_GUID \ - { \ - 0xff3e5307, 0x9fd0, 0x48c9, {0x85, 0xf1, 0x8a, 0xd5, 0x6c, 0x70, 0x1e, 0x1} \ - } - -/// -/// This identifies a signature containing a SHA-512 hash. The SignatureHeader size shall -/// always be 0. The SignatureSize shall always be 16 (size of SignatureOwner component) + -/// 64 bytes. -/// -#define EFI_CERT_SHA512_GUID \ - { \ - 0x93e0fae, 0xa6c4, 0x4f50, {0x9f, 0x1b, 0xd4, 0x1e, 0x2b, 0x89, 0xc1, 0x9a} \ - } - -/// -/// This identifies a signature containing the SHA256 hash of an X.509 certificate's -/// To-Be-Signed contents, and a time of revocation. The SignatureHeader size shall -/// always be 0. The SignatureSize shall always be 16 (size of the SignatureOwner component) -/// + 48 bytes for an EFI_CERT_X509_SHA256 structure. If the TimeOfRevocation is non-zero, -/// the certificate should be considered to be revoked from that time and onwards, and -/// otherwise the certificate shall be considered to always be revoked. -/// -#define EFI_CERT_X509_SHA256_GUID \ - { \ - 0x3bd2a492, 0x96c0, 0x4079, {0xb4, 0x20, 0xfc, 0xf9, 0x8e, 0xf1, 0x03, 0xed } \ - } - -/// -/// This identifies a signature containing the SHA384 hash of an X.509 certificate's -/// To-Be-Signed contents, and a time of revocation. The SignatureHeader size shall -/// always be 0. The SignatureSize shall always be 16 (size of the SignatureOwner component) -/// + 64 bytes for an EFI_CERT_X509_SHA384 structure. If the TimeOfRevocation is non-zero, -/// the certificate should be considered to be revoked from that time and onwards, and -/// otherwise the certificate shall be considered to always be revoked. -/// -#define EFI_CERT_X509_SHA384_GUID \ - { \ - 0x7076876e, 0x80c2, 0x4ee6, {0xaa, 0xd2, 0x28, 0xb3, 0x49, 0xa6, 0x86, 0x5b } \ - } - -/// -/// This identifies a signature containing the SHA512 hash of an X.509 certificate's -/// To-Be-Signed contents, and a time of revocation. The SignatureHeader size shall -/// always be 0. The SignatureSize shall always be 16 (size of the SignatureOwner component) -/// + 80 bytes for an EFI_CERT_X509_SHA512 structure. If the TimeOfRevocation is non-zero, -/// the certificate should be considered to be revoked from that time and onwards, and -/// otherwise the certificate shall be considered to always be revoked. -/// -#define EFI_CERT_X509_SHA512_GUID \ - { \ - 0x446dbf63, 0x2502, 0x4cda, {0xbc, 0xfa, 0x24, 0x65, 0xd2, 0xb0, 0xfe, 0x9d } \ - } - -/// -/// This identifies a signature containing a DER-encoded PKCS #7 version 1.5 [RFC2315] -/// SignedData value. -/// -#define EFI_CERT_TYPE_PKCS7_GUID \ - { \ - 0x4aafd29d, 0x68df, 0x49ee, {0x8a, 0xa9, 0x34, 0x7d, 0x37, 0x56, 0x65, 0xa7} \ - } - -//*********************************************************************** -// Image Execution Information Table Definition -//*********************************************************************** -typedef UINT32 EFI_IMAGE_EXECUTION_ACTION; - -#define EFI_IMAGE_EXECUTION_AUTHENTICATION 0x00000007 -#define EFI_IMAGE_EXECUTION_AUTH_UNTESTED 0x00000000 -#define EFI_IMAGE_EXECUTION_AUTH_SIG_FAILED 0x00000001 -#define EFI_IMAGE_EXECUTION_AUTH_SIG_PASSED 0x00000002 -#define EFI_IMAGE_EXECUTION_AUTH_SIG_NOT_FOUND 0x00000003 -#define EFI_IMAGE_EXECUTION_AUTH_SIG_FOUND 0x00000004 -#define EFI_IMAGE_EXECUTION_POLICY_FAILED 0x00000005 -#define EFI_IMAGE_EXECUTION_INITIALIZED 0x00000008 - -// -// EFI_IMAGE_EXECUTION_INFO is added to EFI System Configuration Table -// and assigned the GUID EFI_IMAGE_SECURITY_DATABASE_GUID. -// -typedef struct { - /// - /// Describes the action taken by the firmware regarding this image. - /// - EFI_IMAGE_EXECUTION_ACTION Action; - /// - /// Size of all of the entire structure. - /// - UINT32 InfoSize; - /// - /// If this image was a UEFI device driver (for option ROM, for example) this is the - /// null-terminated, user-friendly name for the device. If the image was for an application, - /// then this is the name of the application. If this cannot be determined, then a simple - /// NULL character should be put in this position. - /// CHAR16 Name[]; - /// - - /// - /// For device drivers, this is the device path of the device for which this device driver - /// was intended. In some cases, the driver itself may be stored as part of the system - /// firmware, but this field should record the device's path, not the firmware path. For - /// applications, this is the device path of the application. If this cannot be determined, - /// a simple end-of-path device node should be put in this position. - /// EFI_DEVICE_PATH_PROTOCOL DevicePath; - /// - - /// - /// Zero or more image signatures. If the image contained no signatures, - /// then this field is empty. - /// EFI_SIGNATURE_LIST Signature; - /// -} EFI_IMAGE_EXECUTION_INFO; - - -typedef struct { - /// - /// Number of EFI_IMAGE_EXECUTION_INFO structures. - /// - UINTN NumberOfImages; - /// - /// Number of image instances of EFI_IMAGE_EXECUTION_INFO structures. - /// - // EFI_IMAGE_EXECUTION_INFO InformationInfo[] -} EFI_IMAGE_EXECUTION_INFO_TABLE; - -extern EFI_GUID gEfiImageSecurityDatabaseGuid; -extern EFI_GUID gEfiCertSha256Guid; -extern EFI_GUID gEfiCertRsa2048Guid; -extern EFI_GUID gEfiCertRsa2048Sha256Guid; -extern EFI_GUID gEfiCertSha1Guid; -extern EFI_GUID gEfiCertRsa2048Sha1Guid; -extern EFI_GUID gEfiCertX509Guid; -extern EFI_GUID gEfiCertSha224Guid; -extern EFI_GUID gEfiCertSha384Guid; -extern EFI_GUID gEfiCertSha512Guid; -extern EFI_GUID gEfiCertX509Sha256Guid; -extern EFI_GUID gEfiCertX509Sha384Guid; -extern EFI_GUID gEfiCertX509Sha512Guid; -extern EFI_GUID gEfiCertPkcs7Guid; - -#endif +/** @file + Image signature database are defined for the signed image validation. + + Copyright (c) 2009 - 2024, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + + @par Revision Reference: + GUIDs defined in UEFI 2.5 spec. +**/ + +#ifndef __IMAGE_AUTHTICATION_H__ +#define __IMAGE_AUTHTICATION_H__ + +#include +#include + +#define EFI_IMAGE_SECURITY_DATABASE_GUID \ + { \ + 0xd719b2cb, 0x3d3a, 0x4596, { 0xa3, 0xbc, 0xda, 0xd0, 0xe, 0x67, 0x65, 0x6f } \ + } + +/// +/// Varialbe name with guid EFI_IMAGE_SECURITY_DATABASE_GUID +/// for the authorized signature database. +/// +#define EFI_IMAGE_SECURITY_DATABASE L"db" +/// +/// Varialbe name with guid EFI_IMAGE_SECURITY_DATABASE_GUID +/// for the forbidden signature database. +/// +#define EFI_IMAGE_SECURITY_DATABASE1 L"dbx" +/// +/// Variable name with guid EFI_IMAGE_SECURITY_DATABASE_GUID +/// for the timestamp signature database. +/// +#define EFI_IMAGE_SECURITY_DATABASE2 L"dbt" + +#define SECURE_BOOT_MODE_ENABLE 1 +#define SECURE_BOOT_MODE_DISABLE 0 + +#define SETUP_MODE 1 +#define USER_MODE 0 + +#define DEVICE_AUTH_BOOT_MODE_ENABLE 1 +#define DEVICE_AUTH_BOOT_MODE_DISABLE 0 + +// *********************************************************************** +// Signature Database +// *********************************************************************** +/// +/// The format of a signature database. +/// +#pragma pack(1) + +typedef struct { + /// + /// An identifier which identifies the agent which added the signature to the list. + /// + EFI_GUID SignatureOwner; + /// + /// The format of the signature is defined by the SignatureType. + /// + UINT8 SignatureData[1]; +} EFI_SIGNATURE_DATA; + +typedef struct { + /// + /// Type of the signature. GUID signature types are defined in below. + /// + EFI_GUID SignatureType; + /// + /// Total size of the signature list, including this header. + /// + UINT32 SignatureListSize; + /// + /// Size of the signature header which precedes the array of signatures. + /// + UINT32 SignatureHeaderSize; + /// + /// Size of each signature. + /// + UINT32 SignatureSize; + /// + /// Header before the array of signatures. The format of this header is specified + /// by the SignatureType. + /// UINT8 SignatureHeader[SignatureHeaderSize]; + /// + /// An array of signatures. Each signature is SignatureSize bytes in length. + /// EFI_SIGNATURE_DATA Signatures[][SignatureSize]; + /// +} EFI_SIGNATURE_LIST; + +typedef struct { + /// + /// The SHA256 hash of an X.509 certificate's To-Be-Signed contents. + /// + EFI_SHA256_HASH ToBeSignedHash; + /// + /// The time that the certificate shall be considered to be revoked. + /// + EFI_TIME TimeOfRevocation; +} EFI_CERT_X509_SHA256; + +typedef struct { + /// + /// The SHA384 hash of an X.509 certificate's To-Be-Signed contents. + /// + EFI_SHA384_HASH ToBeSignedHash; + /// + /// The time that the certificate shall be considered to be revoked. + /// + EFI_TIME TimeOfRevocation; +} EFI_CERT_X509_SHA384; + +typedef struct { + /// + /// The SHA512 hash of an X.509 certificate's To-Be-Signed contents. + /// + EFI_SHA512_HASH ToBeSignedHash; + /// + /// The time that the certificate shall be considered to be revoked. + /// + EFI_TIME TimeOfRevocation; +} EFI_CERT_X509_SHA512; + +typedef UINT8 EFI_SM3_HASH[32]; + +typedef struct { + /// + /// The SM3 hash of an X.509 certificate's To-Be-Signed contents. + /// + EFI_SM3_HASH ToBeSignedHash; + /// + /// The time that the certificate shall be considered to be revoked. + /// + EFI_TIME TimeOfRevocation; +} EFI_CERT_X509_SM3; + +#pragma pack() + +/// +/// This identifies a signature containing a SHA-256 hash. The SignatureHeader size shall +/// always be 0. The SignatureSize shall always be 16 (size of SignatureOwner component) + +/// 32 bytes. +/// +#define EFI_CERT_SHA256_GUID \ + { \ + 0xc1c41626, 0x504c, 0x4092, {0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28} \ + } + +/// +/// This identifies a signature containing an RSA-2048 key. The key (only the modulus +/// since the public key exponent is known to be 0x10001) shall be stored in big-endian +/// order. +/// The SignatureHeader size shall always be 0. The SignatureSize shall always be 16 (size +/// of SignatureOwner component) + 256 bytes. +/// +#define EFI_CERT_RSA2048_GUID \ + { \ + 0x3c5766e8, 0x269c, 0x4e34, {0xaa, 0x14, 0xed, 0x77, 0x6e, 0x85, 0xb3, 0xb6} \ + } + +/// +/// This identifies a signature containing a RSA-2048 signature of a SHA-256 hash. The +/// SignatureHeader size shall always be 0. The SignatureSize shall always be 16 (size of +/// SignatureOwner component) + 256 bytes. +/// +#define EFI_CERT_RSA2048_SHA256_GUID \ + { \ + 0xe2b36190, 0x879b, 0x4a3d, {0xad, 0x8d, 0xf2, 0xe7, 0xbb, 0xa3, 0x27, 0x84} \ + } + +/// +/// This identifies a signature containing a SHA-1 hash. The SignatureSize shall always +/// be 16 (size of SignatureOwner component) + 20 bytes. +/// +#define EFI_CERT_SHA1_GUID \ + { \ + 0x826ca512, 0xcf10, 0x4ac9, {0xb1, 0x87, 0xbe, 0x1, 0x49, 0x66, 0x31, 0xbd} \ + } + +/// +/// This identifies a signature containing a SM3 hash. The SignatureSize shall always +/// be 16 (size of SignatureOwner component) + 32 bytes. +/// +#define EFI_CERT_SM3_GUID \ + { \ + 0x57347f87, 0x7a9b, 0x403a, { 0xb9, 0x3c, 0xdc, 0x4a, 0xfb, 0x7a, 0xe, 0xbc } \ + } + +/// +/// TThis identifies a signature containing a RSA-2048 signature of a SHA-1 hash. The +/// SignatureHeader size shall always be 0. The SignatureSize shall always be 16 (size of +/// SignatureOwner component) + 256 bytes. +/// +#define EFI_CERT_RSA2048_SHA1_GUID \ + { \ + 0x67f8444f, 0x8743, 0x48f1, {0xa3, 0x28, 0x1e, 0xaa, 0xb8, 0x73, 0x60, 0x80} \ + } + +/// +/// This identifies a signature based on an X.509 certificate. If the signature is an X.509 +/// certificate then verification of the signature of an image should validate the public +/// key certificate in the image using certificate path verification, up to this X.509 +/// certificate as a trusted root. The SignatureHeader size shall always be 0. The +/// SignatureSize may vary but shall always be 16 (size of the SignatureOwner component) + +/// the size of the certificate itself. +/// Note: This means that each certificate will normally be in a separate EFI_SIGNATURE_LIST. +/// +#define EFI_CERT_X509_GUID \ + { \ + 0xa5c059a1, 0x94e4, 0x4aa7, {0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72} \ + } + +/// +/// This identifies a signature containing the SM3 hash of an X.509 certificate's To-Be-Signed +/// contents, and a time of revocation. The SignatureHeader size shall always be 0. The +/// SignatureSize shall always be 16 (size of the SignatureOwner component) + 32 bytes for +/// an EFI_CERT_X509_SM3 structure. If the TimeOfRevocation is non-zero, the certificate should +/// be considered to be revoked from that time and onwards, and otherwise the certificate shall +/// be considered to always be revoked. +/// +#define EFI_CERT_X509_SM3_GUID \ + { \ + 0x60d807e5, 0x10b4, 0x49a9, {0x93, 0x31, 0xe4, 0x4, 0x37, 0x88, 0x8d, 0x37 } \ + } + +/// +/// This identifies a signature containing a SHA-224 hash. The SignatureHeader size shall +/// always be 0. The SignatureSize shall always be 16 (size of SignatureOwner component) + +/// 28 bytes. +/// +#define EFI_CERT_SHA224_GUID \ + { \ + 0xb6e5233, 0xa65c, 0x44c9, {0x94, 0x7, 0xd9, 0xab, 0x83, 0xbf, 0xc8, 0xbd} \ + } + +/// +/// This identifies a signature containing a SHA-384 hash. The SignatureHeader size shall +/// always be 0. The SignatureSize shall always be 16 (size of SignatureOwner component) + +/// 48 bytes. +/// +#define EFI_CERT_SHA384_GUID \ + { \ + 0xff3e5307, 0x9fd0, 0x48c9, {0x85, 0xf1, 0x8a, 0xd5, 0x6c, 0x70, 0x1e, 0x1} \ + } + +/// +/// This identifies a signature containing a SHA-512 hash. The SignatureHeader size shall +/// always be 0. The SignatureSize shall always be 16 (size of SignatureOwner component) + +/// 64 bytes. +/// +#define EFI_CERT_SHA512_GUID \ + { \ + 0x93e0fae, 0xa6c4, 0x4f50, {0x9f, 0x1b, 0xd4, 0x1e, 0x2b, 0x89, 0xc1, 0x9a} \ + } + +/// +/// This identifies a signature containing the SHA256 hash of an X.509 certificate's +/// To-Be-Signed contents, and a time of revocation. The SignatureHeader size shall +/// always be 0. The SignatureSize shall always be 16 (size of the SignatureOwner component) +/// + 48 bytes for an EFI_CERT_X509_SHA256 structure. If the TimeOfRevocation is non-zero, +/// the certificate should be considered to be revoked from that time and onwards, and +/// otherwise the certificate shall be considered to always be revoked. +/// +#define EFI_CERT_X509_SHA256_GUID \ + { \ + 0x3bd2a492, 0x96c0, 0x4079, {0xb4, 0x20, 0xfc, 0xf9, 0x8e, 0xf1, 0x03, 0xed } \ + } + +/// +/// This identifies a signature containing the SHA384 hash of an X.509 certificate's +/// To-Be-Signed contents, and a time of revocation. The SignatureHeader size shall +/// always be 0. The SignatureSize shall always be 16 (size of the SignatureOwner component) +/// + 64 bytes for an EFI_CERT_X509_SHA384 structure. If the TimeOfRevocation is non-zero, +/// the certificate should be considered to be revoked from that time and onwards, and +/// otherwise the certificate shall be considered to always be revoked. +/// +#define EFI_CERT_X509_SHA384_GUID \ + { \ + 0x7076876e, 0x80c2, 0x4ee6, {0xaa, 0xd2, 0x28, 0xb3, 0x49, 0xa6, 0x86, 0x5b } \ + } + +/// +/// This identifies a signature containing the SHA512 hash of an X.509 certificate's +/// To-Be-Signed contents, and a time of revocation. The SignatureHeader size shall +/// always be 0. The SignatureSize shall always be 16 (size of the SignatureOwner component) +/// + 80 bytes for an EFI_CERT_X509_SHA512 structure. If the TimeOfRevocation is non-zero, +/// the certificate should be considered to be revoked from that time and onwards, and +/// otherwise the certificate shall be considered to always be revoked. +/// +#define EFI_CERT_X509_SHA512_GUID \ + { \ + 0x446dbf63, 0x2502, 0x4cda, {0xbc, 0xfa, 0x24, 0x65, 0xd2, 0xb0, 0xfe, 0x9d } \ + } + +/// +/// This identifies a signature containing a DER-encoded PKCS #7 version 1.5 [RFC2315] +/// SignedData value. +/// +#define EFI_CERT_TYPE_PKCS7_GUID \ + { \ + 0x4aafd29d, 0x68df, 0x49ee, {0x8a, 0xa9, 0x34, 0x7d, 0x37, 0x56, 0x65, 0xa7} \ + } + +// *********************************************************************** +// Image Execution Information Table Definition +// *********************************************************************** +typedef UINT32 EFI_IMAGE_EXECUTION_ACTION; + +#define EFI_IMAGE_EXECUTION_AUTHENTICATION 0x00000007 +#define EFI_IMAGE_EXECUTION_AUTH_UNTESTED 0x00000000 +#define EFI_IMAGE_EXECUTION_AUTH_SIG_FAILED 0x00000001 +#define EFI_IMAGE_EXECUTION_AUTH_SIG_PASSED 0x00000002 +#define EFI_IMAGE_EXECUTION_AUTH_SIG_NOT_FOUND 0x00000003 +#define EFI_IMAGE_EXECUTION_AUTH_SIG_FOUND 0x00000004 +#define EFI_IMAGE_EXECUTION_POLICY_FAILED 0x00000005 +#define EFI_IMAGE_EXECUTION_INITIALIZED 0x00000008 + +// +// EFI_IMAGE_EXECUTION_INFO is added to EFI System Configuration Table +// and assigned the GUID EFI_IMAGE_SECURITY_DATABASE_GUID. +// +typedef struct { + /// + /// Describes the action taken by the firmware regarding this image. + /// + EFI_IMAGE_EXECUTION_ACTION Action; + /// + /// Size of all of the entire structure. + /// + UINT32 InfoSize; + /// + /// If this image was a UEFI device driver (for option ROM, for example) this is the + /// null-terminated, user-friendly name for the device. If the image was for an application, + /// then this is the name of the application. If this cannot be determined, then a simple + /// NULL character should be put in this position. + /// CHAR16 Name[]; + /// + + /// + /// For device drivers, this is the device path of the device for which this device driver + /// was intended. In some cases, the driver itself may be stored as part of the system + /// firmware, but this field should record the device's path, not the firmware path. For + /// applications, this is the device path of the application. If this cannot be determined, + /// a simple end-of-path device node should be put in this position. + /// EFI_DEVICE_PATH_PROTOCOL DevicePath; + /// + + /// + /// Zero or more image signatures. If the image contained no signatures, + /// then this field is empty. + /// EFI_SIGNATURE_LIST Signature; + /// +} EFI_IMAGE_EXECUTION_INFO; *** 578 LINES SKIPPED *** From nobody Mon Nov 17 06:05:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8xzy36M7z6GdBJ for ; Mon, 17 Nov 2025 06:05:18 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8xzx1wzwz3SF7 for ; Mon, 17 Nov 2025 06:05:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20230601.gappssmtp.com header.s=20230601 header.b=Y8IAQx2A; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::1030) smtp.mailfrom=wlosh@bsdimp.com Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-340bb1cb9ddso3393555a91.2 for ; Sun, 16 Nov 2025 22:05:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1763359515; x=1763964315; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=pJIA99Ovhr5E9/GPOmcHIVHFt9ABVADqpCfcAcpZe5I=; b=Y8IAQx2Ak9+wrlwdw+kEmjZBvzDAii5YWlpDX4jwV3LyPc+wA3SnA/KywA6nG+gECC 2jxttrUcRTEv4QtAsw9KbSLsQfPCrPMYP89MxEtX84/OQim8BaIdIxJDgXK3xRmsFmdu KetZ/eIQ+08LC41R5gAYbyY90Bso+tnBepziAfl5gnqxX5D11NQ3ME9cVfeYpPdPD3BS i2vjHt1lriudMOyHn2KlLrWOTiyzRcSJA7Jm60KtAuUdJTkJkkRIm3nzFmouNGBcIeBy fTvDgurqK9DzT3MPcT/LtQmM08fV8Mak1X3L//Qx4Gs8yilweyNa9LkrN+IzJvSGk4nD 7WDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763359515; x=1763964315; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pJIA99Ovhr5E9/GPOmcHIVHFt9ABVADqpCfcAcpZe5I=; b=HxGNak2VkpJCX37jmwHLtmQWDqcZDg5JtpThUNYCYc2ultS/DcweLAJHJYpjBHBcEb w5binTE6yNG4eBSa/9alAA33HhVWGyzVdA9yNg30u1/2LsIKVb9soDJ9lP+CoBdHrxsc YelqKYd3pHz02scon+GYKbg0vs0ifF5wkXPCc6qAa8HExsiqL0GTL5sstQdbFcbkd+9w T89iowA4pN2FnDUgTTeYxo97nX5QWdgEckQjm0r6Uyll2LKhde66kF7zKv3ndNaOu7iC n9f0dD0N2JQrrtitSbTJuEO8UfWrmvTO5eS1sgTtX5hpvrgDCmlnibK/4LXI1TOW4uXR 0EYw== X-Forwarded-Encrypted: i=1; AJvYcCW+ka1oDxHuC4qDajFi9lsEv/8gpkeBMfUE33bIUoWXIANv862hT55DwuVfw7BwAjKNd+efLbAngN25LXjHOPLsSQFR@freebsd.org X-Gm-Message-State: AOJu0YxuzNbw+TeiN8daGDeOlFbDcxTclAsFd7RPGjetNvKwRhzbF1w+ T/B0r0SAzNDIX2I3TTq6MjXx7L+tm/yYPW2wF3g4WCjZnA790Fa01ykLeIDeka5++phAC0X7/q5 er4UiGyEc/EC0x8wkwAmE/48qFa/dGNsFIwuDEzqR1Q== X-Gm-Gg: ASbGncsEvInJOUgGjyOyZWz/E4aQ7TAbcDq7HC1ozt8MiVBGI6d1r7CEC+tZQZBTi+7 iQ6IJI6Xd7efaVzPDDHNEoRvh7/YSBfglDL9n3/KOCGJE+WzfeinK8RYUnPQIpcAAH8cjHcUh/C m4SzHzAc/TGyRuYQcnr5MyKCL/1JmzyUOrMOUhCPyoqx+Ys6F2LYNBIOF1pa2kmn5A7RiRNKWme Ze5ZeM3EiopjTR7+qPtw0D8Vo59anw+w/9TTEmhK4Dv4NoXOM6eIqEKuODAsHlxy5I3q3g= X-Google-Smtp-Source: AGHT+IGh9wjHLq2azusccrw0tb/hnW9GkG+4B/ikojqXaobzAOh0kL0TiXo2q7BLMEOScsoTdnNkyIq0zJnYAF7YPys= X-Received: by 2002:a17:90b:3d92:b0:33b:6650:57c3 with SMTP id 98e67ed59e1d1-343fa63269amr11423544a91.21.1763359515156; Sun, 16 Nov 2025 22:05:15 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202511170018.5AH0ITWK063891@gitrepo.freebsd.org> <20251117051144.3d0c31d9@thor.sb211.local> In-Reply-To: From: Warner Losh Date: Sun, 16 Nov 2025 23:05:08 -0700 X-Gm-Features: AWmQ_bk5Kwd3fM75I4wSPxP1kx1E8K4PVuD4YCtiupn8XKsZeWHPWLtFWCRnfsY Message-ID: Subject: Re: git: 44fb9f2701c7 - main - sys/efi_map.h: This is a kernel-only file To: A FreeBSD User Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000083325b0643c4218e" X-Spamd-Bar: -- X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20230601.gappssmtp.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+,1:+,2:~]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::1030:from]; R_SPF_NA(0.00)[no SPF record]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; MISSING_XM_UA(0.00)[]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20230601.gappssmtp.com:+] X-Rspamd-Queue-Id: 4d8xzx1wzwz3SF7 --00000000000083325b0643c4218e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Nov 16, 2025 at 10:16=E2=80=AFPM Warner Losh wrote= : > > > On Sun, Nov 16, 2025 at 9:14=E2=80=AFPM A FreeBSD User > wrote: > >> Am Tage des Herren Mon, 17 Nov 2025 00:18:29 GMT >> Warner Losh schrieb: >> >> > The branch main has been updated by imp: >> > >> > URL: >> https://cgit.FreeBSD.org/src/commit/?id=3D44fb9f2701c71ce6bba75810fc6b7e= 735ecd5868 >> > >> > commit 44fb9f2701c71ce6bba75810fc6b7e735ecd5868 >> > Author: Warner Losh >> > AuthorDate: 2025-11-16 23:58:37 +0000 >> > Commit: Warner Losh >> > CommitDate: 2025-11-17 00:16:26 +0000 >> > >> > sys/efi_map.h: This is a kernel-only file >> > >> > Slap a #ifdef _KERNEL around it all since it's useless to userland= . >> > >> > Fixes: 43b8edb32051 >> > Sponsored by: Netflix >> > --- >> > sys/sys/efi_map.h | 4 ++++ >> > 1 file changed, 4 insertions(+) >> > >> > diff --git a/sys/sys/efi_map.h b/sys/sys/efi_map.h >> > index 8b458cd08b00..d2206056b1f8 100644 >> > --- a/sys/sys/efi_map.h >> > +++ b/sys/sys/efi_map.h >> > @@ -7,6 +7,8 @@ >> > #ifndef _SYS_EFI_MAP_H_ >> > #define _SYS_EFI_MAP_H_ >> > >> > +#ifdef _KERNEL >> > + >> > #include >> > #include >> > >> > @@ -21,4 +23,6 @@ void efi_map_add_entries(struct efi_map_header >> *efihdr); >> > void efi_map_exclude_entries(struct efi_map_header *efihdr); >> > void efi_map_print_entries(struct efi_map_header *efihdr); >> > >> > +#endif >> > + >> > #endif /* !_SYS_EFI_MAP_H_ */ >> > >> >> Hello, >> >> tried a buildworld just now and it fails, something seems missing: >> >> [...] >> =3D=3D=3D> stand/libsa (all) >> mkdir -p xlocale arpa ssp; for i in a.out.h assert.h elf.h limits.h >> nlist.h setjmp.h stddef.h >> stdbool.h string.h strings.h time.h uuid.h; do ln -sf >> /usr/src/include/$i $i; done; ln -sf >> /usr/src/sys/sys/errno.h errno.h; ln -sf /usr/src/sys/sys/stdarg.h >> stdarg.h; ln -sf >> /usr/src/sys/sys/stdint.h stdint.h; ln -sf /usr/src/include/arpa/inet.h >> arpa/inet.h; ln -sf >> /usr/src/include/arpa/tftp.h arpa/tftp.h; ln -sf >> /usr/src/include/ssp/ssp.h ssp/ssp.h; for i in _time.h _strings.h >> _string.h; do [ -f xlocale/$i ] || :> >> xlocale/$i; done; for i in ctype.h fcntl.h signal.h stdio.h stdlib.h >> unistd.h; do ln -sf >> /usr/src/stand/libsa/stand.h $i; done cc -target >> x86_64-unknown-freebsd16.0 >> --sysroot=3D/usr/obj/usr/src/amd64.amd64/tmp >> -B/usr/obj/usr/src/amd64.amd64/tmp/usr/bin -O2 >> -pipe -fno-common -nostdinc >> -I/usr/obj/usr/src/amd64.amd64/stand/libsa >> -I/usr/src/stand/libsa -D_STANDALONE -I/usr/src/sys >> -Ddouble=3Djagged-little-pill >> -Dfloat=3Dfloaty-mcfloatface -ffunction-sections -fdata-sections >> -DLOADER_GELI_SUPPORT >> -I/usr/src/stand/libsa/geli -DLOADER_DISK_SUPPORT -ffreestanding -mno-mm= x >> -mno-sse -mno-avx >> -mno-avx2 -msoft-float -fPIC -mno-red-zone -mno-relax -I. >> -DLOADER_VERIEXEC >> -I/usr/src/lib/libsecureboot/h -DLOADER_VERIEXEC_VECTX -Iinclude >> -I/usr/src/contrib/bearssl/inc -Wno-deprecated-non-prototype >> -I/usr/src/contrib/bearssl/src >> -I/usr/src/lib/libsecureboot/h -DHAVE_BR_X509_TIME_CHECK -DNO_STDIO >> -I/usr/src/contrib/bearssl/tools -I. -DTRUST_ANCHOR_STR=3Dta_PEM >> -DVE_SHA256_SUPPORT >> -DVE_SHA384_SUPPORT -DVE_RSA_SUPPORT -DVE_PCR_SUPPORT >> -I/usr/src/stand/efi/include >> -I/usr/src/lib/libsecureboot/efi/include >> -I/usr/src/stand/efi/include/amd64 -DNDEBUG -MD >> -MF.depend.efi_variables.o -MTefi_variables.o -std=3Dgnu17 >> -Wno-format-zero-length >> -Wsystem-headers -Wno-pointer-sign -Wdate-time -Wno-empty-body >> -Wno-string-plus-int >> -Wno-unused-const-variable -Wno-error=3Dunused-but-set-parameter >> -Wno-error=3Dcast-function-type-mismatch -Wno-tautological-compare >> -Wno-unused-value >> -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion >> -Wno-unused-local-typedef >> -Wno-address-of-packed-member -Wno-switch -Wno-switch-enum >> -Wno-knr-promoted-parameter >> -Wno-parentheses -Oz -Qunused-arguments -c >> /usr/src/lib/libsecureboot/efi/efi_variables.c >> -o efi_variables.o In file included from >> /usr/src/lib/libsecureboot/efi/efi_variables.c:31: >> /usr/src/stand/efi/include/efi.h:47:10: fatal error: 'Uefi.h' file not >> found 47 | #include >> >> [...] > > > I've done 20 buildworlds today. And on what architecture? What do you hav= e > in your src.conf since I'm not seeing this and I didn't think we built > libsecureboot by default. I certainly didn't fix it and didn't expect it = to > include efi.h from stand. I'm skeptical about why since that file is > tailored to the boot loader only. > > Warner > Oh, I see. WITH_BEARSSL and WITH_LOADER_EFI_SECUREBOOT must have been selected. I just fixed this with 3c5ca68b9b7c. Unless it's something else, in which case I'll need more details. Warner --00000000000083325b0643c4218e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Sun, Nov 16,= 2025 at 10:16=E2=80=AFPM Warner Losh <imp@bsdimp.com> wrote:


On Sun, Nov 16, 2025= at 9:14=E2=80=AFPM A FreeBSD User <freebsd@walstatt-de.de> wrote:
Am Tage des Herren Mon, 17 No= v 2025 00:18:29 GMT
Warner Losh <imp@FreeBSD.org> schrieb:

> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D44fb9f2701c71ce6bba75810fc6b7e735ecd5868<= /a>
>
> commit 44fb9f2701c71ce6bba75810fc6b7e735ecd5868
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2025-11-16 23:58:37 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2025-11-17 00:16:26 +0000
>
>=C2=A0 =C2=A0 =C2=A0sys/efi_map.h: This is a kernel-only file
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Slap a #ifdef _KERNEL around it all since it's = useless to userland.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 43b8edb320= 51
>=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0Netflix
> ---
>=C2=A0 sys/sys/efi_map.h | 4 ++++
>=C2=A0 1 file changed, 4 insertions(+)
>
> diff --git a/sys/sys/efi_map.h b/sys/sys/efi_map.h
> index 8b458cd08b00..d2206056b1f8 100644
> --- a/sys/sys/efi_map.h
> +++ b/sys/sys/efi_map.h
> @@ -7,6 +7,8 @@
>=C2=A0 #ifndef _SYS_EFI_MAP_H_
>=C2=A0 #define _SYS_EFI_MAP_H_
>=C2=A0
> +#ifdef _KERNEL
> +
>=C2=A0 #include <sys/efi.h>
>=C2=A0 #include <machine/metadata.h>
>=C2=A0
> @@ -21,4 +23,6 @@ void efi_map_add_entries(struct efi_map_header *efih= dr);
>=C2=A0 void efi_map_exclude_entries(struct efi_map_header *efihdr);
>=C2=A0 void efi_map_print_entries(struct efi_map_header *efihdr);
>=C2=A0
> +#endif
> +
>=C2=A0 #endif /* !_SYS_EFI_MAP_H_ */
>

Hello,

tried a buildworld just now and it fails, something seems missing:

[...]
=3D=3D=3D> stand/libsa (all)
mkdir -p xlocale arpa ssp;=C2=A0 for i in a.out.h assert.h elf.h limits.h n= list.h setjmp.h stddef.h
stdbool.h string.h strings.h time.h uuid.h; do=C2=A0 ln -sf /usr/src/includ= e/$i $i;=C2=A0 done;=C2=A0 ln -sf
/usr/src/sys/sys/errno.h errno.h;=C2=A0 ln -sf /usr/src/sys/sys/stdarg.h st= darg.h;=C2=A0 ln -sf
/usr/src/sys/sys/stdint.h stdint.h;=C2=A0 ln -sf /usr/src/include/arpa/inet= .h arpa/inet.h;=C2=A0 ln -sf
/usr/src/include/arpa/tftp.h arpa/tftp.h;=C2=A0 ln -sf /usr/src/include/ssp= /ssp.h ssp/ssp.h;=C2=A0 for i in _time.h _strings.h _string.h; do=C2=A0 [ -= f xlocale/$i ] || :>
xlocale/$i;=C2=A0 done;=C2=A0 for i in ctype.h fcntl.h signal.h stdio.h std= lib.h unistd.h; do=C2=A0 ln -sf
/usr/src/stand/libsa/stand.h $i;=C2=A0 done cc -target x86_64-unknown-freeb= sd16.0
--sysroot=3D/usr/obj/usr/src/amd64.amd64/tmp -B/usr/obj/usr/src/amd64.amd64= /tmp/usr/bin=C2=A0 -O2
-pipe -fno-common=C2=A0 =C2=A0-nostdinc=C2=A0 =C2=A0 -I/usr/obj/usr/src/amd= 64.amd64/stand/libsa
-I/usr/src/stand/libsa -D_STANDALONE -I/usr/src/sys -Ddouble=3Djagged-littl= e-pill
-Dfloat=3Dfloaty-mcfloatface -ffunction-sections -fdata-sections -DLOADER_G= ELI_SUPPORT
-I/usr/src/stand/libsa/geli -DLOADER_DISK_SUPPORT -ffreestanding -mno-mmx -= mno-sse -mno-avx
-mno-avx2 -msoft-float -fPIC -mno-red-zone -mno-relax -I. -DLOADER_VERIEXEC=
-I/usr/src/lib/libsecureboot/h -DLOADER_VERIEXEC_VECTX -Iinclude
-I/usr/src/contrib/bearssl/inc -Wno-deprecated-non-prototype -I/usr/src/con= trib/bearssl/src
-I/usr/src/lib/libsecureboot/h -DHAVE_BR_X509_TIME_CHECK -DNO_STDIO
-I/usr/src/contrib/bearssl/tools -I. -DTRUST_ANCHOR_STR=3Dta_PEM -DVE_SHA25= 6_SUPPORT
-DVE_SHA384_SUPPORT=C2=A0 -DVE_RSA_SUPPORT -DVE_PCR_SUPPORT -I/usr/src/stan= d/efi/include
-I/usr/src/lib/libsecureboot/efi/include=C2=A0 -I/usr/src/stand/efi/include= /amd64 -DNDEBUG -MD
-MF.depend.efi_variables.o -MTefi_variables.o -std=3Dgnu17 -Wno-format-zero= -length
-Wsystem-headers -Wno-pointer-sign -Wdate-time -Wno-empty-body -Wno-string-= plus-int
-Wno-unused-const-variable -Wno-error=3Dunused-but-set-parameter
-Wno-error=3Dcast-function-type-mismatch -Wno-tautological-compare -Wno-unu= sed-value
-Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-un= used-local-typedef
-Wno-address-of-packed-member -Wno-switch -Wno-switch-enum -Wno-knr-promote= d-parameter
-Wno-parentheses=C2=A0 -Oz -Qunused-arguments=C2=A0 =C2=A0 =C2=A0-c /usr/sr= c/lib/libsecureboot/efi/efi_variables.c
-o efi_variables.o In file included from /usr/src/lib/libsecureboot/efi/efi= _variables.c:31:
/usr/src/stand/efi/include/efi.h:47:10: fatal error: 'Uefi.h' file = not found 47 | #include
<Uefi.h>
[...]




--00000000000083325b0643c4218e-- From nobody Mon Nov 17 14:42:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d99TG0Vr0z6HLXn; Mon, 17 Nov 2025 14:42:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d99TF6wpnz4Psl; Mon, 17 Nov 2025 14:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jEf5jI+octS8F5xdRlv7t9jifPQlFeBq7Q/U7dT6ovM=; b=befhb3xRJ49216/QGJyAkWqZfZHHg5Q5o6boLQVtx/HacTeuHnNob1wFxOaO45spGKpuEU g2YSl5Rvt/yGOnXzwEVZtGvQxr3Z0G0YgevcT91TDTHmBpFBWxzf+r9aKw7iPevGNN6KPQ 2oVuqyQckahDED3ujPZ8CPx5k2Sob2js3sW9UGhUWZC3R1vPQ8g4ro6JRdZWVMiz/ai/zI s+BUAFDG6b0iH8YIFk6ukstV14isTqtuudTiNl5Jni26MLYhhFKyHE99hO+CzivqGdgH3y 1Gosk1byLVNg1ndXobFpu+rEawLtC434ogQGaPCrI+cuQG2hMrohmleKmEryHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jEf5jI+octS8F5xdRlv7t9jifPQlFeBq7Q/U7dT6ovM=; b=gqbjlkgQHYaqOB4K9sHTFHZBDsNoLkBtYDmJQdXCWXq9HygOsitimxHZMePwGd7Z5ajvO/ Lt6fwfC527WQVZFR2B+M3aVUgR0onL/kA+XspDBSeZCA8DQZ2MbfOFr7SS+F99xtmvJbS3 RQxHFyCUgTx9UjGH5lJwF0YvmD34mTb+Xjy6zNqZ3/ygm5mqW460MhQYCLXpEgL2x/1a+6 s/TNsdJ3KiGSQPmn53WzNYAUW+ffxrlVhr7GyucS3d8DP3S7sfyhMt1DAKoz2bXKVGpJxR iqrH0t03yrazJgTTqitHJqVw00ZnyiaksrkmPjw+VZ2ArANXnIP/mJymv3ybow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763390578; a=rsa-sha256; cv=none; b=qE77QL3qyqVpFCowJIyX1zqQ8ThoUEy4NeNiHEourAXuPrN16NxA/9t5ZL16eyHSrGqTup fxuMgLgQ3EARo88DRf+K5AYR28TXXtMqyrtLkgPVJknS8D1HsFvYgjiDgh2AzxaqHAo7ek DGhhfoyvxVSZWbDazHPW/34kAWxuubcvg27qRbO6XXCgQlGABiPgQscE6bk6z2A7SfTwM3 PNrrTUp+qUuZ8qOpJ3tgLuKq8qQxHT4nf5HSLNEEwNH2whJ6tdpKfMJGTDR1LmMD+lNVa2 GOPAWtl1y1hKhszgmxD4jbZvOupR1bTOH9qxekTQQde1cCw4O3iEbY4R0Uiv9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d99TF6RQyz1RPL; Mon, 17 Nov 2025 14:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHEgvTo097982; Mon, 17 Nov 2025 14:42:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHEgvPJ097980; Mon, 17 Nov 2025 14:42:57 GMT (envelope-from git) Date: Mon, 17 Nov 2025 14:42:57 GMT Message-Id: <202511171442.5AHEgvPJ097980@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: af4ba95daf75 - main - freebsd-update: Add some diagnositic information for a failure case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af4ba95daf75cf1b1624dd57038cfaa3ed2753e7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=af4ba95daf75cf1b1624dd57038cfaa3ed2753e7 commit af4ba95daf75cf1b1624dd57038cfaa3ed2753e7 Author: Ed Maste AuthorDate: 2025-08-28 16:04:06 +0000 Commit: Ed Maste CommitDate: 2025-11-17 14:42:17 +0000 freebsd-update: Add some diagnositic information for a failure case Users report freebsd-update failing with "The update metadata index is correctly signed, but failed an integrity check." Add a hint at which of the cases is failing to help track down the issue. PR: 264205 Reviewed by: dch Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52222 --- usr.sbin/freebsd-update/freebsd-update.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 2a07bc1fb7bc..b6e42e94f4bf 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1402,7 +1402,7 @@ fetch_metadata_index () { fetch_metadata_bogus () { echo echo "The update metadata$1 is correctly signed, but" - echo "failed an integrity check." + echo "failed an integrity check ($2)." echo "Cowardly refusing to proceed any further." return 1 } @@ -1413,7 +1413,7 @@ fetch_metadata_index_merge () { for METAFILE in $@; do if [ `grep -E "^${METAFILE}\|" ${TINDEXHASH} | wc -l` \ -ne 1 ]; then - fetch_metadata_bogus " index" + fetch_metadata_bogus " index" "${METAFILE} count not 1" return 1 fi @@ -1436,7 +1436,7 @@ fetch_metadata_index_merge () { # specifically grepped out of ${TINDEXHASH}. fetch_metadata_index_sanity () { if grep -qvE '^[0-9A-Z.-]+\|[0-9a-f]{64}$' tINDEX.new; then - fetch_metadata_bogus " index" + fetch_metadata_bogus " index" "unexpected entry in tINDEX.new" return 1 fi } @@ -1453,7 +1453,7 @@ fetch_metadata_sanity () { # Check that the first four fields make sense. if gunzip -c < files/$1.gz | grep -qvE "^[a-z]+\|[0-9a-z-]+\|${P}+\|[fdL-]\|"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid initial fields" return 1 fi @@ -1464,28 +1464,28 @@ fetch_metadata_sanity () { # Sanity check entries with type 'f' if grep -E '^f' sanitycheck.tmp | grep -qvE "^f\|${M}\|${H}\|${P}*\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type f entry" return 1 fi # Sanity check entries with type 'd' if grep -E '^d' sanitycheck.tmp | grep -qvE "^d\|${M}\|\|\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type d entry" return 1 fi # Sanity check entries with type 'L' if grep -E '^L' sanitycheck.tmp | grep -qvE "^L\|${M}\|${P}*\|\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type L entry" return 1 fi # Sanity check entries with type '-' if grep -E '^-' sanitycheck.tmp | grep -qvE "^-\|\|\|\|\|\|"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type - entry" return 1 fi From nobody Mon Nov 17 14:46:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d99Yp1ts0z6HLtc; Mon, 17 Nov 2025 14:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d99Yp1FqQz3C1n; Mon, 17 Nov 2025 14:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9zTwDPBR9n5lPMaiWfJfc+py4UjOYvSiSsUpqcCN7XQ=; b=PhrcnAwXWxr8J9FsbcinikXV6AzayTl6dqC6McTyd24RNZQJQ1GZTgRd/EP6dHpmApHY0q ObgiGTYsP1RjT4D4TMZhqHQbI9i+ygGxk+S5WyNtG0VJCq33P1n9YNzfUXXF7Z4sLLLKxO dnm2HMD8MqA4XVX0R4LoEuFk2WOWmlEqpJFj9xWilDS6Rk9gSuLvKQYlI4EDbm6bbFxiUs 8LDis3HKAL/RFXMhCn3mFy8NoXrUKbM19vKP5yzYDPX7OAVz84E5iAGi1USqkta2cP4ojo dXoxvOrBXT7p9Vv4DdbCqMdRw6bLTxWgOQioyfgStDPZYBRDTqDqR62ekZEZKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9zTwDPBR9n5lPMaiWfJfc+py4UjOYvSiSsUpqcCN7XQ=; b=XsJKwVee42XZaWC6GdhxPiuu+2EH8I0i2FlNRjMAUBaTd6ZeUDQLE7NL/0WrZ9YdPT0XA9 6tKD0iOXXtccp6dqrko55FpFvVCk+eDIowLY//cD2SGiV3BJp9T4OPSoMIOdKztMOFUgXz 9dlD0frDxBZJAHcjsYRQLWx5wQNgqDI1uqTWeqYggoRt9jIekMqORAZDGpn4kUtNLPg6cX WUwr8p1FhQCAq5d7vdpa1geYJU28jERr35Z+pykWqlD2oe8JhBlYHsud478R6iC70fuC+R xOKG9eBHme8BFjNLuJeyqiivmWjWuvfbimRlRh2Pm2aoIo4VeALRcsllAXD6iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763390814; a=rsa-sha256; cv=none; b=ReTK5u87FFWZVECYXGW2sXeD414TCZMex8X5pHQHF/72CA6G+McF6KCJnKWyqNMx+5dnCN DURTfmLdjK2E1Q4HUXXS+/JGwupXV3NDZUA1pxHV0yS4E7VDqxFCPZ9YsfrkLHJuCEsuIP 0Dkoo9QUL05OBWJmGi+rMDFylofh27a6RM3tPx/fA/8F4oWMpYyIFK/U2rtJH+QjOYpMLS c/yyXHi++L9CU6SfnpoUM3dca6dvsfb/ptqFMJVLmiqy4cXmYLKgBZ1imntfunOIQI8QPP ChVUHITy+OIvwtaxnS0x05I0B1wrpfxFvi1MxcZUzSy9dMSvWL/kDsyipE1ppg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d99Yp0g7bz1Qwv; Mon, 17 Nov 2025 14:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHEksLu099239; Mon, 17 Nov 2025 14:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHEksQL099236; Mon, 17 Nov 2025 14:46:54 GMT (envelope-from git) Date: Mon, 17 Nov 2025 14:46:54 GMT Message-Id: <202511171446.5AHEksQL099236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: cf3e1dc5f59e - stable/15 - newfs_msdos: Improve error messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cf3e1dc5f59e13252ef314bd4f72e19c38115840 Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cf3e1dc5f59e13252ef314bd4f72e19c38115840 commit cf3e1dc5f59e13252ef314bd4f72e19c38115840 Author: Ed Maste AuthorDate: 2025-11-09 19:43:50 +0000 Commit: Ed Maste CommitDate: 2025-11-17 14:46:37 +0000 newfs_msdos: Improve error messages - Report overly long OEM string as too long, not just "bad". - Use warn instead of warnx for open or ftruncate failure to report the error string. Reviewed by: se Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53649 (cherry picked from commit dbb34d496708a37763d3d8bf6782991dee10d17e) --- sbin/newfs_msdos/mkfs_msdos.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c index dcc2bb982efc..a570d92cd17b 100644 --- a/sbin/newfs_msdos/mkfs_msdos.c +++ b/sbin/newfs_msdos/mkfs_msdos.c @@ -264,7 +264,7 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) goto done; } if (o.OEM_string && strlen(o.OEM_string) > 8) { - warnx("%s: bad OEM string", o.OEM_string); + warnx("%s: OEM string too long", o.OEM_string); goto done; } if (o.create_size) { @@ -274,11 +274,11 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) } fd = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0644); if (fd == -1) { - warnx("failed to create %s", fname); + warn("failed to create %s", fname); goto done; } if (ftruncate(fd, o.create_size)) { - warnx("failed to initialize %jd bytes", (intmax_t)o.create_size); + warn("failed to initialize %jd bytes", (intmax_t)o.create_size); goto done; } } else if ((fd = open(fname, o.no_create ? O_RDONLY : O_RDWR)) == -1) { From nobody Mon Nov 17 14:48:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d99cB0tnnz6HLV4; Mon, 17 Nov 2025 14:48: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d99cB0338z3CDv; Mon, 17 Nov 2025 14:48:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rUuKqRkOVLYBx0uTXsH1zkWel88y6h+A6bsQG+I/PWI=; b=Eqja2FR4tvN+oDD20PfpLgXHgvP1KVLMwBz0QXjMsvj+x1SnFDh8d4E9z58PsYQ9jp90U1 6kuYDmL0Sj/YFWlVpSdZsg/zgLBsCiw1RwlV2CIXEkyf1iuUa/fumD6+HBp8nXut1Sk495 V/6qun5qDoxk5Nhx3W0MrbjdcNCzyMfqJVtIBdeLrQ/EQQSi/94h4KSwJ/9QPojW3V7Oq/ phqoxKsm1RjpCbW13W2UsqguGfCdQOQbDxZdvsYxXfgktdc7d1rLAUEubos0Psb1svYIcP nrQxqOQwI1lHLNZp3VhBGF4/7S45/FBwZe/vWB5NyrHpPRYHYNu8CaA5HwBmwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rUuKqRkOVLYBx0uTXsH1zkWel88y6h+A6bsQG+I/PWI=; b=bgwqU1nvuo+zsA7yWem81ZGJoZ3HdVP0KTD4vk+7noiew5ESPtFnLfLvZ2d8RGt9G2crfF wDWlP0g2MhEB4GZZVUyulI7XwHmcBqHWcMcdL5YdZPo9b9+17zCM6Q9CWocly3Y/onf/vi AS9TOWMOtDZoo0vVmgY8LhiIrehyBMQM8jOoJ4Va9w0k443SJ9ESrR9KiAw4fnAtPssIZn PM1WFbtlOlJfeb0GQtZiWVmD9BRisu8rVIK3iqiIP1Y8XtKo/hr5YYFlc6o6cjsoRkhZx/ YUOoQHzqvfYLQD86TTPNjl0vjzCtad2JFSu+uOmTWpPtRcxhLwOQ3NPsAECuWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763390938; a=rsa-sha256; cv=none; b=QxoibRf4mz52XlVHCBDGGJuG90G+524aw0/d1IgdUBmMASgoKtMbPSK1/ee7k+ESFn7oTK dSOQl6jJr0Ct64iF4z3L++iMEsVQp2zqCdFTham9wyRlUuqyQiDomeEodfeyTWp0tMKp4O Lw+Nbg1LyYTyB9ixtgbtaxl76ubFMknmu9ZjLwfQ4AfdSpks2m+XK6keRIw2O/PwCmb85q gTjJ+TmEsUlle6DkeM7geCKlTZi92TzhVFOnh/zNLNJYVhNxDoM+/VJJh626gvjMpX3lDx MeuDq93fZuGvCJk2x0kiitTr6QPzCF+qNJ7Q9OVIb6dUaWaEKK4ctH5HMsPr/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d99c96S2Kz1RPP; Mon, 17 Nov 2025 14:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHEmvR9099937; Mon, 17 Nov 2025 14:48:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHEmvll099934; Mon, 17 Nov 2025 14:48:57 GMT (envelope-from git) Date: Mon, 17 Nov 2025 14:48:57 GMT Message-Id: <202511171448.5AHEmvll099934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 3602181372ab - stable/14 - newfs_msdos: Improve error messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3602181372abc0aa164b5024c6269720e7896b10 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3602181372abc0aa164b5024c6269720e7896b10 commit 3602181372abc0aa164b5024c6269720e7896b10 Author: Ed Maste AuthorDate: 2025-11-09 19:43:50 +0000 Commit: Ed Maste CommitDate: 2025-11-17 14:48:41 +0000 newfs_msdos: Improve error messages - Report overly long OEM string as too long, not just "bad". - Use warn instead of warnx for open or ftruncate failure to report the error string. Reviewed by: se Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53649 (cherry picked from commit dbb34d496708a37763d3d8bf6782991dee10d17e) (cherry picked from commit cf3e1dc5f59e13252ef314bd4f72e19c38115840) --- sbin/newfs_msdos/mkfs_msdos.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c index 065e3c5f4192..3600755f30c3 100644 --- a/sbin/newfs_msdos/mkfs_msdos.c +++ b/sbin/newfs_msdos/mkfs_msdos.c @@ -264,7 +264,7 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) goto done; } if (o.OEM_string && strlen(o.OEM_string) > 8) { - warnx("%s: bad OEM string", o.OEM_string); + warnx("%s: OEM string too long", o.OEM_string); goto done; } if (o.create_size) { @@ -274,11 +274,11 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) } fd = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0644); if (fd == -1) { - warnx("failed to create %s", fname); + warn("failed to create %s", fname); goto done; } if (ftruncate(fd, o.create_size)) { - warnx("failed to initialize %jd bytes", (intmax_t)o.create_size); + warn("failed to initialize %jd bytes", (intmax_t)o.create_size); goto done; } } else if ((fd = open(fname, o.no_create ? O_RDONLY : O_RDWR)) == -1) { From nobody Mon Nov 17 15:14:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9B9q41tNz6GPYW; Mon, 17 Nov 2025 15:14: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9B9q2Bbcz3GgZ; Mon, 17 Nov 2025 15:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763392479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q1zL7y+JwhDJccxXiwoX6oa2lqAUNTI81gAVYpjNhpg=; b=GVs9xWg3dBMz7YkyjhHu6b6F8s9ZQcIF1htJfmunFqBzDcgKve3b2Og9QjyrYUcI9UHgOo SsZRVm/gkBpfjTycr9vh4bdknXA0K3+pDJMDbomoSYVjpXHG05ts7N7f3ZbbSRJAcanR0e o62wHlJQwte0RE3uWVbc9jy0WqWr+uPEXulMQPwZOydVp7b3z394xDMoqFXLCQGzOgOorO jDUbDWeOVbnd5OV5V9lWgac22xUK3CBE/PmnJ1KQHEWc517FWnDvprABX+GdA86JBuQyB+ /u2+CxumXLh6MgjJB0I9vZb/hGQLFBghIVdq4G/XVfsodemp/3KmmEBZzOXwqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763392479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q1zL7y+JwhDJccxXiwoX6oa2lqAUNTI81gAVYpjNhpg=; b=pvRkm+DckSztxQvE6SmKKGZ6SqqKyPabRG8dbZa3k06kbPPRglCUzz6SPw+HXuJcIGapWc urjXXLqA0kwkJCxCk6vUYftQv8ror3DFxmf/lwhKkPp6NcfHLDRMeh1J+R8Nd6yC0r4YAj bgVb6iluenlVjRyJmsYuUmqqEH9+v8ynt7Z/nle5HxeJyccB9Jf+GvQvJTsOjPiBR+xKiO uyNfOWW0Fo3Xm8MrMeLynlq+1sAREAv7tDxabvvEAW9pbkcqhQx00ueGLfu24p90/PufcN QpyF1Yn3/dSuMT50ImDZxb0kQmVdA4UpTwgN82CpJyKCnO9IeDxKYlReXoHIXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763392479; a=rsa-sha256; cv=none; b=JMW5+egbZKVp9U95TTDG9y1zn/6kOKpS7HeC+KJ6gfUnDprqRDmMrF35RMfK9cdK4pO7+G fINQmSB4zEzofQzj6VMrppyre05PjyC7jr/4T1lJDUkyEs3+kLrQMKfPThV1YrbqrMp7D4 M7ih7U0Npz4nwMdLKD1zXTQvDk1SJV8C1NYP1a7XarYCV5OsGgyhhG861e3Gbc09QpCDxj v1xMSrg2keJpsIQTD3KqdhtrDW8df/Ya321UGqB5vw6IG0wDt9l9PeoC3yxfWOTJzMbPik PagjmUKMQdNdlm11gMQul0kohlBOQvhEwbNBz83/ucDpmeRCcMtMRGIN3waApw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9B9q1VNwz1SM3; Mon, 17 Nov 2025 15:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHFEdS0055752; Mon, 17 Nov 2025 15:14:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHFEddv055749; Mon, 17 Nov 2025 15:14:39 GMT (envelope-from git) Date: Mon, 17 Nov 2025 15:14:39 GMT Message-Id: <202511171514.5AHFEddv055749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: bf2dc446d129 - main - example.4: Bump deprecation example to FreeBSD 17 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf2dc446d12953c67fa54698952b9072e3c660ce Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bf2dc446d12953c67fa54698952b9072e3c660ce commit bf2dc446d12953c67fa54698952b9072e3c660ce Author: Ed Maste AuthorDate: 2025-11-12 14:56:55 +0000 Commit: Ed Maste CommitDate: 2025-11-17 15:13:17 +0000 example.4: Bump deprecation example to FreeBSD 17 The deprecation notice should indicate that the driver or feature will be removed in a future release, not one that's nearly EOL. Sponsored by: The FreeBSD Foundation --- share/examples/mdoc/example.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/examples/mdoc/example.4 b/share/examples/mdoc/example.4 index 6983fb75fada..a51d9ca9262b 100644 --- a/share/examples/mdoc/example.4 +++ b/share/examples/mdoc/example.4 @@ -28,7 +28,7 @@ example_load="YES" .Ed .Sh DEPRECATION NOTICE This driver is scheduled for removal prior to the release of -.Fx 13.0 . +.Fx 17.0 . .Sh DESCRIPTION This is an example device driver manual page for the .Nm From nobody Mon Nov 17 15:35:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Bf95CC2z6GRVC; Mon, 17 Nov 2025 15:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Bf939K1z3JSW; Mon, 17 Nov 2025 15:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763393745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dz4PTYK2Oex23p2+/dPUMCnYzkUpEsuFUHZU4SZ+Iuk=; b=uhmq2UlScUpEgWAXRTXmowjELp8J7ozlXdhHOBOdeeqfOc0FfmncFWvCSGY6ARMsFv6kmq qGaWV623PxK4G4P4TZj6EYW44K5SxzhQOAUULtU19egGAAeWUG4WGOhtQXHM/W6xUBDuaY VGx6+ee6f8ahIDwMmqtIxfM80mIIVIW+OtieCfDiYu9JXgY7ZjUrce2Fq8BtFiAlr6NDrp DyC5X0/4y3nPrjIWU3IAGvdJzqzJ28z5dGLPsNu9kkMoy4xk2TRTWvhfn7Qbz/FBUU9+3I sQg0kTijoSSKoreBciqIZfpLxVE9QPqDdhxLqK9VFeVcPAr60cNdGLxqRMdqzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763393745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dz4PTYK2Oex23p2+/dPUMCnYzkUpEsuFUHZU4SZ+Iuk=; b=pX382n6TxCXuABsyL46gMWpSQvfH9OoM/P1s4QGSDfdsxF5TqlW2DhPYxerSYiciXqjFNI iOQ0/5QY3GSj9qHKyrAIl05EMnAFc14DLc99vbeFoOpkvj3CAirUkoNWEuHrJkNdj7OzWu kA7A4ul00crrooU7guz3jEdgevHi4wEaTYnenQxF2wfy8GICcaRPIMfFYJC4+G0rHrIbqm C/LIbzqA7MQ6VjmxBkRyG2MP38NAvkYZ3g65yQZqrQII7vL2CUF2lAQhYw/zfgilK783ZU J2oG0Od8OBi+pXrV+3fxFbA2ICQ2lB/iaG/ZrR+bvcnWQYzN/Qago7LQyWfiWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763393745; a=rsa-sha256; cv=none; b=cGW1kagny6glKnKsBDR0A9NwVLItDhLk5dCb7LDLMBOKk6fGkjvCPBqmOYiRTOcPckw2/3 /sSCw+f/PtE0UvtZu+KfGpMemVzQPX1ccBc0Svb/cUHmQkv9B+gLyBqM4NjD95JWjciOGg 5xafHyXimqbIDTyjI0yvd/I2axhjMyznmNjngQCjGvQhJBX1jJWP1QareURE1VVaMm6alB CSLU4zPgaaB79SYDL4+pksT8At2nLKdJmNCKb5QCb6ZQ1/3zba8RUsxyx7KOqheoEu+KZO pXP0KTrg26OTZlgYRK2qJLV/efrN3wFSaMNNs3GsEL5M0gT61o8PgbrBpy+4Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Bf929nlzL1; Mon, 17 Nov 2025 15:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHFZjIm093198; Mon, 17 Nov 2025 15:35:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHFZjma093195; Mon, 17 Nov 2025 15:35:45 GMT (envelope-from git) Date: Mon, 17 Nov 2025 15:35:45 GMT Message-Id: <202511171535.5AHFZjma093195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Krzysztof Galazka Subject: git: 1839526b7315 - main - igb(4): Fix VLAN support on VFs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1839526b7315cae62efbd2d1493e6243439effcb Auto-Submitted: auto-generated The branch main has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=1839526b7315cae62efbd2d1493e6243439effcb commit 1839526b7315cae62efbd2d1493e6243439effcb Author: Krzysztof Galazka AuthorDate: 2025-11-17 15:30:26 +0000 Commit: Krzysztof Galazka CommitDate: 2025-11-17 15:30:35 +0000 igb(4): Fix VLAN support on VFs Virtual Functions are considered untrusted and have no control over VLAN filtering configuration in HW. To allow using VLANs on VF intreface driver has to assume that VLAN HW Filtering is always enabled and pass requests for adding or removing VLAN tags to Physical Function driver using Mailbox API. Signed-off-by: Krzysztof Galazka Approved by: kbowling (mentor) Reviewed by: erj (previous version) Tested by: gowtham.kumar.ks_intel.com MFC after: 1 week Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D53245 --- sys/dev/e1000/if_em.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index e3d839b828ed..b8ea3168330b 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -4023,7 +4023,15 @@ em_if_vlan_register(if_ctx_t ctx, u16 vtag) bit = vtag & 0x1F; sc->shadow_vfta[index] |= (1 << bit); ++sc->num_vlans; - em_if_vlan_filter_write(sc); + if (!sc->vf_ifp) + em_if_vlan_filter_write(sc); + else + /* + * Physical funtion may reject registering VLAN + * but we have no way to inform the stack + * about that. + */ + e1000_vfta_set_vf(&sc->hw, vtag, true); } static void @@ -4036,7 +4044,10 @@ em_if_vlan_unregister(if_ctx_t ctx, u16 vtag) bit = vtag & 0x1F; sc->shadow_vfta[index] &= ~(1 << bit); --sc->num_vlans; - em_if_vlan_filter_write(sc); + if (!sc->vf_ifp) + em_if_vlan_filter_write(sc); + else + e1000_vfta_set_vf(&sc->hw, vtag, false); } static bool @@ -4094,22 +4105,15 @@ em_if_vlan_filter_write(struct e1000_softc *sc) { struct e1000_hw *hw = &sc->hw; - if (sc->vf_ifp) - return; + KASSERT(!sc->vf_ifp, ("VLAN filter write on VF\n")); /* Disable interrupts for lem(4) devices during the filter change */ if (hw->mac.type < em_mac_min) em_if_intr_disable(sc->ctx); for (int i = 0; i < EM_VFTA_SIZE; i++) - if (sc->shadow_vfta[i] != 0) { - /* XXXKB: incomplete VF support, we returned above */ - if (sc->vf_ifp) - e1000_vfta_set_vf(hw, sc->shadow_vfta[i], - true); - else - e1000_write_vfta(hw, i, sc->shadow_vfta[i]); - } + if (sc->shadow_vfta[i] != 0) + e1000_write_vfta(hw, i, sc->shadow_vfta[i]); /* Re-enable interrupts for lem-class devices */ if (hw->mac.type < em_mac_min) @@ -4124,8 +4128,10 @@ em_setup_vlan_hw_support(if_ctx_t ctx) if_t ifp = iflib_get_ifp(ctx); u32 reg; - /* XXXKB: Return early if we are a VF until VF decap and filter - * management is ready and tested. + /* + * Only PFs have control over VLAN HW filtering + * configuration. VFs have to act as if it's always + * enabled. */ if (sc->vf_ifp) return; From nobody Mon Nov 17 15:48:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Bwf3yRBz6GSDt; Mon, 17 Nov 2025 15:48: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Bwf3LMxz3MHd; Mon, 17 Nov 2025 15:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763394498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UySCllIjIgxoRgK8kK0784VzS1mPyhayQ2p+wA4sZ9Q=; b=IdGCXNgT50/p5MpH/C920yAIlcBWrXgOmxv5D5KwssoXWHrtgx+IlLxiAuIySxrRnKTHJv lSTIJ3TlmaSiNUX8kqOo9MyefxS/56uacPNKvWXxf11kAIKZw+tzOpEPSjR/qz/4u979a2 3z/R06KTp0LBsL22S1ecTockxbmQGF9hNTA0fT/eJUJYp0/X/TQgtqebDrCQ83kUJHzYy8 1jvM/DbjjTYPBwZZ7qWWax77AyrToUm+RKO41LaaeWM7NTougbTfVDSP6FmsSQm1xp30+u A8JOk4xPQsm5JVE5DHd9ENAlRRoAkP3A3i0IRzs7eKgIKvr4KlJqGJYJ3em7Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763394498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UySCllIjIgxoRgK8kK0784VzS1mPyhayQ2p+wA4sZ9Q=; b=E5D0P6ISGTb7xe8ypDdRcMFYb6EPuWBeAUOuz4uEygkLkbHej1i/n89qp5rX6UBqon7yxI sNGhIgcYch9vrIp83EMbLanMppmIngnd+XOfUNkO49YMuIiPiNiIylkVBMK9U+lxWwtVcr tvkIB+NFh7GyE8phZ8PoSEeD3ySY+CzU/IrFeX1TtztNIy2g8wqhyH7wVqALf0Ehp96ssd tC1mi5TGpkihpoYcvCpi48lEplnjr0MtS74LCZcZlexGdSoDuGak1KSoLotTvbdT4dPpYQ Y+5+++jxPBlur41lANVPpQJDVZqwbmVFCT+dehMTSW+UZHyTZg50ZNinsXbzDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763394498; a=rsa-sha256; cv=none; b=hjJLf7PDnDzd/ZSBAh2OqMEb4315ol7IBcr9Y4x83JLvpFtkIZeGWbXvR3PGPJFGWgWHmC kr8WBZERc9i6fl4+8Z+JFyI219N7EKrmzDeSQeggja3f8qs5rlQ2TfU17zkzLXTuI2P/o3 bLgrb2sMLoJYlanIjS6NasVgfb6g/p0epuATGDqqo6mkDs333JpKuI5A/6ve9fch/cuQlt z7IYlWWuMMKEJfq+U8dhZDLCtnlVMBcRkF/ZoPhb3hWLrmCXE3UNPo2JkPTlNXwjToUC6D ctfINgb5BJSVFJFX/zj5TyaYLzCrCgkxuvgWW/Z4wFMwDOoi/fP9VmVhkrRVpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Bwf2qnwzNf; Mon, 17 Nov 2025 15:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHFmIRO012608; Mon, 17 Nov 2025 15:48:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHFmIUR012605; Mon, 17 Nov 2025 15:48:18 GMT (envelope-from git) Date: Mon, 17 Nov 2025 15:48:18 GMT Message-Id: <202511171548.5AHFmIUR012605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c12013f5bb38 - main - pf: fix udp_mapping cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c12013f5bb3819e64499f02ecd199a635003c7ce Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c12013f5bb3819e64499f02ecd199a635003c7ce commit c12013f5bb3819e64499f02ecd199a635003c7ce Author: Kristof Provost AuthorDate: 2025-11-13 13:54:54 +0000 Commit: Kristof Provost CommitDate: 2025-11-17 15:48:04 +0000 pf: fix udp_mapping cleanup If we fail to obtain a new source port (pf_get_sport()) while we've created a udp_mapping (for 'endpoint independent nat') we must free the udp_mapping in pf_get_sport(). Otherwise the calling function will call pf_udp_mapping_release(). This will then attempt to remove the udp_mapping from a list it's not in, and crash. Actually free the udp_mapping in all failure cases. While here sprinkle in a few more assertions to ensure we don't forget leak udp_mappings and add a test case to provoke this problem. Reviewed by: thj MFC after: 1 week See also: https://redmine.pfsense.org/issues/16517 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D53737 --- sys/netpfil/pf/pf_lb.c | 29 ++++++++++++++++++++++------- tests/sys/netpfil/pf/nat.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index 7aeb8266ca8c..3227d2906fb5 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -301,9 +301,8 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, bzero(&init_addr, sizeof(init_addr)); - if (udp_mapping) { - MPASS(*udp_mapping == NULL); - } + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); /* * If we are UDP and have an existing mapping we can get source port @@ -354,16 +353,22 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, if (pd->ndport == htons(ICMP_ECHO)) { low = 1; high = 65535; - } else + } else { + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); return (0); /* Don't try to modify non-echo ICMP */ + } } #ifdef INET6 if (pd->proto == IPPROTO_ICMPV6) { if (pd->ndport == htons(ICMP6_ECHO_REQUEST)) { low = 1; high = 65535; - } else + } else { + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); return (0); /* Don't try to modify non-echo ICMP */ + } } #endif /* INET6 */ @@ -386,6 +391,8 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, */ if (pd->proto == IPPROTO_SCTP) { key.port[sidx] = pd->nsport; + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); if (!pf_find_state_all_exists(&key, dir)) { *nport = pd->nsport; return (0); @@ -400,6 +407,8 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, */ key.port[sidx] = pd->nsport; if (!pf_find_state_all_exists(&key, dir)) { + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); *nport = pd->nsport; return (0); } @@ -413,6 +422,8 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, return (0); } } else { + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); *nport = htons(low); return (0); } @@ -440,6 +451,8 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, key.port[sidx] = htons(tmp); if (!pf_find_state_all_exists(&key, dir)) { *nport = htons(tmp); + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); return (0); } } @@ -457,6 +470,8 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, } else { key.port[sidx] = htons(tmp); if (!pf_find_state_all_exists(&key, dir)) { + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); *nport = htons(tmp); return (0); } @@ -473,13 +488,13 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, */ if (pf_map_addr_sn(pd->naf, r, &pd->nsaddr, naddr, &(pd->naf), NULL, &init_addr, rpool, sn_type)) - return (1); + goto failed; break; case PF_POOL_NONE: case PF_POOL_SRCHASH: case PF_POOL_BITMASK: default: - return (1); + goto failed; } } while (! PF_AEQ(&init_addr, naddr, pd->naf) ); diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh index 0824671fa0f1..788eacdc3369 100644 --- a/tests/sys/netpfil/pf/nat.sh +++ b/tests/sys/netpfil/pf/nat.sh @@ -260,6 +260,35 @@ endpoint_independent_compat_cleanup() rm -f server2.out } +atf_test_case "endpoint_independent_exhaust" "cleanup" +endpoint_independent_exhaust_head() +{ + atf_set descr 'Test that a client behind NAT gets the same external IP:port for different servers' + atf_set require.user root +} + +endpoint_independent_exhaust_body() +{ + endpoint_independent_setup # Sets ${epair_…} variables + + endpoint_independent_common \ + "nat on ${epair_nat}a inet from ! (${epair_nat}a) to any -> (${epair_nat}a)" \ + "nat on ${epair_nat}a inet from ! (${epair_nat}a) to any -> (${epair_nat}a) port 3000:3001 sticky-address endpoint-independent" + + # Exhaust the available nat ports + for i in $(seq 1 10); do + echo "ping" | jexec client nc -u 198.51.100.32 1234 -w 0 + echo "ping" | jexec client nc -u 198.51.100.22 1234 -w 0 + done +} + +endpoint_independent_exhaust_cleanup() +{ + pft_cleanup + rm -f server1.out + rm -f server2.out +} + atf_test_case "endpoint_independent_pass" "cleanup" endpoint_independent_pass_head() { @@ -900,6 +929,7 @@ atf_init_test_cases() atf_add_test_case "exhaust" atf_add_test_case "nested_anchor" atf_add_test_case "endpoint_independent_compat" + atf_add_test_case "endpoint_independent_exhaust" atf_add_test_case "endpoint_independent_pass" atf_add_test_case "nat6_nolinklocal" atf_add_test_case "empty_table_source_hash" From nobody Mon Nov 17 16:09:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9CPN18qxz6GTX7; Mon, 17 Nov 2025 16:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9CPN04CRz3Nx1; Mon, 17 Nov 2025 16:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763395784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gSteArk/raIHF4nj5DDT76cHQ3CgPudcWBjtg2hjMhE=; b=RmvWMEBbMwUzuqXeJv8kvXcM/9PecaE0ILwwIOzG7cYPECwz/TFClVTSGxzdxTbrPXGLWE 2OIOKNhrPvEx1IuTt4fKK46V7IQ21H6S2KAVNM6rI9u0Sh/LiA3yFTv18yoK+YRiYAyWgr VZua3qWFxvX/CXClco8P6kgs+CoREhpKhcCZJwHptLPkgUmKa3kZD+yjhWaG7J2TRsNcME DaOeI3Ol4gRvX+fahVe/UAmsPUjEnb6G73t8QSOJCoEIvVnPG5F2IeP0x1TLnpHu8OoZ2C 3enK9rBq3u5LRLFFXVwk2firTbihSkIZYiB7jBBnkIGfFrJoECQx5GgXb9hjCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763395784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gSteArk/raIHF4nj5DDT76cHQ3CgPudcWBjtg2hjMhE=; b=sqHy2V5YPzbcEtOzTS90nZBRk1Y00/bEASoFTCLZYbmPaCMpav30PMeFZ8Mx66mwB32vE7 ugjLQQF9/E/QLPsSZiWyTaz5dxC7MO8qDsIUSBOvlkqj3nA+1V4SexoisWamOO85PCp5dX j1Xn/hyFLTdyhUK+Eoxuv/DXWe+lvssGfOc0FH2ZQqGRpUYntzMBOBTutI2dczj75p3k2b /SXpSx3r2ZyWiS7tjNHIMRWCLUccXYRBCiyiDrZ+VFRGgDcXOSJOu7ALJQOU6xaQ2YQwzx pEZl/5GXYCpKHPXPINZXcm0XjFlgGdCRPgMmBL5aSYIOR+z82WggnUR83k7Wtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763395784; a=rsa-sha256; cv=none; b=Q4NTd643aMVvpYi+LNJ3eueG8NIz4XYkDriswzhzWJ+nCM/8okeuHbmNPX8bfOsaR5fxzq 1txXWc4FMfGDy5rcD/dpr86PKtqQ6awG9vNe5CZFkkaVJ/1oQ+l704L2mX0qRla3W2N/PS ELCAGCvrUx1PotR2mBRIM9Z7caP1MzV+OWyR+NBUuu/YRc3+8P3NENluTTvzUzsiqpeXlt 0E8s9RPrU+cSWTXsZOTkm7Bqf2hcd5WnsjJMaR85oASrIOFtiE5BrwxOSOh9+UR7uL7eY3 LLgMdBUcPXus/cMtycXRr4q2DUuqNsOfu81PNt/EB3OZuSfnysYXpDpdBuuqmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9CPM6hGSz16t; Mon, 17 Nov 2025 16:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHG9hNg051151; Mon, 17 Nov 2025 16:09:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHG9hsg051148; Mon, 17 Nov 2025 16:09:43 GMT (envelope-from git) Date: Mon, 17 Nov 2025 16:09:43 GMT Message-Id: <202511171609.5AHG9hsg051148@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 5f624d923db0 - main - snd_hda: Patch Lenovo V15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f624d923db0f2fb33990948cffdc24da44deaa8 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5f624d923db0f2fb33990948cffdc24da44deaa8 commit 5f624d923db0f2fb33990948cffdc24da44deaa8 Author: Christos Margiolis AuthorDate: 2025-11-17 16:09:18 +0000 Commit: Christos Margiolis CommitDate: 2025-11-17 16:09:18 +0000 snd_hda: Patch Lenovo V15 PR: 290496 Tested by: adrian Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/pci/hda/hdaa_patches.c | 3 ++- sys/dev/sound/pci/hda/hdac.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index 91bb244578c7..d4267aae80f8 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -341,7 +341,8 @@ hdac_pin_patch(struct hdaa_widget *w) } else if (id == HDA_CODEC_ALC257 && (subid == LENOVO_L5AMD_SUBVENDOR || subid == LENOVO_L5INTEL_SUBVENDOR || - subid == LENOVO_IDEAPAD3_SUBVENDOR)) { + subid == LENOVO_IDEAPAD3_SUBVENDOR || + subid == LENOVO_V15_SUBVENDOR)) { switch (nid) { case 20: patch_str = "as=1 seq=0"; diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 8fb54108a833..bc0ae651a3b6 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -390,6 +390,7 @@ #define LENOVO_3000_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x384e) #define LENOVO_IDEAPAD330_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x3808) #define LENOVO_IDEAPAD3_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x3881) +#define LENOVO_V15_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x3886) #define LENOVO_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0xffff) /* Samsung */ From nobody Mon Nov 17 16:12:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9CSk3w8Cz6GVTX; Mon, 17 Nov 2025 16:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9CSk3B6Zz3Q3c; Mon, 17 Nov 2025 16:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763395958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eSrmKydqSA8SgiVIwYUM1BYCPEHFHeCncwE3lISZj1s=; b=UF2XleTL23wjTW5TUZ1XSrd+qUnEkv7PyZlYVM7QpxuDSPwbgq4cQ78ye9b1aIDeT9vrkL D8eS5diWyYfPuxT95oP1kyhiIAiJzEbtpz7Wzb+wMhSqCCnrGmT+vfzFl/66hpPcvhhLYZ 8IXfWBlxk2zEiUGqVuMIP0sHIeYuMlrYCzOdNZaEJFNDV3lG3DLkNmApEZfY9z17NWriib 96CEuDJJ/pIkTWgu8l8kVeHU6rqIl4duTn5RTpf1v2QGszklPAt6vaknHA8VL/evlSM197 WyIlF2W+zNa+NQIMAsIXTiKYZKuTyP0lQkqW5ozNCOjwZAamFwQYYtiSJCGSgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763395958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eSrmKydqSA8SgiVIwYUM1BYCPEHFHeCncwE3lISZj1s=; b=N8VL8vHeB8LtZRnyisWGVMKWtsGlwjv4PCfkl/DTCUV5h/2zzW8F74q69EXZY8ryYtoP9R rOTRZOxKWXMZCvck9swO0eZ106mcJ/hhGXOW6db88icFQzby5zYwMwQlCCfWjHIl1sH+cj wKZEzL7NydfDJCOLuJmh5RO4Wg8WW/BYLy1yegm7GYoZghErZvfT1/2BBAqnLr3cJOZfhu CeqHCAhwxSl41ElXSB27E8srv8TJvBzDHqsK3HqDot9edF14wS21vDxUZq6HLQhApITxcb bv+we7pRN2EDdvb7nhohZWPs7ErK8NQB4qXkwjBOOQK6r6ZLGwHOny6HMim4Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763395958; a=rsa-sha256; cv=none; b=MuswAQOG4g2+pPqMW83WYASYBlaXNPFSdQDfSdfvTahdJRGMm/w+UwcL4YxSfnCMU/WAwS AU96p5piIES0j5oq0gO1XbwXwJG//jV7afhY1xvFqRJNcig2v/xfnFR248cx5aHXJ3ysCQ r7PyBYGCwhnSFuGUZAIw+OqdxBpV7IhmBhMTjdBJoeCv0A8yBWmgQ7zjd0V9FspVa86Hld umY3GtGTN8Tqf21LqzhRzDZFR4h2PJXdHusa2RtOowaHSbzoEu+lDDjGTXA8uPDjI16CVf pMCzoAjW4NQ4UaoVTIc4ux31Qs7637q1T/iTiINe0EmERCe1CLxdzca3qvTAaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9CSk2d2qz17f; Mon, 17 Nov 2025 16:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHGCcdA068045; Mon, 17 Nov 2025 16:12:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHGCWHj068007; Mon, 17 Nov 2025 16:12:32 GMT (envelope-from git) Date: Mon, 17 Nov 2025 16:12:32 GMT Message-Id: <202511171612.5AHGCWHj068007@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 8ac904ce090b - main - zfs: merge openzfs/zfs@e63d026b9 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ac904ce090b1c2e355da8aa122ca2252183f4e1 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=8ac904ce090b1c2e355da8aa122ca2252183f4e1 commit 8ac904ce090b1c2e355da8aa122ca2252183f4e1 Merge: 5f624d923db0 e63d026b91b8 Author: Martin Matuska AuthorDate: 2025-11-17 16:11:32 +0000 Commit: Martin Matuska CommitDate: 2025-11-17 16:11:32 +0000 zfs: merge openzfs/zfs@e63d026b9 Notable upstream pull request merges: #17477 02fdd26e5 Add knob to disable slow io notifications #17792 d0294aa75 Update dnode_next_offset_level to accept blkid instead of offset #17824 8c225ff1b Fix gang write late_arrival bug #17861 -multiple Lift userspace definitions out of zfs_context.h #17872 dcada084b Pass flags to more DMU write/hold functions #17875 ec268cdf9 Fix caching of DDT log and BRT #17875 ea125eeb5 BRT: Round bv_entcount up to BRT_BLOCKSIZE #17877 6cfc3dba9 Cleanup ZIO_FLAG_IO_RETRY vs TRYHARD usage #17885 e63d026b9 cmd/zpool cstyle issues #17890 b4f073b5a Add BRT support to zpool prefetch command #17903 baefe098e ZIO: Set minimum number of free issue threads to 32 #17906 6e12f0bd7 spa_misc: add an API for spa_namespace_lock #17908 e26b9fc87 FreeBSD: Add support for _PC_CASE_INSENSITIVE #17911 -multiple Update library ABI versions for v2.4.0 #17915 8aaed7dc4 BRT: Fix ranges to blocks conversion math #17916 cc5cae547 BRT: Increase block size from 4KB to 8KB #17921 72b2a9571 ZAP: Remove dmu_object_info_from_dnode() call Obtained from: OpenZFS OpenZFS commit: e63d026b91b822dd9b363ab9a1e39d9a66493601 .../.github/workflows/scripts/generate-ci-type.py | 10 +- .../.github/workflows/scripts/qemu-2-start.sh | 20 +- .../.github/workflows/zfs-qemu-packages.yml | 2 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 38 +- sys/contrib/openzfs/README.md | 2 +- sys/contrib/openzfs/autogen.sh | 61 +- sys/contrib/openzfs/cmd/raidz_test/raidz_test.c | 1 + sys/contrib/openzfs/cmd/zdb/zdb.c | 9 +- sys/contrib/openzfs/cmd/zfs/zfs_project.c | 36 +- sys/contrib/openzfs/cmd/zhack.c | 1 + sys/contrib/openzfs/cmd/zpool/zpool_main.c | 445 ++++--- sys/contrib/openzfs/cmd/zpool/zpool_vdev.c | 8 +- sys/contrib/openzfs/cmd/zstream/zstream_redup.c | 4 +- sys/contrib/openzfs/cmd/ztest.c | 57 +- sys/contrib/openzfs/config/Rules.am | 4 +- sys/contrib/openzfs/config/deb.am | 8 +- sys/contrib/openzfs/contrib/debian/Makefile.am | 8 +- sys/contrib/openzfs/contrib/debian/clean | 4 +- sys/contrib/openzfs/contrib/debian/control | 26 +- .../{openzfs-libzfs6.docs => openzfs-libzfs7.docs} | 0 ...bzfs6.install.in => openzfs-libzfs7.install.in} | 0 ...enzfs-libzpool6.docs => openzfs-libzpool7.docs} | 0 ...ol6.install.in => openzfs-libzpool7.install.in} | 0 sys/contrib/openzfs/include/Makefile.am | 1 + sys/contrib/openzfs/include/libzpool.h | 51 + sys/contrib/openzfs/include/libzutil.h | 1 + sys/contrib/openzfs/include/os/freebsd/Makefile.am | 4 +- .../openzfs/include/os/freebsd/spl/sys/mod.h | 3 + .../os/freebsd/{spl => zfs}/sys/trace_zfs.h | 0 .../{spl/sys/sdt.h => zfs/sys/zfs_debug_os.h} | 9 +- sys/contrib/openzfs/include/os/linux/Makefile.am | 2 +- .../openzfs/include/os/linux/spl/sys/sysmacros.h | 8 - .../include/os/linux/zfs/sys/zfs_debug_os.h | 29 + sys/contrib/openzfs/include/sys/brt.h | 1 + sys/contrib/openzfs/include/sys/brt_impl.h | 2 +- sys/contrib/openzfs/include/sys/crypto/common.h | 2 + sys/contrib/openzfs/include/sys/dmu.h | 8 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 4 +- sys/contrib/openzfs/include/sys/spa.h | 14 +- sys/contrib/openzfs/include/sys/vdev_impl.h | 1 + sys/contrib/openzfs/include/sys/zfs_acl.h | 2 +- sys/contrib/openzfs/include/sys/zfs_bootenv.h | 1 + sys/contrib/openzfs/include/sys/zfs_context.h | 686 +--------- sys/contrib/openzfs/include/sys/zfs_debug.h | 1 + sys/contrib/openzfs/include/sys/zfs_project.h | 10 +- sys/contrib/openzfs/lib/libicp/Makefile.am | 6 +- sys/contrib/openzfs/lib/libnvpair/Makefile.am | 2 +- sys/contrib/openzfs/lib/libspl/Makefile.am | 12 + sys/contrib/openzfs/lib/libspl/condvar.c | 153 +++ sys/contrib/openzfs/lib/libspl/cred.c | 64 + sys/contrib/openzfs/lib/libspl/include/Makefile.am | 26 +- sys/contrib/openzfs/lib/libspl/include/libspl.h | 40 + .../lib/libspl/include/os/freebsd/sys/param.h | 2 + .../libspl/include/os/freebsd/sys/zfs_context_os.h | 35 - .../lib/libspl/include/os/linux/sys/param.h | 2 + .../os/linux/sys/{zfs_context_os.h => vfs.h} | 10 +- sys/contrib/openzfs/lib/libspl/include/sys/acl.h | 4 - sys/contrib/openzfs/lib/libspl/include/sys/callb.h | 29 +- .../openzfs/lib/libspl/include/sys/cmn_err.h | 27 + .../openzfs/lib/libspl/include/sys/condvar.h | 65 + sys/contrib/openzfs/lib/libspl/include/sys/cred.h | 18 + sys/contrib/openzfs/lib/libspl/include/sys/debug.h | 24 + sys/contrib/openzfs/lib/libspl/include/sys/kmem.h | 66 +- sys/contrib/openzfs/lib/libspl/include/sys/kstat.h | 743 +---------- sys/contrib/openzfs/lib/libspl/include/sys/misc.h | 40 + sys/contrib/openzfs/lib/libspl/include/sys/mutex.h | 58 + .../openzfs/lib/libspl/include/sys/procfs_list.h | 69 + .../openzfs/lib/libspl/include/sys/random.h | 52 + .../openzfs/lib/libspl/include/sys/rwlock.h | 62 + sys/contrib/openzfs/lib/libspl/include/sys/sid.h | 44 + .../openzfs/lib/libspl/include/sys/string.h | 3 + .../openzfs/lib/libspl/include/sys/sunddi.h | 8 +- .../libspl/include/{os/linux => }/sys/sysmacros.h | 43 +- sys/contrib/openzfs/lib/libspl/include/sys/systm.h | 36 + sys/contrib/openzfs/lib/libspl/include/sys/taskq.h | 119 ++ .../openzfs/lib/libspl/include/sys/thread.h | 79 ++ sys/contrib/openzfs/lib/libspl/include/sys/timer.h | 64 + sys/contrib/openzfs/lib/libspl/include/sys/trace.h | 73 + .../openzfs/lib/libspl/include/sys/trace_spl.h | 24 - .../openzfs/lib/libspl/include/sys/trace_zfs.h | 24 - sys/contrib/openzfs/lib/libspl/include/sys/tsd.h | 42 + .../openzfs/lib/libspl/include/sys/tunables.h | 12 +- sys/contrib/openzfs/lib/libspl/include/sys/types.h | 4 + sys/contrib/openzfs/lib/libspl/include/sys/vnode.h | 35 +- sys/contrib/openzfs/lib/libspl/include/sys/zone.h | 18 +- sys/contrib/openzfs/lib/libspl/include/umem.h | 1 + sys/contrib/openzfs/lib/libspl/kmem.c | 102 ++ sys/contrib/openzfs/lib/libspl/kstat.c | 64 + sys/contrib/openzfs/lib/libspl/libspl.c | 67 + sys/contrib/openzfs/lib/libspl/libspl_impl.h | 7 + sys/contrib/openzfs/lib/libspl/mutex.c | 89 ++ sys/contrib/openzfs/lib/libspl/procfs_list.c | 93 ++ sys/contrib/openzfs/lib/libspl/random.c | 101 ++ sys/contrib/openzfs/lib/libspl/rwlock.c | 108 ++ sys/contrib/openzfs/lib/libspl/sid.c | 47 + .../openzfs/lib/{libzpool => libspl}/taskq.c | 44 +- sys/contrib/openzfs/lib/libspl/thread.c | 118 ++ sys/contrib/openzfs/lib/libuutil/libuutil.abi | 1408 ++++++++++++++++---- sys/contrib/openzfs/lib/libzfs/Makefile.am | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 933 +++++++++++-- sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c | 3 +- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 8 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 5 +- .../openzfs/lib/libzfs/os/linux/libzfs_util_os.c | 37 + .../openzfs/lib/libzfs_core/libzfs_core.abi | 1163 ++++++++++++++-- .../openzfs/lib/libzfsbootenv/libzfsbootenv.abi | 2 +- sys/contrib/openzfs/lib/libzpool/Makefile.am | 7 +- .../openzfs/lib/libzpool/include/Makefile.am | 8 + .../{libspl => libzpool}/include/sys/abd_impl_os.h | 0 .../lib/{libspl => libzpool}/include/sys/abd_os.h | 0 .../include/sys/trace_zfs.h} | 0 .../lib/libzpool/include/sys/zfs_bootenv_os.h | 39 + .../lib/libzpool/include/sys/zfs_context_os.h | 34 + .../lib/libzpool/include/sys/zfs_debug_os.h | 29 + sys/contrib/openzfs/lib/libzpool/kernel.c | 662 +-------- sys/contrib/openzfs/lib/libzpool/util.c | 1 + sys/contrib/openzfs/man/man4/zfs.4 | 42 +- sys/contrib/openzfs/man/man7/vdevprops.7 | 8 +- sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 5 + sys/contrib/openzfs/man/man8/zfs-jail.8 | 79 +- sys/contrib/openzfs/man/man8/zfs-rewrite.8 | 22 +- sys/contrib/openzfs/man/man8/zpool-events.8 | 73 +- sys/contrib/openzfs/man/man8/zpool-prefetch.8 | 27 +- sys/contrib/openzfs/module/Kbuild.in | 3 +- sys/contrib/openzfs/module/Makefile.bsd | 24 - sys/contrib/openzfs/module/icp/spi/kcf_spi.c | 1 - .../openzfs/module/os/freebsd/spl/spl_uio.c | 2 +- sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c | 5 +- sys/contrib/openzfs/module/os/freebsd/zfs/spa_os.c | 10 +- .../openzfs/module/os/freebsd/zfs/vdev_label_os.c | 8 +- .../openzfs/module/os/freebsd/zfs/zfs_acl.c | 3 +- .../openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c | 4 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 20 +- .../openzfs/module/os/freebsd/zfs/zvol_os.c | 12 +- .../openzfs/module/os/linux/spl/spl-taskq.c | 14 - sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 3 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 3 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 93 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 6 +- sys/contrib/openzfs/module/zcommon/zpool_prop.c | 3 + sys/contrib/openzfs/module/zfs/arc.c | 8 +- sys/contrib/openzfs/module/zfs/bpobj.c | 7 +- sys/contrib/openzfs/module/zfs/bptree.c | 9 +- sys/contrib/openzfs/module/zfs/brt.c | 48 +- sys/contrib/openzfs/module/zfs/dbuf.c | 5 +- sys/contrib/openzfs/module/zfs/ddt_log.c | 7 +- sys/contrib/openzfs/module/zfs/dmu.c | 27 +- sys/contrib/openzfs/module/zfs/dmu_redact.c | 6 +- sys/contrib/openzfs/module/zfs/dnode.c | 156 +-- sys/contrib/openzfs/module/zfs/metaslab.c | 8 +- sys/contrib/openzfs/module/zfs/mmp.c | 4 +- sys/contrib/openzfs/module/zfs/spa.c | 281 ++-- sys/contrib/openzfs/module/zfs/spa_checkpoint.c | 2 +- sys/contrib/openzfs/module/zfs/spa_config.c | 8 +- sys/contrib/openzfs/module/zfs/spa_history.c | 5 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 110 +- sys/contrib/openzfs/module/zfs/space_map.c | 2 +- sys/contrib/openzfs/module/zfs/vdev.c | 86 +- .../openzfs/module/zfs/vdev_indirect_births.c | 2 +- .../openzfs/module/zfs/vdev_indirect_mapping.c | 5 +- sys/contrib/openzfs/module/zfs/vdev_initialize.c | 8 +- sys/contrib/openzfs/module/zfs/vdev_label.c | 33 +- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 2 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 4 +- sys/contrib/openzfs/module/zfs/vdev_removal.c | 20 +- sys/contrib/openzfs/module/zfs/vdev_trim.c | 12 +- sys/contrib/openzfs/module/zfs/zap_micro.c | 4 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 9 +- sys/contrib/openzfs/module/zfs/zfs_fuid.c | 4 +- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 41 +- sys/contrib/openzfs/module/zfs/zio.c | 13 +- sys/contrib/openzfs/module/zfs/zio_inject.c | 8 +- sys/contrib/openzfs/module/zfs/zvol.c | 9 +- .../openzfs/module/zstd/include/aarch64_compat.h | 38 - .../openzfs/module/zstd/lib/common/compiler.h | 3 - .../openzfs/module/zstd/lib/common/zstd_internal.h | 9 + sys/contrib/openzfs/rpm/generic/zfs.spec.in | 44 +- sys/contrib/openzfs/scripts/Makefile.am | 4 +- sys/contrib/openzfs/scripts/spdxcheck.pl | 6 +- sys/contrib/openzfs/scripts/zfs2zol-patch.sed | 32 - sys/contrib/openzfs/scripts/zol2zfs-patch.sed | 20 - sys/contrib/openzfs/tests/runfiles/common.run | 2 +- .../openzfs/tests/zfs-tests/cmd/Makefile.am | 5 +- sys/contrib/openzfs/tests/zfs-tests/cmd/ereports.c | 3 +- .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + .../functional/cli_root/zpool_get/vdev_get.cfg | 1 + .../zpool_prefetch/zpool_prefetch_001_pos.ksh | 12 +- .../zpool_prefetch/zpool_prefetch_002_pos.ksh | 95 ++ .../tests/functional/events/zed_slow_io.ksh | 44 +- .../tests/functional/trim/autotrim_config.ksh | 2 +- 190 files changed, 7048 insertions(+), 3699 deletions(-) diff --cc sys/contrib/openzfs/README.md index a90736bb56b7,000000000000..a39b88fedd12 mode 100644,000000..100644 --- a/sys/contrib/openzfs/README.md +++ b/sys/contrib/openzfs/README.md @@@ -1,35 -1,0 +1,35 @@@ +![img](https://openzfs.github.io/openzfs-docs/_static/img/logo/480px-Open-ZFS-Secondary-Logo-Colour-halfsize.png) + +OpenZFS is an advanced file system and volume manager which was originally +developed for Solaris and is now maintained by the OpenZFS community. +This repository contains the code for running OpenZFS on Linux and FreeBSD. + +[![codecov](https://codecov.io/gh/openzfs/zfs/branch/master/graph/badge.svg)](https://codecov.io/gh/openzfs/zfs) +[![coverity](https://scan.coverity.com/projects/1973/badge.svg)](https://scan.coverity.com/projects/openzfs-zfs) + +# Official Resources + + * [Documentation](https://openzfs.github.io/openzfs-docs/) - for using and developing this repo - * [ZoL Site](https://zfsonlinux.org) - Linux release info & links ++ * [ZoL site](https://zfsonlinux.org) - Linux release info & links + * [Mailing lists](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html) + * [OpenZFS site](https://openzfs.org/) - for conference videos and info on other platforms (illumos, OSX, Windows, etc) + +# Installation + +Full documentation for installing OpenZFS on your favorite operating system can +be found at the [Getting Started Page](https://openzfs.github.io/openzfs-docs/Getting%20Started/index.html). + +# Contribute & Develop + +We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md). + +We have a [Code of Conduct](./CODE_OF_CONDUCT.md). + +# Release + +OpenZFS is released under a CDDL license. +For more details see the NOTICE, LICENSE and COPYRIGHT files; `UCRL-CODE-235197` + +# Supported Kernels + * The `META` file contains the officially recognized supported Linux kernel versions. + * Supported FreeBSD versions are any supported branches and releases starting from 13.0-RELEASE. diff --cc sys/contrib/openzfs/include/libzpool.h index 000000000000,95991e68116e..95991e68116e mode 000000,100644..100644 --- a/sys/contrib/openzfs/include/libzpool.h +++ b/sys/contrib/openzfs/include/libzpool.h diff --cc sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_debug_os.h index 000000000000,2841809528b6..2841809528b6 mode 000000,100644..100644 --- a/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_debug_os.h +++ b/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_debug_os.h diff --cc sys/contrib/openzfs/lib/libspl/condvar.c index 000000000000,3d70fe152089..3d70fe152089 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/condvar.c +++ b/sys/contrib/openzfs/lib/libspl/condvar.c diff --cc sys/contrib/openzfs/lib/libspl/cred.c index 000000000000,130323ea91a7..130323ea91a7 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/cred.c +++ b/sys/contrib/openzfs/lib/libspl/cred.c diff --cc sys/contrib/openzfs/lib/libspl/include/libspl.h index 000000000000,68756bb9597b..68756bb9597b mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/libspl.h +++ b/sys/contrib/openzfs/lib/libspl/include/libspl.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/condvar.h index 000000000000,9a05c41d1510..9a05c41d1510 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/condvar.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/condvar.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/misc.h index 000000000000,171bbc1de798..171bbc1de798 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/misc.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/misc.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/mutex.h index 000000000000,1da0e632d60f..1da0e632d60f mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/mutex.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/mutex.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h index 000000000000,93b80a4bfdb6..93b80a4bfdb6 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/random.h index 000000000000,d11580829ed2..d11580829ed2 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/random.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/random.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/rwlock.h index 000000000000,9f82f270d939..9f82f270d939 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/rwlock.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/rwlock.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/sid.h index 000000000000,74789c5d9a62..74789c5d9a62 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/sid.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/sid.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/systm.h index 000000000000,f984125c3315..f984125c3315 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/systm.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/systm.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/taskq.h index 000000000000,fbe3f388c05f..fbe3f388c05f mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/taskq.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/taskq.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/thread.h index 000000000000,6390c5bfd863..6390c5bfd863 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/thread.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/thread.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/timer.h index 000000000000,850d11f063c3..850d11f063c3 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/timer.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/timer.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/trace.h index 000000000000,17b812faed20..17b812faed20 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/trace.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/trace.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/tsd.h index 000000000000,fa91519b3de5..fa91519b3de5 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/tsd.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/tsd.h diff --cc sys/contrib/openzfs/lib/libspl/kmem.c index 000000000000,c64e94597cf4..c64e94597cf4 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/kmem.c +++ b/sys/contrib/openzfs/lib/libspl/kmem.c diff --cc sys/contrib/openzfs/lib/libspl/kstat.c index 000000000000,af4b870edadf..af4b870edadf mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/kstat.c +++ b/sys/contrib/openzfs/lib/libspl/kstat.c diff --cc sys/contrib/openzfs/lib/libspl/libspl.c index 000000000000,208b3e428536..208b3e428536 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/libspl.c +++ b/sys/contrib/openzfs/lib/libspl/libspl.c diff --cc sys/contrib/openzfs/lib/libspl/mutex.c index 000000000000,36e5bec396ed..36e5bec396ed mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/mutex.c +++ b/sys/contrib/openzfs/lib/libspl/mutex.c diff --cc sys/contrib/openzfs/lib/libspl/procfs_list.c index 000000000000,0ce327db6343..0ce327db6343 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/procfs_list.c +++ b/sys/contrib/openzfs/lib/libspl/procfs_list.c diff --cc sys/contrib/openzfs/lib/libspl/random.c index 000000000000,c6f0ee7ae0f7..c6f0ee7ae0f7 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/random.c +++ b/sys/contrib/openzfs/lib/libspl/random.c diff --cc sys/contrib/openzfs/lib/libspl/rwlock.c index 000000000000,3712829ef594..3712829ef594 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/rwlock.c +++ b/sys/contrib/openzfs/lib/libspl/rwlock.c diff --cc sys/contrib/openzfs/lib/libspl/sid.c index 000000000000,b7d5b5f2e778..b7d5b5f2e778 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/sid.c +++ b/sys/contrib/openzfs/lib/libspl/sid.c diff --cc sys/contrib/openzfs/lib/libspl/thread.c index 000000000000,f00e0a01a06b..f00e0a01a06b mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/thread.c +++ b/sys/contrib/openzfs/lib/libspl/thread.c diff --cc sys/contrib/openzfs/lib/libzpool/include/Makefile.am index 000000000000,6cfa2d5ce089..6cfa2d5ce089 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libzpool/include/Makefile.am +++ b/sys/contrib/openzfs/lib/libzpool/include/Makefile.am diff --cc sys/contrib/openzfs/lib/libzpool/include/sys/zfs_bootenv_os.h index 000000000000,44afbb6f5b6b..44afbb6f5b6b mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_bootenv_os.h +++ b/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_bootenv_os.h diff --cc sys/contrib/openzfs/lib/libzpool/include/sys/zfs_context_os.h index 000000000000,4dcf386e3351..4dcf386e3351 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_context_os.h +++ b/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_context_os.h diff --cc sys/contrib/openzfs/lib/libzpool/include/sys/zfs_debug_os.h index 000000000000,b59165a6c903..b59165a6c903 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_debug_os.h +++ b/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_debug_os.h diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.ksh index 000000000000,f34f8c36e592..f34f8c36e592 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.ksh From nobody Mon Nov 17 16:12:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9CSl4rlSz6GVLX; Mon, 17 Nov 2025 16:12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9CSl3fzXz3QFL; Mon, 17 Nov 2025 16:12:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763395959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LZ2KDCjpNC/bJOS9+yDLwtASmiWMnHdJ4jLKRr8KN1I=; b=qxlevYJE8b5zMGYFtwIOxizUkUwmsJggVkSkicOJkBzqAilbNvLyvW9wwI+S8f17S+ObNG mvowNWAirxeREyV+IUQMTkynP9cOgDfoL7AM08aY7fDU9SBbqFmPnzcP5O5gUBh2y+7HUQ EcQBi++6SJh4LMA5Jv/3VT5MjXTirZmUrGIw1MYmw4YlOB6Tl03rwhG8s4h6IZOXfzJX8e F2xfTw887ayqlmwIg4CILFoq64uckf8N5AlZmawXsjAFkgj5WNUFLF7hnNICphxzxKo2XS uMIeUuAM54SMpHr14ULCMh1pcRZUedgFTSclVGYcaOufRNhG/Rva4JpcuA72Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763395959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LZ2KDCjpNC/bJOS9+yDLwtASmiWMnHdJ4jLKRr8KN1I=; b=KmNpl4Dap+adB4U70o1let5pGPkBN1q4f4gf7LH8z33M8Kf+R6m+IeBf24IYwvepm/TKbI vFqraQLfZu1elmD95bTCN64SCNwaBn4dN5s2Y+6DkDZq4lapt6Okthw5B+QWsUf0PW7FK/ idweAJE6jXA2JoqODYS/Xwmv9XIsaLb3L2ZGMLxHUrpzey3OunRu/++VVmgkEBcd1sbEWM mO04XvSsWgdVS/s+QUfS3T+TbtLx/OYzO+AwVCQiYsTtqVhkr6aCj8qemVMdTSolNhs0Zk CU8eSfnVQPRhhzQpEBh3+SpWhAt2JUjYyHSYKTi78OJ8H8dgxIU0K/liQ+YTCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763395959; a=rsa-sha256; cv=none; b=Ym30TYnCsLqEy265BMfftzInhgc8UmcVE8XWfhl33JgBVKsFrZTe+hAcg4Q02XMF/Dpwz3 e3CB/QKIaG5UoXOCYY0pGs+viw3hxGBCRxk/bJ+1DvoQg934pJAb+dQFqCuj0Aff4T5G2e V7JrKWkqdr56jsqzS7HShNW8VIuHpzl59DzABVR/rlvKq8PcvXkQDbQwOlUiwziZYPvgZ5 6tfZjsMbnHSC8JrJ10CMcAKE5nZ20XtGviEYRfQRGAFnAM3xldDg+YT+kRA+wqlgrTYNEQ OC5sXmBc1UR4bESFYi9Ml8rXG5VeUkt9mLkU45FkZi5dadyFSE3PH8pJXLKHwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9CSl3FK5z1Q1; Mon, 17 Nov 2025 16:12:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHGCdlw068079; Mon, 17 Nov 2025 16:12:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHGCdw2068076; Mon, 17 Nov 2025 16:12:39 GMT (envelope-from git) Date: Mon, 17 Nov 2025 16:12:39 GMT Message-Id: <202511171612.5AHGCdw2068076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 4303bde4297a - main - zfs: fix build after openzfs/zfs@e63d026b9 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4303bde4297a3d19cabdb08ce1550f682578d2ba Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=4303bde4297a3d19cabdb08ce1550f682578d2ba commit 4303bde4297a3d19cabdb08ce1550f682578d2ba Author: Martin Matuska AuthorDate: 2025-11-16 11:15:14 +0000 Commit: Martin Matuska CommitDate: 2025-11-17 16:11:56 +0000 zfs: fix build after openzfs/zfs@e63d026b9 Fix Makefiles Update zfs_config.h and zfs_gitrev.h --- cddl/lib/drti/Makefile | 1 + cddl/lib/libdtrace/Makefile | 1 + cddl/lib/libicp/Makefile | 3 --- cddl/lib/libspl/Makefile | 12 ++++++++++++ cddl/lib/libzpool/Makefile | 3 +-- cddl/usr.bin/zinject/Makefile | 2 +- cddl/usr.bin/zstream/Makefile | 2 +- cddl/usr.libexec/zpool_influxdb/Makefile | 2 +- cddl/usr.sbin/dtrace/Makefile | 3 ++- cddl/usr.sbin/lockstat/Makefile | 1 + cddl/usr.sbin/plockstat/Makefile | 1 + cddl/usr.sbin/zdb/Makefile | 2 +- cddl/usr.sbin/zhack/Makefile | 2 +- lib/libbe/tests/Makefile | 1 + lib/libproc/Makefile | 1 + lib/libprocstat/Makefile | 1 + sbin/bectl/Makefile | 3 ++- sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h | 3 +++ sys/cddl/dev/dtrace/x86/instr_size.c | 3 +++ sys/contrib/openzfs/lib/libspl/include/sys/condvar.h | 5 +++++ sys/contrib/openzfs/lib/libspl/include/sys/kmem.h | 10 ++++++++++ sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h | 2 ++ sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h | 4 ++++ sys/contrib/openzfs/lib/libspl/include/sys/tunables.h | 3 ++- sys/modules/zfs/zfs_config.h | 4 ++-- sys/modules/zfs/zfs_gitrev.h | 2 +- usr.sbin/fstyp/Makefile | 2 +- 27 files changed, 62 insertions(+), 17 deletions(-) diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile index 4a7a8350cac8..50250887e379 100644 --- a/cddl/lib/drti/Makefile +++ b/cddl/lib/drti/Makefile @@ -11,6 +11,7 @@ CLEANFILES= ${FILES} # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. .undef LIBRARIES_ONLY CFLAGS+= -DIN_BASE +CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index d086fffb07bc..dae6200d80c1 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -77,6 +77,7 @@ SYSINCS+= ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h WARNS?= 1 CFLAGS+= -DIN_BASE +CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile index 1a9a79103b50..833ecbb1c7f7 100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -91,9 +91,6 @@ KERNEL_C = \ core/kcf_prov_tabs.c \ $(ASM_SOURCES_C) -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zfs -KERNEL_C+= zfs_impl.c - SRCS= $(ASM_SOURCES_AS) $(KERNEL_C) WARNS?= 2 diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile index 26e14ea72b8a..2c56348cdf9c 100644 --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -13,10 +13,22 @@ LIBADD= SRCS = \ assert.c \ backtrace.c \ + condvar.c \ + cred.c \ + kmem.c \ + kstat.c \ + libspl.c \ list.c \ mkdirp.c \ + mutex.c \ os/freebsd/zone.c \ page.c \ + procfs_list.c \ + random.c \ + rwlock.c \ + sid.c \ + taskq.c \ + thread.c \ timestamp.c \ include/sys/list.h \ include/sys/list_impl.h diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 82ec0e890d56..031cc27fb431 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -36,7 +36,6 @@ LIB= zpool USER_C = \ arc_os.c \ kernel.c \ - taskq.c \ util.c \ zfs_debug.c @@ -181,6 +180,7 @@ KERNEL_C = \ zfs_debug_common.c \ zfs_fm.c \ zfs_fuid.c \ + zfs_impl.c \ zfs_sa.c \ zfs_znode.c \ zfs_racct.c \ @@ -265,7 +265,6 @@ CFLAGS+= \ -I${ZFSTOP}/lib/libspl/include/os/freebsd \ -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \ -I${SRCTOP}/sys \ - -I${ZFSTOP}/include/os/freebsd/zfs \ -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${ZFSTOP}/module/icp/include \ -I${SRCTOP}/compat/linuxkpi/common/include/linux \ diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile index 921d4df7a651..fd8437ed3f2c 100644 --- a/cddl/usr.bin/zinject/Makefile +++ b/cddl/usr.bin/zinject/Makefile @@ -23,6 +23,6 @@ CFLAGS+= \ -DHAVE_ISSETUGID \ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h -LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool +LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool pthread .include diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile index b131901cb6a9..7b753f79c4d7 100644 --- a/cddl/usr.bin/zstream/Makefile +++ b/cddl/usr.bin/zstream/Makefile @@ -33,6 +33,6 @@ CFLAGS+= \ -DHAVE_ISSETUGID \ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h -LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool +LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool pthread .include diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile b/cddl/usr.libexec/zpool_influxdb/Makefile index 064ac9b23e4a..f91ce1a7a213 100644 --- a/cddl/usr.libexec/zpool_influxdb/Makefile +++ b/cddl/usr.libexec/zpool_influxdb/Makefile @@ -22,6 +22,6 @@ CFLAGS+= \ -DSYSCONFDIR=\"/etc\" \ -DPKGDATADIR=\"/usr/share/zfs\" -LIBADD= nvpair spl zfs +LIBADD= nvpair spl zfs pthread .include diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile index c72b55cc4903..cdfd8af8fe72 100644 --- a/cddl/usr.sbin/dtrace/Makefile +++ b/cddl/usr.sbin/dtrace/Makefile @@ -10,6 +10,7 @@ BINDIR?= /usr/sbin WARNS?= 1 CFLAGS+= -DIN_BASE +CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd @@ -33,7 +34,7 @@ CFLAGS+= -fsanitize=address -fsanitize=undefined LDFLAGS+= -fsanitize=address -fsanitize=undefined .endif -LIBADD= dtrace ctf elf proc spl xo +LIBADD= dtrace ctf elf proc spl xo pthread .if ${MK_DTRACE_TESTS} != "no" SUBDIR+= tests diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile index c87a37ef1504..498e2a5857e0 100644 --- a/cddl/usr.sbin/lockstat/Makefile +++ b/cddl/usr.sbin/lockstat/Makefile @@ -10,6 +10,7 @@ BINDIR?= /usr/sbin WARNS?= 1 CFLAGS+= -DIN_BASE +CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile index 3e35c5c5b8f7..2880c6aeafc7 100644 --- a/cddl/usr.sbin/plockstat/Makefile +++ b/cddl/usr.sbin/plockstat/Makefile @@ -10,6 +10,7 @@ BINDIR?= /usr/sbin WARNS?= 1 CFLAGS+= -DIN_BASE +CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile index 7d1e41e1690e..f8f7eea6050b 100644 --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -23,7 +23,7 @@ CFLAGS+= \ -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ -DHAVE_ISSETUGID -LIBADD= nvpair umem uutil zdb zfs_core zfs spl avl zutil zpool crypto +LIBADD= nvpair umem uutil zdb zfs_core zfs spl avl zutil zpool crypto pthread CFLAGS.gcc+= -fms-extensions # Since there are many asserts in this program, it makes no sense to compile diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile index 69d561b3407b..2b981919e17b 100644 --- a/cddl/usr.sbin/zhack/Makefile +++ b/cddl/usr.sbin/zhack/Makefile @@ -24,7 +24,7 @@ CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h -LIBADD= nvpair zfs spl zutil zpool +LIBADD= nvpair zfs spl zutil zpool pthread CFLAGS+= -DDEBUG=1 #DEBUG_FLAGS+= -g diff --git a/lib/libbe/tests/Makefile b/lib/libbe/tests/Makefile index 20a4e1ddfeb7..80731ed1effc 100644 --- a/lib/libbe/tests/Makefile +++ b/lib/libbe/tests/Makefile @@ -10,6 +10,7 @@ LIBADD+= zfs \ spl \ nvpair \ be \ + pthread CFLAGS+= -I${SRCTOP}/lib/libbe CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile index 785007188255..5720dfdb6621 100644 --- a/lib/libproc/Makefile +++ b/lib/libproc/Makefile @@ -19,6 +19,7 @@ LIBADD+= cxxrt elf procstat rtld_db util z LIBADD+= ctf IGNORE_PRAGMA= YES CFLAGS+= -DIN_BASE +CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile index e20518910ba3..ab0c8157b393 100644 --- a/lib/libprocstat/Makefile +++ b/lib/libprocstat/Makefile @@ -60,6 +60,7 @@ CFLAGS.zfs.c+= -DIN_BASE CFLAGS.zfs.c+= -DHAVE_ISSETUGID CFLAGS.zfs.c+= -DZFS_DEBUG CFLAGS.zfs.c+= -I${ZFSTOP}/include +CFLAGS.zfs.c+= -I${ZFSTOP}/lib/libzpool/include CFLAGS.zfs.c+= -I${ZFSTOP}/lib/libspl/include CFLAGS.zfs.c+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS.zfs.c+= -I${ZFSTOP}/include/os/freebsd/zfs diff --git a/sbin/bectl/Makefile b/sbin/bectl/Makefile index c11426c57e45..cfd6ee2ccb97 100644 --- a/sbin/bectl/Makefile +++ b/sbin/bectl/Makefile @@ -11,7 +11,8 @@ LIBADD+= be \ nvpair \ spl \ util \ - zfsbootenv + zfsbootenv \ + pthread CFLAGS+= -DIN_BASE CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h index c274a9f3357a..242a32e140f5 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h @@ -70,6 +70,9 @@ typedef int processorid_t; #include #include #include +#ifdef __FreeBSD__ +#include +#endif #include #include #include diff --git a/sys/cddl/dev/dtrace/x86/instr_size.c b/sys/cddl/dev/dtrace/x86/instr_size.c index 4397b3bd69d7..41faf0f3e5aa 100644 --- a/sys/cddl/dev/dtrace/x86/instr_size.c +++ b/sys/cddl/dev/dtrace/x86/instr_size.c @@ -29,6 +29,9 @@ #include #include +#ifdef __FreeBSD__ +#include +#endif #include #ifdef illumos #include diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/condvar.h b/sys/contrib/openzfs/lib/libspl/include/sys/condvar.h index 9a05c41d1510..fb8f7c9bf6b1 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/condvar.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/condvar.h @@ -29,6 +29,10 @@ #ifndef _SYS_CONDVAR_H #define _SYS_CONDVAR_H +#ifdef SKIP_SPL_SYS_CONDVAR_H +#include_next +#else + #include #include #include @@ -62,4 +66,5 @@ extern void cv_broadcast(kcondvar_t *cv); #define cv_timedwait_idle_hires(cv, mp, t, r, f) \ cv_timedwait_hires(cv, mp, t, r, f) +#endif /* SKIP_SPL_CONDVAR_H */ #endif /* _SYS_CONDVAR_H */ diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/kmem.h b/sys/contrib/openzfs/lib/libspl/include/sys/kmem.h index 0321f6a0d5ba..33e618f46bb0 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/kmem.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/kmem.h @@ -32,6 +32,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + /* * Kernel memory */ @@ -65,8 +69,10 @@ extern char *kmem_asprintf(const char *fmt, ...); #define kmem_strfree(str) kmem_free((str), strlen(str) + 1) #define kmem_strdup(s) strdup(s) +#ifndef __cplusplus extern int kmem_scnprintf(char *restrict str, size_t size, const char *restrict fmt, ...); +#endif typedef umem_cache_t kmem_cache_t; @@ -83,4 +89,8 @@ typedef int fstrans_cookie_t; extern fstrans_cookie_t spl_fstrans_mark(void); extern void spl_fstrans_unmark(fstrans_cookie_t); +#ifdef __cplusplus +} +#endif + #endif /* _SYS_KMEM_H */ diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h b/sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h index 93b80a4bfdb6..144a8a22b9b5 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h @@ -45,6 +45,7 @@ typedef struct procfs_list { size_t pl_node_offset; } procfs_list_t; +#ifndef __cplusplus struct seq_file { }; void seq_printf(struct seq_file *m, const char *fmt, ...); @@ -65,5 +66,6 @@ void procfs_list_install(const char *module, void procfs_list_uninstall(procfs_list_t *procfs_list); void procfs_list_destroy(procfs_list_t *procfs_list); void procfs_list_add(procfs_list_t *procfs_list, void *p); +#endif #endif /* _SYS_PROCFS_LIST_H */ diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h b/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h index e33915c8d96b..cc6edf25a7bc 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h @@ -41,6 +41,10 @@ #include_next #endif +#ifdef __FreeBSD__ +#include +#endif + /* common macros */ #ifndef MIN #define MIN(a, b) ((a) < (b) ? (a) : (b)) diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h b/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h index c85400f6fd28..d93425733709 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h @@ -25,7 +25,8 @@ */ #ifndef _SYS_TUNABLES_H -#define _SYS_TUNABLES_H extern __attribute__((visibility("hidden"))) +//#define _SYS_TUNABLES_H extern __attribute__((visibility("hidden"))) +#define _SYS_TUNABLES_H extern typedef enum { ZFS_TUNABLE_TYPE_INT, diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 39b9229653af..f012910f58e7 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -856,7 +856,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.4.99-129-FreeBSD_g0455150f1" +#define ZFS_META_ALIAS "zfs-2.4.99-220-FreeBSD_ge63d026b9" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -886,7 +886,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "129-FreeBSD_g0455150f1" +#define ZFS_META_RELEASE "220-FreeBSD_ge63d026b9" /* Define the project version. */ #define ZFS_META_VERSION "2.4.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 87d2071cb0d2..f632d7d06ebe 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.4.99-129-g0455150f1" +#define ZFS_META_GITREV "zfs-2.4.99-220-ge63d026b9" diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile index ae5bae2e4f9d..c1f812cb5b97 100644 --- a/usr.sbin/fstyp/Makefile +++ b/usr.sbin/fstyp/Makefile @@ -47,7 +47,7 @@ CFLAGS.${src}+=-I${SRCTOP}/sys LIBADD= geom md ufs .if ${MK_ZFS} != "no" -LIBADD+=nvpair zfs spl +LIBADD+=nvpair zfs spl pthread .endif .include From nobody Mon Nov 17 16:12:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9CSn010nz6GV70; Mon, 17 Nov 2025 16:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9CSm4pGDz3Q15; Mon, 17 Nov 2025 16:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763395960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TF/uRi4ooTksOZYVy61wanNj6gN0r3+Zh5Yp9R/mLEQ=; b=a2xfRDsmYINJ9F4+57m9TryToJG4qEObJ6UxwXqWp6SoVEaL8JJ35rZLfea0j0RtYrx/rP zMiXCqF8NbVGGzDt1siKsu5t/FuRJmIw0ssqyQjyZNvBkWrt090vEj6oXjyesJOGQIc3E/ M05q91ztYBOAat5GX4cjOMCzo82VJp6LnWd/xeDHvSlOdzn4dn1OSveV4thwwCvE4Kqn01 yEQe4ncsrQFkxc5rqijcuD78mdokIni019l/u9SYKyaWZ8aris+AD01kNuAZCANvLu4AnT Fbd1BPChZVr0jNeuK2GfFScEC5zBnx+Rvplr9E1lcgLg0vL8Zur9WApgmX2oyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763395960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TF/uRi4ooTksOZYVy61wanNj6gN0r3+Zh5Yp9R/mLEQ=; b=fdEQ59mCv08VKDJi9rTq0c/KlgfJw4aP+IFrTMB6lTPMF8dSzlOZe//1az7dZr75O1QjMU 9IYUM2f2bsHcC9yw6TALBdmJZEKbxrz6fiRdnaRzAebRiCweRyxa9qBZxnU8r0qbmo6jfI EXB00oHh6Xn8RNsKvhRrYFYLJnUA/434gI0wcPXfogKQS1RTBFt23/hGVW79vsvDFPFuLr 23VxRSvI1SSV9uWwsK0OARYyPYkJS0nk6QuP3ip6FB1/ybRFErMUEIfneTQdQv5JT2lxIu JvBk0faQq9aklBNWLSUicFgbXNKS2ZyL79UqYxPvIgj7gvixcS4d444wm6VQag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763395960; a=rsa-sha256; cv=none; b=fz/PAoSsJgZjQ2PrGhxLxoM5rsBQeRE7AvO35Kq1XrrKT2J10JOYI/DAc8Oofu0yim63XG 6jEocHkbAhcWAa55X/LbpwE+M2KN8jcFNIQ1H2qJOwXgjAfLhB4X2lvjjoGyIKHfhlELBg K3ZEY0BQMmPdFWfhvD01oETL9IO1+48bWXWOOPUhLyzFsE5zsFRIx9gfrGIk0DPX0KW1Bv udRBBeVPT8e0OEsKCZ9lzQpSCdcOybL6cIfFKwv7SF4nyX7kcCP9E8OwMWjSmp/0tdOoyT 83BRm+gh4rINKpE+QhpR3GniMjR9z+xmjYznLcVlMO/P3Jc53A8uROgDOQcivQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9CSm47hcz1DJ; Mon, 17 Nov 2025 16:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHGCe7c068113; Mon, 17 Nov 2025 16:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHGCes5068110; Mon, 17 Nov 2025 16:12:40 GMT (envelope-from git) Date: Mon, 17 Nov 2025 16:12:40 GMT Message-Id: <202511171612.5AHGCes5068110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: bb8580e7a6a8 - main - zfs: fix cross-build after openzfs/zfs@e63d026b9d List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb8580e7a6a8c54481d0fd19cac43e84a485f45b Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=bb8580e7a6a8c54481d0fd19cac43e84a485f45b commit bb8580e7a6a8c54481d0fd19cac43e84a485f45b Author: Martin Matuska AuthorDate: 2025-11-17 11:34:01 +0000 Commit: Martin Matuska CommitDate: 2025-11-17 16:12:03 +0000 zfs: fix cross-build after openzfs/zfs@e63d026b9d Workaround multiple cross-build issues in OpenZFS code TBD: discuss long-term fix with OpenZFS --- cddl/lib/libspl/Makefile | 6 +++--- sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/fcntl.h | 2 ++ sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/mount.h | 2 ++ sys/contrib/openzfs/lib/libspl/include/sys/random.h | 2 ++ sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h | 2 ++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile index 2c56348cdf9c..173e9116e284 100644 --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -14,9 +14,7 @@ SRCS = \ assert.c \ backtrace.c \ condvar.c \ - cred.c \ kmem.c \ - kstat.c \ libspl.c \ list.c \ mkdirp.c \ @@ -28,7 +26,6 @@ SRCS = \ rwlock.c \ sid.c \ taskq.c \ - thread.c \ timestamp.c \ include/sys/list.h \ include/sys/list_impl.h @@ -38,7 +35,10 @@ SRCS = \ .if !defined(BOOTSTRAPPING) SRCS += \ atomic.c \ + cred.c \ getexecname.c \ + kstat.c \ + thread.c \ tunables.c \ os/freebsd/getexecname.c \ os/freebsd/gethostid.c \ diff --git a/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/fcntl.h b/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/fcntl.h index 64dd4d7ebe45..04fcc9f85c91 100644 --- a/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/fcntl.h +++ b/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/fcntl.h @@ -27,7 +27,9 @@ #ifndef _LIBSPL_SYS_FCNTL_H_ #define _LIBSPL_SYS_FCNTL_H_ +#if !defined(__linux__) || !defined(IN_BASE) #include_next +#endif #define O_LARGEFILE 0 #define O_RSYNC 0 diff --git a/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/mount.h b/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/mount.h index 231c250d3410..5548ad7d22b2 100644 --- a/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/mount.h +++ b/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/mount.h @@ -29,8 +29,10 @@ #ifndef _LIBSPL_SYS_MOUNT_H #define _LIBSPL_SYS_MOUNT_H +#if !defined(__linux__) || !defined(IN_BASE) #undef _SYS_MOUNT_H_ #include_next +#endif #include #include diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/random.h b/sys/contrib/openzfs/lib/libspl/include/sys/random.h index d11580829ed2..09ca0662d1a3 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/random.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/random.h @@ -39,7 +39,9 @@ random_in_range(uint32_t range) { uint32_t r; +#if !defined(__APPLE__) || !defined(IN_BASE) ASSERT(range != 0); +#endif if (range == 1) return (0); diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h b/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h index cc6edf25a7bc..f67b081c42fa 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h @@ -38,8 +38,10 @@ * have this header, so include_next won't find it and will abort. So, we * protect it with a platform check. */ +#ifndef IN_BASE #include_next #endif +#endif #ifdef __FreeBSD__ #include From nobody Mon Nov 17 16:39:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9D493Mj4z6GXPX; Mon, 17 Nov 2025 16:39: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9D492Lk2z3TTH; Mon, 17 Nov 2025 16:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763397593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lX99Pqabt10rCSWtMJ2ZVpbu0DExFGx8EnWHPDJZfdA=; b=rQvDalD3Bl5R6q532zhCFqatLNcy5xTR7UKspPDkX9ofj4PImdSgsGV99VKjuJfBYfH323 JvMeMrtDU5Ed2kCJEazQhRjzZS0xdojd5qqXxHnUyztjLkTzuqRJhyDg4mVDFw20BABqe2 Ic/6ocgJLCbeHqhtEUJVslgW5zNIccAgBD3hqIJjtPn+zj9hLWn8nqdsvqn9HTF/vHmPGI vLy82t7Cv3NQ0fN0hxI2EgLBKx9rI38O9gZmb8q6QtEdsIiZsiuU8CHq/vCkWzOZERyUn7 f1XkrD1yz1EBi6BrEsAk4WQnlg577B64ZUB3Tf56gmnO5fsp0RlQ5vrSkl+9Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763397593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lX99Pqabt10rCSWtMJ2ZVpbu0DExFGx8EnWHPDJZfdA=; b=or2mS4RZS1KvWOcBrDyivRezPGw+cUt7nOMj7a5TtbEnJvJIBIIOQvjLN/SPrqxl/8SbVf TbjvzQSvIqvTVdutd5Jx3xc7hjInQ6pVFwDZjCSKoarMoy34CWcWY50jtofF8EXtAct64b M8Kzu8g+GYts9U7JaXX5WNFn5x5g/NPvgCyDFHpK+2fUGngaxnCrFk3EYX3CxW788f8kTB fff+r19eHGcuLZHOAybsyIXfnYwG+0PLBEDKjgcbmyTMAlL3ph2QnsLG7Q4uu/yRXDa3xJ ocxH1wUL+h2hpYeE+xTweKRXOW90BMqa/5i86+BZm2D7KZ59X4T99ElokE4YTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763397593; a=rsa-sha256; cv=none; b=veC24Dke3tqwU6PP/BNf17KqhPd3HlCdgczZt/VyIF7T9NlxAnc4FosFCR4gW5duAfYE+H CrqvroXaeAB8fZQlOc9XTIZzrgsT5AO/QaJ8rVYLQRoeHD9WFDly17bY3Kp7qFjQ5oPmCK axI11QRxHx7zm8voaBoFL7kLQjYwpUfQJ3VhgROQkyrJbqgTYUujJzg7DnlWqlrQdBtugg GWKBD79HS5pAlVoo0kcSQ7/GqCC799oHNwimQID07kOpxXI/QhGEaC84pTkXVWKbHwqodI wrSILC42W34trovDzW/kLPYsXoSnQIw3xscBC/aP5wyQaQeKeHQv4TIEhLELqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9D491NTsz15k; Mon, 17 Nov 2025 16:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHGdril008835; Mon, 17 Nov 2025 16:39:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHGdrtr008832; Mon, 17 Nov 2025 16:39:53 GMT (envelope-from git) Date: Mon, 17 Nov 2025 16:39:53 GMT Message-Id: <202511171639.5AHGdrtr008832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e2956be814a1 - stable/13 - file: Simplify an INVARIANTS check in _fdrop() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e2956be814a1ae86d7b5f83144b517e54424da27 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e2956be814a1ae86d7b5f83144b517e54424da27 commit e2956be814a1ae86d7b5f83144b517e54424da27 Author: Mark Johnston AuthorDate: 2025-05-13 23:26:49 +0000 Commit: Mark Johnston CommitDate: 2025-11-17 14:29:25 +0000 file: Simplify an INVARIANTS check in _fdrop() No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. (cherry picked from commit a2e22ed3420d92d9d98a1e9681b5c9b1fbe40fca) --- sys/kern/kern_descrip.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index f51a1092114d..57ecf253f5be 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3718,13 +3718,10 @@ int __noinline _fdrop(struct file *fp, struct thread *td) { int error; -#ifdef INVARIANTS - int count; - count = refcount_load(&fp->f_count); - if (count != 0) - panic("fdrop: fp %p count %d", fp, count); -#endif + KASSERT(refcount_load(&fp->f_count) == 0, + ("fdrop: fp %p count %d", fp, refcount_load(&fp->f_count))); + error = fo_close(fp, td); atomic_subtract_int(&openfiles, 1); crfree(fp->f_cred); From nobody Mon Nov 17 16:39:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9D4B3L1Lz6GXBf; Mon, 17 Nov 2025 16:39: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9D4B1lRNz3TJ3; Mon, 17 Nov 2025 16:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763397594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxBkOt9WDNS3vOyzBZH0IMjgvuxvCj6ux3I6JX/JDrU=; b=cBTu1pI6kXEaOcFVUBnivTpOwIvbWEMXYlJ7nBarifnyrxYtIw5Zl0I/yNDMf8G3K6AXkv PJKUGNm14e8AxZXm2cUTs1F01bODoTP99F1XOmyz/hh7J7IPVz55F6kN6G7UixMvDj9VAy xDlfxIGNqjvwDWcUjDFJfoGBSurl1pdEY61VEdfF49XO6I1P3pSNFbV227cCR1ATHENsNE nIIXEbsAi6F8WJrrbHtKPkGTidgyBopmC6ojz9T3KSOgIOxm5sZc3h0zu2L0qspe5VYmF7 R1fAEqzKDLp5bgiacT628nOUulYSZvnLQc73rGqtN7v5oD1CngwzKF55e7YYcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763397594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxBkOt9WDNS3vOyzBZH0IMjgvuxvCj6ux3I6JX/JDrU=; b=T9myU2+o3Hne7cIBa3qpLSkldWmsicsltRJGhuUnt8eYAPelBa/rI2yA6+jAO3q1P8kfBS 5LiEWM/sV9F1PJx6/KrbbFa1XfXGevYddsT6CkkNInWXpQVNmJMobhsm6XHiKVmNkzkXxF o17TpbhfstivPymx7s/6u2xFddrlXAJE8Toll2KLNnypHNb9hxEQ4WcolkZjlYXmmFoGcJ ADyoMhZGuGPjpKUOt5zRTu+/WJxx6TkQlXR4mGdqwHcKDhOskkJBGLhbrV2NnuThAyxlUH S8rDyCenP9F/VrlqEMohxYJAfA3UHMVrBlqMt2rM97dkO6O6CNlufBzKBAAcmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763397594; a=rsa-sha256; cv=none; b=c5mn85beJn9BnoGBLtOtOdJWdPXgWj8HAj0FG/sWUexfx6nys+MDK+eQmkyLm0jLi4UamU cz0KrgGXaMMMFqSmeP03fHNa9dxRwiq7KccM9IlzX+kLFpYjYEKdqPOneB8uCLOLiMJZBX 7JcigrerZZLWum+Y6aeNJconb7UXeFz3d+nvizcu4AHedDbgG6ms+XQr9I5TuzhgsQSLVH c6EQs7855Jo9ej9i87X/BSxpE0Dp2V9P00JvZurAPVJMI2AHGi3g3a1on3ClfG48cUmUyv SjPs74bDNmBcvO9CcvTKqXYjrvZ35SfYEbzm/y5rqpL++s6HgQCcFP31P84LkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9D4B1K5Pz1RN; Mon, 17 Nov 2025 16:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHGdsac008870; Mon, 17 Nov 2025 16:39:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHGdspa008867; Mon, 17 Nov 2025 16:39:54 GMT (envelope-from git) Date: Mon, 17 Nov 2025 16:39:54 GMT Message-Id: <202511171639.5AHGdspa008867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ecc1e61d3140 - stable/13 - file: Qualify pointers to capsicum rights as const List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ecc1e61d31407680c9acee9c7adcf2ca2aa21432 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ecc1e61d31407680c9acee9c7adcf2ca2aa21432 commit ecc1e61d31407680c9acee9c7adcf2ca2aa21432 Author: Mark Johnston AuthorDate: 2025-05-20 20:19:30 +0000 Commit: Mark Johnston CommitDate: 2025-11-17 15:06:28 +0000 file: Qualify pointers to capsicum rights as const File descriptor lookup routines typically take a set of capsicum rights as input to the lookup, so that the fd's rights can be atomically checked. This set should be qualified with const. No functional change intended. Reviewed by: olce, oshogbo, brooks, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50419 (cherry picked from commit 5319cb21610ad947c56fd0cd4f18ef5b58bc8db7) --- sys/kern/kern_descrip.c | 48 +++++++++++++++++++++++++++--------------------- sys/kern/sys_procdesc.c | 5 +++-- sys/kern/uipc_mqueue.c | 5 +++-- sys/kern/uipc_sem.c | 6 +++--- sys/kern/uipc_syscalls.c | 4 ++-- sys/kern/vfs_syscalls.c | 5 +++-- sys/sys/file.h | 21 +++++++++++---------- sys/sys/filedesc.h | 19 ++++++++++--------- sys/sys/namei.h | 4 ++-- sys/sys/procdesc.h | 6 ++++-- sys/sys/socketvar.h | 2 +- 11 files changed, 69 insertions(+), 56 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 57ecf253f5be..f073fc64e0bc 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -114,7 +114,8 @@ static void fdgrowtable_exp(struct filedesc *fdp, int nfd); static void fdunused(struct filedesc *fdp, int fd); static void fdused(struct filedesc *fdp, int fd); static int fget_unlocked_seq(struct filedesc *fdp, int fd, - cap_rights_t *needrightsp, struct file **fpp, seqc_t *seqp); + const cap_rights_t *needrightsp, struct file **fpp, + seqc_t *seqp); static int getmaxfd(struct thread *td); static u_long *filecaps_copy_prep(const struct filecaps *src); static void filecaps_copy_finish(const struct filecaps *src, @@ -2978,7 +2979,7 @@ finit_vnode(struct file *fp, u_int flag, void *data, struct fileops *ops) } int -fget_cap_locked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, +fget_cap_locked(struct filedesc *fdp, int fd, const cap_rights_t *needrightsp, struct file **fpp, struct filecaps *havecapsp) { struct filedescent *fde; @@ -3010,7 +3011,7 @@ out: } int -fget_cap(struct thread *td, int fd, cap_rights_t *needrightsp, +fget_cap(struct thread *td, int fd, const cap_rights_t *needrightsp, struct file **fpp, struct filecaps *havecapsp) { struct filedesc *fdp = td->td_proc->p_fd; @@ -3256,7 +3257,7 @@ out_free: } static int -fget_unlocked_seq(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, +fget_unlocked_seq(struct filedesc *fdp, int fd, const cap_rights_t *needrightsp, struct file **fpp, seqc_t *seqp) { #ifdef CAPABILITIES @@ -3339,7 +3340,7 @@ fget_unlocked_seq(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, * racing with itself. */ int -fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, +fget_unlocked(struct filedesc *fdp, int fd, const cap_rights_t *needrightsp, struct file **fpp) { #ifdef CAPABILITIES @@ -3406,7 +3407,7 @@ out_fallback: */ #ifdef CAPABILITIES int -fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, +fget_only_user(struct filedesc *fdp, int fd, const cap_rights_t *needrightsp, struct file **fpp) { const struct filedescent *fde; @@ -3436,7 +3437,7 @@ fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, } #else int -fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, +fget_only_user(struct filedesc *fdp, int fd, const cap_rights_t *needrightsp, struct file **fpp) { struct file *fp; @@ -3472,7 +3473,7 @@ fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, */ static __inline int _fget(struct thread *td, int fd, struct file **fpp, int flags, - cap_rights_t *needrightsp) + const cap_rights_t *needrightsp) { struct filedesc *fdp; struct file *fp; @@ -3520,15 +3521,15 @@ _fget(struct thread *td, int fd, struct file **fpp, int flags, } int -fget(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp) +fget(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp) { return (_fget(td, fd, fpp, 0, rightsp)); } int -fget_mmap(struct thread *td, int fd, cap_rights_t *rightsp, vm_prot_t *maxprotp, - struct file **fpp) +fget_mmap(struct thread *td, int fd, const cap_rights_t *rightsp, + vm_prot_t *maxprotp, struct file **fpp) { int error; #ifndef CAPABILITIES @@ -3571,22 +3572,24 @@ fget_mmap(struct thread *td, int fd, cap_rights_t *rightsp, vm_prot_t *maxprotp, } int -fget_read(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp) +fget_read(struct thread *td, int fd, const cap_rights_t *rightsp, + struct file **fpp) { return (_fget(td, fd, fpp, FREAD, rightsp)); } int -fget_write(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp) +fget_write(struct thread *td, int fd, const cap_rights_t *rightsp, + struct file **fpp) { return (_fget(td, fd, fpp, FWRITE, rightsp)); } int -fget_fcntl(struct thread *td, int fd, cap_rights_t *rightsp, int needfcntl, - struct file **fpp) +fget_fcntl(struct thread *td, int fd, const cap_rights_t *rightsp, + int needfcntl, struct file **fpp) { struct filedesc *fdp = td->td_proc->p_fd; #ifndef CAPABILITIES @@ -3624,7 +3627,7 @@ fget_fcntl(struct thread *td, int fd, cap_rights_t *rightsp, int needfcntl, * XXX: what about the unused flags ? */ static __inline int -_fgetvp(struct thread *td, int fd, int flags, cap_rights_t *needrightsp, +_fgetvp(struct thread *td, int fd, int flags, const cap_rights_t *needrightsp, struct vnode **vpp) { struct file *fp; @@ -3646,14 +3649,15 @@ _fgetvp(struct thread *td, int fd, int flags, cap_rights_t *needrightsp, } int -fgetvp(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp) +fgetvp(struct thread *td, int fd, const cap_rights_t *rightsp, + struct vnode **vpp) { return (_fgetvp(td, fd, 0, rightsp, vpp)); } int -fgetvp_rights(struct thread *td, int fd, cap_rights_t *needrightsp, +fgetvp_rights(struct thread *td, int fd, const cap_rights_t *needrightsp, struct filecaps *havecaps, struct vnode **vpp) { struct filecaps caps; @@ -3685,14 +3689,16 @@ out: } int -fgetvp_read(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp) +fgetvp_read(struct thread *td, int fd, const cap_rights_t *rightsp, + struct vnode **vpp) { return (_fgetvp(td, fd, FREAD, rightsp, vpp)); } int -fgetvp_exec(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp) +fgetvp_exec(struct thread *td, int fd, const cap_rights_t *rightsp, + struct vnode **vpp) { return (_fgetvp(td, fd, FEXEC, rightsp, vpp)); @@ -3700,7 +3706,7 @@ fgetvp_exec(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp #ifdef notyet int -fgetvp_write(struct thread *td, int fd, cap_rights_t *rightsp, +fgetvp_write(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp) { diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index aab7b1616594..4665dc2c0421 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -121,7 +121,7 @@ static struct fileops procdesc_ops = { * died. */ int -procdesc_find(struct thread *td, int fd, cap_rights_t *rightsp, +procdesc_find(struct thread *td, int fd, const cap_rights_t *rightsp, struct proc **p) { struct procdesc *pd; @@ -168,7 +168,8 @@ procdesc_pid(struct file *fp_procdesc) * Retrieve the PID associated with a process descriptor. */ int -kern_pdgetpid(struct thread *td, int fd, cap_rights_t *rightsp, pid_t *pidp) +kern_pdgetpid(struct thread *td, int fd, const cap_rights_t *rightsp, + pid_t *pidp) { struct file *fp; int error; diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index be3e3fefa749..14fbe9a7f281 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -2159,13 +2159,14 @@ sys_kmq_unlink(struct thread *td, struct kmq_unlink_args *uap) return (error); } -typedef int (*_fgetf)(struct thread *, int, cap_rights_t *, struct file **); +typedef int (*_fgetf)(struct thread *, int, const cap_rights_t *, + struct file **); /* * Get message queue by giving file slot */ static int -_getmq(struct thread *td, int fd, cap_rights_t *rightsp, _fgetf func, +_getmq(struct thread *td, int fd, const cap_rights_t *rightsp, _fgetf func, struct file **fpp, struct mqfs_node **ppn, struct mqueue **pmq) { struct mqfs_node *pn; diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c index 7cb25749ad9c..9871c0528338 100644 --- a/sys/kern/uipc_sem.c +++ b/sys/kern/uipc_sem.c @@ -123,8 +123,8 @@ static int ksem_create(struct thread *td, const char *path, semid_t *semidp, mode_t mode, unsigned int value, int flags, int compat32); static void ksem_drop(struct ksem *ks); -static int ksem_get(struct thread *td, semid_t id, cap_rights_t *rightsp, - struct file **fpp); +static int ksem_get(struct thread *td, semid_t id, + const cap_rights_t *rightsp, struct file **fpp); static struct ksem *ksem_hold(struct ksem *ks); static void ksem_insert(char *path, Fnv32_t fnv, struct ksem *ks); static struct ksem *ksem_lookup(char *path, Fnv32_t fnv); @@ -588,7 +588,7 @@ ksem_create(struct thread *td, const char *name, semid_t *semidp, mode_t mode, } static int -ksem_get(struct thread *td, semid_t id, cap_rights_t *rightsp, +ksem_get(struct thread *td, semid_t id, const cap_rights_t *rightsp, struct file **fpp) { struct ksem *ks; diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index ef3ebeb58176..336a0dd77d5c 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -91,7 +91,7 @@ static int sockargs(struct mbuf **, char *, socklen_t, int); * A reference on the file entry is held upon returning. */ int -getsock_cap(struct thread *td, int fd, cap_rights_t *rightsp, +getsock_cap(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp, u_int *fflagp, struct filecaps *havecapsp) { struct file *fp; @@ -727,7 +727,7 @@ kern_sendit(struct thread *td, int s, struct msghdr *mp, int flags, struct uio auio; struct iovec *iov; struct socket *so; - cap_rights_t *rights; + const cap_rights_t *rights; #ifdef KTRACE struct uio *ktruio = NULL; #endif diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 7dcdaa66adb8..51f26b843c45 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -4315,7 +4315,7 @@ out: * semantics. */ int -getvnode_path(struct thread *td, int fd, cap_rights_t *rightsp, +getvnode_path(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp) { struct file *fp; @@ -4353,7 +4353,8 @@ getvnode_path(struct thread *td, int fd, cap_rights_t *rightsp, * A reference on the file entry is held upon returning. */ int -getvnode(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp) +getvnode(struct thread *td, int fd, const cap_rights_t *rightsp, + struct file **fpp) { int error; diff --git a/sys/sys/file.h b/sys/sys/file.h index 9ae31974745a..4c0ec276c700 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -251,14 +251,15 @@ extern struct fileops socketops; extern int maxfiles; /* kernel limit on number of open files */ extern int maxfilesperproc; /* per process limit on number of open files */ -int fget(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp); -int fget_mmap(struct thread *td, int fd, cap_rights_t *rightsp, +int fget(struct thread *td, int fd, const cap_rights_t *rightsp, + struct file **fpp); +int fget_mmap(struct thread *td, int fd, const cap_rights_t *rightsp, vm_prot_t *maxprotp, struct file **fpp); -int fget_read(struct thread *td, int fd, cap_rights_t *rightsp, +int fget_read(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp); -int fget_write(struct thread *td, int fd, cap_rights_t *rightsp, +int fget_write(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp); -int fget_fcntl(struct thread *td, int fd, cap_rights_t *rightsp, +int fget_fcntl(struct thread *td, int fd, const cap_rights_t *rightsp, int needfcntl, struct file **fpp); int _fdrop(struct file *fp, struct thread *td); int fget_remote(struct thread *td, struct proc *p, int fd, struct file **fpp); @@ -281,15 +282,15 @@ int file_kcmp_generic(struct file *fp1, struct file *fp2, struct thread *td); void finit(struct file *, u_int, short, void *, struct fileops *); void finit_vnode(struct file *, u_int, void *, struct fileops *); -int fgetvp(struct thread *td, int fd, cap_rights_t *rightsp, +int fgetvp(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp); -int fgetvp_exec(struct thread *td, int fd, cap_rights_t *rightsp, +int fgetvp_exec(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp); -int fgetvp_rights(struct thread *td, int fd, cap_rights_t *needrightsp, +int fgetvp_rights(struct thread *td, int fd, const cap_rights_t *needrightsp, struct filecaps *havecaps, struct vnode **vpp); -int fgetvp_read(struct thread *td, int fd, cap_rights_t *rightsp, +int fgetvp_read(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp); -int fgetvp_write(struct thread *td, int fd, cap_rights_t *rightsp, +int fgetvp_write(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp); int fgetvp_lookup_smr(int fd, struct nameidata *ndp, struct vnode **vpp, bool *fsearch); int fgetvp_lookup(int fd, struct nameidata *ndp, struct vnode **vpp); diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index 9055f0a785e7..bf7a27e37161 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -267,22 +267,23 @@ struct filedesc_to_leader * struct filedesc_to_leader * filedesc_to_leader_share(struct filedesc_to_leader *fdtol, struct filedesc *fdp); -int getvnode(struct thread *td, int fd, cap_rights_t *rightsp, +int getvnode(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp); -int getvnode_path(struct thread *td, int fd, cap_rights_t *rightsp, +int getvnode_path(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp); void mountcheckdirs(struct vnode *olddp, struct vnode *newdp); -int fget_cap_locked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, - struct file **fpp, struct filecaps *havecapsp); -int fget_cap(struct thread *td, int fd, cap_rights_t *needrightsp, +int fget_cap_locked(struct filedesc *fdp, int fd, + const cap_rights_t *needrightsp, struct file **fpp, + struct filecaps *havecapsp); +int fget_cap(struct thread *td, int fd, const cap_rights_t *needrightsp, struct file **fpp, struct filecaps *havecapsp); /* Return a referenced file from an unlocked descriptor. */ -int fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, - struct file **fpp); +int fget_unlocked(struct filedesc *fdp, int fd, + const cap_rights_t *needrightsp, struct file **fpp); /* Return a file pointer without a ref. FILEDESC_IS_ONLY_USER must be true. */ -int fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, - struct file **fpp); +int fget_only_user(struct filedesc *fdp, int fd, + const cap_rights_t *needrightsp, struct file **fpp); #define fput_only_user(fdp, fp) ({ \ MPASS(FILEDESC_IS_ONLY_USER(fdp)); \ MPASS(refcount_load(&fp->f_count) > 0); \ diff --git a/sys/sys/namei.h b/sys/sys/namei.h index e8369867c6b8..1d0fd1c96449 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -72,7 +72,7 @@ struct nameidata { */ const char *ni_dirp; /* pathname pointer */ enum uio_seg ni_segflg; /* location of pathname */ - cap_rights_t *ni_rightsneeded; /* rights required to look up vnode */ + const cap_rights_t *ni_rightsneeded; /* rights needed to look up vnode */ /* * Arguments to lookup. */ @@ -249,7 +249,7 @@ int cache_fplookup(struct nameidata *ndp, enum cache_fpl_status *status, #define NDINIT_ALL(ndp, op, flags, segflg, namep, dirfd, startdir, rightsp, td) \ do { \ struct nameidata *_ndp = (ndp); \ - cap_rights_t *_rightsp = (rightsp); \ + const cap_rights_t *_rightsp = (rightsp); \ MPASS(_rightsp != NULL); \ NDINIT_PREFILL(_ndp); \ NDINIT_DBG(_ndp); \ diff --git a/sys/sys/procdesc.h b/sys/sys/procdesc.h index ca26d65d5417..4e8b06fb7377 100644 --- a/sys/sys/procdesc.h +++ b/sys/sys/procdesc.h @@ -94,8 +94,10 @@ struct procdesc { * In-kernel interfaces to process descriptors. */ int procdesc_exit(struct proc *); -int procdesc_find(struct thread *, int fd, cap_rights_t *, struct proc **); -int kern_pdgetpid(struct thread *, int fd, cap_rights_t *, pid_t *pidp); +int procdesc_find(struct thread *, int fd, const cap_rights_t *, + struct proc **); +int kern_pdgetpid(struct thread *, int fd, const cap_rights_t *, + pid_t *pidp); void procdesc_new(struct proc *, int); void procdesc_finit(struct procdesc *, struct file *); pid_t procdesc_pid(struct file *); diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index e7ad086818f4..d2b5ac867a46 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -418,7 +418,7 @@ struct uio; */ int getsockaddr(struct sockaddr **namp, const struct sockaddr *uaddr, size_t len); -int getsock_cap(struct thread *td, int fd, cap_rights_t *rightsp, +int getsock_cap(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp, u_int *fflagp, struct filecaps *havecaps); void soabort(struct socket *so); int soaccept(struct socket *so, struct sockaddr **nam); From nobody Mon Nov 17 17:00:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9DXl3F09z6GYg3; Mon, 17 Nov 2025 17:01:11 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp5.goneo.de [IPv6:2001:1640:5::8:30]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9DXl0f4Zz3XcX; Mon, 17 Nov 2025 17:01:10 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub2.goneo.de (hub2.goneo.de [85.220.129.53]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp5.goneo.de (Postfix) with ESMTPS id E0256240ACA; Mon, 17 Nov 2025 18:01:02 +0100 (CET) Received: from hub2.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPS id 03ED1240542; Mon, 17 Nov 2025 18:01:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1763398861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3tPPxw88G4TLwlmCovgPLK6lA+CusYoLwTdeHy7/xTY=; b=llP3Tpi7zU1ZMhLS7/jIvZ3Dq+ixHvhA4K9uyN2NWhZw/qMjGDHUaVqeGM33Qc+KjuFhII QRXO+XOaEPqBLzlvDT1iHvYDdLLvC5SelPq0VREMi9P/DsPPH/X6PJc4tVCefvX4e4VzM1 UEP7IqJOVkcMWS9Gfj2y63rP3ujAVRG3BkpwQSRSosl5epJZ0VwhHl1Ohy5m75y3pEWOcv wLI33/8ezcWtNPIjsyx+7ZX1Yqcwe7QcBU5kNIbK+j1GfIz2T8jC59MRJzixAaOI8Ym4Qu wO/u70D63q426fzTJZU4Ls7ZuqL8Lf6bijFPP1ilLWwAK9n2CD5LeM0/5KytuQ== Received: from thor.sb211.local (dynamic-2a02-3100-2ea1-7002-7587-9c98-e11e-6c68.310.pool.telefonica.de [IPv6:2a02:3100:2ea1:7002:7587:9c98:e11e:6c68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPSA id 7D39424021E; Mon, 17 Nov 2025 18:01:00 +0100 (CET) Date: Mon, 17 Nov 2025 18:00:26 +0100 From: A FreeBSD User To: Warner Losh Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 44fb9f2701c7 - main - sys/efi_map.h: This is a kernel-only file Message-ID: <20251117180053.03f95e7a@thor.sb211.local> In-Reply-To: References: <202511170018.5AH0ITWK063891@gitrepo.freebsd.org> <20251117051144.3d0c31d9@thor.sb211.local> X-Mailer: Claws Mail 3.21.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/TlOH9YXa5uMGJ4f6CzYkjgH"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Rspamd-UID: be517f X-Rspamd-UID: bf10ac X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4d9DXl0f4Zz3XcX --Sig_/TlOH9YXa5uMGJ4f6CzYkjgH Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am Tage des Herren Sun, 16 Nov 2025 23:05:08 -0700 Warner Losh schrieb: > On Sun, Nov 16, 2025 at 10:16=E2=80=AFPM Warner Losh wro= te: >=20 > > > > > > On Sun, Nov 16, 2025 at 9:14=E2=80=AFPM A FreeBSD User > > wrote: > > =20 > >> Am Tage des Herren Mon, 17 Nov 2025 00:18:29 GMT > >> Warner Losh schrieb: > >> =20 > >> > The branch main has been updated by imp: > >> > > >> > URL: =20 > >> https://cgit.FreeBSD.org/src/commit/?id=3D44fb9f2701c71ce6bba75810fc6b= 7e735ecd5868 =20 > >> > > >> > commit 44fb9f2701c71ce6bba75810fc6b7e735ecd5868 > >> > Author: Warner Losh > >> > AuthorDate: 2025-11-16 23:58:37 +0000 > >> > Commit: Warner Losh > >> > CommitDate: 2025-11-17 00:16:26 +0000 > >> > > >> > sys/efi_map.h: This is a kernel-only file > >> > > >> > Slap a #ifdef _KERNEL around it all since it's useless to userla= nd. > >> > > >> > Fixes: 43b8edb32051 > >> > Sponsored by: Netflix > >> > --- > >> > sys/sys/efi_map.h | 4 ++++ > >> > 1 file changed, 4 insertions(+) > >> > > >> > diff --git a/sys/sys/efi_map.h b/sys/sys/efi_map.h > >> > index 8b458cd08b00..d2206056b1f8 100644 > >> > --- a/sys/sys/efi_map.h > >> > +++ b/sys/sys/efi_map.h > >> > @@ -7,6 +7,8 @@ > >> > #ifndef _SYS_EFI_MAP_H_ > >> > #define _SYS_EFI_MAP_H_ > >> > > >> > +#ifdef _KERNEL > >> > + > >> > #include > >> > #include > >> > > >> > @@ -21,4 +23,6 @@ void efi_map_add_entries(struct efi_map_header =20 > >> *efihdr); =20 > >> > void efi_map_exclude_entries(struct efi_map_header *efihdr); > >> > void efi_map_print_entries(struct efi_map_header *efihdr); > >> > > >> > +#endif > >> > + > >> > #endif /* !_SYS_EFI_MAP_H_ */ > >> > =20 > >> > >> Hello, > >> > >> tried a buildworld just now and it fails, something seems missing: > >> > >> [...] =20 > >> =3D=3D=3D> stand/libsa (all) =20 > >> mkdir -p xlocale arpa ssp; for i in a.out.h assert.h elf.h limits.h > >> nlist.h setjmp.h stddef.h > >> stdbool.h string.h strings.h time.h uuid.h; do ln -sf > >> /usr/src/include/$i $i; done; ln -sf > >> /usr/src/sys/sys/errno.h errno.h; ln -sf /usr/src/sys/sys/stdarg.h > >> stdarg.h; ln -sf > >> /usr/src/sys/sys/stdint.h stdint.h; ln -sf /usr/src/include/arpa/inet= .h > >> arpa/inet.h; ln -sf > >> /usr/src/include/arpa/tftp.h arpa/tftp.h; ln -sf > >> /usr/src/include/ssp/ssp.h ssp/ssp.h; for i in _time.h _strings.h > >> _string.h; do [ -f xlocale/$i ] || :> > >> xlocale/$i; done; for i in ctype.h fcntl.h signal.h stdio.h stdlib.h > >> unistd.h; do ln -sf > >> /usr/src/stand/libsa/stand.h $i; done cc -target > >> x86_64-unknown-freebsd16.0 > >> --sysroot=3D/usr/obj/usr/src/amd64.amd64/tmp > >> -B/usr/obj/usr/src/amd64.amd64/tmp/usr/bin -O2 > >> -pipe -fno-common -nostdinc > >> -I/usr/obj/usr/src/amd64.amd64/stand/libsa > >> -I/usr/src/stand/libsa -D_STANDALONE -I/usr/src/sys > >> -Ddouble=3Djagged-little-pill > >> -Dfloat=3Dfloaty-mcfloatface -ffunction-sections -fdata-sections > >> -DLOADER_GELI_SUPPORT > >> -I/usr/src/stand/libsa/geli -DLOADER_DISK_SUPPORT -ffreestanding -mno-= mmx > >> -mno-sse -mno-avx > >> -mno-avx2 -msoft-float -fPIC -mno-red-zone -mno-relax -I. > >> -DLOADER_VERIEXEC > >> -I/usr/src/lib/libsecureboot/h -DLOADER_VERIEXEC_VECTX -Iinclude > >> -I/usr/src/contrib/bearssl/inc -Wno-deprecated-non-prototype > >> -I/usr/src/contrib/bearssl/src > >> -I/usr/src/lib/libsecureboot/h -DHAVE_BR_X509_TIME_CHECK -DNO_STDIO > >> -I/usr/src/contrib/bearssl/tools -I. -DTRUST_ANCHOR_STR=3Dta_PEM > >> -DVE_SHA256_SUPPORT > >> -DVE_SHA384_SUPPORT -DVE_RSA_SUPPORT -DVE_PCR_SUPPORT > >> -I/usr/src/stand/efi/include > >> -I/usr/src/lib/libsecureboot/efi/include > >> -I/usr/src/stand/efi/include/amd64 -DNDEBUG -MD > >> -MF.depend.efi_variables.o -MTefi_variables.o -std=3Dgnu17 > >> -Wno-format-zero-length > >> -Wsystem-headers -Wno-pointer-sign -Wdate-time -Wno-empty-body > >> -Wno-string-plus-int > >> -Wno-unused-const-variable -Wno-error=3Dunused-but-set-parameter > >> -Wno-error=3Dcast-function-type-mismatch -Wno-tautological-compare > >> -Wno-unused-value > >> -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion > >> -Wno-unused-local-typedef > >> -Wno-address-of-packed-member -Wno-switch -Wno-switch-enum > >> -Wno-knr-promoted-parameter > >> -Wno-parentheses -Oz -Qunused-arguments -c > >> /usr/src/lib/libsecureboot/efi/efi_variables.c > >> -o efi_variables.o In file included from > >> /usr/src/lib/libsecureboot/efi/efi_variables.c:31: > >> /usr/src/stand/efi/include/efi.h:47:10: fatal error: 'Uefi.h' file not > >> found 47 | #include > >> > >> [...] =20 > > > > > > I've done 20 buildworlds today. And on what architecture? What do you h= ave > > in your src.conf since I'm not seeing this and I didn't think we built > > libsecureboot by default. I certainly didn't fix it and didn't expect i= t to > > include efi.h from stand. I'm skeptical about why since that file is > > tailored to the boot loader only. > > > > Warner > > =20 >=20 > Oh, I see. WITH_BEARSSL and WITH_LOADER_EFI_SECUREBOOT must have been > selected. I just fixed this with 3c5ca68b9b7c. Unless it's something else, > in which case I'll need more details. >=20 > Warner A standard UEFI loader (/boot/loader.efi) built with the recent sources and= installed properly in /EFI/BOOT/ results in a locked up box (black screen, touch on/off switch= acts immediately, no usual latency when box is up and has no screen).=20 I only have WITH_BEARSSL defined in /etc/src.conf, not WITH_LOADER_EFI_SECU= REBOOT as it is set implicitely as mentioned in the manpage of src.conf. Also set, just for the record: WITHOUT_LOADER_PXEBOOT=3D YES LOADERSIZE?=3D 525000 probably not important. --=20 A FreeBSD user --Sig_/TlOH9YXa5uMGJ4f6CzYkjgH Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRQheDybVktG5eW/1Kxzvs8OqokrwUCaRtUxQAKCRCxzvs8Oqok r17yAQD9QnQB//z1CLQT5XlTFdExWi9fMfhDD6FBI18LTaLHHgEA069K658d2eAt tgb92enOTVPfTvFkBA3lRb2H7WH04Qw= =PU+Q -----END PGP SIGNATURE----- --Sig_/TlOH9YXa5uMGJ4f6CzYkjgH-- From nobody Mon Nov 17 17:19:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9DxP1TRkz6Gb11; Mon, 17 Nov 2025 17:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9DxP0yWLz3c7D; Mon, 17 Nov 2025 17:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763399945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MuaHQlqtRebA2LjZAoAPKwniN4CxQeXofF5mID0EeLU=; b=Qna09AQqxSmBoQbR4zOPkyiub/Fn7TNSpfuiWtlrtD3aoBYyoUWfo3XQyfog3WyHt14PfY M1VQ8Dpq1BTQ2JhETmAa27ONBfeyos8AHihL4o2NVG42UMyC5pmqcGng2n1vCYmcZSvIYV wz6HbxAPSYlhO4gOd1Bknl1YzHk6HXWL9MFoH7A/DWlMqGJal2W1Ps/rkRgdu70pNI0/Sa qJU6XNRq3HNg0fVUlK8GdEdVt8l7gq+6pkrvzGEzw/wknbAQOqcU7d/+AinhwVorYCsFsT hkLVsZmkFGOTPiDdwiKf5q8VcAffOMSuJcTgep9e9I+CsVzYeXsZebiv87kdeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763399945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MuaHQlqtRebA2LjZAoAPKwniN4CxQeXofF5mID0EeLU=; b=fkMw01NB+kAL1CCzPRLWjxTbVCLGuuKNP42m/8m9N/9r7BPcjkfmgr/nkE3BwH/IwqY3+6 8oEWdd6ui5XKaZniwC1UoYT3M4HD8DkAS0wBmYq6uw16oQvfOoEOT0xUDNSgvnm0nW9MXY th6/OkBSEwUshG280uGnhSWLUFMF6GCY3DhFZSfm5ud8+TTzb0eesuqAT69rbyabJwuwgy I2Qgt+UAcmewxL1PrLpuYYoQ27TKplwudGQHS7y6kMJwkODhkqUYlb/pZ5FP7a6l67rN66 zPWjUjY9HkO7gscLSXOUti0gxsndlj3FT+nz3nE3G7qxEqV6HHA59/ROpDLY/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763399945; a=rsa-sha256; cv=none; b=io8vk86oFoOvaH9Vv+FRZ+AekpnBmgxagATTsZBtQEt+V4ddOQ4h9XlJHRb2MSO/q+N9YR 8uNSSm/rFv9xAUz+eF4iXBIcWGSAgH1e8QgkiO5bGq6Va2qQfbiLhb6XGmNktqfIMiXzFa 0MzGvjdWfsFzqvSKFpMPWdRkNi/ep3XwseT7HZqrpBbjhrV/L9kUQTaj4SJW7nPr9NhSKu npyigGcGQzYLNxF/EK2NvH0ZvFBEKNfZg0yL112yjYq7Csq3AffoSHrxHwSKbdahTpFXu9 xVpXERzxjtfPCXb096yqSEpzVUTh0BBKe4xXWYPKMDVfG+y8dUNUda/FFmxhZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9DxP0GqFz2Df; Mon, 17 Nov 2025 17:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHHJ4Fl084138; Mon, 17 Nov 2025 17:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHHJ4Wr084135; Mon, 17 Nov 2025 17:19:04 GMT (envelope-from git) Date: Mon, 17 Nov 2025 17:19:04 GMT Message-Id: <202511171719.5AHHJ4Wr084135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: db3884b03989 - main - contrib/mandoc: add -ieee754-2008 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: db3884b03989b095d746087afab8e5e649c3699a Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=db3884b03989b095d746087afab8e5e649c3699a commit db3884b03989b095d746087afab8e5e649c3699a Author: Robert Clausecker AuthorDate: 2025-11-17 17:18:40 +0000 Commit: Robert Clausecker CommitDate: 2025-11-17 17:18:40 +0000 contrib/mandoc: add -ieee754-2008 This is needed to simplify the msun manpages {sin,cos,tan}pi.3 Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D53784 --- contrib/mandoc/st.c | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/mandoc/st.c b/contrib/mandoc/st.c index 276981584e41..d740ee619f17 100644 --- a/contrib/mandoc/st.c +++ b/contrib/mandoc/st.c @@ -65,6 +65,7 @@ LINE("-iso9945-2-93", "ISO/IEC 9945-2:1993 (\\(lqPOSIX.2\\(rq)") LINE("-ansiC", "ANSI X3.159-1989 (\\(lqANSI\\~C89\\(rq)") LINE("-ansiC-89", "ANSI X3.159-1989 (\\(lqANSI\\~C89\\(rq)") LINE("-ieee754", "IEEE Std 754-1985") +LINE("-ieee754-2008", "IEEE Std 754-2008") LINE("-iso8802-3", "ISO 8802-3: 1989") LINE("-iso8601", "ISO 8601") LINE("-ieee1275-94", "IEEE Std 1275-1994 (\\(lqOpen Firmware\\(rq)") From nobody Mon Nov 17 17:19:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9DxQ236gz6Gb32; Mon, 17 Nov 2025 17:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9DxQ1Klvz3bxX; Mon, 17 Nov 2025 17:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763399946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c0Iim4ye+ek63ojFEzBdDfWt5kXnzzK1SpEwAp+H5TU=; b=E1OGRG2w/yQyMiInEI3iDiBFkgJD3wmWknDQT5XnA8Cg3NNZ7TDvALbGSZIClLKlrW80xb x0uq01RGkGVZCx11Vm1bqq7mUVp+GTANTjkKzHBFYwvn/vjChEeg1Q8Vd5e4B+6FVBsgRq nGEUCR+CwsduunXU7RBqrICzr2J3OkmRWPY613Oa20Gu+Aqu4/VSYkAgjjAG+Na3ZFPVw3 5UqbO0z8tlc0qY0YOWzaolwtecbzw6JROKrtHjBqfYZYf6bWWB4iPhu5k/ymwX4CsBIlNC 2IEbIhSq6DX+Hjl8sCTFshoDvRLwO3Os2dArlqEHerYn1eUS8LvclR0dpB10Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763399946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c0Iim4ye+ek63ojFEzBdDfWt5kXnzzK1SpEwAp+H5TU=; b=ooE3XWTCSzYEDKh6a/kx9YAPla+/k5BCSjzMZSeK4y/kbuUfiGz3aTw3legEJhlSrJF7EY N20RZlsAGaQSFUVCRWcJKwNqiLm2clAtQdL8DaR1MGaOZUMVq9jjoI9WnOyTx6iog4O1fT WANLuIhTKYtrJ8iQmxYR+1pPOY4ybKCGLDMq7YB0dhOJ4fioH67WnDupN/elJUWQrKo7Hl dvIi/9/irEBi+dCALv2YAC5ziURwY5tSQRlMaZDRqc9XsBY08GjnZ21kK9w+fz1R6HoEzx JNXT2MqnNVqUBMxf2+e0YF7WPUCasTmaT6XAq9F6q6nWHX/l74poxBB6CXBXUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763399946; a=rsa-sha256; cv=none; b=ohxe4pDVwFKy7RBK37setvIAVPXP4+n4WnoL4Bu3n7gfCDTINYcGHXQKN1qM+QKr4ayc26 OY1J9kAoxwDuDoww2qmdSVv4jthdd4Qjqlt9RY3olSTOQQLaRKjnq6cB6PO3qldR1v8GZH /WH4JBdw/fq4IsYvCEPWKwt/PuXOXwsCQ4CTQ1FUmKaT8TU1ufQrQZSzSzokXTDIqbAzwI hOX3ClCWcCA+d+4w81M9siY0AwrnSKVnc9uTdym19FS1qSREGQS9IFT7WvOaXC5Zkolxry Paov2dFrfruQbHTVAEzb7uEFVTCclKL53yjDgiZGUwFTJT8ShKj+uRvpkd796Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9DxQ0xGbz2rN; Mon, 17 Nov 2025 17:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHHJ6rA084171; Mon, 17 Nov 2025 17:19:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHHJ6Ke084169; Mon, 17 Nov 2025 17:19:06 GMT (envelope-from git) Date: Mon, 17 Nov 2025 17:19:06 GMT Message-Id: <202511171719.5AHHJ6Ke084169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 63cd0841de76 - main - contrib/mandoc: document .St -ieee754-2008 in mdoc(7) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 63cd0841de76b215f5d5078fab097b515b42cc93 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=63cd0841de76b215f5d5078fab097b515b42cc93 commit 63cd0841de76b215f5d5078fab097b515b42cc93 Author: Robert Clausecker AuthorDate: 2025-11-17 15:39:11 +0000 Commit: Robert Clausecker CommitDate: 2025-11-17 17:18:46 +0000 contrib/mandoc: document .St -ieee754-2008 in mdoc(7) Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D53784 --- contrib/mandoc/mdoc.7 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/mandoc/mdoc.7 b/contrib/mandoc/mdoc.7 index 6c2d3568baa6..90f5600c59a7 100644 --- a/contrib/mandoc/mdoc.7 +++ b/contrib/mandoc/mdoc.7 @@ -2606,6 +2606,11 @@ Open Group Standard Base Specifications, Issue 8. .br Floating-point arithmetic. .Pp +.It \-ieee754-2008 +.St -ieee754-2008 +.br +Floating-point arithmetic, 2008 revision. +.Pp .It \-iso8601 .St -iso8601 .br From nobody Mon Nov 17 17:19:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9DxR5S7Bz6Gb33; Mon, 17 Nov 2025 17:19:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9DxR30Gsz3c0n; Mon, 17 Nov 2025 17:19:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763399947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=snHHudYe+tU363bC8KdqApQd+vztnVH6kB8DguXx2zg=; b=DXGOFSLULs9fEo4gq89OiRDIWRnLCCS9YBmxRtepha8jn5Zkdnm7eOHCplYhA+yJLFraPI gdQQ58Oy+RoIQ41oIlE0wkFaF7iEMVFqunByo0tfyBE6zAQ0/ZI3Zksr+tfzEhiDHQ3vVH 0ERoPI8HnN05oQC7qZXv0akWaTYHO7RuDqbKqMg1qAAIivkfwoQavDIYVCvsLWSPpSgG/X ujqrlWKv1dP+M9QIcjO1CXk+Ar7xikTG1qHlyvtaQ5MnmhbXbQQCVXo0iOKnviesqotGqE 9hVeInh7Cf70+lZPuTsmyuJekAykrCa9GuQQu3DfWnPdhD8dTEuhwTnIHSupGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763399947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=snHHudYe+tU363bC8KdqApQd+vztnVH6kB8DguXx2zg=; b=L7fdJuosYgF1lzFhTymgheNRzalM6iNVqFATYKAUl3oTFKxowzvyYSuwEWh1MWi9piOhpI RmzD4LjgK/M9CSq4X1m8VvE2+G5AGU8iI3G+tMVYo0EGDWlMNXrde1GeG+2uaZj6TKotAd hEFrMfTLAkaQJoD+Qyq/APErUOx7b54hqJTzAqKe0Qw/25/PXRgv64tMJd+Kj/7wFMZoTG zD6eJEGrH2VgC9hwl0Wqs2Rue9j3ROsXP43nR9uyqRq3+w1Zs7crZ/n3j9wEk/zNFkct+j DhGDUa5snkie0UxIaUEEokDyNyTgbWBTxeDTe6neujAylcIlw8JbkhCr1kAlbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763399947; a=rsa-sha256; cv=none; b=UTyjvULrVwM1p+xo19pTBvjiJP9rnC2XfOudWMlb/v71DZ6DTc3VcXmt/LefzIjiVSDsWm kitNlnoQpyMC+tEkmCNiWVZaiJCIUfiPnMJSN+bpF7HrA6ILnbyjH/GcnHM61EI0Er2Avz vGp+qwn62hRKo6eOXamQHJ8TWcOLWs3CTlr/aV3WXLCI8sbwt5ly2//j9dDWZmresTUooo /9Efpx6C8u63bjN/TX2UGX/C6nrcNHqs2LXbWyIzg9dy123MysAPSUCdiYmtxUHxfilM5i kU7cwgmeqDHcSgQ+aZOtW+FYDGMGO/ASC8DvS2E8bJz4JHhnSU8nhjW52c3o4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9DxR1v9xz2rP; Mon, 17 Nov 2025 17:19:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHHJ7fR084204; Mon, 17 Nov 2025 17:19:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHHJ7fx084201; Mon, 17 Nov 2025 17:19:07 GMT (envelope-from git) Date: Mon, 17 Nov 2025 17:19:07 GMT Message-Id: <202511171719.5AHHJ7fx084201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 37fa5b36abb1 - main - msun: expose the C23 functions we already support in List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 37fa5b36abb15b322493aba20146709d48359507 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=37fa5b36abb15b322493aba20146709d48359507 commit 37fa5b36abb15b322493aba20146709d48359507 Author: Robert Clausecker AuthorDate: 2025-11-17 17:09:11 +0000 Commit: Robert Clausecker CommitDate: 2025-11-17 17:18:46 +0000 msun: expose the C23 functions we already support in This is the *pi family of trigonometric functions. Quite a few C23 functions are still missing. These seem to be: acospi, acospif, acospil, asinpi, asinpif, asinpil, atan2pi, atan2pif, atan2pil, atanpi, atanpif, atanpil, canonicalize, canonicalizef, canonicalizel, compoundn, compoundnf, compoundnl, daddl, ddivl, dfmal, dmull, dsqrtl, dsubl, exp10, exp10f, exp10l, exp10m1, exp10m1f, exp10m1l, exp2m1, exp2m1f, exp2m1l, fadd, faddl, fdiv, fdivl, ffma, ffmal, fmaximum, fmaximum_mag, fmaximum_mag_num, fmaximum_mag_numf, fmaximum_mag_numl, fmaximum_magf, fmaximum_magl, fmaximum_num, fmaximum_numf, fmaximum_numl, fmaximumf, fmaximuml, fminimum, fminimum_mag, fminimum_mag_num, fminimum_mag_numf, fminimum_mag_numl, fminimum_magf, fminimum_magl, fminimum_num, fminimum_numf, fminimum_numl, fminimumf, fminimuml, fmul, fmull, fromfp, fromfpf, fromfpl, fromfpx, fromfpxf, fromfpxl, fsqrt, fsqrtl, fsub, fsubl, iscanonical, iseqsig, issignaling, issubnormal, iszero, nextdown, nextdownf, nextdownl, nextup, nextupf, nextupl, pown, pownf, pownl, powr, powrf, powrl, rootf, rootl, rootn, roundeven, roundevenf, roundevenl, rsqrt, rsqrtf, rsqrtl, ufromfp, ufromfpf, ufromfpl, ufromfpx, ufromfpxf, ufromfpxl. Reviewed by: imp Approved by: markj (mentor) MFC after: 1 month Relnotes: yes Differential Revision: https://reviews.freebsd.org/D53783 --- lib/msun/src/math.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h index aecc652ea08a..25bd64e36a63 100644 --- a/lib/msun/src/math.h +++ b/lib/msun/src/math.h @@ -508,6 +508,9 @@ long double lgammal_r(long double, int *); void sincos(double, double *, double *); void sincosf(float, float *, float *); void sincosl(long double, long double *, long double *); +#endif /* __BSD_VISIBLE */ + +#if __ISO_C_VISIBLE >= 2023 double cospi(double); float cospif(float); long double cospil(long double); @@ -517,7 +520,7 @@ long double sinpil(long double); double tanpi(double); float tanpif(float); long double tanpil(long double); -#endif +#endif /* __ISO_C_VISIBLE >= 2023 */ __END_DECLS From nobody Mon Nov 17 17:19:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9DxS6Vthz6Gb9m; Mon, 17 Nov 2025 17:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9DxS3qpJz3c10; Mon, 17 Nov 2025 17:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763399948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTLf9/g009Fr8D3F31zYiAylZpnuU6knw6qUgOSMpS0=; b=Ypoel1QqXDzu5hi0OP9WO/LUzrBgsk1VC6LCsmx7w123w0XO8XtSsvZVYokW8A3Db/lDYF moZ2yE8LOmsnFsdLvQORUEz8sPKfhakrnPEJziMtWgygHN1jiV4Q4ktcsLaeAL7rA7bpnq +L1nVOeH66fNF7O4izr4/I60ZFk/AAHo39GxAuWdSBES3ORNhRHNcawAUmWup1aXlDCnKL ws/wBAecxagNIRFfjkb0hK8pxkjbgIw6ZHaqWwN22z4mrG1N3/kCh8Ky0v6JSf93H0HiSv S6h4Tso78uwZU35QLwV3Vq8y95MbCQ8Xie8/X8VTj28+WddNbiQjhYbp66yjZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763399948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTLf9/g009Fr8D3F31zYiAylZpnuU6knw6qUgOSMpS0=; b=yG80O5k+vgSP0DHsIqAYnM/fdtcJTHNxZ73DKnEd/0Ae4pnRjNXif/znetHncWRaOQnlsU C7B9lsxEMiervhVYXhiAIhEi+PC+k2D4jLOgx2XlRQPhOn4Z1EwVSPUyKkQO50jfc8UgVA sq0RMZZGMyHyY5comkXzkqy3FajDO/pk2pXU9VQvyiBdByZdFeAvdUntxQ7yB2GkUQd/IJ SwbBQYZbIkCkVKf5f7YwmV2D3B0l3A+GdzaStgqeU+c0LgklWJWM3vXaek+9ML8glwUUN2 1RJ7LWm/6bJyJG9niSEyjfdBrdH3i+e6eIoAf7EM5n8BSyHaha6NA22vtW4msA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763399948; a=rsa-sha256; cv=none; b=QZ/sG1/7a8amlo5Lw8ntG46h5hrRyPkmtfwXSb9fNaW7Jw3k4i/ywBBeQewLang4kE5pm+ yzhsltp0ssEyx3mdbEnmWNPyF1eq00WNKOtkOtBTozLkeBPEXOUK1U32IO4l4K76xXqYVf Pj4+5bH+Zx+a4gvlsc6LWsqW38v/RsqY1u/SMpFHggS9tMUWFZS0zHeRQ52yvv3hIWAOVN lix/2b2tzMNktV1RSvPpu7CbFuaQYqtAmKBIRzAZqBqrwh/L9qIV1qfxMscPGpUmmm07da 61B3lBwdCxgr1YRcfl76xaaHia4XQfrzWpVoXe/IXjO5NxxViN9wPPwheDaGLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9DxS2sNjz2wm; Mon, 17 Nov 2025 17:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHHJ8Ii084237; Mon, 17 Nov 2025 17:19:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHHJ8Mo084234; Mon, 17 Nov 2025 17:19:08 GMT (envelope-from git) Date: Mon, 17 Nov 2025 17:19:08 GMT Message-Id: <202511171719.5AHHJ8Mo084234@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 4fcc58afbff9 - main - msun: document that {sin,cos,tan}pi(3) follow C23 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 4fcc58afbff924293c721f4c4056bb7f94580f22 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=4fcc58afbff924293c721f4c4056bb7f94580f22 commit 4fcc58afbff924293c721f4c4056bb7f94580f22 Author: Robert Clausecker AuthorDate: 2025-11-17 17:10:56 +0000 Commit: Robert Clausecker CommitDate: 2025-11-17 17:18:46 +0000 msun: document that {sin,cos,tan}pi(3) follow C23 - also use new .St -ieee754-2008 request in *pi.3 Reviewed by: imp Approved by markj (mentor) See also: D53784 Differential Revision: https://reviews.freebsd.org/D53783 --- lib/msun/man/cospi.3 | 13 +++++-------- lib/msun/man/sinpi.3 | 12 +++++------- lib/msun/man/tanpi.3 | 13 +++++-------- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/lib/msun/man/cospi.3 b/lib/msun/man/cospi.3 index 86e63fb77498..92b449832112 100644 --- a/lib/msun/man/cospi.3 +++ b/lib/msun/man/cospi.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 1, 2017 +.Dd November 16, 2025 .Dt COSPI 3 .Os .Sh NAME @@ -92,12 +92,9 @@ The half\(encycle trignometric functions were written by .An Steven G. Kargl Aq Mt kargl@FreeBSD.org . .Sh STANDARDS These functions conform to -IEEE Std 754\(tm\(en2008 , -\(dqIEEE Standard for Floating-Point Arithmetic\(dq -and to -ISO/IEC TS 18661-4 , +.St -ieee754-2008 , +to ISO/IEC TS 18661-4, \(dqInformation technology \(em Programming languages, their environments, and system software interfaces \(em Floating\(enpoint extensions for -C\(dq \(em Part 4: Supplementary functions. - - +C\(dq \(em Part 4: Supplementary functions, and to +.St -isoC-2023 . diff --git a/lib/msun/man/sinpi.3 b/lib/msun/man/sinpi.3 index 63a1e3010de5..9d64e9d343a7 100644 --- a/lib/msun/man/sinpi.3 +++ b/lib/msun/man/sinpi.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 1, 2017 +.Dd November 16, 2025 .Dt SINPI 3 .Os .Sh NAME @@ -86,11 +86,9 @@ The half\(encycle trignometric functions were written by .An Steven G. Kargl Aq Mt kargl@FreeBSD.org . .Sh STANDARDS These functions conform to -IEEE Std 754\(tm\(en2008 , -\(dqIEEE Standard for Floating-Point Arithmetic\(dq -and to -ISO/IEC TS 18661-4 , +.St -ieee754-2008 , +to ISO/IEC TS 18661-4, \(dqInformation technology \(em Programming languages, their environments, and system software interfaces \(em Floating\(enpoint extensions for -C\(dq \(em Part 4: Supplementary functions. - +C\(dq \(em Part 4: Supplementary functions, and to +.St -isoC-2023 . diff --git a/lib/msun/man/tanpi.3 b/lib/msun/man/tanpi.3 index b11d54031b71..183240418e76 100644 --- a/lib/msun/man/tanpi.3 +++ b/lib/msun/man/tanpi.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 1, 2017 +.Dd November 16, 2025 .Dt TANPI 3 .Os .Sh NAME @@ -88,12 +88,9 @@ The half\(encycle trignometric functions were written by .An Steven G. Kargl Aq Mt kargl@FreeBSD.org . .Sh STANDARDS These functions conform to -IEEE Std 754\(tm\(en2008 , -\(dqIEEE Standard for Floating-Point Arithmetic\(dq -and to -ISO/IEC TS 18661-4 , +.St -ieee754-2008 , +to ISO/IEC TS 18661-4, \(dqInformation technology \(em Programming languages, their environments, and system software interfaces \(em Floating\(enpoint extensions for -C\(dq \(em Part 4: Supplementary functions. - - +C\(dq \(em Part 4: Supplementary functions, and to +.St -isoC-2023 . From nobody Mon Nov 17 17:54:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9FkD0nytz6Gfjr; Mon, 17 Nov 2025 17:54:28 +0000 (UTC) (envelope-from garga@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9FkC71jBz3lmV; Mon, 17 Nov 2025 17:54:27 +0000 (UTC) (envelope-from garga@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763402068; 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:autocrypt:autocrypt; bh=9HFZChMIOzU/Q7Tfyf1fFoaqxMFcsEJ6LxQ5LailWhA=; b=h6RZtc08XvfsOhkaWatL78YnKWUkJzJ6in9GeRr7my8hDFrMDtVFoA0kQyJ3ukFFgQvQo9 G4WDQ+lMFisRRu3liJK9zCEoKTyx9PCMJqsHFi85Mjh/XmA8jh6Wh36zsZmalhxeRm95s0 JCgxmaQ9Y6Fyv0cKIiLVb1Zhin895vIs9GSo1bkljTcORyIKImKpvC3ZgMKSnXOxmPxx4D cjuttk+MkIsjJ2GEEkMo+8rF9XCuvQFe6oooyBxbXyVdgsv+XJknAuUf78FH22CKVMIoQ5 vyyJttCwNLw7ccaKirp0NGxqfyk8vg0q2hpwbGlcRQHJQNM9pCqw5UUBRmO4vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763402068; 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:autocrypt:autocrypt; bh=9HFZChMIOzU/Q7Tfyf1fFoaqxMFcsEJ6LxQ5LailWhA=; b=FoMf/YV4qIje1Vf208mLGYRHmPA0X+UFJFNi+WFde+VAdmIuYxQlf0Tlw+vr8x72ICgALc sjL2zVYMmuEEj6w8EzXz82H7+/BarNAwipJdqfG39EgAlHAvioH3j8QQ1DlBBo40HArAf9 lbj899WzNUD/U26q+zTmFRY/bvsz0vP9bT3blfRB76zt0P+wxv1GUvpyLtXPQ58Rl1duUV Ih30gpNeWHo5bUZDSbbkhNQAmv3qWUkJrouD3wXgocLZX5//PKaksUZcPz/UVv0IXArOvO Zr0hUS57aHHTSJsG8RAWh3eV74fmbxLmvqSdHRvvRa5mrIbIIR+39ARCxJNtMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763402068; a=rsa-sha256; cv=none; b=oTIL1lnEAu/HbiZ7LQp7vL4wZ3rOtE/wPkEC3zfXY+WNpu/Eeui36Zv/xRP+raDjZ0qa3w ABGH2P3TYvQxcLtn42eZQIzSplUV3Bayn+dJoJ5H8vC+dbWlJPSx0hdfv+WSNxklrtUPP1 uUVBJFrKSHDcnzYk+x5dUPKAnnIpa7gJDQQtBrE7dLUQIJTNx4NrUXcCY8RjvQw8oWwMJK l7JjPbUEImHwCSSnMNXA1Fme2WzPt9F/83RmQJ/B31ytiNQ2DfzHcBH2Gplqoln200oWGH 74kZ62GeWS3piYU7f96Trh5RaiCxKmm9bo2iStHSXybPFVoPwtgOZuoC452U/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2804:f1c:34:1001:8922:7658:64c:f767] (unknown [IPv6:2804:f1c:34:1001:8922:7658:64c:f767]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: garga) by smtp.freebsd.org (Postfix) with ESMTPSA id 4d9FkC0lhyzD8B; Mon, 17 Nov 2025 17:54:26 +0000 (UTC) (envelope-from garga@FreeBSD.org) Message-ID: Date: Mon, 17 Nov 2025 14:54:26 -0300 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: f1b9c1aafd84 - main - random: git'o in RANDOM_ENABLE_TPM To: Gleb Smirnoff Cc: "David E. O'Brien" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202511110246.5AB2kdQc077401__35176.4420907543$1762829211$gmane$org@gitrepo.freebsd.org> Content-Language: en-US From: Renato Botelho Autocrypt: addr=garga@FreeBSD.org; keydata= xsBNBGStavwBCACjNlp/9+Y+VFe9ieR2h/WWbdvjz4Mb2z/f22bGoaskzCfvVNbo/v3i34I9 H6OdgZkGqheQEAD2jNfRbmPr4z40xDMUpYGLds+1Mvg7G3Hms3j5Ef8KaLSWUNWIfwKdfSVR Qs35ccSJxAdRW5YdI6J3xZgika+3Bc4eJ05YE/nWW+PNTYevt5rqD50N3zybVYIcLoqVPpBi AZE/sf5SLiLACIJb1t/s4x+pi8vgWevxVVT9u8V1f8zYErmHSLSqjxii0B3eRZphX9NCJOv9 +tfFZhnENInhn9gT7H4e2YumUltEy3jacONHJF3CC1pvvWEa6lEyypclMOkHQwNON7DLABEB AAHNLFJlbmF0byBCb3RlbGhvIChGcmVlQlNEKSA8Z2FyZ2FARnJlZUJTRC5vcmc+wsCXBBMB CgBBAhsDBQkFo5qABQsJCAcDBRUKCQgLBRYDAgEAAh4FAheAFiEERL7Dxegbnh7xTiQ5Ob6P xxJcZXoFAmSta78CGQEACgkQOb6PxxJcZXrYlggAgaZmr6c1yIWzN8VksHrHpwt/uxONEP+h ljy3yfrMsgfS5wx5Uzgfih1xYZUFC6jiI63CetqBqJpp3g1klRS1UWYKx2NeXphDMYZEdPm/ a6sXh4bKZbk6IE8Yn0/YiRT57d9DtbvswC7Gn7Igj/MSbhl49TvTGyvuB6juaffVoYZViomx 5zMoee8Ml2o2qj3MrCJ+/K8GU54RlpOGqGRsqdwVdr9XEWub6fF2YFwR46cjmbiU3P5urFHH nkJlBGPIwKxHimTW0lZsdx9aCKRDd/D80/WOEzXmk3k8B9lv/GsvOluHmveLhJG1R1tIJ31I f2q8dfTvqsQXnu8CcWRcgc7ATQRkrWr8AQgA1DufoxScA+CWQbUR6zExIu8wXQKrhuRt4DG2 BgynT7EMUvEBadcbQRZXsBpemNfncc9Axyut/+rWiyKJf9BLQuo/9QYmSRvW1U6+0LJUYmdg kMyBeYaPk+vnssv/u9jLuvV7FVgyE0yk1iaWIKOVDD+XrQCOvGw9uSceBrQyCyo3A/eRM/+p vnDCaywR63PKE+3axk6lfNdGK3TnaWmS30/ZDCZlNsXuqprqR4JdT5wXids5o36dsuJ5EZ20 s5hNMD34s4Yr1Y1R9elH6qBsFCpozs0+jwrArxq+UJJCR6hH5W8ZEwJtRC8tzR8mRE1WywzX BXYj0YhfGztQIxZckQARAQABwsB8BBgBCgAmFiEERL7Dxegbnh7xTiQ5Ob6PxxJcZXoFAmSt avwCGwwFCQWjmoAACgkQOb6PxxJcZXr1vgf/SKXhoZcUU5I7TqcbHg0lJz9tICTupCGHWr/s SQgjh9oEM5j1wqW7FlCGP90Tl9K0g3ow9YdbhU7VK470o6pymX9V9eLHzGgkZO/KMEtGBeK1 u+5ePjCJ/MK5B21KODLSU7WrIL1VN5ceXfQPLYt02LMLtPri+oduHD6RNBeA7US1DUzleq5F 9NHGbvV2U7BdDUezpiO8NaFjFZVB11I5d99FxUM5XGVstI3VhsRKZxjY0KnqJzaQgTFsPGmv AUfZVIN1pXgXiedhPXpr8+Y64jP+pHVwpVmh1zYWL6+q3kqFOUVP6c5iiMeoEXZvgJz7x/AC ek3X5gvu8Hpcv+MZIg== In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 14/11/25 18:41, Gleb Smirnoff wrote: > On Fri, Nov 14, 2025 at 06:03:15PM -0300, Renato Botelho wrote: > R> After upgrading my laptop this morning I noticed it was freezing after > R> suspend/resume. I've bisected and ended up on this commit. > R> > R> I confirmed reverting d6f10a5d013f (only to prevent conflicts) followed by > R> f1b9c1aafd84 and 3deb21f1afd5 have fixed the issue. > R> > R> My system is running today's CURRENT at 82d8a5029a80. > > Looks like the commit you point at can't be a culprit. Looking closer to your > description "reverting d6f10a5d013f followed by f1b9c1aafd84 and 3deb21f1afd5" > it seems that the only functional change is addition of device tpm and > rdrand_rng and option RANDOM_ENABLE_TPM to the GENERIC. > > Can you please try unmodified main sources at 82d8a5029a80, but modify GENERIC > to remove these two lines: > > +# random(4) > +device rdrand_rng # Intel Bull Mountain RNG > +device tpm # Trusted Platform Module > +options RANDOM_ENABLE_TPM # enable entropy from TPM 2.0 > > If that helps, can you please find which particular line makes the > regression. Hello Gleb! I was far from keyboard during the weekend but I tested it today and RANDOM_ENABLE_TPM is the option that trigger the issue. I've commented out RANDOM_ENABLE_{TPM,KBD,MOUSE} on unpatched src at 82d8a5029a80 and suspend/resume worked as expected. Uncommenting RANDOM_ENABLE_TPM made it to stop working again. -- Renato Botelho From nobody Mon Nov 17 17:54:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9FkM30Zjz6GfN7 for ; Mon, 17 Nov 2025 17:54:35 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9FkJ6fgRz3m22 for ; Mon, 17 Nov 2025 17:54:32 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=QZ52P8a+; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of garga.bsd@gmail.com designates 2607:f8b0:4864:20::629 as permitted sender) smtp.mailfrom=garga.bsd@gmail.com Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-29808a9a96aso47306755ad.1 for ; Mon, 17 Nov 2025 09:54:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763402070; x=1764006870; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:sender:from:to:cc:subject:date:message-id:reply-to; bh=9HFZChMIOzU/Q7Tfyf1fFoaqxMFcsEJ6LxQ5LailWhA=; b=QZ52P8a+C5fzPKKFcQBDDCEhotGSjorcf4x4MnLdxJAK/ZO6xnVzdr6imOk6+TW/eo Nc7SDakyYyNlq8/HcUErM66u5QYYXKzdpxhTz5lV0E3YdSX1Ncbtkwc15mUThdDrWWY6 fsIQ18JtqwTTxVCBlDYdI4zt/hOiQ4t0BIEDThZWI9NWcwAwRzdrL116EQb6zDhidDS/ AtanNe7W4uu3RY28xk2I/l/jCHgZbIxXW1WrqxYj5V/xvNhj4CNgfriKIMdD2EODN2o9 QYdEiZYZMuzrZcwuJlx1QdYo1+lW8ZB6kcN9gS+8fpBc6++Lcx0UX686ViNI8iZGCQuU c2Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763402070; x=1764006870; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:sender:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9HFZChMIOzU/Q7Tfyf1fFoaqxMFcsEJ6LxQ5LailWhA=; b=N158wEkkKs9CQk1+PMu0+naWWuVQZiqluNLyHgRbmnqVd/85nIa9OVLiNGBRHN5OyS o+3dkDPjjEFNBJdgZp/qjvL4URgaP7S3eAQW4Fb80iL7bN7Q03n9aOfoyaVwA3vB+UvW ErVsFAaqQttY3IzQHBYVfz8Esxj3YgjFdRG9IiMoezIYmp3jXgbHg+wjafQeXV9MbUMf 4AF7Kkfaz3rdGpb5OxJu7jY3NIf3td3sn9zksaZ+x/dtau+mGLAMWDPJNxnHaMx4WTXV JU2+M3DV6I3w9D/12GMR9m+Y9lOZ70VoQrRLTBTf7Dy3Gz8myDhslxO60+/xYA9SD7bM zGHA== X-Forwarded-Encrypted: i=1; AJvYcCVKb8TykXSxGyP8P6Vr75gWwbjcqEoeOLbhZy6KMUs9YDcf1Wb2mxh5mPyf/FBQclMIX3kyqQvrBmjKHrxXxxZxs6xK@freebsd.org X-Gm-Message-State: AOJu0Ywrcomi8KYUWPN/Ry5k89DVhNlWv+wBzHM712KlkRTO8EK/38HF 5rmdNFfB1Gaxm5J7ELwvyRaN/uoG5Ob7RU65krr+QD5WPvpcuZT8eI5c X-Gm-Gg: ASbGncsUuFl1MaEg6wODJMulVzbspcf8PNTzy+hMVgdUzuLsFYcGTBMjdTIWy69AIra r+rJCzWx+SgUUSFFfC5OMvrD/oHMfxcPGUXAlulLzYh313cGBbKE/61r7vXBO7Jd7lv4WtJrtQ9 5m6643YJGcIec2uV18HiTgwa/yDxmHXbaGAl8uBSQBKGZHYneH3xDzFQYY7zxHVnHhL/2Xu4ahT mzG5vskjECsBJ35SxtRI3QTI0CdzUn4n9UuCChGorildFhQk7MCDcHycosF9/F+YuQkIOmFo03S LXNJ+5hVDuMbAw1kjvXg0GUwC4Nauba+5nFxflkc1FMiyiMuDSiizVsOtDFyK0nNw4fGEBSztBa bxHuZu8+IKwy7ZOTuiVXn8+WTxW0/6Cvuq8VtC0mSJ8PdwOaUU0a3dAnXBLuCUQCko483T+/HDQ OrX+PT+iCilcffC7klXI6hQA4aSfRB227lCE/fkXGFuSQGzyHT1xo0SVUAWTB+CJnlWQ/ncQ== X-Google-Smtp-Source: AGHT+IFZUt8OggRfaswBG2KfiRm+y1E+IJ3YzgAC+PRhYJ9RHRmcHQZ1CkeUTUwdmO1cAicFkJjlfw== X-Received: by 2002:a17:902:da4f:b0:295:6d30:e26f with SMTP id d9443c01a7336-2986a6ec220mr169349995ad.22.1763402070067; Mon, 17 Nov 2025 09:54:30 -0800 (PST) Received: from ?IPV6:2804:f1c:34:1001:8922:7658:64c:f767? ([2804:f1c:34:1001:8922:7658:64c:f767]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29864b00fc9sm121551085ad.40.2025.11.17.09.54.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Nov 2025 09:54:29 -0800 (PST) Message-ID: Date: Mon, 17 Nov 2025 14:54:26 -0300 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: f1b9c1aafd84 - main - random: git'o in RANDOM_ENABLE_TPM To: Gleb Smirnoff Cc: "David E. O'Brien" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202511110246.5AB2kdQc077401__35176.4420907543$1762829211$gmane$org@gitrepo.freebsd.org> Content-Language: en-US From: Renato Botelho Autocrypt: addr=garga@FreeBSD.org; keydata= xsBNBGStavwBCACjNlp/9+Y+VFe9ieR2h/WWbdvjz4Mb2z/f22bGoaskzCfvVNbo/v3i34I9 H6OdgZkGqheQEAD2jNfRbmPr4z40xDMUpYGLds+1Mvg7G3Hms3j5Ef8KaLSWUNWIfwKdfSVR Qs35ccSJxAdRW5YdI6J3xZgika+3Bc4eJ05YE/nWW+PNTYevt5rqD50N3zybVYIcLoqVPpBi AZE/sf5SLiLACIJb1t/s4x+pi8vgWevxVVT9u8V1f8zYErmHSLSqjxii0B3eRZphX9NCJOv9 +tfFZhnENInhn9gT7H4e2YumUltEy3jacONHJF3CC1pvvWEa6lEyypclMOkHQwNON7DLABEB AAHNLFJlbmF0byBCb3RlbGhvIChGcmVlQlNEKSA8Z2FyZ2FARnJlZUJTRC5vcmc+wsCXBBMB CgBBAhsDBQkFo5qABQsJCAcDBRUKCQgLBRYDAgEAAh4FAheAFiEERL7Dxegbnh7xTiQ5Ob6P xxJcZXoFAmSta78CGQEACgkQOb6PxxJcZXrYlggAgaZmr6c1yIWzN8VksHrHpwt/uxONEP+h ljy3yfrMsgfS5wx5Uzgfih1xYZUFC6jiI63CetqBqJpp3g1klRS1UWYKx2NeXphDMYZEdPm/ a6sXh4bKZbk6IE8Yn0/YiRT57d9DtbvswC7Gn7Igj/MSbhl49TvTGyvuB6juaffVoYZViomx 5zMoee8Ml2o2qj3MrCJ+/K8GU54RlpOGqGRsqdwVdr9XEWub6fF2YFwR46cjmbiU3P5urFHH nkJlBGPIwKxHimTW0lZsdx9aCKRDd/D80/WOEzXmk3k8B9lv/GsvOluHmveLhJG1R1tIJ31I f2q8dfTvqsQXnu8CcWRcgc7ATQRkrWr8AQgA1DufoxScA+CWQbUR6zExIu8wXQKrhuRt4DG2 BgynT7EMUvEBadcbQRZXsBpemNfncc9Axyut/+rWiyKJf9BLQuo/9QYmSRvW1U6+0LJUYmdg kMyBeYaPk+vnssv/u9jLuvV7FVgyE0yk1iaWIKOVDD+XrQCOvGw9uSceBrQyCyo3A/eRM/+p vnDCaywR63PKE+3axk6lfNdGK3TnaWmS30/ZDCZlNsXuqprqR4JdT5wXids5o36dsuJ5EZ20 s5hNMD34s4Yr1Y1R9elH6qBsFCpozs0+jwrArxq+UJJCR6hH5W8ZEwJtRC8tzR8mRE1WywzX BXYj0YhfGztQIxZckQARAQABwsB8BBgBCgAmFiEERL7Dxegbnh7xTiQ5Ob6PxxJcZXoFAmSt avwCGwwFCQWjmoAACgkQOb6PxxJcZXr1vgf/SKXhoZcUU5I7TqcbHg0lJz9tICTupCGHWr/s SQgjh9oEM5j1wqW7FlCGP90Tl9K0g3ow9YdbhU7VK470o6pymX9V9eLHzGgkZO/KMEtGBeK1 u+5ePjCJ/MK5B21KODLSU7WrIL1VN5ceXfQPLYt02LMLtPri+oduHD6RNBeA7US1DUzleq5F 9NHGbvV2U7BdDUezpiO8NaFjFZVB11I5d99FxUM5XGVstI3VhsRKZxjY0KnqJzaQgTFsPGmv AUfZVIN1pXgXiedhPXpr8+Y64jP+pHVwpVmh1zYWL6+q3kqFOUVP6c5iiMeoEXZvgJz7x/AC ek3X5gvu8Hpcv+MZIg== In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.02 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.92)[-0.917]; FORGED_SENDER(0.30)[garga@FreeBSD.org,gargabsd@gmail.com]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), DKIM not aligned (relaxed),none]; RCVD_TLS_LAST(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::629:from]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; TAGGED_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[garga@FreeBSD.org,gargabsd@gmail.com]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_FIVE(0.00)[5] X-Rspamd-Queue-Id: 4d9FkJ6fgRz3m22 On 14/11/25 18:41, Gleb Smirnoff wrote: > On Fri, Nov 14, 2025 at 06:03:15PM -0300, Renato Botelho wrote: > R> After upgrading my laptop this morning I noticed it was freezing after > R> suspend/resume. I've bisected and ended up on this commit. > R> > R> I confirmed reverting d6f10a5d013f (only to prevent conflicts) followed by > R> f1b9c1aafd84 and 3deb21f1afd5 have fixed the issue. > R> > R> My system is running today's CURRENT at 82d8a5029a80. > > Looks like the commit you point at can't be a culprit. Looking closer to your > description "reverting d6f10a5d013f followed by f1b9c1aafd84 and 3deb21f1afd5" > it seems that the only functional change is addition of device tpm and > rdrand_rng and option RANDOM_ENABLE_TPM to the GENERIC. > > Can you please try unmodified main sources at 82d8a5029a80, but modify GENERIC > to remove these two lines: > > +# random(4) > +device rdrand_rng # Intel Bull Mountain RNG > +device tpm # Trusted Platform Module > +options RANDOM_ENABLE_TPM # enable entropy from TPM 2.0 > > If that helps, can you please find which particular line makes the > regression. Hello Gleb! I was far from keyboard during the weekend but I tested it today and RANDOM_ENABLE_TPM is the option that trigger the issue. I've commented out RANDOM_ENABLE_{TPM,KBD,MOUSE} on unpatched src at 82d8a5029a80 and suspend/resume worked as expected. Uncommenting RANDOM_ENABLE_TPM made it to stop working again. -- Renato Botelho From nobody Mon Nov 17 18:27:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9GSL4MX4z6GhrW; Mon, 17 Nov 2025 18:27:30 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9GSL3LSjz3tk4; Mon, 17 Nov 2025 18:27:30 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763404050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Yzw1Jy7FBainCU5fZkfEjgmHDC6/OFjxPZMu23KnBNA=; b=FuJW+UJxKpJMrvsDWk5wAJSQCAgcs2UocBjySX9OTQ8amFXuWzviftYs+zGnk7TktyubTr oOxV+QcLvk1b2ajk1qs5pULbtn2IVQCx5osWG0goFwmAioZATssreHIcrD28xHigRbfwj9 bd7aQFtvVGzPdh9DgVqCIv23B2VmIwIncKm+Iurs1qfG1xPnZLo2dJDcKbU9ZKuozefWs+ /Nbek8ghc4rMonyNGvnW351f4hS3WwjgTkuQN4Op/3VIRea7j8pG2WwVB7BWZRwcbN3TR1 c8Q6aAaTC21WboKoIYDUAVv6FBKNBHCkRqGMjO/3uot4hIBTP3T2LJ8Tq60FdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763404050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Yzw1Jy7FBainCU5fZkfEjgmHDC6/OFjxPZMu23KnBNA=; b=cGaG8p2QWMzQIN3B926ey1HQyMw20f70GyTFVVX8S2XvB0mMcT3sR4zoFX20zqmR2QRmYG RPH62MgHskPaM6hzm7g9qvt2URB+VbLHztTQ6KYxYHLVnt8g2v7u/WvMw2cv/Jmspgmg2E xC0A5F4jYy0m8q5C/TdGjPosauMHuAdUDCxZ21I17nrYl78GBRPlbWYAi4DG8XrnWPeUEI 9l7BODu/cugp3F1TI4mq7aQd2Cspmd9CKpCGx8oX8OBD8T3ZHkazFI0ToTR/xE3aQC+OqM HpZn82aIZ8f5khURezPSqLDH9OO4Drv5jd/oFNqzVZR0uoVpVeu7qHFUSqb0ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763404050; a=rsa-sha256; cv=none; b=bEEn2tl12Yn0XAR5OOeG61QiyHGM+Hp+sbsybyGHTpyr4i1kXWorDt0uwJmeaxfuHLQA2M IFOwI+CrxheHu4Vm1UGxfHWw4kbD5CaWyVd/Krv6Bol3S01hL6vrCjEs1gcuVDt74/z6Sa ScKlkFbEgq09klfyvD713HvuOs/AYLlw7yCpy4lwM9y8SYSL4UpOBUAs5BXrRCpp2borCV 63HeDJGUP4UV7EfENvKPot2P5HbzsmgxGkO+uhGcnMC1uENZoZWLD7ROCGCgCzI+I8oeey 2zgy01GAs4EJZA1EI+iyJLHOwrtsmSvGnTB1CjdhQVW2ULG1XaSnG7MM+C2l3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_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: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4d9GSK5byyzCy6; Mon, 17 Nov 2025 18:27:29 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Mon, 17 Nov 2025 10:27:27 -0800 From: Gleb Smirnoff To: Renato Botelho Cc: "David E. O'Brien" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: f1b9c1aafd84 - main - random: git'o in RANDOM_ENABLE_TPM Message-ID: References: <202511110246.5AB2kdQc077401__35176.4420907543$1762829211$gmane$org@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Mon, Nov 17, 2025 at 02:54:26PM -0300, Renato Botelho wrote: R> > +# random(4) R> > +device rdrand_rng # Intel Bull Mountain RNG R> > +device tpm # Trusted Platform Module R> > +options RANDOM_ENABLE_TPM # enable entropy from TPM 2.0 R> > R> > If that helps, can you please find which particular line makes the R> > regression. R> Hello Gleb! R> R> I was far from keyboard during the weekend but I tested it today and R> RANDOM_ENABLE_TPM is the option that trigger the issue. R> R> I've commented out RANDOM_ENABLE_{TPM,KBD,MOUSE} on unpatched src at R> 82d8a5029a80 and suspend/resume worked as expected. Uncommenting R> RANDOM_ENABLE_TPM made it to stop working again. Renato, can you please file bug report into bugzilla? David, may we assign the bug to you? This change was not MFCed yet, was it? -- Gleb Smirnoff From nobody Mon Nov 17 18:28:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9GTT2fzrz6GjPl; Mon, 17 Nov 2025 18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9GTT26NWz3vQk; Mon, 17 Nov 2025 18: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=1763404109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wMBhdWo0JTBtfKJ4ZE+EfQEJy+pbFsAI0S3s5KX/rOM=; b=pY53b3nzCO6dqjAsV/0tD2xUBCARfhpM61NiIoT1y/4H6cUnFkA30UzXEnrdzbm9SHWmi2 yCrXLbRWiHU4ScT+rxaV5yWXa/SC/D+TdyOyfWxzaVje+7+a9CUsD44uHUxXmE2xZvAY6P L9ZjERzkni7vxZUeWU/EHSZHmC55e+vMaDoDuMzNZ3BGe3arsu++dWj0TwF16ogEooQUuG KtQndT9jcXwazEXhYhhb890FC4sGNO/dlTKuLTcnXQM1txBqcAWkqso4+KRfZ6ExFs0xQv ukXSDaorwX+CmMkAjRyHn8O+wd7dpiEN+i1XWqpx84L6yKUXpleCeZNgNkmLVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763404109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wMBhdWo0JTBtfKJ4ZE+EfQEJy+pbFsAI0S3s5KX/rOM=; b=LK+NgCryEX4nUrybzCvvBmSgfTcAqIEmks9QyqECxnoyZV3qX7ogmDeaxBxu+iT8yuJuG1 rfO+leG6ghn5WpQucOP45aT9Eez7cC2y+FfafbTTQYCroqi8VKHFwsX0WRFVYo/kc6mB6S s5iEXlzUtBDP/BSW/SuGH+eOg4keltKLab0A3/XUI7ymkvYfMmIYZbOmJ3fdmfQzW/Ab0Z qtNweWbl45yoeXbtgQlj7jctqu47rEWcf0/c6jYlZYZm+QUA4q7TQzxKkocPxl12yCAMyQ f3ThIBJrrzYpxeUhcV2kffSDSjPiyyISyLh96cFp7GzlBrTin2H0rn9DfAP+GA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763404109; a=rsa-sha256; cv=none; b=k5d8YtznL50JgzHlT6vYwwKud+PbCguKW7Ba0UPbzDfrQn0PctCpteq6utV8lBLB2NJ27r o0s82UZXvMe4UI6d4fOumkVHIjAa8G3aPCae7ApnMvDsxPfcmmGPHHFsKhgZ9ZgetgKkbP GmzSb6Qth5ybugQO+RCtwKQrrwJTMmJogXj5GO78Akv3DBjsybdzLplw1TwVMBvSWFYO5q 1gFWX8nqhE4ScJFuG9ihSqZEjdpDJSNL90GzL9ld9JTdZbiVb4H1bNCLkEAsfrZH5U9slj fmQCZnjJ5ReTx1dZglaZRr4jQdx/tbelMjJBys6xbonj7MadVCY+ym5AJVyucw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9GTT1jWgz4Fb; Mon, 17 Nov 2025 18:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHISTj0016410; Mon, 17 Nov 2025 18:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHISTJE016407; Mon, 17 Nov 2025 18:28:29 GMT (envelope-from git) Date: Mon, 17 Nov 2025 18:28:29 GMT Message-Id: <202511171828.5AHISTJE016407@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8d2a50bb3805 - main - nvme: Abstract out function to obtain a disk ident string from cdata List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d2a50bb38051fefeb1427fdbfd249f2829310d8 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8d2a50bb38051fefeb1427fdbfd249f2829310d8 commit 8d2a50bb38051fefeb1427fdbfd249f2829310d8 Author: John Baldwin AuthorDate: 2025-11-17 18:21:39 +0000 Commit: John Baldwin CommitDate: 2025-11-17 18:21:39 +0000 nvme: Abstract out function to obtain a disk ident string from cdata This will permit sharing the code with nvmf(4). Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D53338 --- sys/dev/nvme/nvme.h | 19 +++++++++++++++++++ sys/dev/nvme/nvme_ctrlr.c | 21 +-------------------- sys/dev/nvme/nvme_ns.c | 2 +- sys/dev/nvme/nvme_private.h | 1 - 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index f4ea08f129c0..22421f5600ec 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1910,6 +1910,7 @@ void nvme_sc_sbuf(const struct nvme_completion *cpl, struct sbuf *sbuf); void nvme_strvis(uint8_t *dst, const uint8_t *src, int dstlen, int srclen); #ifdef _KERNEL +#include struct bio; struct thread; @@ -1995,6 +1996,24 @@ nvme_ctrlr_has_dataset_mgmt(const struct nvme_controller_data *cd) return (NVMEV(NVME_CTRLR_DATA_ONCS_DSM, cd->oncs) != 0); } +/* + * Copy the NVME device's serial number to the provided buffer, which must be + * at least DISK_IDENT_SIZE bytes large. + */ +static inline void +nvme_cdata_get_disk_ident(const struct nvme_controller_data *cdata, uint8_t *sn) +{ + _Static_assert(NVME_SERIAL_NUMBER_LENGTH < DISK_IDENT_SIZE, + "NVME serial number too big for disk ident"); + + memmove(sn, cdata->sn, NVME_SERIAL_NUMBER_LENGTH); + sn[NVME_SERIAL_NUMBER_LENGTH] = '\0'; + for (int i = 0; sn[i] != '\0'; i++) { + if (sn[i] < 0x20 || sn[i] >= 0x80) + sn[i] = ' '; + } +} + /* Namespace helper functions */ uint32_t nvme_ns_get_max_io_xfer_size(struct nvme_namespace *ns); uint32_t nvme_ns_get_sector_size(struct nvme_namespace *ns); diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index e607667decf5..ab06c1d553d7 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -1254,24 +1253,6 @@ nvme_ctrlr_poll(struct nvme_controller *ctrlr) nvme_qpair_process_completions(&ctrlr->ioq[i]); } -/* - * Copy the NVME device's serial number to the provided buffer, which must be - * at least DISK_IDENT_SIZE bytes large. - */ -void -nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn) -{ - _Static_assert(NVME_SERIAL_NUMBER_LENGTH < DISK_IDENT_SIZE, - "NVME serial number too big for disk ident"); - - memmove(sn, ctrlr->cdata.sn, NVME_SERIAL_NUMBER_LENGTH); - sn[NVME_SERIAL_NUMBER_LENGTH] = '\0'; - for (int i = 0; sn[i] != '\0'; i++) { - if (sn[i] < 0x20 || sn[i] >= 0x80) - sn[i] = ' '; - } -} - /* * Poll the single-vector interrupt case: num_io_queues will be 1 and * there's only a single vector. While we're polling, we mask further @@ -1516,7 +1497,7 @@ nvme_ctrlr_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, break; case DIOCGIDENT: { uint8_t *sn = arg; - nvme_ctrlr_get_ident(ctrlr, sn); + nvme_cdata_get_disk_ident(&ctrlr->cdata, sn); break; } /* Linux Compatible (see nvme_linux.h) */ diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 17684cc14ba2..f238fa552350 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -90,7 +90,7 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, } case DIOCGIDENT: { uint8_t *sn = arg; - nvme_ctrlr_get_ident(ctrlr, sn); + nvme_cdata_get_disk_ident(&ctrlr->cdata, sn); break; } case DIOCGMEDIASIZE: diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index dd45e1acd0aa..a425a6a5ad62 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -565,7 +565,6 @@ void nvme_notify_new_controller(struct nvme_controller *ctrlr); void nvme_notify_ns(struct nvme_controller *ctrlr, int nsid); void nvme_ctrlr_shared_handler(void *arg); -void nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn); void nvme_ctrlr_poll(struct nvme_controller *ctrlr); int nvme_ctrlr_suspend(struct nvme_controller *ctrlr); From nobody Mon Nov 17 18:28:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9GTV5Rkcz6GjDV; Mon, 17 Nov 2025 18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9GTV3C0bz3vYy; Mon, 17 Nov 2025 18: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=1763404110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aUrKnxdji88Lrf6bToKY3OkD9UumnwU1N3ABl7WfheY=; b=mXS/EXbJ25MBdVkweXoKLRVsPmH++6dORjcidqASoh/WHyfBqOU/lBFL1FDeBJFJcpFCDl YcqNfEF/vxu5cRvMaCOCEikEATRlALqOqnj7+nwFsH3MWrbJ1qWUj/muajXxWFvMc7Jdqw vJXRlXS1z50jQKB5GTBi04D0qfzp++1rtS8kIUtJ78ralBgg2/MmdcVw6l2ZEmGM7+7x/9 N9fpttKGLrbnccUrexL31PsbgUF3tWPW/pTI7f/BUMLv0uoguOxWN783C5jOXuADxsrZS3 s117Ad2SRo/NaJkTsO5/9pFLuYvIsVccNv4ZcFmm1Kppl54mQ4lo5N9dhRTvgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763404110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aUrKnxdji88Lrf6bToKY3OkD9UumnwU1N3ABl7WfheY=; b=SGosJTJhb/8OxXLY9bklKzb0lGpJuofscJpCjCS3tBm9TR02YiluLHUoqMk/o7ED9W5DTh y0Q1KI7ev5kOlaDQRM4S1khdPnYC29GzVESz3kSKMxWgC6r/Ub7kpviJ8VIhs4JtZanbuQ pQK+EVb/9jUfk2JmqfbPeIiIuojBQmhlEWZlRVzQ5+OBgM7G6KvsEccr87cqoBl+noR0im 9LwaymY6Ja2/Gd+d2sJOeV/m8tILZ99RWdPYRXjWyQJQGjJzhbG5Oy+Dnxd4jKrkfFBME0 jdDLHurx3sRkgPWgqEcOC32f4Ud6BTMLzcZP+mspzskjDIhDst2kBWvD0Wey8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763404110; a=rsa-sha256; cv=none; b=rJUcSC6NUBIyicGgaDlRiswxIK2GlEPlynElqvLeAOp2aW1C8wfLutf8yRp7UeDCtzT2ZQ KkxGpPI+RwswZr9o+KJ+ARazS5qoUZqLYgfefnzIQcFcHJ8OuQFbN2V8rHKT3Ig0/eUDnQ sDYH7xr/v212FeDXmHo9+WUHoQuDYB12E1dB/Zld98SnIzQbqJPFDKcbRL8bt4rhElAWIX 0ZcIB93e8wdGwSrkzGP61teVH65fKe0klqrYSHGRO6xbSEJxgkwr72abCn+jDo7OE1FIkV Gc+wuiCcnXsDmai3azDgabOsNW0FMmPDJx9ZqinjRBFWNL38J5XoT9f6ifDn3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9GTV2dV6z41R; Mon, 17 Nov 2025 18:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHISUIo016443; Mon, 17 Nov 2025 18:28:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHISUFB016440; Mon, 17 Nov 2025 18:28:30 GMT (envelope-from git) Date: Mon, 17 Nov 2025 18:28:30 GMT Message-Id: <202511171828.5AHISUFB016440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 33383fbf606b - main - nvmf: Add support for DIOCGIDENT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33383fbf606be619af0e107106f4f6028c9eab0d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=33383fbf606be619af0e107106f4f6028c9eab0d commit 33383fbf606be619af0e107106f4f6028c9eab0d Author: John Baldwin AuthorDate: 2025-11-17 18:26:30 +0000 Commit: John Baldwin CommitDate: 2025-11-17 18:26:30 +0000 nvmf: Add support for DIOCGIDENT This mirrors commit 6d0001d44490becdd20d627ce663c72a30b9aac3 but for nvmf(4). Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D53339 --- sys/dev/nvmf/host/nvmf.c | 3 +++ sys/dev/nvmf/host/nvmf_ns.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sys/dev/nvmf/host/nvmf.c b/sys/dev/nvmf/host/nvmf.c index d6afdce54709..8ed801524089 100644 --- a/sys/dev/nvmf/host/nvmf.c +++ b/sys/dev/nvmf/host/nvmf.c @@ -1237,6 +1237,9 @@ nvmf_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, case NVME_GET_CONTROLLER_DATA: memcpy(arg, sc->cdata, sizeof(*sc->cdata)); return (0); + case DIOCGIDENT: + nvme_cdata_get_disk_ident(sc->cdata, (uint8_t *)arg); + return (0); case NVMF_RECONNECT_PARAMS: nv = (struct nvmf_ioc_nv *)arg; return (nvmf_reconnect_params(sc, nv)); diff --git a/sys/dev/nvmf/host/nvmf_ns.c b/sys/dev/nvmf/host/nvmf_ns.c index 4215c8295d2e..d57280e19d41 100644 --- a/sys/dev/nvmf/host/nvmf_ns.c +++ b/sys/dev/nvmf/host/nvmf_ns.c @@ -278,6 +278,9 @@ nvmf_ns_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int flag, sizeof(gnsid->cdev)); gnsid->nsid = ns->id; return (0); + case DIOCGIDENT: + nvme_cdata_get_disk_ident(ns->sc->cdata, (uint8_t *)arg); + return (0); case DIOCGMEDIASIZE: *(off_t *)arg = ns->size; return (0); From nobody Mon Nov 17 18:33:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9GZs5CRVz6Gjd5; Mon, 17 Nov 2025 18:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9GZs4N6vz3wbG; Mon, 17 Nov 2025 18:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763404389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BRgZA7EmQhuhAPKKUwAdlwJZhGaYGDkbe8IrqswAzzs=; b=P2kiuxpyC2qBmBgLKAWo908NM2sqAaB56yTNdFKRSj0iR2fPN3pMmRRj0yQ94VLr1kePkw vb1zqr7elNWognLEUpSJAOt1tw+TWxlvMfDJGzxaASj/MFjJ97Q97TCQbmXF1n13vR4YOI p/R23Jlxfko3LOOJvWaFGLpq/A2AoweCvVwe88vjss61mHJyjxqJcmGPzhM1AIG0s4EJlT aw7XtAiPjkeQiKA5RCiF39GAJEqk2+4issgtg7fqmIHfPm1yNjpitMjbUlXpwvhuZBaxMV n3309AhTAScRLBsGuiZ4dGVFxsFKTHeshJY3mcBJ00cREWdXGs+fu3IS1v7KGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763404389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BRgZA7EmQhuhAPKKUwAdlwJZhGaYGDkbe8IrqswAzzs=; b=j715JTiUB0q75xt21YbdV5LiEDr+qaTIeDA/uRfFdre4XqaPGSTDeuH7fZa+eDfSLmzzQV FugC0hgB6zjLPfLKbvMA1TXIcZzLlcGeT2Xx2CfuOotbsa02Geu3F7NKTmCz9yC2k+a1yK RR/qPa5VH4pNgDZ5J5RuVRF1aBRYI53B1l7KCFRZNkkhC+hpzdBRizufl0qpHXsBFVqfh8 hrUs00qr1yM5yrfPZ36iOm/3x597N23pFi5PHjbY0dJS1mBnxoMVDle5UTYs4jBsZ97UKF wiT4fDkNtyvQwMPN29oEYjsF13i5RtVHZct+bV9dcJ9+N3SGOOjSZcRkMdtnhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763404389; a=rsa-sha256; cv=none; b=Tg1ReIMs1amMH/wkqOrO/3p6qJi/WW9krywiFuynHlVADTPmkZ1amJhfsDP8fXqXPDdWWh n152QkNy6xwToQywn4HVwWYsY8zQxjLHgpMGPeozBFBZPRmcWi06/J5OBZyHEhEwzhFl2p CHMLgzI3mHjQ8rQq8HtUMt4s1UvPL7Y4+YR9HZVkgz42G+0WgkacJQWIxhJwfDQ6z1qbah dPLyl2cagtJoEJ4c5nPgBjlBk15pDuB3xMH+Z3SqUFEpTMtX3UFbkk9H5d1HnVClFmbg27 B8JpRERphU2uszxv6QNq62LI+9WddjXmzanWIozXvEvtaIwJvzDeIrS5CO7K8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9GZs3qwRz4GK; Mon, 17 Nov 2025 18:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHIX96m033112; Mon, 17 Nov 2025 18:33:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHIX9Cr033109; Mon, 17 Nov 2025 18:33:09 GMT (envelope-from git) Date: Mon, 17 Nov 2025 18:33:09 GMT Message-Id: <202511171833.5AHIX9Cr033109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jilles Tjoelker Subject: git: 75a6c38e4d5c - main - sh: Fix a double free in a rare scenario with pipes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jilles X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75a6c38e4d5c651b7398bf2bea5baa41a0939e92 Auto-Submitted: auto-generated The branch main has been updated by jilles: URL: https://cgit.FreeBSD.org/src/commit/?id=75a6c38e4d5c651b7398bf2bea5baa41a0939e92 commit 75a6c38e4d5c651b7398bf2bea5baa41a0939e92 Author: Jilles Tjoelker AuthorDate: 2025-11-15 16:43:03 +0000 Commit: Jilles Tjoelker CommitDate: 2025-11-17 18:32:38 +0000 sh: Fix a double free in a rare scenario with pipes The command sh -c 'sleep 3 | sleep 2 & sleep 3 & kill %1; wait %1' crashes (with appropriate sanitization such as putting MALLOC_CONF=abort:true,junk:true in the environment or compiling with -fsanitize=address). What happens here is that waitcmdloop() calls dowait() with a NULL job pointer, instructing dowait() to freejob() if it's a non-interactive shell and $! was not and cannot be referenced for it. However, waitcmdloop() then uses fields possibly freed by freejob() and calls freejob() again. This only occurs if the job being waited for is identified via % syntax ($! has never been referenced for it), it is a pipeline with two or more elements and another background job has been started before the wait command. That seems special enough for a bug to remain. Test scripts written by Jilles would almost always use $! and not % syntax. We can instead make waitcmdloop() pass its job pointer to dowait(), fixing up things for that (waitcmdloop() will have to call deljob() if it does not call freejob()). The crash from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290330#c2 appears to be the same bug. PR: 290330 Reported by: bdrewery Reviewed by: bdrewery Differential Revision: https://reviews.freebsd.org/D53773 --- bin/sh/jobs.c | 3 ++- bin/sh/tests/builtins/Makefile | 1 + bin/sh/tests/builtins/wait11.0 | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index 1328ae50edef..0aaff5e1e140 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -573,6 +573,7 @@ waitcmdloop(struct job *job) freejob(job); else { job->remembered = 0; + deljob(job); if (job == bgjob) bgjob = NULL; } @@ -599,7 +600,7 @@ waitcmdloop(struct job *job) break; } } - } while (dowait(DOWAIT_BLOCK | DOWAIT_SIG, (struct job *)NULL) != -1); + } while (dowait(DOWAIT_BLOCK | DOWAIT_SIG, job) != -1); sig = pendingsig_waitcmd; pendingsig_waitcmd = 0; diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile index 7fdecb23c817..407d2aeaa061 100644 --- a/bin/sh/tests/builtins/Makefile +++ b/bin/sh/tests/builtins/Makefile @@ -188,5 +188,6 @@ ${PACKAGE}FILES+= wait7.0 ${PACKAGE}FILES+= wait8.0 ${PACKAGE}FILES+= wait9.127 ${PACKAGE}FILES+= wait10.0 +${PACKAGE}FILES+= wait11.0 .include diff --git a/bin/sh/tests/builtins/wait11.0 b/bin/sh/tests/builtins/wait11.0 new file mode 100644 index 000000000000..d5fab26fb677 --- /dev/null +++ b/bin/sh/tests/builtins/wait11.0 @@ -0,0 +1,6 @@ +sleep 3 | sleep 2 & +sleep 3 & +kill %1 +wait %1 +r=$? +[ "$r" -gt 128 ] && [ "$(kill -l "$r")" = TERM ] From nobody Mon Nov 17 18:57:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9H7Z1zmLz6GlWS for ; Mon, 17 Nov 2025 18:58:02 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9H7Z00wgz42QF for ; Mon, 17 Nov 2025 18:58:02 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-3e80c483a13so2569226fac.2 for ; Mon, 17 Nov 2025 10:58:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763405880; x=1764010680; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:sender:from:to:cc:subject:date:message-id:reply-to; bh=LgcVe468LSbbR4VNAFKHMwmFKtI9e2DUXAmth97PHew=; b=atDPsR0sWwSOxzmXmEJXP3k3inaO11Y8vXK0/syq5kgJcC3Z/arWfwLDPeUDxPLHwH tFUo/Uvtdh36hJ1bK1eTd3SQwUPK1UC1zs/cvH+s7J9AdEWNje+Ueb/Rp2n0FBg23EdQ 7qns0oqGuEYHKIkkLhPtPIh0ulQjkoOG5tK1BDLaUvrzq859LB7ptHeO/JAeutTqFqCx NS1I9JJ6bqQC+53YUrmDwyfZCJVue0E63HM8GUHf/iGNnWsF4ehTxIrGQp/7bcui9jiJ eBD9tkBAlSedjGLdIdV/aI9kx5ZZKzm9R9IynXH/8S0Ek1sPcllaD9eWNj3XkE5byc3r taPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763405880; x=1764010680; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:sender:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LgcVe468LSbbR4VNAFKHMwmFKtI9e2DUXAmth97PHew=; b=OO+EbZ2Lc7iKOXSecet/Bpg1eO5N0cA3ijqOu/tqe0iZmFE+CQ9gXVXKHRqu2Nl/pz y9gJjFTYY/Xy/lHdQGav21Oy315IWHExErvtEwUyCgrNb9AQCubavdSLVs6VZQIfn+Eh fOxRtF1ZfH8RlDM93xNH7+STEcbXweV42AXTlvdmngPe4nKwJ4n474CadXG2tvqMUBRu 2UL31VAjCDgoH7Mjo4FBTKG8+crWWOfgieeHJ4PtMKD9xt5JpDrbk3oLEUgOc4W5V6UJ 65NIR9sxadjQT4TWQvH0kHIuD8QVhvVyfMvWJrmQ9A1bxLwMTAlWmSjgrno/eubAWUoa 3XBw== X-Forwarded-Encrypted: i=1; AJvYcCW3nQO0n8eO+YAwd+DBFFGAR1phWqB7QYw3jcYHkBbvx/KT8hb3vSQ9iYbBqJMxfQc3q1StEyC9omnS48kxyKF0cVBI@freebsd.org X-Gm-Message-State: AOJu0YydpGpqkBzOl0cAvj+zqSLK6OEkuIrbYrr/P7aCUiOlLLJ7dM7t 3EzXRzfRvLNfgasxEHkbDaIEOwKWfvyEy2NvFAp5ppl7DgR2hKU9TUmb X-Gm-Gg: ASbGncuW3GKo0wgr/wLHEsVFSeLcHP6gHh15tz2fm9DDn+j1oR/ZuOmP4zzA3SEWNSG PdAcTTewWfLPFHzZkb69zNJYonTzplSIGKfPD+nrBW1uDuDQZsLwSkjFSNhaiwlTiRkZLy3po0V KPDaV+uid1MfDaaaV7Vwu7dD69usooLoeexTl1zSbos0MGSyJ6oE6VK7kxehWw2nwyYc7GVTsCu T2tgpY+V2HSkDpSM+B/pUhFqbkxlB0cGD6V7CG3NFr0wo+XwM98ri7KVP6pCG9/6BIh+368W3kz jf8Hhig7SAHVKmV7V8eQBcksLgIFbm5lxueam00LIyMwlO8bJrkvhw8hJ7swmyFas1hPYvIXDQ5 Jy180fJ1s8alwaES4jCBAmjJr66+OQSwfpI6w6lltvjcrDcCzdYYS/EJFNlCPnZETxaZNHXg35l /DncM0CbcQkWIULe3O8RBjOZJe67/cuV0UZbN1tYq4K7e3AUaCi7pY/Eap4iUj+T0hTF40Ug== X-Google-Smtp-Source: AGHT+IF9YrBPRg3mTB6+s0SdX2sgydgBpZp66EMCBMviqfdBsjXIz5VSMhVVyphyOXE1UpnQmLny6Q== X-Received: by 2002:a05:6871:5d18:b0:3e8:983c:c8a with SMTP id 586e51a60fabf-3e8983c1b8fmr4055861fac.37.1763405879682; Mon, 17 Nov 2025 10:57:59 -0800 (PST) Received: from ?IPV6:2804:f1c:34:1001:8922:7658:64c:f767? ([2804:f1c:34:1001:8922:7658:64c:f767]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-3e8522b1594sm6172013fac.17.2025.11.17.10.57.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Nov 2025 10:57:59 -0800 (PST) Message-ID: Date: Mon, 17 Nov 2025 15:57:54 -0300 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: f1b9c1aafd84 - main - random: git'o in RANDOM_ENABLE_TPM To: Gleb Smirnoff Cc: "David E. O'Brien" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202511110246.5AB2kdQc077401__35176.4420907543$1762829211$gmane$org@gitrepo.freebsd.org> Content-Language: en-US From: Renato Botelho Autocrypt: addr=garga@FreeBSD.org; keydata= xsBNBGStavwBCACjNlp/9+Y+VFe9ieR2h/WWbdvjz4Mb2z/f22bGoaskzCfvVNbo/v3i34I9 H6OdgZkGqheQEAD2jNfRbmPr4z40xDMUpYGLds+1Mvg7G3Hms3j5Ef8KaLSWUNWIfwKdfSVR Qs35ccSJxAdRW5YdI6J3xZgika+3Bc4eJ05YE/nWW+PNTYevt5rqD50N3zybVYIcLoqVPpBi AZE/sf5SLiLACIJb1t/s4x+pi8vgWevxVVT9u8V1f8zYErmHSLSqjxii0B3eRZphX9NCJOv9 +tfFZhnENInhn9gT7H4e2YumUltEy3jacONHJF3CC1pvvWEa6lEyypclMOkHQwNON7DLABEB AAHNLFJlbmF0byBCb3RlbGhvIChGcmVlQlNEKSA8Z2FyZ2FARnJlZUJTRC5vcmc+wsCXBBMB CgBBAhsDBQkFo5qABQsJCAcDBRUKCQgLBRYDAgEAAh4FAheAFiEERL7Dxegbnh7xTiQ5Ob6P xxJcZXoFAmSta78CGQEACgkQOb6PxxJcZXrYlggAgaZmr6c1yIWzN8VksHrHpwt/uxONEP+h ljy3yfrMsgfS5wx5Uzgfih1xYZUFC6jiI63CetqBqJpp3g1klRS1UWYKx2NeXphDMYZEdPm/ a6sXh4bKZbk6IE8Yn0/YiRT57d9DtbvswC7Gn7Igj/MSbhl49TvTGyvuB6juaffVoYZViomx 5zMoee8Ml2o2qj3MrCJ+/K8GU54RlpOGqGRsqdwVdr9XEWub6fF2YFwR46cjmbiU3P5urFHH nkJlBGPIwKxHimTW0lZsdx9aCKRDd/D80/WOEzXmk3k8B9lv/GsvOluHmveLhJG1R1tIJ31I f2q8dfTvqsQXnu8CcWRcgc7ATQRkrWr8AQgA1DufoxScA+CWQbUR6zExIu8wXQKrhuRt4DG2 BgynT7EMUvEBadcbQRZXsBpemNfncc9Axyut/+rWiyKJf9BLQuo/9QYmSRvW1U6+0LJUYmdg kMyBeYaPk+vnssv/u9jLuvV7FVgyE0yk1iaWIKOVDD+XrQCOvGw9uSceBrQyCyo3A/eRM/+p vnDCaywR63PKE+3axk6lfNdGK3TnaWmS30/ZDCZlNsXuqprqR4JdT5wXids5o36dsuJ5EZ20 s5hNMD34s4Yr1Y1R9elH6qBsFCpozs0+jwrArxq+UJJCR6hH5W8ZEwJtRC8tzR8mRE1WywzX BXYj0YhfGztQIxZckQARAQABwsB8BBgBCgAmFiEERL7Dxegbnh7xTiQ5Ob6PxxJcZXoFAmSt avwCGwwFCQWjmoAACgkQOb6PxxJcZXr1vgf/SKXhoZcUU5I7TqcbHg0lJz9tICTupCGHWr/s SQgjh9oEM5j1wqW7FlCGP90Tl9K0g3ow9YdbhU7VK470o6pymX9V9eLHzGgkZO/KMEtGBeK1 u+5ePjCJ/MK5B21KODLSU7WrIL1VN5ceXfQPLYt02LMLtPri+oduHD6RNBeA7US1DUzleq5F 9NHGbvV2U7BdDUezpiO8NaFjFZVB11I5d99FxUM5XGVstI3VhsRKZxjY0KnqJzaQgTFsPGmv AUfZVIN1pXgXiedhPXpr8+Y64jP+pHVwpVmh1zYWL6+q3kqFOUVP6c5iiMeoEXZvgJz7x/AC ek3X5gvu8Hpcv+MZIg== In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4d9H7Z00wgz42QF On 17/11/25 15:27, Gleb Smirnoff wrote: > On Mon, Nov 17, 2025 at 02:54:26PM -0300, Renato Botelho wrote: > R> > +# random(4) > R> > +device rdrand_rng # Intel Bull Mountain RNG > R> > +device tpm # Trusted Platform Module > R> > +options RANDOM_ENABLE_TPM # enable entropy from TPM 2.0 > R> > > R> > If that helps, can you please find which particular line makes the > R> > regression. > R> Hello Gleb! > R> > R> I was far from keyboard during the weekend but I tested it today and > R> RANDOM_ENABLE_TPM is the option that trigger the issue. > R> > R> I've commented out RANDOM_ENABLE_{TPM,KBD,MOUSE} on unpatched src at > R> 82d8a5029a80 and suspend/resume worked as expected. Uncommenting > R> RANDOM_ENABLE_TPM made it to stop working again. > > Renato, can you please file bug report into bugzilla? > > David, may we assign the bug to you? > > This change was not MFCed yet, was it? You've got it https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=291067 -- Renato Botelho From nobody Mon Nov 17 19:16:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9HXK4X3Yz6Gmww; Mon, 17 Nov 2025 19:16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9HXK3pp6z45yw; Mon, 17 Nov 2025 19:16:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763406961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c2kfg2LD7op1ZOFerTRMdvf1cT7WAmsG4hxwHtzcwjo=; b=W5EIpLvU6WTdZe8d5/t12c0ipBmiboWrkfoMnvMgW58ZZMC9JL3kan8h3qwofqDuZpDdpV zBHJJKAJFZ4jUarr54cu6eEI75+ACqVIPZi1h3Hgimin/huWHSE+miK/tGjDX3n/eRcyK5 lAF74/pI8Nw1a/SjbA5lf53WIAYa9NGvJBUH8QsZM1sCOw548roxxZOIYo3xswW5H7F5od 1TuOGb8TNHSHhXktHRc6EzmgP4N3qJwIn8uzUCgAsjIiJWmulRTC+EVoGXzimWdMIHVKPf 4CSu7Vhv7+hew/uFMszUJfTrZr+DvCXu61AUGs79ERzv5aqt3rg2Kx+5MXiMwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763406961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c2kfg2LD7op1ZOFerTRMdvf1cT7WAmsG4hxwHtzcwjo=; b=n8B3tdCCf1JyGQyq7HPp7SW9rSq9AmVnqLDp1EM1uJqfEu7uY9AMtLEY4ARwFxQMNQ6dms w/knRLyZFxfmF9Rdlgf6e9gJNvKkkK4lERLyNgpXzxkTDZDU4CT8YdY4dakTGDOR5q6soW zQhWx3IcaZyf+hmb2loNhU82rmM7cqpb7ODkWI4x6LwCDrGowy2k16O25NKgeq2FAFYHP5 eGuyzOZiNrDOGa1ogrABnDAf5bCdw38OlK5kXUZBVZNS5Kn9A4ZB/HBBtGSBfLJFFuPETM RueWo35kvOhCmK85K8IaeWbjSrKijthfaMv8aSTtGgmWSS5xbY1ymNo6swDn8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763406961; a=rsa-sha256; cv=none; b=ey3aIjBU2r25AIRLt1zP0ny0IO/Wg8Lzj7tOohi4F9FRVFoVdTiDkXw3mVBdDmNXkSlAa3 AZje7TeFwiaUY93k6XDRmqH0lTfa4vuYea0NuhE2+k4Moe3keiT92AYt1sEJFHm4G0S80/ rOAx6fOW2K6WrcsZ+KmWRUm0UOVpagsucvufVzv4Z/V3IUXaqo0h9I10BKFUt2bXg8DXmc co1HrGaD6m+37H9UPXwSa9x9MEIWEURNYS7YyosaFcQf11dP/E4SyeiK+ZETBgXPjghOOl S8Qr4ZG1FngjhYiRN+TWQR9+dAzgKYs7NseEORIzfOc+VpPeHb0upeZbrGJp1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9HXK2zz4z5tx; Mon, 17 Nov 2025 19:16:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHJG1TW009095; Mon, 17 Nov 2025 19:16:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHJG1rd009092; Mon, 17 Nov 2025 19:16:01 GMT (envelope-from git) Date: Mon, 17 Nov 2025 19:16:01 GMT Message-Id: <202511171916.5AHJG1rd009092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: fb709935d64d - main - zfs: fix aarch64 build after openzfs/zfs@e63d026b9 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb709935d64d5fd4ad21cf8c69faf580760999e4 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=fb709935d64d5fd4ad21cf8c69faf580760999e4 commit fb709935d64d5fd4ad21cf8c69faf580760999e4 Author: Martin Matuska AuthorDate: 2025-11-17 19:15:33 +0000 Commit: Martin Matuska CommitDate: 2025-11-17 19:15:33 +0000 zfs: fix aarch64 build after openzfs/zfs@e63d026b9 --- sys/modules/zfs/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index ec531ed646a7..7a4d0bb51376 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -475,8 +475,6 @@ CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICA CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} .if ${MACHINE_ARCH} == "aarch64" -__ZFS_ZSTD_AARCH64_FLAGS= -include ${SRCDIR}/zstd/include/aarch64_compat.h -CFLAGS.zstd.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.error_private.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.fse_compress.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} From nobody Mon Nov 17 20:25:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9K4h3X28z6GvFp; Mon, 17 Nov 2025 20:25: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9K4h2tfVz3H91; Mon, 17 Nov 2025 20:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763411140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CiMu78+MlZSxZXiKfPsdNuzZ7VqQJakw3JuZP5sObv0=; b=PeOqQqNdJcv4kzNPWaJQB4+HVNZbeoBt9ghZFpYFBUdvLcm41hyEKc6v7H27bhurXR5muh DZnxyUxFJnYnM1KqLb9WzlVVs7Hki2zeUc5Eggchh/YyDmIXUrjMH/QFkTV0fYOy4bM03I 8fE6CyL2XufDlawtnvtvxuJJw0g2fdejPNHz82vCYHHbMUX3TIck+r1nV07Q7fhS36KavY NyHSZFzoaVrhHWNk8wYOVruL29kFFjyju3F+Vm3FrhEdkxttJZG77OmJ+4LxPMzHS81ry7 2+49pNAhJCZj/GcgehKb1uc9JbMtCfvBcYv18L3yXZLY+9V2BwpFsJZNtfme1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763411140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CiMu78+MlZSxZXiKfPsdNuzZ7VqQJakw3JuZP5sObv0=; b=FnoHC6p5XqG+0/ILT+589RxVVMsIYZVdrGmZdkQXejqBxjnesoHCBlf7ldANHvvNIbG1g/ A/cpddBT+G1DsJU8tT7ORl+p2BbP9fISbeip/L4L9i3q90/qs+6jQoeXUepvkv9lKg2KXD xq4CjN81aAkOomgsHjyRedjXjAK3IlrGXJ399C+XmxH1zwqo8BLryZ603FA/2hor9mMlHP kjkwaOV9Sex2EhR3kGSqTGZOyD3kUgqtR/I2XqZNYzvMLKt9zPOgDHS+DuoC8sKlDm2+Ce GAYbAa+pt5bzVVysxermye7XU5Umic2oHvqmkAcixei7GUJhBauMOezIY6LX1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763411140; a=rsa-sha256; cv=none; b=YrkXSsWRpUkJzOZRLR6o3ruPrY65ksk3BqVvVX1H3P0BlNC5PI9RyE4aznLFtOSA8//tjf iKmvJ7MFB0LJWPdQxsV0Fn+6d42XsxhyVcZztJPoYO4KSfLzaVhRgU3z+/DK5KECxTKprb 5X/PuIokofRsvCZcExkSez1dKLYnqRpXRLx8jWWXvpTNBjE0ymOsX54dgPt4+cOIB/MrPZ G+IveT+nkF4kn2zthPGCoiYYphpkF2KZ51A0T2nZRD3ggovSAiol2yjI8poByRbDyDBh1G 7ewmfjalLiQAjYgCNy6WU1UH41ARLohckSijNY1gOcl1pgrxgtFXBIV226EGDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9K4h2THpz7xs; Mon, 17 Nov 2025 20:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHKPeA2040634; Mon, 17 Nov 2025 20:25:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHKPeek040631; Mon, 17 Nov 2025 20:25:40 GMT (envelope-from git) Date: Mon, 17 Nov 2025 20:25:40 GMT Message-Id: <202511172025.5AHKPeek040631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 259264460d8d - stable/15 - Add --libxo support for geom status and list sub commands. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 259264460d8dca4b7c51a73bad101ea78b3209e3 Auto-Submitted: auto-generated The branch stable/15 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=259264460d8dca4b7c51a73bad101ea78b3209e3 commit 259264460d8dca4b7c51a73bad101ea78b3209e3 Author: Kirk McKusick AuthorDate: 2025-10-13 21:15:05 +0000 Commit: Kirk McKusick CommitDate: 2025-11-17 20:25:21 +0000 Add --libxo support for geom status and list sub commands. Submitted-by: Johan Söllvander Differential Revision: https://reviews.freebsd.org/D37615 Differential Revision: https://reviews.freebsd.org/D53110 Differential Revision: https://reviews.freebsd.org/D53180 Differential Revision: https://reviews.freebsd.org/D53313 (cherry picked from commit 0d4642a67e59f8da5e00a05001c342bdad2a806f) (cherry-picked from commit 2168e15ee89b4206d8e65a4ea04e4721f60f4060) (cherry picked from commit 2f461ddd784b4abdb7f88701d20fc45f658c42f5) (cherry picked from commit c174f518c9c8cf3a567c5f60414508ac951a2ae4) --- sbin/geom/Makefile | 2 +- sbin/geom/core/geom.c | 254 +++++++++++++++++++++++++++++++++++--------------- 2 files changed, 179 insertions(+), 77 deletions(-) diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile index 078503d3ae67..61561ef1ff1b 100644 --- a/sbin/geom/Makefile +++ b/sbin/geom/Makefile @@ -9,7 +9,7 @@ MAN= geom.8 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/core CFLAGS+= -DGEOM_CLASS_DIR=\"${GEOM_CLASS_DIR}\" -LIBADD= geom util +LIBADD= geom util xo .if defined(RESCUE) .PATH: ${SRCTOP}/lib/geom/part \ diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index b78021194ddd..51ea52a3e858 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -49,9 +49,12 @@ #include #include #include +#include #include "misc/subr.h" +#define GEOM_XO_VERSION "1" + #ifdef STATIC_GEOM_CLASSES extern uint32_t gpart_version; extern struct g_command gpart_class_commands[]; @@ -513,6 +516,7 @@ run_command(int argc, char *argv[]) gctl_free(req); if (verbose) printf("Done.\n"); + xo_finish(); exit(EXIT_SUCCESS); } @@ -810,6 +814,10 @@ main(int argc, char *argv[]) provider_name = NULL; tflag = false; + argc = xo_parse_args(argc, argv); + if (argc < 0) + return (argc); + if (strcmp(getprogname(), "geom") == 0) { while ((ch = getopt(argc, argv, "hp:t")) != -1) { switch (ch) { @@ -831,6 +839,7 @@ main(int argc, char *argv[]) * Don't adjust argc and argv, it would break get_class(). */ } + xo_set_version(GEOM_XO_VERSION); if (tflag && provider_name != NULL) { errx(EXIT_FAILURE, @@ -839,6 +848,7 @@ main(int argc, char *argv[]) if (provider_name != NULL) { list_one_geom_by_provider(provider_name); + xo_finish(); return (0); } @@ -882,29 +892,33 @@ find_geom(struct gclass *classp, const char *name) } static void -list_one_provider(struct gprovider *pp, const char *prefix) +list_one_provider(struct gprovider *pp, const char *padding) { struct gconfig *conf; char buf[5]; - printf("Name: %s\n", pp->lg_name); + xo_emit("{Lcw:Name}{:name}\n", pp->lg_name); humanize_number(buf, sizeof(buf), (int64_t)pp->lg_mediasize, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); - printf("%sMediasize: %jd (%s)\n", prefix, (intmax_t)pp->lg_mediasize, - buf); - printf("%sSectorsize: %u\n", prefix, pp->lg_sectorsize); + xo_emit("{P:/%s}{Lcw:Mediasize}{:mediasize/%jd} ({N:/%s})\n", + padding, (intmax_t)pp->lg_mediasize, buf); + xo_emit("{P:/%s}{Lcw:Sectorsize}{:sectorsize/%u}\n", + padding, pp->lg_sectorsize); if (pp->lg_stripesize > 0 || pp->lg_stripeoffset > 0) { - printf("%sStripesize: %ju\n", prefix, pp->lg_stripesize); - printf("%sStripeoffset: %ju\n", prefix, pp->lg_stripeoffset); + xo_emit("{P:/%s}{Lcw:Stripesize}{:stripesize/%ju}\n", + padding, pp->lg_stripesize); + xo_emit("{P:/%s}{Lcw:Stripeoffset}{:stripeoffset/%ju}\n", + padding, pp->lg_stripeoffset); } - printf("%sMode: %s\n", prefix, pp->lg_mode); + xo_emit("{P:/%s}{Lcw:Mode}{:mode}\n", padding, pp->lg_mode); LIST_FOREACH(conf, &pp->lg_config, lg_config) { - printf("%s%s: %s\n", prefix, conf->lg_name, conf->lg_val); + xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, + conf->lg_name, conf->lg_val ? conf->lg_val : ""); } } static void -list_one_consumer(struct gconsumer *cp, const char *prefix) +list_one_consumer(struct gconsumer *cp, const char *padding) { struct gprovider *pp; struct gconfig *conf; @@ -915,20 +929,24 @@ list_one_consumer(struct gconsumer *cp, const char *prefix) else { char buf[5]; - printf("Name: %s\n", pp->lg_name); + xo_emit("{Lcw:Name}{:name}\n", pp->lg_name); humanize_number(buf, sizeof(buf), (int64_t)pp->lg_mediasize, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); - printf("%sMediasize: %jd (%s)\n", prefix, - (intmax_t)pp->lg_mediasize, buf); - printf("%sSectorsize: %u\n", prefix, pp->lg_sectorsize); + xo_emit("{P:/%s}{Lcw:Mediasize}{:mediasize/%jd} ({N:/%s})\n", + padding, (intmax_t)pp->lg_mediasize, buf); + xo_emit("{P:/%s}{Lcw:Sectorsize}{:sectorsize/%u}\n", + padding, pp->lg_sectorsize); if (pp->lg_stripesize > 0 || pp->lg_stripeoffset > 0) { - printf("%sStripesize: %ju\n", prefix, pp->lg_stripesize); - printf("%sStripeoffset: %ju\n", prefix, pp->lg_stripeoffset); + xo_emit("{P:/%s}{Lcw:Stripesize}{:stripesize/%ju}\n", + padding, pp->lg_stripesize); + xo_emit("{P:/%s}{Lcw:Stripeoffset}{:stripeoffset/%ju}\n", + padding, pp->lg_stripeoffset); } - printf("%sMode: %s\n", prefix, cp->lg_mode); + xo_emit("{P:/%s}{Lcw:Mode}{:mode}\n", padding, pp->lg_mode); } LIST_FOREACH(conf, &cp->lg_config, lg_config) { - printf("%s%s: %s\n", prefix, conf->lg_name, conf->lg_val); + xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, + conf->lg_name, conf->lg_val ? conf->lg_val : ""); } } @@ -940,27 +958,36 @@ list_one_geom(struct ggeom *gp) struct gconfig *conf; unsigned n; - printf("Geom name: %s\n", gp->lg_name); + xo_emit("{Lcw:Geom name}{:name}\n", gp->lg_name); LIST_FOREACH(conf, &gp->lg_config, lg_config) { - printf("%s: %s\n", conf->lg_name, conf->lg_val); + xo_emit("{Lcwa:}{a:}\n", conf->lg_name, conf->lg_name, + conf->lg_val ? conf->lg_val : ""); } if (!LIST_EMPTY(&gp->lg_provider)) { - printf("Providers:\n"); + xo_open_list("providers"); + xo_emit("{Tc:Providers}\n"); n = 1; LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { - printf("%u. ", n++); + xo_emit("{T:/%u}. ", n++); + xo_open_instance("provider"); list_one_provider(pp, " "); + xo_close_instance("provider"); } + xo_close_list("providers"); } if (!LIST_EMPTY(&gp->lg_consumer)) { - printf("Consumers:\n"); + xo_open_list("consumers"); + xo_emit("{Tc:Consumers}\n"); n = 1; LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { - printf("%u. ", n++); + xo_emit("{T:/%u}. ", n++); + xo_open_instance("consumer"); list_one_consumer(cp, " "); + xo_close_instance("consumer"); } + xo_close_list("consumers"); } - printf("\n"); + xo_emit("\n"); } static void @@ -978,8 +1005,10 @@ list_one_geom_by_provider(const char *provider_name) if (gp == NULL) errx(EXIT_FAILURE, "Cannot find provider '%s'.", provider_name); - printf("Geom class: %s\n", gp->lg_class->lg_name); + xo_open_container(provider_name); + xo_emit("{Lwc:Geom class}{:class}\n", gp->lg_class->lg_name); list_one_geom(gp); + xo_close_container(provider_name); } static void @@ -1038,14 +1067,20 @@ std_list(struct gctl_req *req, unsigned flags __unused) "an instance named '%s'.", gclass_name, name); } + xo_open_container(gclass_name); list_one_geom(gp); + xo_close_container(gclass_name); } } else { + xo_open_list(gclass_name); LIST_FOREACH(gp, &classp->lg_geom, lg_geom) { if (LIST_EMPTY(&gp->lg_provider) && !all) continue; + xo_open_instance("geom"); list_one_geom(gp); + xo_close_instance("geom"); } + xo_close_list(gclass_name); } geom_deletetree(&mesh); } @@ -1115,34 +1150,24 @@ status_update_len_prs(struct ggeom *gp, int *name_len, int *status_len) } static char * -status_one_consumer(struct gconsumer *cp) +status_one_consumer(struct gconsumer *cp, const char *value) { - static char buf[256]; struct gprovider *pp; struct gconfig *conf; - const char *state, *syncr; + char *ret; pp = cp->lg_provider; if (pp == NULL) return (NULL); - state = NULL; - syncr = NULL; + ret = NULL; LIST_FOREACH(conf, &cp->lg_config, lg_config) { - if (strcasecmp(conf->lg_name, "state") == 0) - state = conf->lg_val; - if (strcasecmp(conf->lg_name, "synchronized") == 0) - syncr = conf->lg_val; - } - if (state == NULL && syncr == NULL) - snprintf(buf, sizeof(buf), "%s", pp->lg_name); - else if (state != NULL && syncr != NULL) { - snprintf(buf, sizeof(buf), "%s (%s, %s)", pp->lg_name, - state, syncr); - } else { - snprintf(buf, sizeof(buf), "%s (%s)", pp->lg_name, - state ? state : syncr); + if (strcasecmp(conf->lg_name, value) == 0) + ret = conf->lg_val; } - return (buf); + + if (ret == NULL) + return (NULL); + return (ret); } static void @@ -1150,8 +1175,9 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len) { struct gconsumer *cp; struct gconfig *conf; - const char *name, *status, *component; - int gotone; + char fmt[64]; + const char *name, *status, *cstate, *csyncr; + int gotone, len; name = gp->lg_name; status = "N/A"; @@ -1161,21 +1187,59 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len) break; } } - gotone = 0; + gotone = len = 0; + xo_open_instance("status"); LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { - component = status_one_consumer(cp); - if (component == NULL) + if (cp->lg_provider == NULL) continue; + + cstate = status_one_consumer(cp, "state"); + csyncr = status_one_consumer(cp, "synchronized"); + if (!gotone || script) { + if (!gotone) { + xo_emit("{t:name/%*s} {t:status/%*s} ", + name_len, name, status_len, status); + xo_open_list("components"); + } else { + /* + * XXX: running the same xo_emit() as above or + * variations of it will cause the XML/JSON to + * produce extra "components" lists in script + * mode + */ + + snprintf(fmt, sizeof(fmt), "%*s %*s ", + name_len, name, status_len, status); + xo_emit(fmt); + } + } + + xo_open_instance("components"); + if (cstate != NULL && csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:state}, {:synchronized})\n", + len, "", cp->lg_provider->lg_name, cstate, csyncr); + } else if (cstate != NULL) { + xo_emit("{P:/%*s}{:component} ({:state})\n", + len, "", cp->lg_provider->lg_name, cstate); + } else if (csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:synchronized})\n", + len, "", cp->lg_provider->lg_name, csyncr); + } else { + xo_emit("{P:/%*s}{:component}\n", + len, "", cp->lg_provider->lg_name); + } + xo_close_instance("components"); gotone = 1; - printf("%*s %*s %s\n", name_len, name, status_len, status, - component); - if (!script) - name = status = ""; + if (!len && !script) + len = name_len + status_len + 4; } if (!gotone) { - printf("%*s %*s %s\n", name_len, name, status_len, status, - "N/A"); + xo_emit("{t:name/%*s} {t:status/%*s} N/A\n", + name_len, name, status_len, status); + } else { + xo_close_list("components"); } + xo_close_instance("status"); } static void @@ -1184,9 +1248,11 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len) struct gprovider *pp; struct gconsumer *cp; struct gconfig *conf; - const char *name, *status, *component; - int gotone; + const char *name, *status, *cstate, *csyncr; + char fmt[64]; + int gotone, len; + xo_open_instance("status"); LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { name = pp->lg_name; status = "N/A"; @@ -1202,22 +1268,60 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len) break; } } - gotone = 0; + gotone = len = 0; LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { - component = status_one_consumer(cp); - if (component == NULL) + if (cp->lg_provider == NULL) continue; + + cstate = status_one_consumer(cp, "state"); + csyncr = status_one_consumer(cp, "synchronized"); + if (!gotone || script) { + if (!gotone) { + xo_emit("{t:name/%*s} {t:status/%*s} ", + name_len, name, status_len, status); + xo_open_list("components"); + } else { + /* + * XXX: running the same xo_emit() as + * above or variations of it will + * cause the XML/JSON to produce + * extra "components" lists in + * script mode + */ + + snprintf(fmt, sizeof(fmt), "%*s %*s ", + name_len, name, status_len, status); + xo_emit(fmt); + } + } + + xo_open_instance("component"); + if (cstate != NULL && csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:state}, {:synchronized})\n", + len, "", cp->lg_provider->lg_name, cstate, csyncr); + } else if (cstate != NULL) { + xo_emit("{P:/%*s}{:component} ({:state})\n", + len, "", cp->lg_provider->lg_name, cstate); + } else if (csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:synchronized})\n", + len, "", cp->lg_provider->lg_name, csyncr); + } else { + xo_emit("{P:/%*s}{:component}\n", + len, "", cp->lg_provider->lg_name); + } + xo_close_instance("component"); gotone = 1; - printf("%*s %*s %s\n", name_len, name, - status_len, status, component); - if (!script) - name = status = ""; + if (!len && !script) + len = name_len + status_len + 4; } if (!gotone) { - printf("%*s %*s %s\n", name_len, name, - status_len, status, "N/A"); + xo_emit("{t:name/%*s} {t:status/%*s} N/A\n", + name_len, name, status_len, status); + } else { + xo_close_list("components"); } } + xo_close_instance("status"); } static void @@ -1240,13 +1344,9 @@ std_status(struct gctl_req *req, unsigned flags __unused) all = gctl_get_int(req, "all"); geoms = gctl_get_int(req, "geoms"); script = gctl_get_int(req, "script"); - if (script) { - name_len = 0; - status_len = 0; - } else { - name_len = strlen("Name"); - status_len = strlen("Status"); - } + name_len = strlen("Name"); + status_len = strlen("Status"); + if (nargs > 0) { for (i = 0, n = 0; i < nargs; i++) { name = gctl_get_ascii(req, "arg%d", i); @@ -1282,9 +1382,10 @@ std_status(struct gctl_req *req, unsigned flags __unused) goto end; } if (!script) { - printf("%*s %*s %s\n", name_len, "Name", status_len, "Status", - "Components"); + xo_emit("{T:/%*s} {T:/%*s} {T:Components}\n", + name_len, "Name", status_len, "Status"); } + xo_open_list(gclass_name); if (nargs > 0) { for (i = 0; i < nargs; i++) { name = gctl_get_ascii(req, "arg%d", i); @@ -1312,6 +1413,7 @@ std_status(struct gctl_req *req, unsigned flags __unused) } } } + xo_close_list(gclass_name); end: geom_deletetree(&mesh); } From nobody Mon Nov 17 20:39:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9KNk06vqz6GvgM; Mon, 17 Nov 2025 20:39: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9KNj71dBz3KPX; Mon, 17 Nov 2025 20:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763411973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OSOpZWSwkP0MnjDLMv3334JdkWftevLY/mIH6pFuoPA=; b=R3q6mq4J41DL25kBOIf1+0FJVtE694G4zc/bbe2fs57yDvqqv+mJzLW9ajIy/aFDxZVitl Xm0yWm96RiAoO4DI+0teX2rxrNh0eKubgRCu4PUpTvdbs8FvNqz6nHakJTnMwqkQFxDLmr 6E7YKF8s12af0pB5+o/PmxtHK41ZW3J/jm4/yJxqKgmhQClqomAl7l29LEIhs0eQdtmUhB KBxWPqQemxwV5l9KAa9pZ3AjC3+jxypfFE2PSMTBrgJ8j4jTjWoSj2EFDXxG6yLQEQlmju zhudgx0QR9M4Fsv0aIjS1cGWqcPRRET7Sp1v80vrkstL/2+JMmeqE4u8xWwWoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763411973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OSOpZWSwkP0MnjDLMv3334JdkWftevLY/mIH6pFuoPA=; b=dS+ufeNPR5Sy58NetFuNd6fBFmSNoai4WltztgCOTVwJSzT8lPqBVBc3EjSwram1zWeQ1i n9vEhVf1E7aLayXTg3N6vXUkyu+7lwgQFHoTnVgfqzdrkVfdoOy/P8qHHwaDybpQxrhA0G 357uqm7ZTCq8YBlZn/vgeQ3aDaOBdQBBCLrfsswf9oMQ3Jwm0bPCFkoXguLSgfeesQFzAO c1h1iWfbnR58omVUok0+pwe+Ynrj31qt6gyx1MeuKgx4uJTBmSDpVz5K/Tt3N3RFNHFOeU /AdKe+7vAEE9WHaIyfjV9wSQthPQeAISMMzWVBsC5yh5gQw2rOhEw1yVavSs/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763411973; a=rsa-sha256; cv=none; b=bbRNqXmLOTzc5zTcZzBfVVmEjN67XBgmC5TJJDLsYfzJLVF9hbVv5FAQZo5a1nZLAcOL1T TaHRG0I2skI5OrptFE0pJGDbs2FRa/Arak2/Hg0cHT5+S2Vh1zkU91+Ut3bP5siKBuOSNB iNmrE3icuCMlxc6lVTuB+cMshs/HgLZgNRiEdOhGI6zAnIFf8fhevC55v6hqTGp1BKVcYj PDrTId/KYIA05UcN4p2HPoSs0nqCXg7iQMbPixtyULobThdlREb6vdts4d8VGk/nAoNTln pqPkJT4DOKzVHJyPzUzTscrrjmmRMB1Tv9FNKA/l5CsFKxgpNZq2CBmHuSr/mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9KNj6XlYz86Y; Mon, 17 Nov 2025 20:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHKdX0S060047; Mon, 17 Nov 2025 20:39:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHKdXEi060044; Mon, 17 Nov 2025 20:39:33 GMT (envelope-from git) Date: Mon, 17 Nov 2025 20:39:33 GMT Message-Id: <202511172039.5AHKdXEi060044@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 511e33d20925 - stable/14 - Add --libxo support for geom status and list sub commands. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 511e33d209257eadeb5487bcff91389c3ff6d5eb Auto-Submitted: auto-generated The branch stable/14 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=511e33d209257eadeb5487bcff91389c3ff6d5eb commit 511e33d209257eadeb5487bcff91389c3ff6d5eb Author: Kirk McKusick AuthorDate: 2025-10-13 21:15:05 +0000 Commit: Kirk McKusick CommitDate: 2025-11-17 20:33:21 +0000 Add --libxo support for geom status and list sub commands. Submitted-by: Johan Söllvander Differential Revision: https://reviews.freebsd.org/D37615 Differential Revision: https://reviews.freebsd.org/D53110 Differential Revision: https://reviews.freebsd.org/D53180 Differential Revision: https://reviews.freebsd.org/D53313 (cherry picked from commit 0d4642a67e59f8da5e00a05001c342bdad2a806f) (cherry picked from commit 2168e15ee89b4206d8e65a4ea04e4721f60f4060) (cherry picked from commit 2f461ddd784b4abdb7f88701d20fc45f658c42f5) (cherry picked from commit c174f518c9c8cf3a567c5f60414508ac951a2ae4) --- sbin/geom/Makefile | 2 +- sbin/geom/core/geom.c | 254 +++++++++++++++++++++++++++++++++++--------------- 2 files changed, 179 insertions(+), 77 deletions(-) diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile index b311a9e8e8fb..0aa9d7f350bb 100644 --- a/sbin/geom/Makefile +++ b/sbin/geom/Makefile @@ -10,7 +10,7 @@ MAN= geom.8 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/core CFLAGS+= -DGEOM_CLASS_DIR=\"${GEOM_CLASS_DIR}\" -LIBADD= geom util +LIBADD= geom util xo .if defined(RESCUE) .PATH: ${SRCTOP}/lib/geom/part \ diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index ccaf7adca305..6631e6b7f6af 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -50,9 +50,12 @@ #include #include #include +#include #include "misc/subr.h" +#define GEOM_XO_VERSION "1" + #ifdef STATIC_GEOM_CLASSES extern uint32_t gpart_version; extern struct g_command gpart_class_commands[]; @@ -514,6 +517,7 @@ run_command(int argc, char *argv[]) gctl_free(req); if (verbose) printf("Done.\n"); + xo_finish(); exit(EXIT_SUCCESS); } @@ -811,6 +815,10 @@ main(int argc, char *argv[]) provider_name = NULL; tflag = false; + argc = xo_parse_args(argc, argv); + if (argc < 0) + return (argc); + if (strcmp(getprogname(), "geom") == 0) { while ((ch = getopt(argc, argv, "hp:t")) != -1) { switch (ch) { @@ -832,6 +840,7 @@ main(int argc, char *argv[]) * Don't adjust argc and argv, it would break get_class(). */ } + xo_set_version(GEOM_XO_VERSION); if (tflag && provider_name != NULL) { errx(EXIT_FAILURE, @@ -840,6 +849,7 @@ main(int argc, char *argv[]) if (provider_name != NULL) { list_one_geom_by_provider(provider_name); + xo_finish(); return (0); } @@ -883,29 +893,33 @@ find_geom(struct gclass *classp, const char *name) } static void -list_one_provider(struct gprovider *pp, const char *prefix) +list_one_provider(struct gprovider *pp, const char *padding) { struct gconfig *conf; char buf[5]; - printf("Name: %s\n", pp->lg_name); + xo_emit("{Lcw:Name}{:name}\n", pp->lg_name); humanize_number(buf, sizeof(buf), (int64_t)pp->lg_mediasize, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); - printf("%sMediasize: %jd (%s)\n", prefix, (intmax_t)pp->lg_mediasize, - buf); - printf("%sSectorsize: %u\n", prefix, pp->lg_sectorsize); + xo_emit("{P:/%s}{Lcw:Mediasize}{:mediasize/%jd} ({N:/%s})\n", + padding, (intmax_t)pp->lg_mediasize, buf); + xo_emit("{P:/%s}{Lcw:Sectorsize}{:sectorsize/%u}\n", + padding, pp->lg_sectorsize); if (pp->lg_stripesize > 0 || pp->lg_stripeoffset > 0) { - printf("%sStripesize: %ju\n", prefix, pp->lg_stripesize); - printf("%sStripeoffset: %ju\n", prefix, pp->lg_stripeoffset); + xo_emit("{P:/%s}{Lcw:Stripesize}{:stripesize/%ju}\n", + padding, pp->lg_stripesize); + xo_emit("{P:/%s}{Lcw:Stripeoffset}{:stripeoffset/%ju}\n", + padding, pp->lg_stripeoffset); } - printf("%sMode: %s\n", prefix, pp->lg_mode); + xo_emit("{P:/%s}{Lcw:Mode}{:mode}\n", padding, pp->lg_mode); LIST_FOREACH(conf, &pp->lg_config, lg_config) { - printf("%s%s: %s\n", prefix, conf->lg_name, conf->lg_val); + xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, + conf->lg_name, conf->lg_val ? conf->lg_val : ""); } } static void -list_one_consumer(struct gconsumer *cp, const char *prefix) +list_one_consumer(struct gconsumer *cp, const char *padding) { struct gprovider *pp; struct gconfig *conf; @@ -916,20 +930,24 @@ list_one_consumer(struct gconsumer *cp, const char *prefix) else { char buf[5]; - printf("Name: %s\n", pp->lg_name); + xo_emit("{Lcw:Name}{:name}\n", pp->lg_name); humanize_number(buf, sizeof(buf), (int64_t)pp->lg_mediasize, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); - printf("%sMediasize: %jd (%s)\n", prefix, - (intmax_t)pp->lg_mediasize, buf); - printf("%sSectorsize: %u\n", prefix, pp->lg_sectorsize); + xo_emit("{P:/%s}{Lcw:Mediasize}{:mediasize/%jd} ({N:/%s})\n", + padding, (intmax_t)pp->lg_mediasize, buf); + xo_emit("{P:/%s}{Lcw:Sectorsize}{:sectorsize/%u}\n", + padding, pp->lg_sectorsize); if (pp->lg_stripesize > 0 || pp->lg_stripeoffset > 0) { - printf("%sStripesize: %ju\n", prefix, pp->lg_stripesize); - printf("%sStripeoffset: %ju\n", prefix, pp->lg_stripeoffset); + xo_emit("{P:/%s}{Lcw:Stripesize}{:stripesize/%ju}\n", + padding, pp->lg_stripesize); + xo_emit("{P:/%s}{Lcw:Stripeoffset}{:stripeoffset/%ju}\n", + padding, pp->lg_stripeoffset); } - printf("%sMode: %s\n", prefix, cp->lg_mode); + xo_emit("{P:/%s}{Lcw:Mode}{:mode}\n", padding, pp->lg_mode); } LIST_FOREACH(conf, &cp->lg_config, lg_config) { - printf("%s%s: %s\n", prefix, conf->lg_name, conf->lg_val); + xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, + conf->lg_name, conf->lg_val ? conf->lg_val : ""); } } @@ -941,27 +959,36 @@ list_one_geom(struct ggeom *gp) struct gconfig *conf; unsigned n; - printf("Geom name: %s\n", gp->lg_name); + xo_emit("{Lcw:Geom name}{:name}\n", gp->lg_name); LIST_FOREACH(conf, &gp->lg_config, lg_config) { - printf("%s: %s\n", conf->lg_name, conf->lg_val); + xo_emit("{Lcwa:}{a:}\n", conf->lg_name, conf->lg_name, + conf->lg_val ? conf->lg_val : ""); } if (!LIST_EMPTY(&gp->lg_provider)) { - printf("Providers:\n"); + xo_open_list("providers"); + xo_emit("{Tc:Providers}\n"); n = 1; LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { - printf("%u. ", n++); + xo_emit("{T:/%u}. ", n++); + xo_open_instance("provider"); list_one_provider(pp, " "); + xo_close_instance("provider"); } + xo_close_list("providers"); } if (!LIST_EMPTY(&gp->lg_consumer)) { - printf("Consumers:\n"); + xo_open_list("consumers"); + xo_emit("{Tc:Consumers}\n"); n = 1; LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { - printf("%u. ", n++); + xo_emit("{T:/%u}. ", n++); + xo_open_instance("consumer"); list_one_consumer(cp, " "); + xo_close_instance("consumer"); } + xo_close_list("consumers"); } - printf("\n"); + xo_emit("\n"); } static void @@ -979,8 +1006,10 @@ list_one_geom_by_provider(const char *provider_name) if (gp == NULL) errx(EXIT_FAILURE, "Cannot find provider '%s'.", provider_name); - printf("Geom class: %s\n", gp->lg_class->lg_name); + xo_open_container(provider_name); + xo_emit("{Lwc:Geom class}{:class}\n", gp->lg_class->lg_name); list_one_geom(gp); + xo_close_container(provider_name); } static void @@ -1039,14 +1068,20 @@ std_list(struct gctl_req *req, unsigned flags __unused) "an instance named '%s'.", gclass_name, name); } + xo_open_container(gclass_name); list_one_geom(gp); + xo_close_container(gclass_name); } } else { + xo_open_list(gclass_name); LIST_FOREACH(gp, &classp->lg_geom, lg_geom) { if (LIST_EMPTY(&gp->lg_provider) && !all) continue; + xo_open_instance("geom"); list_one_geom(gp); + xo_close_instance("geom"); } + xo_close_list(gclass_name); } geom_deletetree(&mesh); } @@ -1116,34 +1151,24 @@ status_update_len_prs(struct ggeom *gp, int *name_len, int *status_len) } static char * -status_one_consumer(struct gconsumer *cp) +status_one_consumer(struct gconsumer *cp, const char *value) { - static char buf[256]; struct gprovider *pp; struct gconfig *conf; - const char *state, *syncr; + char *ret; pp = cp->lg_provider; if (pp == NULL) return (NULL); - state = NULL; - syncr = NULL; + ret = NULL; LIST_FOREACH(conf, &cp->lg_config, lg_config) { - if (strcasecmp(conf->lg_name, "state") == 0) - state = conf->lg_val; - if (strcasecmp(conf->lg_name, "synchronized") == 0) - syncr = conf->lg_val; - } - if (state == NULL && syncr == NULL) - snprintf(buf, sizeof(buf), "%s", pp->lg_name); - else if (state != NULL && syncr != NULL) { - snprintf(buf, sizeof(buf), "%s (%s, %s)", pp->lg_name, - state, syncr); - } else { - snprintf(buf, sizeof(buf), "%s (%s)", pp->lg_name, - state ? state : syncr); + if (strcasecmp(conf->lg_name, value) == 0) + ret = conf->lg_val; } - return (buf); + + if (ret == NULL) + return (NULL); + return (ret); } static void @@ -1151,8 +1176,9 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len) { struct gconsumer *cp; struct gconfig *conf; - const char *name, *status, *component; - int gotone; + char fmt[64]; + const char *name, *status, *cstate, *csyncr; + int gotone, len; name = gp->lg_name; status = "N/A"; @@ -1162,21 +1188,59 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len) break; } } - gotone = 0; + gotone = len = 0; + xo_open_instance("status"); LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { - component = status_one_consumer(cp); - if (component == NULL) + if (cp->lg_provider == NULL) continue; + + cstate = status_one_consumer(cp, "state"); + csyncr = status_one_consumer(cp, "synchronized"); + if (!gotone || script) { + if (!gotone) { + xo_emit("{t:name/%*s} {t:status/%*s} ", + name_len, name, status_len, status); + xo_open_list("components"); + } else { + /* + * XXX: running the same xo_emit() as above or + * variations of it will cause the XML/JSON to + * produce extra "components" lists in script + * mode + */ + + snprintf(fmt, sizeof(fmt), "%*s %*s ", + name_len, name, status_len, status); + xo_emit(fmt); + } + } + + xo_open_instance("components"); + if (cstate != NULL && csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:state}, {:synchronized})\n", + len, "", cp->lg_provider->lg_name, cstate, csyncr); + } else if (cstate != NULL) { + xo_emit("{P:/%*s}{:component} ({:state})\n", + len, "", cp->lg_provider->lg_name, cstate); + } else if (csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:synchronized})\n", + len, "", cp->lg_provider->lg_name, csyncr); + } else { + xo_emit("{P:/%*s}{:component}\n", + len, "", cp->lg_provider->lg_name); + } + xo_close_instance("components"); gotone = 1; - printf("%*s %*s %s\n", name_len, name, status_len, status, - component); - if (!script) - name = status = ""; + if (!len && !script) + len = name_len + status_len + 4; } if (!gotone) { - printf("%*s %*s %s\n", name_len, name, status_len, status, - "N/A"); + xo_emit("{t:name/%*s} {t:status/%*s} N/A\n", + name_len, name, status_len, status); + } else { + xo_close_list("components"); } + xo_close_instance("status"); } static void @@ -1185,9 +1249,11 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len) struct gprovider *pp; struct gconsumer *cp; struct gconfig *conf; - const char *name, *status, *component; - int gotone; + const char *name, *status, *cstate, *csyncr; + char fmt[64]; + int gotone, len; + xo_open_instance("status"); LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { name = pp->lg_name; status = "N/A"; @@ -1203,22 +1269,60 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len) break; } } - gotone = 0; + gotone = len = 0; LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { - component = status_one_consumer(cp); - if (component == NULL) + if (cp->lg_provider == NULL) continue; + + cstate = status_one_consumer(cp, "state"); + csyncr = status_one_consumer(cp, "synchronized"); + if (!gotone || script) { + if (!gotone) { + xo_emit("{t:name/%*s} {t:status/%*s} ", + name_len, name, status_len, status); + xo_open_list("components"); + } else { + /* + * XXX: running the same xo_emit() as + * above or variations of it will + * cause the XML/JSON to produce + * extra "components" lists in + * script mode + */ + + snprintf(fmt, sizeof(fmt), "%*s %*s ", + name_len, name, status_len, status); + xo_emit(fmt); + } + } + + xo_open_instance("component"); + if (cstate != NULL && csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:state}, {:synchronized})\n", + len, "", cp->lg_provider->lg_name, cstate, csyncr); + } else if (cstate != NULL) { + xo_emit("{P:/%*s}{:component} ({:state})\n", + len, "", cp->lg_provider->lg_name, cstate); + } else if (csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:synchronized})\n", + len, "", cp->lg_provider->lg_name, csyncr); + } else { + xo_emit("{P:/%*s}{:component}\n", + len, "", cp->lg_provider->lg_name); + } + xo_close_instance("component"); gotone = 1; - printf("%*s %*s %s\n", name_len, name, - status_len, status, component); - if (!script) - name = status = ""; + if (!len && !script) + len = name_len + status_len + 4; } if (!gotone) { - printf("%*s %*s %s\n", name_len, name, - status_len, status, "N/A"); + xo_emit("{t:name/%*s} {t:status/%*s} N/A\n", + name_len, name, status_len, status); + } else { + xo_close_list("components"); } } + xo_close_instance("status"); } static void @@ -1241,13 +1345,9 @@ std_status(struct gctl_req *req, unsigned flags __unused) all = gctl_get_int(req, "all"); geoms = gctl_get_int(req, "geoms"); script = gctl_get_int(req, "script"); - if (script) { - name_len = 0; - status_len = 0; - } else { - name_len = strlen("Name"); - status_len = strlen("Status"); - } + name_len = strlen("Name"); + status_len = strlen("Status"); + if (nargs > 0) { for (i = 0, n = 0; i < nargs; i++) { name = gctl_get_ascii(req, "arg%d", i); @@ -1283,9 +1383,10 @@ std_status(struct gctl_req *req, unsigned flags __unused) goto end; } if (!script) { - printf("%*s %*s %s\n", name_len, "Name", status_len, "Status", - "Components"); + xo_emit("{T:/%*s} {T:/%*s} {T:Components}\n", + name_len, "Name", status_len, "Status"); } + xo_open_list(gclass_name); if (nargs > 0) { for (i = 0; i < nargs; i++) { name = gctl_get_ascii(req, "arg%d", i); @@ -1313,6 +1414,7 @@ std_status(struct gctl_req *req, unsigned flags __unused) } } } + xo_close_list(gclass_name); end: geom_deletetree(&mesh); } From nobody Mon Nov 17 21:17:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9LDk2c2rz6H09K; Mon, 17 Nov 2025 21:17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9LDk1gfTz3X54; Mon, 17 Nov 2025 21:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763414262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OeS51HzlrTUbOmJkldjmOfIftYGQn0SAjG8mo7Uudx0=; b=c35WPH7mn6Qpiq5pkdJSS+XSYXz71w/LhC1RSAD+JhgX/aywZOWiQU9gMKE2ay7lpuVSKK v8+2OvQkY8Z2GdCyV1TAF5upmHzZ9qT9yaBbeylTwSX/0AIXVSsiSs4ZH09P6Mx167b+0v Y3QBJKCTY8VkATYMaPWp8xPnt9f6Xt4+wxtYcBVDfqnBJPDrbV534DjxRGcvaPr3RWavgl MYIotJuHmjmH6Lk3rMrRhawd+Jz9F7m9b1T4s9s6TLo02cuWFaBqlGORzU6Us6QpNcNone y5XEmqD+76dK3wMuKoEcMCvI2D2ocj4eYePK3n4HMxdjgPlUUCOvf+M7JF10YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763414262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OeS51HzlrTUbOmJkldjmOfIftYGQn0SAjG8mo7Uudx0=; b=Zg25TDd7QtAyQdxvW5IptQkRyTPWsWvtn0LiejoTyvFViAH02NZ7kKWDMhP2/AoSk43I57 jLCZMDckRTHs1daGSJCO3sjZpNIhqKGa7gslDS9nIbPd54bPz+VPqwtItfJ7tr+ymdZLCQ aptDwECO0uWGuLXIbKNLujsPNWmGX2cXVrxkHN4UcNEfjj9Vbh0HvAcgEb+pdWTjCCs7GT 7UwJ0/Xd+O9nKGMVeMGNo12GdlQ85CcPcEl8H/K0izX++D1JSQ+olfZaMDe+iEKmVVdfHc mq89DcMBn5hJTosMvrePzttB5qUmWJM4PpSY665yn6RhepmZpbUq4/dJlAseaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763414262; a=rsa-sha256; cv=none; b=cdWeEmCeWgRCwbLRLVpiJQ+qTexjVC7kmLT9XBr00V4iCkbH9ps9k2NPye9vQCDUecy2lQ 7+oyRcrZcaxpo6dgcglsgY94K/hDy4tyWXx3kX0I8c3YxdLoaKo4G5X8PIsVfUD4+8gFtA lkZU+T4rYldcpUHk8wIiqL7C+nTPcq09sBy7qsl6JqKfSsdfw9EfAjMcgMAw3v2usp90Ui Fdn1vuYtXcxGjKPJUXLYUtn7qBRAJM5I26O8daAl7isuP7HADzgOeRYF4fv66iH+aA2xg4 nfLjy6AKa61z7vTG1rieq0eGchR6PCP6YvO/FFY+gFYuR/sjOTV9QDg5Ah7giw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9LDk1GGFz91w; Mon, 17 Nov 2025 21:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHLHgvB038230; Mon, 17 Nov 2025 21:17:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHLHgUZ038227; Mon, 17 Nov 2025 21:17:42 GMT (envelope-from git) Date: Mon, 17 Nov 2025 21:17:42 GMT Message-Id: <202511172117.5AHLHgUZ038227@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 1b9254f4d473 - main - zfs: unbreak gcc builds after openzfs/zfs@e63d026b9 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b9254f4d4738a90f2a408acfff619818c9493f2 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=1b9254f4d4738a90f2a408acfff619818c9493f2 commit 1b9254f4d4738a90f2a408acfff619818c9493f2 Author: Martin Matuska AuthorDate: 2025-11-17 21:17:19 +0000 Commit: Martin Matuska CommitDate: 2025-11-17 21:17:19 +0000 zfs: unbreak gcc builds after openzfs/zfs@e63d026b9 --- lib/libproc/tests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libproc/tests/Makefile b/lib/libproc/tests/Makefile index 9467cc634884..ebefdfb713f2 100644 --- a/lib/libproc/tests/Makefile +++ b/lib/libproc/tests/Makefile @@ -4,7 +4,7 @@ PROGS= target_prog SRCS_target_prog= target_prog.c BINDIR_target_prog= ${TESTSDIR} -LIBADD= elf proc rtld_db util +LIBADD= elf proc rtld_db util pthread # Ensure that symbols aren't stripped from the test program, as they're needed # for testing symbol lookup. From nobody Mon Nov 17 22:06:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9MJw5hR4z6H3f8; Mon, 17 Nov 2025 22:06: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9MJw50Ycz3cNh; Mon, 17 Nov 2025 22:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763417184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yai2tCqfzfjhueK8wsqnMe98s3hhhqt9v4yVsGEn7J4=; b=yz24XczOd2aKHG2FFkxKBGjIAJftCYmKEqouCic+v8VTWpiVEzgsLw49ouxmHhGFehQUEh dLUBUoc58TidULcuthSneNFGEMI2CqmsLBSbkO9VJAD5auwCjPZdxogFM2KQgYnVQ3PINQ 0cbFTOeWkpnln/SFs0wR3s1rpWJGE5El0OB7QR0kARSOzxnsK+uzEigXGKfCwD/sm/dO6n JKMq0nI6BdBuB30mnIRwxd/QtvScbeHEg2xDPRmQz2oduAMX3oysZd1TQ7sCyAoH5X4Fdn v3LyWYMmCTPNY0/ZBCjbuEP5AyEjAd5IS3sTKXtcFUP027HzbTcsIg54L6N2Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763417184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yai2tCqfzfjhueK8wsqnMe98s3hhhqt9v4yVsGEn7J4=; b=akH0mZ4D2iOYnFiCGiEyfAcvBIdQEGJwGvDmAPI2W4mQEq6kJcS81kUIPOXsqsFx43Rfrp 9zZFYrA1QLx2/IU5+0VrIAVJJjLLQzXJhqAuHYrARKYYw7InMqF7sem9fRaIGRJJsje+f4 /FKlWy5uRTF4ta6E7kWaK3tSbtXxsvenHJIzWu6tMQuHgAeWvUUQNAPzYCuUjOYeLxpMNj 68o7bMgJOd03XyAyW0yZ78vmdRqPIUbzH4lTjOriApC4ARjc1OIa5x/IJKVb3pUjruooOo Ex6xSvx+yPQ1S0NBmCsm3XDXg/8adrBZ5pFTDoE1OBn7vIoxxpKjX/oBjAT2ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763417184; a=rsa-sha256; cv=none; b=iboOpmQN0dIBdfeDugrOUICLjaJQuNl5CBMc3LAB6v6O2rLDrqSmA9HiN7wlLOWd4IuLsC YsD/tJEjTE/DUzAh2JIj2weWmrAvqJdsNIYnZtGkoptOKFiQvSi+D4lHsGXFoXK4WoUXJV qCT5FajpXa7aM980QNpIJKL/cLq8l8DJhxxgG4jLY0c17G0TabbkLUjs7AxxSxQoS7LN1y M/EyxnYkZ8YPvi+ZzZ/JdNlgvHXQm2zobp5Lf2OOcXJLMY2czlz3xjUwz/TGhWEhC6+0HN c4T0LLEB2O5seYYnnqWFnu+sB27tBrfpGkSl3ERJ0G4ZOGGIRnLOEbrFvteB2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9MJw48jCzB19; Mon, 17 Nov 2025 22:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHM6OIU031380; Mon, 17 Nov 2025 22:06:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHM6OFr031377; Mon, 17 Nov 2025 22:06:24 GMT (envelope-from git) Date: Mon, 17 Nov 2025 22:06:24 GMT Message-Id: <202511172206.5AHM6OFr031377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: ff9f76a206c8 - main - if_ovpn: use IFT_TUNNEL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff9f76a206c80c263050816735d537a151ee2999 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ff9f76a206c80c263050816735d537a151ee2999 commit ff9f76a206c80c263050816735d537a151ee2999 Author: Kristof Provost AuthorDate: 2025-11-17 19:42:24 +0000 Commit: Kristof Provost CommitDate: 2025-11-17 22:05:45 +0000 if_ovpn: use IFT_TUNNEL IFT_ENC has special behaviour in pf we don't desire, and this also ensures that for all interface types there is N:1:1 correspondence between if_type:dlt:header len. Requested by: glebius MFC after: 1 week --- sys/net/if_ovpn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 1c18baac3417..674df4d17eb4 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -2691,7 +2691,7 @@ ovpn_clone_create(struct if_clone *ifc, char *name, size_t len, return (EEXIST); sc = malloc(sizeof(struct ovpn_softc), M_OVPN, M_WAITOK | M_ZERO); - sc->ifp = if_alloc(IFT_ENC); + sc->ifp = if_alloc(IFT_TUNNEL); rm_init_flags(&sc->lock, "if_ovpn_lock", RM_RECURSE); sc->refcount = 0; From nobody Mon Nov 17 22:16:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9MXl2Cvlz6H4Ty; Mon, 17 Nov 2025 22:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9MXl1fRyz3gTF; Mon, 17 Nov 2025 22:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763417799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z/0DffE6wFsjHuOJvk9f8ZJkbeqFagV20PogMX+GueQ=; b=TjU9ot+G2IDd03iqpQXXnXGFZt0LqGlVyz2CwdnP0+49eC80s6OHYp8rMmPj+5jF481Oin FEt5Hza4R+LC5FJBiEajyvY3PPz9xw6J4cqzGhON7UFCxDOwUcjawvT+0bp4j7Dte8wiG2 HVykMYlEkndlEBHfGYaFouQH49j9DUEaqOe2AbxiowvbZOrtaTbnArFX6msVilwQK85HkC drLChHvFMyxkxgeSEn+qmFy94J3yKn9pxKgUNxBTuHYUy7+H2dZ0fzTIUc8kpDfBC6zQFy uQnQTO5WjgNFrwaS4k8oK5CeipwPP4EP59u0m/b49ImPxTuoWxgc0O8omUAfQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763417799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z/0DffE6wFsjHuOJvk9f8ZJkbeqFagV20PogMX+GueQ=; b=PmTUseBgZy2Iz5IbsOrR6k/3lH20lvw5WocPRQGLSgUljGScTRtVVvm4Valekx7E8cCFVy ZyUkraB+hhQMFKLELjfbV9J/FQOmSxuu+9yTvI48l9Jez7rR3+G3Ue+Ib7ZnutpliXKRdk VmahMOsjx1iZj6PxldtHghzA0WL64jkvFMIQiTZ5GlOWy1PWfkR6/yy2QLweRYdi7joj5D 8F6ugeoJaWjca9w7n1AsCFNmXmM1fGEim83yMs+6LsEXTcbKJmu/msEBNLNU2yKGU69sa+ qiA8B7dAzH+yP9CjdySr+/LqPBw1IkHnJ/hWQpIOGH2bGZYnBxugffs020HPLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763417799; a=rsa-sha256; cv=none; b=qsahfR1bln0Ei9vQRZAv7YSNgXnE7tNmKtgPUmKk70lPAWVNtgOcQ7/9N+9HqfEHVHDOZB ukmdbaKckdyi4nhB94k9U7/iauV/lo+KmvJ/JrMESx/i/2NrEMyUvT30mhW0ZuxNjNF0rr u43r1tUExsY8OT1jP0e3rYgjtUozsOZXJW8cntW3RDlIsc3XDtyu1U0+/dF1fEpoYEq+Xw 2ETN0KQD4zCM7bSEnZ+UzVtqTdKEzYPSVAy6rrNEuZpBnJ7EiHArJYvn2CCukqy5H0JaD3 +JaVRe+hK6LrGaz88IzpB8Oc4yE8QM1QwgFKVMCio6DCX22YPXMrnsu7Eo9LdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9MXl0jmKzBQt; Mon, 17 Nov 2025 22:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHMGcbW049884; Mon, 17 Nov 2025 22:16:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHMGcp7049881; Mon, 17 Nov 2025 22:16:38 GMT (envelope-from git) Date: Mon, 17 Nov 2025 22:16:38 GMT Message-Id: <202511172216.5AHMGcp7049881@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: 321a15380668 - stable/14 - bhyve: Report SVM as disabled on AMD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 321a153806685dff031c6ab2d453f077914910ec Auto-Submitted: auto-generated The branch stable/14 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=321a153806685dff031c6ab2d453f077914910ec commit 321a153806685dff031c6ab2d453f077914910ec Author: Chuck Tuffli AuthorDate: 2025-07-26 22:09:59 +0000 Commit: Chuck Tuffli CommitDate: 2025-11-17 21:54:00 +0000 bhyve: Report SVM as disabled on AMD bhyve with a Windows 2025 guest will hang/freeze with the message rdmsr to register 0xc0010114 on a system with an AMD Ryzen 5. Evidently, recent versions of Windows ignore the CPUID bits and still read this MSR. Fix is to report Secure Virtual Machine (SVM) mode as disabled in the VM CR. PR: 288308 (cherry picked from commit 92dfc3fbcd79422a4586590edabe483f361b7e0e) --- usr.sbin/bhyve/amd64/xmsr.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/usr.sbin/bhyve/amd64/xmsr.c b/usr.sbin/bhyve/amd64/xmsr.c index 7481df4669e7..b245fc27045d 100644 --- a/usr.sbin/bhyve/amd64/xmsr.c +++ b/usr.sbin/bhyve/amd64/xmsr.c @@ -205,6 +205,15 @@ emulate_rdmsr(struct vcpu *vcpu __unused, uint32_t num, uint64_t *val) *val = 1; break; + case MSR_VM_CR: + /* + * We currently don't support nested virt. + * Windows seems to ignore the cpuid bits and reads this + * MSR anyways. + */ + *val = VM_CR_SVMDIS; + break; + default: error = -1; break; From nobody Mon Nov 17 23:47:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9PZ016ZYz6HBRq; Mon, 17 Nov 2025 23:47: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9PZ00LK4z3qw4; Mon, 17 Nov 2025 23:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763423272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HCZ+gVxI2SqL9Dbm9ehyeeXxfETxaJGeO29MivCS6sU=; b=dkNWAIQiHEPAcyzRDnLn6MYK/cjJ1M+uuRKXTI0skpUdI1BKu+dGnEIgLbEsNnZRAwePVK WGTfUHtwQKlEhtDTCOPOZ/SjMz+fUa7CxxKgrt8nxYDiERSOIaQgKYjH6sCLkqAI2cEldl eKxtBxCLIsLmglMkjTXWBh0FJW5VOWB6voZVpSlUn7aDMYyleAav2ytYKUvsu2RtW4rnCQ 2UtJb8HkK8QUmX/wJuiMhsHt+9xSjAbGFT4Ks7v2PKW5/+YnjaFZe2iwthgZD2FRQJJIcB O+SXKz/JCjRxBHDy8zMSaEZFCMMLwRHd4WFQ+BLb9Y51fX9FLv7udSsObYPGxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763423272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HCZ+gVxI2SqL9Dbm9ehyeeXxfETxaJGeO29MivCS6sU=; b=nXzOEaYnaOXfi/6lV6HfvCGrRyR+wpTzMe8BNacotwmW75mBChvAYZ6k4ylrgdW3FTJQJh NFT17SpNyJDgNk/9f4Ez3q01uaxkcqOwslx8hgNjBvP3NpCUCqDIp6Ojo1bi+lcPo1KUoR 6DdZRDOOP8NNOqQ6WVcHPT2JjLJQmBVJkaQJ1thxXg4J949LuUFWUqOQRFvEEUJsr5hetC GDojox7+oNbXHzmDl2woYcn340V6SfOrUorQl33ZcwsSyV7CkhqTAQra39/OihnV6G4jnS Ehti0yCHvoDJEFvK5PLf4fZDIbbfJvfi/EzMpZ9NiBcof78mP0yZ5LldJ27NDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763423272; a=rsa-sha256; cv=none; b=ObQPwHWB4zrbOmRDI2l6Tz28t52BoaOlkMAlYCRjMdwDijl8XNe35h8xdQL+9/qaAXzCdI RsYWy3s/qckXkCZdM0XjHtaW61wZSIMTNVjXUjVnf2I/rKjtjpg+bPaOkornnHmcTdvXex 8cYk3Era6cDoKzxScaprcXSwNSwsOAduQdatmZSBJ7zNkZuGtj4GM/QBjPhSHp5rg75u7L hTleg6vxfTRa/TvRuPIj1M5NoRWfedCtAEhsG44xz8HFtjdlyWb/CwiiRQ9N5vl4hR4Row A+xj3g+B9LeEtV7DC7708WPA8r343sigxMTXJjikQcOi070l/zHMAsfkHwYfTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9PYz6mkwzDT0; Mon, 17 Nov 2025 23:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHNlpuU019608; Mon, 17 Nov 2025 23:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHNlpqe019605; Mon, 17 Nov 2025 23:47:51 GMT (envelope-from git) Date: Mon, 17 Nov 2025 23:47:51 GMT Message-Id: <202511172347.5AHNlpqe019605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 45197d29ced2 - stable/14 - Fix getmntpoint(3) to operate as it is documented in its manual page. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 45197d29ced2f57941a771dc8ec37243a52b9a7e Auto-Submitted: auto-generated The branch stable/14 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=45197d29ced2f57941a771dc8ec37243a52b9a7e commit 45197d29ced2f57941a771dc8ec37243a52b9a7e Author: Kirk McKusick AuthorDate: 2025-10-22 18:01:03 +0000 Commit: Kirk McKusick CommitDate: 2025-11-17 23:47:36 +0000 Fix getmntpoint(3) to operate as it is documented in its manual page. The -libutil function getmntpoint(3) is documented as accepting a device name “with or without /dev/ prepended to it” but did not attempt to prepend /dev/. This patch corrects the problem by prepending /dev/ to names that do not begin with a '/'. Reported-by: Dag-Erling Smørgrav Differential Revision: https://reviews.freebsd.org/D53185 Sponsored-by: Netflix (cherry picked from commit 99bf680a8499dea71db5da705dfe41f4bb5e00ab) --- sbin/mount/getmntopts.c | 53 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c index fab25466425f..32f2920eb9c5 100644 --- a/sbin/mount/getmntopts.c +++ b/sbin/mount/getmntopts.c @@ -152,6 +152,18 @@ checkpath_allow_file(const char *path, char *resolved) return (0); } +static char * +prependdevtopath(const char *path, char *buf, u_long buflen) +{ + u_long len; + + if ((len = strlen(_PATH_DEV) + strlen(path) + 1) > buflen) + return NULL; + strncpy(buf, _PATH_DEV, len); + strncat(buf, path, len - sizeof(_PATH_DEV)); + return (buf); +} + /* * Get the mount point information for name. Name may be mount point name * or device name (with or without /dev/ preprended). @@ -160,19 +172,27 @@ struct statfs * getmntpoint(const char *name) { struct stat devstat, mntdevstat; - char device[sizeof(_PATH_DEV) - 1 + MNAMELEN]; - char *ddevname; + char *devname; struct statfs *mntbuf, *statfsp; - int i, mntsize, isdev; - u_long len; + int i, len, isdev, mntsize, mntfromnamesize; + char device[sizeof(_PATH_DEV) - 1 + MNAMELEN]; + u_long devlen; - if (stat(name, &devstat) != 0) + devlen = sizeof(device); + /* + * Note that stat(NULL, &statbuf) returns -1 (EBADF) which will + * cause us to return NULL if prependdevtopath() returns NULL. + */ + if (stat(name, &devstat) != 0 && + (name[0] != '/' && + stat(prependdevtopath(name, device, devlen), &devstat) != 0)) return (NULL); if (S_ISCHR(devstat.st_mode) || S_ISBLK(devstat.st_mode)) isdev = 1; else isdev = 0; mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); + mntfromnamesize = sizeof(statfsp->f_mntfromname); for (i = 0; i < mntsize; i++) { statfsp = &mntbuf[i]; if (isdev == 0) { @@ -180,19 +200,20 @@ getmntpoint(const char *name) continue; return (statfsp); } - ddevname = statfsp->f_mntfromname; - if (*ddevname != '/') { - if ((len = strlen(_PATH_DEV) + strlen(ddevname) + 1) > - sizeof(statfsp->f_mntfromname) || - len > sizeof(device)) + devname = statfsp->f_mntfromname; + if (*devname == '/') { + if (stat(devname, &mntdevstat) != 0) + continue; + } else { + devname = prependdevtopath(devname, device, devlen); + if (devname == NULL || + (len = strlen(devname)) > mntfromnamesize) + continue; + if (stat(devname, &mntdevstat) != 0) continue; - strncpy(device, _PATH_DEV, len); - strncat(device, ddevname, len); - if (stat(device, &mntdevstat) == 0) - strncpy(statfsp->f_mntfromname, device, len); + strncpy(statfsp->f_mntfromname, devname, len); } - if (stat(ddevname, &mntdevstat) == 0 && - S_ISCHR(mntdevstat.st_mode) && + if (S_ISCHR(mntdevstat.st_mode) && mntdevstat.st_rdev == devstat.st_rdev) return (statfsp); } From nobody Tue Nov 18 00:02:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9PvK1yXlz6HCcr; Tue, 18 Nov 2025 00:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9PvK1NFhz3sbg; Tue, 18 Nov 2025 00:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763424173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ddl9y3ao/0LKH0j9IRJEf/qazm/u3Jr8AjxfkexgMss=; b=aqCxDnGsFqvGhSKI9DHuczsc40RuLQ0j9L0cohtJvpmNF5bMWDJsAAk7LpCIoHYJHT4iua kL9gKYtVs50XQi5m1bIzcgQLyy2YaTyMuNkqkZQHjwvZGl8dTQdi3vAv1Q6X1FVj7sC7U6 0iN5FWhRY6jZVvhxnh2MNhxQhbNcVPXHVhah9fKoJ6In4nhDNAqVpjmgcl6hS3Kfgj3myh /kGF5BpIwECKpE3tMFm4p4wx7Tu2Lx7NNZUyKs1KMV6KvUDQvDvITy2Z6rvHMe+zU+H8Xy 86Sd6lIo7RdAOp5Zhsn7PbKCB3mysHPzFt94HT5lTcx49RzY95iV+FfMep54OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763424173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ddl9y3ao/0LKH0j9IRJEf/qazm/u3Jr8AjxfkexgMss=; b=cBigvqXfRUnxGXdwKUKpbIiA/8Cose7k2tCmuesuiuOG4tdX87XikZ4yJJD9h8M04ecSpl W23FkSeP2VteHbadhUgJeU2Gkoqs1riwwXbx3WyAfG3MP+aoRNRcm0IZcJiqV/bCUdS969 Usb86nqnu7eAn25U7vxaK13Td3p5rJ1FZ07bJoqYNC6b2ZTcP0BYaFZ54nnVrWNt+vvk4/ +8hdPNKIhgeQZx1UdJCLLCp08iZv5GGG7bnmJoUz1ZP36pUulA5N0f26l8SXE/TV1THIHR 2WwZkY8zMAuOUtrDCHbAlhIcGtJgAY0Q2DS/4k6uYQgK6jEqptQWDpnvh6BZxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763424173; a=rsa-sha256; cv=none; b=FgEmZGexveHh7JhNWCfeBksZ1CqcGMtLwC1YGXIXbSOQEWf8aAajmCMDBCyH26fiQ65ozG Sv0Y7eEV3ryRHisD9h2HtaPN2aKlVwsL0v+7RE8kFKsSWIWdfu2fqKnIC2wrJLHC8B3t70 QvsEpQsFcNc1yMhXVsmAOT3Cj0KuexYPJkdqfK/scMbB39g9wOvroiw9nQKtfH2ubAWqnT 8/BJXivyicg9HR8/PnyTDGSHdLjE4E35xtuIdm7VTPr7IRX/we46NaAD1suNgA59Iy1sxv b9SFP2CvTvT8LFEync3fVcNWljy9UmjwAG6PJ5SxODjT4NG2P/fXWRR55MqG6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9PvK0zZyzVcV; Tue, 18 Nov 2025 00:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI02r1a056610; Tue, 18 Nov 2025 00:02:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI02r51056607; Tue, 18 Nov 2025 00:02:53 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:02:53 GMT Message-Id: <202511180002.5AI02r51056607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 404fbe6847b4 - stable/15 - Fix getmntpoint(3) to operate as it is documented in its manual page. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 404fbe6847b42d12fcaa034d148d41ff63ccf420 Auto-Submitted: auto-generated The branch stable/15 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=404fbe6847b42d12fcaa034d148d41ff63ccf420 commit 404fbe6847b42d12fcaa034d148d41ff63ccf420 Author: Kirk McKusick AuthorDate: 2025-10-22 18:01:03 +0000 Commit: Kirk McKusick CommitDate: 2025-11-17 23:57:26 +0000 Fix getmntpoint(3) to operate as it is documented in its manual page. The -libutil function getmntpoint(3) is documented as accepting a device name “with or without /dev/ prepended to it” but did not attempt to prepend /dev/. This patch corrects the problem by prepending /dev/ to names that do not begin with a '/'. Reported-by: Dag-Erling Smørgrav Differential Revision: https://reviews.freebsd.org/D53185 Sponsored-by: Netflix (cherry picked from commit 99bf680a8499dea71db5da705dfe41f4bb5e00ab) --- lib/libutil/mntopts.c | 53 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/lib/libutil/mntopts.c b/lib/libutil/mntopts.c index 07d3dd6d98a3..4a064a086fd5 100644 --- a/lib/libutil/mntopts.c +++ b/lib/libutil/mntopts.c @@ -145,6 +145,18 @@ checkpath_allow_file(const char *path, char *resolved) return (0); } +static char * +prependdevtopath(const char *path, char *buf, u_long buflen) +{ + u_long len; + + if ((len = strlen(_PATH_DEV) + strlen(path) + 1) > buflen) + return NULL; + strncpy(buf, _PATH_DEV, len); + strncat(buf, path, len - sizeof(_PATH_DEV)); + return (buf); +} + /* * Get the mount point information for name. Name may be mount point name * or device name (with or without /dev/ preprended). @@ -153,19 +165,27 @@ struct statfs * getmntpoint(const char *name) { struct stat devstat, mntdevstat; - char device[sizeof(_PATH_DEV) - 1 + MNAMELEN]; - char *ddevname; + char *devname; struct statfs *mntbuf, *statfsp; - int i, mntsize, isdev; - u_long len; + int i, len, isdev, mntsize, mntfromnamesize; + char device[sizeof(_PATH_DEV) - 1 + MNAMELEN]; + u_long devlen; - if (stat(name, &devstat) != 0) + devlen = sizeof(device); + /* + * Note that stat(NULL, &statbuf) returns -1 (EBADF) which will + * cause us to return NULL if prependdevtopath() returns NULL. + */ + if (stat(name, &devstat) != 0 && + (name[0] != '/' && + stat(prependdevtopath(name, device, devlen), &devstat) != 0)) return (NULL); if (S_ISCHR(devstat.st_mode) || S_ISBLK(devstat.st_mode)) isdev = 1; else isdev = 0; mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); + mntfromnamesize = sizeof(statfsp->f_mntfromname); for (i = 0; i < mntsize; i++) { statfsp = &mntbuf[i]; if (isdev == 0) { @@ -173,19 +193,20 @@ getmntpoint(const char *name) continue; return (statfsp); } - ddevname = statfsp->f_mntfromname; - if (*ddevname != '/') { - if ((len = strlen(_PATH_DEV) + strlen(ddevname) + 1) > - sizeof(statfsp->f_mntfromname) || - len > sizeof(device)) + devname = statfsp->f_mntfromname; + if (*devname == '/') { + if (stat(devname, &mntdevstat) != 0) + continue; + } else { + devname = prependdevtopath(devname, device, devlen); + if (devname == NULL || + (len = strlen(devname)) > mntfromnamesize) + continue; + if (stat(devname, &mntdevstat) != 0) continue; - strncpy(device, _PATH_DEV, len); - strncat(device, ddevname, len); - if (stat(device, &mntdevstat) == 0) - strncpy(statfsp->f_mntfromname, device, len); + strncpy(statfsp->f_mntfromname, devname, len); } - if (stat(ddevname, &mntdevstat) == 0 && - S_ISCHR(mntdevstat.st_mode) && + if (S_ISCHR(mntdevstat.st_mode) && mntdevstat.st_rdev == devstat.st_rdev) return (statfsp); } From nobody Tue Nov 18 00:19:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9QG54lfDz6HDZr; Tue, 18 Nov 2025 00:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9QG50nfhz3tXK; Tue, 18 Nov 2025 00:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763425149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JVH528Gw675DaZAUEaGqUC9XAfIZ9l28//DpqH5Uh8A=; b=bkxerkbHwgdc7VzQDQm1iq6RtEs2yjtMsXSowESPJdjDZBHCNhpunPOOVTvKQm+9Mp9FOg ruV4mASafPROLUtD7L36WZhiTSRfP0o2lNNrjHnBeKEtccvYMdgwLiqI1SPYFRVILppYCq J0Z1WNMFQKKhrVHe+F7LrC9d4xTM/z2Rpwayo9MbCJTXwa+FijDvx2NYwND2tjwHHO58XA kl9LX4ExMm31Ai5u9sTjcPKdmRZ4s+UzCd3hUW1sTqydIF89KqOSHcQHSCvnUsfBOefGiP cjoqcrL86W2hP91liCMC/GtwvFCLiZKgRDFMwV88x6C8pYazHsByCa0Bs3YKug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763425149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JVH528Gw675DaZAUEaGqUC9XAfIZ9l28//DpqH5Uh8A=; b=AXVvXteOxTcmUcvHvLxDiG1sll3N3UBQMjXzhaJ0OzN1FAgWIdL58If13DnkAkhjb0vLuF N17e6UqTTndkbGc7yI7xguThW4LFrMuZcZCZWBvCC5WNdVMR6rIs3HG7BuQvsDNEHK+ipB cTYAjzLthqW+dpWcrvh9oghD3CASr6vum8d4GxuNbP0tPIAW2m/OlW4FuZSEAuLWFuiQnq Ll8/FRCUlmzKjNldBw4YI3eQHXKo53+5LshgTf3O0gOyzGh1+4Em+41xRyqyEWFCN6YNAa x7rCyeqatpN4jO+n3GdMiMZt1LnGiKZaz9c0EsB0hHez2ie2crcYFfEqwzq7hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763425149; a=rsa-sha256; cv=none; b=ietuUYicXMfZRDnCQOsAjYP0HRzZ62D58Lv1bEohACzisM+aQpmHNeK1DACa26dbGRU0aG +vPnqQey/Mjifbp44inYbAPRKDUNvKphzE7M2x7pK+m+jkQodtovyakT9+VwCT5F/wALpt nvagv1JP8Sr25e468AIIN11m8aIKoZ02QBhHqpNEzNkDjTEk4vMTjZaDU5fAF6brAK1jmK a9Rk6hantuMa3/tgJjE54zyaCpftHJJ4AUMuymnifYQjuj8P9Zc6/DNq04L5isFe8jOhlz Y7XGhUUpna2mu1p276ldd0vBX9MxWRelKFE78iQOHzl5ngalej1zHUNG/+6qGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9QG50KRRzTl1; Tue, 18 Nov 2025 00:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0J8Ed077151; Tue, 18 Nov 2025 00:19:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0J8cd077148; Tue, 18 Nov 2025 00:19:08 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:19:08 GMT Message-Id: <202511180019.5AI0J8cd077148@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 640205bc22c8 - main - LinuxKPI: 802.11: initialize the passed in chandef in cfg80211_chandef_create List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 640205bc22c8b2bd31c766f4d0c409c183a8b8dc Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=640205bc22c8b2bd31c766f4d0c409c183a8b8dc commit 640205bc22c8b2bd31c766f4d0c409c183a8b8dc Author: Bjoern A. Zeeb AuthorDate: 2025-11-17 22:54:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-11-17 22:54:07 +0000 LinuxKPI: 802.11: initialize the passed in chandef in cfg80211_chandef_create cfg80211_chandef_create() gets passed a pointer to a cfg80211_chan_def. It seems that several users are passing in an uninitialized variable from the stack and expect cfg80211_chandef_create() to initialize it. Run memset() on the struct, which for all callers currently seems to do the right thing, to avoid later accesses to uninitialized struct members like "punctured". Reported by: CI (gcc build) MFC after: 3 days Sponsonred by: The FreeBSD Foundation --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index f769cfdd4075..305026b34451 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -1450,7 +1450,7 @@ cfg80211_chandef_create(struct cfg80211_chan_def *chandef, KASSERT(chandef != NULL, ("%s: chandef is NULL\n", __func__)); KASSERT(chan != NULL, ("%s: chan is NULL\n", __func__)); - /* memset(chandef, 0, sizeof(*chandef)); */ + memset(chandef, 0, sizeof(*chandef)); chandef->chan = chan; chandef->center_freq1 = chan->center_freq; /* chandef->width, center_freq2, punctured */ From nobody Tue Nov 18 00:51:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzj0Q9mz6HH1R; Tue, 18 Nov 2025 00:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzh6fF7z3xJq; Tue, 18 Nov 2025 00:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IvAC5xh1QLOYStgt0vMQhr8aQhnUuWRNHR0yrAQmpg=; b=GYk5hH77PKOLGzCe+s9dEUeI+gxB5SJc5/jcz5Xsdi3nXklkbQdX2hxgwLsI0lfK0+dOaA uwl3t9bSxjRbatzecXbFqjTftkRtSKGt3vvR3lwlaROkQTrpV0tK8bL5gokV4v/qw2F1fT f2FkMnVPdRzlFm3WCLKmtgbE/q83aOeME0CeFdlpONymDpm81TF1Q1TG6HO3VqhSYqLPoS 9TxYtf+g5wCtDdbD4CGb1qlovBW4IP4h73cf3Y4LhOT59Si7b1lZQjWSRAQGhEDqkJd/6E Pa9JaL8RW/+QsyfAfAPOY3CEM2TEz32cLiptKR2CESjkR1M6HGHLE0sV3MWohA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IvAC5xh1QLOYStgt0vMQhr8aQhnUuWRNHR0yrAQmpg=; b=GyEZjhDsYa/OMWHLFU35LgOQivdGY1D3578ovt637ncEVPwcjoiLV+QCj44pR4B9zW5x1S tMfRmfjjfqgJg2lXXFDvGErdBJOmZtBUhyO7N6z0KzUZ6Q8ZQ60M75XpIXThp/cQzz59sa TsXIGGk3hHfxa+wwS+KPh+1cW3LY13jouH1u45udoJBwAzIwKffDXN+B0htpT+e+qzxilw 8u6XJN96AERV27EbI7ekfK36KopGHVoT5oMfw2hs19ch/gaTp6SJN3wVdkfNsjE9TuKlfN NE41Pw8LwpfSnz6hcBvIi/4c2+uct9YFANt1tVoKNw6KCBALT/94ORgDpkLdTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427104; a=rsa-sha256; cv=none; b=pVSN4OWgWgUzoYa77BHSgOzgotv1zBhiSeOD0vYxY7ZIjAnL0iSf9PicY7X6s4NSNPHEDP O5k7HRvr6RIxY+VfrleJFfKGyQE2migYuRZU4pBSU58S8APVC6Psp0hOuJwhHVDjFNArpv yuaXCKqHufGxvKb869kEvdv4GZZtDhf315/1UJyXTMoNPcBJZvZqubzzVy6vwJPKe+QZNO S2qMrjBbQ3p4bnVzcKOgpzID5REnsEWEDOcyL0TjmSNGDlCvNp5GDRZ5E6VMQhJMfmpLIm qAAdIlIEMYu/1i8kkFyQajn6c1JHadrGjK7+SWQ73a1JiHP7y3A7rgjKI3do9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzh6372zY7k; Tue, 18 Nov 2025 00:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0piuO044679; Tue, 18 Nov 2025 00:51:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0piPU044676; Tue, 18 Nov 2025 00:51:44 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:44 GMT Message-Id: <202511180051.5AI0piPU044676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: f7fe9f04c396 - stable/15 - sound: Add kqueue support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f7fe9f04c396d16a144dcce779e6a633e584e4a0 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f7fe9f04c396d16a144dcce779e6a633e584e4a0 commit f7fe9f04c396d16a144dcce779e6a633e584e4a0 Author: Christos Margiolis AuthorDate: 2025-11-11 12:04:45 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:00 +0000 sound: Add kqueue support Co-authored by: meka@tilda.center Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53029 (cherry picked from commit 4181bf9d18166c4061bfa137b8a46972a5a55f67) --- sys/dev/sound/pcm/channel.c | 9 +++-- sys/dev/sound/pcm/channel.h | 1 + sys/dev/sound/pcm/dsp.c | 82 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 4d13f20a5262..062eeb251a5b 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -271,7 +271,7 @@ chn_lockdestroy(struct pcm_channel *c) * @retval 1 = ready for I/O * @retval 0 = not ready for I/O */ -static int +int chn_polltrigger(struct pcm_channel *c) { struct snd_dbuf *bs = c->bufsoft; @@ -313,6 +313,7 @@ chn_wakeup(struct pcm_channel *c) bs = c->bufsoft; if (CHN_EMPTY(c, children.busy)) { + KNOTE_LOCKED(&bs->sel.si_note, 0); if (SEL_WAITING(sndbuf_getsel(bs)) && chn_polltrigger(c)) selwakeuppri(sndbuf_getsel(bs), PRIBIO); CHN_BROADCAST(&c->intr_cv); @@ -1277,6 +1278,7 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, } c->bufhard = b; c->bufsoft = bs; + knlist_init_mtx(&bs->sel.si_note, c->lock); c->devinfo = CHANNEL_INIT(c->methods, devinfo, b, c, direction); if (c->devinfo == NULL) { @@ -1373,8 +1375,11 @@ chn_kill(struct pcm_channel *c) feeder_remove(c); if (c->devinfo && CHANNEL_FREE(c->methods, c->devinfo)) sndbuf_free(b); - if (bs) + if (bs) { + knlist_clear(&bs->sel.si_note, 0); + knlist_destroy(&bs->sel.si_note); sndbuf_destroy(bs); + } if (b) sndbuf_destroy(b); CHN_LOCK(c); diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 9ad21d219001..15180bc8f0b6 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -261,6 +261,7 @@ int chn_read(struct pcm_channel *c, struct uio *buf); u_int32_t chn_start(struct pcm_channel *c, int force); int chn_sync(struct pcm_channel *c, int threshold); int chn_flush(struct pcm_channel *c); +int chn_polltrigger(struct pcm_channel *c); int chn_poll(struct pcm_channel *c, int ev, struct thread *td); char *chn_mkname(char *buf, size_t len, struct pcm_channel *c); diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 27d5b740b90b..1b205d7229fc 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -81,6 +81,7 @@ static d_ioctl_t dsp_ioctl; static d_poll_t dsp_poll; static d_mmap_t dsp_mmap; static d_mmap_single_t dsp_mmap_single; +static d_kqfilter_t dsp_kqfilter; struct cdevsw dsp_cdevsw = { .d_version = D_VERSION, @@ -89,6 +90,7 @@ struct cdevsw dsp_cdevsw = { .d_write = dsp_write, .d_ioctl = dsp_ioctl, .d_poll = dsp_poll, + .d_kqfilter = dsp_kqfilter, .d_mmap = dsp_mmap, .d_mmap_single = dsp_mmap_single, .d_name = "dsp", @@ -2962,6 +2964,86 @@ dsp_oss_getchannelmask(struct pcm_channel *wrch, struct pcm_channel *rdch, return (ret); } +static void +dsp_kqdetach(struct knote *kn) +{ + struct pcm_channel *ch = kn->kn_hook; + + if (ch == NULL) + return; + CHN_LOCK(ch); + knlist_remove(&ch->bufsoft->sel.si_note, kn, 1); + CHN_UNLOCK(ch); +} + +static int +dsp_kqevent(struct knote *kn, long hint) +{ + struct pcm_channel *ch = kn->kn_hook; + + CHN_LOCKASSERT(ch); + if (ch->flags & CHN_F_DEAD) { + kn->kn_flags |= EV_EOF; + return (1); + } + kn->kn_data = 0; + if (chn_polltrigger(ch)) { + if (kn->kn_filter == EVFILT_READ) + kn->kn_data = sndbuf_getready(ch->bufsoft); + else + kn->kn_data = sndbuf_getfree(ch->bufsoft); + } + + return (kn->kn_data > 0); +} + +static const struct filterops dsp_filtops = { + .f_isfd = 1, + .f_detach = dsp_kqdetach, + .f_event = dsp_kqevent, +}; + +static int +dsp_kqfilter(struct cdev *dev, struct knote *kn) +{ + struct dsp_cdevpriv *priv; + struct snddev_info *d; + struct pcm_channel *ch; + int err = 0; + + if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) + return (err); + + d = priv->sc; + if (!DSP_REGISTERED(d)) + return (EBADF); + PCM_GIANT_ENTER(d); + switch (kn->kn_filter) { + case EVFILT_READ: + ch = priv->rdch; + break; + case EVFILT_WRITE: + ch = priv->wrch; + break; + default: + kn->kn_hook = NULL; + err = EINVAL; + ch = NULL; + break; + } + if (ch != NULL) { + kn->kn_fop = &dsp_filtops; + CHN_LOCK(ch); + knlist_add(&ch->bufsoft->sel.si_note, kn, 1); + CHN_UNLOCK(ch); + kn->kn_hook = ch; + } else + err = EINVAL; + PCM_GIANT_LEAVE(d); + + return (err); +} + #ifdef OSSV4_EXPERIMENT /** * @brief Retrieve an audio device's label From nobody Tue Nov 18 00:51:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzk23q1z6HGwM; Tue, 18 Nov 2025 00:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzk0Znkz3x0H; Tue, 18 Nov 2025 00:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SJFhuQ/e/GdyL/YEtJaF0Y03RFtRdDNzHGkJhQJJ+P4=; b=a1fFxm4VZ8bHapFYS/qq+J7y+eJC8b8ug9paWRFsPnVYGD7B+yyBzm/yEu7OEcQzYOsK3R UncM2i44L148R1xUYA6f2eaDB71U+arPITOB9tscGcLQV4QIezhtWUTqn1cWOVXdZGGORn vHeJkaqqX0diDltp5GKiBdomfsVgZCx2WDoGlo6kZ9C3pY6jTcWL9ItAZJdataJ8TOimzd Fn7W2nJ1xmV09s2XUEJk1ky7hG3+EeFP3CTWm0fqb5iNvt1/pSrmqf9oq3bKO42AO7mfwV FcWtnUpUBONSfSFVxxAAwVPaQ7J3I7Z6WezDEetfed1VM+nfrdgETQzWxcIJmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SJFhuQ/e/GdyL/YEtJaF0Y03RFtRdDNzHGkJhQJJ+P4=; b=V4y9KvXo/y8n3/2iYWaGwHQ23MLSpa7PqpLQWiFxQkW0/GYBCSHdZ5Gjqbf2j3DNQDn7r4 v3cKplLRwd+iIPIofbO13x2YziXI+OOcsYgAUyvwnIfHpsM2dMG5crutjam+D1CCKUkOZy qQbozpTR+M8i9WqV5HexFq41RgA9kwy0jdz9R+rswStWh1rlf92kry11ffwwrieHaMrmZw kivRopEwB/K/qYg0yK1qBb5gLXsqTdaIkS8GmerI3zUKLr+Uekmtrimouo116TA3E6vSw4 g6w8wQQ1d/V4jhMkcIV4Ky4YI0tQ2hNsfl74yj+NvUGyFbdYddxg/4ph/R7V0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427106; a=rsa-sha256; cv=none; b=Vu9cRC1VMYku6pgwPkZKc7j4/e/14Nuz5r8+d7jGSNTqktskVov41F2X2g431o5eNF0Vkt iYDZaozDoG5i8PuuW0i6vtauEhZDiO3fUv8gQx70hGOs9uPubVzjF5mZAHGTCMm4tGP0N6 fq+Z4yEhEwn4SnEqZB/huNlf9zWFyLk+hZc3JiaEeADtkmsxat1hEBQRaPEofl/py/NGrB WQpFy5whxGfdUgtlJqkylOMDNhEB1gNny9YnmGeI/Km0yau/LGnuhuR7M+qxUwSz9/HX6d Qukn8K1FUkxw9s29VLrW9vCg1Xvwe4NNrJ5ogs5bGwdx9gIzXHhYvZEylyTGmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzj70smzXmm; Tue, 18 Nov 2025 00:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0pjX7044713; Tue, 18 Nov 2025 00:51:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pj99044710; Tue, 18 Nov 2025 00:51:45 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:45 GMT Message-Id: <202511180051.5AI0pj99044710@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 16dc00a5cf58 - stable/15 - sound tests: Test polling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 16dc00a5cf58b4be96748b4a7c9b932f6422547c Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=16dc00a5cf58b4be96748b4a7c9b932f6422547c commit 16dc00a5cf58b4be96748b4a7c9b932f6422547c Author: Christos Margiolis AuthorDate: 2025-11-11 12:04:54 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:12 +0000 sound tests: Test polling Co-authored by: meka@tilda.center Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53188 (cherry picked from commit dd81b19ef23622d03d7c75935e11c2b2af3f4cb8) (cherry picked from commit 41f2ec3be93a2981e5afcc2569e6abcc64414437) (cherry picked from commit eb95b990f8ebfb85ce6e4d7d16305746b5eddcde) (cherry picked from commit fb99c0ba60dc464aab2102c4395791e151d438c6) --- tests/sys/sound/Makefile | 1 + tests/sys/sound/polling.c | 205 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+) diff --git a/tests/sys/sound/Makefile b/tests/sys/sound/Makefile index 74a0765a0540..ab52a7aad386 100644 --- a/tests/sys/sound/Makefile +++ b/tests/sys/sound/Makefile @@ -3,6 +3,7 @@ PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/sound ATF_TESTS_C+= pcm_read_write +ATF_TESTS_C+= polling ATF_TESTS_C+= sndstat CFLAGS+= -I${SRCTOP}/sys diff --git a/tests/sys/sound/polling.c b/tests/sys/sound/polling.c new file mode 100644 index 000000000000..b7a328d13d4c --- /dev/null +++ b/tests/sys/sound/polling.c @@ -0,0 +1,205 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * + * This software was developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include + +#define FMT_ERR(s) s ": %s", strerror(errno) + +static int +oss_init(void) +{ + int fd, tmp, rc; + + fd = open("/dev/dsp.dummy", O_RDWR); + ATF_REQUIRE_MSG(fd >= 0, FMT_ERR("open")); + + tmp = 2; + rc = ioctl(fd, SNDCTL_DSP_CHANNELS, &tmp); + ATF_REQUIRE_EQ_MSG(rc, 0, FMT_ERR("ioctl")); + + tmp = AFMT_S16_LE; + rc = ioctl(fd, SNDCTL_DSP_SETFMT, &tmp); + ATF_REQUIRE_EQ_MSG(rc, 0, FMT_ERR("ioctl")); + + tmp = 48000; + rc = ioctl(fd, SNDCTL_DSP_SPEED, &tmp); + ATF_REQUIRE_EQ_MSG(rc, 0, FMT_ERR("ioctl")); + + /* + * See http://manuals.opensound.com/developer/SNDCTL_DSP_SETTRIGGER.html + */ + tmp = PCM_ENABLE_INPUT | PCM_ENABLE_OUTPUT; + rc = ioctl(fd, SNDCTL_DSP_SETTRIGGER, &tmp); + ATF_REQUIRE_EQ_MSG(rc, 0, FMT_ERR("ioctl")); + + return (fd); +} + +ATF_TC(poll_kqueue); +ATF_TC_HEAD(poll_kqueue, tc) +{ + atf_tc_set_md_var(tc, "descr", "kqueue(2) test"); + atf_tc_set_md_var(tc, "require.kmods", "snd_dummy"); +} + +ATF_TC_BODY(poll_kqueue, tc) +{ + struct kevent ev; + int16_t buf[32]; + int fd, kq; + + fd = oss_init(); + + kq = kqueue(); + ATF_REQUIRE_MSG(kq >= 0, FMT_ERR("kqueue")); + EV_SET(&ev, fd, EVFILT_READ, EV_ADD | EV_CLEAR, 0, 0, 0); + ATF_REQUIRE_MSG(kevent(kq, &ev, 1, NULL, 0, NULL) == 0, + FMT_ERR("kevent")); + + ATF_REQUIRE_MSG(kevent(kq, NULL, 0, &ev, 1, NULL) == 1, + FMT_ERR("kevent")); + ATF_REQUIRE_MSG((ev.flags & EV_ERROR) == 0, "EV_ERROR is set"); + ATF_REQUIRE_MSG(ev.data != 0, "data is %" PRId64, ev.data); + ATF_REQUIRE_MSG(read(fd, buf, sizeof(buf)) > 0, FMT_ERR("read")); + + EV_SET(&ev, fd, EVFILT_READ, EV_DELETE, 0, 0, 0); + close(kq); + + kq = kqueue(); + ATF_REQUIRE_MSG(kq >= 0, FMT_ERR("kqueue")); + EV_SET(&ev, fd, EVFILT_WRITE, EV_ADD | EV_CLEAR, 0, 0, 0); + ATF_REQUIRE_MSG(kevent(kq, &ev, 1, NULL, 0, NULL) == 0, + FMT_ERR("kevent")); + + ATF_REQUIRE_MSG(kevent(kq, NULL, 0, &ev, 1, NULL) == 1, + FMT_ERR("kevent")); + ATF_REQUIRE_MSG((ev.flags & EV_ERROR) == 0, "EV_ERROR is set"); + ATF_REQUIRE_MSG(ev.data != 0, "data is %" PRId64, ev.data); + ATF_REQUIRE_MSG(write(fd, buf, sizeof(buf)) > 0, FMT_ERR("write")); + + EV_SET(&ev, fd, EVFILT_WRITE, EV_DELETE, 0, 0, 0); + close(kq); + + close(fd); +} + +ATF_TC(poll_poll); +ATF_TC_HEAD(poll_poll, tc) +{ + atf_tc_set_md_var(tc, "descr", "poll(2) test"); + atf_tc_set_md_var(tc, "require.kmods", "snd_dummy"); +} + +ATF_TC_BODY(poll_poll, tc) +{ + struct pollfd pfd[2]; + int16_t buf[32]; + int fd; + bool rd = false; + bool wr = false; + + fd = oss_init(); + + while (!rd || !wr) { + pfd[0].fd = fd; + pfd[0].events = POLLIN; + pfd[1].fd = fd; + pfd[1].events = POLLOUT; + ATF_REQUIRE_MSG(poll(pfd, sizeof(pfd) / sizeof(struct pollfd), + -1) > 0, FMT_ERR("poll")); + + if (pfd[0].revents) { + ATF_REQUIRE_MSG(read(fd, buf, sizeof(buf)) > 0, + FMT_ERR("read")); + rd = true; + } + if (pfd[1].revents) { + ATF_REQUIRE_MSG(write(fd, buf, sizeof(buf)) > 0, + FMT_ERR("write")); + wr = true; + } + } + close(fd); +} + +ATF_TC(poll_select); +ATF_TC_HEAD(poll_select, tc) +{ + atf_tc_set_md_var(tc, "descr", "select(2) test"); + atf_tc_set_md_var(tc, "require.kmods", "snd_dummy"); +} + +ATF_TC_BODY(poll_select, tc) +{ + fd_set fds[2]; + int16_t buf[32]; + int fd; + bool rd = false; + bool wr = false; + + fd = oss_init(); + + while (!rd || !wr) { + FD_ZERO(&fds[0]); + FD_ZERO(&fds[1]); + FD_SET(fd, &fds[0]); + FD_SET(fd, &fds[1]); + ATF_REQUIRE_MSG(select(fd + 2, &fds[0], &fds[1], NULL, NULL) > 0, + FMT_ERR("select")); + if (FD_ISSET(fd, &fds[0])) { + ATF_REQUIRE_MSG(read(fd, buf, sizeof(buf)) > 0, + FMT_ERR("read")); + rd = true; + } + if (FD_ISSET(fd, &fds[1])) { + ATF_REQUIRE_MSG(write(fd, buf, sizeof(buf)) > 0, + FMT_ERR("write")); + wr = true; + } + } + close(fd); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, poll_kqueue); + ATF_TP_ADD_TC(tp, poll_poll); + ATF_TP_ADD_TC(tp, poll_select); + + return (atf_no_error()); +} From nobody Tue Nov 18 00:51:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzl595Gz6HH3j; Tue, 18 Nov 2025 00:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzl212hz3xTq; Tue, 18 Nov 2025 00:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQrNPOdtUCD9rNvoQZ+hYN6QOzzu+/svRVju19uUb20=; b=fSagQtg28rGruIxhfdsndZDRuT6XjEayhzyrH5TwsGg6Yq9uIinXafzajydzRsbGJ8T3BK lzB9ulfcpy07KDuREOIY5+nl3f+7b+iMnKnHaojhHpfwnKzWva5tleFjiv+R1tuigLGL76 KK5iO6v5Mv2w8S0oTrr6V4XlXY1fZ/Uio5hi1/pLjW1m1lCndbdv1HU0RvRl/okrwE97fH LzFWQwAwQ3DU47uFzb5Ie6wM8ZmNmlzqtQeBJNlnPOxp8HKx6MBquz8znxASp6AaSXGAdg vjGbfxBY06AH2trSPNOegrJW1dzEpqwMZk7xozXgwsjhRRM75UN3LE7W9YemSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQrNPOdtUCD9rNvoQZ+hYN6QOzzu+/svRVju19uUb20=; b=ZUxZyofcofD2wMVhJ9IiuJMB8MwQc1oVRHgnCHirfKpMNwV2NhPHmUvx4Xx9T1t5l0ueV5 jsmV0zGnjes5Z48fBoPLaBTkbvWJ4723Qa7fyxhXAxG+c/sjjpAaGEnbXYHc98wHmbEP9y WbQ/pfUJNIcL0Vi/dCLuvQwRihjhwCRtquorLHarSpmUFLZyXIP7fx4xdRHfckl9r0PcX7 lvpuJq/kuUrBk1XyHO/+oKRUyVfQK+NC1IGs5wD8RkLQv10DaCNkR2t/C4v38L1naURZzZ Sy9OpU52demm6biWoZ5CZb/qM5mVwl8MotGCBQYM6t8TLhQq79zCS3mcQoeJNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427107; a=rsa-sha256; cv=none; b=Op9atA0S1CxRYphYSLsF5ffpDNLKEGpwUhpWNVas0HRWjs0rPwQf3tBCi/Gl64i85VB44O wWXhdYSKRU9EWclXBQvuQxFVnjMmara1qstfswgpDQo3Shumappia8a/Znfuufr9P9qqbW FZhud07ZS1nHPB/wOL99qnX8F2Jrqz5L0ecOEhp4xfyx25c24PE/r0L26NQJTqKn2Y07lC 1Bz7uD4MtmnMHLxbE4H7IVdxJOWpF1bpt0Y1q/xUoWppsmyW8m4Poi8hc3ptMoAcV9bOPX sqCjv9EEnJDF2OcnUTxoMOtw3ZiFrYwBfERiJusdyzVDDCJwHkddb460ggFkZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzl0qzTzXZy; Tue, 18 Nov 2025 00:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0plVa044746; Tue, 18 Nov 2025 00:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pl2X044743; Tue, 18 Nov 2025 00:51:47 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:47 GMT Message-Id: <202511180051.5AI0pl2X044743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: c58e41d899a7 - stable/15 - sound: Clarify userland/vchan relationship in sndstat feeder chain List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c58e41d899a785abf1f075dfef3ed9c045d5ca23 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c58e41d899a785abf1f075dfef3ed9c045d5ca23 commit c58e41d899a785abf1f075dfef3ed9c045d5ca23 Author: Christos Margiolis AuthorDate: 2025-11-10 16:15:36 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:21 +0000 sound: Clarify userland/vchan relationship in sndstat feeder chain When vchans are enabled, the primary channels do not interact with userland, but with the vchans. With vchans enabled: $ sndctl feederchain dsp0.play.0.feederchain=[vchans -> [...] -> hardware] dsp0.record.0.feederchain=[hardware -> [...] -> vchans] With vchans disabled: $ sndctl feederchain dsp0.play.0.feederchain=[userland -> [...] -> hardware] dsp0.record.0.feederchain=[hardware -> [...] -> userland] Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53504 (cherry picked from commit 59d7865d3c20e86b3c42096f4a8c06a5e2eebd29) --- sys/dev/sound/pcm/sndstat.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index 51d0fb3bb686..1a5bccd718b5 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -524,7 +524,8 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) c->parentchannel->name : "userland"); } else { sbuf_printf(&sb, "[%s", (c->direction == PCMDIR_REC) ? - "hardware" : "userland"); + "hardware" : + ((d->flags & SD_F_PVCHANS) ? "vchans" : "userland")); } sbuf_printf(&sb, " -> "); f = c->feeder; @@ -561,7 +562,8 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) "userland" : c->parentchannel->name); } else { sbuf_printf(&sb, "%s]", (c->direction == PCMDIR_REC) ? - "userland" : "hardware"); + ((d->flags & SD_F_RVCHANS) ? "vchans" : "userland") : + "hardware"); } CHN_UNLOCK(c); @@ -1320,7 +1322,8 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) c->parentchannel->name : "userland"); } else { sbuf_printf(s, "\t{%s}", (c->direction == PCMDIR_REC) ? - "hardware" : "userland"); + "hardware" : + ((d->flags & SD_F_PVCHANS) ? "vchans" : "userland")); } sbuf_printf(s, " -> "); f = c->feeder; @@ -1358,7 +1361,8 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) "userland" : c->parentchannel->name); } else { sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC) ? - "userland" : "hardware"); + ((d->flags & SD_F_RVCHANS) ? "vchans" : "userland") : + "hardware"); } CHN_UNLOCK(c); From nobody Tue Nov 18 00:51:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzm4T97z6HGmv; Tue, 18 Nov 2025 00:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzm1qDpz3xRy; Tue, 18 Nov 2025 00:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7WjIvWYq579YTd4ekOyI4UQFg1aTd2LnRmzE/zLuIk4=; b=HYnpBUUJLOoxYc0ixZx1fLdW1XaZHeoi0Qg0TGKqFJpOrxM2TdfEM5gkABTsbU3qO+TDTC LN+p3/CnuMbwAFl1dUXTR/NFioIyXIIwNtErB+IWdEYs6nI3/8rwr7/WylqR0RmOrflpQB nqXmb6ZR9tfbnOmCPSSmGBfwRwn2pYDudnu0M0jrYMpM0xFiohwLHlEPoK9/MsV4WttXIH 27Ve+z0ofr5OkHavGVfVHFTxmUgs34Eh+q5QCZ3o8P/3HRaoSnTEuLbLpaOKO9F/xH+RVm mpF4DS9Rk6oeOdkCgt7DgcZK1xuEH8m4pVBaR1nUoiIGnaWM21wlKUw8JkoRRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7WjIvWYq579YTd4ekOyI4UQFg1aTd2LnRmzE/zLuIk4=; b=DbWbB6D/OgBlBH7d+bHHfGQvR4+v74DodQxRUxoVdK8g9A0HOuz++wqv2BkuaHuzkpUXMB 3OonJse8Qg25WFJH+DeyPQ9soLDVMRRB38qpV+krQck1e+ziW35ruq3KUEZcWIrde5uwjQ zGb2/eDU/aNcha6cReTyNToMvtyozyK/HzRm1wVKZvo6vYVF48gSAccs7D24lsY2dW+6pf AcKvLJezr6kbKL9yYleIkjMJgsnFzUX+4jSlIiOKiF/zE0CR615dEttZ8lsrknunsYEvCp TEJVMoJIbsXYsA/QwOPMfu507eh4k/M4EposkWF7GoUEVWXXKI3o2SwbgebGhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427108; a=rsa-sha256; cv=none; b=olhuRY2SsJt0M6BTSq1yE/bsU+ciTsAVhcKXxwncu9OYhZq4/Aiy6utY47ALTd66hBPz65 q797xp16ro5Boy671h4qatmUmwGzJGHmfzGQtfjLNsHcx+GPYqBowQDHXaFhWTX8bVTA3h +PB9uCtvQVWfy4NKD7nUttAsIMpEsD14jKfIlJ864K0FtExvRoJi4fueecIeKtXTm5v2To l7YvxrCbYP9p4znvLC8qFSkzlhEPDJxdcS3oiW3jwJZ/jLNcSnFomtAgGQc5MKU2BhnqQH U98cX7U5XPECuLfCVx5tm7zJUhEyTiBMpxKWIi4LUzCEW2vr1jFsyjduuw7PBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzm1Q2PzXdH; Tue, 18 Nov 2025 00:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0pmtA044780; Tue, 18 Nov 2025 00:51:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pmVW044777; Tue, 18 Nov 2025 00:51:48 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:48 GMT Message-Id: <202511180051.5AI0pmVW044777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 65c1264625e3 - stable/15 - sound: Retire unused snd_dbuf->dir List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 65c1264625e3bcde278d5069e7a973a03795737a Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=65c1264625e3bcde278d5069e7a973a03795737a commit 65c1264625e3bcde278d5069e7a973a03795737a Author: Christos Margiolis AuthorDate: 2025-11-11 12:04:58 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:21 +0000 sound: Retire unused snd_dbuf->dir Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53518 (cherry picked from commit 3ba4e3d352e5fbc550645a76064ca16460616d86) --- sys/dev/sound/pcm/buffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index ddf4083ec19f..841bfb85af3c 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -41,7 +41,7 @@ struct snd_dbuf { volatile int rl; /* length of ready area */ volatile int hp; volatile u_int64_t total, prev_total; - int dmachan, dir; /* dma channel */ + int dmachan; /* dma channel */ u_int32_t fmt, spd, bps, align; unsigned int blksz, blkcnt; int xrun; From nobody Tue Nov 18 00:51:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzn4sqKz6HGwQ; Tue, 18 Nov 2025 00:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzn38Fjz3xKK; Tue, 18 Nov 2025 00:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qe3zySG92RHpPhpsmSHjAQkogsfT/xn2BCpMrrUS/A=; b=mrAJGYGTEJBmxEkZA3CjRFqP+f/+hBIMM2m11Xk2mxaGEcPblOrF7MWUFl/AEYVWWUwFGf csRQ3b3KbEhwun9wW0jXhckX3Gjdy5kAGxKoOHQlXoAlYcPkzyrW0DGG5kU90J7Oft6IhF iAcGrbmSka44gMdXcg2gpUDrhGvHVNHFDlOf9lh5wJMIyA7PZyfyXmph9InRqL56YUZqO6 24y7yICnLVQWC8p+77IOsXYxDCaurFqpFKfLJa5S/dna9L0Wy74Clzyxg4eJdXEPyc5bu0 QNx+Tap+5Ub9ecAxlELiXSHY1mX4U8A9Gp7F3+TLIYS8Wf+ysm417izx6rgzZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qe3zySG92RHpPhpsmSHjAQkogsfT/xn2BCpMrrUS/A=; b=kpTYql5VfL6KgWlKpx/957c1ZUy4ESZhGs2BGJSmkFNTHhNNbFnSaNxTQxxyEKQsxAmAum tr8Z6QdsjmQ6C1V4shII0ZGbINDcgbqV9yH7HXLGOhTPHopwK0X3keV0wztyXweEDXyQXs 7ZH1Bzldy2MWcPWH/LblV62uOPwbW8K5OPGAIZmXmmiu8ms6lqor7hOoImJ+Utbpsj4Ri9 /Dx3s/pyfS+m4+RhMZf3zJEUBW2mBHCGuwoB6vo+7uaMhJRpUfT8NC78rrAbrREmp1msR/ BeCGWvcF3RAX1EfkjG25dhG42LABEmDvU7yL/UXNCR0M4PG10FpbjihNTYHaJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427109; a=rsa-sha256; cv=none; b=Q4dvOcWlDbM7oqB5dXN7aE2zqlLc5hkpPIwx4pQTvdsJygobdMa9UkUGscnDv/sK5S8T5M A/CtjTY6XvFh2TH1vgKK7x2vp4w5lgMa1s3hiqZTTuangTcH0dQOlHjfNlDAkDBxuImNRr ghWvBOvSSTQmHlj3SyDGgonCm6yVKUg5zfPsVAiYwDu0/VKMVPLSh55Mvs9LT3bArqRZaB WFK+P/w6AGVRJMANKJTFbewcUoZlDpF+UEHz3eABzP7fHK931qgiUDn1LbDLG8HXIQm6u2 U5pUXG03Q83PTOGHHZ4G4h64JHl8mS0qxrdeQtcpgzZgzSFxrzWC64AJW77QRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzn22gDzXmp; Tue, 18 Nov 2025 00:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0pnOF044818; Tue, 18 Nov 2025 00:51:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pnud044815; Tue, 18 Nov 2025 00:51:49 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:49 GMT Message-Id: <202511180051.5AI0pnud044815@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: aabcb5d35b47 - stable/15 - sound: Retire snd_dbuf->dev List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: aabcb5d35b47d0c6fb4ed11a34dde3eec0434779 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=aabcb5d35b47d0c6fb4ed11a34dde3eec0434779 commit aabcb5d35b47d0c6fb4ed11a34dde3eec0434779 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:03 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Retire snd_dbuf->dev Redundant, and if we at some point really need this, we can fetch it from snd_dbuf->channel->dev. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53519 (cherry picked from commit 55540ebc33ad9a52bc4de121cb598243153981a8) --- sys/dev/sound/pcm/buffer.c | 5 ++--- sys/dev/sound/pcm/buffer.h | 3 +-- sys/dev/sound/pcm/channel.c | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index de535ec2dcba..0b77ab599aed 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -41,13 +41,12 @@ #include "snd_fxdiv_gen.h" struct snd_dbuf * -sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel) +sndbuf_create(char *drv, char *desc, struct pcm_channel *channel) { struct snd_dbuf *b; b = malloc(sizeof(*b), M_DEVBUF, M_WAITOK | M_ZERO); snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", drv, desc); - b->dev = dev; b->channel = channel; return b; @@ -72,7 +71,7 @@ sndbuf_setmap(void *arg, bus_dma_segment_t *segs, int nseg, int error) struct snd_dbuf *b = (struct snd_dbuf *)arg; if (snd_verbose > 3) { - device_printf(b->dev, "sndbuf_setmap %lx, %lx; ", + printf("sndbuf_setmap %lx, %lx; ", (u_long)segs[0].ds_addr, (u_long)segs[0].ds_len); printf("%p -> %lx\n", b->buf, (u_long)segs[0].ds_addr); } diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index 841bfb85af3c..eaca6d8f313d 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -31,7 +31,6 @@ #define SNDBUF_NAMELEN 48 struct snd_dbuf { - device_t dev; u_int8_t *buf, *tmpbuf; u_int8_t *shadbuf; /**< shadow buffer used w/ S_D_SILENCE/SKIP */ volatile int sl; /**< shadbuf ready length in # of bytes */ @@ -55,7 +54,7 @@ struct snd_dbuf { char name[SNDBUF_NAMELEN]; }; -struct snd_dbuf *sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel); +struct snd_dbuf *sndbuf_create(char *drv, char *desc, struct pcm_channel *channel); void sndbuf_destroy(struct snd_dbuf *b); void sndbuf_dump(struct snd_dbuf *b, char *s, u_int32_t what); diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 062eeb251a5b..e7c0779ea2df 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1269,8 +1269,8 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, goto fail; } - b = sndbuf_create(c->dev, c->name, "primary", c); - bs = sndbuf_create(c->dev, c->name, "secondary", c); + b = sndbuf_create(c->name, "primary", c); + bs = sndbuf_create(c->name, "secondary", c); if (b == NULL || bs == NULL) { device_printf(d->dev, "%s(): failed to create %s buffer\n", __func__, b == NULL ? "hardware" : "software"); From nobody Tue Nov 18 00:51:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzq04xZz6HGwT; Tue, 18 Nov 2025 00:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzp40Bdz3xVM; Tue, 18 Nov 2025 00:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YdmatD7/pcibVtBWM79hyD/IjMcWhoe9D+rxF5Z/S24=; b=lAUeu3DruJwDieSQWQDXvP3gbRP8K7j/qxUFg8dGu9ohKKrUh7yCR6sBkX6iX9hgrL+t8G yH9FA92QAarAlB/JuPUA8WD3egE8nE2iLzEz00qyJr1fBpeurc0Xg+vHsKAAqc+G6fDiyj W2R0L4j1DC+06/9lQVA5NGGDq8ldEHZ3AcK519wox8e1gisTQJG67ntC312L18Mzviiqe1 HfWYvVdPfIOq43pM0Dk2Oc4euJ2hq+ygTYSbcNrpdThTJ6JFuWLSqsJzu+6WN+rD29uGvy QajoNCOOCd2fBEnRb5nKliE1FLUd7mUVDDEaW19vrUdO6ILyYoVXTruDguobSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YdmatD7/pcibVtBWM79hyD/IjMcWhoe9D+rxF5Z/S24=; b=sbi24J0f/WaPYLQm0MEEB0RoRS41JPYqZ1m7opvjpPhq+itLsxIZKPdRHuAu/7GvAWrkux n8dTO0bqBx0qlhvg9WcgA3so0NPhACYHD9ooMMAtL4obEhW+ZU6FYeHqWta+1pH/Zka2cE 3sEmStOH8wUpFiHW17Mst5pad/mXyCSYjNnCTETyYASXeEAh+H+KU6X372p5/ToPHUOJVv FOC9PeBLqu5aCrvb+hl33eD6fVnzLdgDZHVXuLtlT6uar8mglrTAozJVvxexmPrsby+AUA gkP82YtOMCwy/9MYK7P02fYv2VfRhL5+AC+Q/d/Qt33paMxtK16Ai9pt/4djAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427110; a=rsa-sha256; cv=none; b=ezCDVUT9KKws92SjwGPJGQ+TaeH+gXlxxBVnuERRziYUHQbFJjX2/0aCZ6Nf3OCKZK+BUY 9IudM4Ayv8gD8mILMelhiPfaduNWNVnJTa356OiihQpUOFI7aP9cIjf0Bznshe9Mz/WU1Z Wy4/jiDTxlVIoel4XV0g/VNvawJdJWPbufCvKKyn7n81MGo1Glw4j7jH67ZfnIA5FuabJS xC21Q1WKHZ2xFSmVE9SkljzSRREBBpWeg3M6wAFBFWsWo75Bjomj2LSXeZ/i8zQSYRkwWu FHXyT+YynNz2aSbqKQapjlBiIwwgi7W2yxuKd4s4S4jvpnIVj6R/dCYNFnfoDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzp3JzlzXdK; Tue, 18 Nov 2025 00:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0poag044855; Tue, 18 Nov 2025 00:51:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0poJg044852; Tue, 18 Nov 2025 00:51:50 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:50 GMT Message-Id: <202511180051.5AI0poJg044852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 155f24992674 - stable/15 - sound: Re-arrange sndbuf_create() arguments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 155f24992674be5d04c7606c81b113fcec456a73 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=155f24992674be5d04c7606c81b113fcec456a73 commit 155f24992674be5d04c7606c81b113fcec456a73 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:07 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Re-arrange sndbuf_create() arguments Since we always use the channel name as the "drv" argument, we can just get rid of it and fetch it in sndbuf_create(). Also, put the "channel" argument first, as it is more intuitive. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53520 (cherry picked from commit 482d0d97885506a5eb2b1f2501f65e7e4fca6fdc) --- sys/dev/sound/pcm/buffer.c | 4 ++-- sys/dev/sound/pcm/buffer.h | 2 +- sys/dev/sound/pcm/channel.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index 0b77ab599aed..b162da97f9e2 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -41,12 +41,12 @@ #include "snd_fxdiv_gen.h" struct snd_dbuf * -sndbuf_create(char *drv, char *desc, struct pcm_channel *channel) +sndbuf_create(struct pcm_channel *channel, const char *desc) { struct snd_dbuf *b; b = malloc(sizeof(*b), M_DEVBUF, M_WAITOK | M_ZERO); - snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", drv, desc); + snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", channel->name, desc); b->channel = channel; return b; diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index eaca6d8f313d..329a41d0b0a5 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -54,7 +54,7 @@ struct snd_dbuf { char name[SNDBUF_NAMELEN]; }; -struct snd_dbuf *sndbuf_create(char *drv, char *desc, struct pcm_channel *channel); +struct snd_dbuf *sndbuf_create(struct pcm_channel *channel, const char *desc); void sndbuf_destroy(struct snd_dbuf *b); void sndbuf_dump(struct snd_dbuf *b, char *s, u_int32_t what); diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index e7c0779ea2df..749ee4d9cdba 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1269,8 +1269,8 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, goto fail; } - b = sndbuf_create(c->name, "primary", c); - bs = sndbuf_create(c->name, "secondary", c); + b = sndbuf_create(c, "primary"); + bs = sndbuf_create(c, "secondary"); if (b == NULL || bs == NULL) { device_printf(d->dev, "%s(): failed to create %s buffer\n", __func__, b == NULL ? "hardware" : "software"); From nobody Tue Nov 18 00:51:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzq5gsLz6HGwV; Tue, 18 Nov 2025 00:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzq4fY9z3xHg; Tue, 18 Nov 2025 00:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=njo7nTn1Zg6JwRumhA4U7jDoEDa6pFxC6kqH8qzXD2w=; b=igHJEOpJGkkEc9HBLhhvfuG0wzpWYz/VA9sbEoNkklTGZ/F8psDNnHMgn/LSQvhpNHal9V LbWvu4VlSy+KX6oJydbjD/1GCqVRfsIj0d00D0n/HvFGYgAZ5BeaDpFMyp32vGZBUhUOOf 7nu66cCPbsMWJwXUera55kXCn2RfE8gxAgkimY5FXJ3+yqamVxHLzUBqbFvKqcyFiDIO16 0g4LU0SSuychIct0jZaVocvYsv17ucQYwhMBnjmk3tr+Ew7+RDevnEODvFQbFBHfdjfoQv t1MAqy5ysftB0GLHTpmamdF6rX8y0SIMWKOHsnuIr+ZveEEpbj9qat8yO+RUJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=njo7nTn1Zg6JwRumhA4U7jDoEDa6pFxC6kqH8qzXD2w=; b=yxhNNQWvrTP4qXgTQzXmBKT843je6yTknd3wIPIAZo40DeF+bFi28jJ3P1hdKEOcR5UZ3j PqStp+OwdXdltkOJadr23drHx+hR+dOz0wmHalskaxQ9XlwmqxSvICLqiFWtBLbkuzW0Jt 8X2rl2vgM4qMAxRVtONcxb48fZII9Ur16aTEQk1lDZp3wvjpH9oA3cvgIiw4dT6ACoZZGz /hBe6kLQwu86VB7SyA5w77qj1DGTYi7ZlgiI0fe4+WXWCzYbc43KpPsE4PE0qP2xjP8voZ 5wPrBZoxls2OaIUHOQXFe2X/NtTu0/Fk7pH4LQzhFgaHkmQV08w/ratcLRonlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427111; a=rsa-sha256; cv=none; b=oqn5hZpUDM3AYz70F5lY+wGsKf0r6kbzl9SzJBsI76etTQ2M4d+DvNvQvQXUh2gHOUAX2Q Gq39gV40Hi1YJu/BmPopJUUrbVQUB/v/iNmeJcAq7GQqZ8xCsvCogoyEuwFbD7OBPPrNCw W6GiCQqaEy2NS8JMr+i3nZ16QvdUZo0jfNGr8C1f9fV5m5S0yQ9wHBfPNQNnduB4+pdGsV XoPVQIFP/CtmICW2dVERfBfwVh3yuYbNLY/VQxtNWJUq9+HwqFvsumPh0f+G5ZaPZj9E+t bZW1N7LxFKtSuD2GNDgIw8Oq+B0Bm2XbRGsvHprfdOI1h71HilD3UKYT1gamOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzq4FJTzXhC; Tue, 18 Nov 2025 00:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0ppn1044889; Tue, 18 Nov 2025 00:51:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0ppO4044886; Tue, 18 Nov 2025 00:51:51 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:51 GMT Message-Id: <202511180051.5AI0ppO4044886@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 7ac082ff1ad9 - stable/15 - sound: Define SNDBUF_F_MANAGED as 0x00000001 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7ac082ff1ad9fec8322f3ba1c8fe8444a3cd65ea Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7ac082ff1ad9fec8322f3ba1c8fe8444a3cd65ea commit 7ac082ff1ad9fec8322f3ba1c8fe8444a3cd65ea Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:12 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Define SNDBUF_F_MANAGED as 0x00000001 It's the only flag anyway. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D53521 (cherry picked from commit d159b023de52570800d5a5292318de4bce3c9978) --- sys/dev/sound/pcm/buffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index 329a41d0b0a5..1e1cfd570b36 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ -#define SNDBUF_F_MANAGED 0x00000008 +#define SNDBUF_F_MANAGED 0x00000001 #define SNDBUF_NAMELEN 48 From nobody Tue Nov 18 00:51:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzs3XB0z6HGyx; Tue, 18 Nov 2025 00:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzr5YPkz3xSm; Tue, 18 Nov 2025 00:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G7cAdxZdIYBVmruBM/yyjfSP7Dz41gzn+4G9CvCjbBM=; b=mVcpsM4DsUiX/C9m7GgDWnDQI88H+/REsZ4jWpyksvjbUjAIwCjdIFMv7+vkY4VW25+Qpj exchXFNT0Ri13SfXpTvBPiu9CwmNYnLCCAUM5aVO96VIyvwTKz3ldETfcc9gc5Iqnlf7ao WoVDP3y3sbfqrqLR8xIwMICnIRUIc7DbY3l8vmjZlCp1i+XDDBsh8yuxIhz50G8EYa1Mqj NYHkT9w1Ascvlraczk5lJdz1ytuluNOuilX5AtHz8IcfLMvsr9Eqfglku6+bXoyd+W/Zhr 6MglH60KMWB/H0YR1f2DVH30XgHM99Y41Z1ZGnRSqClNZnbjDvzGorzomBuPhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G7cAdxZdIYBVmruBM/yyjfSP7Dz41gzn+4G9CvCjbBM=; b=Jn+O0xiU/+ZHCKX1USg6KAVqMFoSbs5ZTp2XfKBFuY+Ilaktkjz6fYp+fpFC8lG2rX3pxu 48QIMdRuE/sGSnGRlG7o03fC8wX4foX/zSCbPESGIcEykev/H0bFdDA68Fy9lWZEuB7RXC 3Tvo0JshS9wFslm1K+e6/0VBX9DbgzvKSIbGLcMBPNnrcwwBJY1kyGzw60NRcS0rORrdTX OXEV72+CMKl12NOilWZw1wZ/Ab3qb0IdvdTlNPGg336dIGrBagdw7srrbFEq7yTbxUKQel 50DPHq9BhxV30t4bNECioH64H/K65g1xNZGiCF7KltTTo2/X3c5qM4YW8Ai7kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427112; a=rsa-sha256; cv=none; b=RQq6/LogB1i/ngxbcb/lgogLhftrTmbIsz23oL27bU0suYF5aMMZjds33ZXBEPFIZKcqto VfGOCL5kI2tZ67HdODA3Q2K/HWbmv0ftBf0zYYXuWK7ITq3b4KeCbT6XUtGEQw8QXkohFj 1dnvbr+hEsmPJQhZX0ReHuGur8OBhz/O7fy0Qmj85aaPfSBeSuQsJYEWRrOH2MSDbwXufe eMmzBFhIoZGFv8Z4RuI67eB2mIH9yIbyP5/9JIBM017BsPdRBUiFveQ92CGHzR6OUhTKTl 80CVRcZlBMXb0TRTbjAJBe+DzDAO7JGXXDpsRVcO71g80ocJwQ7dQ1i/8SwAoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzr57zhzXmq; Tue, 18 Nov 2025 00:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0pqnD044924; Tue, 18 Nov 2025 00:51:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pqLe044921; Tue, 18 Nov 2025 00:51:52 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:52 GMT Message-Id: <202511180051.5AI0pqLe044921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 6bb6be4eef58 - stable/15 - sound: Retire unused sndbuf_dump() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6bb6be4eef581a68e710087f7f2706fb2cbf4db0 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=6bb6be4eef581a68e710087f7f2706fb2cbf4db0 commit 6bb6be4eef581a68e710087f7f2706fb2cbf4db0 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:16 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Retire unused sndbuf_dump() Fixes: e4e61333ffa4e90360de2dd1e4e0146f7cbf0afb Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D53522 (cherry picked from commit 6d6eb25d0b19443089749e288f091bf26fc58f70) --- sys/dev/sound/pcm/buffer.c | 20 -------------------- sys/dev/sound/pcm/buffer.h | 2 -- 2 files changed, 22 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index b162da97f9e2..ab3c8d447b21 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -694,26 +694,6 @@ sndbuf_feed(struct snd_dbuf *from, struct snd_dbuf *to, struct pcm_channel *chan return (0); } -/************************************************************/ - -void -sndbuf_dump(struct snd_dbuf *b, char *s, u_int32_t what) -{ - printf("%s: [", s); - if (what & 0x01) - printf(" bufsize: %d, maxsize: %d", b->bufsize, b->maxsize); - if (what & 0x02) - printf(" dl: %d, rp: %d, rl: %d, hp: %d", b->dl, b->rp, b->rl, b->hp); - if (what & 0x04) - printf(" total: %ju, prev_total: %ju, xrun: %d", (uintmax_t)b->total, (uintmax_t)b->prev_total, b->xrun); - if (what & 0x08) - printf(" fmt: 0x%x, spd: %d", b->fmt, b->spd); - if (what & 0x10) - printf(" blksz: %d, blkcnt: %d, flags: 0x%x", b->blksz, b->blkcnt, b->flags); - printf(" ]\n"); -} - -/************************************************************/ u_int32_t sndbuf_getflags(struct snd_dbuf *b) { diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index 1e1cfd570b36..6c16c0c1f2d5 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -57,8 +57,6 @@ struct snd_dbuf { struct snd_dbuf *sndbuf_create(struct pcm_channel *channel, const char *desc); void sndbuf_destroy(struct snd_dbuf *b); -void sndbuf_dump(struct snd_dbuf *b, char *s, u_int32_t what); - int sndbuf_alloc(struct snd_dbuf *b, bus_dma_tag_t dmatag, int dmaflags, unsigned int size); int sndbuf_setup(struct snd_dbuf *b, void *buf, unsigned int size); void sndbuf_free(struct snd_dbuf *b); From nobody Tue Nov 18 00:51:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzt0f4nz6HGkn; Tue, 18 Nov 2025 00:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzs6SC8z3xR9; Tue, 18 Nov 2025 00:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4HwRFIurN3TtsdJZYV3JViNPuUVwyHdlnNMtFiEoC4=; b=eR6ya7WwHCc8wIyEE0/gs1TCzo7tZ94yP/+nvTzZ5ZDeLZlU29iDHVil7B6/kAfa17HQ4P 7mzEu31DLqSh4hyi/5pPHdxHEVeUHeFCSzG4Hvre8QYiqCmVF3fO0AvfDb3eoN6xS4pa3W dH35C98lOJe64QVuP9I1E5WejtjTIRPS7jRf4NR9z53Qg0PeAWBIgoRHrLwcJ/HE8OI2V8 25dly9it5m0dVD9t8Js1KVR+6wC+p+KrUrvCPCplNE9HigGveJYwDE2qLT0mFQAxinZX30 Q4m7b9zGHEBAy857W7GYIkDwBY/Pib05qPgTN/j1XrMmjN85ZnCcpRPEa+oufA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4HwRFIurN3TtsdJZYV3JViNPuUVwyHdlnNMtFiEoC4=; b=A556nXLW733EySpkwGwgI8OdifXYt9cJnOykwPF1uykzlL4NS4eAssVQ0hVxbG/1SSnDZk If2TJthmT5DU1S79wJGnLT9j1ymx/XDSFq+6U0tvg82CQ2ZV8vWa/bcM7r4sG70t6uZehI +WHVEwHu38bqIhpRCkBG7cJf/tKkCYnVWeKqeMw9y90b5Ev6yYAuAJpvu5Eu16ogfNiy9Z N6DeGN1HFcJNkNmy7nkL6BfFDbGSjaWgX2MgoXKUqhAumFGHduU0iWBqma/Y/C9ZoiNhwq Boo11d9Ot4I58F0HROKTUHug02Nd2BfS/PWBBe4iTjW/GxHrXxKRQLui1zVy5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427113; a=rsa-sha256; cv=none; b=gz6yJxlFb3RRG/12Ai/gwpC6qo7OvJ/jUnDflmYj6zLEyjSyxuJgsf3+m+s1XgvQkiHb+J o3Cw7uGnP3BPx6uFvG1Fa8xbgOxU3W9y0kxZ+FOq+t+QezitocCJr0gBSYtDDmv0nvFM1t 2PiPc3Be2h708pz0UElB98SLfy1UAcSmurZwTkvA0rSpMTkNUdfRcACirkpri8Ra/mvomW vroD1FHDYeg58MKy2TWOQV7XNVNdPvmF0pg8RirGp6T9KwsTWY76Axy0PovAZnp2vksONd GvN4AOqpQpKkEit8eBasrNMMz18amdkvSTnPWxfxDoTAPMZBaweSqwWJJI4fPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzs5z6RzXhD; Tue, 18 Nov 2025 00:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0prO5044961; Tue, 18 Nov 2025 00:51:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0prD1044958; Tue, 18 Nov 2025 00:51:53 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:53 GMT Message-Id: <202511180051.5AI0prD1044958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 418c7be1760d - stable/15 - sound: Retire unused sndbuf_getflags() and sndbuf_setflags() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 418c7be1760df3b004e04361333e9b2c8e12be98 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=418c7be1760df3b004e04361333e9b2c8e12be98 commit 418c7be1760df3b004e04361333e9b2c8e12be98 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:20 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Retire unused sndbuf_getflags() and sndbuf_setflags() Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53525 (cherry picked from commit 06eb65e11d7a66caec358966dcf892c9f4c2e411) --- sys/dev/sound/pcm/buffer.c | 14 -------------- sys/dev/sound/pcm/buffer.h | 3 --- 2 files changed, 17 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index ab3c8d447b21..e3d2f27f9f81 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -694,20 +694,6 @@ sndbuf_feed(struct snd_dbuf *from, struct snd_dbuf *to, struct pcm_channel *chan return (0); } -u_int32_t -sndbuf_getflags(struct snd_dbuf *b) -{ - return b->flags; -} - -void -sndbuf_setflags(struct snd_dbuf *b, u_int32_t flags, int on) -{ - b->flags &= ~flags; - if (on) - b->flags |= flags; -} - /** * @brief Clear the shadow buffer by filling with samples equal to zero. * diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index 6c16c0c1f2d5..421db261566d 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -111,9 +111,6 @@ int sndbuf_acquire(struct snd_dbuf *b, u_int8_t *from, unsigned int count); int sndbuf_dispose(struct snd_dbuf *b, u_int8_t *to, unsigned int count); int sndbuf_feed(struct snd_dbuf *from, struct snd_dbuf *to, struct pcm_channel *channel, struct pcm_feeder *feeder, unsigned int count); -u_int32_t sndbuf_getflags(struct snd_dbuf *b); -void sndbuf_setflags(struct snd_dbuf *b, u_int32_t flags, int on); - #ifdef OSSV4_EXPERIMENT void sndbuf_getpeaks(struct snd_dbuf *b, int *lp, int *rp); #endif From nobody Tue Nov 18 00:51:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzv3968z6HH1n; Tue, 18 Nov 2025 00:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzt7457z3xnW; Tue, 18 Nov 2025 00:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LSXZPcS8Hu/B+cM23OKQMtS627JVkpbeY0Z7yAAENfg=; b=JbmJaiBviCJUHytUmljs0P8YR4A9JSdmWHYi52wBv9cA0x4KdZ6V9K7eq5CtuqTItfh4sQ 0CdbCQEiGdX0vywAF4ln3ygW7+jsv7KpR+6xuSX3NoQaOWi+vIIimCg/QyVXbH5WTYInCr PIVYwlc9WrmEmpTWaObEDDTusfWfaJkmhgPvEsxGCPThQjecJeIrJ+RMvosiazIBtbPoAA FzhPkKDh00L/BA1+LvVAZYT3RokEMTwMNlP2ZHrVPYpaGZy9veYLmMSuwuADlTaYPLMOMA gqDnqm1HNI1PBWWKQgfTQ2Ch6zz+Szqb4rpP6zV5fErBG9f1dcj9FFvidkAM/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LSXZPcS8Hu/B+cM23OKQMtS627JVkpbeY0Z7yAAENfg=; b=vM+srSrUArAE7HvffxGHPE1ueYxjbytPvY+4b/XFx/Cqwe3Lyp5NIoyM2s/gi81erkc7KN 0Va2r3+dlG+CKvuaqoQEnNH/PKeLH9U1JetgKrcToNgbSNQaKXq8Ot6/sHWmI+MzzI2R/8 p9YDINm/pU12VvMOg86OSOgLwt1bnvRRBSOL0GXaJu/1ggnWnjdsToIStPO+yxODMNls5Q jkWqTUmxf6U/pRXv6XX9uHyxS35TSWKP7H94yTFPVS35WiiV+vwcdabW92yzF8d4YhRdYk dN1NR2Q88p1T8wYA1fZWemdyf4Iy92GDnpIOWdnsYljnW5JJQHhlmggN90uFvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427115; a=rsa-sha256; cv=none; b=bXEroekdni5W0zM0GgUSKxGIdWXLxZ1k3hD01oSooeeCgQG2SGMQUrEqGym7VD0beICqdh yxOHZejS7fDMwB9RAsyBCAYhai54umOoiiMsicP502VbY2bK8f9LLe3M1GCC2WW6GhEMje UFcQAIbQReIBO9ETaKy+KtztudaTx752hasGpE3p39d/Mab5bb9TeF0i6G6OqbcWPMoh0m OxIFyLuImHqKSNQsGcZQFnXBYW6giGH1g8O654+YApV7oFNoWghxOXNR5XqTWXZZTiu6fm 4g7uh9rJ5sEYWwlgbtVNh30UA/HunikzZOlsXSMVEfU0nnbKoNLbvDUpDxQL3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzt6dLhzXmr; Tue, 18 Nov 2025 00:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0psln045000; Tue, 18 Nov 2025 00:51:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0psSL044997; Tue, 18 Nov 2025 00:51:54 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:54 GMT Message-Id: <202511180051.5AI0psSL044997@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: d5024179b8dd - stable/15 - sound: Simplify sndbuf_clear() loop List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d5024179b8dd1c1779adff1c762f6f6c0abae557 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d5024179b8dd1c1779adff1c762f6f6c0abae557 commit d5024179b8dd1c1779adff1c762f6f6c0abae557 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:24 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Simplify sndbuf_clear() loop Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53526 (cherry picked from commit c0e96595a4da90d890be88881a5dc3381da59dd7) --- sys/dev/sound/pcm/buffer.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index e3d2f27f9f81..0cfa04fc3167 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -276,16 +276,10 @@ sndbuf_clear(struct snd_dbuf *b, unsigned int length) length = b->bufsize; data = sndbuf_zerodata(b->fmt); - i = sndbuf_getfreeptr(b); p = sndbuf_getbuf(b); - while (length > 0) { - p[i] = data; - length--; - i++; - if (i >= b->bufsize) - i = 0; - } + for (; length > 0; length--, i++) + p[i % b->bufsize] = data; } /** From nobody Tue Nov 18 00:51:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzw5fVyz6HH07; Tue, 18 Nov 2025 00:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzw1Nycz3xYX; Tue, 18 Nov 2025 00:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pQBgQTaPyc9Kmwgzw1jg2PU4yHYG+S8EKwm4X1DnTF4=; b=ZEYMsRO29/YXaHRdDESbgV2YnT0NedaGron9zOy3pz6sy7oFLRl/Rms2ccypRCz0NP+0y6 0dzkKjtE7Psj9nHGmT2VY+pAzOseP2CAgDELq1CSdXYhr+ApTLWGULdqjEilEMCG0eKGz9 TJHTIJyjM7W7F4fIQ89blIhh0B1kwByXSpsld+3R+sa3RNDubsZQEP2KX0yvphwFjdXFAn PVcrd7KHBZBr9dKTT5+VMma/pbNh9uQgnzGKifFzAcFymj3C4SjxHWkFqLwLhh2Cy7VHov kt/hugWBspvDtw7WPCXfnywXYAZh8RCMVvU0X74C1p3h2QJDTw+ZRmYcwrQ+bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pQBgQTaPyc9Kmwgzw1jg2PU4yHYG+S8EKwm4X1DnTF4=; b=jYZKtBnHbpbLRuDLwfWt6iuR2fXFt1EaEwuIwm0p4RZGCgdECUtxHhABnHCeoObd8aTBBJ m3xsvq2/j7J37N7bYOkoZ5C/OywmEuASglVg6fOm/RTXrFsypxG2KT4RBB0oTXVWvU9Nkl NfIO58jFoLsJySjSR/8yfzi1IrTOpOa5d1Mv6e8L/1p1qTU5u9nwPVb9KxjyRtI1OIyZwq K9KdQFTyaZzyRK6pmtEFg7MbsH51Lx0ymLgRSxoYGWzIZr8TvO+y3issYjhgteim/ydMT3 0b53+YXtvTVVboTPIsGsGBiVKRb1ocEBbN6o3NIMMNFxm2HH/JUYrGaGO3M2lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427116; a=rsa-sha256; cv=none; b=Y1c6/1rSyijhQd+qVhvikEkVUD/L91sajdG+JPWSNS1MRNRdA5DB8Eor4+FJVr3Y2G9lxy hBKRMfkKiQWGMpA7j5WB1+u7+LREvIRViQBzzeTFwLfyt+pld4LLJlQmODbt5N5fIqOhkC Kwj+Tx7lVw3tBZkeo4tZwh+wlnoP08ydNiJcM8s/CpNCy/TX+y5Evq0/u6FYmUSA6XbwEC mJ4vL+Pzf6dEq8/9hk/8Cx8Qou+ZC07aOVRVCJOuCoxH7R/p5fIcpRl3vwk9SKKiAbNb+Z fYrG/cOjhToyaiTkfVOXHN6TCQobmdlqj+ML4sfeuWvH5UYREvSLnXTglQUvXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzw0nHCzY9P; Tue, 18 Nov 2025 00:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0puko045043; Tue, 18 Nov 2025 00:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pujX045040; Tue, 18 Nov 2025 00:51:56 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:56 GMT Message-Id: <202511180051.5AI0pujX045040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 7ed840e33127 - stable/15 - sound: Remove redundant sndbuf_free() in chn_kill() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7ed840e33127296d31b1098372aa6a23a7518fe5 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7ed840e33127296d31b1098372aa6a23a7518fe5 commit 7ed840e33127296d31b1098372aa6a23a7518fe5 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:30 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Remove redundant sndbuf_free() in chn_kill() If b exists, it will get destroyed by sndbuf_destroy() (which calls sndbuf_free()) a few lines below, so the additional sndbuf_free() here is redundant. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53527 (cherry picked from commit ad28c6a13a45746f32cbc832b3fe58748fae0d19) --- sys/dev/sound/pcm/channel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 749ee4d9cdba..54d8976d46bf 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1373,8 +1373,8 @@ chn_kill(struct pcm_channel *c) } free_unr(chn_getunr(d, c->type), c->unit); feeder_remove(c); - if (c->devinfo && CHANNEL_FREE(c->methods, c->devinfo)) - sndbuf_free(b); + if (c->devinfo) + CHANNEL_FREE(c->methods, c->devinfo); if (bs) { knlist_clear(&bs->sel.si_note, 0); knlist_destroy(&bs->sel.si_note); From nobody Tue Nov 18 00:51:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzx3vKwz6HGhp; Tue, 18 Nov 2025 00:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzx2F2Xz3xnp; Tue, 18 Nov 2025 00:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tadKTGwadEG1a98fuADK57E2rrIwheh/Dg8iKi0WS+o=; b=U33Sbn/TkiViQCB2Tz5K77TbLuZuEZdmTXNLKgkA9GD/wH5Erkzrzn7/7ip8KSgbxszcB1 tsGr0mqvHeWKK4vfUKSWgu9RnYgqEEBpit1za8pB5zqsEIGEVHkZpEiR42wKXd0+7oz7UB qInNzhitHUBbDli2KC7zdDHkl7pY2D07SKfIR0C9pSXTdMxLQqUFT6u+JVVBhe/a/b4iQm D//FP0nOFf/3PVletDUdIQogRyDUCA9mseFI0w8ZPNvmr5M1PfaMfco2fqC/iDOZVQs5vZ P+4vQmNshTVX1PISHw0c6Vna0+dHiU/s7lijTU+EbQIj2ZPiSDbwcyWQgRq/PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tadKTGwadEG1a98fuADK57E2rrIwheh/Dg8iKi0WS+o=; b=SJR2X5EJ3501fiIIwuXoSgJDXpqWJyoLvP7CK6J2f+5bQeRWAHNH25Yh0qKcRC11QiRF4s uRLwqqvlHnDGkwQVtxKcdb2pIAAt6R7abaoqr33Uvmycuv0uUsA/gRAUzxEOfVtYsrPYq6 0SPn/Kh79D2MH5OgeWbDVHH4WVRBwiufbhJsSqQ29WwzX+Sb4kTHUQ7xEgUGj8/pFsx1/Z 3wBe3pObLYPyBpH7Tlr0An0moiRT2pE5FtFsgkKYRQ0obmXduZMKDxmY2SdjRH2XvlVH/9 BQzCX/si1+2UXjIVfDQB9YqcugCBpr5kFU0ckaxi2NRp4rGtsI95ukNYy0xq4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427117; a=rsa-sha256; cv=none; b=T49TnUeRDf3QR9K0ieoWY2sWLlTQFhx4y0+Tb1BgXJiv3+XosHLJM+LzqMsGrQQsjCDD2G YG+lBwPvE9N29T7FBTXbp+/R9h8iQYb9O3MLqYAZskGKwucKqzRyFMlH+K5N/OOFLq7bsk qryg2Y6wD+DEBFxcKwAgbj77HndvjUPzIp125JMZ2yZep4d5gLomX5uYv8W9hGf2/mgGls XA4hSkceGbg+AJ5iuz0MrwNgpSwmkZFSYV3nA0amywoMBffZnrgq1vTLe0SJFoyraZEzr1 1PSveTYGWKsmTDldvns0+vDfGGr2v+U1mRijYVfDI8OpNzS02nD9EC8uNIlgLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzx1gJGzXhG; Tue, 18 Nov 2025 00:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0pvOm045081; Tue, 18 Nov 2025 00:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pvLK045078; Tue, 18 Nov 2025 00:51:57 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:57 GMT Message-Id: <202511180051.5AI0pvLK045078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 1d9f05bd46bc - stable/15 - sound: Get rid of useless sndbuf getters and setters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1d9f05bd46bc496d695ed883274ee599fdde5538 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=1d9f05bd46bc496d695ed883274ee599fdde5538 commit 1d9f05bd46bc496d695ed883274ee599fdde5538 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:34 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Get rid of useless sndbuf getters and setters No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53528 (cherry picked from commit 78c5026ae13b2d30b479f9bc892ecdb6f5a5bc0b) --- sys/arm/allwinner/a10_codec.c | 2 +- sys/arm/allwinner/aw_i2s.c | 8 +- sys/arm/broadcom/bcm2835/bcm2835_audio.c | 9 +- sys/arm/freescale/imx/imx6_ssi.c | 10 +-- sys/arm/freescale/vybrid/vf_sai.c | 2 +- sys/arm64/rockchip/rk_i2s.c | 8 +- sys/dev/sound/dummy.c | 8 +- sys/dev/sound/fdt/audio_soc.c | 2 +- sys/dev/sound/macio/aoa.c | 4 +- sys/dev/sound/pci/als4000.c | 10 +-- sys/dev/sound/pci/atiixp.c | 25 +++--- sys/dev/sound/pci/cmi.c | 6 +- sys/dev/sound/pci/cs4281.c | 8 +- sys/dev/sound/pci/csapcm.c | 8 +- sys/dev/sound/pci/emu10k1.c | 8 +- sys/dev/sound/pci/emu10kx-pcm.c | 12 +-- sys/dev/sound/pci/es137x.c | 24 +++--- sys/dev/sound/pci/fm801.c | 2 +- sys/dev/sound/pci/hda/hdaa.c | 18 ++-- sys/dev/sound/pci/hdsp-pcm.c | 2 +- sys/dev/sound/pci/hdspe-pcm.c | 2 +- sys/dev/sound/pci/ich.c | 16 ++-- sys/dev/sound/pci/maestro3.c | 20 ++--- sys/dev/sound/pci/neomagic.c | 2 +- sys/dev/sound/pci/solo.c | 3 +- sys/dev/sound/pci/t4dwave.c | 10 +-- sys/dev/sound/pci/via8233.c | 26 +++--- sys/dev/sound/pci/via82c686.c | 6 +- sys/dev/sound/pci/vibes.c | 12 +-- sys/dev/sound/pcm/buffer.c | 144 ++----------------------------- sys/dev/sound/pcm/buffer.h | 22 ----- sys/dev/sound/pcm/channel.c | 133 ++++++++++++++-------------- sys/dev/sound/pcm/dsp.c | 44 +++++----- sys/dev/sound/pcm/feeder.c | 8 +- sys/dev/sound/pcm/feeder_chain.c | 4 +- sys/dev/sound/pcm/feeder_mixer.c | 14 +-- sys/dev/sound/pcm/sndstat.c | 55 ++++++------ sys/dev/sound/pcm/vchan.c | 4 +- sys/dev/sound/pcm/vchan.h | 4 +- 39 files changed, 272 insertions(+), 433 deletions(-) diff --git a/sys/arm/allwinner/a10_codec.c b/sys/arm/allwinner/a10_codec.c index 12d389d24243..0a4ba7aa31b2 100644 --- a/sys/arm/allwinner/a10_codec.c +++ b/sys/arm/allwinner/a10_codec.c @@ -680,7 +680,7 @@ a10codec_dmaintr(void *priv) struct a10codec_chinfo *ch = priv; unsigned bufsize; - bufsize = sndbuf_getsize(ch->buffer); + bufsize = ch->buffer->bufsize; ch->pos += ch->blocksize; if (ch->pos >= bufsize) diff --git a/sys/arm/allwinner/aw_i2s.c b/sys/arm/allwinner/aw_i2s.c index 87dfb109363f..31c6d9854171 100644 --- a/sys/arm/allwinner/aw_i2s.c +++ b/sys/arm/allwinner/aw_i2s.c @@ -530,10 +530,10 @@ aw_i2s_dai_intr(device_t dev, struct snd_dbuf *play_buf, struct snd_dbuf *rec_bu val = I2S_READ(sc, DA_FSTA); empty = DA_FSTA_TXE_CNT(val); count = sndbuf_getready(play_buf); - size = sndbuf_getsize(play_buf); + size = play_buf->bufsize; readyptr = sndbuf_getreadyptr(play_buf); - samples = (uint8_t*)sndbuf_getbuf(play_buf); + samples = play_buf->buf; written = 0; if (empty > count / 2) empty = count / 2; @@ -556,9 +556,9 @@ aw_i2s_dai_intr(device_t dev, struct snd_dbuf *play_buf, struct snd_dbuf *rec_bu available = DA_FSTA_RXA_CNT(val); count = sndbuf_getfree(rec_buf); - size = sndbuf_getsize(rec_buf); + size = rec_buf->bufsize; freeptr = sndbuf_getfreeptr(rec_buf); - samples = (uint8_t*)sndbuf_getbuf(rec_buf); + samples = rec_buf->buf; recorded = 0; if (available > count / 2) available = count / 2; diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c index 13f309dd3f11..4b138de58238 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -537,7 +537,7 @@ bcm2835_audio_worker(void *data) continue; count = sndbuf_getready(ch->buffer); - size = sndbuf_getsize(ch->buffer); + size = ch->buffer->bufsize; readyptr = sndbuf_getreadyptr(ch->buffer); BCM2835_AUDIO_LOCK(sc); @@ -550,11 +550,12 @@ bcm2835_audio_worker(void *data) if (count < VCHIQ_AUDIO_PACKET_SIZE) continue; - buf = (uint8_t*)sndbuf_getbuf(ch->buffer) + readyptr; + buf = ch->buffer->buf + readyptr; bcm2835_audio_write_samples(ch, buf, count); BCM2835_AUDIO_LOCK(sc); - ch->unsubmittedptr = (ch->unsubmittedptr + count) % sndbuf_getsize(ch->buffer); + ch->unsubmittedptr = (ch->unsubmittedptr + count) % + ch->buffer->bufsize; ch->available_space -= count; ch->submitted_samples += count; KASSERT(ch->available_space >= 0, ("ch->available_space == %d\n", ch->available_space)); @@ -623,7 +624,7 @@ bcmchan_free(kobj_t obj, void *data) struct bcm2835_audio_chinfo *ch = data; void *buffer; - buffer = sndbuf_getbuf(ch->buffer); + buffer = ch->buffer->buf; if (buffer) free(buffer, M_DEVBUF); diff --git a/sys/arm/freescale/imx/imx6_ssi.c b/sys/arm/freescale/imx/imx6_ssi.c index cb77f1454e63..5a0e671f15a2 100644 --- a/sys/arm/freescale/imx/imx6_ssi.c +++ b/sys/arm/freescale/imx/imx6_ssi.c @@ -398,7 +398,7 @@ ssichan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) setup_dma(scp); - return (sndbuf_getblksz(ch->buffer)); + return (ch->buffer->blksz); } uint32_t @@ -415,7 +415,7 @@ ssi_dma_intr(void *arg, int chn) sc = scp->sc; conf = sc->conf; - bufsize = sndbuf_getsize(ch->buffer); + bufsize = ch->buffer->bufsize; sc->pos += conf->period; if (sc->pos >= bufsize) @@ -487,8 +487,8 @@ setup_dma(struct sc_pcminfo *scp) conf->saddr = sc->buf_base_phys; conf->daddr = rman_get_start(sc->res[0]) + SSI_STX0; conf->event = sc->sdma_ev_tx; /* SDMA TX event */ - conf->period = sndbuf_getblksz(ch->buffer); - conf->num_bd = sndbuf_getblkcnt(ch->buffer); + conf->period = ch->buffer->blksz; + conf->num_bd = ch->buffer->blkcnt; /* * Word Length @@ -497,7 +497,7 @@ setup_dma(struct sc_pcminfo *scp) * SSI supports 24 at max. */ - fmt = sndbuf_getfmt(ch->buffer); + fmt = ch->buffer->fmt; if (fmt & AFMT_16BIT) { conf->word_length = 16; diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c index e895529c4810..9c0125768fee 100644 --- a/sys/arm/freescale/vybrid/vf_sai.c +++ b/sys/arm/freescale/vybrid/vf_sai.c @@ -369,7 +369,7 @@ saichan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) sndbuf_resize(ch->buffer, sc->dma_size / blocksize, blocksize); - sc->period = sndbuf_getblksz(ch->buffer); + sc->period = ch->buffer->blksz; return (sc->period); } diff --git a/sys/arm64/rockchip/rk_i2s.c b/sys/arm64/rockchip/rk_i2s.c index 5f1b6bbdeabf..856fa20e6ce4 100644 --- a/sys/arm64/rockchip/rk_i2s.c +++ b/sys/arm64/rockchip/rk_i2s.c @@ -403,10 +403,10 @@ rk_i2s_dai_intr(device_t dev, struct snd_dbuf *play_buf, struct snd_dbuf *rec_bu count = sndbuf_getready(play_buf); if (count > FIFO_SIZE - 1) count = FIFO_SIZE - 1; - size = sndbuf_getsize(play_buf); + size = play_buf->bufsize; readyptr = sndbuf_getreadyptr(play_buf); - samples = (uint8_t*)sndbuf_getbuf(play_buf); + samples = play_buf->buf; written = 0; for (; level < count; level++) { val = (samples[readyptr++ % size] << 0); @@ -426,9 +426,9 @@ rk_i2s_dai_intr(device_t dev, struct snd_dbuf *play_buf, struct snd_dbuf *rec_bu uint8_t *samples; uint32_t count, size, freeptr, recorded; count = sndbuf_getfree(rec_buf); - size = sndbuf_getsize(rec_buf); + size = rec_buf->bufsize; freeptr = sndbuf_getfreeptr(rec_buf); - samples = (uint8_t*)sndbuf_getbuf(rec_buf); + samples = rec_buf->buf; recorded = 0; if (level > count / 4) level = count / 4; diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 39214a141bf9..0a2717ec418c 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -105,8 +105,8 @@ dummy_chan_io(void *arg) if (!ch->run) continue; if (ch->dir == PCMDIR_PLAY) { - ch->ptr += sndbuf_getblksz(ch->buf); - ch->ptr %= sndbuf_getsize(ch->buf); + ch->ptr += ch->buf->blksz; + ch->ptr %= ch->buf->bufsize; } else sndbuf_fillsilence(ch->buf); snd_mtxunlock(sc->lock); @@ -123,7 +123,7 @@ dummy_chan_free(kobj_t obj, void *data) struct dummy_chan *ch =data; uint8_t *buf; - buf = sndbuf_getbuf(ch->buf); + buf = ch->buf->buf; if (buf != NULL) free(buf, M_DEVBUF); @@ -190,7 +190,7 @@ dummy_chan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) { struct dummy_chan *ch = data; - return (sndbuf_getblksz(ch->buf)); + return (ch->buf->blksz); } static int diff --git a/sys/dev/sound/fdt/audio_soc.c b/sys/dev/sound/fdt/audio_soc.c index c2bdea399364..84867cb3d781 100644 --- a/sys/dev/sound/fdt/audio_soc.c +++ b/sys/dev/sound/fdt/audio_soc.c @@ -249,7 +249,7 @@ audio_soc_chan_free(kobj_t obj, void *data) ausoc_chan = (struct audio_soc_channel *)data; - buffer = sndbuf_getbuf(ausoc_chan->buf); + buffer = ausoc_chan->buf->buf; if (buffer) free(buffer, M_DEVBUF); diff --git a/sys/dev/sound/macio/aoa.c b/sys/dev/sound/macio/aoa.c index 9861bbd92a0c..e0a6206c19a6 100644 --- a/sys/dev/sound/macio/aoa.c +++ b/sys/dev/sound/macio/aoa.c @@ -73,8 +73,8 @@ aoa_dma_set_program(struct aoa_dma *dma) u_int32_t addr; int i; - addr = (u_int32_t) sndbuf_getbufaddr(dma->buf); - KASSERT(dma->bufsz == sndbuf_getsize(dma->buf), ("bad size")); + addr = (u_int32_t)dma->buf->buf_addr; + KASSERT(dma->bufsz == dma->buf->bufsize, ("bad size")); dma->slots = dma->bufsz / dma->blksz; diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 9d86713b379e..75fbefe27633 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -281,7 +281,7 @@ alschan_getptr(kobj_t obj, void *data) snd_mtxlock(sc->lock); pos = als_gcr_rd(ch->parent, ch->gcr_fifo_status) & 0xffff; snd_mtxunlock(sc->lock); - sz = sndbuf_getsize(ch->buffer); + sz = ch->buffer->bufsize; return (2 * sz - pos - 1) % sz; } @@ -348,8 +348,8 @@ als_playback_start(struct sc_chinfo *ch) struct sc_info *sc = ch->parent; u_int32_t buf, bufsz, count, dma_prog; - buf = sndbuf_getbufaddr(ch->buffer); - bufsz = sndbuf_getsize(ch->buffer); + buf = ch->buffer->buf_addr; + bufsz = ch->buffer->bufsize; count = bufsz / 2; if (ch->format & AFMT_16BIT) count /= 2; @@ -451,8 +451,8 @@ als_capture_start(struct sc_chinfo *ch) struct sc_info *sc = ch->parent; u_int32_t buf, bufsz, count, dma_prog; - buf = sndbuf_getbufaddr(ch->buffer); - bufsz = sndbuf_getsize(ch->buffer); + buf = ch->buffer->buf_addr; + bufsz = ch->buffer->bufsize; count = bufsz / 2; if (ch->format & AFMT_16BIT) count /= 2; diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index 90e5742e6523..30f061fd9388 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -535,8 +535,8 @@ atiixp_chan_setfragments(kobj_t obj, void *data, blksz &= ATI_IXP_BLK_ALIGN; - if (blksz > (sndbuf_getmaxsize(ch->buffer) / ATI_IXP_DMA_CHSEGS_MIN)) - blksz = sndbuf_getmaxsize(ch->buffer) / ATI_IXP_DMA_CHSEGS_MIN; + if (blksz > (ch->buffer->maxsize / ATI_IXP_DMA_CHSEGS_MIN)) + blksz = ch->buffer->maxsize / ATI_IXP_DMA_CHSEGS_MIN; if (blksz < ATI_IXP_BLK_MIN) blksz = ATI_IXP_BLK_MIN; if (blkcnt > ATI_IXP_DMA_CHSEGS_MAX) @@ -544,7 +544,7 @@ atiixp_chan_setfragments(kobj_t obj, void *data, if (blkcnt < ATI_IXP_DMA_CHSEGS_MIN) blkcnt = ATI_IXP_DMA_CHSEGS_MIN; - while ((blksz * blkcnt) > sndbuf_getmaxsize(ch->buffer)) { + while ((blksz * blkcnt) > ch->buffer->maxsize) { if ((blkcnt >> 1) >= ATI_IXP_DMA_CHSEGS_MIN) blkcnt >>= 1; else if ((blksz >> 1) >= ATI_IXP_BLK_MIN) @@ -553,14 +553,14 @@ atiixp_chan_setfragments(kobj_t obj, void *data, break; } - if ((sndbuf_getblksz(ch->buffer) != blksz || - sndbuf_getblkcnt(ch->buffer) != blkcnt) && + if ((ch->buffer->blksz != blksz || + ch->buffer->blkcnt != blkcnt) && sndbuf_resize(ch->buffer, blkcnt, blksz) != 0) device_printf(sc->dev, "%s: failed blksz=%u blkcnt=%u\n", __func__, blksz, blkcnt); - ch->blksz = sndbuf_getblksz(ch->buffer); - ch->blkcnt = sndbuf_getblkcnt(ch->buffer); + ch->blksz = ch->buffer->blksz; + ch->blkcnt = ch->buffer->blkcnt; return (0); } @@ -583,7 +583,7 @@ atiixp_buildsgdt(struct atiixp_chinfo *ch) uint32_t addr, blksz, blkcnt; int i; - addr = sndbuf_getbufaddr(ch->buffer); + addr = ch->buffer->buf_addr; if (sc->polling != 0) { blksz = ch->blksz * ch->blkcnt; @@ -610,7 +610,7 @@ atiixp_dmapos(struct atiixp_chinfo *ch) volatile uint32_t ptr; reg = ch->dt_cur_bit; - addr = sndbuf_getbufaddr(ch->buffer); + addr = ch->buffer->buf_addr; sz = ch->blkcnt * ch->blksz; retry = ATI_IXP_DMA_RETRY_MAX; @@ -739,8 +739,7 @@ atiixp_chan_trigger(kobj_t obj, void *data, int go) ch->ptr = 0; ch->prevptr = 0; pollticks = ((uint64_t)hz * ch->blksz) / - ((uint64_t)sndbuf_getalign(ch->buffer) * - sndbuf_getspd(ch->buffer)); + ((uint64_t)ch->buffer->align * ch->buffer->spd); pollticks >>= 2; if (pollticks > hz) pollticks = hz; @@ -781,8 +780,8 @@ atiixp_chan_trigger(kobj_t obj, void *data, int go) else ch = &sc->rch; pollticks = ((uint64_t)hz * ch->blksz) / - ((uint64_t)sndbuf_getalign(ch->buffer) * - sndbuf_getspd(ch->buffer)); + ((uint64_t)ch->buffer->align * + ch->buffer->spd); pollticks >>= 2; if (pollticks > hz) pollticks = hz; diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 22f1e76a4d1f..a1356f58b567 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -255,10 +255,10 @@ cmi_dma_prog(struct sc_info *sc, struct sc_chinfo *ch, u_int32_t base) { u_int32_t s, i, sz; - ch->phys_buf = sndbuf_getbufaddr(ch->buffer); + ch->phys_buf = ch->buffer->buf_addr; cmi_wr(sc, base, ch->phys_buf, 4); - sz = (u_int32_t)sndbuf_getsize(ch->buffer); + sz = (u_int32_t)ch->buffer->bufsize; s = sz / ch->bps - 1; cmi_wr(sc, base + 4, s, 2); @@ -525,7 +525,7 @@ cmichan_getptr(kobj_t obj, void *data) } snd_mtxunlock(sc->lock); - sz = sndbuf_getsize(ch->buffer); + sz = ch->buffer->bufsize; bufptr = (physptr - ch->phys_buf + sz - ch->bps) % sz; return bufptr; diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index 7a25f7f4c08d..af2b4da76aba 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -328,7 +328,7 @@ cs4281chan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channe ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); ch->spd = DSP_DEFAULT_SPEED; ch->bps = 1; - ch->blksz = sndbuf_getsize(ch->buffer); + ch->blksz = ch->buffer->bufsize; ch->dma_chan = (dir == PCMDIR_PLAY) ? CS4281_DMA_PLAY : CS4281_DMA_REC; ch->dma_setup = 0; @@ -412,7 +412,7 @@ cs4281chan_getptr(kobj_t obj, void *data) u_int32_t dba, dca, ptr; int sz; - sz = sndbuf_getsize(ch->buffer); + sz = ch->buffer->bufsize; dba = cs4281_rd(sc, CS4281PCI_DBA(ch->dma_chan)); dca = cs4281_rd(sc, CS4281PCI_DCA(ch->dma_chan)); ptr = (dca - dba + sz) % sz; @@ -493,9 +493,9 @@ adcdac_prog(struct sc_chinfo *ch) if (!ch->dma_setup) { go = adcdac_go(ch, 0); cs4281_wr(sc, CS4281PCI_DBA(ch->dma_chan), - sndbuf_getbufaddr(ch->buffer)); + ch->buffer->buf_addr); cs4281_wr(sc, CS4281PCI_DBC(ch->dma_chan), - sndbuf_getsize(ch->buffer) / ch->bps - 1); + ch->buffer->bufsize / ch->bps - 1); ch->dma_setup = 1; adcdac_go(ch, go); } diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index a966a2e66402..688aee6400d8 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -483,7 +483,7 @@ csa_setupchan(struct csa_chinfo *ch) if (ch->dir == PCMDIR_PLAY) { /* direction */ - csa_writemem(resp, BA1_PBA, sndbuf_getbufaddr(ch->buffer)); + csa_writemem(resp, BA1_PBA, ch->buffer->buf_addr); /* format */ csa->pfie = csa_readmem(resp, BA1_PFIE) & ~0x0000f03f; @@ -512,7 +512,7 @@ csa_setupchan(struct csa_chinfo *ch) csa_setplaysamplerate(resp, ch->spd); } else if (ch->dir == PCMDIR_REC) { /* direction */ - csa_writemem(resp, BA1_CBA, sndbuf_getbufaddr(ch->buffer)); + csa_writemem(resp, BA1_CBA, ch->buffer->buf_addr); /* format */ csa_writemem(resp, BA1_CIE, (csa_readmem(resp, BA1_CIE) & ~0x0000003f) | 0x00000001); @@ -602,11 +602,11 @@ csachan_getptr(kobj_t obj, void *data) resp = &csa->res; if (ch->dir == PCMDIR_PLAY) { - ptr = csa_readmem(resp, BA1_PBA) - sndbuf_getbufaddr(ch->buffer); + ptr = csa_readmem(resp, BA1_PBA) - ch->buffer->buf_addr; if ((ch->fmt & AFMT_U8) != 0 || (ch->fmt & AFMT_S8) != 0) ptr >>= 1; } else { - ptr = csa_readmem(resp, BA1_CBA) - sndbuf_getbufaddr(ch->buffer); + ptr = csa_readmem(resp, BA1_CBA) - ch->buffer->buf_addr; if ((ch->fmt & AFMT_U8) != 0 || (ch->fmt & AFMT_S8) != 0) ptr >>= 1; } diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index e4b2c22f4f07..a85031977f4b 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -413,7 +413,7 @@ emu_settimer(struct sc_info *sc) for (i = 0; i < sc->nchans; i++) { pch = &sc->pch[i]; if (pch->buffer) { - tmp = (pch->spd * sndbuf_getalign(pch->buffer)) + tmp = (pch->spd * pch->buffer->align) / pch->blksz; if (tmp > rate) rate = tmp; @@ -423,7 +423,7 @@ emu_settimer(struct sc_info *sc) for (i = 0; i < 3; i++) { rch = &sc->rch[i]; if (rch->buffer) { - tmp = (rch->spd * sndbuf_getalign(rch->buffer)) + tmp = (rch->spd * rch->buffer->align) / rch->blksz; if (tmp > rate) rate = tmp; @@ -838,7 +838,7 @@ emupchan_free(kobj_t obj, void *data) int r; snd_mtxlock(sc->lock); - r = emu_memfree(sc, sndbuf_getbuf(ch->buffer)); + r = emu_memfree(sc, ch->buffer->buf); snd_mtxunlock(sc->lock); return r; @@ -985,7 +985,7 @@ emurchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, return NULL; else { snd_mtxlock(sc->lock); - emu_wrptr(sc, 0, ch->basereg, sndbuf_getbufaddr(ch->buffer)); + emu_wrptr(sc, 0, ch->basereg, ch->buffer->buf_addr); emu_wrptr(sc, 0, ch->sizereg, 0); /* off */ snd_mtxunlock(sc->lock); return ch; diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c index c280b64892f6..a93d48ba71b1 100644 --- a/sys/dev/sound/pci/emu10kx-pcm.c +++ b/sys/dev/sound/pci/emu10kx-pcm.c @@ -773,7 +773,7 @@ emupchan_setblocksize(kobj_t obj __unused, void *c_devinfo, uint32_t blocksize) blocksize = ch->pcm->bufsz; snd_mtxlock(sc->lock); ch->blksz = blocksize; - emu_timer_set(sc->card, ch->timer, ch->blksz / sndbuf_getalign(ch->buffer)); + emu_timer_set(sc->card, ch->timer, ch->blksz / ch->buffer->align); snd_mtxunlock(sc->lock); return (ch->blksz); } @@ -795,7 +795,8 @@ emupchan_trigger(kobj_t obj __unused, void *c_devinfo, int go) else emu_vroute(sc->card, &(sc->rt_mono), ch->master); emu_vwrite(sc->card, ch->master); - emu_timer_set(sc->card, ch->timer, ch->blksz / sndbuf_getalign(ch->buffer)); + emu_timer_set(sc->card, ch->timer, ch->blksz / + ch->buffer->align); emu_timer_enable(sc->card, ch->timer, 1); } /* PCM interrupt handler will handle PCMTRIG_STOP event */ @@ -878,7 +879,7 @@ emurchan_init(kobj_t obj __unused, void *devinfo, struct snd_dbuf *b, struct pcm return (NULL); else { ch->timer = emu_timer_create(sc->card); - emu_wrptr(sc->card, 0, ch->basereg, sndbuf_getbufaddr(ch->buffer)); + emu_wrptr(sc->card, 0, ch->basereg, ch->buffer->buf_addr); emu_wrptr(sc->card, 0, ch->sizereg, 0); /* off */ return (ch); } @@ -930,7 +931,8 @@ emurchan_setblocksize(kobj_t obj __unused, void *c_devinfo, uint32_t blocksize) * (and use) timer interrupts. Otherwise channel will be marked dead. */ if (ch->blksz < (ch->pcm->bufsz / 2)) { - emu_timer_set(sc->card, ch->timer, ch->blksz / sndbuf_getalign(ch->buffer)); + emu_timer_set(sc->card, ch->timer, ch->blksz / + ch->buffer->align); emu_timer_enable(sc->card, ch->timer, 1); } else { emu_timer_enable(sc->card, ch->timer, 0); @@ -1059,7 +1061,7 @@ emufxrchan_init(kobj_t obj __unused, void *devinfo, struct snd_dbuf *b, struct p if (sndbuf_alloc(ch->buffer, emu_gettag(sc->card), 0, sc->bufsz) != 0) return (NULL); else { - emu_wrptr(sc->card, 0, ch->basereg, sndbuf_getbufaddr(ch->buffer)); + emu_wrptr(sc->card, 0, ch->basereg, ch->buffer->buf_addr); emu_wrptr(sc->card, 0, ch->sizereg, 0); /* off */ return (ch); } diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index 3c1bea09b5d1..eb546de81f65 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -508,21 +508,21 @@ eschan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, es_wr(es, ES1370_REG_MEMPAGE, ES1370_REG_DAC1_FRAMEADR >> 8, 1); es_wr(es, ES1370_REG_DAC1_FRAMEADR & 0xff, - sndbuf_getbufaddr(ch->buffer), 4); + ch->buffer->buf_addr, 4); es_wr(es, ES1370_REG_DAC1_FRAMECNT & 0xff, (ch->bufsz >> 2) - 1, 4); } else { es_wr(es, ES1370_REG_MEMPAGE, ES1370_REG_DAC2_FRAMEADR >> 8, 1); es_wr(es, ES1370_REG_DAC2_FRAMEADR & 0xff, - sndbuf_getbufaddr(ch->buffer), 4); + ch->buffer->buf_addr, 4); es_wr(es, ES1370_REG_DAC2_FRAMECNT & 0xff, (ch->bufsz >> 2) - 1, 4); } } else { es_wr(es, ES1370_REG_MEMPAGE, ES1370_REG_ADC_FRAMEADR >> 8, 1); es_wr(es, ES1370_REG_ADC_FRAMEADR & 0xff, - sndbuf_getbufaddr(ch->buffer), 4); + ch->buffer->buf_addr, 4); es_wr(es, ES1370_REG_ADC_FRAMECNT & 0xff, (ch->bufsz >> 2) - 1, 4); } @@ -637,8 +637,8 @@ eschan_setfragments(kobj_t obj, void *data, uint32_t blksz, uint32_t blkcnt) blksz &= ES_BLK_ALIGN; - if (blksz > (sndbuf_getmaxsize(ch->buffer) / ES_DMA_SEGS_MIN)) - blksz = sndbuf_getmaxsize(ch->buffer) / ES_DMA_SEGS_MIN; + if (blksz > (ch->buffer->maxsize / ES_DMA_SEGS_MIN)) + blksz = ch->buffer->maxsize / ES_DMA_SEGS_MIN; if (blksz < ES_BLK_MIN) blksz = ES_BLK_MIN; if (blkcnt > ES_DMA_SEGS_MAX) @@ -646,7 +646,7 @@ eschan_setfragments(kobj_t obj, void *data, uint32_t blksz, uint32_t blkcnt) if (blkcnt < ES_DMA_SEGS_MIN) blkcnt = ES_DMA_SEGS_MIN; - while ((blksz * blkcnt) > sndbuf_getmaxsize(ch->buffer)) { + while ((blksz * blkcnt) > ch->buffer->maxsize) { if ((blkcnt >> 1) >= ES_DMA_SEGS_MIN) blkcnt >>= 1; else if ((blksz >> 1) >= ES_BLK_MIN) @@ -655,15 +655,15 @@ eschan_setfragments(kobj_t obj, void *data, uint32_t blksz, uint32_t blkcnt) break; } - if ((sndbuf_getblksz(ch->buffer) != blksz || - sndbuf_getblkcnt(ch->buffer) != blkcnt) && + if ((ch->buffer->blksz != blksz || + ch->buffer->blkcnt != blkcnt) && sndbuf_resize(ch->buffer, blkcnt, blksz) != 0) device_printf(es->dev, "%s: failed blksz=%u blkcnt=%u\n", __func__, blksz, blkcnt); - ch->bufsz = sndbuf_getsize(ch->buffer); - ch->blksz = sndbuf_getblksz(ch->buffer); - ch->blkcnt = sndbuf_getblkcnt(ch->buffer); + ch->bufsz = ch->buffer->bufsize; + ch->blksz = ch->buffer->blksz; + ch->blkcnt = ch->buffer->blkcnt; return (0); } @@ -762,7 +762,7 @@ eschan_trigger(kobj_t obj, void *data, int go) return 0; ES_LOCK(es); - cnt = (ch->blksz / sndbuf_getalign(ch->buffer)) - 1; + cnt = (ch->blksz / ch->buffer->align) - 1; if (ch->fmt & AFMT_16BIT) b |= 0x02; if (AFMT_CHANNEL(ch->fmt) > 1) diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 3537c7807ded..39d12f8505d1 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -440,7 +440,7 @@ fm801ch_trigger(kobj_t obj, void *data, int go) { struct fm801_chinfo *ch = data; struct fm801_info *fm801 = ch->parent; - u_int32_t baseaddr = sndbuf_getbufaddr(ch->buffer); + u_int32_t baseaddr = ch->buffer->buf_addr; u_int32_t k1; DPRINT("fm801ch_trigger go %d , ", go); diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index 5dbb5c4f4453..14231107e17a 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -2081,10 +2081,10 @@ hdaa_channel_setfragments(kobj_t obj, void *data, { struct hdaa_chan *ch = data; - blksz -= blksz % lcm(HDA_DMA_ALIGNMENT, sndbuf_getalign(ch->b)); + blksz -= blksz % lcm(HDA_DMA_ALIGNMENT, ch->b->align); - if (blksz > (sndbuf_getmaxsize(ch->b) / HDA_BDL_MIN)) - blksz = sndbuf_getmaxsize(ch->b) / HDA_BDL_MIN; + if (blksz > (ch->b->maxsize / HDA_BDL_MIN)) + blksz = ch->b->maxsize / HDA_BDL_MIN; if (blksz < HDA_BLK_MIN) blksz = HDA_BLK_MIN; if (blkcnt > HDA_BDL_MAX) @@ -2092,7 +2092,7 @@ hdaa_channel_setfragments(kobj_t obj, void *data, if (blkcnt < HDA_BDL_MIN) blkcnt = HDA_BDL_MIN; - while ((blksz * blkcnt) > sndbuf_getmaxsize(ch->b)) { + while ((blksz * blkcnt) > ch->b->maxsize) { if ((blkcnt >> 1) >= HDA_BDL_MIN) blkcnt >>= 1; else if ((blksz >> 1) >= HDA_BLK_MIN) @@ -2101,14 +2101,14 @@ hdaa_channel_setfragments(kobj_t obj, void *data, break; } - if ((sndbuf_getblksz(ch->b) != blksz || - sndbuf_getblkcnt(ch->b) != blkcnt) && + if ((ch->b->blksz != blksz || + ch->b->blkcnt != blkcnt) && sndbuf_resize(ch->b, blkcnt, blksz) != 0) device_printf(ch->devinfo->dev, "%s: failed blksz=%u blkcnt=%u\n", __func__, blksz, blkcnt); - ch->blksz = sndbuf_getblksz(ch->b); - ch->blkcnt = sndbuf_getblkcnt(ch->b); + ch->blksz = ch->b->blksz; + ch->blkcnt = ch->b->blkcnt; return (0); } @@ -2169,7 +2169,7 @@ hdaa_channel_start(struct hdaa_chan *ch) ch->dir == PCMDIR_PLAY ? 1 : 0, ch->sid); HDAC_STREAM_START(device_get_parent(devinfo->dev), devinfo->dev, ch->dir == PCMDIR_PLAY ? 1 : 0, ch->sid, - sndbuf_getbufaddr(ch->b), ch->blksz, ch->blkcnt); + ch->b->buf_addr, ch->blksz, ch->blkcnt); ch->flags |= HDAA_CHN_RUNNING; return (0); } diff --git a/sys/dev/sound/pci/hdsp-pcm.c b/sys/dev/sound/pci/hdsp-pcm.c index 5ac571e64fde..bc11199f15e8 100644 --- a/sys/dev/sound/pci/hdsp-pcm.c +++ b/sys/dev/sound/pci/hdsp-pcm.c @@ -971,7 +971,7 @@ hdspchan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) hdsp_write_4(sc, HDSP_FREQ_REG, hdsp_freq_reg_value(sc->speed)); end: - return (sndbuf_getblksz(ch->buffer)); + return (ch->buffer->blksz); } static uint32_t hdsp_bkp_fmt[] = { diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index 09bbbe22dacf..1c0a92e45b7a 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -962,7 +962,7 @@ hdspechan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) (sc->period * 4)); end: - return (sndbuf_getblksz(ch->buffer)); + return (ch->buffer->blksz); } static uint32_t hdspe_bkp_fmt[] = { diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index 500d6d95daac..53f4db3332a8 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -301,15 +301,15 @@ ich_filldtbl(struct sc_chinfo *ch) uint32_t base; int i; - base = sndbuf_getbufaddr(ch->buffer); - if ((ch->blksz * ch->blkcnt) > sndbuf_getmaxsize(ch->buffer)) - ch->blksz = sndbuf_getmaxsize(ch->buffer) / ch->blkcnt; - if ((sndbuf_getblksz(ch->buffer) != ch->blksz || - sndbuf_getblkcnt(ch->buffer) != ch->blkcnt) && + base = ch->buffer->buf_addr; + if ((ch->blksz * ch->blkcnt) > ch->buffer->maxsize) + ch->blksz = ch->buffer->maxsize / ch->blkcnt; + if ((ch->buffer->blksz != ch->blksz || + ch->buffer->blkcnt != ch->blkcnt) && sndbuf_resize(ch->buffer, ch->blkcnt, ch->blksz) != 0) device_printf(sc->dev, "%s: failed blksz=%u blkcnt=%u\n", __func__, ch->blksz, ch->blkcnt); - ch->blksz = sndbuf_getblksz(ch->buffer); + ch->blksz = ch->buffer->blksz; for (i = 0; i < ICH_DTBL_LENGTH; i++) { ch->dtbl[i].buffer = base + (ch->blksz * (i % ch->blkcnt)); @@ -491,7 +491,7 @@ ichchan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) ); if (sc->flags & ICH_HIGH_LATENCY) - blocksize = sndbuf_getmaxsize(ch->buffer) / ch->blkcnt; + blocksize = ch->buffer->maxsize / ch->blkcnt; if (blocksize < ICH_MIN_BLKSZ) blocksize = ICH_MIN_BLKSZ; @@ -734,7 +734,7 @@ ich_calibrate(void *arg) ch->blkcnt = 2; sc->flags |= ICH_CALIBRATE_DONE; ICH_UNLOCK(sc); - ichchan_setblocksize(0, ch, sndbuf_getmaxsize(ch->buffer) >> 1); + ichchan_setblocksize(0, ch, ch->buffer->maxsize >> 1); ICH_LOCK(sc); sc->flags &= ~ICH_CALIBRATE_DONE; diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index 2d102fcd6dbe..ee39f5f3c90d 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -444,10 +444,10 @@ m3_pchan_init(kobj_t kobj, void *devinfo, struct snd_dbuf *b, struct pcm_channel return (NULL); } M3_LOCK(sc); - ch->bufsize = sndbuf_getsize(ch->buffer); + ch->bufsize = ch->buffer->bufsize; /* host dma buffer pointers */ - bus_addr = sndbuf_getbufaddr(ch->buffer); + bus_addr = ch->buffer->buf_addr; if (bus_addr & 3) { device_printf(sc->dev, "m3_pchan_init unaligned bus_addr\n"); bus_addr = (bus_addr + 4) & ~3; @@ -595,7 +595,7 @@ m3_pchan_setblocksize(kobj_t kobj, void *chdata, u_int32_t blocksize) M3_DEBUG(CHANGE, ("m3_pchan_setblocksize(dac=%d, blocksize=%d)\n", ch->dac_idx, blocksize)); - return (sndbuf_getblksz(ch->buffer)); + return (ch->buffer->blksz); } static int @@ -709,7 +709,7 @@ m3_pchan_getptr_internal(struct sc_pchinfo *ch) struct sc_info *sc = ch->parent; u_int32_t hi, lo, bus_base, bus_crnt; - bus_base = sndbuf_getbufaddr(ch->buffer); + bus_base = ch->buffer->buf_addr; hi = m3_rd_assp_data(sc, ch->dac_data + CDATA_HOST_SRC_CURRENTH); lo = m3_rd_assp_data(sc, ch->dac_data + CDATA_HOST_SRC_CURRENTL); bus_crnt = lo | (hi << 16); @@ -823,10 +823,10 @@ m3_rchan_init(kobj_t kobj, void *devinfo, struct snd_dbuf *b, struct pcm_channel return (NULL); } M3_LOCK(sc); - ch->bufsize = sndbuf_getsize(ch->buffer); + ch->bufsize = ch->buffer->bufsize; /* host dma buffer pointers */ - bus_addr = sndbuf_getbufaddr(ch->buffer); + bus_addr = ch->buffer->buf_addr; if (bus_addr & 3) { device_printf(sc->dev, "m3_rchan_init unaligned bus_addr\n"); bus_addr = (bus_addr + 4) & ~3; @@ -968,7 +968,7 @@ m3_rchan_setblocksize(kobj_t kobj, void *chdata, u_int32_t blocksize) M3_DEBUG(CHANGE, ("m3_rchan_setblocksize(adc=%d, blocksize=%d)\n", ch->adc_idx, blocksize)); - return (sndbuf_getblksz(ch->buffer)); + return (ch->buffer->blksz); } static int @@ -1061,7 +1061,7 @@ m3_rchan_getptr_internal(struct sc_rchinfo *ch) struct sc_info *sc = ch->parent; u_int32_t hi, lo, bus_base, bus_crnt; - bus_base = sndbuf_getbufaddr(ch->buffer); + bus_base = ch->buffer->buf_addr; hi = m3_rd_assp_data(sc, ch->adc_data + CDATA_HOST_SRC_CURRENTH); lo = m3_rd_assp_data(sc, ch->adc_data + CDATA_HOST_SRC_CURRENTL); bus_crnt = lo | (hi << 16); @@ -1162,7 +1162,7 @@ m3_handle_channel_intr: pch->ptr = m3_pchan_getptr_internal(pch); delta = pch->bufsize + pch->ptr - pch->prevptr; delta %= pch->bufsize; - if (delta < sndbuf_getblksz(pch->buffer)) + if (delta < pch->buffer->blksz) continue; pch->prevptr = pch->ptr; M3_UNLOCK(sc); @@ -1176,7 +1176,7 @@ m3_handle_channel_intr: rch->ptr = m3_rchan_getptr_internal(rch); delta = rch->bufsize + rch->ptr - rch->prevptr; delta %= rch->bufsize; - if (delta < sndbuf_getblksz(rch->buffer)) + if (delta < rch->buffer->blksz) continue; rch->prevptr = rch->ptr; M3_UNLOCK(sc); diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c index d7824c990a52..1fee943d9364 100644 --- a/sys/dev/sound/pci/neomagic.c +++ b/sys/dev/sound/pci/neomagic.c @@ -362,7 +362,7 @@ nmchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channel *c sndbuf_setup(ch->buffer, (u_int8_t *)rman_get_virtual(sc->buf) + chnbuf, NM_BUFFSIZE); if (bootverbose) device_printf(sc->dev, "%s buf %p\n", (dir == PCMDIR_PLAY)? - "play" : "rec", sndbuf_getbuf(ch->buffer)); + "play" : "rec", ch->buffer->buf); ch->parent = sc; ch->channel = c; ch->dir = dir; diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index 90dd2e26ad41..8229b0cffdae 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -584,7 +584,8 @@ esschan_trigger(kobj_t obj, void *data, int go) ess_lock(sc); switch (go) { case PCMTRIG_START: - ess_dmasetup(sc, ch->hwch, sndbuf_getbufaddr(ch->buffer), sndbuf_getsize(ch->buffer), ch->dir); + ess_dmasetup(sc, ch->hwch, ch->buffer->buf_addr, + ch->buffer->bufsize, ch->dir); ess_dmatrigger(sc, ch->hwch, 1); ess_start(ch); break; diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index 07b9e1004573..874d1c7a2e2a 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -555,9 +555,9 @@ trpchan_trigger(kobj_t obj, void *data, int go) ch->fms = 0; ch->ec = 0; ch->alpha = 0; - ch->lba = sndbuf_getbufaddr(ch->buffer); + ch->lba = ch->buffer->buf_addr; ch->cso = 0; - ch->eso = (sndbuf_getsize(ch->buffer) / sndbuf_getalign(ch->buffer)) - 1; + ch->eso = (ch->buffer->bufsize / ch->buffer->align) - 1; ch->rvol = ch->cvol = 0x7f; ch->gvsel = 0; ch->pan = 0; @@ -581,7 +581,7 @@ trpchan_getptr(kobj_t obj, void *data) struct tr_chinfo *ch = data; tr_rdch(ch); - return ch->cso * sndbuf_getalign(ch->buffer); + return ch->cso * ch->buffer->align; } static struct pcmchan_caps * @@ -680,7 +680,7 @@ trrchan_trigger(kobj_t obj, void *data, int go) i = tr_rd(tr, TR_REG_DMAR11, 1) & 0x03; tr_wr(tr, TR_REG_DMAR11, i | 0x54, 1); /* set up base address */ - tr_wr(tr, TR_REG_DMAR0, sndbuf_getbufaddr(ch->buffer), 4); + tr_wr(tr, TR_REG_DMAR0, ch->buffer->buf_addr, 4); /* set up buffer size */ i = tr_rd(tr, TR_REG_DMAR4, 4) & ~0x00ffffff; tr_wr(tr, TR_REG_DMAR4, i | (sndbuf_runsz(ch->buffer) - 1), 4); @@ -703,7 +703,7 @@ trrchan_getptr(kobj_t obj, void *data) struct tr_info *tr = ch->parent; /* return current byte offset of channel */ - return tr_rd(tr, TR_REG_DMAR0, 4) - sndbuf_getbufaddr(ch->buffer); + return tr_rd(tr, TR_REG_DMAR0, 4) - ch->buffer->buf_addr; } static struct pcmchan_caps * diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c index 243353805b94..47caa7ea4459 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -385,7 +385,7 @@ via_buildsgdt(struct via_chinfo *ch) uint32_t phys_addr, flag; int i; - phys_addr = sndbuf_getbufaddr(ch->buffer); + phys_addr = ch->buffer->buf_addr; for (i = 0; i < ch->blkcnt; i++) { flag = (i == ch->blkcnt - 1) ? VIA_DMAOP_EOL : VIA_DMAOP_FLAG; @@ -568,8 +568,8 @@ via8233chan_setfragments(kobj_t obj, void *data, blksz &= VIA_BLK_ALIGN; - if (blksz > (sndbuf_getmaxsize(ch->buffer) / VIA_SEGS_MIN)) - blksz = sndbuf_getmaxsize(ch->buffer) / VIA_SEGS_MIN; + if (blksz > (ch->buffer->maxsize / VIA_SEGS_MIN)) + blksz = ch->buffer->maxsize / VIA_SEGS_MIN; if (blksz < VIA_BLK_MIN) blksz = VIA_BLK_MIN; if (blkcnt > VIA_SEGS_MAX) @@ -577,7 +577,7 @@ via8233chan_setfragments(kobj_t obj, void *data, if (blkcnt < VIA_SEGS_MIN) *** 1197 LINES SKIPPED *** From nobody Tue Nov 18 00:51:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzz0bq3z6HH5x; Tue, 18 Nov 2025 00:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzy3JGrz3xrR; Tue, 18 Nov 2025 00:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TfBLbcTcbWGtoazTOWYAvqDS4hOlB45FQlNY5yrtZco=; b=mFI6IkJ1RFOuPGNOH4n9WfpH9ehuegDDK/fXz8U/XLRqK3f/PSKU+B6JRYykTX10iq1mJ+ AzhCJWbh+uMukb0Z55Jkt4zQI9VoVxEVuLHbWOGvo50txEgkcWKFpnCapOW2bvW9/5ps2T 3Fw43TVahfdUW1PeMq15fCS6oNdx+EyqT5w/DINmOo2YPrM5HxUOmz1p4nw9VA4Dg45UCY UhTnZpgGr1N88iQyuqs+v3L06MInwxJhBU03o4k22+XioKV+xieAsYo5Y2tTMvk2gVzWeM A9krsx4oI81KiqBBniB1GDug+/g3NJ6HSU0PX4V7/RpYTxnotMtSbhAALzu+Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TfBLbcTcbWGtoazTOWYAvqDS4hOlB45FQlNY5yrtZco=; b=aXIC4Y+rO8lA0Pj5LBWHOvAtD10Lt7zminjykIkDhQ+WR7wrFCoct8ONvS5chPe68kL/s6 kMxv+YiBZkN1ylmIl8vCx75mt4EdCoNW1RJSPq8hMKcqrSn5SVrib9gWPNMUHPXXYCZ/03 L+Kf2a9jfkrUTz0dxWOOu+JKkwuMbWk2/0+vUGatHigAJR87jSmPRsLgX5vUOTX0uHu+h0 PZKZeUhMjjULq8aQi2dJtUyl+DSt+uxHL6n0j422qMk5A/KOCihqRJ0u7jcSYcbpIcX7hF P1x334u/nH3ach1fZAVhlD4V/1BQ1fWBxKeWWPDJZLXMaEmpNoq5f75g7T6Z6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427118; a=rsa-sha256; cv=none; b=a5yxTDHWQ4NeBN8+bMaxbjO3kWBCDcPxfLmuKYf7a2vCf2tahoTggl6ayUh+nCXQtxq6bt X3SkoFl+P2iowD/YxcHfHFAm9y7woOfO6jvMDo/0l2Kx8rZz7NAzftyQA5xZuNgXrrsO84 cJjvx/zVYTcFnN2WbI57vAS6hJKA2bVg21EYPEUb/rrWpSWYRyHI04s9DTiLNYCBPqTTB/ EbT8lxKuNIPhkZBx/MpCEGfJhn5bm9H9IVyzhtraQgFBZ3VcsinZ+6UifFZkIj4jVWAgjJ bQiqbm/erCXixrxsD3eZNonW33jHteTZ4TgfzCl+QglnsuIdoSSFyV1/2H9Oaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzy2cwszYKT; Tue, 18 Nov 2025 00:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0pwUB045116; Tue, 18 Nov 2025 00:51:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pwAZ045113; Tue, 18 Nov 2025 00:51:58 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:58 GMT Message-Id: <202511180051.5AI0pwAZ045113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: aa214f899a40 - stable/15 - sound: Add to pcm/buffer.* copyright List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: aa214f899a4002f37557be18fe5571a278d31bce Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=aa214f899a4002f37557be18fe5571a278d31bce commit aa214f899a4002f37557be18fe5571a278d31bce Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:37 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Add to pcm/buffer.* copyright Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 4e2bf54d9f2e9a2a51dbdcebf079089615102f1c) --- sys/dev/sound/pcm/buffer.c | 4 ++++ sys/dev/sound/pcm/buffer.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index 841fc5b0d8a9..eb2cbe667bf3 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -5,6 +5,10 @@ * Portions Copyright (c) Ryan Beasley - GSoC 2006 * Copyright (c) 1999 Cameron Grant * All rights reserved. + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index 5509256ea433..371ba2dd94ce 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -3,6 +3,10 @@ * * Copyright (c) 1999 Cameron Grant * All rights reserved. + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions From nobody Tue Nov 18 00:52:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0068srz6HGtH; Tue, 18 Nov 2025 00:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R004nFdz3xpK; Tue, 18 Nov 2025 00:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c0R0TRzPvcCSQyc3ECdhKxkIszmZz9xaV2JcyAEFGnc=; b=eJnIpxyCIkzfm6mEx79VmUYckgH9AzPNAnCit48KvayYK3sM9lcmjUhoLTfcn+XqVHSI9H DAkzmc+/s4ijrE+8wo0xcOe7WJD9gixSPY/jfn9hw/1Dyu+vw8bSX8LtbWUgyo5KyaSp18 xcRhhy3BQjgSdRTLC8ImK3CI2gZKAX0BZfuwg93sAuAwyDXjbYg9nb85jrW2auJVSHiMlb Df/D/Mfm6Qd21hJnLmJixXT7DJ0XOgy4KpMVshQ6InUs57NwLdKQks5l5j4GHeQRKuDt8Z rmuRqUrub9/8TLoDJvjLDyTvV4PlYdbxTE0ookTFpXriOmfyNdUOz8/4wI/Clg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c0R0TRzPvcCSQyc3ECdhKxkIszmZz9xaV2JcyAEFGnc=; b=q8e9v2fbt4Tx+WpNrFqwe6EZjyRVJSi+uOLEPy7NIVQqwCtnwb6h8xetZY0heAvdKE3Bdb l4L9iWNTxzdRyyH8nZ/GsH7uYTp7c4K7Irh7cb9e8SmYCgAtoyKVUB9QwMahbVS24XxkT3 q8u7SqOxMGEtrbn9+zxO2ZPF8zRhIwvjCH1amITmHqcBaa5K3yxyYirYGb5CXuitxf88bn +kAwoUfA/E8o+e8PmAHgdKCyvJKSFiy+wmaNvxk9nzyCpw/jDFoXyN7RUZpxv85Qpqn3iG rO2aVqJrR4vh6YGsHbNiO22b0cr8DdB36bl2A6Ml812OhB3dlaYB21xb711LWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427120; a=rsa-sha256; cv=none; b=XnRiNd4LoxnotZlLowbQSDP0dFYkD218qFT2W3NW09z6RmIlSzykBOH0G9F9dTVWbO1wVr ZKxqMS+1XRg41Pup8LOlQKkt+tTBJvSrRLkt9OTPB/Wlb7iI6qLegduc6k71KX0JbJNabi r56aeVUc2LbVXxXxEjjGHBoH1pHcx8V5o4EX2ja3uppo0sYIdQP8Yda5ErydWu2B2Tk3Bn nBJXl4mODx/lGBHPKjszUGgUgRDzeJthfWXg7/m/203w62PlAC9q2fHzVjL1PNMs+g7EwG 2naGwM72jOn+Maydoflco3NWUgBEQYQf1Af2aaVdXnZx1HsQdMFOnojgwZNrvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R004NltzXdV; Tue, 18 Nov 2025 00:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q0ST045195; Tue, 18 Nov 2025 00:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q0W7045192; Tue, 18 Nov 2025 00:52:00 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:00 GMT Message-Id: <202511180052.5AI0q0W7045192@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ebe59a72abf7 - stable/15 - sound: Retire MAXFEEDERS and feedercnt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ebe59a72abf7c71e0ef5091e91ecd36e6771422c Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ebe59a72abf7c71e0ef5091e91ecd36e6771422c commit ebe59a72abf7c71e0ef5091e91ecd36e6771422c Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:47 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Retire MAXFEEDERS and feedercnt Apart from the fact that it's unrealistic to reach MAXFEEDERS (256), since sound(4) comes with maximum 7 feeders (including feeder_root), there is also no reason to cap it. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53549 (cherry picked from commit 84282785cc497c3fb798502899f880e15d063233) --- sys/dev/sound/pcm/feeder.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 3f6b35c9197d..2e19577bfde3 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -42,15 +42,12 @@ static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); -#define MAXFEEDERS 256 - struct feedertab_entry { SLIST_ENTRY(feedertab_entry) link; struct feeder_class *feederclass; struct pcm_feederdesc *desc; }; static SLIST_HEAD(, feedertab_entry) feedertab; -static int feedercnt = 0; /*****************************************************************************/ @@ -60,7 +57,6 @@ feeder_register_root(void *p) struct feeder_class *fc = p; struct feedertab_entry *fte; - MPASS(feedercnt == 0); KASSERT(fc->desc == NULL, ("first feeder not root: %s", fc->name)); SLIST_INIT(&feedertab); @@ -68,7 +64,6 @@ feeder_register_root(void *p) fte->feederclass = fc; fte->desc = NULL; SLIST_INSERT_HEAD(&feedertab, fte, link); - feedercnt++; } void @@ -85,18 +80,13 @@ feeder_register(void *p) * translations being unavailable */ i = 0; - while ((feedercnt < MAXFEEDERS) && (fc->desc[i].type > 0)) { + while (fc->desc[i].type > 0) { fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); fte->feederclass = fc; fte->desc = &fc->desc[i]; SLIST_INSERT_HEAD(&feedertab, fte, link); i++; } - feedercnt++; - if (feedercnt >= MAXFEEDERS) { - printf("MAXFEEDERS (%d >= %d) exceeded\n", - feedercnt, MAXFEEDERS); - } } static void From nobody Tue Nov 18 00:51:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzz62Dmz6HH6D; Tue, 18 Nov 2025 00:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzz3fbZz3xWj; Tue, 18 Nov 2025 00:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6T0PlKS1y8fZe0wgpgK0RoR9tY59DbWx/uwmA5r+nq0=; b=WgkjsPvCTUMH+inxR7pFuuu7nL9JjNVEpTtgJYqxuIZ4jk7gMnjCbqb7a8j9nz+bX/XziG XVmX5skQcB8izpD8jMcQRTADYckDDyPwzCfyXLRz/wBZwppShq1iAceQXfuZwnhSfvqFmZ WwBufxS+nv7T/zDpYa89rG0yq/DAsKbPyqU69eyLrAt08JrF4BfbzRVRsWx5538yTQG2tt KM5OzEICnt+2P3fIsg54pyFlvyfqiOKDXicv7PlbdFN3NZv61KwUCwh2haaxhFUyj0cr2o xOCQ8elCUh+hcSkyU3NSAVGLcj5JF7+QHX2PouLo6GETCYh9B05wIaD78aapwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6T0PlKS1y8fZe0wgpgK0RoR9tY59DbWx/uwmA5r+nq0=; b=Q2JAw8mHNzRRLHWxzZeEaRH3p8rw5AVvkuq1xJ/xhWoRscR65k6gMTe102pT5Q8XqLeA9d ICefcg6hjOsu5OuVNcbUI0tuajvVZIPykHhCI107qenarOnwyP/EIx9N41x2Ra/U/yEeNO 1t+MojnIa8pAaxmrXUVYzfhPX9x0p7S59Q3Uk8vxt2/QFxB/bYusC8EPUV4fQmCOrXCBro GPkTNttayl4C3puJ3zVrC73MSMaf86gq22TWBx+3/0qEiFMkQHCBPunLTNzfkOuXq2pZs3 WYe9Fuu5NjyRYvK7s0WpsxMlSdPKja5eP+9Ps6jAltx2mIbsJWWI0yD983BRIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427119; a=rsa-sha256; cv=none; b=GZHXprb7/AXqQbykcCrnwWcK3Xve8mOZU4gdu+nlyiQG0IbVgqdJknix+RaAh0772Fu90M Qr+UCktNHZOeh5nnr2RFG7/WlWNyu+eUGoTO3IgGWoxRIYQrAq9syrVoNnplSVCEVg+nkF 6BC0kXnbTd2Sh6tIGYbw9TqgZNsVMm8kZ0KnA/BK/Ln2oYKSgW4n3t8mTJTvAyRvVENyT3 PrtPofc9jHhyfsfUdl18eBqGcVxc2hlFvE1jWCq38eD0dKn6qW6cm4IKvXnKPOqqUHk/sL qT7VZlSDfmMvNJ40C2KkBbu8y/u3B4JMvWaQgeuAG+XPFFhQOY5HdXhs8DPQbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzz387NzXdQ; Tue, 18 Nov 2025 00:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0pxOD045155; Tue, 18 Nov 2025 00:51:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pxD3045151; Tue, 18 Nov 2025 00:51:59 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:59 GMT Message-Id: <202511180051.5AI0pxD3045151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 0c61ba36895a - stable/15 - sound: Retire unused {pcm_feederdesc,feedertab_entry}->idx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0c61ba36895aed8cc9eca50b549948235b4d5b21 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0c61ba36895aed8cc9eca50b549948235b4d5b21 commit 0c61ba36895aed8cc9eca50b549948235b4d5b21 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:42 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Retire unused {pcm_feederdesc,feedertab_entry}->idx Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53547 (cherry picked from commit f1157508b37d66c0e038b2a3346858999bcd5984) --- sys/dev/sound/pcm/feeder.c | 8 +------- sys/dev/sound/pcm/feeder.h | 1 - sys/dev/sound/pcm/feeder_eq.c | 4 ++-- sys/dev/sound/pcm/feeder_format.c | 4 ++-- sys/dev/sound/pcm/feeder_matrix.c | 4 ++-- sys/dev/sound/pcm/feeder_mixer.c | 4 ++-- sys/dev/sound/pcm/feeder_rate.c | 4 ++-- sys/dev/sound/pcm/feeder_volume.c | 4 ++-- 8 files changed, 13 insertions(+), 20 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 2ec0ee6fb3fd..3f6b35c9197d 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -48,8 +48,6 @@ struct feedertab_entry { SLIST_ENTRY(feedertab_entry) link; struct feeder_class *feederclass; struct pcm_feederdesc *desc; - - int idx; }; static SLIST_HEAD(, feedertab_entry) feedertab; static int feedercnt = 0; @@ -69,7 +67,6 @@ feeder_register_root(void *p) fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); fte->feederclass = fc; fte->desc = NULL; - fte->idx = feedercnt; SLIST_INSERT_HEAD(&feedertab, fte, link); feedercnt++; } @@ -92,8 +89,6 @@ feeder_register(void *p) fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); fte->feederclass = fc; fte->desc = &fc->desc[i]; - fte->idx = feedercnt; - fte->desc->idx = feedercnt; SLIST_INSERT_HEAD(&feedertab, fte, link); i++; } @@ -156,7 +151,6 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) f->desc->in = 0; f->desc->out = 0; f->desc->flags = 0; - f->desc->idx = 0; } err = FEEDER_INIT(f); @@ -394,7 +388,7 @@ feeder_printchain(struct pcm_feeder *head) printf("feeder chain (head @%p)\n", head); f = head; while (f != NULL) { - printf("%s/%d @ %p\n", f->class->name, f->desc->idx, f); + printf("%s @ %p\n", f->class->name, f); f = f->source; } printf("[end]\n\n"); diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index 60b8280e59ef..e417d68fea71 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -31,7 +31,6 @@ struct pcm_feederdesc { u_int32_t type; u_int32_t in, out; u_int32_t flags; - int idx; }; struct feeder_class { diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 23e27b922486..88a083a3bfd1 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -420,8 +420,8 @@ feed_eq_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_eq_desc[] = { - { FEEDER_EQ, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_EQ, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_eq_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 0feac43374b8..c9679cfeba44 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -173,8 +173,8 @@ feed_format_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_format_desc[] = { - { FEEDER_FORMAT, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_FORMAT, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_format_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 43258a311d82..a0af32b887ce 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -399,8 +399,8 @@ feed_matrix_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_matrix_desc[] = { - { FEEDER_MATRIX, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_MATRIX, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_matrix_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index ab67a14711d3..028e9366aa8e 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -359,8 +359,8 @@ feed_mixer_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_mixer_desc[] = { - { FEEDER_MIXER, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_MIXER, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_mixer_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 9c29142b9d6b..166165e95e65 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -1706,8 +1706,8 @@ z_resampler_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_rate_desc[] = { - { FEEDER_RATE, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 }, + { FEEDER_RATE, 0, 0, 0 }, + { 0, 0, 0, 0 }, }; static kobj_method_t feeder_rate_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index ddcbf29804f3..119ab1b288d8 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -307,8 +307,8 @@ feed_volume_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_volume_desc[] = { - { FEEDER_VOLUME, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_VOLUME, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_volume_methods[] = { From nobody Tue Nov 18 00:52:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R020dPbz6HH0P; Tue, 18 Nov 2025 00:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R015TpHz3y0Z; Tue, 18 Nov 2025 00:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vCCBpjt+M4O+TeNH16k3dlHXel5MXfj/7wrOj1iwzw8=; b=admhfAq5VvL78haXeQSVaCPPRiI8fLdX5AGlBHy05jpSZBI6yKDFZu1DWSL7rI20nsplZD PGy+gMTiGtX+lGTypBIH5PftXPVvegEZ0zbXBejLfEtTUMYbMg1sVLTCUE0DB+GDQUPHEY PlAZ/LMQrLsEQpPPgK/aPvMQM5pnl+2bjCMUZ1/+gcdgu7gRhz6lwbyQ17zfbSljmKubnk T9XIYGgx83kArLr7tD+DYwGpg1dafb/LeTBaedXRXyQzxOsGLMyh2Gal1xUbpjwcb1ZQCR cP0MQL5em9anx08O/R/DEyYUQ/Rmwi8jaDDhk7NNWTK6ns5eofAxgnOyfudDCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vCCBpjt+M4O+TeNH16k3dlHXel5MXfj/7wrOj1iwzw8=; b=rbXV3ksRehZT/S2hRVdNlIkYvez8w2BpgGepZd2gKh/9kCKhjb0Fejeq9FX9AGx193sF1/ fHi62xoUonUgea9Y6N4eXPB2gcAmrtgu+ZMGVbY1rqZPdKaMT8ZU3OOEOdAkHprjSVevgN Tql5MsnjTptMO9j8W7eem15pM0+flAwavAX0oC7CTbNBDXKDmXRMMnLZeLzki8Xzev7/tf qubDN0ng4eTyp/nKo33BOIrAYs+5L6k03Y8ZKOX9geazWgJhB2U1XBVFajisRj/rc5uK2w 4Wv7Mm31NVEd5MZGEFtoIUQpahUIVI8ATtrQV1Wbo/xc/uLDD2YZxTef2z1WMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427121; a=rsa-sha256; cv=none; b=ckWAbuwzdDLcKRdL5Lip2ARGfDZ2WNIO9nY5KMH11b8rR2JqBUOJKNOtLFwljRHb58G2wc 1mqqrYMSW2J9ip7sFpBWjEJBQ+6ce/qtYLBf809cmNnbMkcWRKa2XSEkzryXze2LAMQJv6 BRtPzSaGy+l9DrMgY0nf428NxUFTBL3/80rfdMhyyWDhrFXiSInmsFLBuG5qm7K0x/9Gkl u1H97TX+krf7wQkJrzyfO8lblbwQTxTBbEYGLre7YFRDA+Ww0PIY2pGxbxeGtuKRKgPosb uFjDdYuBtftnmViwwGnhivighiZ+3NOW1c4+tOmIXFVQr27sdahFDcqacw3bSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0153zvzXb1; Tue, 18 Nov 2025 00:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q1Vl045231; Tue, 18 Nov 2025 00:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q1L3045228; Tue, 18 Nov 2025 00:52:01 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:01 GMT Message-Id: <202511180052.5AI0q1L3045228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 1619adaf77ad - stable/15 - sound: Remove unnecessary pcm/vchan.h include from pcm/feeder.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1619adaf77ad18056edc6968ef7fbbfef3890d23 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=1619adaf77ad18056edc6968ef7fbbfef3890d23 commit 1619adaf77ad18056edc6968ef7fbbfef3890d23 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:51 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Remove unnecessary pcm/vchan.h include from pcm/feeder.c Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53550 (cherry picked from commit 6049209f35c39823f6f9a756953b361d52658812) --- sys/dev/sound/pcm/feeder.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 2e19577bfde3..e94e742b263f 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -36,7 +36,6 @@ #endif #include -#include #include "feeder_if.h" From nobody Tue Nov 18 00:52:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0324fMz6HHF7; Tue, 18 Nov 2025 00:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R026hXhz3xvS; Tue, 18 Nov 2025 00:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vFe4r/MjF61xxlRsgtBy1PKtcktvMua/ZW/oxNwDrYw=; b=kVIeAh7jmZpBxap5adUVRJQOrI3I8mxYs0b9TAqnYyzRgXWrQ1Ho+qBwtZscCfkuuiVV8t D2uqaWWE9XRfBZF/1CAnr4/sAJOkopip2xbaY/MRdwGkyAk0pOnJ4J+Tt+fUzoHp9JIRpM CWJOiT6IXKa9Rt63lIv706uINbLehED5m0FWrfroWc/rmvO/cnV6ZdmdjTRJGvQiryp3ng fbIixDSU5fgqjM61CLkBMGH0tJhLf2vKwWF7zB1OhVT5sEARjYozPGmnopwOzb9TCy0yI8 xjAeqoVbQw1kKJ4jGyTfxR+c9hCdWg7XNURkV6vuzPb3/Ug6bMGd1JKvJ6s/tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vFe4r/MjF61xxlRsgtBy1PKtcktvMua/ZW/oxNwDrYw=; b=GWt8zLs60ozaMIBMzpPryiJp70n9j+GjJ2nLuXq56ETmqU9AJY2H6zi2lEFNBS+Rf89O/d ZKcauMMb44mh94zqVgJlbTp/Q7lPhngvteIk+PNMUCr++aetPE/qW42yfKhdvl5PJy77Yx tXmV62caNhulwPR+M7/6YTYRyo+kmebNkbIcxPrEC36vcnn/y6fzdZmgpSiuxyOA+gfFgk uTx0nD9/x9YcmTHyWZqinKacYfFqZhJds6cun0d7ofZRZwRyQovXLMdHmCOn0al+ocs1I8 vyzkkZRvfKme3Y4NsOdQQSNf7aD1Zl4TtDNUmwCmj3Se/hMTRwHJplhcqXTl0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427122; a=rsa-sha256; cv=none; b=KtqyA1Mvipp4csM1ez9fRrFn6OacFUHBl28ks+p75FfMfpozZCPCNlLPbItNwlmVSR5O+n AMvDCbyBKUihtnO2pTAQu8kYY23b+NWuXiBYHx5MdvS4pZGrHlln2ASDz6LTN2Hm47Lec+ ptiIlJg+4e7oEvFIjjhblwsY6OzZPHn2nppDv4FJfFSTj/Vse5BkgVYMwA8TsqRGSnR+BR X533Pd5yS/8c7ncyNN5YdCCxrMmRBoPIxVWa968Uux1SW+lulv+wajEk1T3YwFVE/Wq0tX 1mCXITbg7j2ISQibMp3mydPC2ikxOKI3jQHw6TLpK26c3y8Rd61tYP5uXZFKzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R026G7CzXVN; Tue, 18 Nov 2025 00:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q2XY045271; Tue, 18 Nov 2025 00:52:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q2tK045268; Tue, 18 Nov 2025 00:52:02 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:02 GMT Message-Id: <202511180052.5AI0q2tK045268@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 0a566f2fe96b - stable/15 - sound: Simplify pcm_feederdesc initialization List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0a566f2fe96ba29eec84bc365de65dc4352c2cd1 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0a566f2fe96ba29eec84bc365de65dc4352c2cd1 commit 0a566f2fe96ba29eec84bc365de65dc4352c2cd1 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:01 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Simplify pcm_feederdesc initialization Currently we initialize a pcm_feederdesc array for every feeder, which is then used by FEEDER_DECLARE(). However, there is no reason for this to be an array, as each feeder has only one description. Additionally, since the only thing we define in that array is the feeder type, remove the pcm_feederdesc definitions altogether, and instead pass their type to FEEDER_DECLARE() directly, which will then initialize the pcm_feederdesc. This also simplifies feeder_register(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53551 (cherry picked from commit 7d33c3d651901c97a683689916c810cf4e26a057) --- sys/dev/sound/pcm/feeder.c | 23 +++++++---------------- sys/dev/sound/pcm/feeder.h | 6 +++--- sys/dev/sound/pcm/feeder_eq.c | 7 +------ sys/dev/sound/pcm/feeder_format.c | 7 +------ sys/dev/sound/pcm/feeder_matrix.c | 7 +------ sys/dev/sound/pcm/feeder_mixer.c | 7 +------ sys/dev/sound/pcm/feeder_rate.c | 7 +------ sys/dev/sound/pcm/feeder_volume.c | 7 +------ 8 files changed, 16 insertions(+), 55 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index e94e742b263f..0dddfa84543d 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -70,22 +70,13 @@ feeder_register(void *p) { struct feeder_class *fc = p; struct feedertab_entry *fte; - int i; - KASSERT(fc->desc != NULL, ("feeder '%s' has no descriptor", fc->name)); - - /* - * beyond this point failure is non-fatal but may result in some - * translations being unavailable - */ - i = 0; - while (fc->desc[i].type > 0) { - fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); - fte->feederclass = fc; - fte->desc = &fc->desc[i]; - SLIST_INSERT_HEAD(&feedertab, fte, link); - i++; - } + KASSERT(fc->desc.type != 0, ("feeder '%s' has no descriptor", fc->name)); + + fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); + fte->feederclass = fc; + fte->desc = &fc->desc; + SLIST_INSERT_HEAD(&feedertab, fte, link); } static void @@ -442,7 +433,7 @@ static struct feeder_class feeder_root_class = { .name = "feeder_root", .methods = feeder_root_methods, .size = sizeof(struct pcm_feeder), - .desc = NULL, + .desc = { 0 }, .data = NULL, }; /* diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index e417d68fea71..d8760f1c87ab 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -35,7 +35,7 @@ struct pcm_feederdesc { struct feeder_class { KOBJ_CLASS_FIELDS; - struct pcm_feederdesc *desc; + struct pcm_feederdesc desc; void *data; }; @@ -64,12 +64,12 @@ struct pcm_feeder *feeder_find(struct pcm_channel *c, u_int32_t type); void feeder_printchain(struct pcm_feeder *head); int feeder_chain(struct pcm_channel *); -#define FEEDER_DECLARE(feeder, pdata) \ +#define FEEDER_DECLARE(feeder, type, pdata) \ static struct feeder_class feeder ## _class = { \ .name = #feeder, \ .methods = feeder ## _methods, \ .size = sizeof(struct pcm_feeder), \ - .desc = feeder ## _desc, \ + .desc = { type, 0, 0, 0 }, \ .data = pdata, \ }; \ SYSINIT(feeder, SI_SUB_DRIVERS, SI_ORDER_ANY, feeder_register, \ diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 88a083a3bfd1..05f5a5b82290 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -419,11 +419,6 @@ feed_eq_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, return (dst - b); } -static struct pcm_feederdesc feeder_eq_desc[] = { - { FEEDER_EQ, 0, 0, 0 }, - { 0, 0, 0, 0 } -}; - static kobj_method_t feeder_eq_methods[] = { KOBJMETHOD(feeder_init, feed_eq_init), KOBJMETHOD(feeder_free, feed_eq_free), @@ -432,7 +427,7 @@ static kobj_method_t feeder_eq_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_eq, NULL); +FEEDER_DECLARE(feeder_eq, FEEDER_EQ, NULL); static int32_t feed_eq_scan_preamp_arg(const char *s) diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index c9679cfeba44..21b54fcafcd7 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -172,11 +172,6 @@ feed_format_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, return (dst - b); } -static struct pcm_feederdesc feeder_format_desc[] = { - { FEEDER_FORMAT, 0, 0, 0 }, - { 0, 0, 0, 0 } -}; - static kobj_method_t feeder_format_methods[] = { KOBJMETHOD(feeder_init, feed_format_init), KOBJMETHOD(feeder_free, feed_format_free), @@ -185,4 +180,4 @@ static kobj_method_t feeder_format_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_format, NULL); +FEEDER_DECLARE(feeder_format, FEEDER_FORMAT, NULL); diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index a0af32b887ce..69c7e5962268 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -398,11 +398,6 @@ feed_matrix_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, return (dst - b); } -static struct pcm_feederdesc feeder_matrix_desc[] = { - { FEEDER_MATRIX, 0, 0, 0 }, - { 0, 0, 0, 0 } -}; - static kobj_method_t feeder_matrix_methods[] = { KOBJMETHOD(feeder_init, feed_matrix_init), KOBJMETHOD(feeder_free, feed_matrix_free), @@ -410,7 +405,7 @@ static kobj_method_t feeder_matrix_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_matrix, NULL); +FEEDER_DECLARE(feeder_matrix, FEEDER_MATRIX, NULL); /* External */ int diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 028e9366aa8e..3c2a58ba145f 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -358,11 +358,6 @@ feed_mixer_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, return (rcnt); } -static struct pcm_feederdesc feeder_mixer_desc[] = { - { FEEDER_MIXER, 0, 0, 0 }, - { 0, 0, 0, 0 } -}; - static kobj_method_t feeder_mixer_methods[] = { KOBJMETHOD(feeder_init, feed_mixer_init), KOBJMETHOD(feeder_free, feed_mixer_free), @@ -371,4 +366,4 @@ static kobj_method_t feeder_mixer_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_mixer, NULL); +FEEDER_DECLARE(feeder_mixer, FEEDER_MIXER, NULL); diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 166165e95e65..173a0c1fcd39 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -1705,11 +1705,6 @@ z_resampler_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, return (count - left); } -static struct pcm_feederdesc feeder_rate_desc[] = { - { FEEDER_RATE, 0, 0, 0 }, - { 0, 0, 0, 0 }, -}; - static kobj_method_t feeder_rate_methods[] = { KOBJMETHOD(feeder_init, z_resampler_init), KOBJMETHOD(feeder_free, z_resampler_free), @@ -1719,4 +1714,4 @@ static kobj_method_t feeder_rate_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_rate, NULL); +FEEDER_DECLARE(feeder_rate, FEEDER_RATE, NULL); diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index 119ab1b288d8..942f1a273edf 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -306,11 +306,6 @@ feed_volume_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, return (dst - b); } -static struct pcm_feederdesc feeder_volume_desc[] = { - { FEEDER_VOLUME, 0, 0, 0 }, - { 0, 0, 0, 0 } -}; - static kobj_method_t feeder_volume_methods[] = { KOBJMETHOD(feeder_init, feed_volume_init), KOBJMETHOD(feeder_free, feed_volume_free), @@ -319,7 +314,7 @@ static kobj_method_t feeder_volume_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_volume, NULL); +FEEDER_DECLARE(feeder_volume, FEEDER_VOLUME, NULL); /* Extern */ From nobody Tue Nov 18 00:52:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R04347rz6HHK9; Tue, 18 Nov 2025 00:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R040jfGz3xyB; Tue, 18 Nov 2025 00:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uv/KpQ5vHC4C4SGk3QKtA2pklk2H250UQgCE5YgVVHI=; b=GXTstjFkc822e891IOVeavn66jjPHI3UlB2Apb4CRxzja76hss6uhxpTs18iXzoubIBvgS aJJRzTH0fCYuXkh4naB3ZzfjSS9j7mKD+dbXuGmK59Kcg1PtedBNdP+XpuiuXs/XDP7isl 92f7pVfYnI1g2MlwUH3gCk0SSmK55fbf33wzPowCoRLc2qIA+QkFV3YRmrvmHxvfKDNuSM CIelcMX60SHcHABLFqW1YVxLdta2ZOZVwc3N0n+1MprW5JRv3fHCmxMTdda2fFIVc/d/Um 5pqVonAgJHSR0OLbGgw8HBE1VhzFUBHwCZsjREXoj98YYHVDp39Jq1G3QwOMuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uv/KpQ5vHC4C4SGk3QKtA2pklk2H250UQgCE5YgVVHI=; b=uJ4D6MyMS21D697TsvPM8RAzsYVX7qhC23najXz+/HTwBAkCIU4JeZh2OtO/ILYE1K5cGO Yp8aR64Gj14zorOkserx5L4prygCEzez+84QSOKSIJz+WUZ+6nhM4z+51xTfwJAGHr60eR 99GaJQRYa52RnaxkIfeVfpSx9Vcs7Hu2rwRgMssZAbBwABHC0bG0tnG1FlNF56v92FOvep Sc3HCIIpq44764RBnljdSfXLsPVNZeCVH7czTzE2uUQmczENaMDHEbBlsrF1nl8ZuzKFZP Bg7XRFMSOfcnqEVP3Rcpsv8KC4HbFWluBjDZwQxouoqPxONgFKmWFewKWVVS9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427124; a=rsa-sha256; cv=none; b=NjAx43PsEwOPUPgbOlo0rhfQ1HHbT658MfkGuC8TIQnG6/JuDxUhPnmnaBlslb6DwUBlsS oOBgk2YGm68PLqCqcHZ92F8cuX6DQ8pQT3WLENrKyihLQkjxGgVwN3HdbOJxbv8iUcW9HS Lgw4zD0f/i7KBvI9kFwQc5xKpLkaMr+AEYtsgU3RarM96NLIArjbehXEckbkkIemWMmpIH 4PHDjNBWPudGqB/3KVRkDjl2QJDVlAePqkObeG8pQUUEVDtO7RZZNuGdRSc+SIWbh6xnKP BiYkMj+OqbyqKHMfY0cEVUPyBwDMP/KUOD5V/SC8BC+CSUVpPMRVo8WFz2xPkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0408KWzXdW; Tue, 18 Nov 2025 00:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q3fQ045306; Tue, 18 Nov 2025 00:52:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q3rx045304; Tue, 18 Nov 2025 00:52:03 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:03 GMT Message-Id: <202511180052.5AI0q3rx045304@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: c0657096dbf6 - stable/15 - sound: Retire unused pcm_feederdesc->flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c0657096dbf6fca849d880d0d3fd5e640c145f4b Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c0657096dbf6fca849d880d0d3fd5e640c145f4b commit c0657096dbf6fca849d880d0d3fd5e640c145f4b Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:05 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Retire unused pcm_feederdesc->flags Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53552 (cherry picked from commit 0e9e222518dc543e34f891c00d2a6a1dd93c3fc2) --- sys/dev/sound/pcm/feeder.c | 4 +--- sys/dev/sound/pcm/feeder.h | 3 +-- sys/dev/sound/pcm/feeder_chain.c | 6 ------ 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 0dddfa84543d..6b7c7f43903c 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -97,8 +97,7 @@ cmpdesc(struct pcm_feederdesc *n, struct pcm_feederdesc *m) { return ((n->type == m->type) && ((n->in == 0) || (n->in == m->in)) && - ((n->out == 0) || (n->out == m->out)) && - (n->flags == m->flags)); + ((n->out == 0) || (n->out == m->out))); } static void @@ -130,7 +129,6 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) f->desc->type = FEEDER_ROOT; f->desc->in = 0; f->desc->out = 0; - f->desc->flags = 0; } err = FEEDER_INIT(f); diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index d8760f1c87ab..86cabb3e9925 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -30,7 +30,6 @@ struct pcm_feederdesc { u_int32_t type; u_int32_t in, out; - u_int32_t flags; }; struct feeder_class { @@ -69,7 +68,7 @@ static struct feeder_class feeder ## _class = { \ .name = #feeder, \ .methods = feeder ## _methods, \ .size = sizeof(struct pcm_feeder), \ - .desc = { type, 0, 0, 0 }, \ + .desc = { type, 0, 0 }, \ .data = pdata, \ }; \ SYSINIT(feeder, SI_SUB_DRIVERS, SI_ORDER_ANY, feeder_register, \ diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 8b5d50760b32..f5075bf76a49 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -147,7 +147,6 @@ feeder_build_format(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_FORMAT; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -220,7 +219,6 @@ feeder_build_rate(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_RATE; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -298,7 +296,6 @@ feeder_build_matrix(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_MATRIX; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -355,7 +352,6 @@ feeder_build_volume(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_VOLUME; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -423,7 +419,6 @@ feeder_build_eq(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_EQ; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -503,7 +498,6 @@ feeder_build_mixer(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_MIXER; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { From nobody Tue Nov 18 00:52:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R054dGTz6HHKH; Tue, 18 Nov 2025 00:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R051W6pz3xqJ; Tue, 18 Nov 2025 00:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LJlPci3lCQLlyb0wZrDT8bZWR6tr/Nfrxxsz3/Aj6Xo=; b=UdbSJJkQ05hRWrXcs/jiE0sERyQSizZJ/malEgXRwXv0FVlfJWPufcyrGC5ukHVbJn1wMA JjbfqB4vBzY6HZapPBOVaeRFgHzAnno4PmmN+6aDvyfqGIA3mjt1EsfNAQWpeOAEi2huGV mA1I5kKPQsJ5Bk0uBQbzsohYmjt166pFbzMx6corLk1J8PS0HnlIHe/mFalPTf7l0rHvYD HkrMYtYUV1ZNJ2qTK3qqFL4oUeaKPHkBmgoBnZP/19foL/P09/vm7oF9pFoAD5WZfp5fN2 Ol4VRdQOPRgF4CgjOJT4bKkf1L99PPFX0Y5jmc2VbRfnRtkXMPJlwpGaQr+naQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LJlPci3lCQLlyb0wZrDT8bZWR6tr/Nfrxxsz3/Aj6Xo=; b=bXHZ3ABZMkCGoXwCnklURvsm1Tp9KGhsWt6AdZ9SdSa7V5VElFs5+x2VXJ+7qJQi+njSDH Zu9Y670OE9VgFg9ER/1PdlAPnQGhX7NL7kBB8N7Od3p6aXS9WyPOGq6cx93oN6aPG0suHH vYZL2exQMCpPQrNatFrIfQxZ4EgTl62yiw4ftAUxTptPYsVrvlQNga9NqE1+sYJGwwKY8P OjgxhdBzh6VAozxccKsaAE5r//zeEvWDDvC/Wf39T/a3twSrFILGSk3WrXSZBgEKkN2mlx Oi4CW/j2j/k/oE1cSM+4+N1fx4Ue/kboEQDpra9zkbSYma1lECgwXsdVTlwXJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427125; a=rsa-sha256; cv=none; b=faUxj13fpBjh8ONtBWyP4UDmM5tRVYR2UQAdH4g2jllKFj/SMyeokOLP14zCJK4zCnUHQx 8zaIAOHdL4INV4wjRj9FkFwGlh8r5Z4+FDi8VY1ksPJ0VGrp4zqpfsaKqR69UxQWvrF7KR ThswIpibE1fH75fO0gOjq/d1HHZNuJ9IbqpQpC/64bL9ocUf5/v21rosu3lWivYWnGRjfO 2159NpvZ4Zr4E0EAQ14x1FBOHIXq+WQ9HUNdNCZrA1wJ8hjLuQNPZOGC+PJla0u8JBrTkx QR2NVdEl1qbfu3M5dBl0Z5B4FvJyTvhVG4/+6yxg+Q8ff6/ACqxQiztVm9ms1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R050vjgzXhJ; Tue, 18 Nov 2025 00:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q5kQ045340; Tue, 18 Nov 2025 00:52:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q5WF045337; Tue, 18 Nov 2025 00:52:05 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:05 GMT Message-Id: <202511180052.5AI0q5WF045337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 5dd90538ba4d - stable/15 - sound: Simplify feeder_getclass() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5dd90538ba4d13e0fe6633568412dfa11966fa39 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5dd90538ba4d13e0fe6633568412dfa11966fa39 commit 5dd90538ba4d13e0fe6633568412dfa11966fa39 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:09 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Simplify feeder_getclass() With the parameters we provide feeder_getclass(), the only thing we really care about is the feeder's class type. We can simplify (and make the code more readable) that by simply passing the type to feeder_getclass(). Apart from being simpler, we can now also retire feedertab_entry->desc and cmpdesc(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53553 (cherry picked from commit 441a411853e48719d4aa6a36bba0a4c4cbca3a4f) --- sys/dev/sound/pcm/channel.c | 2 +- sys/dev/sound/pcm/feeder.c | 26 +++++++------------------- sys/dev/sound/pcm/feeder.h | 2 +- sys/dev/sound/pcm/feeder_chain.c | 14 +++++++------- 4 files changed, 16 insertions(+), 28 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index fda4cd2314a6..f29a819ce0ae 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1257,7 +1257,7 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, chn_vpc_reset(c, SND_VOL_C_PCM, 1); CHN_UNLOCK(c); - fc = feeder_getclass(NULL); + fc = feeder_getclass(FEEDER_ROOT); if (fc == NULL) { device_printf(d->dev, "%s(): failed to get feeder class\n", __func__); diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 6b7c7f43903c..e818ed4a1a5d 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -44,7 +44,6 @@ static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); struct feedertab_entry { SLIST_ENTRY(feedertab_entry) link; struct feeder_class *feederclass; - struct pcm_feederdesc *desc; }; static SLIST_HEAD(, feedertab_entry) feedertab; @@ -56,12 +55,12 @@ feeder_register_root(void *p) struct feeder_class *fc = p; struct feedertab_entry *fte; - KASSERT(fc->desc == NULL, ("first feeder not root: %s", fc->name)); + KASSERT(fc->desc.type == FEEDER_ROOT, + ("first feeder not root: %s", fc->name)); SLIST_INIT(&feedertab); fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); fte->feederclass = fc; - fte->desc = NULL; SLIST_INSERT_HEAD(&feedertab, fte, link); } @@ -75,7 +74,6 @@ feeder_register(void *p) fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); fte->feederclass = fc; - fte->desc = &fc->desc; SLIST_INSERT_HEAD(&feedertab, fte, link); } @@ -92,14 +90,6 @@ feeder_unregisterall(void *p) } } -static int -cmpdesc(struct pcm_feederdesc *n, struct pcm_feederdesc *m) -{ - return ((n->type == m->type) && - ((n->in == 0) || (n->in == m->in)) && - ((n->out == 0) || (n->out == m->out))); -} - static void feeder_destroy(struct pcm_feeder *f) { @@ -143,17 +133,15 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) } struct feeder_class * -feeder_getclass(struct pcm_feederdesc *desc) +feeder_getclass(u_int32_t type) { struct feedertab_entry *fte; SLIST_FOREACH(fte, &feedertab, link) { - if ((desc == NULL) && (fte->desc == NULL)) - return fte->feederclass; - if ((fte->desc != NULL) && (desc != NULL) && cmpdesc(desc, fte->desc)) - return fte->feederclass; + if (fte->feederclass->desc.type == type) + return (fte->feederclass); } - return NULL; + return (NULL); } int @@ -431,7 +419,7 @@ static struct feeder_class feeder_root_class = { .name = "feeder_root", .methods = feeder_root_methods, .size = sizeof(struct pcm_feeder), - .desc = { 0 }, + .desc = { FEEDER_ROOT, 0, 0 }, .data = NULL, }; /* diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index 86cabb3e9925..e883083f7504 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -49,7 +49,7 @@ struct pcm_feeder { }; void feeder_register(void *p); -struct feeder_class *feeder_getclass(struct pcm_feederdesc *desc); +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); diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index f5075bf76a49..6d896364e3ca 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -148,7 +148,7 @@ feeder_build_format(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->in = 0; desc->out = 0; - fc = feeder_getclass(desc); + fc = feeder_getclass(FEEDER_FORMAT); if (fc == NULL) { device_printf(c->dev, "%s(): can't find feeder_format\n", __func__); @@ -220,7 +220,7 @@ feeder_build_rate(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->in = 0; desc->out = 0; - fc = feeder_getclass(desc); + fc = feeder_getclass(FEEDER_RATE); if (fc == NULL) { device_printf(c->dev, "%s(): can't find feeder_rate\n", __func__); @@ -297,7 +297,7 @@ feeder_build_matrix(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->in = 0; desc->out = 0; - fc = feeder_getclass(desc); + fc = feeder_getclass(FEEDER_MATRIX); if (fc == NULL) { device_printf(c->dev, "%s(): can't find feeder_matrix\n", __func__); @@ -353,7 +353,7 @@ feeder_build_volume(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->in = 0; desc->out = 0; - fc = feeder_getclass(desc); + fc = feeder_getclass(FEEDER_VOLUME); if (fc == NULL) { device_printf(c->dev, "%s(): can't find feeder_volume\n", __func__); @@ -420,7 +420,7 @@ feeder_build_eq(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->in = 0; desc->out = 0; - fc = feeder_getclass(desc); + fc = feeder_getclass(FEEDER_EQ); if (fc == NULL) { device_printf(c->dev, "%s(): can't find feeder_eq\n", __func__); @@ -462,7 +462,7 @@ feeder_build_root(struct pcm_channel *c, struct feeder_chain_desc *cdesc) struct feeder_class *fc; int ret; - fc = feeder_getclass(NULL); + fc = feeder_getclass(FEEDER_ROOT); if (fc == NULL) { device_printf(c->dev, "%s(): can't find feeder_root\n", __func__); @@ -499,7 +499,7 @@ feeder_build_mixer(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->in = 0; desc->out = 0; - fc = feeder_getclass(desc); + fc = feeder_getclass(FEEDER_MIXER); if (fc == NULL) { device_printf(c->dev, "%s(): can't find feeder_mixer\n", __func__); From nobody Tue Nov 18 00:52:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0666dhz6HH0b; Tue, 18 Nov 2025 00:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R062bQHz3yDh; Tue, 18 Nov 2025 00:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zxk6P9CCFJhxTkzwz6wTPUVMRbSdZWqaRij3bLFs/K8=; b=PXtedD/lRewcAP5eDnnW6E0IW6pdlgWrZ6VrE5w7S00TMPVnVYGF1MkPCnkCquhEkotcSF hIvlh/+w+bnpFeREbDdXGu5IBJ4N7BeODVUGqo+JW9NZxV0RP9OY7KcMXiP4+na37jMRij BpGxYG24yjEKQyIKq1Tn1SbyeWAPMnXoUsm2hLg4v0jy10bV9P+CzoRXMezP4uWvwGq7Ot pOtXYKNaj4VfHBTGx3HX01z+mim3+jWwq+a8C0VZzG8LKLFirktDX9QYo4GfhZgZE8UvcB OEKLn5ZmPmowwWSEyEq8mAltooPElKp0jMggz+jBDAwqQVeRLdppnQ3jNEUWuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zxk6P9CCFJhxTkzwz6wTPUVMRbSdZWqaRij3bLFs/K8=; b=Zu93qvVXajA4wH2PQmkmVnH848D41THnbEk7EkWvv/fX/6E23qw2NQZcX7n6tqLAhKKwHo Dvjq5kAEFqzr4lX5xnhTVFo96kz+1GwcAc4f14uBqmMfhF0EGSxEAyohxvVeatloaTnSZF n1HxHsMDJuBIhFIng9GynGj7MpJOotdjvNnR4Ku7CWHztARA0B2WCwv9iQaBBoAEV2dwdz rbp4IUfLPAkHC8dqBiJPeFZQ7rh4O8mwM6MWhnPdxQnYpBlA77JDLGzy/7FwXgdlVmzOdf eyce4r4QwPvpAVU6FzBZkfSkrPNrbPCCxFlLMB83GYP0bdQNZhiKgGVBRMaR+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427126; a=rsa-sha256; cv=none; b=JOgUInqTt2wc6ERlUowBtwcXrYpZP2SxU4Q59CDf+FF/29amQNOrn7b4ULQHwCdSKcWRO+ FI7/pvZxtBv4SbjqTFITZhdLpAHwqLIwgo9zHgjor7L6Yi+xsgA5dTwxY7/XvUPrQAK8KI C2kA4qfcBZsCnPLnJhY7YYQOuXEEAlIA3J7ZE1iDuDKqI9mWDfxwTtAEg2WD++Cd+QzIHY syhtteObWtSKBH2TvdjpMI9Dpnt0MatlR8gW++e/YWv8ak3P4SuNPHmJt68tEc9bYHRTPs 5+d+ZBS9YpkeAEGbVlwLY6AO0QOWse5RvOLETs0Yh5XtuWp80xYYR2NyQJIbxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R061mczzXdb; Tue, 18 Nov 2025 00:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q6xD046078; Tue, 18 Nov 2025 00:52:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q6ZE046075; Tue, 18 Nov 2025 00:52:06 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:06 GMT Message-Id: <202511180052.5AI0q6ZE046075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 2acd16ce68be - stable/15 - sound: Retire feedertab_entry List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2acd16ce68be04755508d63c05d3eb15a5916c6f Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2acd16ce68be04755508d63c05d3eb15a5916c6f commit 2acd16ce68be04755508d63c05d3eb15a5916c6f Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:14 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Retire feedertab_entry Have an SLIST of feeder_class directly. This way we simplify the code, and also avoid the additional malloc()/free() for each entry. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53554 (cherry picked from commit c24ca02c4c85d0b691a6100fd3006b1f23061858) --- sys/dev/sound/pcm/feeder.c | 37 +++++++++---------------------------- sys/dev/sound/pcm/feeder.h | 1 + 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index e818ed4a1a5d..6f7b225af3b9 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -41,53 +41,34 @@ static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); -struct feedertab_entry { - SLIST_ENTRY(feedertab_entry) link; - struct feeder_class *feederclass; -}; -static SLIST_HEAD(, feedertab_entry) feedertab; - -/*****************************************************************************/ +static SLIST_HEAD(, feeder_class) feedertab; static void feeder_register_root(void *p) { struct feeder_class *fc = p; - struct feedertab_entry *fte; KASSERT(fc->desc.type == FEEDER_ROOT, ("first feeder not root: %s", fc->name)); SLIST_INIT(&feedertab); - fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); - fte->feederclass = fc; - SLIST_INSERT_HEAD(&feedertab, fte, link); + SLIST_INSERT_HEAD(&feedertab, fc, link); } void feeder_register(void *p) { struct feeder_class *fc = p; - struct feedertab_entry *fte; KASSERT(fc->desc.type != 0, ("feeder '%s' has no descriptor", fc->name)); - fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); - fte->feederclass = fc; - SLIST_INSERT_HEAD(&feedertab, fte, link); + SLIST_INSERT_HEAD(&feedertab, fc, link); } static void -feeder_unregisterall(void *p) +feeder_unregisterall(void *p __unused) { - struct feedertab_entry *fte, *next; - - next = SLIST_FIRST(&feedertab); - while (next != NULL) { - fte = next; - next = SLIST_NEXT(fte, link); - free(fte, M_FEEDER); - } + SLIST_INIT(&feedertab); } static void @@ -135,11 +116,11 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) struct feeder_class * feeder_getclass(u_int32_t type) { - struct feedertab_entry *fte; + struct feeder_class *fc; - SLIST_FOREACH(fte, &feedertab, link) { - if (fte->feederclass->desc.type == type) - return (fte->feederclass); + SLIST_FOREACH(fc, &feedertab, link) { + if (fc->desc.type == type) + return (fc); } return (NULL); } diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index e883083f7504..5ac92bf13735 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -36,6 +36,7 @@ struct feeder_class { KOBJ_CLASS_FIELDS; struct pcm_feederdesc desc; void *data; + SLIST_ENTRY(feeder_class) link; }; struct pcm_feeder { From nobody Tue Nov 18 00:52:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R076M3xz6HHFM; Tue, 18 Nov 2025 00:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R073BZdz3y83; Tue, 18 Nov 2025 00:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7OP/LtYnMwL8TWE3OFAiHfv4XRHzdPtDyi1o7UIojgo=; b=APVGCOrjaf1Lbt1sZ9XRKp785hiDoBlpPc38pr1y1+tKtIfNgD1XhrNu5T/daPFDixm7Lq 2keCk87mow+KCvDfhdDKTS6hr+lv9w8W6bptTQb7VWjBoPTJyJkgigiAUEV3grPRG32pRq dzzX/XkgXxNEN/ujhOU30/vM214bg2cLdfVWrPzgoQh74A2Us1fmKyyUPaWGoEGlaSBdyC tYE8N2JsAkiP4KTKmk4fVdWpPlLy1nkkQ6vLsr55lOOGjFS/k7usGnNPkXRsqQ48xKoeNx 0dtGJ2W7jt/PC+WPJEGH9DBISuuRiJGKAtSiubiBV6NhvysGH4mGTQhoekJyQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7OP/LtYnMwL8TWE3OFAiHfv4XRHzdPtDyi1o7UIojgo=; b=hhXlft2mnyc+Qq+MH1oi+KoBh4UOHVwx02xPwFCM0O7o9DGnrXqKsjztzUkb9MUrBEl6qH EZYuWMrCrBgeRLa3pafQSffc4om0C3eqoYlvlajUsmGdWoPR/al9MglabGuPBdCrMOfadK g0O3N/7ldoorlwPS0zrBRMal7k25RSDmKutY+gFt42ImrRH6iTyOfSCa9WBuHG754ho2Wi I1zIuz7d6iflpISsW9W5EdtR+JyBccwNyPZyJ/XX2XGiYi1/OnZwMMeo402Ag6eFyX06ao /Oj7IcT3jULQwpfxOYIPzPSykP9BI9bx0RKET4Xc78h3VGTM9oyrcu22/JSl9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427127; a=rsa-sha256; cv=none; b=byooFRocvXDQJyZAXDdsh6u3rvH0xpsTetEufI6VsMB0BANKozySiTg+IODONXjnRowK4C GQSMLHDhtvdh6bGJ/H7jiedRKUTwXWvEhs+G2cWDMaLZKvCv7/UQXIJJvNExVRrgOl57w7 BkD8x0N0A7CcgFikc2/edihBTlOoAV1RJQU/iD61AKe/586xqVsvOs8iW7UFRoKUJuFRZj JbCVZ1S1x41fJEPGOGMhPq2jTXKBNkOaU+5P1teetm+0eq+e/M4jDu3PbuNq4+nqkm4W2b UAxmvDlDNIyATdaLtIr/3hhw6JnMAwVE7VvqZqrsyxQIO5TclTwQXM2Hd+7Fqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R072k5SzYMR; Tue, 18 Nov 2025 00:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q7SA046710; Tue, 18 Nov 2025 00:52:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q7Of046707; Tue, 18 Nov 2025 00:52:07 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:07 GMT Message-Id: <202511180052.5AI0q7Of046707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 3305f6e6317c - stable/15 - sound: Retire feeder_class->data List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3305f6e6317c3480804b8ddda83fa882efe6b745 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3305f6e6317c3480804b8ddda83fa882efe6b745 commit 3305f6e6317c3480804b8ddda83fa882efe6b745 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:18 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Retire feeder_class->data It's always NULL. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53555 (cherry picked from commit 762f8e6f515a33274503872cf597e0895ff706bc) --- sys/dev/sound/pcm/feeder.c | 3 +-- sys/dev/sound/pcm/feeder.h | 4 +--- sys/dev/sound/pcm/feeder_eq.c | 2 +- sys/dev/sound/pcm/feeder_format.c | 2 +- sys/dev/sound/pcm/feeder_matrix.c | 2 +- sys/dev/sound/pcm/feeder_mixer.c | 2 +- sys/dev/sound/pcm/feeder_rate.c | 2 +- sys/dev/sound/pcm/feeder_volume.c | 2 +- 8 files changed, 8 insertions(+), 11 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 6f7b225af3b9..f55c3e5992e1 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -88,7 +88,7 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) if (f == NULL) return NULL; - f->data = fc->data; + f->data = NULL; f->source = NULL; f->parent = NULL; f->class = fc; @@ -401,7 +401,6 @@ static struct feeder_class feeder_root_class = { .methods = feeder_root_methods, .size = sizeof(struct pcm_feeder), .desc = { FEEDER_ROOT, 0, 0 }, - .data = NULL, }; /* * Register the root feeder first so that pcm_addchan() and subsequent diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index 5ac92bf13735..f89652ab9635 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -35,7 +35,6 @@ struct pcm_feederdesc { struct feeder_class { KOBJ_CLASS_FIELDS; struct pcm_feederdesc desc; - void *data; SLIST_ENTRY(feeder_class) link; }; @@ -64,13 +63,12 @@ struct pcm_feeder *feeder_find(struct pcm_channel *c, u_int32_t type); void feeder_printchain(struct pcm_feeder *head); int feeder_chain(struct pcm_channel *); -#define FEEDER_DECLARE(feeder, type, pdata) \ +#define FEEDER_DECLARE(feeder, type) \ static struct feeder_class feeder ## _class = { \ .name = #feeder, \ .methods = feeder ## _methods, \ .size = sizeof(struct pcm_feeder), \ .desc = { type, 0, 0 }, \ - .data = pdata, \ }; \ SYSINIT(feeder, SI_SUB_DRIVERS, SI_ORDER_ANY, feeder_register, \ &feeder ## _class) diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 05f5a5b82290..3838328fb0bb 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -427,7 +427,7 @@ static kobj_method_t feeder_eq_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_eq, FEEDER_EQ, NULL); +FEEDER_DECLARE(feeder_eq, FEEDER_EQ); static int32_t feed_eq_scan_preamp_arg(const char *s) diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 21b54fcafcd7..d2c4d7618ab4 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -180,4 +180,4 @@ static kobj_method_t feeder_format_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_format, FEEDER_FORMAT, NULL); +FEEDER_DECLARE(feeder_format, FEEDER_FORMAT); diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 69c7e5962268..7319b10930de 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -405,7 +405,7 @@ static kobj_method_t feeder_matrix_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_matrix, FEEDER_MATRIX, NULL); +FEEDER_DECLARE(feeder_matrix, FEEDER_MATRIX); /* External */ int diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 3c2a58ba145f..10de42ba727a 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -366,4 +366,4 @@ static kobj_method_t feeder_mixer_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_mixer, FEEDER_MIXER, NULL); +FEEDER_DECLARE(feeder_mixer, FEEDER_MIXER); diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 173a0c1fcd39..c2c232a97177 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -1714,4 +1714,4 @@ static kobj_method_t feeder_rate_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_rate, FEEDER_RATE, NULL); +FEEDER_DECLARE(feeder_rate, FEEDER_RATE); diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index 942f1a273edf..a45003849034 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -314,7 +314,7 @@ static kobj_method_t feeder_volume_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_volume, FEEDER_VOLUME, NULL); +FEEDER_DECLARE(feeder_volume, FEEDER_VOLUME); /* Extern */ From nobody Tue Nov 18 00:52:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R086C5cz6HH99; Tue, 18 Nov 2025 00:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0844PZz3yHV; Tue, 18 Nov 2025 00:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9VEzjh6lgcDZe65nkoEbb8LarN/SLoU075cWs6cIyfk=; b=Cu47wPRogP2pL5CNxUBrLO0hJCI/k9VYmnweBwyOwXnv4iJFeBrpQljeScxNF3QX7niZ3e ziKjrs7gzQ0v1Rbg44/jMHVHTz4H1VbpIZAQJuKBSQ4lX0ongDzkMTnZqtWMQep3I4f/8+ d8VvnRWGLplMnrFByl+t9dmIOa7dOOCSfwqNrHFktaT6/ZoWUldatBRXpxwy5DnUfDoF8p kGi9rw9JfwYwJW7XlkEiPPMldckUoPRwyCki9ygkx/0UF0+vPbvEnksGsbR+zbvgcL9Yi3 sZIWXabG1e2ZOufwNhxNi/zjLQYIHeiQlf/orm7t77LlcnbERuEzhqsmrRg8lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9VEzjh6lgcDZe65nkoEbb8LarN/SLoU075cWs6cIyfk=; b=vrGXSq8IqbacDEqmxu3XzjN/NoWETaN5U72ERtuHtGcpYWcmkPfg6uqjRD1P/D2SNna/XA K3XEOWNdMWnRcgZliGkEZLsFYG7X//5qePw3MIDpqr93zWBFKG9jP1YhDx7IC9DQeEcbgu fJ82tDiG41ptYhc3/WBl4+vG5LEy1IIYM9H2St7r3KrHlr72L/XWTbE82PY/o0KhHte36t bL0ltZ3CJjXae271d4gz+c7CzxgUcfIij+YuGQdQWlMbijlOyv5jhTCBO/3VoG9NDBilc1 TbaZPm5Mn2jxgFapHEGZK9DqX4jtu0gXh0YQ2T37kCx7FrZn5XmYh84EcEl6yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427128; a=rsa-sha256; cv=none; b=aRLQ5KpoqTg80ltIRKbx8FF9m/r/AvzzBQjAYDs4SLwQmtuqFTir0cVZKvLaCno3yIF3tX oLMrIPuU5YAVXSyaanR7HyffEZmZI/r61zamZKhUq6qUr90RCKcG98srCL0AhcboXvF1F5 II42/9fi/sN9aas7v7Idk3H4qGL+oWw0p7sh1Pv7YVnPyA5sgeYYdr0CsjnHeUockLM+Sj +viS6KseNANQO1HBsvL6adyMUQV1XZocbu7hR6mTOhz9a1QgZDymYInsZj9Xy68103WlMN j/2LMxHyT6SrzicvQQHmuLQLW4oCk42yZt9kQ8+3qq378bPK8SdLl+9+7fTWhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R083fQkzY7v; Tue, 18 Nov 2025 00:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q8DP046747; Tue, 18 Nov 2025 00:52:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q8KH046744; Tue, 18 Nov 2025 00:52:08 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:08 GMT Message-Id: <202511180052.5AI0q8KH046744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ae3cd550d257 - stable/15 - sound: Retire feeder_class->desc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ae3cd550d257e38ea21dee0915677f0c6aafbb3e Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ae3cd550d257e38ea21dee0915677f0c6aafbb3e commit ae3cd550d257e38ea21dee0915677f0c6aafbb3e Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:24 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Retire feeder_class->desc The only field we care about is pcm_feederdesc->type, so keep that one only and do not embed the whole pcm_feederdesc. While here, make the feeder type enum into a named one and use it as feeder_class->type's type. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53556 (cherry picked from commit 91fcc0132d0b192f07f9b67626c9af2ad8759857) --- sys/dev/sound/pcm/feeder.c | 8 ++++---- sys/dev/sound/pcm/feeder.h | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index f55c3e5992e1..acc9e374e718 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -48,7 +48,7 @@ feeder_register_root(void *p) { struct feeder_class *fc = p; - KASSERT(fc->desc.type == FEEDER_ROOT, + KASSERT(fc->type == FEEDER_ROOT, ("first feeder not root: %s", fc->name)); SLIST_INIT(&feedertab); @@ -60,7 +60,7 @@ feeder_register(void *p) { struct feeder_class *fc = p; - KASSERT(fc->desc.type != 0, ("feeder '%s' has no descriptor", fc->name)); + KASSERT(fc->type != 0, ("feeder '%s' has no descriptor", fc->name)); SLIST_INSERT_HEAD(&feedertab, fc, link); } @@ -119,7 +119,7 @@ feeder_getclass(u_int32_t type) struct feeder_class *fc; SLIST_FOREACH(fc, &feedertab, link) { - if (fc->desc.type == type) + if (fc->type == type) return (fc); } return (NULL); @@ -400,7 +400,7 @@ static struct feeder_class feeder_root_class = { .name = "feeder_root", .methods = feeder_root_methods, .size = sizeof(struct pcm_feeder), - .desc = { FEEDER_ROOT, 0, 0 }, + .type = FEEDER_ROOT, }; /* * Register the root feeder first so that pcm_addchan() and subsequent diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index f89652ab9635..171168d66e4e 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -27,6 +27,17 @@ * SUCH DAMAGE. */ +enum feeder_type { + FEEDER_ROOT, + FEEDER_FORMAT, + FEEDER_MIXER, + FEEDER_RATE, + FEEDER_EQ, + FEEDER_VOLUME, + FEEDER_MATRIX, + FEEDER_LAST, +}; + struct pcm_feederdesc { u_int32_t type; u_int32_t in, out; @@ -34,7 +45,7 @@ struct pcm_feederdesc { struct feeder_class { KOBJ_CLASS_FIELDS; - struct pcm_feederdesc desc; + enum feeder_type type; SLIST_ENTRY(feeder_class) link; }; @@ -63,27 +74,16 @@ struct pcm_feeder *feeder_find(struct pcm_channel *c, u_int32_t type); void feeder_printchain(struct pcm_feeder *head); int feeder_chain(struct pcm_channel *); -#define FEEDER_DECLARE(feeder, type) \ +#define FEEDER_DECLARE(feeder, ctype) \ static struct feeder_class feeder ## _class = { \ .name = #feeder, \ .methods = feeder ## _methods, \ .size = sizeof(struct pcm_feeder), \ - .desc = { type, 0, 0 }, \ + .type = ctype, \ }; \ SYSINIT(feeder, SI_SUB_DRIVERS, SI_ORDER_ANY, feeder_register, \ &feeder ## _class) -enum { - FEEDER_ROOT, - FEEDER_FORMAT, - FEEDER_MIXER, - FEEDER_RATE, - FEEDER_EQ, - FEEDER_VOLUME, - FEEDER_MATRIX, - FEEDER_LAST, -}; - /* feeder_format */ enum { FEEDFORMAT_CHANNELS From nobody Tue Nov 18 00:52:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0B0jQKz6HH0k; Tue, 18 Nov 2025 00:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0955DZz3y68; Tue, 18 Nov 2025 00:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O0x1tZUbSlfrlu+WbMhuf72oWKpkKlvwN08jSzmXcg8=; b=VgUfYtMQ4wSzk4JfoB6kqzpL/vmuXfLGiOwZAKjhD9wStsx0sC0H2InTBQncFMuPV8zv2p ONBvehP4Z7KnhQs8YpBChdeWGZ2zsMeSZMVJmnJqDmIRrfXL9f4c+ztHBpLIF1Z7Px0I33 r0US/sqP/YpuvyZXOUhVc9hj+s2p90ru+JiNBsNb0wCrrdP0YsEMr9lSWeRU2IvydrLBdX DhlB1+34goRUG/MVPRC6zRiU4PSKuPig8vFsVcajqGHSmEg7ooj3JEai9rO7bmUu6IZ4kM JPMETFLp0fuM4MOccyvaJAYuDjPvgbDonsviiTlvLxBa8i2vb50zhT2V4Uq7qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O0x1tZUbSlfrlu+WbMhuf72oWKpkKlvwN08jSzmXcg8=; b=ozgvuOaRKxmV6ZT+q2wEROzY2HLTkTvcZrWWwMuXVV+A1/3RIIUX1RPZbYA1qRz4NmG6pg kRPrv3j/1E927T8g6VGvtR1/x+NBWRJdPLW8XUkXUrV/mXasumqOfIE6J3nu0pVkRcldGg O0y1/xnDtJKmviG7vsrbvaWcrM2BMAAD73WRZtT2h0V4JoVzROKFJC/ikGnV1gBWzIRqJz zfR/4/tpsA3La6H79Fm/2B1uHSLNfd8XDELFenjShCMgbRmjJ3sfkow0Sm/Jm+HlHyYFoH PuW5PDrGzoR5wR603pHhHWQVpfnfy494wNpp1KnSsGVJX0l944Hws/ZPfHqdaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427129; a=rsa-sha256; cv=none; b=izvZy1kT+bBcKB2bDjNyiwRg+cdN9trgehgQB5ysCXNnFh6sP2FleQTmR67C9R5k5EIGwP pb4pfKO3sFd6upXbPPtPb/53bCO3sd07HYfwu9aFnRCTbLjOohYLDh4c+D8GMkEpHMhvH9 +Y99FxohSSz9BwK+b3E9ApIMizBD48PTxr1GbSkVJT/H4oC2I+6dzZNojGC0GLLGV2JCS9 37Z8ImMRxCjbGfgk6GQR1HFtoxVmJuJLs9QJ3ox6UqsGVXBIFeP5FuMG3GNyqr6Gw+CRlK VFLqc8QauwQnjkqiMlMR67Cje4osgMh0eLJEfy2eXUKDbZDT9BiDUMq5QNw/IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R094bbNzXb5; Tue, 18 Nov 2025 00:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q9iJ046781; Tue, 18 Nov 2025 00:52:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q94s046778; Tue, 18 Nov 2025 00:52:09 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:09 GMT Message-Id: <202511180052.5AI0q94s046778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: f709b2b59d44 - stable/15 - sound: Retire pcm_feederdesc->type List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f709b2b59d446b4eacb9d3221a49c5a2bbb75211 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f709b2b59d446b4eacb9d3221a49c5a2bbb75211 commit f709b2b59d446b4eacb9d3221a49c5a2bbb75211 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:28 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Retire pcm_feederdesc->type This is always accessed from pcm_feeder->desc->type. Instead of duplicating this field, we can remove it from pcm_feederdesc, and access it through pcm_feeder->class->type. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53557 (cherry picked from commit 92dcd20222a2674ba31ae09865da19d948992994) --- sys/dev/sound/pcm/feeder.c | 4 ++-- sys/dev/sound/pcm/feeder.h | 1 - sys/dev/sound/pcm/feeder_chain.c | 6 ------ sys/dev/sound/pcm/feeder_matrix.c | 2 +- sys/dev/sound/pcm/feeder_volume.c | 2 +- sys/dev/sound/pcm/sndstat.c | 12 ++++++------ 6 files changed, 10 insertions(+), 17 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index acc9e374e718..874148cd9ab0 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -97,7 +97,7 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) if (desc) { *(f->desc) = *desc; } else { - f->desc->type = FEEDER_ROOT; + f->class->type = FEEDER_ROOT; f->desc->in = 0; f->desc->out = 0; } @@ -162,7 +162,7 @@ feeder_find(struct pcm_channel *c, u_int32_t type) f = c->feeder; while (f != NULL) { - if (f->desc->type == type) + if (f->class->type == type) return f; f = f->source; } diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index 171168d66e4e..d191edd201e9 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -39,7 +39,6 @@ enum feeder_type { }; struct pcm_feederdesc { - u_int32_t type; u_int32_t in, out; }; diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 6d896364e3ca..32dd4ca14faf 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -144,7 +144,6 @@ feeder_build_format(struct pcm_channel *c, struct feeder_chain_desc *cdesc) int ret; desc = &(cdesc->desc); - desc->type = FEEDER_FORMAT; desc->in = 0; desc->out = 0; @@ -216,7 +215,6 @@ feeder_build_rate(struct pcm_channel *c, struct feeder_chain_desc *cdesc) return (ret); desc = &(cdesc->desc); - desc->type = FEEDER_RATE; desc->in = 0; desc->out = 0; @@ -293,7 +291,6 @@ feeder_build_matrix(struct pcm_channel *c, struct feeder_chain_desc *cdesc) return (ret); desc = &(cdesc->desc); - desc->type = FEEDER_MATRIX; desc->in = 0; desc->out = 0; @@ -349,7 +346,6 @@ feeder_build_volume(struct pcm_channel *c, struct feeder_chain_desc *cdesc) return (ret); desc = &(cdesc->desc); - desc->type = FEEDER_VOLUME; desc->in = 0; desc->out = 0; @@ -416,7 +412,6 @@ feeder_build_eq(struct pcm_channel *c, struct feeder_chain_desc *cdesc) return (ret); desc = &(cdesc->desc); - desc->type = FEEDER_EQ; desc->in = 0; desc->out = 0; @@ -495,7 +490,6 @@ feeder_build_mixer(struct pcm_channel *c, struct feeder_chain_desc *cdesc) int ret; desc = &(cdesc->desc); - desc->type = FEEDER_MIXER; desc->in = 0; desc->out = 0; diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 7319b10930de..2c7a3e04690d 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -413,7 +413,7 @@ feeder_matrix_setup(struct pcm_feeder *f, struct pcmchan_matrix *m_in, struct pcmchan_matrix *m_out) { - if (f == NULL || f->desc == NULL || f->desc->type != FEEDER_MATRIX || + if (f == NULL || f->desc == NULL || f->class->type != FEEDER_MATRIX || f->data == NULL) return (EINVAL); diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index a45003849034..101cc7ba003b 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -332,7 +332,7 @@ feeder_volume_apply_matrix(struct pcm_feeder *f, struct pcmchan_matrix *m) struct feed_volume_info *info; uint32_t i; - if (f == NULL || f->desc == NULL || f->desc->type != FEEDER_VOLUME || + if (f == NULL || f->desc == NULL || f->class->type != FEEDER_VOLUME || f->data == NULL || m == NULL || m->channels < SND_CHN_MIN || m->channels > SND_CHN_MAX) return (EINVAL); diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index b5e52aa13a19..a7c53ac85eb8 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -533,12 +533,12 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) f = f->source; while (f != NULL) { sbuf_printf(&sb, "%s", f->class->name); - if (f->desc->type == FEEDER_FORMAT) { + if (f->class->type == FEEDER_FORMAT) { snd_afmt2str(f->desc->in, buf, sizeof(buf)); sbuf_printf(&sb, "(%s -> ", buf); snd_afmt2str(f->desc->out, buf, sizeof(buf)); sbuf_printf(&sb, "%s)", buf); - } else if (f->desc->type == FEEDER_MATRIX) { + } else if (f->class->type == FEEDER_MATRIX) { sbuf_printf(&sb, "(%d.%dch -> %d.%dch)", AFMT_CHANNEL(f->desc->in) - AFMT_EXTCHANNEL(f->desc->in), @@ -546,7 +546,7 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) AFMT_CHANNEL(f->desc->out) - AFMT_EXTCHANNEL(f->desc->out), AFMT_EXTCHANNEL(f->desc->out)); - } else if (f->desc->type == FEEDER_RATE) { + } else if (f->class->type == FEEDER_RATE) { sbuf_printf(&sb, "(%d -> %d)", FEEDER_GET(f, FEEDRATE_SRC), FEEDER_GET(f, FEEDRATE_DST)); @@ -1328,10 +1328,10 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) f = f->source; while (f != NULL) { sbuf_printf(s, "%s", f->class->name); - if (f->desc->type == FEEDER_FORMAT) { + if (f->class->type == FEEDER_FORMAT) { sbuf_printf(s, "(0x%08x -> 0x%08x)", f->desc->in, f->desc->out); - } else if (f->desc->type == FEEDER_MATRIX) { + } else if (f->class->type == FEEDER_MATRIX) { sbuf_printf(s, "(%d.%d -> %d.%d)", AFMT_CHANNEL(f->desc->in) - AFMT_EXTCHANNEL(f->desc->in), @@ -1339,7 +1339,7 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) AFMT_CHANNEL(f->desc->out) - AFMT_EXTCHANNEL(f->desc->out), AFMT_EXTCHANNEL(f->desc->out)); - } else if (f->desc->type == FEEDER_RATE) { + } else if (f->class->type == FEEDER_RATE) { sbuf_printf(s, "(0x%08x q:%d %d -> %d)", f->desc->out, From nobody Tue Nov 18 00:52:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0C00r6z6HH0l; Tue, 18 Nov 2025 00:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0B5qJqz3yj0; Tue, 18 Nov 2025 00:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=140Pp7kS0bmz0YO2dhWwrdAR09JQ8QxigaE7raFgSR8=; b=jCb2AwB06R+L51tvTSenrEJNESIrv3ZQfCEhb4trRgYedWO+rESIfK/F/Eo4tj6u3jP9X1 xqnm6ss72+B2qte8m+jC6Aajhhs8QtyR5LLKT47u5Jvo/1pjIQ370wnCJmUtt/yj0tAQII dLNNFu4QfIXz0c1cas82CaO6BAk4JH38UoGrIDhazJWN/JYtmLrqpLksTXKEfO0nWUcsv5 I9umhRLMcNbXo9lW7GYWMPQ7Eh44N3/5P6wDx5OKSbAYyuXhxTtwzCoctByb8hpjEo/SxA lN71IPny6TY0ZHisHjgQXVFLpvs4yfD2TJGmNZCY6KVrVF8lweEIariN3IyOWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=140Pp7kS0bmz0YO2dhWwrdAR09JQ8QxigaE7raFgSR8=; b=GtX/DVxMlmKbuV0DJ4hG6GCpPEI6VkYSOafoghyPhw8d47zwf7WyRxm04O0+60CKqswC/+ 6VxwRa1hHITsGD9Y4B88vWW4jZ00MSa4tLMsTk7iuqYg4DD8oseFy7Y9aSZad0/Cs72ddC WL0YSYY4hqe0RHaLbP4Wi6NrFm6wYjD3A9ovzc8tDkKusR3bjtzI1++35Nx8xP1gcw6bHa qji1mTlHRfoZV2oRXgKpGBmAfUMNKwrSNusL+8h8q1YsSoedev2nQHvpDXMAZk9CLg9PwK xVXEtTrL0coWxDWXmnTpdnx+tXeh+XJ0kop4esG3q6uNmbtY3k5exKCrD75ZtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427130; a=rsa-sha256; cv=none; b=yEgK6vRR4Kse9zx0GSEosmXjLuUbo6JFZuO23bcwDB822i+nP5OmHKopjL29YHVqbmnFA8 7OHtPc7soZpSGfgvBXKeP62EmX5tFeBZTUGquZY2W9u/0aF6xW/RQze+oLflYKDRKnsvED 57G0X4x/jrzvJegMEv57KHCfv5XxgVfuh7ili0nzvb2JiBtRMwpfqpXX4Q/3W7WkqIePLQ PeW2uJclRmkeQvVXl7G1Px9NjTi9JZz4lFVyiXcsT5RqAmJ3hsxBQFD5Bjjhm+2vUgRqs+ shtr2najBjSRSoZJnnjhgH4lt7Vts9e5AY6IEE6iYKda2Q4rDnZnHfLoHCpAWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0B5R6DzY9V; Tue, 18 Nov 2025 00:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qAqU046815; Tue, 18 Nov 2025 00:52:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qAOm046812; Tue, 18 Nov 2025 00:52:10 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:10 GMT Message-Id: <202511180052.5AI0qAOm046812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ad348a08586f - stable/15 - sound: Remove unnecessary initializations in feeder_create() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ad348a08586f9244a363a7cb9098a395c772e448 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ad348a08586f9244a363a7cb9098a395c772e448 commit ad348a08586f9244a363a7cb9098a395c772e448 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:32 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 sound: Remove unnecessary initializations in feeder_create() We do not need to zero out fields since the struct is allocated with M_ZERO. Also we no longer need to have a special case for the root feeder. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53558 (cherry picked from commit 699fd108c50ccbd576476a2c95fa03e16492f2f9) --- sys/dev/sound/pcm/feeder.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 874148cd9ab0..75c0f0405040 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -88,19 +88,10 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) if (f == NULL) return NULL; - f->data = NULL; - f->source = NULL; - f->parent = NULL; f->class = fc; f->desc = &(f->desc_static); - - if (desc) { + if (desc != NULL) *(f->desc) = *desc; - } else { - f->class->type = FEEDER_ROOT; - f->desc->in = 0; - f->desc->out = 0; - } err = FEEDER_INIT(f); if (err) { From nobody Tue Nov 18 00:52:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0D0v45z6HHKS; Tue, 18 Nov 2025 00:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0C6KvJz3yf7; Tue, 18 Nov 2025 00:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTcHitxkzWL9I5UA51radnBOKBROAzHxNyWfIs5GXlo=; b=kkVI4mw4Tm3fsKMiRcueFFjl/sctBRAVzAVPP7KkYB67fkvZYkqU0CbwU3gMqoMA5SRUzw hUsUaRYIRizvk9kcpt0E3wjkzA6suPRmstsqEPkwXFmOGZvtr1FEp7z6cIf5JmOJtRvB20 twR8seDfybhoC3MmSD/vchLJnq3clMwr8bZF77vrTAqb1abssVI5XRBneO+qyEByKffwgO h4b/RgT467oKjyo82gFA2gl19urdl/H/gDuGATBD75zMD2TIUejrRa+mZ+FOmLNTzGgPPE XYuKHxq3bSF5RhN9PDyOHXfqqRc+u3EvV7iNc/+Jdl6nBV2yydywefzzNFV8DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTcHitxkzWL9I5UA51radnBOKBROAzHxNyWfIs5GXlo=; b=iCEMOU//GFmm1IKnGOX5ZySg/UctgwTQsTvAxKxGyGoh/bWKzWoEtsj1yAAFSQvXowoma+ mVJ9LWdBM38imOC62LKJHxQP+/Md6JoC5rBpgQ4HSvyeJuxzPC1C+AtHFXIsf306sCQsG6 56tA39vYGNdxtvG2ywOposSyH9rlSxkEOjeuAS2f3sFhJ+ZIRRY3XBI+i4Mnwrxvayep4s RVxJ8bkNyzMPmotyATR/iGBX+Y3km1vMMlkwIrWHZ4177f5cSUYQESwJ7kxZ/F7+m9JHIt QJMoNOaOuRGwF8rm5d63FggALE3x8jFosOoA0cv3eibDm7FnjOng0Cnb2WqM6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427131; a=rsa-sha256; cv=none; b=FFAfokZ2SrloKuODoTp/1PJTIAYovinWieAWC4FryyT4USESSfcY/biZAdlqDGnbY9cC5w hliuOPJTVp49Vt/9YmRTxwEDGqQhac+Ei/WnQkCAuJ80V4b2VhUm+cAzGCIawafsXq6pCU mXmjyUbe+EIom/V10PuZBFfrUYyL/bguru6iEAwkARuqo2SBZwFnS5EFo/Rs45EZ03RsIV 9caCxSv0h0DvrWlPC1wS8dKJ0Pz66fqcVPVPZvQ+uZMdaGZxFYZUIlILlX2MLPGW0EV6OT B6A5xu6aYNbP8yGvf1uxrouanxKjHJ4JzjF08r+8jexfne0+IIE/Hd3LkmMmHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0C5wZ8zY7x; Tue, 18 Nov 2025 00:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qBp7046847; Tue, 18 Nov 2025 00:52:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qBsN046844; Tue, 18 Nov 2025 00:52:11 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:11 GMT Message-Id: <202511180052.5AI0qBsN046844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: d1a627f39a33 - stable/15 - sound: Retire unused feeder_printchain() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d1a627f39a33afb82de95fa24b027e8b3a5b93fe Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d1a627f39a33afb82de95fa24b027e8b3a5b93fe commit d1a627f39a33afb82de95fa24b027e8b3a5b93fe Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:37 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 sound: Retire unused feeder_printchain() We can print it with "sndctl feederchain". Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53559 (cherry picked from commit f4819a1b6c441f804d66d710678bf5558ee29eee) --- sys/dev/sound/pcm/feeder.c | 16 ---------------- sys/dev/sound/pcm/feeder.h | 1 - 2 files changed, 17 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 75c0f0405040..e2d05f307f4d 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -318,22 +318,6 @@ snd_fmtbest(u_int32_t fmt, u_int32_t *fmts) return best2; } -void -feeder_printchain(struct pcm_feeder *head) -{ - struct pcm_feeder *f; - - printf("feeder chain (head @%p)\n", head); - f = head; - while (f != NULL) { - printf("%s @ %p\n", f->class->name, f); - f = f->source; - } - printf("[end]\n\n"); -} - -/*****************************************************************************/ - static int feed_root(struct pcm_feeder *feeder, struct pcm_channel *ch, u_int8_t *buffer, u_int32_t count, void *source) { diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index d191edd201e9..f1c96d86fda0 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -70,7 +70,6 @@ int feeder_add(struct pcm_channel *c, struct feeder_class *fc, struct pcm_feederdesc *desc); void feeder_remove(struct pcm_channel *c); struct pcm_feeder *feeder_find(struct pcm_channel *c, u_int32_t type); -void feeder_printchain(struct pcm_feeder *head); int feeder_chain(struct pcm_channel *); #define FEEDER_DECLARE(feeder, ctype) \ From nobody Tue Nov 18 00:52:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0F3wyrz6HH9J; Tue, 18 Nov 2025 00:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0F0jkZz3yfh; Tue, 18 Nov 2025 00:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nm11j/KfSEwfWkvKTIttU8Y4IHSCAJFOzh4bykeKOg=; b=iDjoJKtH73G7dd3x8eE9bXrtX2iEDI3xLE/Xh488Tov9iQPyhzZ3gTn6B6Tmus2dLna8YU Xlyro9cd4omnHoV9l4OcZaM/UrNpIL4ZZU5Ie2fM0JpoSM+nZgNeoBkkmN81/mj2jJxHUq Ly6nWc8LJLZdsUFRhQAMmjJzQmW3uRQ6AXG8bjaWzK2pkIhyht4K2cG4A6mdx2gSxCVQcO eDpIhV7j5rrGO9ytcPPbFbT5QBPLBGXOZfSgW58EAsLuI/wffvdfZfnh9XIMpKdgPTT3La zQLp8/koaIZ+KaR1fBtNVHObhO1U2d345WeV51qAAnzdVkcdAkP248ETYv5jwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nm11j/KfSEwfWkvKTIttU8Y4IHSCAJFOzh4bykeKOg=; b=ZoUoFKupwn+9EMtY7B3D+iZs9Yz7mACQ3j9sJg5odFRelNALIi7TuN5iQcgwhYRMx03jC9 sEIIk6WcsmMsh8SVEiaUzZvBMEMRhpbpVj2VYBW355qjAmAFog3mOdwTwFbsJRxx78Au40 h3Wjfr+EQXHXjdvmSVVUNV3W6USiSqs2fgqhRvtOtSs3HxCxISQkQvOEh1oZ1e0YsNPTrG VxOpN2NMo93hnUjmE+hlTqlZnQJov46z5VQhDSaPCd1uxAJ4ldztq91K3kstojEQFWo5mY LrciCUIPv1vfHuaTLoRF2btkLAMDNJNKrpfRtnHupJDabnhPlpmkdCYXJtocaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427133; a=rsa-sha256; cv=none; b=N7rC05eEa4MOPKYzdx7Kyyu2MAzEEAsx9Zg9+eJndnc0u2H3SiAZj76MvndJfm3vldz0nL qI9WLiqdS5d5T6hNTQc6+QXZdScuC4TjBlX0heyZHURUfaovcFZ201h+ViPFOT5DwVD3Ga rnJUu7vLpaJJ9yqV8Mwi7lo84vVvTbEpBjlOWJ2NdGsxb6ryidBIhiNQG8r57f2DTMOT8B NBhfOV3c/Cq+89Iiwy/ILNsbPwuZVp/KGnaJJQiLF1Y+1XSWkU34ROjSVERI5gCP3+yxiK cXv1dM31rM+G1tcPog4JE0c4QouJffFix69rFbgi35/q36fp0mQcXdUDhPESFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0F03wtzXb6; Tue, 18 Nov 2025 00:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qC6L046879; Tue, 18 Nov 2025 00:52:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qCEn046876; Tue, 18 Nov 2025 00:52:12 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:12 GMT Message-Id: <202511180052.5AI0qCEn046876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ae879f73a03f - stable/15 - sound: Retire feeder_register_root() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ae879f73a03ff8f0657248e403576640ebf7d134 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ae879f73a03ff8f0657248e403576640ebf7d134 commit ae879f73a03ff8f0657248e403576640ebf7d134 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:41 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 sound: Retire feeder_register_root() We can now use feeder_register(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53560 (cherry picked from commit 2ba68208390a2c091039eb6731cdc2ebe280f89a) --- sys/dev/sound/pcm/feeder.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index e2d05f307f4d..fa4e4e16a133 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -41,27 +41,13 @@ static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); -static SLIST_HEAD(, feeder_class) feedertab; - -static void -feeder_register_root(void *p) -{ - struct feeder_class *fc = p; - - KASSERT(fc->type == FEEDER_ROOT, - ("first feeder not root: %s", fc->name)); - - SLIST_INIT(&feedertab); - SLIST_INSERT_HEAD(&feedertab, fc, link); -} +static SLIST_HEAD(, feeder_class) feedertab = SLIST_HEAD_INITIALIZER(feedertab); void feeder_register(void *p) { struct feeder_class *fc = p; - KASSERT(fc->type != 0, ("feeder '%s' has no descriptor", fc->name)); - SLIST_INSERT_HEAD(&feedertab, fc, link); } @@ -381,6 +367,6 @@ static struct feeder_class feeder_root_class = { * Register the root feeder first so that pcm_addchan() and subsequent * functions can use it. */ -SYSINIT(feeder_root, SI_SUB_DRIVERS, SI_ORDER_FIRST, feeder_register_root, +SYSINIT(feeder_root, SI_SUB_DRIVERS, SI_ORDER_FIRST, feeder_register, &feeder_root_class); SYSUNINIT(feeder_root, SI_SUB_DRIVERS, SI_ORDER_FIRST, feeder_unregisterall, NULL); From nobody Tue Nov 18 00:52:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0G4KhSz6HH9M; Tue, 18 Nov 2025 00:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0G1k4Dz3ypN; Tue, 18 Nov 2025 00:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35Ilraxo4BouqET7df6zHxiYnxqHJr3pD9vj6iEM8Xk=; b=nE7fq0Rs8UFaBkGlTArLRMdjWUxxMnPZJ/U0+E5Z/pHzNHXdeaoQR6/CGNd+kAgHrvlvwW m0ndPO8Jig2XlvmCpPatplAE7H6AxJYc8n3po5z59gjn1YGS4vxnawRkJD4KnQ6suGSsxA GIzz3sgTCkF7MkFEWa/YytyEAWoDiA77FRw8h1tupdapTxQwRkR+1W5vvDGeCjrxZKOBn0 YpidkPn3V+bcghUsD7hSdCHQpwMmGm9FVvRdpybK8wzQi7DUc65i/VTuoFzCMq+vHoxqkj G/WqYfJ6/oSRPWZ3+WRfq2FJJg4wwSANcWf1/+yuuoOd9H7b9ZJkNGUCFj3Veg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35Ilraxo4BouqET7df6zHxiYnxqHJr3pD9vj6iEM8Xk=; b=R5EPLcau1hrucAenmfHpHPioDMiSj1o7forLuiRE5BL3MSAUOsRrC//2ZgNRCzkFyRHwJT 0fHGSx7/AA333tPh1aHEbLTkAKwzXoiWTKjkZo4GdcuIR4mDgTpCB5S1RUtlJ9S6Weoddz JI1cYMLfRjICAPhTyyZY8y0RxZDkqd7TG8CIf+6ttnbk/xc4311n2NAPY5on2qKDHgeieY qRf6suL1hxyAcjyLjAN6E6k0+tA34a1rcw3qp2LJzP9TwWhq7b+sAa3R37kCH8UlMjj0nC FBVVGZvR8FIZSeCTLzgAR+xIUEXze4/CXiUKIxGVnwQ6o1CDPo8mxqzRruEBJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427134; a=rsa-sha256; cv=none; b=LjQquvewODBbJW0Y2/kqw9l/igQG+VdkRMPtOFi3QuaD9JL3nARehvdwZ9xh6D0srl8Cnb MXw4RmHsfkFG9pTRRJ6ChCgtBIyXTdfq1H+KYTLavxLqUJDGGqHdgajC4lrWw5Z5op1eqJ KqB9ydcxXTK5AsU7xY6o7X3FSII/zy5EbsoS1YtdWDto95b8U3Z2GCqkGonrh+STt1lWsY Gx8KcY/3jJKuzOEmAdYK2o9QhzSWgEyEXNUkjnom/BiJrAtj352TIZCNdF0X8QAc21dYqK 2VX/yF2+GeJbMfzDoGFKOOcU7fbQRAazFg6LgnztBhc7Vx3iowFvDtWPaOTXZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0G146CzXdk; Tue, 18 Nov 2025 00:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qEeF046911; Tue, 18 Nov 2025 00:52:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qEA5046908; Tue, 18 Nov 2025 00:52:14 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:14 GMT Message-Id: <202511180052.5AI0qEA5046908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 8517a76e34b6 - stable/15 - sound: Retire DSP_DEFAULT_SPEED List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8517a76e34b642cc11f4f16892e429b9c780bb53 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8517a76e34b642cc11f4f16892e429b9c780bb53 commit 8517a76e34b642cc11f4f16892e429b9c780bb53 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:47 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 sound: Retire DSP_DEFAULT_SPEED Only a few drivers use this, but this is not really our "default" speed. And even those drivers most likely override that value at some point once CHANNEL_SETSPEED() has been called. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53562 (cherry picked from commit 16ae4c2398c89dcc5c03f1aac72a2fce2a60e724) --- sys/dev/sound/pci/als4000.c | 2 +- sys/dev/sound/pci/cmi.c | 2 +- sys/dev/sound/pci/cs4281.c | 2 +- sys/dev/sound/pci/es137x.c | 2 +- sys/dev/sound/pci/maestro3.c | 4 ++-- sys/dev/sound/pci/vibes.c | 2 +- sys/dev/sound/pcm/sound.h | 2 -- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 75fbefe27633..a8c3303af74f 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -221,7 +221,7 @@ alschan_init(kobj_t obj, void *devinfo, ch->channel = c; ch->bps = 1; ch->format = SND_FORMAT(AFMT_U8, 1, 0); - ch->speed = DSP_DEFAULT_SPEED; + ch->speed = 8000; ch->buffer = b; snd_mtxunlock(sc->lock); diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index a1356f58b567..28427d449c8d 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -352,7 +352,7 @@ cmichan_init(kobj_t obj, void *devinfo, ch->channel = c; ch->bps = 1; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; ch->buffer = b; ch->dma_active = 0; if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) { diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index af2b4da76aba..5b0b229a021b 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -326,7 +326,7 @@ cs4281chan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channe ch->channel = c; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; ch->bps = 1; ch->blksz = ch->buffer->bufsize; diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index eb546de81f65..6b2093e16246 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -987,7 +987,7 @@ es1370_init(struct es_info *es) es->escfg = ES_SET_FIXED_RATE(es->escfg, fixed_rate); else { es->escfg = ES_SET_FIXED_RATE(es->escfg, 0); - fixed_rate = DSP_DEFAULT_SPEED; + fixed_rate = 8000; } if (single_pcm) es->escfg = ES_SET_SINGLE_PCM_MIX(es->escfg, 1); diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index ee39f5f3c90d..bad2b4eee1cd 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -437,7 +437,7 @@ m3_pchan_init(kobj_t kobj, void *devinfo, struct snd_dbuf *b, struct pcm_channel ch->parent = sc; ch->channel = c; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; M3_UNLOCK(sc); /* XXX */ if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) { device_printf(sc->dev, "m3_pchan_init chn_allocbuf failed\n"); @@ -816,7 +816,7 @@ m3_rchan_init(kobj_t kobj, void *devinfo, struct snd_dbuf *b, struct pcm_channel ch->parent = sc; ch->channel = c; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; M3_UNLOCK(sc); /* XXX */ if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) { device_printf(sc->dev, "m3_rchan_init chn_allocbuf failed\n"); diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c index 6df76306b28f..1b7353464503 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -204,7 +204,7 @@ svchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channel *c } ch->buffer = b; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; ch->dma_active = ch->dma_was_active = 0; return ch; diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 6bd435d0ea25..19da1a22871a 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -148,8 +148,6 @@ struct snd_mixer; #define RANGE(var, low, high) (var) = \ (((var)<(low))? (low) : ((var)>(high))? (high) : (var)) -#define DSP_DEFAULT_SPEED 8000 - extern int snd_unit; extern int snd_verbose; extern devclass_t pcm_devclass; From nobody Tue Nov 18 00:52:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0H5ZZvz6HH6s; Tue, 18 Nov 2025 00:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0H2ZBbz3yj6; Tue, 18 Nov 2025 00:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=946Y3JN5ZSw9LsZxym8ndG6k+vKV2H+uTllgIKSLT5s=; b=q7KIwkuzYrIsMX7geUlf70CQnoEpazcGpV9bKzxQQ9SYMG0XAWvM1DKUIQf44rrC4lZqpr KhAV8b86BhqfvIBvqeaOFatIdLrCSeaogwejhJT+QZwaxFqDh7hBqgD6vJ8ONxGsYVEQYb iPib9ji3PKh4fphnG5+dDhjAcDbcTsmF09cY/xOf/pZPkO91zXd6YyPmQAjrMbib3CQNJf pFAtbIK8WlhapXEdYgfrNCXtQREUUwsl41vf24JwsDiUR3DXG1wDxZeNP5DUstNFPCKJGm GMR5oLRTAfuMpJ8wJPC8vk7DNeLYv2L8oNNuCGilMiBR4qZMhvJhkpToS5vcwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=946Y3JN5ZSw9LsZxym8ndG6k+vKV2H+uTllgIKSLT5s=; b=BvZH5CLlV4b1VxaC0mhLxZREItczb6x/l8EuzwWDAKv739Zu57mqH9UskQcr2iJXax0CVb MVednvMaQ97TUVPR0hGgTjZE98+fxhoQBM4Qsxxo2FQBE6weSGMQzjmk5peEklg1SIE6pP EJ9Ntk9ABwb9bfAUVlBdX9GUv7eBM6vbPyl/fUqLDiXd+8moUndXqWP45l9gzHn2hOMnWa awAtR20xzRr5WpkVzlLAU8ZsQ5qalvuSJ5/18DoBoq51BTOfPx3mMHTVF6OKNBPlucUNE5 YCJL+eV3wPyUxQc/4AaQgNBSUQxhQl237mzxAJepwqfw1BQD3+8+AlxZXv5SxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427135; a=rsa-sha256; cv=none; b=VB0vor+MEBFVKsPr9YWCeueCZMIvB64zKeWZJjSdhbhG7YtomsmmfgMCFDgqGqy4dd6qIQ bTMvxTUT/o6uiuB8mQroI2mojv1yrQCIZkrbFIXezQvdFBlAW0Qr+oVY3cyYTkm9PkPRM9 GHQQO6jLUc/spcNqFhgh5w8ozOl4IZodsQNjDaASXE7KL8zdy4/xdk/WTOazh58XUFTjzP Nob3SfckAxAv9rFkWSQtM6jqO40BJURBmrYltKCUQiXuAREHeBC6TI2kg+0iyEakZCjXDw YcD90wZAlwgjf+DxJ7RMCrpeV1xJnAGO5mftTCFFXqHraLawDOzMPXCfhwdmFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0H20hLzY7y; Tue, 18 Nov 2025 00:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qFZr046949; Tue, 18 Nov 2025 00:52:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qFe9046946; Tue, 18 Nov 2025 00:52:15 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:15 GMT Message-Id: <202511180052.5AI0qFe9046946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: b4c210f241b3 - stable/15 - sound: Retire unused SCF_SYNTH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b4c210f241b3b7bf07842d85342f9852d9f2dc6c Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b4c210f241b3b7bf07842d85342f9852d9f2dc6c commit b4c210f241b3b7bf07842d85342f9852d9f2dc6c Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:55 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 sound: Retire unused SCF_SYNTH Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 7dc58828f494ae8fc06ef014b01b2dbea855091b) --- sys/dev/sound/pcm/sound.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 19da1a22871a..75fb57e33733 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -184,7 +184,6 @@ int sndstat_unregister(device_t dev); enum { SCF_PCM, SCF_MIDI, - SCF_SYNTH, }; /* From nobody Tue Nov 18 00:52:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0J5QPQz6HHPF; Tue, 18 Nov 2025 00:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0J3B68z401Z; Tue, 18 Nov 2025 00:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zbzs6D0nPh/UASixhCC3Na1SLG/0D6iPUNIk/7KpCYo=; b=I1RA19e8D2YVjwnd/hsyJWaE/wxbhwtruBG7nroWKUDsUL0DASPKd6Qce24nyWfFqkFYp3 5a5dbgLEU/i5IKuqIk/beOl06O3xt1etTWRZMCYfAf2fMvZyTAjFYLeLDWPUfKEa4DX26t SNS2AehorUbsGpsKT6Oot/VuCiVWayFnY/SsY62Gz0XUfzHc8i5Tm9YMHpzsYWeHsMco2g 8wbp8ICS11CGXtb8WTWdM2P6ZDzQ+cOjK1Ir6dnXeRGfWI+oFlydH+l7oxwbO/6ycSGdoP Ja+cqPgqsBzAGoMNexYB+XEuC/45WWT6gQeFJSYr7NXtTd5UxaYdwWVXQhYFhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zbzs6D0nPh/UASixhCC3Na1SLG/0D6iPUNIk/7KpCYo=; b=bB6tVCuCIFHGshTp3+4ca8WniKgk3aeeqCxH/ycj7Cu65kKtWKKTMwszIlFh8ora3VohP9 3QlE81dbBW/k2Gin8Izw2v6sFWSABZnshmebUEZG0Hbu0lHfFfHz1ctOudh7n0RmxiGYh6 qyFmGL7mjkeS9xh5V1ve1M1wWdRRx2NHY2DZml27rbf8M9f1Rdri4zVKomIuHyCfGF1bZr quyvDF8oi2EzQQhS9sCNO2kpO9iUHjvFYoYZjxqKkdAOY47zDW6s46ej8XVi3q9JT1XY8M d/ifBrYsNuCeds6Xwl42irQgIJsTBGL8jqPTu9qlRa9mh5nztPETr3REzIo94A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427136; a=rsa-sha256; cv=none; b=RxDG0XNnuMHL6mEDTUCrCrgdcY5nl8gxM2W5p+j/8dy8V7N9zrWRMqsYtSHzuIwWgPqeMr 9P5CijKRZFnzDGTv+vx2N2tRlvhNoOc7RO4LBlsfbGcY9KMkUTzYBveeCw4eeiP7AanyId IlHpHo4Lzo7lUfyRFJvzBct6D7gUB1UrT6vxn+XNBmYcLCD5BUsmFqISqZACUXOp0TILCp oQHBBHmfX2h9Zrba1X+FV+esGKrZMQmOkcXd0tp4C9Fn7mbsik8mBBoopqZ1nWyU/fPdHR bp7qrObiAvYxr63nGtAjqznQr54hk0y3OosuTLu1dTjVnKQIO17SD1xWkeCwOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0J2hyDzXhN; Tue, 18 Nov 2025 00:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qGmX046981; Tue, 18 Nov 2025 00:52:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qGoq046978; Tue, 18 Nov 2025 00:52:16 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:16 GMT Message-Id: <202511180052.5AI0qGoq046978@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 29e5f29fc0c9 - stable/15 - rc: virtual_oss: Use required_modules instead of load_kld List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 29e5f29fc0c9fa180b5ec07f8c80aa7428220bd7 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=29e5f29fc0c9fa180b5ec07f8c80aa7428220bd7 commit 29e5f29fc0c9fa180b5ec07f8c80aa7428220bd7 Author: Christos Margiolis AuthorDate: 2025-11-11 12:07:36 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 rc: virtual_oss: Use required_modules instead of load_kld Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: imp, markj, emaste Differential Revision: https://reviews.freebsd.org/D53616 (cherry picked from commit ac2aa9e869a16b28095364b2e14683df9885ac34) --- libexec/rc/rc.d/virtual_oss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/virtual_oss b/libexec/rc/rc.d/virtual_oss index b9c830617385..b8f1e7620582 100644 --- a/libexec/rc/rc.d/virtual_oss +++ b/libexec/rc/rc.d/virtual_oss @@ -20,6 +20,8 @@ start_cmd="${name}_start" stop_cmd="${name}_stop" status_cmd="${name}_status" +required_modules="cuse" + configs= pidpath="/var/run/${name}" virtual_oss_default_args="\ @@ -53,7 +55,6 @@ virtual_oss_pids() virtual_oss_precmd() { /usr/bin/install -d -m 0755 -o root "${pidpath}" - load_kld cuse } start_instance() From nobody Tue Nov 18 00:52:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0K6w3Cz6HHVG; Tue, 18 Nov 2025 00:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0K46y5z40CY; Tue, 18 Nov 2025 00:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/GoDrAgL6J51hLop+FGHNzpKx/UQwyd//gbZJf1HiY=; b=ypmneIikk2Vc/+skZgRU7n6bKVCO1FkLH4x9j/h1nCEf9RuFWgJvb1h9ALA3vtx4bxvAc1 0TsT8ZzoYGXnvVm7hoWq1/21HBsYJWTr9ZRRTo9zRbqUymVAwQKoyCM3lO1H2pB6DpWOyM xTTcg+oK+i7grpjjMxsJusfe5I/G4OgUhrPbC4kU4IwdE4yGFRZCjeCwYrGlbUamZ9Jivp 9oO3keT05o+63xbUPxpmoIOz6/pMtZO5nHapMmgUkK5IfRleOorUNyDxWDzUUQShr3lN3Y 1IepUIIeLQ4SU6b25vjtKHwb70P/KBA9TYLVbjb9Qe39mvFhZwV+wL+HiOVWzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/GoDrAgL6J51hLop+FGHNzpKx/UQwyd//gbZJf1HiY=; b=C5odIEozXI6VBr/OeEqgwnxe0kIClL2rbeUL5BjlQrVheuBnMU3qePwoAG1NHkt+SOkV2n OfzDnkHHhIkE+I54gZvA95z2wKRt5SSqKRrMEmKqDZjMJqlxfLfORK+DvRsTk+KPirQ5i+ BP4WnS1i8y26ADgemi6Q6ly8nc9i8TBmkSFuqYCEqSiw2nQzdRzxweUFNZulY/Y2YftSIY hgAm/ounwl60xgctHjNvZ/I+8s3RYOqut0EQQl/CoiUVIkoVKtjcG5riFmqm4f6gqczI7s 6WlY96hvsO7/H/QHrVHGmMNLaxxmrrCeTXcx2j3BrBlNU6YdaQFnWHXUPxwq8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427137; a=rsa-sha256; cv=none; b=BP/hP1TUowbKqtbX/hU+STw/Y++6Q1WZT/7pf1ELvssOdabeFnAIkXShBNcGhUD3o7JyCo TSEsD1OO+o20GyyTzk9UAJ4SR9jYRasWhGpiAas0iGM2SG2JsGUjvggQKq/pwezrQx2ovU Fbc3SRMgltlgKIjPV0GW+0jBo5vpXdudQNwdg+drZxZb2YRRAT/TQqPiVJmoTykl8qIVud ag8/SYNoIEjJRnUQVQovry9K6F4NoWZicPlW6KZ2MlY8U8J23SftAEgSr8OXBi5jBgaJUn BXeoCFU/LMhSbuY676bkKS5JLAMEMTKl3Sm5JwXYfANQIGSTY28qhJJzjZPKYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0K3gyfzXdl; Tue, 18 Nov 2025 00:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qHai047013; Tue, 18 Nov 2025 00:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qHZ1047010; Tue, 18 Nov 2025 00:52:17 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:17 GMT Message-Id: <202511180052.5AI0qHZ1047010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 4804bb0d4588 - stable/15 - virtual_oss(8): Use kldload(2) instead of system(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4804bb0d4588d5e0a456b7009295c4e031aa7316 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4804bb0d4588d5e0a456b7009295c4e031aa7316 commit 4804bb0d4588d5e0a456b7009295c4e031aa7316 Author: Christos Margiolis AuthorDate: 2025-11-11 12:07:40 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 virtual_oss(8): Use kldload(2) instead of system(3) Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: imp, markj, emaste Differential Revision: https://reviews.freebsd.org/D53617 (cherry picked from commit 7bedc4634d893174b9cef06c7c13e5f1cb24808b) --- usr.sbin/virtual_oss/virtual_oss/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c index afa4ad0727ca..f2fd085664ed 100644 --- a/usr.sbin/virtual_oss/virtual_oss/main.c +++ b/usr.sbin/virtual_oss/virtual_oss/main.c @@ -26,12 +26,14 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -2539,11 +2541,8 @@ main(int argc, char **argv) atomic_init(); - /* automagically load the cuse.ko module, if any */ - if (feature_present("cuse") == 0) { - if (system("kldload cuse") == -1) - warn("Failed to kldload cuse"); - } + if (kldload("cuse.ko") < 0 && errno != EEXIST) + err(1, "Failed to load cuse kernel module"); if (cuse_init() != 0) errx(EX_USAGE, "Could not connect to cuse module"); From nobody Tue Nov 18 00:52:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0M0cc9z6HH9P; Tue, 18 Nov 2025 00:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0L4sDSz40SQ; Tue, 18 Nov 2025 00:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iwx0YcsvRRSY7T7cIKxmcHxuDLnwvmwElKRxofon/uQ=; b=gy22hpjqSQoNRQ3pQRLrBVFZBPy5ekUtNn3YPgiWdO6kjeu6UG2+SAAEo9r0SxGK2plCvw Zr/1SMPVrhWaFwqAwqxuscxGRDIQVSpyHJG4EDsSbJ3c7a7xwltY2fjiOxTSLHt0m+5NM7 BKXms2FqiQWUPuGuRb8ds0ISKYUHVbsKQYj1kAnTwKEAMIetSKvn/KVH5XlUHCt9yEWRlV HVCHRjzpH9xZ04gzVb2AFi6htNGCOi6v2R440a3WW+yTzc2cBOjWHz0x0XKHai2J9a4nhQ 6zviwuLZStCmdDXdVuu0EvRLGStSjNjMdJ0p9LYwyV4AwzlfZpyombv213qiNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iwx0YcsvRRSY7T7cIKxmcHxuDLnwvmwElKRxofon/uQ=; b=PsKiJQ1b8iJ4PLoIf2DfiQHk3c20sruEkK1UX3PbD7A5S80uUewuvdGMdyciX0/dsWeHwq /CY5r8DyKhB4/1loVvLUoM0+gR5tYi6WG0WM4qY4WSxb4gqji0m67iVtV72QaX/0Dtm8Gv AnSnr3Wus26Ey0jb2viml2sVf3HzwsOs4AI4pWqgaz6rZ1eQfh7KPWXLxUAs6g9ugaa+t3 PTocq4z71Yco8MMuzPgok9F6PKu16XlIkhYI4qgsfm4i2OGszd4zKEwYwAUT0cgcF6hCxw Xt7K7Mb4P72AuzO7USp38ET6C6Pv5Pso7kfXXeS3HDx/Z/QfXRwUrfK98+KQvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427138; a=rsa-sha256; cv=none; b=Cyw8PVHwl0Ryt6/n2Ql7RpZ2AnYVeHukGwPB7hdLQoaG9dhzHFtKEHbYRuuc81qQ1plxBI d2up+mSJn1aX8hHi6MLlXmSQmjIL4NDKf4Yg9Dpb93eynQ+vykB5va/r82IMWbC2NLLJHs +VKj5kATVt2wGNWMnx6ppULh3o4mduWFyRFY9IYDBA0RvMFAlWX0EjXrPtaCqHceD3MK/3 T8/r2abOy2FyXs/H9C+ZGYADuCQInpaqNebxFQZZovxeoXaR+PWDvKTFM1DjEC4fZC1NmC b8Vyqr/M8HgtDJ9PemteVZgYFfSgoRdAwwjKnbk8h5PZ3VTBD8Xe4J5HgRa4TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0L4Pm6zXhQ; Tue, 18 Nov 2025 00:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qIjS047045; Tue, 18 Nov 2025 00:52:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qI7V047042; Tue, 18 Nov 2025 00:52:18 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:18 GMT Message-Id: <202511180052.5AI0qI7V047042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ea9d875a6477 - stable/15 - virtual_oss(8): Improve hw.snd.basename_clone handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ea9d875a6477b5394b6687e6308783c4564fac22 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ea9d875a6477b5394b6687e6308783c4564fac22 commit ea9d875a6477b5394b6687e6308783c4564fac22 Author: Christos Margiolis AuthorDate: 2025-11-11 12:07:44 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 virtual_oss(8): Improve hw.snd.basename_clone handling If we request a /dev/dsp virtual_oss(8) device, we have to replace the sound(4) one by first disabling hw.snd.basename_clone. This sysctl tells sound(4) to not create the /dev/dsp alias for the default device. There are currently two issues with the way this is handled by virtual_oss(8), however: 1. It uses system(3) instead of sysctlbyname(3). 2. It does not restore hw.snd.basename_clone to its original value, so if prior to virtual_oss(8) running, hw.snd.basename_clone was enabled (which is the case by default), and it is closed at some point, hw.snd.basename_clone stays disabled, which is annoying, because users have to manually restore it, otherwise applications that open the default device (i.e., most) will not work. Fix both issues. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53621 (cherry picked from commit e5c0d7020f3d040b28dc7ca0cda9926e07e5aaf4) --- usr.sbin/virtual_oss/virtual_oss/main.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c index f2fd085664ed..28095880c201 100644 --- a/usr.sbin/virtual_oss/virtual_oss/main.c +++ b/usr.sbin/virtual_oss/virtual_oss/main.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -52,6 +53,8 @@ #include "int.h" #include "virtual_oss.h" +#define SYSCTL_BASECLONE "hw.snd.basename_clone" + pthread_mutex_t atomic_mtx; pthread_cond_t atomic_cv; @@ -1617,6 +1620,7 @@ volatile sig_atomic_t voss_exit = 0; static int voss_dsp_perm = 0666; static int voss_do_background; +static int voss_baseclone = 0; static const char *voss_pid_path; uint32_t voss_dsp_rx_refresh; @@ -1739,6 +1743,20 @@ usage(void) exit(EX_USAGE); } +/* + * Restore hw.snd.basename_clone if it was disabled by us. + */ +static void +restore_baseclone(void) +{ + if (voss_baseclone) { + if (sysctlbyname(SYSCTL_BASECLONE, NULL, NULL, &voss_baseclone, + sizeof(int)) < 0) + warn("Could not enable " SYSCTL_BASECLONE); + printf(SYSCTL_BASECLONE ": 0 -> %d\n", voss_baseclone); + } +} + static void init_compressor(struct virtual_profile *pvp) { @@ -1883,8 +1901,18 @@ dup_profile(vprofile_t *pvp, int *pamp, int pol, int rx_mute, * Detect /dev/dsp creation and try to disable system * basename cloning automatically: */ - if (strcmp(ptr->oss_name, "dsp") == 0) - system("sysctl hw.snd.basename_clone=0"); + if (strcmp(ptr->oss_name, "dsp") == 0) { + size_t size; + + x = 0; + size = sizeof(int); + if (sysctlbyname(SYSCTL_BASECLONE, &voss_baseclone, + &size, &x, size) < 0) + return ("Could not disable " SYSCTL_BASECLONE); + printf(SYSCTL_BASECLONE ": %d -> 0\n", voss_baseclone); + if (atexit(restore_baseclone) < 0) + return ("Could not set atexit callback"); + } /* create DSP character device */ pdev = cuse_dev_create(&vclient_oss_methods, ptr, NULL, From nobody Tue Nov 18 02:18:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Svw2TSdz6HQTR; Tue, 18 Nov 2025 02:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Svw1d1sz3PsQ; Tue, 18 Nov 2025 02:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8CP9CtclXDJ127zs8VZNnHxKdwxTqF3hRy4QFVWvokA=; b=iLpPGZtg4MSbukbuXgj86OokpcHqTGStdKstVSg3ZzHOv5GIMclTYGiDU77j/05MTrPeBK Pmc4n/84WxuVvcMEbo8wEwCZzkUA85qPIMLq+qrDGq2E/Nirb2VJEuGihBqj7LVbsVNarM jPhdXsgssbTREuzmQCgt9fmDCpOxeHafCXwTOKnSkPB/l68bKAFQ1fzYcSxCDCFz8HFJw+ iQHDbhj9HTq8t4vGuiCICZgvKShhAVou6X+krjbsyPHEzTEhINsrvJjbCmvp+KyslLA6po oevmCtdbQaRhuOqGmlliQQk3jbeM0ilGEAeKazwExnfIuq5TSBsAvdltWCBbwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8CP9CtclXDJ127zs8VZNnHxKdwxTqF3hRy4QFVWvokA=; b=S6lY3cIbTBSowcprYpldsrDy2dkoTw7K34c8IE96Wd0SrcXlMzrU4a7H8XrZ5/2mRWn7bq xYhP3J+FDRP8U5/Gp95P0E4awlpB+8AxRuPiAj0h6pxUKjNoicubF9hP2lnUCj1WkzLN3n cZUR55RIbowCvIjIRiw3iOmP8kPFs+BfjY0TRr9jlrLHaIv37frIb7RpyhYMuSmiFSmJHM /Ituz7ZLNzv6fPzeUwWQe0wWIHH7ZyrRW3DWpn3H1iY6FJJdanevd/pzyPUKXUigX07hda 5pgcVHHz9MxmVTzmmZf1IghWVs8KgOqTHiZdDBvee9azqXmkFamof2FFKM6yDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432316; a=rsa-sha256; cv=none; b=tdhQW8LJoDqS7Mr8Djlj6I+vxhfpsUJsBaXAJLZcaOfnCXhCUMfQlmWm0t411uUXiWucUX OalhMYf0uhJ7Eja/ZOcUU4XBUf0NXX7T6X44ECa4fgy87z4UhFl1dnEggKFSG+F8XGGcGU 42YSt0tenO6b6qS+p+Pwtky6rNaXcnXGfzh69a/XymTbv2YsXkzBPHskeCXvvVxh2GdfSQ p+jCUtf4Adw+jNpzf4lX+rqkdI8nbsnghrPcIdmLzQVI4T6vzhxVtVJL2RSUF3HdksF14P gXd17wAAGLhGBlY3UNRPsicQtsMim5h9eqHxkzwkNlNC0OTmrcwI4A1WxTzHWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Svw0tL4zbbq; Tue, 18 Nov 2025 02:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2IZOE003119; Tue, 18 Nov 2025 02:18:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2IZnt003116; Tue, 18 Nov 2025 02:18:35 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:18:35 GMT Message-Id: <202511180218.5AI2IZnt003116@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 86c63597f2dc - main - release: Add /boot/loader.conf to some cloudware List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86c63597f2dc7f89268d13a00c0dc7a74cca51d0 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=86c63597f2dc7f89268d13a00c0dc7a74cca51d0 commit 86c63597f2dc7f89268d13a00c0dc7a74cca51d0 Author: Colin Percival AuthorDate: 2025-11-18 01:01:30 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:18:27 +0000 release: Add /boot/loader.conf to some cloudware These were forgotten during the METALOGization process earlier. Reviewed by: markj MFC after: immediately (for 15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53795 --- release/tools/basic-cloudinit.conf | 1 + release/tools/gce.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf index f8554c42f49c..98e11f0bb08b 100644 --- a/release/tools/basic-cloudinit.conf +++ b/release/tools/basic-cloudinit.conf @@ -28,6 +28,7 @@ beastie_disable="YES" loader_logo="none" console="comconsole,vidconsole" EOF + metalog_add_data ./boot/loader.conf cat << EOF >> ${DESTDIR}/etc/ssh/sshd_config PasswordAuthentication yes diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 2fa23f6e54f4..78511dbc66c9 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -51,6 +51,7 @@ kern.timecounter.hardware=ACPI-safe aesni_load="YES" nvme_load="YES" EOF + metalog_add_data ./boot/loader.conf echo '169.254.169.254 metadata.google.internal metadata' >> \ ${DESTDIR}/etc/hosts From nobody Tue Nov 18 02:18:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Svx2qymz6HQNX; Tue, 18 Nov 2025 02:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Svx1p6mz3Q0r; Tue, 18 Nov 2025 02:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fcpFyVOUzhmf4o97Ef/TvjedNbuYv6ErfRhR8iPLJdI=; b=ZcqaYbE3KssmZ7P0kURTgySOajvvuxA4Wa+H3wR2jMP4emqBCM6DFHzHlIGRt+i2sfdMpa QJ5oWHvJETuWyalE8PQKB+C4YEysiSP7q6y5WeAxOLJl+BmBAEtuYr2fkPb8HI8+G7zXGl aemkxFrMsLz2NF98BcYZnRGcqYkjnjb4Yn147sEgzBUT2Dee5G1qnT+P660dwK8Z/kYR6j jF1s59lQrubJgYmHlTCJ9bQAfO6OUjEqi2aC7qrX+3k5i1ixzc4mKa1gAN2Sp8R0/O8suw JTorlOpSTra1CJ1Rg7JgNqIP8dYpaUyDEkB6HEAjyXE4qazLa0Fidfpazoro6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fcpFyVOUzhmf4o97Ef/TvjedNbuYv6ErfRhR8iPLJdI=; b=eDgByYBe5GCRuUTsn2AzxIkakZfsML66BWYXR7+q7q1wc2JzY7KeQ2y5McKMePHHOtDwfr oFgt6kYcyNGYDhEMI1+T+d7WKtXcfQ1a1kCB1djK/SYzPfy6JebOYEphZ5QavasFmXrNiV Tbr5dNeZqgrSFGHtKV4su0oBEj0z9Bu/gB8jI8x3/fdLgJsQmFyYD6vqjrFhhVyFcDdJQM IzBFJuNVb2l/uTpfVEIw8MpVqGGLwFY2iPEed6PNe7w9FXnHvBzE53oV20ZuVI0NyV9srN FHtdLQ93GH3mIVKi9f5E8ppuTaQPhfxbjS6UfuCccgA143HleY9Rgccl8D32TA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432317; a=rsa-sha256; cv=none; b=Ki5+Gmfef2GijFw30wnujdbZ/yy75OzRdHDRoCIb1O9oATA07xQo8blEXaRSqyr+iM+Vfj sNrdv2Y6xNTjDUW4yvtM8x3a7/AW1pYPqc295Fuv4omq3TTPwlUmMZ3RIkWhmxAtvgfSS+ O6SCXWSL401DW7DMxOehk8+E029CxwnhxE+QXDHPIiVzAB0PFZyPDjCmkOgHxcjwwSHcl0 e28tXacIvbDBW5/L0EzsV2+JT1YlmffGIjz4H3PLu9UkPITTnaN/PbPC2fRbFBqtqFrGaa DCoE68ICqGgpJQhJMmnpPQ28zxx1ggk7gkjgEDrsSjoiibV53VT5na2yOnSL+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Svx1GfHzbRS; Tue, 18 Nov 2025 02:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2IbaP003153; Tue, 18 Nov 2025 02:18:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2IbPA003150; Tue, 18 Nov 2025 02:18:37 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:18:37 GMT Message-Id: <202511180218.5AI2IbPA003150@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 0dbb00733c4a - main - GCE: Add /usr/src and /usr/ports to METALOG List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0dbb00733c4a177a9a22d61a627d377d0876ea16 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0dbb00733c4a177a9a22d61a627d377d0876ea16 commit 0dbb00733c4a177a9a22d61a627d377d0876ea16 Author: Colin Percival AuthorDate: 2025-11-18 01:02:47 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:18:27 +0000 GCE: Add /usr/src and /usr/ports to METALOG We ship these in order to comply with GCE Marketplace rules about providing source code and licenses for all the software we ship as part of images. Reviewed by: markj MFC after: immediately (15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53796 --- release/tools/gce.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 78511dbc66c9..c1e129ba69d6 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -98,6 +98,10 @@ EOF # the image. if [ -e "${DESTDIR}/../ftp/src.txz" ]; then tar fxJ ${DESTDIR}/../ftp/src.txz -C ${DESTDIR} + ( cd ${DESTDIR} && find ./usr/src ) | + while read P; do + metalog_add_data ${P} + done fi if [ -e "${DESTDIR}/../ftp/ports.txz" ]; then tar fxJ ${DESTDIR}/../ftp/ports.txz -C ${DESTDIR} @@ -108,6 +112,10 @@ EOF DISABLE_VULNERABILITIES=YES \ I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES done + ( cd ${DESTDIR} && find ./usr/ports ) | + while read P; do + metalog_add_data ${P} + done fi ## XXX: Verify this is needed. I do not see this requirement From nobody Tue Nov 18 02:18:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Svz0LPkz6HQ7V; Tue, 18 Nov 2025 02:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Svy6BxNz3PZb; Tue, 18 Nov 2025 02:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zbdvLjF1LweTgis4vjp9M64EfywIeEDzmJpYAQ0PL6g=; b=QBhRiC62eD8wToa6DROGrsblbPYlfcFi/guJIvrpiEQI67ljTYLDzJpwWOV5F2ucSk7Ujz 3Wb7pPSoTDstBvvZg1rpxrpmbvfy0IX7OyuBBtGeiGYDHYLPrK/JBl21hDTWTXa9YMXQmZ u5jBNOLgrMEgrsNVa+jEljDBwR6cqVmd96wOWgkuUholTfAR9rPIr985jynMojLqRp8EVX mc1OeAlz47JMLr2fp+M76djfvs9d6vOexMkuNmIEb4KZBnmLlLF3kYr8jYQZPA8Wk4xJWV LCnq4Ot4qXZpnwXLPSod1+kl4wlx3b/Qn1HlKToFa3O69K9ZYWPbq65XhdM0TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zbdvLjF1LweTgis4vjp9M64EfywIeEDzmJpYAQ0PL6g=; b=NMX8gHySop1g7FpVZsa7hf3ZuU3RlEnYGB/lwLBC1r9Ol9epfPBypE6Nbi+0R/4p6i739F RJgfYvWmixbxRkX/4CBXAGS6xroO1YJfbOxEhdt1yE74eBj2K2aR5zyNlYIKmL8s19+zln nvQ2WqLKxOKuqTO3QzgpuJxUwmnXRryfjkSCLQUx4wREcwdeVSk2mPU5Z4CGtH4N0GwxxW Gc38p9zbPnhQenpvXfAOtkxVApDR6eBNm16AWCjkeX1w/LrDVQTTNVBilq48eILP31anG8 mL9JxkyLVEzDKKNhgQhyExlIUTN9PIqrD7QnYa0T0OFgfE7J+a9wbBSYhNXrNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432318; a=rsa-sha256; cv=none; b=R9AYzUFzfvQjCBrV2dGRLzg5MEK6qHBxefqcmp9+EMpyVdzjOSsW5xjGEzDWvf71IJ22mm Hqy3mBPX8+6P4LQcfHKfJ7x9sHUa3v3YJtHGc/hca2jFtCAS5WZIOPZGwXKSoXb0TzrdQO 9SAuBXWKpbg3uCrk9RdedbpUqxCWVCsy/1hEbFFpXiPoHT54y5/lT+JlHiRbTjzkos5Snq Xba+7Zm8h90FzxjfJFJbjyYcHZFL1Wp4eXCujQIXrDhN4WnHnrY/tJFQ5XB+/MylnlWAnM 2lq7Kv9kMDCvmPdZbm+nf1a7KqnOcIOOifVTO4M99AAMyvh8Ywd3UTWdM5uJ6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Svy1vDgzbmT; Tue, 18 Nov 2025 02:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2Icep003187; Tue, 18 Nov 2025 02:18:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2Ic2i003184; Tue, 18 Nov 2025 02:18:38 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:18:38 GMT Message-Id: <202511180218.5AI2Ic2i003184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: f6e9474ebdd5 - main - release: Add a MISSING_METALOGS hack to VMs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6e9474ebdd53de5cf487c7bc9e0fa6743881c23 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f6e9474ebdd53de5cf487c7bc9e0fa6743881c23 commit f6e9474ebdd53de5cf487c7bc9e0fa6743881c23 Author: Colin Percival AuthorDate: 2025-11-18 01:04:55 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:18:27 +0000 release: Add a MISSING_METALOGS hack to VMs The packages for 15.0-RELEASE built without the bug fix needed to make files created via @sample get properly listed in METALOG. Fix the cloudware which contain @sample-using packages by adding the necessary files to METALOG manually. This should be reverted after the next full package build, and live on only in releng/15.0. Reviewed by: markj MFC after: immediately (15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53797 --- release/tools/azure.conf | 10 ++++++++++ release/tools/ec2-cloud-init.conf | 12 ++++++++++++ release/tools/gce.conf | 10 ++++++++++ release/tools/oracle.conf | 13 +++++++++++++ release/tools/vmimage.subr | 10 ++++++++++ 5 files changed, 55 insertions(+) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 7975e1db0822..981e40566a1c 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -18,6 +18,16 @@ export NOSWAP=YES # https://learn.microsoft.com/en-us/partner-center/marketplace/azure-vm-certification-faq#vm-images-must-have-1-mb-of-free-space export VM_BOOTPARTSOFFSET=1M +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/pam.d/sudo +./usr/local/etc/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +./usr/local/etc/waagent.conf +" + vm_extra_pre_umount() { # Remove the pkg package and repo databases as they will likely # be out of date by the time the image is used. In unprivileged diff --git a/release/tools/ec2-cloud-init.conf b/release/tools/ec2-cloud-init.conf index 2a15ae5c57d8..8ad86a082260 100644 --- a/release/tools/ec2-cloud-init.conf +++ b/release/tools/ec2-cloud-init.conf @@ -9,6 +9,18 @@ export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent net/cloud-init" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} cloudinit sshd" +# 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/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +" + vm_extra_pre_umount() { # Configuration common to all EC2 AMIs ec2_common diff --git a/release/tools/gce.conf b/release/tools/gce.conf index c1e129ba69d6..558641821b16 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -17,6 +17,16 @@ export VM_RC_LIST="ntpd sshd growfs \ google_accounts_daemon google_clock_skew_daemon \ google_instance_setup google_network_daemon" +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/instance_configs.cfg.distro +./usr/local/etc/pam.d/sudo +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +./usr/local/etc/syslog.d/90-google.conf +" + vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf echo 'nameserver 169.254.169.254' >> ${DESTDIR}/etc/resolv.conf diff --git a/release/tools/oracle.conf b/release/tools/oracle.conf index ebda3b3d6e61..152c48af1829 100644 --- a/release/tools/oracle.conf +++ b/release/tools/oracle.conf @@ -39,6 +39,19 @@ export VM_RC_LIST=" 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 diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index d718150d8767..0ca9ba267ce0 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -334,6 +334,16 @@ buildfs() { metalog_add_data ./var/db/services.db fi + if [ -n "${MISSING_METALOGS}" ]; then + # Hack to allow VM configurations to add files which + # weren't being added to METALOG appropriately. This + # is mainly a workaround for the @sample bug and it + # should go away before FreeBSD 15.1 ships. + for P in ${MISSING_METALOGS}; do + metalog_add_data ${P} + done + fi + # Sort METALOG file; makefs produces directories with 000 permissions # if their contents are seen before the directories themselves. env -i LC_COLLATE=C sort -u ${DESTDIR}/METALOG > ${DESTDIR}/METALOG.sorted From nobody Tue Nov 18 02:19:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Sx41TPlz6HQTh; Tue, 18 Nov 2025 02:19:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Sx40RxVz3R51; Tue, 18 Nov 2025 02:19:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FGHAWMXJf64YAx/l//kh3xXJIpiZi7MzzD4BgFrFPzk=; b=m6/sAVilf0hyn4qPmyasMCeGVhJ5xyYKG3UzQJrtYud0111q/kKRzJoXSh7ZR2oD0fKDKG bIqh0or/syw2PDaYB4Q1r3Nu2OdD88QcbXj8ggqDwzqDwt7LSpNMtm0vm1EMaDHUI7vYlh YGf/44d1fJfvJBYcZ1z/QbZNhsf4qlp/1gKrlFBoDkvFLufIUkvO4zpve1mjU2y/DMlmc2 N2YzmBDix8EqAViQ9wmR9tyMrjgx/vEWYKPzyLkJcrYMQ8Lk0bzc8nUjOmwDZoDxoEEFzl O7rzJB4lcZjaBKDzLo1CZCKMi3A6nvtNewRdcgehGwg0X9C/FwP3DitLY3fcYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FGHAWMXJf64YAx/l//kh3xXJIpiZi7MzzD4BgFrFPzk=; b=MoPq/lw6pEmDOPoiRVLPl8C5g+wOiM+ybvn1c0m4J7nnpfDB+yGUYkMj9mR3dp1ipyGU3/ tFfQlZRzkH3eTmStpCdy2val7STHWLEHhWeMZ8aE7my/OOdckyIR0mXKRj7Aw9wx9yyYV+ hfF5AzWeWptXspLydAedqIq7JFEysA09FD9/+0qPqqr9twSmgcZn0aX1+17AdYnGIn57Bx TGItRMcbhaA2j8uE5Ve5FnORhbvAulPr7J5Fl7G7ShAl8YkF+ZGUyFuH5jKcWJVCS1nW4Q DR7MGD05T/mmFlVA8asGn/fuAEHB66N+aTPecTFt0ngN06sIo1cBKILsVx/zBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432376; a=rsa-sha256; cv=none; b=P0HdEhzaHVYisfevvBEhZzt6lYg7IfVQRE+5MW/npNjOu1ltFYuGKujyEe9NScLDJoCrnO 0Bgcs0fmhR+esNrEeXp4P3IVhDIipv+nfy2Nv0FUxOtvOnhlMbw9kxm7HaUFiYY2hh9AcO jrJ7jE24HCm8mVo/gGTc4HDMFHb4DKRzXSpVCPkdz0STn4/9cmNKQ3aJQlxsoGW9tF2yeI AyOL/KNBY6ZPiHrP4dv3mcz9840tINAlKOEcQOJqtbONIC00ofi6CVBQfJi/njeia4uEwI hpUf/6usOBQaGsdLxA+7tDipHn4CNX/kb1TC5sOhEy3smLx2HDYhAq+wfE2X1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Sx36yjTzbl2; Tue, 18 Nov 2025 02:19:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2JZGj003615; Tue, 18 Nov 2025 02:19:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2JZTR003612; Tue, 18 Nov 2025 02:19:35 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:19:35 GMT Message-Id: <202511180219.5AI2JZTR003612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0e737642f275 - stable/15 - release: Add /boot/loader.conf to some cloudware List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0e737642f27546ea34229447b2bc056a1fa58799 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0e737642f27546ea34229447b2bc056a1fa58799 commit 0e737642f27546ea34229447b2bc056a1fa58799 Author: Colin Percival AuthorDate: 2025-11-18 01:01:30 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:19:20 +0000 release: Add /boot/loader.conf to some cloudware These were forgotten during the METALOGization process earlier. Reviewed by: markj MFC after: immediately (for 15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53795 (cherry picked from commit 86c63597f2dc7f89268d13a00c0dc7a74cca51d0) --- release/tools/basic-cloudinit.conf | 1 + release/tools/gce.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf index f8554c42f49c..98e11f0bb08b 100644 --- a/release/tools/basic-cloudinit.conf +++ b/release/tools/basic-cloudinit.conf @@ -28,6 +28,7 @@ beastie_disable="YES" loader_logo="none" console="comconsole,vidconsole" EOF + metalog_add_data ./boot/loader.conf cat << EOF >> ${DESTDIR}/etc/ssh/sshd_config PasswordAuthentication yes diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 2fa23f6e54f4..78511dbc66c9 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -51,6 +51,7 @@ kern.timecounter.hardware=ACPI-safe aesni_load="YES" nvme_load="YES" EOF + metalog_add_data ./boot/loader.conf echo '169.254.169.254 metadata.google.internal metadata' >> \ ${DESTDIR}/etc/hosts From nobody Tue Nov 18 02:19:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Sx538RTz6HQRL; Tue, 18 Nov 2025 02:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Sx518Vvz3R52; Tue, 18 Nov 2025 02:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6932Ms7aAUxWl473g5rxIz2BgFYVc9k/tcc/1kOv290=; b=RzUWf4Z8I7o0NZdLoewhBd5ygwX0Ja49I9Qp/kkjiLE2VoShOxj2cwPfw9gZBnxxVgBawu 6uBnjGB9/bqTih0IpqmGmWwLbUivH/EhH8LAiUnp4oyk6EeUXOX8J6UTbFM5Q2RLO6qVLK jmK/Tge4j/jWsIPoN4ZgDwq6QngHZx6PSUsK7oGsTEGRjqTU5mkhIwVNvWIqJvvQixh237 MAfDM+qiqk08tWpbM0TGlKPrX9vGlDu4awWEbVJXvI4fvCfncGSANbUnMjbEp/OTMuQTD2 bf/8KHUuYYS46/9HA7qeqgI+tHYUCLGbAFNWgxLmMPOLACQAqJVXXWZYcd2aXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6932Ms7aAUxWl473g5rxIz2BgFYVc9k/tcc/1kOv290=; b=SRk+H8G3pl2CrVRunlcKPvD9/T8JZEc18cmUYKu5grAfZeXIEU63w7B7E2VyXdm8K08KtT aJGvsvkX4ABmL6NFpbnRmlMjLNmXQ9qLG/LvONxP8PPIdQENSgLbYw6DWD+KgdCb5IHSrF 1EQe3ZX1222V9EQBYJEPDdNbit78XNyxHT8Wr20mIXGRR0BanFK5GaBvLNPlpMLaub65om Ser1GuLrZXK45Ubsek5n1mnA95DFrsOzExOMAS5JYCzWEfHztkZkfsmkpzMn9u7UbsLaox 5znwp2caatxAPdW2VgaHPqaad7sH/O6yGNFYeYFqpcAdNx5FIix4n+TCD/rFrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432377; a=rsa-sha256; cv=none; b=VGqZuoVe6WK8XC80iHkupon7AAtOkOsVehKIOpRyzPOBb+lSTJN0CSUJ1oJ2YrQmqvv7q2 832iyAtmrCywFIPWAkNk2Q0/aTYKD13Yy3fz0r0kzTO/1Lmzzizs0xxNLHHp3rqqMorPuv nKvvkal9nJsngNMXZ4LGTs3HBcd5pS9DTHvliFXFHwYURLaOA6LIuNop61MRZo36cU3Weq P8mJSz2N5VdxehoVCmgv9O9c2wkmOHfRrJFa9Fh6fV4LHjHqye14YBl3IRdw5GuUNGQkIC Rm1gcFQDlwtAJom97stQ8KmEQCeocCwgQu7xRcS7yjNzTRBZxG46aY+DTH8uxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Sx50mPTzbXX; Tue, 18 Nov 2025 02:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2JbDP003653; Tue, 18 Nov 2025 02:19:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2JbEV003650; Tue, 18 Nov 2025 02:19:37 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:19:37 GMT Message-Id: <202511180219.5AI2JbEV003650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 10ef3bf823c5 - stable/15 - GCE: Add /usr/src and /usr/ports to METALOG List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 10ef3bf823c5d5db0303eb1552f1faa47cb0e58c Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=10ef3bf823c5d5db0303eb1552f1faa47cb0e58c commit 10ef3bf823c5d5db0303eb1552f1faa47cb0e58c Author: Colin Percival AuthorDate: 2025-11-18 01:02:47 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:19:20 +0000 GCE: Add /usr/src and /usr/ports to METALOG We ship these in order to comply with GCE Marketplace rules about providing source code and licenses for all the software we ship as part of images. Reviewed by: markj MFC after: immediately (15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53796 (cherry picked from commit 0dbb00733c4a177a9a22d61a627d377d0876ea16) --- release/tools/gce.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 78511dbc66c9..c1e129ba69d6 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -98,6 +98,10 @@ EOF # the image. if [ -e "${DESTDIR}/../ftp/src.txz" ]; then tar fxJ ${DESTDIR}/../ftp/src.txz -C ${DESTDIR} + ( cd ${DESTDIR} && find ./usr/src ) | + while read P; do + metalog_add_data ${P} + done fi if [ -e "${DESTDIR}/../ftp/ports.txz" ]; then tar fxJ ${DESTDIR}/../ftp/ports.txz -C ${DESTDIR} @@ -108,6 +112,10 @@ EOF DISABLE_VULNERABILITIES=YES \ I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES done + ( cd ${DESTDIR} && find ./usr/ports ) | + while read P; do + metalog_add_data ${P} + done fi ## XXX: Verify this is needed. I do not see this requirement From nobody Tue Nov 18 02:19:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Sx63PXYz6HQLc; Tue, 18 Nov 2025 02:19:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Sx61hJYz3R2y; Tue, 18 Nov 2025 02:19:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YB+MeAclQ//yno1Cd5NsaMx//IU5MLAvBketYaL5N/Q=; b=qcpXMjWtxTNsKOUDwgi3sjFgLOUFDmR0oRKCQzvUQNFHtTb4UPFtpRoz3alvXnYZOSuS6g +LdygUdiakGHWW59aKgqi5f/tfuvaMKAo2wzmAhRhkSBMnibfD5zySrtv39IaVgBspKuNm EIYkZqwUW2gfbpkdaIW2V6KRODu9OhsbRY6bqaGUyGVXZtDh8GTMiKLROJWNZ8wuoJaG3k PT8SHghfBUsIo6vmdPklUxBXPzfkudIfuYPPLoGbs9ELnlQIPhpRAxeflPV+d9TnVJ4GtN M+3fRY07PtGtuPf9gdSRiwDNLp4ViSLiwyB5Dp/j68euES+tr9v06vd1KdDsxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YB+MeAclQ//yno1Cd5NsaMx//IU5MLAvBketYaL5N/Q=; b=fdSuQY+ipi4iCjwjbURyaZBlQXblm+OQyE+6l2UaodJLEl5qel14OZCsqJWwUTXGOuIKPp xn5Vz8LGUzZGEeyeXrNwXsQht3DzIe2b37h2WTq1sT04+nO77uXN+JUf5HkuykDNB9zkOv 7sCnD2NtFYDnmfL2Ikejc6ezp7z9PwpgbNVOqsM2ixRkjU8Ny/fE3zpAL/X36mXXcbxAw8 3IXV9EjSbsW7JYSlA69c4BaXS3e5aANbpF25AZeseaWe1GfuHNAvL8k6jJhMfn59dhWBCw ZDcHBnweHBrlIBt+0ZoKFYoeftmp3msFXBU2lMqOxhxn+wCZulttRancTgvTGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432378; a=rsa-sha256; cv=none; b=YvND8w8pZOSAVi0MctPs45AVYrLJBHWUDEFPkpDSyvdwMBGfaE1KkmKXLbHQ/el/TniHq5 JC9OirUqA57p8xPnsdNFQCoGmqe+QSjkPXQW7U6YuyACBl+NhQK7ReyRWQ4egEAauZxwWu e7bUFO4HuZAmqZt50LxQ/oxTxzn861CNmuOZe4bQdIYo0aCKe54txxUUp9humdyyynnRj1 arqBdBlRxi4AraE5HEOgaT7sbwg/UGN4DkpENVbX8QJkz9QHE9obV//5qln2zShtokO/do eaZ2JQXlot0fdpem5oxwYKXdNra/zEtrfu5p0jWsfNELScIlhhJzr8S5aKZZQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Sx61H91zbl3; Tue, 18 Nov 2025 02:19:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2JclC003693; Tue, 18 Nov 2025 02:19:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2JcD6003690; Tue, 18 Nov 2025 02:19:38 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:19:38 GMT Message-Id: <202511180219.5AI2JcD6003690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 96468730a2fa - stable/15 - release: Add a MISSING_METALOGS hack to VMs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 96468730a2fad1eaaf65367bcec5106378cbf3d1 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=96468730a2fad1eaaf65367bcec5106378cbf3d1 commit 96468730a2fad1eaaf65367bcec5106378cbf3d1 Author: Colin Percival AuthorDate: 2025-11-18 01:04:55 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:19:20 +0000 release: Add a MISSING_METALOGS hack to VMs The packages for 15.0-RELEASE built without the bug fix needed to make files created via @sample get properly listed in METALOG. Fix the cloudware which contain @sample-using packages by adding the necessary files to METALOG manually. This should be reverted after the next full package build, and live on only in releng/15.0. Reviewed by: markj MFC after: immediately (15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53797 (cherry picked from commit f6e9474ebdd53de5cf487c7bc9e0fa6743881c23) --- release/tools/azure.conf | 10 ++++++++++ release/tools/ec2-cloud-init.conf | 12 ++++++++++++ release/tools/gce.conf | 10 ++++++++++ release/tools/oracle.conf | 13 +++++++++++++ release/tools/vmimage.subr | 10 ++++++++++ 5 files changed, 55 insertions(+) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 7975e1db0822..981e40566a1c 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -18,6 +18,16 @@ export NOSWAP=YES # https://learn.microsoft.com/en-us/partner-center/marketplace/azure-vm-certification-faq#vm-images-must-have-1-mb-of-free-space export VM_BOOTPARTSOFFSET=1M +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/pam.d/sudo +./usr/local/etc/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +./usr/local/etc/waagent.conf +" + vm_extra_pre_umount() { # Remove the pkg package and repo databases as they will likely # be out of date by the time the image is used. In unprivileged diff --git a/release/tools/ec2-cloud-init.conf b/release/tools/ec2-cloud-init.conf index 2a15ae5c57d8..8ad86a082260 100644 --- a/release/tools/ec2-cloud-init.conf +++ b/release/tools/ec2-cloud-init.conf @@ -9,6 +9,18 @@ export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent net/cloud-init" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} cloudinit sshd" +# 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/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +" + vm_extra_pre_umount() { # Configuration common to all EC2 AMIs ec2_common diff --git a/release/tools/gce.conf b/release/tools/gce.conf index c1e129ba69d6..558641821b16 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -17,6 +17,16 @@ export VM_RC_LIST="ntpd sshd growfs \ google_accounts_daemon google_clock_skew_daemon \ google_instance_setup google_network_daemon" +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/instance_configs.cfg.distro +./usr/local/etc/pam.d/sudo +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +./usr/local/etc/syslog.d/90-google.conf +" + vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf echo 'nameserver 169.254.169.254' >> ${DESTDIR}/etc/resolv.conf diff --git a/release/tools/oracle.conf b/release/tools/oracle.conf index ebda3b3d6e61..152c48af1829 100644 --- a/release/tools/oracle.conf +++ b/release/tools/oracle.conf @@ -39,6 +39,19 @@ export VM_RC_LIST=" 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 diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index d718150d8767..0ca9ba267ce0 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -334,6 +334,16 @@ buildfs() { metalog_add_data ./var/db/services.db fi + if [ -n "${MISSING_METALOGS}" ]; then + # Hack to allow VM configurations to add files which + # weren't being added to METALOG appropriately. This + # is mainly a workaround for the @sample bug and it + # should go away before FreeBSD 15.1 ships. + for P in ${MISSING_METALOGS}; do + metalog_add_data ${P} + done + fi + # Sort METALOG file; makefs produces directories with 000 permissions # if their contents are seen before the directories themselves. env -i LC_COLLATE=C sort -u ${DESTDIR}/METALOG > ${DESTDIR}/METALOG.sorted From nobody Tue Nov 18 02:22:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9T0b5Mlyz6HQQ5; Tue, 18 Nov 2025 02:22: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9T0b4sK2z3SGH; Tue, 18 Nov 2025 02:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mwwqzhDYnFmtlRDJFRPHNQ9xf3gmow9gsw/p18eBzCs=; b=meY4YgqaIYBSgQn/KR0MwjwwFaAKP8pk6oNFaerntdCPZtwFin65CU1/8U9rTG0liLrD0D N/4NciYep6RbfHHbTUxOibJOzuK7o+m9JGOHNd8UR+tb2BJgu+Sfe4OiTb81BR6sZ4Q6qb OSL3caWUKC1ffYqCAm3ZrRncnoUH4zCt/GwccC84Wx9A9N7baa1qJxjR3WWMLlzMEKkBYb 9Og8FdNRkW0jKS2hUKZxFu1sEzbf8NDtq6CulEs8uOAZ+Ug4LYMsl2gF3zU8fAsRcey4b4 4Ss87/qXPcKTEZZr3TCp3LamaoQsb1s6tU3MzO/v6wZQskUrOUVDrLvVp+qiSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mwwqzhDYnFmtlRDJFRPHNQ9xf3gmow9gsw/p18eBzCs=; b=CEXv7/USO54i5av5LdhH3dG4fshDoGzlvjxuqEkEQwFCMda0tZkYaHMUv6xuAe8mTNNbDB 0aHq6l6bX4xVXIbe15WN8bwS5uSQ/yjtJ3xzjF+oGSogCusolzMo0ardK33lgVbbM3eg1k nKLu14JevqtZONeiHRz9I+i88grTjxbuKYeijIMdeSOoO/Rllrx6/RFn8kgejgDypL8L1c TgKVfjE1+PD9adA5MIaGsuYmzxoSxlFptj3v3B3vy+07L0HwAnaLyUZJ4yXp0J60JRh9xC NXfrVB4dSW7agYs0WoJ/Xsxy/wVxeaKbwwBXB4TATRw7bfxYJyrf4SF52D1W5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432559; a=rsa-sha256; cv=none; b=iveUvne9LIFjvN6uwWIz/dTrKzxB3jeUsrRIZqb8s0r9iORJtRFszwIF/RblsvvU8qwcpf 0tS96pwpZzC0+kQe/FHh/N9JQxtrTIvxFFiaKgnuFRXzRN+kAk5ydEeIhItLBPnadXJJRb AwYGWC1HSO34tDfmEVkMyDBmLeFG/knTXi6In2K/yt3I6dcBusl88Yi9WBKNrcinSOs7qm fT5+NHkir6pee/ThiADhW8pAZxKpc01P4mbTS9m0uduM+ml6M85gHR2l5Yk1H73m8IKZB5 XuTxIs+JjsnRRlOBexzHPcrsmAur7B1kgUk2/fvYKaUtxzM9WsF+vXWTn2mc6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9T0b4H7jzbDG; Tue, 18 Nov 2025 02:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2MdnI020916; Tue, 18 Nov 2025 02:22:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2Md5m020913; Tue, 18 Nov 2025 02:22:39 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:22:39 GMT Message-Id: <202511180222.5AI2Md5m020913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: fb51f370709d - releng/15.0 - release: Add /boot/loader.conf to some cloudware List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: fb51f370709d2d50704934b24b868b303bd90dd4 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fb51f370709d2d50704934b24b868b303bd90dd4 commit fb51f370709d2d50704934b24b868b303bd90dd4 Author: Colin Percival AuthorDate: 2025-11-18 01:01:30 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:20:30 +0000 release: Add /boot/loader.conf to some cloudware These were forgotten during the METALOGization process earlier. Approved by: re (cperciva) Reviewed by: markj MFC after: immediately (for 15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53795 (cherry picked from commit 86c63597f2dc7f89268d13a00c0dc7a74cca51d0) (cherry picked from commit 0e737642f27546ea34229447b2bc056a1fa58799) --- release/tools/basic-cloudinit.conf | 1 + release/tools/gce.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf index f8554c42f49c..98e11f0bb08b 100644 --- a/release/tools/basic-cloudinit.conf +++ b/release/tools/basic-cloudinit.conf @@ -28,6 +28,7 @@ beastie_disable="YES" loader_logo="none" console="comconsole,vidconsole" EOF + metalog_add_data ./boot/loader.conf cat << EOF >> ${DESTDIR}/etc/ssh/sshd_config PasswordAuthentication yes diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 2fa23f6e54f4..78511dbc66c9 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -51,6 +51,7 @@ kern.timecounter.hardware=ACPI-safe aesni_load="YES" nvme_load="YES" EOF + metalog_add_data ./boot/loader.conf echo '169.254.169.254 metadata.google.internal metadata' >> \ ${DESTDIR}/etc/hosts From nobody Tue Nov 18 02:22:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9T0d1dVnz6HQQ6; Tue, 18 Nov 2025 02:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9T0c5xbSz3SGQ; Tue, 18 Nov 2025 02:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xef58Nohh+CbMsotKp8ijTGaQWZyi1totAmgfxYeQ/U=; b=Zl/pqv8hwL2vv/jcCYDDEKZX7rYMEaEqspfO1T6a5GNft3HZJF9P1SUQPaUPC3Gkt/Axtm 5Ofpta9vBg3cYWEtdq98fjVQdjwiv6AWppdQjnWFXoRlYCa9FN7Lc2wToMUizZlSjjhZan H8Yj5zR+AfFADuanQlozQlCYu4vNtb8zlOtt4FAiFAPavLRWqyfebD8DLv09Parm/yShIf 3+RKntM3VQkLyLmSIp2qlhljSY0/qXNgjOs+zjEDqtAIWqjiCDvS5EwOogIREOxwowr5kQ 98ja4ajw7PUm4C6CqZyw4E5XgklfudSEv2a/hGdBP2io0JC1yV4aEVr7tnqcFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xef58Nohh+CbMsotKp8ijTGaQWZyi1totAmgfxYeQ/U=; b=IIGCx8DrJqz24LZa8r2Ee4OY6P18rQHUyPfkY7vIMxX5Xi+SoU+rzLdhFxUpEHFK0Ft2PZ huFsaCd+hiPc0n6olKJjYTAzmJV8FFXUfczpCyBn8xxqI4BzqmPNlYbGyszYKe/7QQETBC YIkNlzgjuovAoYjY2SVS9w05/Iorvb2FUyCeJyMMuL/VrEK17Y2PmexdNCm+8qFF7qGl8K cVh218lLQrmYGZduzvjyn4F2lDKuVF7Mz4V2oTXDYJdZINisY+OdaBSwKbnkynAXHolfeS PKaQ0yeD/sy52a9jAa7CYmlFUWKK90MRbK5KgqkX3iceK4S+pRgrj2w1AI4NQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432560; a=rsa-sha256; cv=none; b=JYt9U3ZC7zengpK/d9icHkOf0uouq83CCGc//emyDEyFl1PTrkGYmpdztYpPNJJxm6JXIK bvGTYCRT4k2GEJVF/cUgDoS7fjCE2QxoCwFbB6YAKMW7TVkU/FK61CHv6i9FrU6cfbto7o pCZr9Xq+GmPQNw4Cd/WoIDj/YGD6+CxQcrvY7CwnbGjg5VXt4Ak+ZDvs//CfmU4MXnQ9bS 4Esp00jC5FEEqDtY7nzpauG1gcwd1gmiTBn0OuKa2m7Je69/eFi/JG4g1X8C7tjQZUmDqP zfPtlbsRemPCDQ+3lQm1O5/hvB7I7XTmCpobBT75FqIkkfI4yVxrec7iNUrtAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9T0c5ThszbyT; Tue, 18 Nov 2025 02:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2MeLb020950; Tue, 18 Nov 2025 02:22:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2MeDu020947; Tue, 18 Nov 2025 02:22:40 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:22:40 GMT Message-Id: <202511180222.5AI2MeDu020947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0f4c3dcd1e07 - releng/15.0 - GCE: Add /usr/src and /usr/ports to METALOG List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 0f4c3dcd1e0761781e5636272caeb5d50fef3e0b Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0f4c3dcd1e0761781e5636272caeb5d50fef3e0b commit 0f4c3dcd1e0761781e5636272caeb5d50fef3e0b Author: Colin Percival AuthorDate: 2025-11-18 01:02:47 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:20:35 +0000 GCE: Add /usr/src and /usr/ports to METALOG We ship these in order to comply with GCE Marketplace rules about providing source code and licenses for all the software we ship as part of images. Approved by: re (cperciva) Reviewed by: markj MFC after: immediately (15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53796 (cherry picked from commit 0dbb00733c4a177a9a22d61a627d377d0876ea16) (cherry picked from commit 10ef3bf823c5d5db0303eb1552f1faa47cb0e58c) --- release/tools/gce.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 78511dbc66c9..c1e129ba69d6 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -98,6 +98,10 @@ EOF # the image. if [ -e "${DESTDIR}/../ftp/src.txz" ]; then tar fxJ ${DESTDIR}/../ftp/src.txz -C ${DESTDIR} + ( cd ${DESTDIR} && find ./usr/src ) | + while read P; do + metalog_add_data ${P} + done fi if [ -e "${DESTDIR}/../ftp/ports.txz" ]; then tar fxJ ${DESTDIR}/../ftp/ports.txz -C ${DESTDIR} @@ -108,6 +112,10 @@ EOF DISABLE_VULNERABILITIES=YES \ I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES done + ( cd ${DESTDIR} && find ./usr/ports ) | + while read P; do + metalog_add_data ${P} + done fi ## XXX: Verify this is needed. I do not see this requirement From nobody Tue Nov 18 02:22:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9T0f29cFz6HQgh; Tue, 18 Nov 2025 02:22: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9T0d6cbSz3S5J; Tue, 18 Nov 2025 02:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ohHUHPoanQY+sjqMG5vWUp/tc7nFc9tMJYtAnQifU7M=; b=mRaL9XE8X0+56i5F2g2XFrX8cyXGKeHon92hi0WrGexvmiHz1VxsjdCDURF5TUBeqRgi9r NCZwUML476tEpuyyOWV0usXpwD1RPMQTR3x9Gp23a/fnUmgGnz9C7erIse1r77BQBTpz64 skRJHbmnVpzK99rF9XbAvxEpefm6xrCKGs23nkPD2HvHyHKYRTEGfZgBsmT3ozdLYs/xoY bxeqbfJH8bxmn9TcnpQLH13nUhHR5mUjj2ctpZtriMwrLf+lbz5eVRi9tj69mwShZraeKK e4VtP0HefY/f6wKH6lq+akUfg3pvF3wTHj3Ahm+f3IVs+WzlusvpqNBvFZRVqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ohHUHPoanQY+sjqMG5vWUp/tc7nFc9tMJYtAnQifU7M=; b=blakksq7j4BJdZ4uGR32yprCr7142xfVuVult344CH0FM8dGZw7OwVa7gjxGDyKKOY+Hyu NDjw7r3AV+TOIHEXFlLtRUP+UKXKBJQvZzLtVbwAZGnH1b6o5HOZ1MyFEhEbvny0LphdIw 1wIyntDDWS1YBW7EinOsa11G+ZxKfhTOoUMkf12m8rsvSoQmNRh7TJ5wLrQdFTI0pu1M/P j8YpVdszIraVW4JxwnLht1VM++ok/bvH3nHg1gGEj7Xw/5ZjbwVuHHBRKywvCo/i6mZfox g2fJkn/IxWbdI5NRGJr60WwThw+qyED+reRSuiVoW5KzwS2zxcWaoHidk5+i3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432562; a=rsa-sha256; cv=none; b=ejEycaaZ19yihmXSzmO2sYmPewOagksNH7m0tmV6ZLKh6gTeC3HHlEu3sxQt1lprYn3a3E zk5TfqELqJIlrS0IHawe1V1FdWCd0OWheTjOwJfgX2xQDc62kofljLMsG5dMSX/xJAPfXs G6XjLwx6+J7ifDRjGSQGBLHvEqWdzq4dnWEKdsBN2P+vZFIgKoQlkTKxy2Rdaa6GpPlRR5 5El+0B5iPSkZfC5SliGojKXvzugJ0gRBpqDVNppm2fyKgDJQAbOg50z1jjvroLdJUk3LaM MuO8n0cdUpzR1I7cxCwN4hwOhS+tqQJ1mnVJIOaYnmsBJXOkK+8yN01nTx9yYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9T0d669szbyK; Tue, 18 Nov 2025 02:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2Mf5S020986; Tue, 18 Nov 2025 02:22:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2Mfqn020983; Tue, 18 Nov 2025 02:22:41 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:22:41 GMT Message-Id: <202511180222.5AI2Mfqn020983@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f66279332f7c - releng/15.0 - release: Add a MISSING_METALOGS hack to VMs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f66279332f7c571f62d616469e78a4341eb125ff Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f66279332f7c571f62d616469e78a4341eb125ff commit f66279332f7c571f62d616469e78a4341eb125ff Author: Colin Percival AuthorDate: 2025-11-18 01:04:55 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:20:38 +0000 release: Add a MISSING_METALOGS hack to VMs The packages for 15.0-RELEASE built without the bug fix needed to make files created via @sample get properly listed in METALOG. Fix the cloudware which contain @sample-using packages by adding the necessary files to METALOG manually. This should be reverted after the next full package build, and live on only in releng/15.0. Approved by: re (cperciva) Reviewed by: markj MFC after: immediately (15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53797 (cherry picked from commit f6e9474ebdd53de5cf487c7bc9e0fa6743881c23) (cherry picked from commit 96468730a2fad1eaaf65367bcec5106378cbf3d1) --- release/tools/azure.conf | 10 ++++++++++ release/tools/ec2-cloud-init.conf | 12 ++++++++++++ release/tools/gce.conf | 10 ++++++++++ release/tools/oracle.conf | 13 +++++++++++++ release/tools/vmimage.subr | 10 ++++++++++ 5 files changed, 55 insertions(+) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 7975e1db0822..981e40566a1c 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -18,6 +18,16 @@ export NOSWAP=YES # https://learn.microsoft.com/en-us/partner-center/marketplace/azure-vm-certification-faq#vm-images-must-have-1-mb-of-free-space export VM_BOOTPARTSOFFSET=1M +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/pam.d/sudo +./usr/local/etc/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +./usr/local/etc/waagent.conf +" + vm_extra_pre_umount() { # Remove the pkg package and repo databases as they will likely # be out of date by the time the image is used. In unprivileged diff --git a/release/tools/ec2-cloud-init.conf b/release/tools/ec2-cloud-init.conf index 2a15ae5c57d8..8ad86a082260 100644 --- a/release/tools/ec2-cloud-init.conf +++ b/release/tools/ec2-cloud-init.conf @@ -9,6 +9,18 @@ export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent net/cloud-init" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} cloudinit sshd" +# 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/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +" + vm_extra_pre_umount() { # Configuration common to all EC2 AMIs ec2_common diff --git a/release/tools/gce.conf b/release/tools/gce.conf index c1e129ba69d6..558641821b16 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -17,6 +17,16 @@ export VM_RC_LIST="ntpd sshd growfs \ google_accounts_daemon google_clock_skew_daemon \ google_instance_setup google_network_daemon" +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/instance_configs.cfg.distro +./usr/local/etc/pam.d/sudo +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +./usr/local/etc/syslog.d/90-google.conf +" + vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf echo 'nameserver 169.254.169.254' >> ${DESTDIR}/etc/resolv.conf diff --git a/release/tools/oracle.conf b/release/tools/oracle.conf index ebda3b3d6e61..152c48af1829 100644 --- a/release/tools/oracle.conf +++ b/release/tools/oracle.conf @@ -39,6 +39,19 @@ export VM_RC_LIST=" 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 diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index d718150d8767..0ca9ba267ce0 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -334,6 +334,16 @@ buildfs() { metalog_add_data ./var/db/services.db fi + if [ -n "${MISSING_METALOGS}" ]; then + # Hack to allow VM configurations to add files which + # weren't being added to METALOG appropriately. This + # is mainly a workaround for the @sample bug and it + # should go away before FreeBSD 15.1 ships. + for P in ${MISSING_METALOGS}; do + metalog_add_data ${P} + done + fi + # Sort METALOG file; makefs produces directories with 000 permissions # if their contents are seen before the directories themselves. env -i LC_COLLATE=C sort -u ${DESTDIR}/METALOG > ${DESTDIR}/METALOG.sorted From nobody Tue Nov 18 02:22:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9T0g2Yybz6HQYd; Tue, 18 Nov 2025 02:22: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9T0g00Nkz3S5V; Tue, 18 Nov 2025 02:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ZpZlwGgwTjgI+jCmQs6I8omNPqoSUvQbvPcT2VzDSU=; b=CZJpBqTa684WbVKov1BRzyfrlUJLbbU5KbjE6A96Lx8ax74Ill0I5dnilD0sOp5pZm+57k eYbMzP4jt8Sr068fClyVhRJ4Sy/8axxq/uPIYK+vPiFNAy1tHeZTgf0qEHf/tLVkrEbaJI RnA9sgSZCk8bQjx8wuzuB5h0k9rRMjOP/qOvwR33Ewq9mmFzd5vObOEPDtu8B9dVpGU1Qs LUjngSUXZPNi4LIoQwTSO/Onipn54jWnSSxg7zCHkRxH2/SVSAuI/5o5rCT4Q2l04QoilN /GLhN4CWWoXIlXcBUr8+ZhlXVEmCnnCIhEtd4xyUhzjIXa/Md0eXEDstQ9XdgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ZpZlwGgwTjgI+jCmQs6I8omNPqoSUvQbvPcT2VzDSU=; b=LpiyhEYurgb3BoImhUk2MtNsjM6XI0x0KU+mJApOmh9Yv9qiVZYqbFWFlpz2ob/FEChWGs p0B/vw7vAUq82BGbth0qTlvS93uLR3K3G17bkqOMyKRyatxDSX297suvpeSk1va3lJKdmE zvcggIQiPjCCGRA4PsOHeemyPJwZWuIX+LSndmWJ0mJKweGToQBNAYZf3P1j6wZnzGben+ 4DCOJv3g6gsgsWlx5tqmPodcM2hL7OWXT0oSt96JuaY/qF+3xtUMKzaIGcol1VbkiyIUnn NP3p7ZvAmPLPjz+qaqJhRL+nIYPKaqmEeIdjnitdHeMbM+GZTCV+kkPdSLYwdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432563; a=rsa-sha256; cv=none; b=rs6zjegj1+oBVFQ/63re+QGidZ/H7PJ0BFg7TgzB8TJazTG8XYgbNBgJEMKZffwiXUb4vo +Y6rWQblEXiSxly+fcLUByci2OlOc4pLb9+dxAhOl/YGJlAxo5JX5v+ClyKLb5CAyPw3tp g0TxSr6XyJxCe1N0a3EoNUX8sh52IrCwI+4mnPQTAhgti3Q272XXYYaboiaNzBVphCOBGB tzjdUBV9JfrxXO+D/Gxm25kJpRq5AXHkyNgSm3+EuF2hjlCmEmeooe+NOGWhovgg+BCQp4 K8d5c/Sz+oFM94pe+DRS/HXJlyH/s5VvE3nPTQ+pk5Ju/CRKk0qYTBvI8eH+iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9T0f6byYzbVv; Tue, 18 Nov 2025 02:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2MgKc021023; Tue, 18 Nov 2025 02:22:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2Mgx8021020; Tue, 18 Nov 2025 02:22:42 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:22:42 GMT Message-Id: <202511180222.5AI2Mgx8021020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 7bd80d8ee020 - releng/15.0 - 15.0: Update to RC2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 7bd80d8ee020ea79fd148f11f295a342b96dcc89 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7bd80d8ee020ea79fd148f11f295a342b96dcc89 commit 7bd80d8ee020ea79fd148f11f295a342b96dcc89 Author: Colin Percival AuthorDate: 2025-11-18 02:22:00 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:22:00 +0000 15.0: Update to RC2 Approved by: re (implicit) --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 5f5224975735..d04589d00eb3 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -51,7 +51,7 @@ TYPE="FreeBSD" REVISION="15.0" -BRANCH="RC1" +BRANCH="RC2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Nov 18 03:37:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Vg05MBHz6HWW3; Tue, 18 Nov 2025 03:37: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Vg04Zpwz3ZRW; Tue, 18 Nov 2025 03:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763437052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FyTqL0USKBoz7Hkvxljp7nGRxx+vJ2zMSh3qlYbwe3c=; b=pKCGDtbt9s7mtpFc//bAArXywGCcCFE6sc2+FtQE10rdB5KCtk6RjkQBWbotffyMZLl8nA 5C+cB7mWgQ09TruRgQvP/MYDExr2x0h0beIu8Yf8yxEMmsMjLTqgYf+IvvAZbXHQfV0xvI OH8HtcfGXRGu0zlSeVtlxupUrYq7MdwRB+l0uHG+sOl5mGEn2HwF7nCa+a4taRwutpGU01 JsoApinKBmH3oE2JJMZHTvlFPVYpyZQmttdNgtH+XZErQURpfX1h7bD/9XFxBwZrCmKui+ esTczWReJCLF1XMr/+X8tlr5xBNmHNAfp5Z49uLAR3U7T/OywZNn4uZawTk8/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763437052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FyTqL0USKBoz7Hkvxljp7nGRxx+vJ2zMSh3qlYbwe3c=; b=sOpWa+8Q8CmrqXxSTnk8LG4Bf1C+UwYKrmGBxa3lCyM65mnUTC2e2TlsJPllJPyE9tMA7F Fh5RpYP3gcZxYHOTuvd79XGDEmn3Vyfma2PopS1sE3osrh9ov10yunDyQset5WMhbOrXP+ rRJza06pbRhEwsUJukRro8G6etBeFDKDePGmKUyga58v76uvgf4jHAUo5PBdEbs6c3ekMH 3Zo+JVHgORNaSOgqEV4NEAHchty19Oi0JqoPeQjGnl5CvhPTrUJZwfxpPIQO9o4CeJ3NfD UiSSV5732a5RRMChIIO5dRePjT47bEO7H3XYh3/xfhmmUT7qiKCQ9fpBTrF48g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763437052; a=rsa-sha256; cv=none; b=BHlN0onoji5lGQphIXUjwXhK4NYeaih7jP7xOzrL2mXX2fWEdChacSekUUfGBdseaXaIZm cINT0/tmHsF5j3wabjANHM83uOo+nm16N1/tk7c0mC5qvBXoitEhjI6Jb2UB6fqDOd/t+e f/3Bg7xnnS/4GXj43Xz/c4gjFrRC2fJEpd42bEC3ObS6OKU36bNNyDxHPJG43jai7R7AUW uotgpwRYyv99vnq9XIm5ePN9vEqCooaZAlnYFitRJ8jEodJLICpShbNjFyH0d0tuAdfhaB bf7gketvLxTaOFNSomsbV2F+5v5awgNficRW8rmcNIoGnxiXB3LfBdrsaclOdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Vg03lf9zdZP; Tue, 18 Nov 2025 03:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI3bWrX055306; Tue, 18 Nov 2025 03:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI3bW3x055304; Tue, 18 Nov 2025 03:37:32 GMT (envelope-from git) Date: Tue, 18 Nov 2025 03:37:32 GMT Message-Id: <202511180337.5AI3bW3x055304@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 48c288443822 - stable/15 - kern_thread: thread_suspend_check(1) must never suspend List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 48c28844382229a7af24941541e89e663b38f75c Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=48c28844382229a7af24941541e89e663b38f75c commit 48c28844382229a7af24941541e89e663b38f75c Author: Konstantin Belousov AuthorDate: 2025-11-06 19:25:23 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-18 03:37:05 +0000 kern_thread: thread_suspend_check(1) must never suspend PR: 290843 (cherry picked from commit e1c6f4cb9bd29358c2b2fe249af9a2f9626b0670) --- sys/kern/kern_thread.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 3180c66cb42b..4f9053460455 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1446,6 +1446,14 @@ thread_suspend_check(int return_instead) return (TD_SBDRY_INTR(td) ? TD_SBDRY_ERRNO(td) : 0); } + /* + * We might get here with return_instead == 1 if + * other checks missed it. Then we must not suspend + * regardless of P_SHOULDSTOP() or debugger request. + */ + if (return_instead) + return (EINTR); + /* * If the process is waiting for us to exit, * this thread should just suicide. @@ -1481,10 +1489,9 @@ thread_suspend_check(int return_instead) * gets taken off all queues. */ thread_suspend_one(td); - if (return_instead == 0) { - p->p_boundary_count++; - td->td_flags |= TDF_BOUNDARY; - } + MPASS(!return_instead); + p->p_boundary_count++; + td->td_flags |= TDF_BOUNDARY; PROC_SUNLOCK(p); mi_switch(SW_INVOL | SWT_SUSPEND); PROC_LOCK(p); From nobody Tue Nov 18 03:38:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9VhW0jcRz6HWTJ; Tue, 18 Nov 2025 03:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9VhV6s67z3Zlf; Tue, 18 Nov 2025 03:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763437131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0uBYQqc1QQmd+b+S6jYzi4SzgLH+jTs9P8qVMulw+T8=; b=YhlcDoLkU2Tnq85ZD+KwpX4PIuBMm5oycrmJOY+03OXVXyyFu9lUE0iOkaReQ0WVAL+zR+ 55EIYVNs/hL3uqiskfzxaoF3JYq+ef7/ZKD18nEJF12fiqdUvqSljy1uF+9TNpg11N9DXl +IqSOprVCqDrtl544aj3aH2qb10cguzzisp1v3rlIN4gfdeJFT/r3io1FD8vtYNR/7GCYp PrDI5p0sAw2uoWQVNANHU5XeZt0bP5J7rbr+ZzYa3Sx1yRo1bW+okPpw6nGUAPt2m84d75 N1t/jv4OxlhfY0CdV4tpE0U3+d9MK9SROuSUi+rhNd76WaZ0hWyztL2OYZgu5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763437131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0uBYQqc1QQmd+b+S6jYzi4SzgLH+jTs9P8qVMulw+T8=; b=xEs2x6ItW6SIk3X3ZPYlK5Dy2iCpDNImgvQ35D19d5Sa4OFTugz0pmKtw+tW+CPAF7c/GQ FUb5FJNmjy1AuUabO6AGHBzZkqdU9Rlh04Uota2oPrlPWe/pF6VWZA9EyGBmJ77O+G0tb1 z1b+oRk31/+1EglP9hMLweusmzRquPh9FAXV1aJZ0dPyI4iKQXZ21iCyBZ1AAxf2emFIfE bjfPLaqixV/967Pog99NP5nBz1+De9nle7Pw1erntsXU0EqMKThqYnsAyXvFeC6vKEvmcA bRtnQ2CSdgEzr7hwAntAb5hnzCZr9LkURNrCsBZsAloo8D5pHa/IsbWVhx5swQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763437131; a=rsa-sha256; cv=none; b=mA34q0tcV09YhBwbSM9oKDo8WjGeTvoUQWTuorNqyAAbI7QxnraDj2wbmJ8SZdSzh4YBhD cYidVC1AqD5jKTtjE2sS0jQMU1sPMW4d9tJxtBH79PX3iAkCkB9bUTU0Gpn7IkTocVDIgg tPicIBsF6a4Ryq6zqhbkJZCRL+e3LPVpB4cjaP2XX3Qe0RCMEiEn6nukScnGJA3/zfN6/1 ExSzEEVu3GuiLwXZEC74xWgSWDJDNcKufrHzMMZGra8HWl/AHR8/IxzMXJ/qpvX+mq+bQ9 HserV02mnB0gx5IYuze4FGSeffL8KTTiJq0ppSQDOLW5ID6GYP6g+8WnhioWXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9VhV6RSVzd5f; Tue, 18 Nov 2025 03:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI3co1c055825; Tue, 18 Nov 2025 03:38:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI3conO055822; Tue, 18 Nov 2025 03:38:50 GMT (envelope-from git) Date: Tue, 18 Nov 2025 03:38:50 GMT Message-Id: <202511180338.5AI3conO055822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f363f4a8fa8b - stable/14 - kern_thread: thread_suspend_check(1) must never suspend List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f363f4a8fa8b7d7beb79d2f6f70479aad30e7d6f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f363f4a8fa8b7d7beb79d2f6f70479aad30e7d6f commit f363f4a8fa8b7d7beb79d2f6f70479aad30e7d6f Author: Konstantin Belousov AuthorDate: 2025-11-06 19:25:23 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-18 03:38:29 +0000 kern_thread: thread_suspend_check(1) must never suspend PR: 290843 (cherry picked from commit e1c6f4cb9bd29358c2b2fe249af9a2f9626b0670) --- sys/kern/kern_thread.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index a41e74e1533e..bd81b7472579 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1451,6 +1451,14 @@ thread_suspend_check(int return_instead) return (TD_SBDRY_INTR(td) ? TD_SBDRY_ERRNO(td) : 0); } + /* + * We might get here with return_instead == 1 if + * other checks missed it. Then we must not suspend + * regardless of P_SHOULDSTOP() or debugger request. + */ + if (return_instead) + return (EINTR); + /* * If the process is waiting for us to exit, * this thread should just suicide. @@ -1488,10 +1496,9 @@ thread_suspend_check(int return_instead) * gets taken off all queues. */ thread_suspend_one(td); - if (return_instead == 0) { - p->p_boundary_count++; - td->td_flags |= TDF_BOUNDARY; - } + MPASS(!return_instead); + p->p_boundary_count++; + td->td_flags |= TDF_BOUNDARY; PROC_SUNLOCK(p); mi_switch(SW_INVOL | SWT_SUSPEND); PROC_LOCK(p); From nobody Tue Nov 18 04:45:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9X9n4rFQz6HbfG; Tue, 18 Nov 2025 04:45: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9X9n46Wtz3jlF; Tue, 18 Nov 2025 04:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763441149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rorzYHOFvE8yVsGnyq1AZk4XtVHJqsSt/CmQwzpLhT4=; b=YwXIDJ6P+5pfoF7Iu8J1DZT6vMS01UpFfCMDFdYSC4ggHNpn8usCnEcxWWzI6Hn7MVPrnH rbxfTGw/5xOQY2WPg+IhNz8jMA6Dhog1493/18YgonGsUtPAJsbQhWK6PgJbFCR8RZMa02 +IiVVYhLMFpRr0o0F9OcG4/ytJH0d7mkFJ1QZyJ1SZA4mxMJQ82C0BnQuST0fNzepcNDZd pbcGukAhe5OtvWMnY7o2ctqnVpFIRcSCTGFcqYY4Rgoy30fltZqSAlPslDU0y6Pp6ndbYG Ng7vZaXyoK36CNC3pSl+MU/1z2GKKqcJDQJNUWoU1C/puvjGQhFmHUIMYPR7Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763441149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rorzYHOFvE8yVsGnyq1AZk4XtVHJqsSt/CmQwzpLhT4=; b=MfteutG2EX4eiTfXKb0wMMCmRQaLjtQ7OcJRXCT/TRCgIfDbiRudJAFnSP8gD34hQpjj6d 6boSUXGPeOBvk2ZF7qbo4G+Bdb3NzslTE+OdMwGyNvm5oIaPvuw5Wj2YrwFv7opJQTLW6q 59gjlfvXWqBB/rms3jo5xNz5VJty4Epo8dz2LNHH6lCJUFWPtP/PC7lXc7Rm3AUBAq4FFw fQSeGyFFbyF+u+JwP2qxfTUBrNVRIyxDiwfcNYSsh1sFFFiuRtzzIo7zufbbVmz7UfL7gd uovtEpq6geXEqcC4PH1B5JmBt0FORcrAFP57Lh8DfHskZtGwirlr3mj1CVIDuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763441149; a=rsa-sha256; cv=none; b=PbokTx4seXW+o7ItVKI/4ti+8XaFMZzOFD/ozVfDzOurpMWUQqY6nZky/0X3HBwIqSdMZo WPvX6tItk1gO6zyAjfNOQ3LTGsZy4wnYpIAxs68liZSu5ZURHvnoV+Th9W907VoJObP9QB 26JW1MvvMF+NOjWGxuEhyTR77h0H5YRWXn7hVzJGjua0nxgEvQFxW0zaCINH1/5Q2IsFVG EcanFE1k9XX8CrpdqVwi4Za1NGYES5yXskj+Wm8K45pMFW6O+Yg73UWkiJo1evaOm0hFgT 4BZmkl/Ceb5GUDEBZOxtn2v5P+6bANXyT32EZ0g3/PyVeryW6j9osUQYHTY9Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9X9n3T48zgcB; Tue, 18 Nov 2025 04:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI4jnwv085914; Tue, 18 Nov 2025 04:45:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI4jnYK085911; Tue, 18 Nov 2025 04:45:49 GMT (envelope-from git) Date: Tue, 18 Nov 2025 04:45:49 GMT Message-Id: <202511180445.5AI4jnYK085911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 396b32e801d6 - main - stand: Add back missing EFIAPI define List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 396b32e801d615954750162a616b4e9174b39916 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=396b32e801d615954750162a616b4e9174b39916 commit 396b32e801d615954750162a616b4e9174b39916 Author: Warner Losh AuthorDate: 2025-11-18 04:44:07 +0000 Commit: Warner Losh CommitDate: 2025-11-18 04:45:59 +0000 stand: Add back missing EFIAPI define EFIAPI has to be defined correctly for amd64, or things won't boot because it uses a different API than we normally use. Normally, this only affects amd64, since all the other archs are basically nothing. Tested on: amd64, aarch64 and armv7 (the frist two by markj and I with differnet test setups). Fixes: 43b8edb32051 Sponsored by: Netflix Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53799 --- sys/sys/efi-edk2.h | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/sys/sys/efi-edk2.h b/sys/sys/efi-edk2.h index 513c56549803..b27b26bd613c 100644 --- a/sys/sys/efi-edk2.h +++ b/sys/sys/efi-edk2.h @@ -41,7 +41,20 @@ typedef void VOID; /* We can't actually call this stuff, so snip out API syntactic sugar */ #define INTERFACE_DECL(x) struct x +#ifdef _STANDALONE +#if defined(__amd64__) +#define EFIAPI __attribute__((ms_abi)) +#endif +#ifndef EFIAPI // Forces EFI calling conventions reguardless of compiler options + #ifdef _MSC_EXTENSIONS + #define EFIAPI __cdecl // Force C calling convention for Microsoft C compiler + #else + #define EFIAPI // Substitute expresion to force C calling convention + #endif +#endif +#else #define EFIAPI +#endif #define IN #define OUT #define CONST const @@ -64,11 +77,13 @@ typedef void VOID; #define PACKED /* - * Since we're not compiling for the UEFI boot time (which use ms abi - * conventions), tell EDK2 to define VA_START correctly. For the boot - * loader, this likely needs to be different. + * For userland and the kernel, we're not compiling for the UEFI boot time + * (which use ms abi conventions on amd64), tell EDK2 to define VA_START + * correctly. For the boot loader, we can't do that, so don't. */ +#ifndef _STANDALONE #define NO_MSABI_VA_FUNCS 1 +#endif /* * Finally, we need to define the processor we are in EDK2 terms. From nobody Tue Nov 18 05:35:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9YGp2gc7z6GRSb; Tue, 18 Nov 2025 05:35: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9YGp1wYTz3qrF; Tue, 18 Nov 2025 05:35:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763444114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JMJQNAaBrwCb5cx6frrCHPLSt0bhsReiL8wMvzrG4ZI=; b=CHdWbv3R8w9icQMyZY6REk3tt9ziCgyzK970reYc+6FZjZVodR3x8hqHflwvE6V4ejhFPx OeI0CLiQBBcgo/OrerHqVTN8rAPtRYmQSVUVkQZHKUEOAWSHFX+EW6RuIOk5U1V4/w/8O9 Bd44qym3adJrKPMO64JqwYi4PJbKKnfs5pgOLpQZd7ZAogJtZWXrTwn6yLPAMdKqhJGlZr 08GLk6lBABoJZmAT5icBUn5y400iGJxHSX1BZ4efCAT/C9vccxKd5qB2tYKAaSn0HQaVYc YqtLSFKC4z0aQfcv5patRNchzjKMN5Ce0p9eh2OMVuwrzemDlJW6fwIifH1ANQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763444114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JMJQNAaBrwCb5cx6frrCHPLSt0bhsReiL8wMvzrG4ZI=; b=SHMqCugNCkNEb+5q9eKiN/kNMdYeYKuHE8M6MaFQJ9gA+eUBB52o7wmpaBGY7wbuz+4Fys gKvlzJA8Q/MA/29K6DCk5JAMQv/wqfG2uDPKu2gCK5cd6WhQ25eiRkL9KbzbLIpYmItERP KsrTngeuOpZvgeejpBjEW2nLVNynlh1VFNjtxQBmjrcjhSzqH/ElQYv8v+sOu6dFZmzz0C aAHonhI7qrjfrgNdC39MglvukXdo3vQlgz34nzbHMJ7DflE0nQ02+cCsBNccBZJpl58byn o7B3B2WxgUIZFYFArcV5JCG3w8ljekyGZmmXrhqd5RAFLgAANQnRwyKNvMXqLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763444114; a=rsa-sha256; cv=none; b=bnQOPjJBZNkgMZ+OKYDCygBQT4jL6uj+dXYm5Bad9NtQnEuXgxzHILYh/IMcXASjHfaMFH wGDT+TNGNgI10eOsP9u+uAN0bcH5kPU7V43Vj6VQOCbg86NNH4t+jgTjkjQaMe3YUlzomM Q0MBWquQDIFeczTO/yi/pPYqzy1fv8Xa5FJQ+9L8rGbAcqtyuZfTuXn6kCfabS39LWjxCj XCjcauGHFz1oppOwV21rm/e9GsdygQMyqFufdJOc3sWCtUst5myIc/BwgDVih9z8jzhkpQ R7wbLu8qWPTQMP5rMsYj2zILVL/wY9RM/DzSC6ElwK3yfeQ2buQLbemA7y6M+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9YGp1SDKzhtV; Tue, 18 Nov 2025 05:35:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI5ZEnS080109; Tue, 18 Nov 2025 05:35:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI5ZE5Z080106; Tue, 18 Nov 2025 05:35:14 GMT (envelope-from git) Date: Tue, 18 Nov 2025 05:35:14 GMT Message-Id: <202511180535.5AI5ZE5Z080106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c0a38339fec3 - main - exterror.9: explain buffers and bios usage of extended errors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0a38339fec37a5b6367f138f059a12d6d716fd4 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c0a38339fec37a5b6367f138f059a12d6d716fd4 commit c0a38339fec37a5b6367f138f059a12d6d716fd4 Author: Konstantin Belousov AuthorDate: 2025-11-18 04:23:41 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-18 05:34:56 +0000 exterror.9: explain buffers and bios usage of extended errors Reviewed by: pauamma_gundo.com Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D53798 --- share/man/man9/exterror.9 | 82 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/share/man/man9/exterror.9 b/share/man/man9/exterror.9 index 79197e4a187d..fd4b732b8213 100644 --- a/share/man/man9/exterror.9 +++ b/share/man/man9/exterror.9 @@ -17,8 +17,15 @@ #define EXTERR_CATEGORY EXTERR_CAT_MYCATEGORY .Ed .In sys/exterrvar.h +.Vt struct kexterr; +.Ft void +.Fn exterr_clear "struct kexterr *ke" +.Ft int +.Fn exterr_set_from "const struct kexterr *ke" .Ft int .Fn EXTERROR "int error" "const char *msg" ... +.Ft void +.Fn EXTERROR_KE "struct kexterr *ke" "int error" "const char *msg" ... .Sh DESCRIPTION The .Nm @@ -102,6 +109,33 @@ Additionally, use of .Fn EXTERROR in kernel threads is not sensible as there is no userspace to retrieve the extended error data. +.Pp +The +.Fn EXTERROR_KE +macro is similar to +.Fn EXTERROR , +but it takes an explicit pointer +.Fa kep +to the +.Vt struct kexterr +to fill with the extended error information. +The macro expression value is +.Vt void . +See below for description of the asynchronous i/o error facilities. +.Pp +The +.Fn exterr_clear +function clears the content of the +.Vt struct kexterr +pointed to by the argument +.Fa ke . +.Pp +The +.Fn exterr_set_from +function sets the current thread extended error data from the +.Fa struct kexterr +pointed to by the argument +.Fa ke . .Sh USERSPACE ACCESS TO EXTENDED ERROR DATA There is no syscall overhead for using .Nm @@ -127,6 +161,54 @@ were modified to print the extended information if it is available in addition to the usual .Va errno decoding. +.Sh ASYNCHRONOUS INPUT/OUTPUT +Due to the nature of the +.Fx +i/o subsystem, most input/output requests, presented as buffers (as in +.Vt struct buf ) +and geom bio's ( +.Vt struct bio ) +are processed asynchronously in filesystem- and geom-private threads. +This makes it challenging to pass any extended error information +from the geom providers and drivers, where an error typically occurs, +back to the thread that initiated the request, and is the consumer of +the result. +.Pp +To alleviate the mismatch, both +.Vt struct buf +and +.Vt struct bio +have member of the +.Vt struct kexterr +type. +For buffers, the +.Va b_exterr +for +.Vt struct buf , +and +.Va bio_exterr +for +.Vt struct bio . +Asynchronous i/o code can use the +.Fn EXTERROR_KE +macro, passing the pointer to the current request's embedded +.Vt struct kexterr , +to record the extended error. +In both cases, the +.Va BIO_EXTERR +flag should be set to indicate that whole extended error is valid, +not only the +.Va b_error +or +.Va bio_error +values. +.Pp +Both VFS and geom generic layers, and several geom providers that generate +subordinate bio's from the original request, are aware of the extended +errors. +They pass +.Vt kexterr +from the failed request back to the thread that create the request. .Sh SEE ALSO .Xr errno 3 , .Xr err 3 From nobody Tue Nov 18 10:37:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9h073vr1z6Gt6B for ; Tue, 18 Nov 2025 10:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9h0738DGz3SQQ for ; Tue, 18 Nov 2025 10:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763462279; 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=aa1Zhjs/8BBRg/YrnlIdRKF4MhIUraOARQC+KcUd9zw=; b=Vssz2kbBgUFyM5ekjMrkmJ0edWGlBi32U0u2ODzWYw0ueIP6xzhDvDT9Cs+y6PIZHgm1tV zmCs2nMQR78FzxzhCWL9DDEYWPBvWMuxIPX2vBax5STm+ABXSsJG1oVBcJuIFfBzJHHuQa qzDLxTT9p7aft6QouWR6Rbulj2yyjw2RRgHenHdOGDU5Slb/IdPsBtXyC0nTB0ktBj5ikD 4OPqnNLlU7+nNGg2MiU92bghS6WgE+8J144DUtjK/JgfuRsxroMaH8KoLbmiSML+YiQaQR KJwqxzWkM2W+8ko/pRS2bPD/ws20KxPlQ3I90q92gUh9tXssLWMfnn9WDB6v4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763462279; 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=aa1Zhjs/8BBRg/YrnlIdRKF4MhIUraOARQC+KcUd9zw=; b=doCk2ooiTp6Pf0zv06AteXVJoC2FdwyPqyH01XkTpGz9C6sgjqIGF/e0N6bMTHbhErfglw a3cjiFdjf2dk0JJB6gxD8WAo1uAj0zMXICfAQ3weIhIyPVY5YNJOqnrbKEI8HBpy53bY14 zI8iTKe/ZxTQPVqJ7rwGOjhtLTzdYV4ArU5wlI+JcxjOxQ9ZxL3PivbrMMMgqtdMFs9Uuv ckT55EquxUaFAUb4OhHatEiXhF21oZXe9SkrGonOIwUvEliL4wyx38vNUyyyj3uSkiqFL6 InMF68JZS/IXxTg6LBYNkeDEtU62VIgYFtzsoM4ppcKs1ueEMkEmSXYtOj/kHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763462279; a=rsa-sha256; cv=none; b=LiVdQ95Jp9GvAImubwEz7wHNCCFys7RCw6O7Y4W6/tVSx9qU/ZVO4hSQ4eplILutecjWmd ZY0stoNPmnECkmSc32wHShnU6qPROtuRkNH9pKrcnDNXU8q1mUPxh6tYIYqqnd2bXc3ZdE zbpNULUeHnl4R4VQgCGXSa0f08raSroib0InMP+FifQVld6qgcUJKm7l5DPiEPE89GLJdJ ayA5bxQy6VnuWDFgEydRIVvyX3UStaG+zt7E0Z3gIEnL9bt4AOjo5DLXMM1dhTVwppOKua WP0HWP6+TZZC6IdNPjggeefXNNNH/54nCmDCJfEHZqhleMPtHFKYMXgzgKvI6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9h072VWpzqsd for ; Tue, 18 Nov 2025 10:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c148 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 10:37:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Boris Lytochkin From: Andrey V. Elsukov Subject: git: 8012c61bef3b - main - ipfw: fix lookup dst-ip opcode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8012c61bef3bb19a48d8459b38b65e27d46c186c Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 10:37:54 +0000 Message-Id: <691c4c82.c148.3f4cef69@gitrepo.freebsd.org> The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=8012c61bef3bb19a48d8459b38b65e27d46c186c commit 8012c61bef3bb19a48d8459b38b65e27d46c186c Author: Boris Lytochkin AuthorDate: 2025-11-18 10:31:56 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-11-18 10:31:56 +0000 ipfw: fix lookup dst-ip opcode Opcode handling should not fall through to the LOOKUP_DSCP type. Reviewed by: melifaro Obtained from: Yandex LLC MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53775 --- sys/netpfil/ipfw/ip_fw2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c index d15d7760d7f1..c27b6bc274fb 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -2120,8 +2120,8 @@ do { \ pkey = &args->f_id.dst_ip6; else pkey = &args->f_id.src_ip6; - } else /* only for L3 */ - break; + } + break; case LOOKUP_DSCP: if (is_ipv4) key = ip->ip_tos >> 2; From nobody Tue Nov 18 11:42:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9jQd0m4lz6H0PM for ; Tue, 18 Nov 2025 11:42: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9jQd02C0z3Y6J for ; Tue, 18 Nov 2025 11:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763466153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kfYEF2Y9ql9I4h0HooOB7r2pk20hZxtJTvnvHf+RD+Q=; b=Z6CL1hQCii5lHG8AR3rToG4gdrwusdxoYgzFQTawO0Uc5qmEkqYkA7JsE6oAHIp99oBjAc pdzMJEQ2oXtY/bmsCJ//VyF7Xac1/6Es9SBQmL4GZy34wNJcEBhrxYZhQDKMmWFmIIeU4E ypUgaNwR4tQgsgG5hFakf5Z0ZBFw0jRYFsxNMBYk93sHSBKecASFsuLJN3skF8SF7C8fo1 vtFQLNVu9T/vzIEiGikJqf2mW6aADKz+Y6776qFZj/8q05qtuQuuXvqLZ5qzVJpMndk8Xh TNs3sG7Om9mh3/rWtkAJR5/fXr6syee0qpwNbo+EScodcYuuLYVxNORDuYFbaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763466153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kfYEF2Y9ql9I4h0HooOB7r2pk20hZxtJTvnvHf+RD+Q=; b=rNSvnceX3wN00YzrxUHPH+mLPoZuK7qp3SP5PTPJLxMbIs0LHWkrCcUxNWsvRUUpRPQnPQ dEZQmi2kpfQ10QFRmEpKodddwT+U8IPz84XNvRxZjx5Ylrnn6uy4QuVXdkgkKbsT0qDUuj D8xmduV4VD3PtxfwP06EMoiJFpJ+QA4Uta3lU6oFnW6x+eupEUjEXE5fhucD/aW2tmdbWs rcJO1NyCgmgVENR6oOztSI9GMUvVNO+2h7mBSkfZNrULmP1V57H0VH1p4yfBZZMyXaD8d2 xgqXj8DtU1B78uCwI2y0Qb8RSQ7MbZ8vQMIsXZz5QRQqS8lFxBYanTBh9Aof3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763466153; a=rsa-sha256; cv=none; b=x6QYiJ2oKomPLlddSP1LyMxEh7BOdfDJds8mXNEHDzwM5qD2vuMXCsOrcKCmB4SbzEjJpb zZ9+AA/DV6qSWUr2HMdalDBP4zQ0MO/+oNHpNQepgVOJ9GmnVBhv8Zzh9tVLp10rUjaCY4 QjkiwJD+uaFrkmeMTcNTkwhSwlP+MwBXM4PB0HUCTw24m8KpqTcDCmmHOY21l3EYYycy6c gqWtNduPEOmjVMDczGIY6x5tGjGip+Uo6ix/KQ02kBoRVJ65MbNRJyvJOl16Ep99H8Vtgp +CcGKNCdOGiszddVxzCfi6nU5F7cQJbK37rRU1Re13hPd0zyh/gMD/HykJFU3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9jQc6jGSztHq for ; Tue, 18 Nov 2025 11:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24729 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 11:42:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 814f9afba7d6..099f69ff5d3d - vendor/openzfs/zfs-2.4-release - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/zfs-2.4-release X-Git-Reftype: branch X-Git-Commit: 099f69ff5d3df7988632039db7ad6d183eb34042 X-Git-Oldrev: 814f9afba7d6714bd63f18ac808955b61d37f9f0 X-Git-Newrev: 099f69ff5d3df7988632039db7ad6d183eb34042 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 11:42:32 +0000 Message-Id: <691c5ba8.24729.10b78b3d@gitrepo.freebsd.org> The branch vendor/openzfs/zfs-2.4-release has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=814f9afba7d6..099f69ff5d3d f43839e7fdeb ZTS: fail test run if test runner crashes unexpectedly ad6eee2b9b5b mailmap/AUTHORS: update with recent new contributors 672fea2a501f FreeBSD zio_crypt.c: initialize uio variables before access 82d59f7666c4 ZTS: autotrim_config.ksh is missing pool type 9a9e06e5dd87 man: Update zpool-event subclass names and document new types 58476261750e Pass flags to more DMU write/hold functions e8d2e0834562 Retire ZoL patch scripts 29567f13f6e6 autogen.sh: remove workaround for automake <1.14, needed for EL <=7 178a8be21642 BRT: Round bv_entcount up to BRT_BLOCKSIZE e3acd0a728a8 Fix caching of DDT log and BRT 67fc49433f6e Cleanup ZIO_FLAG_IO_RETRY vs TRYHARD usage c9835dab1f7e Fix capitalization typo in README.md 5582e8b08e32 Update dnode_next_offset_level to accept blkid instead of offset 612e8f1e5712 get_key_material_https: label 'kfdok' defined but not used be1e5d599bbe CI: Update FreeBSD versions and ci-type handling dda711dbb594 Fix gang write late_arrival bug a2a34d9212de Linux 6.17 compat: Fix broken projectquota on 6.17 055e908d47fe zfs-jail.8: Add introductory sentence, refactor 7b121388fb19 man: describe zfs-rewrite method and properties 4fd926ab40a0 libzfs: ignoring unreachable code 015729a11b0f Fix typo in vdev_raidz.c 84dd55510bf9 zstd: disable intrinsics 583db400307a FreeBSD: Add support for _PC_CASE_INSENSITIVE aaf374bd4099 ZIO: Set minimum number of free issue threads to 32 e1734111fd79 Update man page description of zpool rewind e305c7d5962f BRT: Fix ranges to blocks conversion math ac0bc4cc00e1 spa_misc: add an API for spa_namespace_lock e895c76194ac ZAP: Remove dmu_object_info_from_dnode() call 002bc3da6a4b BRT: Increase block size from 4KB to 8KB 41878d57eaf3 Add BRT support to zpool prefetch command 1e8c96d7d58d Add knob to disable slow io notifications 7ebb5e9b3fdf Reduce timeout to zero when running inside a container ff536b153890 Bump SONAME on libnvpair 5b2489caf266 Bump SONAME of libzfs and libzpool 5714090fb9a1 libspl: hide zfs_tunable_* symbols 7a919fb70c1d Update all ABI files 099f69ff5d3d Tag 2.4.0-rc4 From nobody Tue Nov 18 12:58:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9l6h5fygz6H5rT for ; Tue, 18 Nov 2025 12:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9l6h4JWSz3gmR for ; Tue, 18 Nov 2025 12:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763470732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qtcqyzCt7xtCaosDO5cGzEmpBq9L459PwHyNGnhP568=; b=tLt/kFFzVFa6L9KzcNHmYSxYYqzY5SZO/HDUfrhgEfxZAnKoq7fPVe2wAPuP7pGLcwY5hc QM1FcfK2tuYg3TCrRz9qFNHXD2SALgZIht1af/NHvp4g0mME9UOm/tx6wf3w0MLTWzKpH8 JUPgBUQbqLNT5UiBk2WxCycHGLMtMLuTSeDC2tzlbEeTi26ZQyeDsYeBl4RtD4WWD6tp8s TIof2cnmbgZCBHKoQ0ZrhOCu1hMqK6fFY5Vt47GCtKMs6yymXuXp1ypr1FiapkhY2kA04w 0vCswAbDKVb3CIgZ/owkazQJD2A/rEtw4UHjSV3sUtKFvSF3am56iVQkhIyasQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763470732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qtcqyzCt7xtCaosDO5cGzEmpBq9L459PwHyNGnhP568=; b=d9XTOf89sROobAGCNF3Q7AtnnsdrHiKnPBqd01TJ56NLEaOjAB9YvR9YLBlXJbqV+jMzHv JbbPeAN1I2oNoxuHozqWFJFhgY9x3ssRhilnL+mOYHz5/mGazHxo6ua00hE2D5CVnAlwK2 orbjRzMG7xbGVfPAxlBd1CO8/ePdFRA/p7YbtZKtZQ+vBmVQd+kft+K+T8UBTNJmlTU5Mz NBmYZYStdkKhR9gp8k+oCesPDdKaHLaGZznuD6iLUDly4aa9ajIeTbcbHNZgnIzLdvOhdm QuFVd5A8B0geawon2qhcn4tzSbyZCS5W34s0OoIW1BeiSeVKjxj5ZIL0ukTE3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763470732; a=rsa-sha256; cv=none; b=uvnFJn2bT5t17gQSwA+pN8oFc6iaZT/2tyDw/ghQx9DhvYUk8sTHMe04ji+wmJO3yU4U5A rlLHHNdWt9DfjIPHhtkQvbdHDXuMr48T3RlMdu/tYCNt8R5ZSyKgCAhQtGNEM4hlNnCuLx VKiDuv2huvqdTKJsN70e9YF/zVVibnVqluT8vYlOesBEsUP7v9iDuGhOGg3Om7OmUltybg e94vLS7vF05ulsEU/w4iTFTV3/VNPMUtPOiy3Efa/ER6DX7Nrc7EbqUnmNbytG4oZ+gSEp LGD8oo92C+6E78GmtSfq4C3M8hv+jTume0xHACqi2f9jArlet3gwONeKfeVyVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9l6h3MBmzw6j for ; Tue, 18 Nov 2025 12:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c400 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 12:58:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 155d5b8a19ba - stable/15 - zfs: merge openzfs/zfs@099f69ff5 (zfs-2.4-release) into stable/15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 155d5b8a19baa864ebe9d8346d932bd04ea23aca Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 12:58:51 +0000 Message-Id: <691c6d8b.2c400.75b41508@gitrepo.freebsd.org> The branch stable/15 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=155d5b8a19baa864ebe9d8346d932bd04ea23aca commit 155d5b8a19baa864ebe9d8346d932bd04ea23aca Merge: 48c288443822 099f69ff5d3d Author: Martin Matuska AuthorDate: 2025-11-18 11:44:03 +0000 Commit: Martin Matuska CommitDate: 2025-11-18 11:44:03 +0000 zfs: merge openzfs/zfs@099f69ff5 (zfs-2.4-release) into stable/15 OpenZFS 2.4.0 rc4 Notable upstream pull request merges: #17477 1e8c96d7d Add knob to disable slow io notifications #17792 5582e8b08 Update dnode_next_offset_level to accept blkid instead of offset #17872 584762617 Pass flags to more DMU write/hold functions #17875 178a8be21 BRT: Round bv_entcount up to BRT_BLOCKSIZE #17875 e3acd0a72 Fix caching of DDT log and BRT #17877 67fc49433 Cleanup ZIO_FLAG_IO_RETRY vs TRYHARD usage #17824 dda711dbb Fix gang write late_arrival bug #17890 41878d57e Add BRT support to zpool prefetch command #17903 aaf374bd4 ZIO: Set minimum number of free issue threads to 32 #17906 ac0bc4cc0 spa_misc: add an API for spa_namespace_lock #17908 583db4003 FreeBSD: Add support for _PC_CASE_INSENSITIVE #17911 -multiple Update library ABI versions for v2.4.0 #17915 e305c7d59 BRT: Fix ranges to blocks conversion math #17916 002bc3da6 BRT: Increase block size from 4KB to 8KB #17921 e895c7619 ZAP: Remove dmu_object_info_from_dnode() call Obtained from: OpenZFS OpenZFS commit: 099f69ff5d3df7988632039db7ad6d183eb34042 OpenZFS tag: zfs-2.4.0-rc4 .../.github/workflows/scripts/generate-ci-type.py | 10 +- .../.github/workflows/scripts/qemu-2-start.sh | 20 +- .../.github/workflows/zfs-qemu-packages.yml | 2 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 38 ++- sys/contrib/openzfs/.mailmap | 8 + sys/contrib/openzfs/AUTHORS | 14 + sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/README.md | 2 +- sys/contrib/openzfs/autogen.sh | 61 +---- sys/contrib/openzfs/cmd/zdb/zdb.c | 8 +- sys/contrib/openzfs/cmd/zfs/zfs_project.c | 36 ++- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 34 ++- sys/contrib/openzfs/cmd/ztest.c | 39 +-- sys/contrib/openzfs/config/deb.am | 8 +- sys/contrib/openzfs/contrib/debian/Makefile.am | 8 +- sys/contrib/openzfs/contrib/debian/clean | 4 +- sys/contrib/openzfs/contrib/debian/control | 26 +- .../{openzfs-libzfs6.docs => openzfs-libzfs7.docs} | 0 ...bzfs6.install.in => openzfs-libzfs7.install.in} | 0 ...enzfs-libzpool6.docs => openzfs-libzpool7.docs} | 0 ...ol6.install.in => openzfs-libzpool7.install.in} | 0 .../openzfs/include/os/freebsd/spl/sys/mod.h | 3 + sys/contrib/openzfs/include/sys/brt.h | 1 + sys/contrib/openzfs/include/sys/brt_impl.h | 2 +- sys/contrib/openzfs/include/sys/dmu.h | 8 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 4 +- sys/contrib/openzfs/include/sys/spa.h | 14 +- sys/contrib/openzfs/include/sys/vdev_impl.h | 1 + sys/contrib/openzfs/include/sys/zfs_project.h | 10 +- sys/contrib/openzfs/lib/libnvpair/Makefile.am | 2 +- sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + .../openzfs/lib/libspl/include/os/linux/sys/vfs.h | 33 +++ .../openzfs/lib/libspl/include/sys/tunables.h | 12 +- sys/contrib/openzfs/lib/libuutil/libuutil.abi | 69 ----- sys/contrib/openzfs/lib/libzfs/Makefile.am | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 83 +----- sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c | 2 + sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 8 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 5 +- .../openzfs/lib/libzfs/os/linux/libzfs_util_os.c | 37 +++ .../openzfs/lib/libzfs_core/libzfs_core.abi | 70 +---- .../openzfs/lib/libzfsbootenv/libzfsbootenv.abi | 2 +- sys/contrib/openzfs/lib/libzpool/Makefile.am | 2 +- sys/contrib/openzfs/lib/libzpool/kernel.c | 4 +- sys/contrib/openzfs/man/man4/zfs.4 | 42 ++- sys/contrib/openzfs/man/man7/vdevprops.7 | 8 +- sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 5 + sys/contrib/openzfs/man/man8/zfs-jail.8 | 79 +++--- sys/contrib/openzfs/man/man8/zfs-rewrite.8 | 22 +- sys/contrib/openzfs/man/man8/zpool-events.8 | 73 ++++-- sys/contrib/openzfs/man/man8/zpool-prefetch.8 | 27 +- sys/contrib/openzfs/module/Kbuild.in | 3 +- sys/contrib/openzfs/module/Makefile.bsd | 24 -- sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c | 5 +- sys/contrib/openzfs/module/os/freebsd/zfs/spa_os.c | 10 +- .../openzfs/module/os/freebsd/zfs/vdev_label_os.c | 8 +- .../openzfs/module/os/freebsd/zfs/zfs_acl.c | 3 +- .../openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c | 4 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 20 +- .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 2 + .../openzfs/module/os/freebsd/zfs/zvol_os.c | 12 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 3 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 3 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 93 +++++-- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 6 +- sys/contrib/openzfs/module/zcommon/zpool_prop.c | 3 + sys/contrib/openzfs/module/zfs/arc.c | 8 +- sys/contrib/openzfs/module/zfs/bpobj.c | 7 +- sys/contrib/openzfs/module/zfs/bptree.c | 9 +- sys/contrib/openzfs/module/zfs/brt.c | 48 +++- sys/contrib/openzfs/module/zfs/dbuf.c | 5 +- sys/contrib/openzfs/module/zfs/ddt_log.c | 7 +- sys/contrib/openzfs/module/zfs/dmu.c | 27 +- sys/contrib/openzfs/module/zfs/dmu_redact.c | 6 +- sys/contrib/openzfs/module/zfs/dnode.c | 156 +++++------- sys/contrib/openzfs/module/zfs/metaslab.c | 8 +- sys/contrib/openzfs/module/zfs/mmp.c | 4 +- sys/contrib/openzfs/module/zfs/spa.c | 281 +++++++++++++-------- sys/contrib/openzfs/module/zfs/spa_checkpoint.c | 2 +- sys/contrib/openzfs/module/zfs/spa_config.c | 8 +- sys/contrib/openzfs/module/zfs/spa_history.c | 5 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 110 +++++--- sys/contrib/openzfs/module/zfs/space_map.c | 2 +- sys/contrib/openzfs/module/zfs/vdev.c | 86 +++++-- .../openzfs/module/zfs/vdev_indirect_births.c | 2 +- .../openzfs/module/zfs/vdev_indirect_mapping.c | 5 +- sys/contrib/openzfs/module/zfs/vdev_initialize.c | 8 +- sys/contrib/openzfs/module/zfs/vdev_label.c | 33 +-- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 2 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 4 +- sys/contrib/openzfs/module/zfs/vdev_removal.c | 20 +- sys/contrib/openzfs/module/zfs/vdev_trim.c | 12 +- sys/contrib/openzfs/module/zfs/zap_micro.c | 4 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 9 +- sys/contrib/openzfs/module/zfs/zfs_fuid.c | 2 +- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 41 +-- sys/contrib/openzfs/module/zfs/zio.c | 13 +- sys/contrib/openzfs/module/zfs/zio_inject.c | 8 +- sys/contrib/openzfs/module/zfs/zvol.c | 9 +- .../openzfs/module/zstd/include/aarch64_compat.h | 38 --- .../openzfs/module/zstd/lib/common/compiler.h | 3 - .../openzfs/module/zstd/lib/common/zstd_internal.h | 9 + sys/contrib/openzfs/rpm/generic/zfs.spec.in | 44 ++-- sys/contrib/openzfs/scripts/Makefile.am | 4 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 4 + sys/contrib/openzfs/scripts/zfs2zol-patch.sed | 32 --- sys/contrib/openzfs/scripts/zol2zfs-patch.sed | 20 -- sys/contrib/openzfs/tests/runfiles/common.run | 2 +- .../tests/test-runner/bin/test-runner.py.in | 33 ++- .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + .../functional/cli_root/zpool_get/vdev_get.cfg | 1 + .../zpool_prefetch/zpool_prefetch_001_pos.ksh | 12 +- .../zpool_prefetch/zpool_prefetch_002_pos.ksh | 95 +++++++ .../tests/functional/events/zed_slow_io.ksh | 44 +++- .../tests/functional/trim/autotrim_config.ksh | 2 +- 115 files changed, 1386 insertions(+), 1059 deletions(-) diff --cc sys/contrib/openzfs/.mailmap index e6f09c6c9d43,000000000000..3397fbc3745d mode 100644,000000..100644 --- a/sys/contrib/openzfs/.mailmap +++ b/sys/contrib/openzfs/.mailmap @@@ -1,229 -1,0 +1,237 @@@ +# This file maps the name+email seen in a commit back to a canonical +# name+email. Git will replace the commit name/email with the canonical version +# wherever it sees it. +# +# If there is a commit in the history with a "wrong" name or email, list it +# here. If you regularly commit with an alternate name or email address and +# would like to ensure that you are always listed consistently in the repo, add +# mapping here. +# +# On the other hand, if you use multiple names or email addresses legitimately +# (eg you use a company email address for your paid OpenZFS work, and a +# personal address for your evening side projects), then don't map one to the +# other here. +# +# The most common formats are: +# +# Canonical Name +# Canonical Name +# Canonical Name Commit Name +# +# See https://git-scm.com/docs/gitmailmap for more info. + +# These maps are making names consistent where they have varied but the email +# address has never changed. In most cases, the full name is in the +# Signed-off-by of a commit with a matching author. +Achill Gilgenast +Ahelenia Ziemiańska +Ahelenia Ziemiańska +Alex John +Andreas Dilger +Andrew Walker +Benedikt Neuffer +Chengfei Zhu +ChenHao Lu <18302010006@fudan.edu.cn> +Chris Lindee +Colm Buckley +Crag Wang +Damian Szuberski +Daniel Kolesa +Debabrata Banerjee +Diwakar Kristappagari +Finix Yan +Gaurav Kumar +Gionatan Danti +Glenn Washburn +Gordan Bobic +Gregory Bartholomew +hedong zhang +Ilkka Sovanto +InsanePrawn +Jason Cohen +Jason Harmening +Jeremy Faulkner +Jinshan Xiong +John Poduska ++Jo Zzsi +Justin Scholz +Ka Ho Ng +Kash Pande +Kay Pedersen +KernelOfTruth +Liu Hua +Liu Qing +loli10K +Mart Frauenlob +Matthias Blankertz +Michael Gmelin +Olivier Mazouffre +Piotr Kubaj +Quentin Zdanis ++Roberto Ricci +Roberto Ricci +Rob Norris +Rob Norris +Sam Lunt +Sanjeev Bagewadi +Sebastian Wuerl +SHENGYI HONG +Stoiko Ivanov +Tamas TEVESZ +WHR +Yanping Gao +Youzhong Yang + +# Signed-off-by: overriding Author: +Alexander Ziaee +Felix Schmidt ++Jean-Sébastien Pédron ++Konstantin Belousov +Olivier Certner ++Patrick Xia +Phil Sutter +poscat +Qiuhao Chen +Ryan +Sietse +Yuxin Wang +Zhenlei Huang + +# Commits from strange places, long ago +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Herb Wartens +Ned Bass +Tulsi Jain + +# Mappings from Github no-reply addresses +ajs124 +Alek Pinchuk +Aleksandr Liber <61714074+AleksandrLiber@users.noreply.github.com> +Alexander Lobakin +Alexey Smirnoff +Allen Holl <65494904+allen-4@users.noreply.github.com> +Alphan Yılmaz +Ameer Hamza <106930537+ixhamza@users.noreply.github.com> +Andrew J. Hesford <48421688+ahesford@users.noreply.github.com>> +Andrew Sun +Aron Xu +Arun KV <65647132+arun-kv@users.noreply.github.com> +Ben Wolsieffer +bernie1995 <42413912+bernie1995@users.noreply.github.com> +Bojan Novković <72801811+bnovkov@users.noreply.github.com> +Boris Protopopov +Brad Forschinger +Brandon Thetford +buzzingwires <131118055+buzzingwires@users.noreply.github.com> +Cedric Maunoury <38213715+cedricmaunoury@users.noreply.github.com> +Charles Suh +Chris Peredun <126915832+chrisperedun@users.noreply.github.com> ++classabbyamp <5366828+classabbyamp@users.noreply.github.com> +Dacian Reece-Stremtan <35844628+dacianstremtan@users.noreply.github.com> +Damian Szuberski <30863496+szubersk@users.noreply.github.com> +Daniel Hiepler <32984777+heeplr@users.noreply.github.com> +Daniel Kobras +Daniel Reichelt +David Quigley +Dennis R. Friedrichsen <31087738+dennisfriedrichsen@users.noreply.github.com> +Dex Wood +DHE +Dmitri John Ledkov <19779+xnox@users.noreply.github.com> +Dries Michiels <32487486+driesmp@users.noreply.github.com> +Edmund Nadolski <137826107+ednadolski-ix@users.noreply.github.com> +Érico Nogueira <34201958+ericonr@users.noreply.github.com> +Fedor Uporov <60701163+fuporovvStack@users.noreply.github.com> +Felix Dörre +Felix Neumärker <34678034+xdch47@users.noreply.github.com> +Finix Yan +Friedrich Weber <56110206+frwbr@users.noreply.github.com> +Gaurav Kumar +George Gaydarov +Georgy Yakovlev <168902+gyakovlev@users.noreply.github.com> +Gerardwx +Germano Massullo +Gian-Carlo DeFazio +Giuseppe Di Natale +Hajo Möller +Harry Mallon <1816667+hjmallon@users.noreply.github.com> +Hiếu Lê +Jake Howard +James Cowgill +Jaron Kent-Dobias +Jason King +Jeff Dike <52420226+jdike@users.noreply.github.com> +Jitendra Patidar <53164267+jsai20@users.noreply.github.com> +João Carlos Mendes Luís +John Eismeier <32205350+jeis2497052@users.noreply.github.com> +John L. Hammond <35266395+jhammond-intel@users.noreply.github.com> +John-Mark Gurney +John Ramsden +Jonathon Fernyhough <559369+jonathonf@users.noreply.github.com> +Jose Luis Duran +Justin Hibbits +Kaitlin Hoang +Kevin Greene <104801862+kxgreene@users.noreply.github.com> +Kevin Jin <33590050+jxdking@users.noreply.github.com> +Kevin P. Fleming +Krzysztof Piecuch <3964215+pikrzysztof@users.noreply.github.com> +Kyle Evans +Laurențiu Nicola +loli10K +Lorenz Hüdepohl +Luís Henriques <73643340+lumigch@users.noreply.github.com> +Marcin Skarbek +Matt Fiddaman <81489167+matt-fidd@users.noreply.github.com> +Maxim Filimonov +Max Zettlmeißl <6818198+maxz@users.noreply.github.com> +Michael Niewöhner +Michael Zhivich <33133421+mzhivich@users.noreply.github.com> +MigeljanImeri <78048439+MigeljanImeri@users.noreply.github.com> +Mo Zhou <5723047+cdluminate@users.noreply.github.com> ++nav1s <42621369+nav1s@users.noreply.github.com> +Nick Mattis +omni <79493359+omnivagant@users.noreply.github.com> +Pablo Correa Gómez <32678034+pablofsf@users.noreply.github.com> +Paul Zuchowski <31706010+PaulZ-98@users.noreply.github.com> +Peter Ashford +Peter Dave Hello +Peter Wirdemo <4224155+pewo@users.noreply.github.com> +Petros Koutoupis +Ping Huang <101400146+hpingfs@users.noreply.github.com> +Piotr P. Stefaniak +Richard Allen <33836503+belperite@users.noreply.github.com> +Rich Ercolani <214141+rincebrain@users.noreply.github.com> +Rick Macklem <64620010+rmacklem@users.noreply.github.com> +Rob Wing <98866084+rob-wing@users.noreply.github.com> +Roman Strashkin +Ryan Hirasaki <4690732+RyanHir@users.noreply.github.com> +Samuel Wycliffe J <115969550+samwyc@users.noreply.github.com> +Samuel Wycliffe <50765275+npc203@users.noreply.github.com> +Savyasachee Jha +Scott Colby +Sean Eric Fagan ++Shreshth Srivastava <66148173+Shreshth3@users.noreply.github.com> +Spencer Kinny <30333052+Spencer-Kinny@users.noreply.github.com> +Srikanth N S <75025422+nssrikanth@users.noreply.github.com> +Stefan Lendl <1321542+stfl@users.noreply.github.com> +Thomas Bertschinger <101425190+bertschinger@users.noreply.github.com> +Thomas Geppert +Tim Crawford +Todd Seidelmann <18294602+seidelma@users.noreply.github.com> +Tom Matthews +Tony Perkins <62951051+tony-zfs@users.noreply.github.com> +Torsten Wörtwein +Tulsi Jain +Václav Skála <33496485+vaclavskala@users.noreply.github.com> +Vaibhav Bhanawat <88050553+vaibhav-delphix@users.noreply.github.com> +Vandana Rungta <46906819+vandanarungta@users.noreply.github.com> +Violet Purcell <66446404+vimproved@users.noreply.github.com> +Vipin Kumar Verma <75025470+vermavipinkumar@users.noreply.github.com> +Wolfgang Bumiller +XDTG <35128600+XDTG@users.noreply.github.com> +xtouqh <72357159+xtouqh@users.noreply.github.com> +Yuri Pankov <113725409+yuripv@users.noreply.github.com> +Yuri Pankov <82001006+yuripv@users.noreply.github.com> diff --cc sys/contrib/openzfs/README.md index a90736bb56b7,000000000000..a39b88fedd12 mode 100644,000000..100644 --- a/sys/contrib/openzfs/README.md +++ b/sys/contrib/openzfs/README.md @@@ -1,35 -1,0 +1,35 @@@ +![img](https://openzfs.github.io/openzfs-docs/_static/img/logo/480px-Open-ZFS-Secondary-Logo-Colour-halfsize.png) + +OpenZFS is an advanced file system and volume manager which was originally +developed for Solaris and is now maintained by the OpenZFS community. +This repository contains the code for running OpenZFS on Linux and FreeBSD. + +[![codecov](https://codecov.io/gh/openzfs/zfs/branch/master/graph/badge.svg)](https://codecov.io/gh/openzfs/zfs) +[![coverity](https://scan.coverity.com/projects/1973/badge.svg)](https://scan.coverity.com/projects/openzfs-zfs) + +# Official Resources + + * [Documentation](https://openzfs.github.io/openzfs-docs/) - for using and developing this repo - * [ZoL Site](https://zfsonlinux.org) - Linux release info & links ++ * [ZoL site](https://zfsonlinux.org) - Linux release info & links + * [Mailing lists](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html) + * [OpenZFS site](https://openzfs.org/) - for conference videos and info on other platforms (illumos, OSX, Windows, etc) + +# Installation + +Full documentation for installing OpenZFS on your favorite operating system can +be found at the [Getting Started Page](https://openzfs.github.io/openzfs-docs/Getting%20Started/index.html). + +# Contribute & Develop + +We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md). + +We have a [Code of Conduct](./CODE_OF_CONDUCT.md). + +# Release + +OpenZFS is released under a CDDL license. +For more details see the NOTICE, LICENSE and COPYRIGHT files; `UCRL-CODE-235197` + +# Supported Kernels + * The `META` file contains the officially recognized supported Linux kernel versions. + * Supported FreeBSD versions are any supported branches and releases starting from 13.0-RELEASE. diff --cc sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h index 000000000000,c7b567ff44a4..c7b567ff44a4 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h +++ b/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.ksh index 000000000000,f34f8c36e592..f34f8c36e592 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.ksh From nobody Tue Nov 18 12:58:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9l6j5lnpz6H5gN for ; Tue, 18 Nov 2025 12:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9l6j4DrNz3gc0 for ; Tue, 18 Nov 2025 12:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763470733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s3IUofgEmudH20Qgg0cQtPIhPCi7/zS/xdmrO0rfFsQ=; b=aWE8qw/mUT5Ay9hQjhzdl2DNgtNl3WypLdUcMRjyDGJw/TNQ+wDclp/zACOc+kUeXe0r9o VqY9yZu0FMdHdrPyAQP123/OIGqKIvBTmmUuLFNO0tZo1sPJIsCCy51bvIEzPsLx3Aqtu3 ka6Y2X4KYVmqG43cgxgLUJpaO+6GEUS3BX5OvY69lszHE0fH9FkL24UWZ7/vAgzBmo3DfX o7u+yCwWvLz5U7HX5e4k3kIGSSHoL1iTrQRH6LWjqDrA1imMrigdmY50byrEYeDWzpKZ8d iMVCpotuUSgjCg9kKyO8vtasO7r5zAQPNX2JIgnXjK0OtX7pTrsGYKYmEk/cUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763470733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s3IUofgEmudH20Qgg0cQtPIhPCi7/zS/xdmrO0rfFsQ=; b=yZkBT7lwZDPeSktSPNbIHWfch3Cp+sRXGMf7otla2CEqHOK7hUh6od83ZfsdeA+pbjcqY/ GbAZDhdXcxrcd6MX7N401lkCIEw56b9Btnry9DSfTELEeohYeJ4ISemlq2fqZ4dKwvSkP9 vSKDb8+cTURP9z1ANwikintqcseZSDxBllGI4Q1YoyRAbSl7V3ZaDoLIPvGj7EqdgjvUBw pzWXjjm+70pr7qrLvJZnxL/BCmcDEEcCIMwQwENRedCGGtncFNFo9avfMIqytB1VZ8Qh+4 daIIexu8Y+lLaSWf2rbUNCxCbvMUQYwDsK2LqIKtDJBUU5cyW+vW0ejiNQ/FPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763470733; a=rsa-sha256; cv=none; b=cD2fwq/1I778CdvrtF7Qwh2qOl4p8GH8K9H8xyTzXcF7JVzCj2T1U75b0DgT/BgSTmMBBB hIvhtMxYee80Trp4bLwnOo8aJRVeubN4u39UvwWu3GizPwRxh9/P82F/ArTBK1WSM6v4Ox c0B/VOGWd8PBa3UIi5fq/Tf6+nTvmGm6fy5o25xwhRrx48i8uhC7XJlVCTZYzcGQD+fBVW sUcclfWIKtSAifNHnDJ2L8IJogPv9gkj1kL7xBH+tDGKJwDg75S/paXnutnKahSn2+U4gC ZGsCIIDByLSudGGBSy4m0Kj5moC51Q8HREp6JAZtKpHnOjIK8NnpWNspg7D6Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9l6j3HmXzvsx for ; Tue, 18 Nov 2025 12:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2acb3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 12:58:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 7128544353ac - stable/15 - zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.4.0-rc4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7128544353ac76cf0acfd02b327dec8e8f7faf1d Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 12:58:53 +0000 Message-Id: <691c6d8d.2acb3.52f91885@gitrepo.freebsd.org> The branch stable/15 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=7128544353ac76cf0acfd02b327dec8e8f7faf1d commit 7128544353ac76cf0acfd02b327dec8e8f7faf1d Author: Martin Matuska AuthorDate: 2025-11-18 11:58:55 +0000 Commit: Martin Matuska CommitDate: 2025-11-18 12:06:40 +0000 zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.4.0-rc4 While here, fix compilation be unhiding zfs_tunables hidden in 5714090fb --- sys/contrib/openzfs/lib/libspl/include/sys/tunables.h | 3 ++- sys/modules/zfs/zfs_config.h | 4 ++-- sys/modules/zfs/zfs_gitrev.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h b/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h index c85400f6fd28..0ce348669bfe 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h @@ -25,7 +25,8 @@ */ #ifndef _SYS_TUNABLES_H -#define _SYS_TUNABLES_H extern __attribute__((visibility("hidden"))) +//#define _SYS_TUNABLES_H extern __attribute__((visibility("hidden"))) +#define _SYS_TUNABLES_H extern typedef enum { ZFS_TUNABLE_TYPE_INT, diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 339182042915..446c5c1a12cd 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -856,7 +856,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.4.0-rc3-FreeBSD_g814f9afba" +#define ZFS_META_ALIAS "zfs-2.4.0-rc4-FreeBSD_g099f69ff5" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -886,7 +886,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "rc3-FreeBSD_g814f9afba" +#define ZFS_META_RELEASE "rc4-FreeBSD_g099f69ff5" /* Define the project version. */ #define ZFS_META_VERSION "2.4.0" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index ba87aecc9751..cedd706372c4 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.4.0-rc3-0-g814f9afba" +#define ZFS_META_GITREV "zfs-2.4.0-rc4-0-g099f69ff5" From nobody Tue Nov 18 13:34:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9lvj6nHtz6H7vF for ; Tue, 18 Nov 2025 13:34: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9lvj1NMlz3m8r for ; Tue, 18 Nov 2025 13:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763472865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QlVjl4wyuaNy8PIaMIKoKdhRRUh2FllIVGAxO7+xuho=; b=EHAtyTqh+ky1cwu7SBtEA2zdKu88NcLLaWuE2rp+mDPnIq2hUTN3oFfokz/uoekfroNWQs Sg2hkhaO7kf3SOpbKWGYJ+ebMdS+HyyyNbYFoW4z1Fcq4wj9E5voj5LZAZ7oRngRQxMJ4Z 6xdM0hPxDUI9b1ASniuoqYuyEn6zX9etdO7+/b59OCARtPXwE6dMkBw6G3qzIjRor96KJn WJOyENt5Ls46HWgMzHdUXMgvme1KyIMdtTSyS9+28we+GpqD7HSwMwqhZqQ7WCk/ZkMTux mae/pUPrb7db1nc33iE7QuiceRsrY/LFcRm6ApCVf4VGI+t/0sneThpbjZxIyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763472865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QlVjl4wyuaNy8PIaMIKoKdhRRUh2FllIVGAxO7+xuho=; b=f/PIKDYKQAm/Qmnk1B54wFVV9mSWA7pWY6L4ivPJDqBsmZ29LZMEstgWJEGeZXW5XzHPFe l13w+pF3/FuKTo/JBfbzfb7Hrrxadsg4hUluTBOqTqml/nZoQs0ZYPOrhgIh3T3DZDdzIV ANbktxKk9ZmTj5A3G9a8s6waQseV/ttUUDJ16Gjel3NfA3Ufr99bjpVhYzxdPuLwlh9Aa5 CxhFV/JPNKq2TaPhy/QPQVWhJ6j2s1g9q4sf1iOs9PLijP5JWfCjkC6Bx3osEMw4xKP58L L43JpgDbdsEBPAhaHq2e1WJdl0gxLhHZDxF1iZW11dSZSU2OEIJePTQJ+Fw7Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763472865; a=rsa-sha256; cv=none; b=q0BIKQ+zQ+FGInORDSbpEf2sgaX7STeLWqXUk5DRr8nZb8OHF0Kv5pyt1uC+2xXiZkGt3Y c3v0CC6QsdNTT82t5udV608YW0SQ0X+RJdBEiGeZoEBcgMrIDYPOhpW3+az8E+iYwoIF4u H9MayD9WCTRwsgLzPUr8f3fRpQ2roSfch4HqfNMr3vin/EIcBiq4ka/q/LnGVg8BPd9bbW EWpKGz29oZ221swljkZ5vMmpIIi9+gg4bDSyp3XfA/5DYl9Q30tiGPu7iIIiGpYmJ0izF+ zE1knR5DAeE79Aq2LmPt8pqajmk1LdvQnNGIgFo/34KsHjRS7TfeXVwrxIYFBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9lvj0y64zwWh for ; Tue, 18 Nov 2025 13:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2ee39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:34:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 443b7c41d619 - stable/15 - dtrace_callout_execute.4: Document the DTrace callout_execute provider List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 443b7c41d619412e2d149423b3c5d0d9b11bf4ae Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:34:25 +0000 Message-Id: <691c75e1.2ee39.11b6f8c9@gitrepo.freebsd.org> The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=443b7c41d619412e2d149423b3c5d0d9b11bf4ae commit 443b7c41d619412e2d149423b3c5d0d9b11bf4ae Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-04 11:10:55 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-18 13:34:19 +0000 dtrace_callout_execute.4: Document the DTrace callout_execute provider MFC after: 2 weeks Fixes: 91dd9aae1ab8 Add explicit static DTrace tracing to the callout mechanism Differential Revision: https://reviews.freebsd.org/D51397 (cherry picked from commit 3ccb2d9513e6a2e046e635c186da68acf8f8498b) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 1 + share/man/man4/Makefile | 1 + share/man/man4/dtrace_callout_execute.4 | 68 ++++++++++++++++++++++++++++ share/man/man9/callout.9 | 4 +- 4 files changed, 73 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 2e7eeeadb86b..6b0c3d3c2dee 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -1300,6 +1300,7 @@ in .Xr cpp 1 , .Xr dwatch 1 , .Xr dtrace_audit 4 , +.Xr dtrace_callout_execute 4 , .Xr dtrace_dtrace 4 , .Xr dtrace_fbt 4 , .Xr dtrace_io 4 , diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 35cc6bbb8da8..dd98badd31ba 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1003,6 +1003,7 @@ _ccd.4= ccd.4 .if ${MK_CDDL} != "no" _dtrace_provs= dtrace_audit.4 \ + dtrace_callout_execute.4 \ dtrace_dtrace.4 \ dtrace_fbt.4 \ dtrace_io.4 \ diff --git a/share/man/man4/dtrace_callout_execute.4 b/share/man/man4/dtrace_callout_execute.4 new file mode 100644 index 000000000000..1154ed066b97 --- /dev/null +++ b/share/man/man4/dtrace_callout_execute.4 @@ -0,0 +1,68 @@ +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 4, 2025 +.Dt DTRACE_CALLOUT_EXECUTE 4 +.Os +.Sh NAME +.Nm dtrace_callout_execute +.Nd a DTrace provider for the callout API +.Sh SYNOPSIS +.Nm callout_execute Ns Cm :kernel::callout_start +.Nm callout_execute Ns Cm :kernel::callout_end +.Sh DESCRIPTION +The +.Nm callout_execute +provider allows for tracing the +.Xr callout 9 +mechanism. +.Pp +The +.Nm callout_execute Ns Cm :kernel::callout_start +probe fires just before a callout. +.Pp +The +.Nm callout_execute Ns Cm :kernel::callout_end +probe fires right after a callout. +.Pp +The only argument to the +.Nm callout_execute +probes, +.Fa args[0] , +is a callout handler +.Ft struct callout * +of the invoked callout. +.Sh EXAMPLES +.Ss Example 1: Graph of Callout Execution Time +The following +.Xr d 7 +script generates a distribution graph of +.Xr callout 9 +execution times: +.Bd -literal -offset 2n +callout_execute:::callout_start +{ + self->cstart = timestamp; +} + +callout_execute:::callout_end +{ + @length = quantize(timestamp - self->cstart); +} +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr tracing 7 , +.Xr callout 9 , +.Xr SDT 9 +.Sh AUTHORS +.An -nosplit +The +.Nm callout_execute +provider was written by +.An Robert N. M. Watson Aq Mt rwatson@FreeBSD.org . +.Pp +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . diff --git a/share/man/man9/callout.9 b/share/man/man9/callout.9 index 0e59ef8ab2b1..637049ec1ef5 100644 --- a/share/man/man9/callout.9 +++ b/share/man/man9/callout.9 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd January 22, 2024 +.Dd November 4, 2025 .Dt CALLOUT 9 .Os .Sh NAME @@ -789,6 +789,8 @@ and functions return a value of one if the callout was still pending when it was called, a zero if the callout could not be stopped and a negative one is it was either not running or has already completed. +.Sh SEE ALSO +.Xr dtrace_callout_execute 4 .Sh HISTORY .Fx initially used the long standing From nobody Tue Nov 18 13:36:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9lxY0c19z6H8hn for ; Tue, 18 Nov 2025 13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9lxX1CS1z3mnT for ; Tue, 18 Nov 2025 13:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763472960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/UgJ+6nW3FDC6cKFGmKpjhgqIkYcQRzSCuBjFSkIOKI=; b=MGDgsJUs6CJ0U9l05mYYlD88QHBBGWjMlDxqigd3dfeFZIuYMuDgtQ9XF2FY0DNCMd5jTV Pd8Sid7ny17GLJQAqcZ4meN5jSg67Xg6aJX191EbEnVZddwjXIvSAC/Z+gsjVwE0mRodww yEKt04b862XJaAac7tNnd4RAhoI5V6CdMylGfODjMr7ZY/uaB71JyJSSmRPJ8YVkgSgwxc gQHwMXnNmYurcM1CrrVHijYefhpOWBNNfXTSN7jWxhPiaR49DADfUI9c/NdJi/Xi6y82nj AVu72zqKJIhvYg8hACakhDsCV25HGBx4BCkt6sY0ep0F0BQC1ek6WG2UkzMZVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763472960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/UgJ+6nW3FDC6cKFGmKpjhgqIkYcQRzSCuBjFSkIOKI=; b=q6SFghI8pBjxPF/2UEqFlVu3HjPhwbP+o2Bc0m4olxisYnm5L0kARdEU814igWRbsJheUg F+XybrSTQMQ92HvRzH0s66lQ/E4zURsgs75QAhJ6r5JcJNtb7G3XjZiotP21+oPly3ztvL 1qsEAF3IogULSAY859tuel0EGdulxpk2czJQ7o8675PKfoJBF6Ihue3qt/uQxAsYGEkXBb tganM/joHrV7RL7U+dZlft6yGwAVGOlR/wDgLDQkURO9s4brdI5x2FXGVkR/ebKxpnu6Zl lsgGWGe31wHm6JAUqpG4oXcK5F6gciTs0ViAVBrCyVICdYiV4n514KzByBijng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763472960; a=rsa-sha256; cv=none; b=iq9sj+QaSsprfxtjflccNa+MX1o1JpN5OshkeQp4KwJH1KB8N6q3mzO3ZM26bwM04sC3GR ThhLmSgymgF/UfDM60Vx3t7VRKEdOiabw/4+SANqVviN6alvd1R7OntKFo+/wz7a6BHtRh 1nb8frlwSmVgjT8sKLOArtd/9b5FKz3SsHOEpgkCEe+e9Yo5zDkEXuKlIpLwn2TDk83dN5 7/2VV7kmFqE2FFgXzv2i1hxr+63HWP/yPUfScy2Yu3dLrsxtm1I6nqu8zVHByq1VqnZrFR eMxraBjeJ2N3R5XmRPByH/TTBsIv6zQmMB8vU+7YZbBXzsjlwX3LtFG1QkjwhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9lxX0n6SzwdX for ; Tue, 18 Nov 2025 13:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f41b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:36:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 7d43404485bf - stable/14 - dtrace_callout_execute.4: Document the DTrace callout_execute provider List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7d43404485bf2e306e54bdfdb0ae937d6921df39 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:36:00 +0000 Message-Id: <691c7640.2f41b.3f5c6a9d@gitrepo.freebsd.org> The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=7d43404485bf2e306e54bdfdb0ae937d6921df39 commit 7d43404485bf2e306e54bdfdb0ae937d6921df39 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-04 11:10:55 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-18 13:35:54 +0000 dtrace_callout_execute.4: Document the DTrace callout_execute provider MFC after: 2 weeks Fixes: 91dd9aae1ab8 Add explicit static DTrace tracing to the callout mechanism Differential Revision: https://reviews.freebsd.org/D51397 (cherry picked from commit 3ccb2d9513e6a2e046e635c186da68acf8f8498b) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 1 + share/man/man4/Makefile | 1 + share/man/man4/dtrace_callout_execute.4 | 68 ++++++++++++++++++++++++++++ share/man/man9/callout.9 | 4 +- 4 files changed, 73 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 68b3a7f5f9bc..ce01b2c4c017 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -1299,6 +1299,7 @@ in .Sh SEE ALSO .Xr cpp 1 , .Xr dtrace_audit 4 , +.Xr dtrace_callout_execute 4 , .Xr dtrace_fbt 4 , .Xr dtrace_io 4 , .Xr dtrace_ip 4 , diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 627ca85d1fff..2dda6b937dc2 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -939,6 +939,7 @@ _ccd.4= ccd.4 .if ${MK_CDDL} != "no" _dtrace_provs= dtrace_audit.4 \ + dtrace_callout_execute.4 \ dtrace_fbt.4 \ dtrace_io.4 \ dtrace_ip.4 \ diff --git a/share/man/man4/dtrace_callout_execute.4 b/share/man/man4/dtrace_callout_execute.4 new file mode 100644 index 000000000000..1154ed066b97 --- /dev/null +++ b/share/man/man4/dtrace_callout_execute.4 @@ -0,0 +1,68 @@ +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 4, 2025 +.Dt DTRACE_CALLOUT_EXECUTE 4 +.Os +.Sh NAME +.Nm dtrace_callout_execute +.Nd a DTrace provider for the callout API +.Sh SYNOPSIS +.Nm callout_execute Ns Cm :kernel::callout_start +.Nm callout_execute Ns Cm :kernel::callout_end +.Sh DESCRIPTION +The +.Nm callout_execute +provider allows for tracing the +.Xr callout 9 +mechanism. +.Pp +The +.Nm callout_execute Ns Cm :kernel::callout_start +probe fires just before a callout. +.Pp +The +.Nm callout_execute Ns Cm :kernel::callout_end +probe fires right after a callout. +.Pp +The only argument to the +.Nm callout_execute +probes, +.Fa args[0] , +is a callout handler +.Ft struct callout * +of the invoked callout. +.Sh EXAMPLES +.Ss Example 1: Graph of Callout Execution Time +The following +.Xr d 7 +script generates a distribution graph of +.Xr callout 9 +execution times: +.Bd -literal -offset 2n +callout_execute:::callout_start +{ + self->cstart = timestamp; +} + +callout_execute:::callout_end +{ + @length = quantize(timestamp - self->cstart); +} +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr tracing 7 , +.Xr callout 9 , +.Xr SDT 9 +.Sh AUTHORS +.An -nosplit +The +.Nm callout_execute +provider was written by +.An Robert N. M. Watson Aq Mt rwatson@FreeBSD.org . +.Pp +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . diff --git a/share/man/man9/callout.9 b/share/man/man9/callout.9 index 96b93283bfc2..97d9f4138742 100644 --- a/share/man/man9/callout.9 +++ b/share/man/man9/callout.9 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 1, 2021 +.Dd November 4, 2025 .Dt CALLOUT 9 .Os .Sh NAME @@ -816,6 +816,8 @@ and functions return a value of one if the callout was still pending when it was called, a zero if the callout could not be stopped and a negative one is it was either not running or has already completed. +.Sh SEE ALSO +.Xr dtrace_callout_execute 4 .Sh HISTORY .Fx initially used the long standing From nobody Tue Nov 18 13:37:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9lz473QYz6H8l4 for ; Tue, 18 Nov 2025 13:37: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9lz44FbRz3nQS for ; Tue, 18 Nov 2025 13:37:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mtkJx3L4WmFMdEb3lMZr9EmsI65WEbSr4YlknBfC5Lo=; b=UlAZoC8s8mNHZ/3lYHwUPb9dCwWiYh3lkJTkuPZatnmPOxyfzM05hRRq6qNoESs3JsiQk7 w3DfcuYHqSm/EvLdg8102ivkOEP1jOl4rMvHts2gyLuNBD1OhevPg1qv+zJANhg28bt//X AKBL0fOp7U7oo+6PuQ52jqBO3txnTl3B6poOL9TLB4Tvu0C+aTomBO1s/6zPaSvGPWY+iB rCyyDXf1OOtNatUk2x9/lExY8qgfu7JH1oMsvqhy7P8PX0m8N/Ifk+cmWVxoXaaTCNTr2c 2WjtoeuiSn4UTZDGaeXZqqJGwJOnoAeStpjv5a0RQsESv60iP9P1eityaRVMPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mtkJx3L4WmFMdEb3lMZr9EmsI65WEbSr4YlknBfC5Lo=; b=R7Uuj5BPThjZmIQDA3TPkNbf+i7ud2QHk40vn/M2k9dEc782IhCwnhGg+1y598gP5Q+uSA V7BKrRmul0FEDlgPQa+WLXiIdjEwEzRlJIcRO+ynAcDyIFlC6F+kP3PgyQMFxgIydP4R5m GsdihQ0zrc16tJ/ZhPrnF5ERfipDEhp+muNkHSKtMzDwRDbR1UzpXO4wEEbsUm2JOGbu2/ 1ippWlZaKyNgAUV7DVn4JYWixhAzgFGw895YuKqWzJT+yD6GeHGCOwRQqXwhnMsn/YXgEk /Y21zBUoJ/aUN6PbT1xBLDwF5AJFrcFdgVPDdPgvtZ6V6cM07+PRTFmyTyD0QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763473040; a=rsa-sha256; cv=none; b=YZHgoFGIdjeUlOL6DjtWWsTAE1Ja+IaLLLZ4RHN0I3YWL4C/bqB3JoDqdWHKGtTG4A+hzE GSKHmjd732QcFT13GumnEFc6H6iX1UMSw7++4JChA+RPkAVwOnmm/pF/tAZftKL+o1pgmH wyl4H5rNL0OEOX6zqPnVGe6ewo6C/VWLk1YMtp9gXu/BzSDAn+FXX3mScumVxpubu9e73S EG4kl57p9tc3IkUqDpQWwdUzwq/My1CsxviItEUr+wI0C0I+HhlPeu4lfPcdl7XCWECKbY CYW4BaZzzt1WtRLpWOneRK9CavL0CSnYIMFQbPfXPMd/OvU4Hn1Xwlo793bs0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9lz43nX0zwvL for ; Tue, 18 Nov 2025 13:37:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2db7d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:37:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 760b71a49363 - stable/13 - dtrace_callout_execute.4: Document the DTrace callout_execute provider List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 760b71a4936330032c727da8ebcecfa6440fe489 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:37:15 +0000 Message-Id: <691c768b.2db7d.2a583924@gitrepo.freebsd.org> The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=760b71a4936330032c727da8ebcecfa6440fe489 commit 760b71a4936330032c727da8ebcecfa6440fe489 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-04 11:10:55 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-18 13:37:10 +0000 dtrace_callout_execute.4: Document the DTrace callout_execute provider MFC after: 2 weeks Fixes: 91dd9aae1ab8 Add explicit static DTrace tracing to the callout mechanism Differential Revision: https://reviews.freebsd.org/D51397 (cherry picked from commit 3ccb2d9513e6a2e046e635c186da68acf8f8498b) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 1 + share/man/man4/Makefile | 1 + share/man/man4/dtrace_callout_execute.4 | 68 ++++++++++++++++++++++++++++ share/man/man9/callout.9 | 4 +- 4 files changed, 73 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index b36f71d17bbb..7c9a4b1e7cf6 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -883,6 +883,7 @@ in .Sh SEE ALSO .Xr cpp 1 , .Xr dtrace_audit 4 , +.Xr dtrace_callout_execute 4 , .Xr dtrace_fbt 4 , .Xr dtrace_io 4 , .Xr dtrace_ip 4 , diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 332670598905..49dbff287e18 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -960,6 +960,7 @@ _ccd.4= ccd.4 .if ${MK_CDDL} != "no" _dtrace_provs= dtrace_audit.4 \ + dtrace_callout_execute.4 \ dtrace_fbt.4 \ dtrace_io.4 \ dtrace_ip.4 \ diff --git a/share/man/man4/dtrace_callout_execute.4 b/share/man/man4/dtrace_callout_execute.4 new file mode 100644 index 000000000000..1154ed066b97 --- /dev/null +++ b/share/man/man4/dtrace_callout_execute.4 @@ -0,0 +1,68 @@ +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 4, 2025 +.Dt DTRACE_CALLOUT_EXECUTE 4 +.Os +.Sh NAME +.Nm dtrace_callout_execute +.Nd a DTrace provider for the callout API +.Sh SYNOPSIS +.Nm callout_execute Ns Cm :kernel::callout_start +.Nm callout_execute Ns Cm :kernel::callout_end +.Sh DESCRIPTION +The +.Nm callout_execute +provider allows for tracing the +.Xr callout 9 +mechanism. +.Pp +The +.Nm callout_execute Ns Cm :kernel::callout_start +probe fires just before a callout. +.Pp +The +.Nm callout_execute Ns Cm :kernel::callout_end +probe fires right after a callout. +.Pp +The only argument to the +.Nm callout_execute +probes, +.Fa args[0] , +is a callout handler +.Ft struct callout * +of the invoked callout. +.Sh EXAMPLES +.Ss Example 1: Graph of Callout Execution Time +The following +.Xr d 7 +script generates a distribution graph of +.Xr callout 9 +execution times: +.Bd -literal -offset 2n +callout_execute:::callout_start +{ + self->cstart = timestamp; +} + +callout_execute:::callout_end +{ + @length = quantize(timestamp - self->cstart); +} +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr tracing 7 , +.Xr callout 9 , +.Xr SDT 9 +.Sh AUTHORS +.An -nosplit +The +.Nm callout_execute +provider was written by +.An Robert N. M. Watson Aq Mt rwatson@FreeBSD.org . +.Pp +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . diff --git a/share/man/man9/callout.9 b/share/man/man9/callout.9 index 96b93283bfc2..97d9f4138742 100644 --- a/share/man/man9/callout.9 +++ b/share/man/man9/callout.9 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 1, 2021 +.Dd November 4, 2025 .Dt CALLOUT 9 .Os .Sh NAME @@ -816,6 +816,8 @@ and functions return a value of one if the callout was still pending when it was called, a zero if the callout could not be stopped and a negative one is it was either not running or has already completed. +.Sh SEE ALSO +.Xr dtrace_callout_execute 4 .Sh HISTORY .Fx initially used the long standing From nobody Tue Nov 18 13:38:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9m0K2fXDz6H98L for ; Tue, 18 Nov 2025 13:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9m0K20gLz3nq8 for ; Tue, 18 Nov 2025 13:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v4ZJk7f1X3tgZupVlPciUf9GRhkni8WRYRMnIiNKEiA=; b=fmrMvNaayYlgxR///bhsfJasP0KUPZ2uFLJMVeq+G+MhGIzMOZeASLgsGBL7leyluwB9/M wphwLHKHTW+aEY/4LkJ3AZF0364SHo3r95twTdAR3M8EngCe+KSOZiQM83FMHyv7ahTGqS 0i2vepyUVQw/z2hlcAuwR3vZbHyou0PZzB/Adzv0lwtG3gOwhhACYh9Z4c+xpBVo3shfO8 cGS4GSoeJB5tVH5cJ3x1hLhDH07INhEHn+ee6tzmfbBcLsXGobfeF9u6dpAYJYBD1GAAiY ai9uLT3BYpdRQjGAG5YYThZns10022YiMpW5h2sLA66If8Zt3KR28MOisgJ11g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v4ZJk7f1X3tgZupVlPciUf9GRhkni8WRYRMnIiNKEiA=; b=hTzt+QlNlpT+GkC3QtFkyw30uOp114RPmptjrzJoUrIYyapiPhmxLntsDZAC8EVylQAVcY IegKOK5tpdorNT2tEcV908zQmuNAkjCiBzt96eyanKL3N2isQCM3dp9lku3KHK0hirhKhw AS03ZbEIKXrM1Jyz6MUYFlgNiIZHlNWqnBhmWf4Yc6KPUVpJYpes9Q57dWBs7u46QRS2nv u9Iw6CX60VMNiLPbzLS74iDXCZf2q7P79LXQxNja89tt8gI/6P3kOuEzgZBhJao458gVN+ Tj1KCkqDlYEy0X9P2usBgCaT9ekLXGoAaSWfo7IQ0eCKyYoNSduorOfkwimCcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763473105; a=rsa-sha256; cv=none; b=pTG68fA3lCeI87jkeYttNVf12hjEVA/vileDAuP7bAq7EpSZWBNQqxdLYQBuWa7CbNZKvA fwGqcU+nDWEABa/TSGUzXcHpsTLJjVseo057fJogxasSzTFbySC/s+1+Og/X8B1x/IYa+U +/6G5XwtBpEAknkFnhOjQ+0bCZnIq73BrcmsfxQfd5IntIirhxor48n9o+Pc/Bc50dUxQ1 Bi//5tUpKouHTH/xKL7dLApDprOSPz97TtTMq/LZAiOvz1ujKyngmgsey0Y8E+WoKAyMiB B7urKuA8qWqM9ky11dlh4SVytk6oeX5A87FtfPnlgN1JRdfQSvHE/t1oC74+sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9m0K1ZYczx52 for ; Tue, 18 Nov 2025 13:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e437 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:38:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: d086bf34b56f - stable/15 - d.7: Document strchr, strjoin, strrchr, strstr, strtok, strlen, and substr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d086bf34b56f1a9bb75cdceabec02cc39703fe66 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:38:25 +0000 Message-Id: <691c76d1.2e437.2a4eeeb4@gitrepo.freebsd.org> The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=d086bf34b56f1a9bb75cdceabec02cc39703fe66 commit d086bf34b56f1a9bb75cdceabec02cc39703fe66 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-28 20:06:53 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-18 13:38:14 +0000 d.7: Document strchr, strjoin, strrchr, strstr, strtok, strlen, and substr Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53417 (cherry picked from commit af99c4c1d03c742faf8bd4c62fbbb664c5f7fc18) --- share/man/man7/d.7 | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/share/man/man7/d.7 b/share/man/man7/d.7 index 4b00d3d71c79..59b3389b121b 100644 --- a/share/man/man7/d.7 +++ b/share/man/man7/d.7 @@ -198,6 +198,130 @@ The number of nanoseconds since the Epoch Suitable for timestamping logs. .El .Sh BUILT-IN FUNCTIONS +.\" Keep the indentation wide enough for the reader to be able to skim through +.\" function names quickly. +.Bl -tag -width "size_t strlen" +.It Ft string Fn strchr "string s" "char c" +Return a substring of +.Fa s +starting at the first occurance of +.Fa c +in +.Fa s . +Return +.Dv NULL +if +.Fa c +does not occur in +.Fa s . +.Pp +For example, +.Bd -literal -compact -offset indent +strchr("abc", 'b'); +.Ed +returns +.Ql "bc" +and +.Bd -literal -compact -offset indent +strchr("abc", 'd'); +.Ed +returns +.Dv NULL . +.It Ft string Fn strjoin "string s1" "string s2" +Return a string resulting from concatenating +.Fa s1 +and +.Fa s2 . +.Pp +For example, +.Bd -literal -compact -offset indent +strjoin("abc", "def") +.Ed +returns +.Ql abcdef . +.It Ft string Fn strrchr "string s" "char c" +Return a substring of +.Fa s +starting at the last occurance of +.Fa c +in +.Fa s . +Similar to +.Fn strchr . +.It Ft string Fn strstr "string haystack" "string needle" +Return a substring of +.Fa haystack +starting at the first occurrence of +.Fa needle . +Return +.Dv NULL +if +.Fa needle +is not a substring of +.Fa haystack . +.Pp +For example, +.Bd -literal -compact -offset indent +strstr("abc1bc2", "bc") +.Ed +returns +.Ql bc1bc2 +and +.Bd -literal -compact -offset indent +strstr("abc", "xy") +.Ed +returns +.Dv NULL . +.It Ft string Fn strtok "string s" "string separators" +Tokenize +.Fa s +with +.Fa separators . +.Pp +For example, +.Bd -literal -compact -offset indent +strtok("abcdefg", "xyzd") +.Ed +returns +.Ql abc . +.It Ft size_t Fn strlen "string s" +Return the length of string +.Fa s . +.It Ft string Fn substr "string s" "int position" "[int length]" +Return a +substring of string +.Fa s +starting at +.Fa position . +The substring will be at most +.Fa length Ns -long . +If +.Fa length +is not specified, use the rest of the string. +If +.Fa position +is greater than +the size of +.Fa s , +return an empty string. +.Pp +For example, +.Bd -literal -compact -offset indent +substr("abcd", 2) +.Ed +returns +.Ql cd , +.Bd -literal -compact -offset indent +substr("abcd", 2, 1) +.Ed +returns +.Ql c , +and +.Bd -literal -compact -offset indent +substr("abcd", 99) +.Ed +returns an empty string. +.El .Ss Aggregation Functions .Bl -tag -compact -width "llquantize(value, factor, low, high, nsteps)" .It Fn avg value From nobody Tue Nov 18 13:38:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9m0v32mnz6H8wC for ; Tue, 18 Nov 2025 13:38: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9m0v2Q05z3pCt for ; Tue, 18 Nov 2025 13:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n4zzXjdZigg4z0p3cjFEe40nYsAGYk5+naohtb0lQHs=; b=m4xI1afSY5innxH7YJNJUs4NsSWEpzo4j+6LI3JHwDGhESQXxdfr8kDNDqAJDtHaJsNz5w 4YZ3DP2Rp9nHvID18SZOfbO0ZJ9P8bOWRZnEWL4ghCuRElOQM6q2OnWzKk4PTcSnES0IIm 188tzIJpAMq30KG4Zubufu+/lFG4AnrM6oSJqmXPC6GS2uxdTeUwBXXfPvlu0Va3GlVVaH CdHxK6g659ZceodaTFIdFUPVlFwrCuZ6f3N/C5KPz/ik+h/mTIDyjg0k3/3H1Hyq9UlmfN ivyTEh9ZNKJvj02+nWJExjj4OAVDjX8R6GsgKm41aSIBXje/lO4J2hl0xwIQ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n4zzXjdZigg4z0p3cjFEe40nYsAGYk5+naohtb0lQHs=; b=dr7xsbNWHeLFgRLYJB/YcqvrEBkAV7DzRKIlaPJrYYxDHN8vAwnSeDlNzjrd/S1GpWgh4x Gi7wL0aIGrokr+MG3ZNb7hoV2uIupaTrYs2ofx4qtb8yo7QlABhWUqOKI7VKOo/qKNi2Q4 8rp2Z7fug5qWa6on3PdQ6LV12QgVu7/qFhCTcgPazZzSyZs9nR+6VD6T/smSDddVs8c6GM xc9FtU5fZEiKz1GD29FfVugnsFOOFX9FSiaoILMULSslSr+qpb6wMMheK6a9Gg7z3aW79N v8E/gWIU4CxgVAk++6icoHJaaAJMOLHC0jbm9RiDU6DGtbptJ4o1gbmI3LGTfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763473135; a=rsa-sha256; cv=none; b=e3E/7H8fElL4iqHD2j+/zTSrZ6QP1vnrMxGRvMXTfW+q6CJw7VUiUiBwGeJCUHCUyQCf6H alEZpCj4c9z1ehCTbKETKK8KTZjZhel5w9zaSn9BJ/Rjkdgvkv1MXThmv5gNtRxCqgIYWr +iwzmUHAg9/HjxxEdsMy9UxBSNBlKbS2V1rGSskPzfQ2W8gSJfoFhTWpouz9WYfKEnx51G qJszkzxUiz/8VYjapS4Okl83wScg74ZXKAEA40cdu22Q5YHxNyVbaXqSRZeRT5VR37sewO 7Ku23G4MOCMRFZCVVtLQw6DpLVDEBMalqFPINCi+QP3nlZe8Rwxj6cWMPGJ3rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9m0v1nFqzwdc for ; Tue, 18 Nov 2025 13:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e43b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:38:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 32ef68b0f30d - stable/15 - geom_zero.4: Document List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 32ef68b0f30d903455173fc4c0029d4bced647db Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:38:55 +0000 Message-Id: <691c76ef.2e43b.6bbb7c30@gitrepo.freebsd.org> The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=32ef68b0f30d903455173fc4c0029d4bced647db commit 32ef68b0f30d903455173fc4c0029d4bced647db Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-09 14:46:40 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-18 13:38:48 +0000 geom_zero.4: Document PR: 250593 Reviewed by: bcr, ziaee Thanks to: imp, markj MFC after: 1 week Fixes: 3843eba85d98 Add unmapped BIO support to GEOM ZERO Fixes: 24e1fdcd1a69 Allow to specify the byte which will be used for filling read buffer Fixes: 565bc101112c Add a very simple and small GEOM class - ZERO (cherry picked from commit 39acb7fd86eda721df402c2f1368b78cede161c3) --- share/man/man4/Makefile | 2 + share/man/man4/geom_zero.4 | 174 +++++++++++++++++++++++++++++++++++++++++++++ share/man/man4/zero.4 | 3 +- 3 files changed, 178 insertions(+), 1 deletion(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index dd98badd31ba..a04e20dfea27 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -189,6 +189,7 @@ MAN= aac.4 \ geom.4 \ geom_linux_lvm.4 \ geom_uzip.4 \ + geom_zero.4 \ gif.4 \ ${_gve.4} \ gpio.4 \ @@ -1120,6 +1121,7 @@ MAN+= \ veriexec.4 \ zyd.4 +MLINKS+=geom_zero.4 gzero.4 MLINKS+=mtw.4 if_mtw.4 MLINKS+=otus.4 if_otus.4 MLINKS+=rsu.4 if_rsu.4 diff --git a/share/man/man4/geom_zero.4 b/share/man/man4/geom_zero.4 new file mode 100644 index 000000000000..8da09b1473c9 --- /dev/null +++ b/share/man/man4/geom_zero.4 @@ -0,0 +1,174 @@ +.\" +.\" Copyright (c) 2019 Greg White . All rights reserved. +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt GEOM_ZERO 4 +.Os +.Sh NAME +.Nm gzero , +.Nm geom_zero +.Nd GEOM-based zero disk/block device +.Sh SYNOPSIS +.Cd "options GEOM_ZERO" +.Pp +In +.Xr loader.conf 5 +or +.Xr sysctl.conf 5 : +.Cd kern.geom.zero.byte +.Cd kern.geom.zero.clear +.Sh DESCRIPTION +.Nm +is a +.Xr GEOM 4 +device simulating a one-exabyte disk. +It throws away any data written to it, +and returns the value of +.Va kern.geom.zero.byte +for every byte read from it. +.Pp +.Nm +differs from +.Xr zero 4 , +which is a regular character device and has an infinite length, +while +.Pa /dev/gzero +is a +.Xr GEOM 4 +provider of large, but limited, size. +.Pp +Consult +.Xr geom 8 +for instructions on how to use the supported commands of the +.Xr GEOM 4 +.Nm ZERO +class. +.Pp +.Nm +is useful for benchmarking performance of GEOM and GEOM classes +where compression of the data does not affect the results +.Po blocks from +.Pa /dev/gzero +compress exceptionally well +.Pc . +Examples of such benchmarks include +comparing the speed of two disk encryption algorithms and +comparing a hardware versus software implementation +of a single encryption algorithm. +.Sh MIB VARIABLES +The following variables are available as both +.Xr sysctl 8 +variables and +.Xr loader 8 +tunables: +.Bl -tag -width "kern.geom.zero.clear" +.It Va kern.geom.zero.byte +This variable sets the fill byte of the +.Nm +device. +Default: +.Ql 0 . +.It Va kern.geom.zero.clear +This variable controls the clearing of the read data buffer. +If set to +.Ql 0 , +.Nm +will not copy any data into the read data buffers +and just return the read data buffers as they are without modifying them. +In particular, it will not not fill the read buffer with the value of +.Va kern.geom.zero.byte . +This is useful for read benchmarking to reduce the measurement noise +caused by extra memory initialization. +Default: +.Ql 1 . +.El +.Sh FILES +.Bl -tag -width /dev/gzero +.It Pa /dev/gzero +The +.Nm +device. +.El +.Sh EXAMPLES +Create the +.Pa /dev/gzero +device by loading the +.Nm geom_zero +kernel module: +.Bd -literal -offset indent +# geom zero load +.Ed +.Pp +Show information about the +.Nm +device: +.Bd -literal -offset indent +# geom zero list +Geom name: gzero +Providers: +1. Name: gzero + Mediasize: 1152921504606846976 (1.0E) + Sectorsize: 512 + Mode: r0w0egzero0 +.Ed +.Pp +Set the fill byte of the +.Nm +device to 70 +.Po decimal for letter +.Dq F +in +.Xr ascii 7 +.Pc : +.Bd -literal -offset indent +# sysctl kern.geom.zero.byte=70 +kern.geom.zero.byte: 0 -> 70 +# head -c 1 /dev/gzero +F +.Ed +.Pp +Benchmark read and write throughput of +.Xr geli 8 Ap s +default encryption algorithm with a 4-KiB sector size: +.Bd -literal -offset indent +# geom zero load +# geli onetime -s 4096 gzero +# sysctl kern.geom.zero.clear=0 +# dd if=/dev/gzero.eli of=/dev/zero bs=4k count=$((1024 * 256)) +262144+0 records in +262144+0 records out +1073741824 bytes transferred in 1.258195 secs (853398307 bytes/sec) +# dd if=/dev/zero of=/dev/gzero.eli bs=4k count=$((1024 * 256)) +262144+0 records in +262144+0 records out +1073741824 bytes transferred in 1.663118 secs (645619658 bytes/sec) +.Ed +.Sh SEE ALSO +.Xr GEOM 4 , +.Xr zero 4 , +.Xr geom 8 , +.Xr sysctl 8 , +.Xr bio 9 +.Sh HISTORY +A +.Nm +device first appeared in +.Fx 6 . +.Sh AUTHORS +.An -nosplit +The +.Nm +device was written by +.An Paweł Jakub Dawidek Aq Mt pjd@FreeBSD.org . +.Pp +The +.Nm +manual page was originally written by +.An Greg White Aq Mt gkwhite@gmail.com +and rewritten by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org +before landing in +.Fx . diff --git a/share/man/man4/zero.4 b/share/man/man4/zero.4 index f1cd52d455d1..85651d53d342 100644 --- a/share/man/man4/zero.4 +++ b/share/man/man4/zero.4 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 7, 1996 +.Dd November 9, 2025 .Dt ZERO 4 .Os .Sh NAME @@ -48,6 +48,7 @@ supply of null bytes when read. .El .Sh SEE ALSO .Xr full 4 , +.Xr gzero 4 , .Xr null 4 .Sh HISTORY A From nobody Tue Nov 18 13:39:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9m1T2H4hz6H8t1 for ; Tue, 18 Nov 2025 13:39: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9m1T0ndhz3pnn for ; Tue, 18 Nov 2025 13:39:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z2NTds+8p8cHutUQc/HQHxslcyJxvDxOKeUP7G7Y7jY=; b=nhzKzQbNJfeZDTyFY5td/imCYhMZbu9/76ve46ngLFnTyx+Om/gQigQ4Tvg81aboABNsTw pTyvtfrjUb2kxOi9bDYyov8f6ZbmF8Ewk5YpgUNzHNA33VSIwPzXgraqplyHT01PHtE6hV 4hs6qUS22zG6U0ZuOj3OeYAzs6oYIK45q1v4zpJllVv0X8bN9r7iTjkMY7k9PyWSWpH6jU 8x3k34hz+WVGZiok81XlniRJrG3CgwGnd84tITlhN2ZgpaSf/vRlXbyCbTSJXUFJvh94jV m4JA+4w06gBoYZeaGDl1QiweSZPJAmVNHkHwFZql/grQaagtrhYEXEsKADhF+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z2NTds+8p8cHutUQc/HQHxslcyJxvDxOKeUP7G7Y7jY=; b=hWhFvIOqm5ukOGf9ZoHPnAQAQSBb7suoi5ZDu7Vn26oP1/I8ENT1VXqIWrVyCFAlH+9oCe 5g3WJ36p45WdzNC0j6Mi9tOGJ8C7VVK1U6i5jTu11Tw9q3mnyhU61MX7ZoQEq/b8MBSlBK nvLxVn28FCD2/83UMN285FV3iMH1Ly4SOb++4Ty51up1KlOQT8C7SU51SF/BQ/QL5AFWQv thELNviysRjRKLllfOUu69JfJ4GVmfLlueA7J8UW5Rmz3j2N8hRRfXIehY+gQ1y+TMQ3ZM KOPABScrfUpQNVJIfq4idSVp2plIv4qlThD2twS8DVZAwTb+JFNpHvEcu3OzBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763473165; a=rsa-sha256; cv=none; b=dBj3AaFveJ1uvFr9AOyCzKZjeIKzNFxrshewTIrcwy48WHdi/AEl54gPRmBfz90Cvs4cNF dqf3VcyuJv+xsqDSpwR/uF/I/GKgz0j+iAb1Uyiqa/xIt7fR34JtBsufdw2RHaDpukV1Nw oK2gWEeviyTRNy41U+z46A7fHKC4zWDQXEawOzPZSFhHD22cOTCw0Xyc7gZnyDRRPID5uG G4z8QPbjzH/GnSzYvaP50qLpaq/YVcugwWXb+o5mkJQzcDi3R2w0PZoH4jbeAhaEKt+m87 rNdPoWSRFU7YULyrwMKvegDgqCzfcvqUMuC/3LDFKV2DgbSC0G9ruEr2y4Da2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9m1T07kszwWn for ; Tue, 18 Nov 2025 13:39:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e8f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:39:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 18391412cecf - stable/14 - geom_zero.4: Document List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 18391412cecfc338fd4ac747e766fbc0721ca3f8 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:39:25 +0000 Message-Id: <691c770d.2e8f4.3a2f7cb1@gitrepo.freebsd.org> The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=18391412cecfc338fd4ac747e766fbc0721ca3f8 commit 18391412cecfc338fd4ac747e766fbc0721ca3f8 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-09 14:46:40 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-18 13:39:16 +0000 geom_zero.4: Document PR: 250593 Reviewed by: bcr, ziaee Thanks to: imp, markj MFC after: 1 week Fixes: 3843eba85d98 Add unmapped BIO support to GEOM ZERO Fixes: 24e1fdcd1a69 Allow to specify the byte which will be used for filling read buffer Fixes: 565bc101112c Add a very simple and small GEOM class - ZERO (cherry picked from commit 39acb7fd86eda721df402c2f1368b78cede161c3) --- share/man/man4/Makefile | 2 + share/man/man4/geom_zero.4 | 174 +++++++++++++++++++++++++++++++++++++++++++++ share/man/man4/zero.4 | 3 +- 3 files changed, 178 insertions(+), 1 deletion(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 2dda6b937dc2..66cec9586fc4 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -173,6 +173,7 @@ MAN= aac.4 \ geom.4 \ geom_linux_lvm.4 \ geom_uzip.4 \ + geom_zero.4 \ gif.4 \ ${_gve.4} \ gpio.4 \ @@ -1047,6 +1048,7 @@ MAN+= \ uvscom.4 \ zyd.4 +MLINKS+=geom_zero.4 gzero.4 MLINKS+=otus.4 if_otus.4 MLINKS+=rsu.4 if_rsu.4 MLINKS+=rtwn_usb.4 if_rtwn_usb.4 diff --git a/share/man/man4/geom_zero.4 b/share/man/man4/geom_zero.4 new file mode 100644 index 000000000000..8da09b1473c9 --- /dev/null +++ b/share/man/man4/geom_zero.4 @@ -0,0 +1,174 @@ +.\" +.\" Copyright (c) 2019 Greg White . All rights reserved. +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt GEOM_ZERO 4 +.Os +.Sh NAME +.Nm gzero , +.Nm geom_zero +.Nd GEOM-based zero disk/block device +.Sh SYNOPSIS +.Cd "options GEOM_ZERO" +.Pp +In +.Xr loader.conf 5 +or +.Xr sysctl.conf 5 : +.Cd kern.geom.zero.byte +.Cd kern.geom.zero.clear +.Sh DESCRIPTION +.Nm +is a +.Xr GEOM 4 +device simulating a one-exabyte disk. +It throws away any data written to it, +and returns the value of +.Va kern.geom.zero.byte +for every byte read from it. +.Pp +.Nm +differs from +.Xr zero 4 , +which is a regular character device and has an infinite length, +while +.Pa /dev/gzero +is a +.Xr GEOM 4 +provider of large, but limited, size. +.Pp +Consult +.Xr geom 8 +for instructions on how to use the supported commands of the +.Xr GEOM 4 +.Nm ZERO +class. +.Pp +.Nm +is useful for benchmarking performance of GEOM and GEOM classes +where compression of the data does not affect the results +.Po blocks from +.Pa /dev/gzero +compress exceptionally well +.Pc . +Examples of such benchmarks include +comparing the speed of two disk encryption algorithms and +comparing a hardware versus software implementation +of a single encryption algorithm. +.Sh MIB VARIABLES +The following variables are available as both +.Xr sysctl 8 +variables and +.Xr loader 8 +tunables: +.Bl -tag -width "kern.geom.zero.clear" +.It Va kern.geom.zero.byte +This variable sets the fill byte of the +.Nm +device. +Default: +.Ql 0 . +.It Va kern.geom.zero.clear +This variable controls the clearing of the read data buffer. +If set to +.Ql 0 , +.Nm +will not copy any data into the read data buffers +and just return the read data buffers as they are without modifying them. +In particular, it will not not fill the read buffer with the value of +.Va kern.geom.zero.byte . +This is useful for read benchmarking to reduce the measurement noise +caused by extra memory initialization. +Default: +.Ql 1 . +.El +.Sh FILES +.Bl -tag -width /dev/gzero +.It Pa /dev/gzero +The +.Nm +device. +.El +.Sh EXAMPLES +Create the +.Pa /dev/gzero +device by loading the +.Nm geom_zero +kernel module: +.Bd -literal -offset indent +# geom zero load +.Ed +.Pp +Show information about the +.Nm +device: +.Bd -literal -offset indent +# geom zero list +Geom name: gzero +Providers: +1. Name: gzero + Mediasize: 1152921504606846976 (1.0E) + Sectorsize: 512 + Mode: r0w0egzero0 +.Ed +.Pp +Set the fill byte of the +.Nm +device to 70 +.Po decimal for letter +.Dq F +in +.Xr ascii 7 +.Pc : +.Bd -literal -offset indent +# sysctl kern.geom.zero.byte=70 +kern.geom.zero.byte: 0 -> 70 +# head -c 1 /dev/gzero +F +.Ed +.Pp +Benchmark read and write throughput of +.Xr geli 8 Ap s +default encryption algorithm with a 4-KiB sector size: +.Bd -literal -offset indent +# geom zero load +# geli onetime -s 4096 gzero +# sysctl kern.geom.zero.clear=0 +# dd if=/dev/gzero.eli of=/dev/zero bs=4k count=$((1024 * 256)) +262144+0 records in +262144+0 records out +1073741824 bytes transferred in 1.258195 secs (853398307 bytes/sec) +# dd if=/dev/zero of=/dev/gzero.eli bs=4k count=$((1024 * 256)) +262144+0 records in +262144+0 records out +1073741824 bytes transferred in 1.663118 secs (645619658 bytes/sec) +.Ed +.Sh SEE ALSO +.Xr GEOM 4 , +.Xr zero 4 , +.Xr geom 8 , +.Xr sysctl 8 , +.Xr bio 9 +.Sh HISTORY +A +.Nm +device first appeared in +.Fx 6 . +.Sh AUTHORS +.An -nosplit +The +.Nm +device was written by +.An Paweł Jakub Dawidek Aq Mt pjd@FreeBSD.org . +.Pp +The +.Nm +manual page was originally written by +.An Greg White Aq Mt gkwhite@gmail.com +and rewritten by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org +before landing in +.Fx . diff --git a/share/man/man4/zero.4 b/share/man/man4/zero.4 index f1cd52d455d1..85651d53d342 100644 --- a/share/man/man4/zero.4 +++ b/share/man/man4/zero.4 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 7, 1996 +.Dd November 9, 2025 .Dt ZERO 4 .Os .Sh NAME @@ -48,6 +48,7 @@ supply of null bytes when read. .El .Sh SEE ALSO .Xr full 4 , +.Xr gzero 4 , .Xr null 4 .Sh HISTORY A From nobody Tue Nov 18 13:39:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9m262b7Sz6H92s for ; Tue, 18 Nov 2025 13:39: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9m261tq0z3psv for ; Tue, 18 Nov 2025 13:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0xFgUorLuPbcf1zzg07s8xvQCXH10fxcxU6jM6YMZII=; b=X3sym5wdb4LEVAB0XFBEfGuHwYAZxaAai+1COFF/XBfPN6F73anURxq1zNO+KVbAHgj7TM 1UK5rARYVn80go4FcH7fgeSnSSFsJaKQi9RBJOkzRbeI4VymfmzZCBbZ3qzZx2Pzy/GeQq aMBOhLc278aeczi/Xi0XcEqa4rDbwgkA+sEmGTQIFuUXQyldcnWfeRl9ZrqqE3VTphfTnC spY6Xl6PobJ2f0hU65Ml3YrVFj0qTx9JVKEcvRhjpvKz0yt/m3AsvIQYQTKj97E1pm228Y ysj1qpgEva7oStZNQdAXfcvpJq6rLXY1pvlVZa5D6Ad0BbmbOiD73YIzcCcwPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0xFgUorLuPbcf1zzg07s8xvQCXH10fxcxU6jM6YMZII=; b=nEyVtxvCCqhsMLVgWgRTvQjtf9060XnEfzjSclq9fvX+rueEtpGjeeR1oK2LdvhsjlqNah 8aviWLOJsAcuTxXhh3hKpvn2MrerQQelVqDJFEjnxnmE2alRr702JSCJzxIKEV7+QTLWx+ oR5t8gRU8Bug8rDWoHTUD7n3GY2c9z73+DnVNy+4f22Ub91csRvEvqCtuGaPigg9r2uKYG mhz8xj9d6lZxpPM5R5R/onXRJR27+3ZBVRuJo1Lol7GeS+HSpyI4nm6eAk76qaCeSRBoye ubITE3/5W7PBnUIS+tTE8mF4r235v4mN3tiGXX+ktlLEGSiVjKgasDGtc3pF4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763473198; a=rsa-sha256; cv=none; b=ZoqkmuqRFNri0EYybF2Hy95/YV10WwPFZBtnqHCitJdbVeWTknXRCEoYeoxfY2zcY/aTqF d+hTInZbKNZ5ErCNsfEwZxjAzzi3NnVywFsrlDSOjhhaUbIYa8w/7VljyAd9W3J3aiSlMt j+gCVDsKHy2tCx7jM1rQZiDMxDMeNetbD0eOrjZypv4hTwAkr1rdepejvhwTMMKfxvS6P+ 7Hr8TN8y10yXIuDK1Jambear/ngRLrws3yHXgA8ifBJeJillWvb5SCOT2JvYMXZmaPNZZd KEUihIGAilJ9W498VJ5l3tPOnNQd+yiJbD+PitjatmFgPXljPJWtYUwLiIdZeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9m2618j3zx8T for ; Tue, 18 Nov 2025 13:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2de61 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:39:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 6ec3d4402af6 - stable/13 - geom_zero.4: Document List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6ec3d4402af60ad91d4dae829c77416ed60cf896 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:39:58 +0000 Message-Id: <691c772e.2de61.275c2775@gitrepo.freebsd.org> The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=6ec3d4402af60ad91d4dae829c77416ed60cf896 commit 6ec3d4402af60ad91d4dae829c77416ed60cf896 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-09 14:46:40 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-18 13:39:49 +0000 geom_zero.4: Document PR: 250593 Reviewed by: bcr, ziaee Thanks to: imp, markj MFC after: 1 week Fixes: 3843eba85d98 Add unmapped BIO support to GEOM ZERO Fixes: 24e1fdcd1a69 Allow to specify the byte which will be used for filling read buffer Fixes: 565bc101112c Add a very simple and small GEOM class - ZERO (cherry picked from commit 39acb7fd86eda721df402c2f1368b78cede161c3) --- share/man/man4/Makefile | 2 + share/man/man4/geom_zero.4 | 174 +++++++++++++++++++++++++++++++++++++++++++++ share/man/man4/zero.4 | 3 +- 3 files changed, 178 insertions(+), 1 deletion(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 49dbff287e18..5ea51eb02eb0 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -172,6 +172,7 @@ MAN= aac.4 \ geom_linux_lvm.4 \ geom_map.4 \ geom_uzip.4 \ + geom_zero.4 \ gif.4 \ ${_gve.4} \ gpio.4 \ @@ -1068,6 +1069,7 @@ MAN+= \ uvscom.4 \ zyd.4 +MLINKS+=geom_zero.4 gzero.4 MLINKS+=otus.4 if_otus.4 MLINKS+=rsu.4 if_rsu.4 MLINKS+=rtwn_usb.4 if_rtwn_usb.4 diff --git a/share/man/man4/geom_zero.4 b/share/man/man4/geom_zero.4 new file mode 100644 index 000000000000..8da09b1473c9 --- /dev/null +++ b/share/man/man4/geom_zero.4 @@ -0,0 +1,174 @@ +.\" +.\" Copyright (c) 2019 Greg White . All rights reserved. +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt GEOM_ZERO 4 +.Os +.Sh NAME +.Nm gzero , +.Nm geom_zero +.Nd GEOM-based zero disk/block device +.Sh SYNOPSIS +.Cd "options GEOM_ZERO" +.Pp +In +.Xr loader.conf 5 +or +.Xr sysctl.conf 5 : +.Cd kern.geom.zero.byte +.Cd kern.geom.zero.clear +.Sh DESCRIPTION +.Nm +is a +.Xr GEOM 4 +device simulating a one-exabyte disk. +It throws away any data written to it, +and returns the value of +.Va kern.geom.zero.byte +for every byte read from it. +.Pp +.Nm +differs from +.Xr zero 4 , +which is a regular character device and has an infinite length, +while +.Pa /dev/gzero +is a +.Xr GEOM 4 +provider of large, but limited, size. +.Pp +Consult +.Xr geom 8 +for instructions on how to use the supported commands of the +.Xr GEOM 4 +.Nm ZERO +class. +.Pp +.Nm +is useful for benchmarking performance of GEOM and GEOM classes +where compression of the data does not affect the results +.Po blocks from +.Pa /dev/gzero +compress exceptionally well +.Pc . +Examples of such benchmarks include +comparing the speed of two disk encryption algorithms and +comparing a hardware versus software implementation +of a single encryption algorithm. +.Sh MIB VARIABLES +The following variables are available as both +.Xr sysctl 8 +variables and +.Xr loader 8 +tunables: +.Bl -tag -width "kern.geom.zero.clear" +.It Va kern.geom.zero.byte +This variable sets the fill byte of the +.Nm +device. +Default: +.Ql 0 . +.It Va kern.geom.zero.clear +This variable controls the clearing of the read data buffer. +If set to +.Ql 0 , +.Nm +will not copy any data into the read data buffers +and just return the read data buffers as they are without modifying them. +In particular, it will not not fill the read buffer with the value of +.Va kern.geom.zero.byte . +This is useful for read benchmarking to reduce the measurement noise +caused by extra memory initialization. +Default: +.Ql 1 . +.El +.Sh FILES +.Bl -tag -width /dev/gzero +.It Pa /dev/gzero +The +.Nm +device. +.El +.Sh EXAMPLES +Create the +.Pa /dev/gzero +device by loading the +.Nm geom_zero +kernel module: +.Bd -literal -offset indent +# geom zero load +.Ed +.Pp +Show information about the +.Nm +device: +.Bd -literal -offset indent +# geom zero list +Geom name: gzero +Providers: +1. Name: gzero + Mediasize: 1152921504606846976 (1.0E) + Sectorsize: 512 + Mode: r0w0egzero0 +.Ed +.Pp +Set the fill byte of the +.Nm +device to 70 +.Po decimal for letter +.Dq F +in +.Xr ascii 7 +.Pc : +.Bd -literal -offset indent +# sysctl kern.geom.zero.byte=70 +kern.geom.zero.byte: 0 -> 70 +# head -c 1 /dev/gzero +F +.Ed +.Pp +Benchmark read and write throughput of +.Xr geli 8 Ap s +default encryption algorithm with a 4-KiB sector size: +.Bd -literal -offset indent +# geom zero load +# geli onetime -s 4096 gzero +# sysctl kern.geom.zero.clear=0 +# dd if=/dev/gzero.eli of=/dev/zero bs=4k count=$((1024 * 256)) +262144+0 records in +262144+0 records out +1073741824 bytes transferred in 1.258195 secs (853398307 bytes/sec) +# dd if=/dev/zero of=/dev/gzero.eli bs=4k count=$((1024 * 256)) +262144+0 records in +262144+0 records out +1073741824 bytes transferred in 1.663118 secs (645619658 bytes/sec) +.Ed +.Sh SEE ALSO +.Xr GEOM 4 , +.Xr zero 4 , +.Xr geom 8 , +.Xr sysctl 8 , +.Xr bio 9 +.Sh HISTORY +A +.Nm +device first appeared in +.Fx 6 . +.Sh AUTHORS +.An -nosplit +The +.Nm +device was written by +.An Paweł Jakub Dawidek Aq Mt pjd@FreeBSD.org . +.Pp +The +.Nm +manual page was originally written by +.An Greg White Aq Mt gkwhite@gmail.com +and rewritten by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org +before landing in +.Fx . diff --git a/share/man/man4/zero.4 b/share/man/man4/zero.4 index f1cd52d455d1..85651d53d342 100644 --- a/share/man/man4/zero.4 +++ b/share/man/man4/zero.4 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 7, 1996 +.Dd November 9, 2025 .Dt ZERO 4 .Os .Sh NAME @@ -48,6 +48,7 @@ supply of null bytes when read. .El .Sh SEE ALSO .Xr full 4 , +.Xr gzero 4 , .Xr null 4 .Sh HISTORY A From nobody Tue Nov 18 13:44:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9m7t6S4Lz6H9bZ for ; Tue, 18 Nov 2025 13:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9m7t4Gvpz3r3M for ; Tue, 18 Nov 2025 13:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qbB0XcTW9mL9CnQbKbrsjDIEtol6BdR4Scx2USYXss8=; b=WXFL6itCD/GOCa30GqqdTqemgbbXVMAkHAWmXRzpb7IlbUD+RhYs9GYBUK1JUexghpl3dx /f5TkA2cwIBgctcO7nBosTBByjzejSCIiBkt8cXPrpBT8LtIAiifqGaDDzFuBtNrn+CZ8s FJJeA7zO97iyLynOAhV9K+I/UFtHNDOsxGqFdFR1EcgG6ezrjqXh18F1ChEjRb73QlcQ3r AkV/sG8MmirZJhluAt4zQWi46yYlYm0Vq1j4wPHBIhawK+0ImcuORrOFUK2uAlaRm1igyw ed49gaYLhcjW5iylH6jkmIXAKQ01X/97P3JEzt3Az9CbiGqxaVJdW6MaLNo/hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qbB0XcTW9mL9CnQbKbrsjDIEtol6BdR4Scx2USYXss8=; b=WntZP/7XPGZjRUg6Yn8tDzvg75qvwX0hZ8upkTK83GpgqlhougS2ZbM5BX+GAQyDgpJhoK bhqlzk86uBKO+SYUdLM7MOj8YCBKFzJmjdreMXwvHo0mlHnHM82oHtKtdRTlRObGX5dNtO C64hTHTzlm1tBLiqIeIw5xc3YPMNDHNIM+UnXwijGCYCuEXVOjFCzocEr9YcEJLeo3tabc Th1p9pzRh9NQnvGWH+FbcPGoWyP0pgzvKUXIEk5aCos4HODQXYYqg1PuSs0dfRN3CnTuut rWiuJ3hHOK5Gwq99B9uqeNaW37tp7HmZ7Ojb6Erad1xpoBA2NSvngmZ9Qsqa5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763473498; a=rsa-sha256; cv=none; b=n5bdiqFk41M7HYJ5hSONfkTFPC/IgF79JClzIJK6gdoufwzkNL0JHdouezDuz7Jg7e4tPO 2joWT315xIa7a/kddxitiYNBg6itcPwYwBK3BDmqQKDaOAV7Zz+Tz0SYJ/p0Q9Z8m6/A/L PlszJaGEwvFtDpBLI4VhY4cqB2oq2Wt115O0Zd/h5XknibuK50Vq0C4tMfnCq0PaXNsbzW Gh82hgMJ8n1YBGpzcq0fua1OarZcZqw10wsz12gP3JQVoCAfo60p5dcJ9Gu/JHvSSLqouJ FhhLGz7MdYw0gI6YkHC6bVbdIqsq3hFQDQqpFtyTkI5Cr2jtaSPGDHEQ+ve7Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9m7t3KLmzwXH for ; Tue, 18 Nov 2025 13:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30441 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:44:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 38829592dc77 - main - diff3: Remove bespoke getopt.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38829592dc77e9ead4259785e0bfb93bd4c2fe34 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:44:58 +0000 Message-Id: <691c785a.30441.26623094@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=38829592dc77e9ead4259785e0bfb93bd4c2fe34 commit 38829592dc77e9ead4259785e0bfb93bd4c2fe34 Author: Ed Maste AuthorDate: 2025-11-18 13:16:22 +0000 Commit: Ed Maste CommitDate: 2025-11-18 13:42:36 +0000 diff3: Remove bespoke getopt.h diff3's getopt.h included a function declaration without a prototype, which produces a compiler warning. Just remove the bespoke getopt.h and use the system header. Reported by: Mark Millard Reviewed by: fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53802 --- contrib/diff/lib/getopt.h | 176 ---------------------------------------------- 1 file changed, 176 deletions(-) diff --git a/contrib/diff/lib/getopt.h b/contrib/diff/lib/getopt.h deleted file mode 100644 index c61768c691bf..000000000000 --- a/contrib/diff/lib/getopt.h +++ /dev/null @@ -1,176 +0,0 @@ -/* Declarations for getopt. - Copyright (C) 1989-1994,1996-1999,2001,2003,2004 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#ifndef _GETOPT_H - -#ifndef __need_getopt -# define _GETOPT_H 1 -#endif - -/* If __GNU_LIBRARY__ is not already defined, either we are being used - standalone, or this is the first header included in the source file. - If we are being used with glibc, we need to include , but - that does not exist if we are standalone. So: if __GNU_LIBRARY__ is - not defined, include , which will pull in for us - if it's from glibc. (Why ctype.h? It's guaranteed to exist and it - doesn't flood the namespace with stuff the way some other headers do.) */ -#if !defined __GNU_LIBRARY__ -# include -#endif - -#ifndef __THROW -# ifndef __GNUC_PREREQ -# define __GNUC_PREREQ(maj, min) (0) -# endif -# if defined __cplusplus && __GNUC_PREREQ (2,8) -# define __THROW throw () -# else -# define __THROW -# endif -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* For communication from `getopt' to the caller. - When `getopt' finds an option that takes an argument, - the argument value is returned here. - Also, when `ordering' is RETURN_IN_ORDER, - each non-option ARGV-element is returned here. */ - -extern char *optarg; - -/* Index in ARGV of the next element to be scanned. - This is used for communication to and from the caller - and for communication between successive calls to `getopt'. - - On entry to `getopt', zero means this is the first call; initialize. - - When `getopt' returns -1, this is the index of the first of the - non-option elements that the caller should itself scan. - - Otherwise, `optind' communicates from one call to the next - how much of ARGV has been scanned so far. */ - -extern int optind; - -/* Callers store zero here to inhibit the error message `getopt' prints - for unrecognized options. */ - -extern int opterr; - -/* Set to an option character which was unrecognized. */ - -extern int optopt; - -#ifndef __need_getopt -/* Describe the long-named options requested by the application. - The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector - of `struct option' terminated by an element containing a name which is - zero. - - The field `has_arg' is: - no_argument (or 0) if the option does not take an argument, - required_argument (or 1) if the option requires an argument, - optional_argument (or 2) if the option takes an optional argument. - - If the field `flag' is not NULL, it points to a variable that is set - to the value given in the field `val' when the option is found, but - left unchanged if the option is not found. - - To have a long-named option do something other than set an `int' to - a compiled-in constant, such as set a value from `optarg', set the - option's `flag' field to zero and its `val' field to a nonzero - value (the equivalent single-letter option character, if there is - one). For long options that have a zero `flag' field, `getopt' - returns the contents of the `val' field. */ - -struct option -{ - const char *name; - /* has_arg can't be an enum because some compilers complain about - type mismatches in all the code that assumes it is an int. */ - int has_arg; - int *flag; - int val; -}; - -/* Names for the values of the `has_arg' field of `struct option'. */ - -# define no_argument 0 -# define required_argument 1 -# define optional_argument 2 -#endif /* need getopt */ - - -/* Get definitions and prototypes for functions to process the - arguments in ARGV (ARGC of them, minus the program name) for - options given in OPTS. - - Return the option character from OPTS just read. Return -1 when - there are no more options. For unrecognized options, or options - missing arguments, `optopt' is set to the option letter, and '?' is - returned. - - The OPTS string is a list of characters which are recognized option - letters, optionally followed by colons, specifying that that letter - takes an argument, to be placed in `optarg'. - - If a letter in OPTS is followed by two colons, its argument is - optional. This behavior is specific to the GNU `getopt'. - - The argument `--' causes premature termination of argument - scanning, explicitly telling `getopt' that there are no more - options. - - If OPTS begins with `--', then non-option arguments are treated as - arguments to the option '\0'. This behavior is specific to the GNU - `getopt'. */ - -#ifdef __GNU_LIBRARY__ -/* Many other libraries have conflicting prototypes for getopt, with - differences in the consts, in stdlib.h. To avoid compilation - errors, only prototype getopt for the GNU C library. */ -extern int getopt (int ___argc, char *const *___argv, const char *__shortopts) - __THROW; -#else /* not __GNU_LIBRARY__ */ -extern int getopt (); -#endif /* __GNU_LIBRARY__ */ - -#ifndef __need_getopt -extern int getopt_long (int ___argc, char *const *___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind) - __THROW; -extern int getopt_long_only (int ___argc, char *const *___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind) - __THROW; - -#endif - -#ifdef __cplusplus -} -#endif - -/* Make sure we later can get all the definitions and declarations. */ -#undef __need_getopt - -#endif /* getopt.h */ From nobody Tue Nov 18 14:04:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9mZT67Kpz6HBrH for ; Tue, 18 Nov 2025 14: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9mZT2XZ8z3vRJ for ; Tue, 18 Nov 2025 14: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=1763474673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=INROj0bnNUFACH+UA0b1aXJloAR5I38lUm0Y9AwJ87o=; b=cvcqN9z3UqmB+BC7v/WHr2MelGbIXzeaIFkTDJLqN54xaw65FHZCayTe5cOVXBehCL8fO4 9kEEJxClz0fAqq2Awzqbu0blen8rpDpfKNW4zVHasACcHtC+17w5JkQik9QGKMwmtQGd7+ CtXaUet7W0j7yyn/GRqaNTvCKHcH316gA2pKIsUDBtUasNW287DNICzPOEk7rt5FS2hJQJ 0jrdwcdeqRRDhmgVStWQG38R9UauAal7X/Ozzg6ACP86HLMHYjm27KeK4W/ybaZMKzzGQm gGyb4aj8CCgKXEdewSEJNxFuGzKAuUs8hLlejfqJCV+h5k8WsQTQKqotkBVOSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763474673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=INROj0bnNUFACH+UA0b1aXJloAR5I38lUm0Y9AwJ87o=; b=nqiY2V6liFiCYiCbAD8yqpU5Fqx9dFFieT69IvIDMbN+LiQ44VhJ3iwrtxZJfG6BJhOivx aqRa/J0vvRtkOU4DlToH2kLXRXQ5bnF2aiiqSh1/sm8vEFyM/QR7lLoR5hhvO8yR71Gkuh EmvoymZiSm+REcTkq1Ba6Fi0TEnsrb3VVBFgrHveeX4fkBRAD+hZjNrDrXOGwHJ6Mm3wfL 7gZbFtpV2baHGzNjxc1px4pqzDyuqKbAvJbP8fMYSr1pSHvDWnDSRMex2kiuTQjQs7WNl0 +Vn07IcJkuOwVCCOKomiZKgvn/mlapVRTy9z0l9vONnZL+u66XzvAahm/PadYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763474673; a=rsa-sha256; cv=none; b=UtOeLexEzmmej11yB1wOC/Wk26mWkMpC3DadLHM4ErYf/BynyMpaTCuOY1mC1Q2R3TSkYm hakaw0n1XVXwYn2CAcdxfq33bwIqbrK/oLVskSxFEn+MYRriAcDb1KCf/u0DcXccTRfvhg k548SzVH/eJmwqrSvPPvmdrMbqDUiVbrwflGmvSnVYL5CUPoCFglU7J+17ASunkJpWf6cu p8mEzhh1VIPahtnY3mqISyWpy4ka2w/fXmt+w9WyKJc/HLv5DptUSBLZ+YKpe9llvt7RNq WXewxsgXCkxfIWlPVP0Iz8tw5sTsZfbcO18ki6l4JvOknlI0b9xvQsv2EgNOZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9mZT1NjJzxn5 for ; Tue, 18 Nov 2025 14:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3227a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 14:04:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 484fa40ca71b - stable/15 - zfs: fix aarch64 build after zfs-2.4.0-rc4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 484fa40ca71bc9c00ee6d3729e5e27cc5d68e131 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 14:04:33 +0000 Message-Id: <691c7cf1.3227a.389b4e4e@gitrepo.freebsd.org> The branch stable/15 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=484fa40ca71bc9c00ee6d3729e5e27cc5d68e131 commit 484fa40ca71bc9c00ee6d3729e5e27cc5d68e131 Author: Martin Matuska AuthorDate: 2025-11-17 19:15:33 +0000 Commit: Martin Matuska CommitDate: 2025-11-18 14:03:54 +0000 zfs: fix aarch64 build after zfs-2.4.0-rc4 (cherry picked from commit fb709935d64d5fd4ad21cf8c69faf580760999e4) --- sys/modules/zfs/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index ec531ed646a7..7a4d0bb51376 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -475,8 +475,6 @@ CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICA CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} .if ${MACHINE_ARCH} == "aarch64" -__ZFS_ZSTD_AARCH64_FLAGS= -include ${SRCDIR}/zstd/include/aarch64_compat.h -CFLAGS.zstd.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.error_private.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.fse_compress.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} From nobody Tue Nov 18 14:52:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nf16DS7z6HGTx; Tue, 18 Nov 2025 14:52:41 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nf141qNz42Nr; Tue, 18 Nov 2025 14:52:41 +0000 (UTC) (envelope-from rpokala@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763477561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ExyKpNrCfojAmLkFFBN0JXx1f5RvMhUBX6VP4MEcraw=; b=hzh9HIVXiiAzmec1EqMqDzNXvxPmkKr3eMaJE1u/fmMy8wpj/kN4zm6rCaxl9iqI6i65ki pHOuQiVQI3dstSzixX6rjzOaGrKKDwxmxvQ/ES55Qh3HvKd9csWr7V2/lV7+dEZfyX+CaU II6F1HE5+AHjSQ6n2/kJNIht7efHtd1DXcbUTnq45YkBJje3jOYMcm1rLxLQu3cf9m/upi PtzrYWlkMBhNn8iVEBawWJZyfmglxD3xO/jKNP+jHn3aiIIdAWB+ZO1pXLQGerdqDb1gQL 1HBe3z+fLHR1gHMxwOqNa6kYIRfbVDsRKp495V1dENVllne5p24baVYpbrZP1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763477561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ExyKpNrCfojAmLkFFBN0JXx1f5RvMhUBX6VP4MEcraw=; b=pTP8Si8pUcwSImunkxBiTrvu+flUkKdf+Rs4zQ6XMzqm0k4Nye15q4pb9tEoxBCD9MRPdy bbDMVz/BLOUlYzhg8B0f9K8KhPQnYkDKYCQKzvJ08WN0n6qJXL6rrRBXusoA2fVjzAn+S3 n+XxOgRmBm0cLUUFkPxpWSMB5jeEjhfNg72Z1GoG3Pc5mv6E9KXuL7nUl3oeJAAJzMdroK BE44PAh1LvbJuEbQl3RLwmeAWwipiRByOtNsAZSTINsMQo2NvxjCOGuxc2QhAw0xO9b9z5 OIsi2PL02ECcn2QGR9pZfRqMQx1kPXpLB8ba1CQvvCTafGFMq3jYCU5nCOxTBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763477561; a=rsa-sha256; cv=none; b=Cb1kCSaGCBvaxdhJgalyPVIX8zYjf/qcpQzjiBIjlkRFuQ67sks2ervgXVqNgs4rPhDWdl IWH3VFfMULc9zRsdtOfqEe6+6PJGO9Z3TCUKuGJSTUEWCoZFx+mD2Tdbm4/VdduTDLwzwl GeLulOGba+TdiivFvjgBgSl+yDXLFO40dD1PhXcti9zjWcAdpkc5a0zaTk0I38CmSOXpZu Ypc/UShfTK6WZc3omvWse8p8o2zEhsBjxpQUDKMDRhWyQRfph3NNMJkL3H2sDbOlyUgqYJ kNJfRCap9H9qDNEauuMYHEW50z1EfBU5W5ED8lc6M7dn6RwqvtyQnYV8bCWODA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [192.168.1.10] (c-73-40-187-156.hsd1.pa.comcast.net [73.40.187.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id 4d9nf129QmzwYc; Tue, 18 Nov 2025 14:52:41 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.102.25101223 Date: Tue, 18 Nov 2025 09:52:39 -0500 Subject: Re: 8d2a50bb3805 - main - nvme: Abstract out function to obtain a disk ident string from cdata From: Ravi Pokala To: John Baldwin , , , Message-ID: Thread-Topic: 8d2a50bb3805 - main - nvme: Abstract out function to obtain a disk ident string from cdata References: <202511171828.5AHISTJE016407@gitrepo.freebsd.org> In-Reply-To: <202511171828.5AHISTJE016407@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-version: 1.0 Content-type: text/plain; charset="UTF-8" Content-transfer-encoding: quoted-printable Hi John, LINT-NOVIMAGE fails because of this change. Specifically: > In file included from sys/cam/ctl/ctl_nvme_all.c:18: > In file included from sys/cam/nvme/nvme_all.h:31: > sys/dev/nvme/nvme.h:2009:2: error: call to undeclared function 'memmove';= ISO C99 and later do not support implicit function declarations [-Werror,-W= implicit-function-declaration] > 2009 | memmove(sn, cdata->sn, NVME_SERIAL_NUMBER_LENGTH); > | ^ > In file included from sys/cam/ctl/ctl_nvme_all.c:20: > In file included from sys/cam/ctl/ctl_io.h:49: > In file included from sys/cam/scsi/scsi_all.h:20: > In file included from sys/sys/malloc.h:40: > sys/sys/systm.h:259:7: error: conflicting types for 'memmove' > 259 | void *memmove(void * _Nonnull dest, const void * _Nonnull src,= size_t n); > | ^ > sys/dev/nvme/nvme.h:2009:2: note: previous implicit declaration is here > 2009 | memmove(sn, cdata->sn, NVME_SERIAL_NUMBER_LENGTH); > | ^ > 2 errors generated. >=20 > *** Error code 1 And > In file included from sys/cam/ctl/ctl_nvme_cmd_table.c:7: > sys/dev/nvme/nvme.h:2009:2: error: call to undeclared function 'memmove';= ISO C99 and later do not support implicit function declarations [-Werror,-W= implicit-function-declaration] > 2009 | memmove(sn, cdata->sn, NVME_SERIAL_NUMBER_LENGTH); > | ^ > In file included from sys/cam/ctl/ctl_nvme_cmd_table.c:11: > In file included from sys/cam/ctl/ctl_io.h:49: > In file included from sys/cam/scsi/scsi_all.h:20: > In file included from sys/sys/malloc.h:40: > sys/sys/systm.h:259:7: error: conflicting types for 'memmove' > 259 | void *memmove(void * _Nonnull dest, const void * _Nonnull src,= size_t n); > | ^ > sys/dev/nvme/nvme.h:2009:2: note: previous implicit declaration is here > 2009 | memmove(sn, cdata->sn, NVME_SERIAL_NUMBER_LENGTH); > | ^ > 2 errors generated. >=20 > *** Error code 1 Thanks, Ravi (rpokala@) =EF=BB=BF-----Original Message----- From: > on behalf of John Baldwin > Date: Monday, November 17, 2025 at 13:28 To: >, >, > Subject: git: 8d2a50bb3805 - main - nvme: Abstract out function to obtain a= disk ident string from cdata The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3D8d2a50bb38051fefeb1427fdbfd249= f2829310d8 commit 8d2a50bb38051fefeb1427fdbfd249f2829310d8 Author: John Baldwin > AuthorDate: 2025-11-17 18:21:39 +0000 Commit: John Baldwin > CommitDate: 2025-11-17 18:21:39 +0000 nvme: Abstract out function to obtain a disk ident string from cdata This will permit sharing the code with nvmf(4). Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D53338 --- sys/dev/nvme/nvme.h | 19 +++++++++++++++++++ sys/dev/nvme/nvme_ctrlr.c | 21 +-------------------- sys/dev/nvme/nvme_ns.c | 2 +- sys/dev/nvme/nvme_private.h | 1 - 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index f4ea08f129c0..22421f5600ec 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1910,6 +1910,7 @@ void nvme_sc_sbuf(const struct nvme_completion *cpl, = struct sbuf *sbuf); void nvme_strvis(uint8_t *dst, const uint8_t *src, int dstlen, int srclen); #ifdef _KERNEL +#include struct bio; struct thread; @@ -1995,6 +1996,24 @@ nvme_ctrlr_has_dataset_mgmt(const struct nvme_contro= ller_data *cd) return (NVMEV(NVME_CTRLR_DATA_ONCS_DSM, cd->oncs) !=3D 0); } +/* + * Copy the NVME device's serial number to the provided buffer, which must= be + * at least DISK_IDENT_SIZE bytes large. + */ +static inline void +nvme_cdata_get_disk_ident(const struct nvme_controller_data *cdata, uint8_= t *sn) +{ + _Static_assert(NVME_SERIAL_NUMBER_LENGTH < DISK_IDENT_SIZE, + "NVME serial number too big for disk ident"); + + memmove(sn, cdata->sn, NVME_SERIAL_NUMBER_LENGTH); + sn[NVME_SERIAL_NUMBER_LENGTH] =3D '\0'; + for (int i =3D 0; sn[i] !=3D '\0'; i++) { + if (sn[i] < 0x20 || sn[i] >=3D 0x80) + sn[i] =3D ' '; + } +} + /* Namespace helper functions */ uint32_t nvme_ns_get_max_io_xfer_size(struct nvme_namespace *ns); uint32_t nvme_ns_get_sector_size(struct nvme_namespace *ns); diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index e607667decf5..ab06c1d553d7 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -1254,24 +1253,6 @@ nvme_ctrlr_poll(struct nvme_controller *ctrlr) nvme_qpair_process_completions(&ctrlr->ioq[i]); } -/* - * Copy the NVME device's serial number to the provided buffer, which must= be - * at least DISK_IDENT_SIZE bytes large. - */ -void -nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn) -{ - _Static_assert(NVME_SERIAL_NUMBER_LENGTH < DISK_IDENT_SIZE, - "NVME serial number too big for disk ident"); - - memmove(sn, ctrlr->cdata.sn, NVME_SERIAL_NUMBER_LENGTH); - sn[NVME_SERIAL_NUMBER_LENGTH] =3D '\0'; - for (int i =3D 0; sn[i] !=3D '\0'; i++) { - if (sn[i] < 0x20 || sn[i] >=3D 0x80) - sn[i] =3D ' '; - } -} - /* * Poll the single-vector interrupt case: num_io_queues will be 1 and * there's only a single vector. While we're polling, we mask further @@ -1516,7 +1497,7 @@ nvme_ctrlr_ioctl(struct cdev *cdev, u_long cmd, caddr= _t arg, int flag, break; case DIOCGIDENT: { uint8_t *sn =3D arg; - nvme_ctrlr_get_ident(ctrlr, sn); + nvme_cdata_get_disk_ident(&ctrlr->cdata, sn); break; } /* Linux Compatible (see nvme_linux.h) */ diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 17684cc14ba2..f238fa552350 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -90,7 +90,7 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg,= int flag, } case DIOCGIDENT: { uint8_t *sn =3D arg; - nvme_ctrlr_get_ident(ctrlr, sn); + nvme_cdata_get_disk_ident(&ctrlr->cdata, sn); break; } case DIOCGMEDIASIZE: diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index dd45e1acd0aa..a425a6a5ad62 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -565,7 +565,6 @@ void nvme_notify_new_controller(struct nvme_controller = *ctrlr); void nvme_notify_ns(struct nvme_controller *ctrlr, int nsid); void nvme_ctrlr_shared_handler(void *arg); -void nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn= ); void nvme_ctrlr_poll(struct nvme_controller *ctrlr); int nvme_ctrlr_suspend(struct nvme_controller *ctrlr); From nobody Tue Nov 18 15:02:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsh5Y5pz6HGt3 for ; Tue, 18 Nov 2025 15:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsh4ldhz44Kw for ; Tue, 18 Nov 2025 15:02:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+iFNxlFrcsSZI0c0fJFTYkXkDsMdO0iUrlo3FiA2H3c=; b=h8S6Jzc69QsCINQiuP/hynj+BTa6/AzPUr3H15l4dhSMEXtAoxAXpJHaNFLkX37jFcw2do T1kWO6vkTkXwLCvp0eJNag2LcJaImlfm1Sre9G1vqIBYPaqycK9HYySWX1zc0tPBR1slak C3p+zdG3GElQV+2bhqBu2nhlmrzTOUVWwagrccQgSO/1mEZZHwRgMrRgYqWmjPUL3oPUuX FeqvS2YYcBrC1rGPp6TvRKAWudtuSbk8Z4nMxE5BW/CjcTVYxdQiwGUxo5nYIx8gxOp+wR GL4DM1yQHLT4ndIJll30/tOi4GLFHUw2Hyy8g3iwOPUfRCdCNWe/oqDi7UvV+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+iFNxlFrcsSZI0c0fJFTYkXkDsMdO0iUrlo3FiA2H3c=; b=pxHFV/zbsFUVd4R+JKtk6nb6T1QBxor8ZhnXQVoidoCzCBg3UQuXOiQ9JgJMDdQiUn30Oz Z8O/UD+bJp60cVLrH9IoxawndaEgCJfw9ghIJSG50RpXg/4pKpkTMZQ+fQlrveQr6U+Lsa TYdtcu/t/jPoqaQcrlKeBmSc7v/DAV4UPHTqtNSbJ/CHsLuLcTqo9mh4Sp1cw7oKDBRa4x h7WS9NLiDkNA+J4X6iCmODF31I57AqF6TXD69PgjlE/4fzzm6ueONq9WjBJUQe8cUEc/IK +T7hdCAzeizPeWy6s6LsHH88UWnX/WR0NDR0KMZBtjBp87IY4ulDr49Gay0x8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478168; a=rsa-sha256; cv=none; b=t4siwpeuNMDuPdb07D0NQL01Rf6b/6BBD3QkXpUEyLi/s75kqqLd6s3vzG+JceeLtXgk+z /BQjsPOuPDANFLFB/vPbEFihW642XgsokrDiOQXzVlDVrhIoq/00v2qKxsnNh3xng5TIHz 9ZsqlwtBzW7hGqhYTtnXhOwyyspTyz1jov+qN6eAMCUE/+Hp2huozaCv2dSUh9qv6OqMzy p8BnFEam7duG3hJORIhQ4cJy2MvVRxF2/rCnXiOj6JmlzFLiYZiLJ+tc+1nEKAsR26iy6F bFnHhQ81t5FNFug/7BC11t506Nu/Wu4HK5MlVyGI7h0249eMmUQLDGiEoI7F2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsh412Rz102W for ; Tue, 18 Nov 2025 15:02:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3882a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 187e4b42f4e1 - stable/15 - multicast tests: Run in VNET jails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 187e4b42f4e1c422a256883507b80216c89ce15d Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:48 +0000 Message-Id: <691c8a98.3882a.6848b27c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=187e4b42f4e1c422a256883507b80216c89ce15d commit 187e4b42f4e1c422a256883507b80216c89ce15d Author: Mark Johnston AuthorDate: 2025-11-09 13:00:19 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:56:38 +0000 multicast tests: Run in VNET jails The tests themselves create identically named jails, resulting in spurious failures when the tests are run in parallel. MFC after: 1 week (cherry picked from commit b3b279b801d571919c8bbd5de4325d8819ffd59a) --- tests/sys/netinet/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index cc525bf24480..fb21196a5550 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -45,6 +45,8 @@ TEST_METADATA.fibs_test+= execenv="jail" \ TEST_METADATA.forward+= required_programs="python" \ execenv="jail" \ execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.multicast+= execenv="jail" \ + execenv_jail_params="vnet" TEST_METADATA.output+= required_programs="python" TEST_METADATA.redirect+= required_programs="python" From nobody Tue Nov 18 15:02:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsl2jw2z6HH6K for ; Tue, 18 Nov 2025 15:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsk6k4yz44FJ for ; Tue, 18 Nov 2025 15:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jK58DV4lCVatUIHufnesuLBHjpnrTPdMMtHFpQSV7mo=; b=ElpkNB9SS5wcBjWZ0wL3RnXVSoOaeFauaym93KbJbUwcC9DkN/S6nR6bIcSo9R0lXnN3Wn WZo45sPFptvOSqM2zOQc3R0TESFR6HZcyYYzQGLkB+yKoJe8WsUcLsKyHcCYda+HtYEnxq UayG2fc6/63+WsqqP86gJbA4nlaiyUUZN+CceRn23PJi+BhpXPqrvqCDTc3lhK+WaKMWIt mYRd8dKnAP4UPjB8bwWIFCNjRs21aMi381u8cnOB0lRErnePISMb29Xsk2Ce4di4ff+XF7 YF5+aQY6lGIicCInOlfDGDoH06CpcT+A9gPo0ry84795fhqJM+grxqMwUqOmFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jK58DV4lCVatUIHufnesuLBHjpnrTPdMMtHFpQSV7mo=; b=YmiJZ4EuWRF2QI7TZWSz4MpnQbvk4err++GH8KADHg62fHkT/3erbjoWmprQL+oiAdkwbT /sCv7js5sO7LsrET00XpIj1XpEmMXzp1yPpxCdXHidU4XUgeAFkffT6BEulkDa5G/GERYc sXeoY2bXpjomB4+R/6Os3qgAvUtaWl0+1EoOwxkyn7EvE9WIwqzUY1wgpDfCMHwZ+xCQNn og2OrlJulQ0eWbhduK1Yz8DnI7Hc+be8rUAzIw/snh0X6K3SMrTnHGo1UKOyJS26ccfxut dNDt0SMafiATJXICvPsH5dgaC7muViVJuobEATeJaFG6m3vOfqnZDggS9WKsxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478171; a=rsa-sha256; cv=none; b=uk1WcmRwD3l/KBtQIFWwiK1FACJbbLK73d5n3BKpGEfDrmTMfGTqltueG//kd17kjSu9lX 3Srncuqztw3r/3qxyQjTKoFN70BXryMVXbvay58JVcChJRNh2n3bagbr7ra9cLTO/SccVj FMRbqgmvV4tdHt72fmcVeqWlcmnHBxTr5ZnjF7F2nyU8aZw2b0h0LnjTNOF50grCOU9oxU WmCwwXfWuR7OH4nykW/C4bkkRVv3JoTNXqDSx7+Op2CoEeNhpiLqZVHwSRGFXez2cvgcjN cdCeOqxKARN2MZ2lmXV6jYwMXrSzeoc+v7NuIridbS071ph7SqKRCIimaxPh0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsk5Zqmz10KC for ; Tue, 18 Nov 2025 15:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38125 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 869faf4c4823 - stable/15 - amd64/vmm: Factor vcpu_notify_event() into two functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 869faf4c4823c78240724ad326df1968f8cb15a9 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:50 +0000 Message-Id: <691c8a9a.38125.4dd1dc60@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=869faf4c4823c78240724ad326df1968f8cb15a9 commit 869faf4c4823c78240724ad326df1968f8cb15a9 Author: Mark Johnston AuthorDate: 2025-11-04 13:52:21 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:31 +0000 amd64/vmm: Factor vcpu_notify_event() into two functions vcpu_notify_event() previously took a boolean parameter which determines whether the implementation should try to use a posted interrupt. On arm64 and riscv, the implementation of vcpu_notify_event() is otherwise identical to that of amd64. With the aim of deduplicating vcpu state management code, introduce a separate amd64-only function which tries to use posted interrupts. This requires some duplication with vcpu_notify_event_locked(), but only a little bit. Then, fix up callers. No functional change intended. Reviewed by: corvink, jhb MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53419 (cherry picked from commit 78a3a1e78ad8812bcf82e30b52ba2f21c49a3407) --- sys/amd64/include/vmm.h | 3 ++- sys/amd64/vmm/io/vlapic.c | 2 +- sys/amd64/vmm/vmm.c | 42 ++++++++++++++++++++++++------------------ sys/amd64/vmm/vmm_lapic.c | 2 +- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index ad67510fecf3..c7baa5e4c54a 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -383,7 +383,8 @@ vcpu_should_yield(struct vcpu *vcpu) #endif void *vcpu_stats(struct vcpu *vcpu); -void vcpu_notify_event(struct vcpu *vcpu, bool lapic_intr); +void vcpu_notify_event(struct vcpu *vcpu); +void vcpu_notify_lapic(struct vcpu *vcpu); struct vm_mem *vm_mem(struct vm *vm); struct vatpic *vm_atpic(struct vm *vm); struct vatpit *vm_atpit(struct vm *vm); diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c index 9879dfa164a4..afd5045de574 100644 --- a/sys/amd64/vmm/io/vlapic.c +++ b/sys/amd64/vmm/io/vlapic.c @@ -456,7 +456,7 @@ vlapic_fire_lvt(struct vlapic *vlapic, u_int lvt) return (0); } if (vlapic_set_intr_ready(vlapic, vec, false)) - vcpu_notify_event(vlapic->vcpu, true); + vcpu_notify_lapic(vlapic->vcpu); break; case APIC_LVT_DM_NMI: vm_inject_nmi(vlapic->vcpu); diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 473887240b9b..92d1b310f6ea 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -274,7 +274,7 @@ u_int vm_maxcpu; SYSCTL_UINT(_hw_vmm, OID_AUTO, maxcpu, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &vm_maxcpu, 0, "Maximum number of vCPUs"); -static void vcpu_notify_event_locked(struct vcpu *vcpu, bool lapic_intr); +static void vcpu_notify_event_locked(struct vcpu *vcpu); /* global statistics */ VMM_STAT(VCPU_MIGRATIONS, "vcpu migration across host cpus"); @@ -1033,7 +1033,7 @@ vcpu_wait_idle(struct vcpu *vcpu) KASSERT(vcpu->state != VCPU_IDLE, ("vcpu already idle")); vcpu->reqidle = 1; - vcpu_notify_event_locked(vcpu, false); + vcpu_notify_event_locked(vcpu); VMM_CTR1(vcpu, "vcpu state change from %s to " "idle requested", vcpu_state2str(vcpu->state)); msleep_spin(&vcpu->state, &vcpu->mtx, "vmstat", hz); @@ -1514,7 +1514,7 @@ vm_handle_suspend(struct vcpu *vcpu, bool *retu) */ for (i = 0; i < vm->maxcpus; i++) { if (CPU_ISSET(i, &vm->suspended_cpus)) { - vcpu_notify_event(vm_vcpu(vm, i), false); + vcpu_notify_event(vm_vcpu(vm, i)); } } @@ -1588,7 +1588,7 @@ vm_suspend(struct vm *vm, enum vm_suspend_how how) */ for (i = 0; i < vm->maxcpus; i++) { if (CPU_ISSET(i, &vm->active_cpus)) - vcpu_notify_event(vm_vcpu(vm, i), false); + vcpu_notify_event(vm_vcpu(vm, i)); } return (0); @@ -2068,7 +2068,7 @@ vm_inject_nmi(struct vcpu *vcpu) { vcpu->nmi_pending = 1; - vcpu_notify_event(vcpu, false); + vcpu_notify_event(vcpu); return (0); } @@ -2095,7 +2095,7 @@ vm_inject_extint(struct vcpu *vcpu) { vcpu->extint_pending = 1; - vcpu_notify_event(vcpu, false); + vcpu_notify_event(vcpu); return (0); } @@ -2266,14 +2266,14 @@ vm_suspend_cpu(struct vm *vm, struct vcpu *vcpu) vm->debug_cpus = vm->active_cpus; for (int i = 0; i < vm->maxcpus; i++) { if (CPU_ISSET(i, &vm->active_cpus)) - vcpu_notify_event(vm_vcpu(vm, i), false); + vcpu_notify_event(vm_vcpu(vm, i)); } } else { if (!CPU_ISSET(vcpu->vcpuid, &vm->active_cpus)) return (EINVAL); CPU_SET_ATOMIC(vcpu->vcpuid, &vm->debug_cpus); - vcpu_notify_event(vcpu, false); + vcpu_notify_event(vcpu); } return (0); } @@ -2381,7 +2381,7 @@ vm_set_x2apic_state(struct vcpu *vcpu, enum x2apic_state state) * to the host_cpu to cause the vcpu to trap into the hypervisor. */ static void -vcpu_notify_event_locked(struct vcpu *vcpu, bool lapic_intr) +vcpu_notify_event_locked(struct vcpu *vcpu) { int hostcpu; @@ -2389,12 +2389,7 @@ vcpu_notify_event_locked(struct vcpu *vcpu, bool lapic_intr) if (vcpu->state == VCPU_RUNNING) { KASSERT(hostcpu != NOCPU, ("vcpu running on invalid hostcpu")); if (hostcpu != curcpu) { - if (lapic_intr) { - vlapic_post_intr(vcpu->vlapic, hostcpu, - vmm_ipinum); - } else { - ipi_cpu(hostcpu, vmm_ipinum); - } + ipi_cpu(hostcpu, vmm_ipinum); } else { /* * If the 'vcpu' is running on 'curcpu' then it must @@ -2412,10 +2407,21 @@ vcpu_notify_event_locked(struct vcpu *vcpu, bool lapic_intr) } void -vcpu_notify_event(struct vcpu *vcpu, bool lapic_intr) +vcpu_notify_event(struct vcpu *vcpu) +{ + vcpu_lock(vcpu); + vcpu_notify_event_locked(vcpu); + vcpu_unlock(vcpu); +} + +void +vcpu_notify_lapic(struct vcpu *vcpu) { vcpu_lock(vcpu); - vcpu_notify_event_locked(vcpu, lapic_intr); + if (vcpu->state == VCPU_RUNNING && vcpu->hostcpu != curcpu) + vlapic_post_intr(vcpu->vlapic, vcpu->hostcpu, vmm_ipinum); + else + vcpu_notify_event_locked(vcpu); vcpu_unlock(vcpu); } @@ -2477,7 +2483,7 @@ restart: */ for (i = 0; i < vm->maxcpus; i++) { if (CPU_ISSET(i, &dest)) - vcpu_notify_event(vm_vcpu(vm, i), false); + vcpu_notify_event(vm_vcpu(vm, i)); } return (vm_handle_rendezvous(vcpu)); diff --git a/sys/amd64/vmm/vmm_lapic.c b/sys/amd64/vmm/vmm_lapic.c index 0cae01f172ec..63bdee69bb59 100644 --- a/sys/amd64/vmm/vmm_lapic.c +++ b/sys/amd64/vmm/vmm_lapic.c @@ -61,7 +61,7 @@ lapic_set_intr(struct vcpu *vcpu, int vector, bool level) vlapic = vm_lapic(vcpu); if (vlapic_set_intr_ready(vlapic, vector, level)) - vcpu_notify_event(vcpu, true); + vcpu_notify_lapic(vcpu); return (0); } From nobody Tue Nov 18 15:02:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsm1qTTz6HGtB for ; Tue, 18 Nov 2025 15:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsl6h23z44Vg for ; Tue, 18 Nov 2025 15:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VV3h3ndPHRTfDcS2C7fsN5y/YE0y4zVZYS6uQdysNK0=; b=Ghr7PuOji8VFu5kef/yd2s9hdxaQ7ZD/avwJWORI94cPLf31UOvGZeS33rneHCe1mKYffp rdNdxd/uWcyVXhMlTlbUa/+ST7wRV7ZiRxj30OIrB/h1/1blCm7RCosEV0zeHl8/r8YrKB jklncVps5Vbq3AYH+6N+jSss1AyyNS3m/r2lQIdbew/kgYTvWOQ52zKikdqKVTUpIp2MKb /T27Utxv7FKptO8bTWoW9FxeXWjkHHSyMdmFN/g8S8MaCMFdF28hCWomi7Qhn3z/7US2l9 5mUWOY5caM54aZxUz1zKWF/IBlvWBH7nIcRinngBFI5IGrROp/O61zx2QxdoVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VV3h3ndPHRTfDcS2C7fsN5y/YE0y4zVZYS6uQdysNK0=; b=m9prQEb7gr/oCLizkrn0tLfUB1yV31J/WVzpQS88zKuBFgtBKbunerRWbvzJQ/ZaBZ1hhp ud2KAj2s8/xePgemzAqJpfK3eTGC0DgTs9a0XX8Cq4DVW11sfoHh+13PD4FxX44E/fhL0q dkFa+rp2X/OTzz07TZth8fXKXJ4/ZqasoEP42UaxUsicI1JppAlKiDWH690odSPk50XG/O cYigKYsBoCUxArecKgSsIMlijfO3jeWSP7f2jZxBlzitWW1qT2LB9Zj4j37PpCS84g9HhK 4/8ko4QE5Y73lJZSBNXtjf6TXO9TcJ5XcD4MK4PZzKdVYrPsFsxOF2wVsojqmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478172; a=rsa-sha256; cv=none; b=pM9ShSf0I7KD9OJtfkNq7g3JGRlNXdeBAiqhtud5zqqu+oH09p8ISYtSE52dVTp8KYOOTn LAdjmA8OceLcDwSAiHriHVMmwVDVMaIe8KacLpegZ3egQhu7CS/rpLQ6raS/w0n6E+pHmT AxjTIQyaF1Rv+qVUmCX3pPYgNIhjeVucz1utoK6F0nFL+HKz6t5vGol6aRDCf1+IDFts3E UXuR1mU42iob0fzpAuiRDOit0MPF/woRn8kDvO7p/Y8k2keFCKRC47nsQEYPq+Opy9dwLL MnLOLfNZunEjZ3JLoORqtGib2rlO3I4VYtLk2pY8SH1n2EXhkf7UeJhMNyZH9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsl61Zmz10HC for ; Tue, 18 Nov 2025 15:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36f50 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: af1dd9cf3d9b - stable/15 - amd64/vmm: Remove useless global variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: af1dd9cf3d9b99234f30a9325973daf488c0e40e Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:51 +0000 Message-Id: <691c8a9b.36f50.11f8683c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=af1dd9cf3d9b99234f30a9325973daf488c0e40e commit af1dd9cf3d9b99234f30a9325973daf488c0e40e Author: Mark Johnston AuthorDate: 2025-11-04 13:54:07 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:31 +0000 amd64/vmm: Remove useless global variables No functional change intended. Reviewed by: corvink, jhb, emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53420 (cherry picked from commit 3faad9e26018dfc0ab6da21a53c0310656187d7b) --- sys/amd64/vmm/vmm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 92d1b310f6ea..8f357fa6fb0f 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -573,12 +573,6 @@ vm_unlock_vcpus(struct vm *vm) sx_unlock(&vm->vcpus_init_lock); } -/* - * The default CPU topology is a single thread per package. - */ -u_int cores_per_package = 1; -u_int threads_per_core = 1; - int vm_create(const char *name, struct vm **retvm) { @@ -609,8 +603,8 @@ vm_create(const char *name, struct vm **retvm) M_ZERO); vm->sockets = 1; - vm->cores = cores_per_package; /* XXX backwards compatibility */ - vm->threads = threads_per_core; /* XXX backwards compatibility */ + vm->cores = 1; /* XXX backwards compatibility */ + vm->threads = 1; /* XXX backwards compatibility */ vm->maxcpus = vm_maxcpu; vm_init(vm, true); From nobody Tue Nov 18 15:02:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsn2KDgz6HGtM for ; Tue, 18 Nov 2025 15:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsn08MCz44bW for ; Tue, 18 Nov 2025 15:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/fzUWWi2HLhdpgHznJS9H6PupmmtFdRocZcdnaJnixQ=; b=ywqtEgPfZECEneA81+gxZvwpM7NkvPU3ei7gSBQdoDmTxdvQbFf+m0lr0u2lFzehLeQrUe 27FVBP7qgIsix7QthEPViXY/z329sJF8PfsjD5rJR96Azge9OEe6VdR0bofkLrS0B655Z4 mP9cXYMmknEj+PFsZx68evkdmM+w3bsVTPkVcw+stCvlG7k9wKTfpXwIGpwemg5x+NymXT ilU3GloGDI9rMM+O2Zgi7djG+UQj4oPmCA5nSq8+iZTRlOwdP9yuSjjajWOWweZXWpRsCS eN8shvvmQwaWGaoBU8ek/Ya6LZzolvZUi51QBgUZUxMZ8luXTrx0EURaTK5rZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/fzUWWi2HLhdpgHznJS9H6PupmmtFdRocZcdnaJnixQ=; b=m32qYrkqExFSuSGxAd93Gp2i2KrYa/hng8HDZ2ML6p2usJD4s9TEGrmhz3+eybFp0bpkJE a4pmOYoT+R3mAIyQ333UUW7Ke9nqbleGRxGhVoAhdVAD6/G4gEZDM8wt4yDWQiNlYhDw+7 iOJkjCpSX54636mqCcDn+3zZ61GlKGV6QNHI3TS/25v8jhKuYW4Ry0IJTqIjzpC7dMkd9j s+kEY3r0IVm5ZB3WUZKYO6HTdAvXZ4KXxmVNLIjftDyoDXfbZRXpDxVM8L0HKxLBTN0Vny tCAU/bTiFQLumroERdVQhEEBEYqzNzmc+Ps3kinbp7tw5d0R0wZc9tmAvWyN9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478173; a=rsa-sha256; cv=none; b=Sf7Q28mZOgh7ZutmR7SNvtdaJzwBlfbidGp5yTN8JCt1YRblkvYqm3EKJ1vBbe5tpWjq32 NPUq5HCCn5LPUCGS7diK85xknC6MZLUHClDdsdoP8lMsEMOxLZ9L5IAt1kHYJNnu4lLJ8M 1NkaSQwNzDbhyVCgbdsk4tjGQTwfZ+99TbQzYJz5tmOM/50yy4jCdj25PTd8lMLLL3kqqA uOMcyw0uf0ybygY1y+mpzhtyEE/7hYT9DgExtPjzjZpBHQZ2XuLrzy6rn/s7iXqf8ITYJs myX0NZM3kB4nIG7ay/cLCy2kU+AiOgsLr7wk+zi3RKEdMVjkCEbZ3bOOPknhoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsm6rFPzyrP for ; Tue, 18 Nov 2025 15:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38309 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 16fe30d92da3 - stable/15 - vmm: Move the module load handler to vmm_dev.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 16fe30d92da3e3354635d5df28752373f2e07ebe Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:52 +0000 Message-Id: <691c8a9c.38309.cb60f52@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=16fe30d92da3e3354635d5df28752373f2e07ebe commit 16fe30d92da3e3354635d5df28752373f2e07ebe Author: Mark Johnston AuthorDate: 2025-11-04 13:54:27 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:32 +0000 vmm: Move the module load handler to vmm_dev.c Move the vmm_initialized check out of vm_create() and into the legacy sysctl handler. If vmm_initialized is false, /dev/vmmctl will not be available and so cannot be used to create VMs. Introduce new MD vmm_modinit() and vmm_modcleanup() routines which handle MD (de)initialization. No functional change intended. Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53421 (cherry picked from commit e758074458df3b61773b7678ff47c4a835365d21) --- sys/amd64/vmm/vmm.c | 83 +++++++-------------------------------------------- sys/arm64/vmm/vmm.c | 73 ++++++-------------------------------------- sys/dev/vmm/vmm_dev.c | 65 ++++++++++++++++++++++++++++++++++++++-- sys/dev/vmm/vmm_dev.h | 5 ++-- sys/riscv/vmm/vmm.c | 65 ++++------------------------------------ 5 files changed, 90 insertions(+), 201 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 8f357fa6fb0f..824c725db0ab 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -189,8 +188,6 @@ struct vm { #define VMM_CTR4(vcpu, format, p1, p2, p3, p4) \ VCPU_CTR4((vcpu)->vm, (vcpu)->vcpuid, format, p1, p2, p3, p4) -static int vmm_initialized; - static void vmmops_panic(void); static void @@ -402,8 +399,8 @@ vm_exitinfo_cpuset(struct vcpu *vcpu) return (&vcpu->exitinfo_cpuset); } -static int -vmm_init(void) +int +vmm_modinit(void) { if (!vmm_is_hw_supported()) return (ENXIO); @@ -431,70 +428,17 @@ vmm_init(void) return (vmmops_modinit(vmm_ipinum)); } -static int -vmm_handler(module_t mod, int what, void *arg) +int +vmm_modcleanup(void) { - int error; - - switch (what) { - case MOD_LOAD: - if (vmm_is_hw_supported()) { - error = vmmdev_init(); - if (error != 0) - break; - error = vmm_init(); - if (error == 0) - vmm_initialized = 1; - else - (void)vmmdev_cleanup(); - } else { - error = ENXIO; - } - break; - case MOD_UNLOAD: - if (vmm_is_hw_supported()) { - error = vmmdev_cleanup(); - if (error == 0) { - vmm_suspend_p = NULL; - vmm_resume_p = NULL; - iommu_cleanup(); - if (vmm_ipinum != IPI_AST) - lapic_ipi_free(vmm_ipinum); - error = vmmops_modcleanup(); - /* - * Something bad happened - prevent new - * VMs from being created - */ - if (error) - vmm_initialized = 0; - } - } else { - error = 0; - } - break; - default: - error = 0; - break; - } - return (error); + vmm_suspend_p = NULL; + vmm_resume_p = NULL; + iommu_cleanup(); + if (vmm_ipinum != IPI_AST) + lapic_ipi_free(vmm_ipinum); + return (vmmops_modcleanup()); } -static moduledata_t vmm_kmod = { - "vmm", - vmm_handler, - NULL -}; - -/* - * vmm initialization has the following dependencies: - * - * - VT-x initialization requires smp_rendezvous() and therefore must happen - * after SMP is fully functional (after SI_SUB_SMP). - * - vmm device initialization requires an initialized devfs. - */ -DECLARE_MODULE(vmm, vmm_kmod, MAX(SI_SUB_SMP, SI_SUB_DEVFS) + 1, SI_ORDER_ANY); -MODULE_VERSION(vmm, 1); - static void vm_init(struct vm *vm, bool create) { @@ -579,13 +523,6 @@ vm_create(const char *name, struct vm **retvm) struct vm *vm; int error; - /* - * If vmm.ko could not be successfully initialized then don't attempt - * to create the virtual machine. - */ - if (!vmm_initialized) - return (ENXIO); - if (name == NULL || strnlen(name, VM_MAX_NAMELEN + 1) == VM_MAX_NAMELEN + 1) return (EINVAL); diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index 14ea26c3668c..0cbc2359f1e8 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -139,8 +138,6 @@ struct vm { struct sx vcpus_init_lock; /* (o) */ }; -static bool vmm_initialized = false; - static int vm_handle_wfi(struct vcpu *vcpu, struct vm_exit *vme, bool *retu); @@ -324,11 +321,15 @@ vmm_unsupported_quirk(void) return (0); } -static int -vmm_init(void) +int +vmm_modinit(void) { int error; + error = vmm_unsupported_quirk(); + if (error != 0) + return (error); + vm_maxcpu = mp_ncpus; TUNABLE_INT_FETCH("hw.vmm.maxcpu", &vm_maxcpu); @@ -346,61 +347,12 @@ vmm_init(void) return (vmmops_modinit(0)); } -static int -vmm_handler(module_t mod, int what, void *arg) +int +vmm_modcleanup(void) { - int error; - - switch (what) { - case MOD_LOAD: - error = vmm_unsupported_quirk(); - if (error != 0) - break; - error = vmmdev_init(); - if (error != 0) - break; - error = vmm_init(); - if (error == 0) - vmm_initialized = true; - else - (void)vmmdev_cleanup(); - break; - case MOD_UNLOAD: - error = vmmdev_cleanup(); - if (error == 0 && vmm_initialized) { - error = vmmops_modcleanup(); - if (error) { - /* - * Something bad happened - prevent new - * VMs from being created - */ - vmm_initialized = false; - } - } - break; - default: - error = 0; - break; - } - return (error); + return (vmmops_modcleanup()); } -static moduledata_t vmm_kmod = { - "vmm", - vmm_handler, - NULL -}; - -/* - * vmm initialization has the following dependencies: - * - * - HYP initialization requires smp_rendezvous() and therefore must happen - * after SMP is fully functional (after SI_SUB_SMP). - * - vmm device initialization requires an initialized devfs. - */ -DECLARE_MODULE(vmm, vmm_kmod, MAX(SI_SUB_SMP, SI_SUB_DEVFS) + 1, SI_ORDER_ANY); -MODULE_VERSION(vmm, 1); - static void vm_init(struct vm *vm, bool create) { @@ -486,13 +438,6 @@ vm_create(const char *name, struct vm **retvm) struct vm *vm; int error; - /* - * If vmm.ko could not be successfully initialized then don't attempt - * to create the virtual machine. - */ - if (!vmm_initialized) - return (ENXIO); - if (name == NULL || strlen(name) >= VM_MAX_NAMELEN) return (EINVAL); diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index bd20acac1d2d..08a53bb62a85 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -78,6 +79,8 @@ struct vmmdev_softc { int flags; }; +static bool vmm_initialized = false; + static SLIST_HEAD(, vmmdev_softc) head; static unsigned pr_allow_flag; @@ -1021,6 +1024,9 @@ sysctl_vmm_create(SYSCTL_HANDLER_ARGS) char *buf; int error, buflen; + if (!vmm_initialized) + return (ENXIO); + error = vmm_priv_check(req->td->td_ucred); if (error != 0) return (error); @@ -1106,7 +1112,7 @@ static struct cdevsw vmmctlsw = { .d_ioctl = vmmctl_ioctl, }; -int +static int vmmdev_init(void) { int error; @@ -1122,7 +1128,7 @@ vmmdev_init(void) return (error); } -int +static int vmmdev_cleanup(void) { sx_xlock(&vmmdev_mtx); @@ -1139,6 +1145,61 @@ vmmdev_cleanup(void) return (0); } +static int +vmm_handler(module_t mod, int what, void *arg) +{ + int error; + + switch (what) { + case MOD_LOAD: + error = vmmdev_init(); + if (error != 0) + break; + error = vmm_modinit(); + if (error == 0) + vmm_initialized = true; + else { + error = vmmdev_cleanup(); + KASSERT(error == 0, + ("%s: vmmdev_cleanup failed: %d", __func__, error)); + } + break; + case MOD_UNLOAD: + error = vmmdev_cleanup(); + if (error == 0 && vmm_initialized) { + error = vmm_modcleanup(); + if (error) { + /* + * Something bad happened - prevent new + * VMs from being created + */ + vmm_initialized = false; + } + } + break; + default: + error = 0; + break; + } + return (error); +} + +static moduledata_t vmm_kmod = { + "vmm", + vmm_handler, + NULL +}; + +/* + * vmm initialization has the following dependencies: + * + * - Initialization requires smp_rendezvous() and therefore must happen + * after SMP is fully functional (after SI_SUB_SMP). + * - vmm device initialization requires an initialized devfs. + */ +DECLARE_MODULE(vmm, vmm_kmod, MAX(SI_SUB_SMP, SI_SUB_DEVFS) + 1, SI_ORDER_ANY); +MODULE_VERSION(vmm, 1); + static int devmem_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, vm_size_t len, struct vm_object **objp, int nprot) diff --git a/sys/dev/vmm/vmm_dev.h b/sys/dev/vmm/vmm_dev.h index 2881a7063565..c691341d4350 100644 --- a/sys/dev/vmm/vmm_dev.h +++ b/sys/dev/vmm/vmm_dev.h @@ -18,8 +18,9 @@ struct thread; struct vm; struct vcpu; -int vmmdev_init(void); -int vmmdev_cleanup(void); +int vmm_modinit(void); +int vmm_modcleanup(void); + int vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, int fflag, struct thread *td); diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index a9eb9d144336..f2995b276072 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -133,8 +132,6 @@ struct vm { struct sx vcpus_init_lock; /* (o) */ }; -static bool vmm_initialized = false; - static MALLOC_DEFINE(M_VMM, "vmm", "vmm"); /* statistics */ @@ -210,10 +207,9 @@ vm_exitinfo(struct vcpu *vcpu) return (&vcpu->exitinfo); } -static int -vmm_init(void) +int +vmm_modinit(void) { - vm_maxcpu = mp_ncpus; TUNABLE_INT_FETCH("hw.vmm.maxcpu", &vm_maxcpu); @@ -229,56 +225,12 @@ vmm_init(void) return (vmmops_modinit()); } -static int -vmm_handler(module_t mod, int what, void *arg) +int +vmm_modcleanup(void) { - int error; - - switch (what) { - case MOD_LOAD: - error = vmmdev_init(); - if (error != 0) - break; - error = vmm_init(); - if (error == 0) - vmm_initialized = true; - else - (void)vmmdev_cleanup(); - break; - case MOD_UNLOAD: - error = vmmdev_cleanup(); - if (error == 0 && vmm_initialized) { - error = vmmops_modcleanup(); - if (error) { - /* - * Something bad happened - prevent new - * VMs from being created - */ - vmm_initialized = false; - } - } - break; - default: - error = 0; - break; - } - return (error); + return (vmmops_modcleanup()); } -static moduledata_t vmm_kmod = { - "vmm", - vmm_handler, - NULL -}; - -/* - * vmm initialization has the following dependencies: - * - * - vmm device initialization requires an initialized devfs. - */ -DECLARE_MODULE(vmm, vmm_kmod, SI_SUB_DEVFS + 1, SI_ORDER_ANY); -MODULE_VERSION(vmm, 1); - static void vm_init(struct vm *vm, bool create) { @@ -359,13 +311,6 @@ vm_create(const char *name, struct vm **retvm) struct vm *vm; int error; - /* - * If vmm.ko could not be successfully initialized then don't attempt - * to create the virtual machine. - */ - if (!vmm_initialized) - return (ENXIO); - if (name == NULL || strlen(name) >= VM_MAX_NAMELEN) return (EINVAL); From nobody Tue Nov 18 15:02:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsk3WPtz6HHCN for ; Tue, 18 Nov 2025 15:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsj5SPTz44Ky for ; Tue, 18 Nov 2025 15:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hrNYWSw9SKkWnDVl1Ho0LQgtk1L4AurnXD8KnQwDDNE=; b=XjzyXjxJQh6CSwH6vRrQN4plhPFCDpbBzYbImquQ6/x7PhuN3KOVxzANODl3bkk/jr81eP eH/mCkSLn4j6S3LpquMQNVhMm36zRb7PluIaREAdaqXKzjpZVpFDtaHZ7Ne7kUYcGkB4KC /lrydEFdepu45S2Nd50b71COiP99N7mvdqhEpM5SjzZbnNqs5KP4XrCgwLuiNQLQ3+vA+x 7TKur+a/vQ3FaQ9QMEgKV64pMXUUoYxfsYa7nDIW4QxH0aSPk7/h/YVEjTaEEkGYgkPjKK K5jFvdUDvs1KnH0rrGz4ZLLxM2Gw/0nK/MJB+b9xYyl+Q7sZR/teU6stJrsAkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hrNYWSw9SKkWnDVl1Ho0LQgtk1L4AurnXD8KnQwDDNE=; b=gKBBUzntorPOSb0na8T6nnHVC66YvZVbYS+31vK/pbGbXoQ3F8EbGctyZCWURIl6lUcZ3K F/+V8KxNxUV1ByH//IkvCUm9A8OSLSdNzSr5xW2DBiBIbTm9JWK/9K+4XPLTdb92n5TWZL v9PUEZVYvS2728lYJ+aXDlCcLwx3vqTeAYPU/4PXEGV3zeF5MhW+ZipIHqvuWDKrtkaGaz t0pZ2UMNLJVcHgo2D0VKfXTiSKcErban5ZTaf+tXI0rFN99IEpi45NBjdPfLg6SPhNDVmi 9tiEHUtnT1iMHqZ+jUwdxZ/lBkn1KeQvbS2lfy5Ldwu+gf1hrsNjQl3s1U/hlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478169; a=rsa-sha256; cv=none; b=CWWjP+Fg78MIubUnhYHvwIYkkdRX1d4ztpHb8+i+12mtxoK5LR8t6qKmKPzL88IVaxeoex s+Q9DCFJXxNlK0DJIw1IId4hCQFGuWesftipoV4ucBAkRj4Fb9ly+yFsRmosw98Ra6i27/ 041a/GaWPjAAt2UqNARv93q5ZlY/fPoythjutsuHVCoACa0X3hOK9STWrhCYg2qpCYn7Sf qbdDLhHLUpCmOOWDovVEzrayLEVBN0YGApnc4m94KbUEyPTE1D3fojSRPXn1xc0OUy1ia4 3C8GI09q2xyAL0kZYzuLB/GU1Y8/T2k+R1NLfo0MtGiAVSK+ERur5c7M87iC/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsj4lkWz1073 for ; Tue, 18 Nov 2025 15:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 368cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 557047e9fa51 - stable/15 - vmm: Simplify the VM_ALLOC_MEMSEG ioctl a bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 557047e9fa51fb697551ef3a717c3971aafeb21b Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:49 +0000 Message-Id: <691c8a99.368cb.3896748a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=557047e9fa51fb697551ef3a717c3971aafeb21b commit 557047e9fa51fb697551ef3a717c3971aafeb21b Author: Mark Johnston AuthorDate: 2025-11-04 13:52:01 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:27 +0000 vmm: Simplify the VM_ALLOC_MEMSEG ioctl a bit We can free the mask earlier, simplifying some error paths. No functional change intended. Reviewed by: corvink, jhb, emaste Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53418 (cherry picked from commit c3f41c02c9a5bf45504af59c351f0ae336719753) --- sys/dev/vmm/vmm_dev.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index ebbceb25b69e..bd20acac1d2d 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -619,20 +619,16 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, } error = domainset_populate(&domain, mask, mseg->ds_policy, mseg->ds_mask_size); - if (error) { - free(mask, M_VMMDEV); + free(mask, M_VMMDEV); + if (error) break; - } domainset = domainset_create(&domain); if (domainset == NULL) { error = EINVAL; - free(mask, M_VMMDEV); break; } - free(mask, M_VMMDEV); } error = alloc_memseg(sc, mseg, sizeof(mseg->name), domainset); - break; } case VM_GET_MEMSEG: From nobody Tue Nov 18 15:02:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsp3cnTz6HHFd for ; Tue, 18 Nov 2025 15:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsp1B4hz44nQ for ; Tue, 18 Nov 2025 15:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1/dq9dl6/nkOIVTyxAw7EJQqccp/+lpNLATEaSdiw0Q=; b=WKj+BRIBrUPX+eJtK6S56EKFn9RWXMx9V18B6yYInvuiLFLKdiHAA3YBRQzKTloV8YrbmP svDFKU6jsHWCJMFo0UVHt2t5ojcOuO0ITrcxxAn3TPat4aB9j9pBfPY6D32NmWnMESYH9J Us+4dHRi1y/k9C5wNN2DR2JX39ger2lBGT0uhR1dEEfjP582iPNeiicdcvSxnn/3mES1yt ZBk3FScRqHw2pvcz4NKtgBl7Ij6hbO3JSjaXBvoTXNYVSlms6j2ZyN0dq+AWh9jWHtiClv r7tU/U0KQiWDHdCdETaCH8U+tbYOy7njFY6YM1RVJAqRhYv9hYzBd8tBCsyTHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1/dq9dl6/nkOIVTyxAw7EJQqccp/+lpNLATEaSdiw0Q=; b=lCrdtRN2fWiACuxD+CrCcY22xUQr35rNTceMZDQASbLuc3Ey4Vy5i65adklW4viUbnUggk W3ACgKz5Ur7YjS0iK28BHKKgY/DIcAlTnix1/aYgksel5Gne4P36sXwvHzbLxL/HRFdJuM uwnJagkwSaiKI+bjulBhLvVPaJkcBiOXLTYoCX1Q1guwki/jD8rMtUHnGZIgae09Fzsbl2 b1kH/3N7DytK0bmYXIIVKIpZYJ1c3IpQn+D2GVlyIQP5XG+kznzSfU1DhmZHCowyIrDoqs xJkZs47g4XH/Kxz/G2G/XGWwUR3rrOcipAfG3f6MiW554aFarj14dGGhsdtgTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478174; a=rsa-sha256; cv=none; b=dTYJ3VOMZLiXFPMkbO6zLYTRxObNUcSwa99UyG6Z1c6rRn7gBmaMYW6Afz3Gd0qTIYPT37 OLfpx6r1Z1JJP+MKcTCfIifHwRgEDH2GVvLPr/NRYjkY5MofFJ95o/lDSVWQQ7xO0TJJM5 HdtAMgrshNb1AKsoedrIL3St2ZfyNAzqLu8z3qPrH6KDNOuEyrPu2VhH/sLQ1EFf+n+nxr JC6xP1jcPZ74ZewyNMVq2rQEWWj8eiCDGv/5fQATRUjppnAFdCBqjXrX6lY8v9f3ernt+w j2gnqlkAIKjYnt9GM7W7QYvcWc73m/lWZBT/CMdRZSeyuOH0UuooEvqAxPsA+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsp0WP9zyrQ for ; Tue, 18 Nov 2025 15:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 368cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 272c8c2b7cfa - stable/15 - vmm: Consolidate VM name length checking List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 272c8c2b7cfa75c1a8fd0b3a1d701f5f8b027635 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:54 +0000 Message-Id: <691c8a9e.368cf.7222eb3a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=272c8c2b7cfa75c1a8fd0b3a1d701f5f8b027635 commit 272c8c2b7cfa75c1a8fd0b3a1d701f5f8b027635 Author: Mark Johnston AuthorDate: 2025-11-04 13:55:07 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:33 +0000 vmm: Consolidate VM name length checking vm_create() is only called from one place. Rather than having similar checks everywhere, move them to vmmdev_create(). We can safely assume that the name is nul-terminated, the vmmctl ioctl handler and the legacy sysctl handler ensure this. So, don't bother with strnlen(). Finally, make sure that the name buffers are the same size on all platforms. VM_MAX_NAMELEN is supposed to be the maximum, not including the nul terminator. Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53422 (cherry picked from commit 7377c87e467343e71b3e803708b98e04ea8e84bd) --- sys/amd64/include/vmm.h | 26 -------------------------- sys/amd64/include/vmm_dev.h | 2 ++ sys/amd64/vmm/vmm.c | 4 ---- sys/arm64/include/vmm.h | 21 --------------------- sys/arm64/include/vmm_dev.h | 2 ++ sys/arm64/vmm/vmm.c | 5 +---- sys/dev/vmm/vmm_dev.c | 3 +++ sys/dev/vmm/vmm_dev.h | 3 +++ sys/dev/vmm/vmm_param.h | 33 +++++++++++++++++++++++++++++++++ sys/riscv/include/vmm.h | 3 --- sys/riscv/include/vmm_dev.h | 2 ++ sys/riscv/vmm/vmm.c | 5 +---- 12 files changed, 47 insertions(+), 62 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index c7baa5e4c54a..0a2d5a80f2b0 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -122,33 +122,7 @@ enum x2apic_state { #define VM_INTINFO_HWEXCEPTION (3 << 8) #define VM_INTINFO_SWINTR (4 << 8) -/* - * The VM name has to fit into the pathname length constraints of devfs, - * governed primarily by SPECNAMELEN. The length is the total number of - * characters in the full path, relative to the mount point and not - * including any leading '/' characters. - * A prefix and a suffix are added to the name specified by the user. - * The prefix is usually "vmm/" or "vmm.io/", but can be a few characters - * longer for future use. - * The suffix is a string that identifies a bootrom image or some similar - * image that is attached to the VM. A separator character gets added to - * the suffix automatically when generating the full path, so it must be - * accounted for, reducing the effective length by 1. - * The effective length of a VM name is 229 bytes for FreeBSD 13 and 37 - * bytes for FreeBSD 12. A minimum length is set for safety and supports - * a SPECNAMELEN as small as 32 on old systems. - */ -#define VM_MAX_PREFIXLEN 10 -#define VM_MAX_SUFFIXLEN 15 -#define VM_MIN_NAMELEN 6 -#define VM_MAX_NAMELEN \ - (SPECNAMELEN - VM_MAX_PREFIXLEN - VM_MAX_SUFFIXLEN - 1) - #ifdef _KERNEL -#include - -CTASSERT(VM_MAX_NAMELEN >= VM_MIN_NAMELEN); - struct vm; struct vm_exception; struct vm_mem; diff --git a/sys/amd64/include/vmm_dev.h b/sys/amd64/include/vmm_dev.h index 441330fd57b8..f1c07a983a4b 100644 --- a/sys/amd64/include/vmm_dev.h +++ b/sys/amd64/include/vmm_dev.h @@ -34,6 +34,8 @@ #include #include +#include + struct vm_memmap { vm_paddr_t gpa; int segid; /* memory segment */ diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 824c725db0ab..a989f93b8728 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -523,10 +523,6 @@ vm_create(const char *name, struct vm **retvm) struct vm *vm; int error; - if (name == NULL || strnlen(name, VM_MAX_NAMELEN + 1) == - VM_MAX_NAMELEN + 1) - return (EINVAL); - vm = malloc(sizeof(struct vm), M_VM, M_WAITOK | M_ZERO); error = vm_mem_init(&vm->mem, 0, VM_MAXUSER_ADDRESS_LA48); if (error != 0) { diff --git a/sys/arm64/include/vmm.h b/sys/arm64/include/vmm.h index 696a69669a2a..e67540eac66d 100644 --- a/sys/arm64/include/vmm.h +++ b/sys/arm64/include/vmm.h @@ -106,27 +106,6 @@ enum vm_reg_name { #define VM_GUEST_BASE_IPA 0x80000000UL /* Guest kernel start ipa */ -/* - * The VM name has to fit into the pathname length constraints of devfs, - * governed primarily by SPECNAMELEN. The length is the total number of - * characters in the full path, relative to the mount point and not - * including any leading '/' characters. - * A prefix and a suffix are added to the name specified by the user. - * The prefix is usually "vmm/" or "vmm.io/", but can be a few characters - * longer for future use. - * The suffix is a string that identifies a bootrom image or some similar - * image that is attached to the VM. A separator character gets added to - * the suffix automatically when generating the full path, so it must be - * accounted for, reducing the effective length by 1. - * The effective length of a VM name is 229 bytes for FreeBSD 13 and 37 - * bytes for FreeBSD 12. A minimum length is set for safety and supports - * a SPECNAMELEN as small as 32 on old systems. - */ -#define VM_MAX_PREFIXLEN 10 -#define VM_MAX_SUFFIXLEN 15 -#define VM_MAX_NAMELEN \ - (SPECNAMELEN - VM_MAX_PREFIXLEN - VM_MAX_SUFFIXLEN - 1) - #ifdef _KERNEL struct vm; struct vm_exception; diff --git a/sys/arm64/include/vmm_dev.h b/sys/arm64/include/vmm_dev.h index 219f1116c728..289ff0fe1fc9 100644 --- a/sys/arm64/include/vmm_dev.h +++ b/sys/arm64/include/vmm_dev.h @@ -31,6 +31,8 @@ #include +#include + struct vm_memmap { vm_paddr_t gpa; int segid; /* memory segment */ diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index 0cbc2359f1e8..dfaba058e205 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -125,7 +125,7 @@ struct vm { volatile cpuset_t suspended_cpus; /* (i) suspended vcpus */ volatile cpuset_t halted_cpus; /* (x) cpus in a hard halt */ struct vm_mem mem; /* (i) guest memory */ - char name[VM_MAX_NAMELEN]; /* (o) virtual machine name */ + char name[VM_MAX_NAMELEN + 1]; /* (o) virtual machine name */ struct vcpu **vcpu; /* (i) guest vcpus */ struct vmm_mmio_region mmio_region[VM_MAX_MMIO_REGIONS]; /* (o) guest MMIO regions */ @@ -438,9 +438,6 @@ vm_create(const char *name, struct vm **retvm) struct vm *vm; int error; - if (name == NULL || strlen(name) >= VM_MAX_NAMELEN) - return (EINVAL); - vm = malloc(sizeof(struct vm), M_VMM, M_WAITOK | M_ZERO); error = vm_mem_init(&vm->mem, 0, 1ul << 39); if (error != 0) { diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 08a53bb62a85..09093fe44e2b 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -984,6 +984,9 @@ vmmdev_create(const char *name, struct ucred *cred) struct vm *vm; int error; + if (name == NULL || strlen(name) > VM_MAX_NAMELEN) + return (EINVAL); + sx_xlock(&vmmdev_mtx); sc = vmmdev_lookup(name, cred); if (sc != NULL) { diff --git a/sys/dev/vmm/vmm_dev.h b/sys/dev/vmm/vmm_dev.h index c691341d4350..89fe7ec4704d 100644 --- a/sys/dev/vmm/vmm_dev.h +++ b/sys/dev/vmm/vmm_dev.h @@ -11,8 +11,11 @@ #include #include + #include +#include + #ifdef _KERNEL struct thread; struct vm; diff --git a/sys/dev/vmm/vmm_param.h b/sys/dev/vmm/vmm_param.h new file mode 100644 index 000000000000..a5040eb0f58c --- /dev/null +++ b/sys/dev/vmm/vmm_param.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2011 NetApp, Inc. + * All rights reserved. + */ + +#ifndef _DEV_VMM_PARAM_H_ +#define _DEV_VMM_PARAM_H_ + +/* + * The VM name has to fit into the pathname length constraints of devfs, + * governed primarily by SPECNAMELEN. The length is the total number of + * characters in the full path, relative to the mount point and not + * including any leading '/' characters. + * A prefix and a suffix are added to the name specified by the user. + * The prefix is usually "vmm/" or "vmm.io/", but can be a few characters + * longer for future use. + * The suffix is a string that identifies a bootrom image or some similar + * image that is attached to the VM. A separator character gets added to + * the suffix automatically when generating the full path, so it must be + * accounted for, reducing the effective length by 1. + * The effective length of a VM name is 229 bytes for FreeBSD 13 and 37 + * bytes for FreeBSD 12. A minimum length is set for safety and supports + * a SPECNAMELEN as small as 32 on old systems. + */ +#define VM_MAX_PREFIXLEN 10 +#define VM_MAX_SUFFIXLEN 15 +#define VM_MIN_NAMELEN 6 +#define VM_MAX_NAMELEN \ + (SPECNAMELEN - VM_MAX_PREFIXLEN - VM_MAX_SUFFIXLEN - 1) + +#endif /* !_DEV_VMM_PARAM_H_ */ diff --git a/sys/riscv/include/vmm.h b/sys/riscv/include/vmm.h index e227dd825966..361140834805 100644 --- a/sys/riscv/include/vmm.h +++ b/sys/riscv/include/vmm.h @@ -103,9 +103,6 @@ enum vm_reg_name { #define VM_INTINFO_HWEXCEPTION (3 << 8) #define VM_INTINFO_SWINTR (4 << 8) -#define VM_MAX_NAMELEN 32 -#define VM_MAX_SUFFIXLEN 15 - #ifdef _KERNEL struct vm; diff --git a/sys/riscv/include/vmm_dev.h b/sys/riscv/include/vmm_dev.h index 4d30d5a1c35b..a60e545b8f52 100644 --- a/sys/riscv/include/vmm_dev.h +++ b/sys/riscv/include/vmm_dev.h @@ -38,6 +38,8 @@ #include +#include + struct vm_memmap { vm_paddr_t gpa; int segid; /* memory segment */ diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index f2995b276072..e1ba0af83fae 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -120,7 +120,7 @@ struct vm { volatile cpuset_t suspended_cpus; /* (i) suspended vcpus */ volatile cpuset_t halted_cpus; /* (x) cpus in a hard halt */ struct vm_mem mem; /* (i) [m+v] guest memory */ - char name[VM_MAX_NAMELEN]; /* (o) virtual machine name */ + char name[VM_MAX_NAMELEN + 1]; /* (o) virtual machine name */ struct vcpu **vcpu; /* (i) guest vcpus */ struct vmm_mmio_region mmio_region[VM_MAX_MMIO_REGIONS]; /* (o) guest MMIO regions */ @@ -311,9 +311,6 @@ vm_create(const char *name, struct vm **retvm) struct vm *vm; int error; - if (name == NULL || strlen(name) >= VM_MAX_NAMELEN) - return (EINVAL); - vm = malloc(sizeof(struct vm), M_VMM, M_WAITOK | M_ZERO); error = vm_mem_init(&vm->mem, 0, 1ul << 39); if (error != 0) { From nobody Tue Nov 18 15:02:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nss5Ffbz6HGwV for ; Tue, 18 Nov 2025 15:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nss2qDtz44j3 for ; Tue, 18 Nov 2025 15:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T+V5aI5zjBEQrqDiAHBSWcN0yN1UTX9yLwezIreuOc0=; b=oMQO2qZfWcrCt1sCWfFpzwBTeW1ox08VivX3VldBjhR4pzXllJHpyo2XxPhlXAFvktuFGa oohLbbWoCa7KwnSC6kyDXhO/qpWRariq5OW+uivfrJ2uh8qRA+eHqUzHktsIAdSwvtJhBP PjwoH0qTJi+fOf6Dn0uwXaDbqHr5dcxTV9s0d0Ptr/Y0xdCaIBTe6z6V2olAJsEs9u7U4A LPI32eWEf5TDLES3fCo6D4psFwTzwc6H9qUpX5CN5hYOhFvj+NvAYn1TVg5a4p1hwZtCsb vR77TQVjMIXFBRE8MWgY7zvDHMASWP6GI0ehyLBx/i5Sh+Txbws6OteqWbsL5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T+V5aI5zjBEQrqDiAHBSWcN0yN1UTX9yLwezIreuOc0=; b=WA00Me1olcvZKuWyJPuASQfVxcmZa8pXjC87J6W9YaDmtTdHgwRCTypXHuURV6mIRVQkkX 0BgMWKRvNos3Msedylt2fqOJsWYYcy1wFOPVcJo5zjF7Jffjh/xkS6EXeTw1K502YNSJB2 2Wf1l00eOig/NRgP6NL85h/wxVO710Y635faL3bEpscsktLEAYUd9S+uXxaZVLPIpZuHRh HeieqZKGJxIF5DmYAMfsJ8Y/ER/BnYRREOhMr3tVPLuZ+EbU2MCkRbjAuF+CJZfeL1y+4k S/+P/KW7HLazFHQV02uSljyPK+EUIwv9j1A5WQ1vrkVHigSQ34YDrFSqzEiUQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478177; a=rsa-sha256; cv=none; b=WNLOBklrVkFg3TwsNW0nDhIt/g4qsrfLHwlgNs06Oiyj70HRl2I7Oec1ei2mftHeAZNV5W zYPu2mb2gctmLhB3aud6zM9VCRlskq546ZmEZSHcw8iuuPWHbCpC9+Lk7mrBJurT2LBEMi kHPDB8hSUiJl0wSCZWGExRDBj5pY0QdHmb+DbeDwcd+flqdiIBPAeaYd/rrtmr568IH4FY cTm5EzUNDFp+MNKkzdAi4oPvwwlGiAot/KPWtwgv1riLSpkc1NIV3euSNHT5L4KWqnjHs2 CuWt+8+kZDUoi+XcWBSx5RzHf2+59eRtYVkkjzon0dbF2V5LTPbKGOFXkQzvxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nss2QY7z10KJ for ; Tue, 18 Nov 2025 15:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3737b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6e8e1de9fb06 - stable/15 - vmm: Move vm_maxcpu handling into MI code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6e8e1de9fb06e37f4b3fce9786c934393a232263 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:57 +0000 Message-Id: <691c8aa1.3737b.fe7862b@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6e8e1de9fb06e37f4b3fce9786c934393a232263 commit 6e8e1de9fb06e37f4b3fce9786c934393a232263 Author: Mark Johnston AuthorDate: 2025-11-04 13:56:15 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:43 +0000 vmm: Move vm_maxcpu handling into MI code No functional change intended. Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53477 (cherry picked from commit c46e5dc65ba5c9666bb4452878e332dc49730843) --- sys/amd64/include/vmm.h | 2 -- sys/amd64/vmm/intel/vmx.c | 2 +- sys/amd64/vmm/vmm.c | 22 ---------------------- sys/arm64/vmm/vmm.c | 20 -------------------- sys/dev/vmm/vmm_dev.c | 15 +++++++++++++++ sys/dev/vmm/vmm_dev.h | 11 +++++++++++ sys/riscv/vmm/vmm.c | 22 ---------------------- 7 files changed, 27 insertions(+), 67 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index 0a2d5a80f2b0..5cf1ae2d769c 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -206,8 +206,6 @@ struct vmm_ops { extern const struct vmm_ops vmm_ops_intel; extern const struct vmm_ops vmm_ops_amd; -extern u_int vm_maxcpu; /* maximum virtual cpus */ - int vm_create(const char *name, struct vm **retvm); struct vcpu *vm_alloc_vcpu(struct vm *vm, int vcpuid); void vm_disable_vcpu_creation(struct vm *vm); diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 842281ab862e..4189c1214b40 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include "opt_bhyve_snapshot.h" #include @@ -58,6 +57,7 @@ #include #include +#include #include #include diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index a989f93b8728..6dfa33adf63c 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -267,10 +267,6 @@ static int trap_wbinvd; SYSCTL_INT(_hw_vmm, OID_AUTO, trap_wbinvd, CTLFLAG_RDTUN, &trap_wbinvd, 0, "WBINVD triggers a VM-exit"); -u_int vm_maxcpu; -SYSCTL_UINT(_hw_vmm, OID_AUTO, maxcpu, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, - &vm_maxcpu, 0, "Maximum number of vCPUs"); - static void vcpu_notify_event_locked(struct vcpu *vcpu); /* global statistics */ @@ -296,14 +292,6 @@ VMM_STAT(VMEXIT_USERSPACE, "number of vm exits handled in userspace"); VMM_STAT(VMEXIT_RENDEZVOUS, "number of times rendezvous pending at exit"); VMM_STAT(VMEXIT_EXCEPTION, "number of vm exits due to exceptions"); -/* - * Upper limit on vm_maxcpu. Limited by use of uint16_t types for CPU - * counts as well as range of vpid values for VT-x and by the capacity - * of cpuset_t masks. The call to new_unrhdr() in vpid_init() in - * vmx.c requires 'vm_maxcpu + 1 <= 0xffff', hence the '- 1' below. - */ -#define VM_MAXCPU MIN(0xffff - 1, CPU_SETSIZE) - #ifdef KTR static const char * vcpu_state2str(enum vcpu_state state) @@ -405,16 +393,6 @@ vmm_modinit(void) if (!vmm_is_hw_supported()) return (ENXIO); - vm_maxcpu = mp_ncpus; - TUNABLE_INT_FETCH("hw.vmm.maxcpu", &vm_maxcpu); - - if (vm_maxcpu > VM_MAXCPU) { - printf("vmm: vm_maxcpu clamped to %u\n", VM_MAXCPU); - vm_maxcpu = VM_MAXCPU; - } - if (vm_maxcpu == 0) - vm_maxcpu = 1; - vmm_host_state_init(); vmm_ipinum = lapic_ipi_alloc(pti ? &IDTVEC(justreturn1_pti) : diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index 5225b995a75d..b1133be8fa3d 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -206,10 +206,6 @@ static const struct vmm_regs vmm_arch_regs_masks = { /* Host registers masked by vmm_arch_regs_masks. */ static struct vmm_regs vmm_arch_regs; -u_int vm_maxcpu; -SYSCTL_UINT(_hw_vmm, OID_AUTO, maxcpu, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, - &vm_maxcpu, 0, "Maximum number of vCPUs"); - static void vcpu_notify_event_locked(struct vcpu *vcpu); /* global statistics */ @@ -229,12 +225,6 @@ VMM_STAT(VMEXIT_SS, "number of vmexits for a single-step exception"); VMM_STAT(VMEXIT_UNHANDLED_EL2, "number of vmexits for an unhandled EL2 exception"); VMM_STAT(VMEXIT_UNHANDLED, "number of vmexits for an unhandled exception"); -/* - * Upper limit on vm_maxcpu. We could increase this to 28 bits, but this - * is a safe value for now. - */ -#define VM_MAXCPU MIN(0xffff - 1, CPU_SETSIZE) - static int vmm_regs_init(struct vmm_regs *regs, const struct vmm_regs *masks) { @@ -330,16 +320,6 @@ vmm_modinit(void) if (error != 0) return (error); - vm_maxcpu = mp_ncpus; - TUNABLE_INT_FETCH("hw.vmm.maxcpu", &vm_maxcpu); - - if (vm_maxcpu > VM_MAXCPU) { - printf("vmm: vm_maxcpu clamped to %u\n", VM_MAXCPU); - vm_maxcpu = VM_MAXCPU; - } - if (vm_maxcpu == 0) - vm_maxcpu = 1; - error = vmm_regs_init(&vmm_arch_regs, &vmm_arch_regs_masks); if (error != 0) return (error); diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 09093fe44e2b..d6543bf6534e 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -91,6 +92,10 @@ static MALLOC_DEFINE(M_VMMDEV, "vmmdev", "vmmdev"); SYSCTL_DECL(_hw_vmm); +u_int vm_maxcpu; +SYSCTL_UINT(_hw_vmm, OID_AUTO, maxcpu, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, + &vm_maxcpu, 0, "Maximum number of vCPUs"); + static void devmem_destroy(void *arg); static int devmem_create_cdev(struct vmmdev_softc *sc, int id, char *devmem); @@ -1158,6 +1163,16 @@ vmm_handler(module_t mod, int what, void *arg) error = vmmdev_init(); if (error != 0) break; + + vm_maxcpu = mp_ncpus; + TUNABLE_INT_FETCH("hw.vmm.maxcpu", &vm_maxcpu); + if (vm_maxcpu > VM_MAXCPU) { + printf("vmm: vm_maxcpu clamped to %u\n", VM_MAXCPU); + vm_maxcpu = VM_MAXCPU; + } + if (vm_maxcpu == 0) + vm_maxcpu = 1; + error = vmm_modinit(); if (error == 0) vmm_initialized = true; diff --git a/sys/dev/vmm/vmm_dev.h b/sys/dev/vmm/vmm_dev.h index 89fe7ec4704d..f14176c8afad 100644 --- a/sys/dev/vmm/vmm_dev.h +++ b/sys/dev/vmm/vmm_dev.h @@ -57,6 +57,17 @@ struct vmmdev_ioctl { extern const struct vmmdev_ioctl vmmdev_machdep_ioctls[]; extern const size_t vmmdev_machdep_ioctl_count; +/* + * Upper limit on vm_maxcpu. Limited by use of uint16_t types for CPU counts as + * well as range of vpid values for VT-x on amd64 and by the capacity of + * cpuset_t masks. The call to new_unrhdr() in vpid_init() in vmx.c requires + * 'vm_maxcpu + 1 <= 0xffff', hence the '- 1' below. + */ +#define VM_MAXCPU MIN(0xffff - 1, CPU_SETSIZE) + +/* Maximum number of vCPUs in a single VM. */ +extern u_int vm_maxcpu; + #endif /* _KERNEL */ struct vmmctl_vm_create { diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index e1ba0af83fae..23b57ad3b7aa 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -143,10 +143,6 @@ static int vmm_ipinum; SYSCTL_INT(_hw_vmm, OID_AUTO, ipinum, CTLFLAG_RD, &vmm_ipinum, 0, "IPI vector used for vcpu notifications"); -u_int vm_maxcpu; -SYSCTL_UINT(_hw_vmm, OID_AUTO, maxcpu, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, - &vm_maxcpu, 0, "Maximum number of vCPUs"); - static void vcpu_notify_event_locked(struct vcpu *vcpu); /* global statistics */ @@ -154,12 +150,6 @@ VMM_STAT(VMEXIT_COUNT, "total number of vm exits"); VMM_STAT(VMEXIT_IRQ, "number of vmexits for an irq"); VMM_STAT(VMEXIT_UNHANDLED, "number of vmexits for an unhandled exception"); -/* - * Upper limit on vm_maxcpu. We could increase this to 28 bits, but this - * is a safe value for now. - */ -#define VM_MAXCPU MIN(0xffff - 1, CPU_SETSIZE) - static void vcpu_cleanup(struct vcpu *vcpu, bool destroy) { @@ -210,18 +200,6 @@ vm_exitinfo(struct vcpu *vcpu) int vmm_modinit(void) { - vm_maxcpu = mp_ncpus; - - TUNABLE_INT_FETCH("hw.vmm.maxcpu", &vm_maxcpu); - - if (vm_maxcpu > VM_MAXCPU) { - printf("vmm: vm_maxcpu clamped to %u\n", VM_MAXCPU); - vm_maxcpu = VM_MAXCPU; - } - - if (vm_maxcpu == 0) - vm_maxcpu = 1; - return (vmmops_modinit()); } From nobody Tue Nov 18 15:02:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsq5h8Nz6HHCP for ; Tue, 18 Nov 2025 15:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsq1szbz44ht for ; Tue, 18 Nov 2025 15:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v8v5R9XaNSRLs8O5az3YhUb1nMB3gWLQlAqaF6Qp8u0=; b=fOWYFBg+84vFWVFjHbKWzihQxphzBx4NcEEdhl2WhMvgreuC7bOMaKShNpxFAmqHlBiYgS mGUIHSRA5jalenf+Cz2mQMTPspR8rbzlTp7PiO8/e7hlzN+7Xpkd/ti7JXodLEoCJxujlF vSpqXzThc5Hu1EeZhF1/KAaNOxlpCb3nUEeZcJ8o8p8CnBwu4Ecz3snPbNUffqONopHlyd GkjDpWd79pvXt6ftko0qQsiSmdlzRLLzf//mdAzUi2YXo05cJn9W22ZT9+rgrQD5m17UoG 4J++Mp3wLbhffHSNQxaRmCAHaYwCKza2Ym4OHIX5YCcrS9MMVWFTvSHtLYayWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v8v5R9XaNSRLs8O5az3YhUb1nMB3gWLQlAqaF6Qp8u0=; b=MZdQlJlqUNuYbRrtrX9fkeWtq4oCZMQCwMFbVSNcYCUehHkLTFkZtVzjGyepevyH8lHbgk 5la64GSNRP0M3Cx+YHIUFdw/IdjfE1+3Dqt/G4IrnKsIXB1Ud40vdkxmimhx4z4wNzBuDi HtZ8lR8qX6KtS5ZKkNSMdWj5y5fVyYGlZuzieHWzUytphGZ5qXtPCm8M+VmzNf79G3tGG+ LK5m/lieReOnFl1pLhcpz7t7baYbgIOli6YFJuwn93C9SmiPZVEoSIrOXv6KS1jc7ONtsz NZuQRARtNb26KkQcjMuNbFI7N8OLDH6UmVZUteC0XOEXCDonlxqdyEPyBJzc5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478175; a=rsa-sha256; cv=none; b=HzsztJrdXgIOaW7FceVjK+LFQHCmlSG16nUw0WfUYjbrpn0GLPlIXHgnEvzi/K0/PCQZIU SQSiQPf/scZ+qKrjFbMgWuSLNDnH3UziuRv+FG48EFhpl2poo6VukWiKttwKYmy3Vpe7jN 3ycLmeaLxhBma43+KmH+ICh9QeYNZW6TvpudMLlLo0KEHhsBMltufB1aRHvxJD/E+3JjXh vpTuf2mkFNPS6JaDABm61zlW/B2Q0fuwIJSU7M+vs2LNRUg+YEo/1Htg9ibZUU/m0yL16Z pqTWNFPcFzKX7XW401YGesCjdB1eF4aMK2YiE2nkI4xPOPb/U5LwSPLyOq8Mbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsq1J2Gz102b for ; Tue, 18 Nov 2025 15:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 379a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 10b2ebb5a368 - stable/15 - amd64/vmm: Remove an unused function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 10b2ebb5a3686cc77135dce8b68ec2b890519b49 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:55 +0000 Message-Id: <691c8a9f.379a6.5c46a910@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=10b2ebb5a3686cc77135dce8b68ec2b890519b49 commit 10b2ebb5a3686cc77135dce8b68ec2b890519b49 Author: Mark Johnston AuthorDate: 2025-11-04 13:56:02 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:34 +0000 amd64/vmm: Remove an unused function Reviewed by: corvink, emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53423 (cherry picked from commit 7214e0469234d90edd6deda4b181cd4862a9ace0) --- sys/amd64/vmm/io/ppt.c | 7 ------- sys/amd64/vmm/io/ppt.h | 6 ------ 2 files changed, 13 deletions(-) diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c index 2cb459fb848f..6feac5dcbbed 100644 --- a/sys/amd64/vmm/io/ppt.c +++ b/sys/amd64/vmm/io/ppt.c @@ -335,13 +335,6 @@ ppt_teardown_msix(struct pptdev *ppt) ppt->msix.num_msgs = 0; } -int -ppt_avail_devices(void) -{ - - return (num_pptdevs); -} - int ppt_assigned_devices(struct vm *vm) { diff --git a/sys/amd64/vmm/io/ppt.h b/sys/amd64/vmm/io/ppt.h index f97c399564d7..9377f34d50e6 100644 --- a/sys/amd64/vmm/io/ppt.h +++ b/sys/amd64/vmm/io/ppt.h @@ -42,12 +42,6 @@ int ppt_disable_msix(struct vm *vm, int bus, int slot, int func); int ppt_assigned_devices(struct vm *vm); bool ppt_is_mmio(struct vm *vm, vm_paddr_t gpa); -/* - * Returns the number of devices sequestered by the ppt driver for assignment - * to virtual machines. - */ -int ppt_avail_devices(void); - /* * The following functions should never be called directly. * Use 'vm_assign_pptdev()' and 'vm_unassign_pptdev()' instead. From nobody Tue Nov 18 15:02:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsr4KWxz6HHCQ for ; Tue, 18 Nov 2025 15:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsr29fKz44Z1 for ; Tue, 18 Nov 2025 15:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GOxe6lAO4YyWdFUY3gFuelAWaQh5HBx5ULjyyeSpVIE=; b=xbAvFgB6oxgwRaC6reorePFzu8e12ylyExRE3LLUA5fxQ+DIU0K8xSW1R7Zglsoj3uPT6K DrJcxVrmq43qbQtxPyhz95EWkHhs9/2I8v/Eb3/G/iVmCkuc4DHsSoIzh+0HMEahy647OY 5NK3Lt1ygzOT91XFKSEE//QfnpLZYvcsBRZ1or1WIzasw7RtWDXzB6+DmewY16GyfgzJcE obaALQoLOTnVyjOJ9UlfVPUaCo55q8+s5ObJORYprd2xZVWOzVEj9UnZRWU+XwPWByzNzy TnXFJ56GyTnAVuQdjO/JMzHukL/tg3vtgS7wkGEIpT+82AjKUNRJLS78RmorCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GOxe6lAO4YyWdFUY3gFuelAWaQh5HBx5ULjyyeSpVIE=; b=l8Wr6rHnyvGsNcki+S72XiJa4W3Xf8OjxfwdAdWwa4KNo++orpguB6cvljUyGLSeHaPT8I 5f4CdZWFhyBQ7y3L7J1TW6AgBj+BDGcq19OlJFbT9s18Y/mOxMWrx2vfmJKUQ/pc+nbNlP +N+UWdRzvF80yp3QKR/Nz1m/rabVQCJBpojNVNiI4eQIuMXPtgKXI+kXJ5kjiSKwuEVC/d EkuXmNu6L1/TIe8tTlNWiJhy9uOxV1Y9YoMYhJifWdAqtCVRSSQZYmWNgiywnEmSaxIAMO vUNoqVBgmfzGV/LKpSEESh9iM8cSYoPiaiq8WXNPH+66sEmEdQrpj9T3eqpZ8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478176; a=rsa-sha256; cv=none; b=P8vcMG6Td3hIpMrUjsmiT93MNyei2dEQqw4THY4oS6Ropd3YeKXOmj9v7+w/oLAdoLruQL ciAjIEzchgKXxNFVPAXKkmsVWew+es14pjGkYrNH6gKjZV/aqblRbg4lJn+ZkFXQrJRRYk HKUqxfD94I6gzQI0i1lAg2ySDwQTiTZZ1Rvvoc2ohENaFgAMT1YuZp+5F1ugO8neYaG04h 6OM0Yz4GHU6xlSDtBfDe9BeKrH20j+LTLXlPy8Evk0AkeitbRS8q6jXbRb8Tx8vfWAY3Wb 67jNFW/8gfd6rC6FGKIvjUM7KAf/Unpc0wj7+RuBmcsgJuupEssedBnQV47lPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsr1bjGz10KF for ; Tue, 18 Nov 2025 15:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 379aa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 55096ebddc15 - stable/15 - arm64/vmm: Move the vgic_max_cpu_count() check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 55096ebddc1557b7f0e4cb294878fcc8621de37b Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:56 +0000 Message-Id: <691c8aa0.379aa.7d985f2a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=55096ebddc1557b7f0e4cb294878fcc8621de37b commit 55096ebddc1557b7f0e4cb294878fcc8621de37b Author: Mark Johnston AuthorDate: 2025-11-04 16:58:25 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:42 +0000 arm64/vmm: Move the vgic_max_cpu_count() check vm_alloc_vcpu() is called quite frequently, and we don't need to apply the vgic limit unless we're actually allocating a vcpu structure for the first time. No functional change intended. Reviewed by: andrew MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53580 (cherry picked from commit f3a7ed2047dffaebbfbb3920e993e9df424be728) --- sys/arm64/vmm/vmm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index dfaba058e205..5225b995a75d 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -394,10 +394,6 @@ vm_alloc_vcpu(struct vm *vm, int vcpuid) if (vcpuid < 0 || vcpuid >= vm_get_maxcpus(vm)) return (NULL); - /* Some interrupt controllers may have a CPU limit */ - if (vcpuid >= vgic_max_cpu_count(vm->cookie)) - return (NULL); - vcpu = (struct vcpu *) atomic_load_acq_ptr((uintptr_t *)&vm->vcpu[vcpuid]); if (__predict_true(vcpu != NULL)) @@ -406,6 +402,12 @@ vm_alloc_vcpu(struct vm *vm, int vcpuid) sx_xlock(&vm->vcpus_init_lock); vcpu = vm->vcpu[vcpuid]; if (vcpu == NULL && !vm->dying) { + /* Some interrupt controllers may have a CPU limit */ + if (vcpuid >= vgic_max_cpu_count(vm->cookie)) { + sx_xunlock(&vm->vcpus_init_lock); + return (NULL); + } + vcpu = vcpu_alloc(vm, vcpuid); vcpu_init(vcpu); From nobody Tue Nov 18 15:19:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9pDn0mvFz6HJCN for ; Tue, 18 Nov 2025 15:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9pDm6zRzz48BL for ; Tue, 18 Nov 2025 15:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763479161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ah2RJTtM/+aNPw8GPk1wmaSkfYZiDM2dpuDxw/dH13Q=; b=obqw+tlANO9j4E9PD7Ofufw4m80mKVyFe8woj+lZufBZtbiQvO0mEX6gdT37TR2MGPag3p S2YcKhIWYTFohfBcblHUtHvYW/3BVy8U5jZKIXhN/bZesDupK4I9fb+ueMID1+icW/jYIE rSGM6NyOZWwZSpO1nYckKUFIn0/EacxU6DaISI4p4cyV04yUMLPjZs8krvK2lI+Pxk+4XX ounQJrftliRFp5sJRKJ4q+3GOOp8FV2gzatJCGsEK5F1WhbT5ortyohEN56iDexnzdpxgq gBy1MyYfCDnYuB/6XQzIp+9EbDdyEtJf+9pVN5vQ3eCb/wrRxlfQcBlr+ASUBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763479161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ah2RJTtM/+aNPw8GPk1wmaSkfYZiDM2dpuDxw/dH13Q=; b=mV/+rkIasYw0sAMm0gsKcNgBIgJ3QmnAq5sxsgmcbUg3WvnQnie19YHnJmWHj/0S63EZ0o ltmOASNmnqAF9nhx7dLS+vx6vCqoWIwK6E7+/XcQ7aJmQu2RffAabbLU56xnk074Pr/XZu duvBFc7+wxtRdC0O6Pbkegz7ZunCMHeBXB35ZQVQjISYzhVZHCfdfdPyOLJGkhS+7ZKBSz 7JcJMwgoP/rtKxCQdw6R47qE8L3YHOBj3XNrsi77K4wOCJAd5hxk39+pZwRGd5067yBt2m jpB1UZO5oBbL2nIaVIQ9hjMMf8mA6VgF30DldsrNOt5iv2KqDkNndOyL/cvbVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763479161; a=rsa-sha256; cv=none; b=cEQIvHqKyqpmGFXAftAVCdX2PLMIWGXREne2oHCEAH25epvdk5+m87gtOzJn4Z1pEsXMAt p4LRSzNZX9E3qqmBkDN5LRFNAh8xqtujJJZqC9fqneYOdThxwPyxwmgtXcLCnTat1SqEfQ Tas2lKpymEKLikFW1gYj4UFZ12CXEeYK0a5657PEqJ/2G/iQiq0YDnM2diTCWz3XoGqFfF mvcuViSJKtYwitOvUt6NLuRAaP9BTRrb/UfXdGBXQXWLd9ZJRFlV4CqT6UcfIelUj+53Ir tFa8rTKXQZ/26UBk5qBLqH/bZjX0F52ro5M8o0HItPOjurik3c+thVxzuDDoiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9pDm64Xpz10f3 for ; Tue, 18 Nov 2025 15:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39deb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:19:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 8f2f66b323ac - main - TCP Pacing system (HPTS) is missing an API List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f2f66b323ac3ea29ebedf12cad06fbbb76edd3c Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:19:20 +0000 Message-Id: <691c8e78.39deb.528019ea@gitrepo.freebsd.org> The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=8f2f66b323ac3ea29ebedf12cad06fbbb76edd3c commit 8f2f66b323ac3ea29ebedf12cad06fbbb76edd3c Author: Randall Stewart AuthorDate: 2025-11-18 15:18:25 +0000 Commit: Randall Stewart CommitDate: 2025-11-18 15:18:25 +0000 TCP Pacing system (HPTS) is missing an API Recent changes to HPTS have broken an API that was somehow removed (used by user space programs for time calculations). This commit will add back the inline function that was removed. Differential Revision: --- sys/netinet/tcp_hpts.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/netinet/tcp_hpts.h b/sys/netinet/tcp_hpts.h index 6b05f9701ac2..13527f7f9a4a 100644 --- a/sys/netinet/tcp_hpts.h +++ b/sys/netinet/tcp_hpts.h @@ -32,6 +32,10 @@ #define HPTS_MSEC_IN_SEC 1000 #define HPTS_USEC_IN_MSEC 1000 +/* + * The following functions should also be available + * to userspace as well. + */ static inline uint32_t tcp_tv_to_usec(const struct timeval *sv) { @@ -50,6 +54,13 @@ tcp_tv_to_lusec(const struct timeval *sv) return ((uint64_t)((sv->tv_sec * HPTS_USEC_IN_SEC) + sv->tv_usec)); } +static inline uint64_t +tcp_tv_to_lusectick(const struct timeval *sv) +{ + return ((uint64_t)((sv->tv_sec * HPTS_USEC_IN_SEC) + sv->tv_usec)); +} + + struct hpts_diag { uint32_t p_hpts_active; /* bbr->flex7 x */ uint32_t p_nxt_slot; /* bbr->flex1 x */ From nobody Tue Nov 18 16:24:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qh75wyZz6HNfH for ; Tue, 18 Nov 2025 16:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9qh756t9z4JDd for ; Tue, 18 Nov 2025 16:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L7CIjQ07MQf4x0arKpdpp71fjF6O2JLD1LN6+rj6Jmc=; b=lu07q0PjzF6oNXiIyYqNej7g6cnpgKFeWZIpYEe4FLCxVHta7+cYXx1b1Pnw5AAGR3BaqP ebx+NieGisk6TqAIeGuQCKPLeqA+L1cta3Jqu+m0oGkqFFAtBcnVRl2R5psUEWjrQxmXLF J7TZjfLkjfKiic4XRPoMiu6D6gjqjXMEl9b0YtE9uz1gbKbZv7XsZNkd2Bol9knii42qL5 sVxiiEEQuy2aoNUCX67IESQfxwBqshnm43KO9lJpPhrwURT8mxuyhA1GWrOQUffYqGT/9I Hl+OldcGi2tYARTj9quoHlVa+tIItvILmh0KJpsZgBkFl5uTS6TUAaE0vB+WoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L7CIjQ07MQf4x0arKpdpp71fjF6O2JLD1LN6+rj6Jmc=; b=IUpvdV9zAkE6fYMwrnK1UdkMFMiXSLvhgI9aAfwv6MAsolpDfMA50n1n6XAUwOtL0k8zOn mOqd90QK5qbqwK+7b51Lcb7Upj1LgKFtUsT7EkEd9l7XGSSwmKBz4PzB3ZCFgk4HowLwvN kHCjnLXgb7p7zIuiyB6XYcnzXd7bvMeGbUx0mvo9ajO4/KNeeBhaXXZGVPPo6T118HXhY4 CaEbWt2/Che2wKJrXsDjehISb40m8M5+sCqDpCmgebVj8I3K5gKtvRumSSYCLhhz+Tw+DF xuWaYMvkPt2Nk83HRCsXgMWn6T1M60Dv5REuyA8djvGxczjYeRtWnwuGxMvl+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763483079; a=rsa-sha256; cv=none; b=MWz9N5VoPUN4x76a5BJeIR/6olzMPgjQcc5dcEHXh1z2xLKu3bnov8aXty5TbZlvB83jxf WqSTx6+TMQ7qjGa4/x1KeQtmRtuJtjnyT5k2KehsEcN06ybI5n1ePOhhLfjt5q3xiuQO6o 2e8AUfkKb+rEb8GUdki6JZGZWl1lv9LPozSLD/OwXAU+rgJbsyme0OmI8J1BauNlumxUGa dlf38Ww5NS5BXAJeWoZ8+qLjkuHPQ6nrkY6YCNELZmpP4aTYQuSI8kaigWzaT7MFQh6M/e u/egaKnZb2S6I9jXYF3HO0JE2mkwKKE15qrM6qAyTcFeHQiLZ/cMtFjUaO8GnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9qh74cntz121s for ; Tue, 18 Nov 2025 16:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f03c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 16:24:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7861d051de2e - main - rc.subr: Try to make svjc option handling a bit easier to read List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7861d051de2ea2f244bcf73111a04389dc5bcf51 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 16:24:39 +0000 Message-Id: <691c9dc7.3f03c.367c511b@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7861d051de2ea2f244bcf73111a04389dc5bcf51 commit 7861d051de2ea2f244bcf73111a04389dc5bcf51 Author: Mark Johnston AuthorDate: 2025-11-17 16:39:43 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 16:24:20 +0000 rc.subr: Try to make svjc option handling a bit easier to read Specifically, make this code fit in fewer columns: - deindent cases to conform to the usual style, - use a local variable to minimize duplication in each case. No functional change intended. Reviewed by: 0mp, netchild MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: Modirum MDPay Differential Revision: https://reviews.freebsd.org/D53754 --- libexec/rc/rc.subr | 88 +++++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 41 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index e4ad14f582d6..4718123a71e9 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1256,49 +1256,55 @@ run_rc_command() if [ -n "$_svcj_options" ]; then # translate service jail options _svcj_sysvipc_x=0 for _svcj_option in $_svcj_options; do + _opts= case "$_svcj_option" in - mlock) - _svcj_cmd_options="allow.mlock ${_svcj_cmd_options}" - ;; - netv4) - _svcj_cmd_options="${_svcj_ip4} allow.reserved_ports ${_svcj_cmd_options}" - ;; - netv6) - _svcj_cmd_options="${_svcj_ip6} allow.reserved_ports ${_svcj_cmd_options}" - ;; - net_basic) - _svcj_cmd_options="${_svcj_ip4} ${_svcj_ip6} allow.reserved_ports ${_svcj_cmd_options}" - ;; - net_raw) - _svcj_cmd_options="allow.raw_sockets ${_svcj_cmd_options}" - ;; - net_all) - _svcj_cmd_options="allow.socket_af allow.raw_sockets allow.reserved_ports ${_svcj_ip4} ${_svcj_ip6} ${_svcj_cmd_options}" - ;; - nfsd) - _svcj_cmd_options="allow.nfsd enforce_statfs=1 ${_svcj_cmd_options}" - ;; - routing) - _svcj_cmd_options="allow.routing ${_svcj_cmd_options}" - ;; - settime) - _svcj_cmd_options="allow.settime ${_svcj_cmd_options}" - ;; - sysvipc) - _svcj_sysvipc_x=$((${_svcj_sysvipc_x} + 1)) - _svcj_cmd_options="sysvmsg=inherit sysvsem=inherit sysvshm=inherit ${_svcj_cmd_options}" - ;; - sysvipcnew) - _svcj_sysvipc_x=$((${_svcj_sysvipc_x} + 1)) - _svcj_cmd_options="sysvmsg=new sysvsem=new sysvshm=new ${_svcj_cmd_options}" - ;; - vmm) - _svcj_cmd_options="allow.vmm ${_svcj_cmd_options}" - ;; - *) - echo ${name}: unknown service jail option: $_svcj_option - ;; + mlock) + _opts="allow.mlock" + ;; + netv4) + _opts="${_svcj_ip4} allow.reserved_ports" + ;; + netv6) + _opts="${_svcj_ip6} allow.reserved_ports" + ;; + net_basic) + _opts="${_svcj_ip4} ${_svcj_ip6}" + _opts="${_opts} allow.reserved_ports" + ;; + net_raw) + _opts="allow.raw_sockets" + ;; + net_all) + _opts="allow.socket_af" + _opts="${_opts} allow.raw_sockets" + _opts="${_opts} allow.reserved_ports" + _opts="${_opts} ${_svcj_ip4} ${_svcj_ip6}" + ;; + nfsd) + _opts="allow.nfsd enforce_statfs=1" + ;; + routing) + _opts="allow.routing" + ;; + settime) + _opts="allow.settime" + ;; + sysvipc) + _svcj_sysvipc_x=$((${_svcj_sysvipc_x} + 1)) + _opts="sysvmsg=inherit sysvsem=inherit sysvshm=inherit" + ;; + sysvipcnew) + _svcj_sysvipc_x=$((${_svcj_sysvipc_x} + 1)) + _opts="sysvmsg=new sysvsem=new sysvshm=new" + ;; + vmm) + _opts="allow.vmm" + ;; + *) + echo ${name}: unknown service jail option: $_svcj_option + ;; esac + _svcj_cmd_options="${_opts} ${_svcj_cmd_options}" done if [ ${_svcj_sysvipc_x} -gt 1 ]; then echo -n "ERROR: more than one sysvipc option is " From nobody Tue Nov 18 16:24:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qh91STdz6HNvg for ; Tue, 18 Nov 2025 16:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9qh85nJCz4JTT for ; Tue, 18 Nov 2025 16:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G05jlaVGaz8xRbjchfoHXhD6Meuj2hxFUjrpCm/Aug8=; b=szAeRnqC3Vdy+3GYg4IzPbOEPFsX0yAQzAuI5hMtMcOko4Xpf+e3lB3UnihROWUQvgkLOz XHJMQSP3hFZaIaM8IYfPPH+gC4Hd/zqi6Y48sLth5kFaaa5chKpXF6xCccyP/gD3FB6AIP Z2WVcLImwsWSw/2IHRfXD2jYmUsmnLeIOCgFlk3mujsgRtUOBUNaUe5m5OKOQDXg5piKLK ztesrxgwY9H9/GFm1oxMqqiN/R9HliJQZPRTemkgE5rPIDcyiYev7sv/MfqWThlzE5Rtfa S/UAiDMVh2lJVdouQVwJlcR+3mSo4hcf9mYtujIUQ9ubvzA1uuAslRpgyGScGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G05jlaVGaz8xRbjchfoHXhD6Meuj2hxFUjrpCm/Aug8=; b=J+/9z7KB5Bd2tfgYoS8GVd3xr7mC0DhYJWxkTmHPUdf/qaRAkFKWgBIYGZcS4zJX5oyrBq DfZKftpqUu5tVDl96LVga61kb0Nqyd+77enL50BFbyGJmlB48NCQd2IIlqGpMA66SySgpN 6w/vbxqMhJaMGTR1oRWWlVYJ2gYYn5ivWMUzlGM16xVoVC8FP2Z2+5F7k+bimrc+aHCNDp GAVVa39aIrhtPajCcc2T+yp3WJZ4goNuLNzZB8dqG1FcJgCl1ZQbSmUzrVdEQbun+/GzRV HR79FMITikBigpSPSd73DKXkKGS9OHO6+WqybFe1/MknjdU4/ujfsPw3S9HkjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763483080; a=rsa-sha256; cv=none; b=babjpILkCV/4BKd4kSmMEboPGbJwruSXKr++jN0opviAGOQ2SP63wO2dAwxkxrskhpFtAm 9169F6DL5fAGuV2UzU73rm/h1Wn9h5RFxe5+i1rK38f7XTomS3oguESmrGIAmPegpjh6mk TGy6c1+Kp5MyKv9KrJj8ZLIpyHABuUtMURpkdYUrpXszESilxtznSYQAMEICjbBYnFVxUp FHAEeamLrvVYoEOHQsVZVOcmuxyNutS/Wp5+9wTE93Ra4MBfWEd6gi5gKwe1ERIQAp3vxM 8bcETw9ut8ZaQ65rT+qiox8NLNYGIvhpTOT7zcR+ldbKm/HwYczHHFKzQh2rtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9qh85HKNz12Mr for ; Tue, 18 Nov 2025 16:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 88a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 16:24:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: dcb0790bad43 - main - setaudit: Initial import List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcb0790bad434ace7cf53259e7a9bcefbef1c69b Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 16:24:40 +0000 Message-Id: <691c9dc8.88a6.4c52bb4@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dcb0790bad434ace7cf53259e7a9bcefbef1c69b commit dcb0790bad434ace7cf53259e7a9bcefbef1c69b Author: Mark Johnston AuthorDate: 2025-11-17 16:40:10 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 16:24:20 +0000 setaudit: Initial import Unmodified sources from https://github.com/csjayp/setaudit at commit aa4dd9dfa40b6437030d718834236f4eaeb18ccb. Some follow-up changes will fix a few issues and make it easier to use this utility in the rc framework. Reviewed by: csjp MFC after: 2 weeks Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53669 --- usr.sbin/Makefile | 1 + usr.sbin/setaudit/.gitignore | 2 + usr.sbin/setaudit/Makefile | 8 +++ usr.sbin/setaudit/setaudit.8 | 78 ++++++++++++++++++++++++ usr.sbin/setaudit/setaudit.c | 140 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 229 insertions(+) diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 44679ca290a5..0290ed4f1c58 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -117,6 +117,7 @@ SUBDIR.${MK_AUDIT}+= auditdistd .endif SUBDIR.${MK_AUDIT}+= auditreduce SUBDIR.${MK_AUDIT}+= praudit +SUBDIR.${MK_AUDIT}+= setaudit SUBDIR.${MK_AUTHPF}+= authpf SUBDIR.${MK_AUTOFS}+= autofs SUBDIR.${MK_BLACKLIST}+= blacklistctl diff --git a/usr.sbin/setaudit/.gitignore b/usr.sbin/setaudit/.gitignore new file mode 100644 index 000000000000..459fdebd0a30 --- /dev/null +++ b/usr.sbin/setaudit/.gitignore @@ -0,0 +1,2 @@ +setaudit +setaudit.o diff --git a/usr.sbin/setaudit/Makefile b/usr.sbin/setaudit/Makefile new file mode 100644 index 000000000000..a2e8b37c5c30 --- /dev/null +++ b/usr.sbin/setaudit/Makefile @@ -0,0 +1,8 @@ +PROG= setaudit +MAN= setaudit.8 + +WARNS?= 3 + +LIBADD+= bsm + +.include diff --git a/usr.sbin/setaudit/setaudit.8 b/usr.sbin/setaudit/setaudit.8 new file mode 100644 index 000000000000..8d0c8716ff73 --- /dev/null +++ b/usr.sbin/setaudit/setaudit.8 @@ -0,0 +1,78 @@ +.\" Copyright (c) 2018-2022 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.Dd March 21, 2018 +.Dt SETAUDIT 8 +.Os +.Sh NAME +.Nm setaudit +.Nd "specify audit configurations on a process" +.Sh SYNOPSIS +.Nm +.Op Fl 46 +.Op Fl a Ar auid +.Op Fl m Ar mask +.Op Fl s Ar source +.Op Fl p Ar port +.Ar command ... +.Sh DESCRIPTION +.Nm +is a tool to specify audit configurations on a process. +.Pp +The following options are available: +.Bl -tag -width ".Fl d Ar argument" +.It Fl 4 +Use IPv4. +.It Fl 6 +Use IPv6. +.It Fl a Ar auid +Audit user ID. +.It Fl m Ar mask +String representation of an audit mask. +.It Fl s Ar source +IPv4 or IPv6 address of a Terminal ID. +.It Fl p Ar port +Port of a Terminal ID. +.Xr +.El +.Sh EXAMPLES +Enable all exe related audit events performed by +.Ar command +and its child processes: +.Pp +.Dl # setaudit -m ex command +.Sh SEE ALSO +.Xr getaudit 2 , +.Xr setaudit 2 , +.Xr au_mask 3 , +.Xr libbsm 3 , +.Xr audit_user 5 , +.Xr audit 8 +.Sh HISTORY +The +.Nm +utility was written by +.An Christian S.J. Peron Aq Mt csjp@FreeBSD.org . +.Sh AUTHORS +This +manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . diff --git a/usr.sbin/setaudit/setaudit.c b/usr.sbin/setaudit/setaudit.c new file mode 100644 index 000000000000..cfe8f2bc7155 --- /dev/null +++ b/usr.sbin/setaudit/setaudit.c @@ -0,0 +1,140 @@ +/*- + * Copyright (c) 2018 Christian S.J. Peron + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#include +#include + +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include + +static char *aflag; +static char *mflag; +static char *sflag; + +static void +usage(char *prog) +{ + + (void) fprintf(stderr, + "usage: %s [-46] [-a auid] [-m mask] [-s source] [-p port] command ...\n", + prog); + exit(1); +} + +int +main(int argc, char *argv []) +{ + struct sockaddr_in6 *sin6; + struct sockaddr_in *sin; + struct addrinfo hints; + auditinfo_addr_t aia; + struct addrinfo *res; + struct passwd *pwd; + char *r, *prog; + int ch, error; + + prog = argv[0]; + bzero(&aia, sizeof(aia)); + bzero(&hints, sizeof(hints)); + aia.ai_termid.at_type = AU_IPv4; + hints.ai_family = PF_UNSPEC; + while ((ch = getopt(argc, argv, "46a:m:s:p:")) != -1) + switch (ch) { + case '4': + hints.ai_family = PF_INET; + break; + case '6': + hints.ai_family = PF_INET6; + break; + case 'a': + aflag = optarg; + break; + case 'm': + mflag = optarg; + break; + case 's': + sflag = optarg; + break; + case 'p': + aia.ai_termid.at_port = htons(atoi(optarg)); + break; + default: + usage(prog); + /* NOT REACHED */ + } + argc -= optind; + argv += optind; + if (argc == 0) + usage(prog); + if (aflag) { + pwd = getpwnam(aflag); + if (pwd == NULL) { + aia.ai_auid = strtoul(aflag, &r, 10); + if (r != NULL) + errx(1, "%s: invalid user", aflag); + } else + aia.ai_auid = pwd->pw_uid; + } + if (mflag) { + if (getauditflagsbin(mflag, &aia.ai_mask) < 0) + err(1, "getauditflagsbin"); + } + if (sflag) { + error = getaddrinfo(sflag, NULL, &hints, &res); + if (error) + errx(1, "%s", gai_strerror(error)); + switch (res->ai_family) { + case PF_INET6: + sin6 = (struct sockaddr_in6 *) res->ai_addr; + bcopy(&sin6->sin6_addr.s6_addr, + &aia.ai_termid.at_addr[0], + sizeof(struct in6_addr)); + aia.ai_termid.at_type = AU_IPv6; + break; + case PF_INET: + sin = (struct sockaddr_in *) res->ai_addr; + bcopy(&sin->sin_addr.s_addr, + &aia.ai_termid.at_addr[0], + sizeof(struct in_addr)); + aia.ai_termid.at_type = AU_IPv4; + break; + } + } + if (setaudit_addr(&aia, sizeof(aia)) < 0) { + err(1, "setaudit_addr"); + } + (void) execvp(*argv, argv); + err(1, "%s", *argv); +} From nobody Tue Nov 18 16:24:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhB04Jlz6HNfN for ; Tue, 18 Nov 2025 16:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9qh968Nsz4JTj for ; Tue, 18 Nov 2025 16:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SLAhX3Sddx4ErnhIqfO8pxbEFis9qqllsdrpglX4RTs=; b=Fb8dAEqDKAu4/Ogom2dFgedRJs1NSd3P8kYVNQ1xz4Sqfdu1KcC/MfbtWqAXC1V8TTVGyT 9wRvEC+ATG5t5S0KVrnFard524yT/sRAKcnU1cBeprN7+LniImgx1qg7ms9xrvEuN2RYml X+MwBmkYZnKxy2fxoCzqaz5znXF9KsamUGyoeIkVi4k/c45ZmDDAqlOcPczM1EuWSGbooR qvV1vzrU9hpBRhsdWpp7lCPd2QLNGYHg2hLvqdF8BHBZWVvFIJSpRjtsQ9EPqvPGIYvwbY bw2A46dN1Uo7BMAPt9A+GW3uVnCqCstb56rgokHHLpvWooX/GsJRvbV40w0uSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SLAhX3Sddx4ErnhIqfO8pxbEFis9qqllsdrpglX4RTs=; b=IbyB60m4JmoWVk5gN22nbyca6YnXZkx0ImWlJwenLQbEjtFl+tpw3MiExUmxfMFXA82Qkb VOAkZUSBQFG/7MrcokGTc1mUYaYMR/h30KggGAlqiInQztV/P4wna6KdY2CQeAWeNSsdIx qZWPWcNHXP5Y8Nz6pteDsJezXkh9O5UloSmacf4yxCVZ7zBA7aeO3ZOQxJhUXlFntl3dzn NyiC5Z20aG5xinAtKfJie9p29rPCK6dEQLX8t2EpQl+9U28u7p9U38PlKKnPwXy2nXjDCg Xw9o2uiXpNkRrKNNKWC0ulzIopBh5IivvebbNivh+/rdeMc4BGoWeS8iHDKvuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763483081; a=rsa-sha256; cv=none; b=Opllh6osWIkY9lP3TrVyIL2aQO260by9zB5F0OBR6Rc9Vt8b9YJ570VrjYQ3oG0dxV/BPk SJGv34KyHe5alSwSKMProzimvqrANDGhCtjOF2OxMF0Qv9pmR3wH2baLt6sLFDQiiRcaGR My453b9fnwlXIquklcNU89tJX7s3b854QPfZtgLJPUJ2gyYccEOyGZPg3MIZzBSLu9/74d UKEoxhZ56wmE24N0Y2MxUiY0M2qHBq1ZGm7v9kUJhzkGHdy8D6NuN71xqPFN3TMsLp8y8l lMks44e0uv8b5kppxmZawVYVAMWrRejlT3VXQv/+ILED2zTIzpUNq9Osl6weBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9qh95cpXz11sk for ; Tue, 18 Nov 2025 16:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e5d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 16:24:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a9be8f996819 - main - setaudit: Bump WARNS and fix some style bugs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9be8f9968198600eefcd1b4423a29ea2016e020 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 16:24:41 +0000 Message-Id: <691c9dc9.3e5d3.7fe75e29@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a9be8f9968198600eefcd1b4423a29ea2016e020 commit a9be8f9968198600eefcd1b4423a29ea2016e020 Author: Mark Johnston AuthorDate: 2025-11-17 16:40:57 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 16:24:20 +0000 setaudit: Bump WARNS and fix some style bugs - Cast sockaddrs through void to silence warnings about expected alignment. - Fix cast style. - Sort includes. - Make some global variables local. - Sort options. No functional change intended. Reviewed by: csjp MFC after: 2 weeks Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53670 --- usr.sbin/setaudit/Makefile | 2 -- usr.sbin/setaudit/setaudit.c | 34 ++++++++++++++++------------------ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/usr.sbin/setaudit/Makefile b/usr.sbin/setaudit/Makefile index a2e8b37c5c30..548780f4cd03 100644 --- a/usr.sbin/setaudit/Makefile +++ b/usr.sbin/setaudit/Makefile @@ -1,8 +1,6 @@ PROG= setaudit MAN= setaudit.8 -WARNS?= 3 - LIBADD+= bsm .include diff --git a/usr.sbin/setaudit/setaudit.c b/usr.sbin/setaudit/setaudit.c index cfe8f2bc7155..bdf33ab4cf3d 100644 --- a/usr.sbin/setaudit/setaudit.c +++ b/usr.sbin/setaudit/setaudit.c @@ -23,6 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + #include #include @@ -31,23 +32,18 @@ #include -#include +#include +#include #include +#include +#include #include #include -#include -#include -#include - -static char *aflag; -static char *mflag; -static char *sflag; static void usage(char *prog) { - - (void) fprintf(stderr, + (void)fprintf(stderr, "usage: %s [-46] [-a auid] [-m mask] [-s source] [-p port] command ...\n", prog); exit(1); @@ -62,15 +58,17 @@ main(int argc, char *argv []) auditinfo_addr_t aia; struct addrinfo *res; struct passwd *pwd; - char *r, *prog; + char *aflag, *mflag, *sflag, *r, *prog; int ch, error; + aflag = mflag = sflag = NULL; + prog = argv[0]; bzero(&aia, sizeof(aia)); bzero(&hints, sizeof(hints)); aia.ai_termid.at_type = AU_IPv4; hints.ai_family = PF_UNSPEC; - while ((ch = getopt(argc, argv, "46a:m:s:p:")) != -1) + while ((ch = getopt(argc, argv, "46a:m:p:s:")) != -1) switch (ch) { case '4': hints.ai_family = PF_INET; @@ -84,12 +82,12 @@ main(int argc, char *argv []) case 'm': mflag = optarg; break; - case 's': - sflag = optarg; - break; case 'p': aia.ai_termid.at_port = htons(atoi(optarg)); break; + case 's': + sflag = optarg; + break; default: usage(prog); /* NOT REACHED */ @@ -117,14 +115,14 @@ main(int argc, char *argv []) errx(1, "%s", gai_strerror(error)); switch (res->ai_family) { case PF_INET6: - sin6 = (struct sockaddr_in6 *) res->ai_addr; + sin6 = (struct sockaddr_in6 *)(void *)res->ai_addr; bcopy(&sin6->sin6_addr.s6_addr, &aia.ai_termid.at_addr[0], sizeof(struct in6_addr)); aia.ai_termid.at_type = AU_IPv6; break; case PF_INET: - sin = (struct sockaddr_in *) res->ai_addr; + sin = (struct sockaddr_in *)(void *)res->ai_addr; bcopy(&sin->sin_addr.s_addr, &aia.ai_termid.at_addr[0], sizeof(struct in_addr)); @@ -135,6 +133,6 @@ main(int argc, char *argv []) if (setaudit_addr(&aia, sizeof(aia)) < 0) { err(1, "setaudit_addr"); } - (void) execvp(*argv, argv); + (void)execvp(*argv, argv); err(1, "%s", *argv); } From nobody Tue Nov 18 16:24:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhC2jZmz6HP3J for ; Tue, 18 Nov 2025 16:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9qhB6Zzlz4JDw for ; Tue, 18 Nov 2025 16:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xTLwHNKf9E75N5skT7/24H9QD3ez2Srt9qrSaCdsPeI=; b=h2xf4lIQfzcl122wzAwrBA3Gxv2ypGIHnwPCmfMiP9olvAFo9idaLYNtBUvuFjD+7OEYHq zfvtKqBW/5bFKmW1oe6427XZ3TjqP6JmLjm/DWJxpZQvq4QMVMWbRzj0BZxrIxqNOB2HFr dhM19cGFtyxgjcvIGj7hz0bP6baWlwyocBqJle9hApGphHQye+wrq56sNHMKVpHCA8moK8 h5FJ1d4B/rGgvQTuk6rsiTOrV7S5tfEa52/Mi1gWCCu5e3+ju+n9WEW1bECUYLCqck9YxL 8994Tcw9oaBlfUx3mKooP220wyx5/dgSbYNPqZa5SuG2LmmSESalhMKOj7mfJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xTLwHNKf9E75N5skT7/24H9QD3ez2Srt9qrSaCdsPeI=; b=TLR3lkh8GgACuZLHnQ5JV0fSQk9zc7e0wE791HjyITW1zP350sFBEfQTa0xkVz2c3QL7eA yL+ITjXoGL6N6O9jq9w8stei3AGoxNS+BcLnM802Y3WwfG13Tdk19EuvDSPRry4AfL8yEg YSahkjcStp3Jeb4FZyIWmr1m5bROnE/HQeq/B2xu+eqeDD9Uio6X5YZfoPt94j1ayVFBGD KdqbkU79knOKUPvWVCq17r1gMz1bJoVbc3dWWBOmvxj6alKBYiUn3NTtmJVLnIZPLttZZo 1s4RI+6r1zaCQDJTKT3kse2yiWhARUSSapah8A7yfc1T2qyuXVq10qHj1gNhpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763483082; a=rsa-sha256; cv=none; b=rqAXmfVESJSKC9zARSMJaITFCf5pJYvCL+LK2OoFipAwr0hlw8kWwueAy+Is4KdTgEjeBW LZVYtnhby67xm13YkBV3fBY1Liw9pf8T34MadZNEg0QfpWDaGwzVW09Zypk7o2AdzA+wqv jxruPGrAzfw1O7zgF+ZWjfVclZC5HfUiAV/IFWP94942THoBUxU7aRc5vd+Mzlq2PWSk8S 2NLU9y01P9GjghbXYGKu3FXC6hebKFYsPWRef7kFzokoTPBez2Futxxoq/qQ0+lJ231F7M +gH1MO/oa8bH3VIuBdTNIkZA2u1+Krhj3G0YlwFLiaBqtX7I2dSCn+rkG8OfOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhB646Jz11sl for ; Tue, 18 Nov 2025 16:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dbe3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 16:24:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 551191e14e22 - main - setaudit: Fix handling of numeric UIDs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 551191e14e223e1cbee5e9f72e08d4e2576b9127 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 16:24:42 +0000 Message-Id: <691c9dca.3dbe3.6c10da94@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=551191e14e223e1cbee5e9f72e08d4e2576b9127 commit 551191e14e223e1cbee5e9f72e08d4e2576b9127 Author: Mark Johnston AuthorDate: 2025-11-17 16:45:11 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 16:24:20 +0000 setaudit: Fix handling of numeric UIDs The usage of strtoul() was incorrect. Reviewed by: csjp MFC after: 2 weeks Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53671 --- usr.sbin/setaudit/setaudit.8 | 2 +- usr.sbin/setaudit/setaudit.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/usr.sbin/setaudit/setaudit.8 b/usr.sbin/setaudit/setaudit.8 index 8d0c8716ff73..7dc3e05a4473 100644 --- a/usr.sbin/setaudit/setaudit.8 +++ b/usr.sbin/setaudit/setaudit.8 @@ -45,7 +45,7 @@ Use IPv4. .It Fl 6 Use IPv6. .It Fl a Ar auid -Audit user ID. +Audit user ID or user name. .It Fl m Ar mask String representation of an audit mask. .It Fl s Ar source diff --git a/usr.sbin/setaudit/setaudit.c b/usr.sbin/setaudit/setaudit.c index bdf33ab4cf3d..adea52a83a8d 100644 --- a/usr.sbin/setaudit/setaudit.c +++ b/usr.sbin/setaudit/setaudit.c @@ -58,7 +58,7 @@ main(int argc, char *argv []) auditinfo_addr_t aia; struct addrinfo *res; struct passwd *pwd; - char *aflag, *mflag, *sflag, *r, *prog; + char *aflag, *mflag, *sflag, *prog; int ch, error; aflag = mflag = sflag = NULL; @@ -99,8 +99,10 @@ main(int argc, char *argv []) if (aflag) { pwd = getpwnam(aflag); if (pwd == NULL) { + char *r; + aia.ai_auid = strtoul(aflag, &r, 10); - if (r != NULL) + if (*r != '\0') errx(1, "%s: invalid user", aflag); } else aia.ai_auid = pwd->pw_uid; From nobody Tue Nov 18 16:24:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhF3S4Yz6HNvl for ; Tue, 18 Nov 2025 16:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9qhF0scYz4Jbj for ; Tue, 18 Nov 2025 16:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iC6FjOrhK3kVOxjL3zaoIlViUmoHCbOKyDjZFUG12Kc=; b=Dz0VXa9ZfFai2Dw2evMS9SZmUYe9T8IOLxh2JFlchMfWXkRxyFucke8ngx7NG2AYh7Qqh5 pgtqPJZGbfQkKP9LNi830mYzblTCqrG27be28d1DksJv0PBiekiuYbeUR6aOfpmRUhZJHB laeegwgalTFhSzT9TagyGITEqXmHJ5IzV0qDV5uKP/aGXorwLt/db5LY87x0KjBpiKVl6E ecmTVyXaEhbKPYGTAk1Lv7Gc4uHnFgK6IwVJIrFGmZI+DxKEhzijCb1C1H2Y++rKzoyu1B KeyowOmb2nSaa+5u7Bgq4OtGnkuNmJxrelM/kk5pbwuVJ4FFm73rbg2U6RzSFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iC6FjOrhK3kVOxjL3zaoIlViUmoHCbOKyDjZFUG12Kc=; b=dy3tWzbuG1h1Cty7z58jrUwIAs2WyIQdlm2AacZmzs07YjXxgaXdmijI0QwO8LdwjKtyka 9wisgRzu3XmH6xldPMCYgtsFHEXrPQR8U76+QV/1Ch0JNP6QC3ddUt5mDfi5Nf6SA6KL0h P9eIN+na7rtqiuuAuMrIwYUupnxNAGxBAJzMSqIZQmXngpMnqlu/KXIPRW9vcxAQ37vEIK /5XojG8DBoAZkSAeggUCbP/R3sJ0ty36aHDp1C2upIKXFBwiBkRZhwtWKQ/kfhhwpzvvFo dMrU284DZcxJBXRYPZmGq9VOCp4VNIKt9Jm/IG2Z2NIWhgZY1RTdwH0CC+0b2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763483085; a=rsa-sha256; cv=none; b=yVwyFsx5n3rb1d/Yj1MtN9RW402piW2t29qPo5+ebyuEb5ELxgYEJcbaMv0cPeGK2TxhkI /08BO/Oki/Ip5zZ0DAzTqM0DV1BTJ7nlTvjJCJMAnVEluvv79cWyZM2oeFsr2SXX5PAM1z 94kSywF2MFfOjtm4i0e7i+JBnpwGM9/PT1ACcOQ0XwRGNTEZx/1QUnetQZVRDbom/f8Pbg aQat7VzU8/Gjq0QTVLfSHgqE1DuiGkavzd/VFrK4Mp09nB6X66ZXvMK5cZ+ykrgRGjf2uZ qQJBee0Qmu1V/Q8kiZV0XX2XsEM6aLYgPiw4ipxFGVomGahe691pwhE2Dj52Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhF0SlWz128p for ; Tue, 18 Nov 2025 16:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 88aa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 16:24:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 71f6592a0150 - main - rc.subr: Remove misguided cpuset usage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71f6592a01506899efd91306b6d8147f14a6b219 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 16:24:45 +0000 Message-Id: <691c9dcd.88aa.164dcddc@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=71f6592a01506899efd91306b6d8147f14a6b219 commit 71f6592a01506899efd91306b6d8147f14a6b219 Author: Mark Johnston AuthorDate: 2025-11-17 16:45:44 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 16:24:21 +0000 rc.subr: Remove misguided cpuset usage When running an rc command, if the target rc script defines _cmd, e.g., start_cmd=..., then the run_rc_command() executes that instead of $command. In general it's a shell function, and "cpuset -l " doesn't work. Moreover, it doesn't really make sense to run cpuset for anything other than start_cmd. Other optional isolation mechanisms (e.g., _fib, _chroot) are only used when invoking $command directly as part of the "start" command. Make _cpuset consistent with everything else by removing these extraneous cpuset invocations. Reviewed by: 0mp MFC after: 2 weeks Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53746 --- libexec/rc/rc.subr | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 4718123a71e9..b0b255e8b6ff 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1375,7 +1375,7 @@ run_rc_command() _run_rc_precmd || return 1 fi if ! checkyesno ${name}_svcj; then - _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" || return 1 + _run_rc_doit "$_cmd $rc_extra_args" || return 1 else case "$rc_arg" in start) @@ -1404,7 +1404,7 @@ run_rc_command() name=svcj-${name} && _return=0 fi else - _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" || _return=1 + _run_rc_doit "$_cmd $rc_extra_args" || _return=1 fi ;; stop) @@ -1412,7 +1412,7 @@ run_rc_command() $SERVICE -E _rc_svcj=jailing -j svcj-${name} ${name} ${_rc_prefix}stop $rc_extra_args || _return=1 $JAIL_CMD -r svcj-${name} 2>/dev/null else - _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" || _return=1 + _run_rc_doit "$_cmd $rc_extra_args" || _return=1 fi ;; restart|status) ;; # no special case needed for svcj or handled somewhere else @@ -1422,7 +1422,7 @@ run_rc_command() if checkyesno _rc_svcj_extra_cmd && [ "${_rc_svcj}" != jailing ]; then $SERVICE -v -E _rc_svcj=jailing -j svcj-${name} ${name} ${_rc_prefix}${rc_arg} $rc_extra_args || _return=1 else - _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" || _return=1 + _run_rc_doit "$_cmd $rc_extra_args" || _return=1 fi ;; esac From nobody Tue Nov 18 16:24:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhG610Tz6HNYN for ; Tue, 18 Nov 2025 16:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9qhG3145z4Jl1 for ; Tue, 18 Nov 2025 16:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T9iwIMW5FCOEKsqQucm7CeBeQM7tuckQWJJgiA9TXes=; b=aGhmE3eWrJ2yG4i5cQ80V5fhohUYLmbX0YabOHFlA9sUcAkbKBcpIH1xLcvsQhldmqLsKm OPAi4ndfAxYGkon0M6+fOqcUGbrXsHbkM74DDEQcB8VwnQCvOhsQ4LITgIPgi/7FZS3SPZ DR/nsIcqk659LsyOb8ZnaiKotCaHKBArUi0e57pvhidX3iZ3xBQv4Eog1LiquiUiRAZO+T 8/SHfSGYO6yuJSuQ1byO5uUqvRpVh7JJXJkyXyFs0lxK05tNnGfmHWajRDZMSuAuBrfpy/ 7Ntduan2zZnaqn8TdUN8EIQP/sU6L9UOk6vbyH90z1Zl3N4kcvOps2g6BzRrKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T9iwIMW5FCOEKsqQucm7CeBeQM7tuckQWJJgiA9TXes=; b=jR6QYOetFfd7Mjyz9s/BGG86kD0ZkYyo7I+mXYE0TggDkytelWqBrdDBn2ylspoaqZEWMu bMs+iwghOeq8POMfaOebnfXo42AseMnWmQCwewlqlqOLuXfLG+W5fIiPXGl6EzkpIKIO1l KyFPdDt+x2NQ/xC717cQxac+QeEb43PsJbLbw7fk5LTh2rbxJ4R9Zg483vB1UukXbRumhS +rBFQGwjvyN7QOi1I2xwX1W2HX3CtEapuQbM8kz8AuYhS47bKM6GjDFuNV51EN3jzNHV9s g3SGO1+JHUkXJr6NU94Vbh88EnC2YzX9zq6CXprUK/JwNLE3OURdOWocEGj2gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763483086; a=rsa-sha256; cv=none; b=f2O+DXCKTXvcQFG4gomtcwZUULnw26PmWGjAU1MOmMC8YibD5CM78jhDmi+Qk+3ljh/jUS 0wBF8Ulv/GbBN1GApnGwkT677l6xQg81OoVC9kwCsETrpiLo+5kT2Ebk81LPQBeI4idLmj tC2XFb3GZ94a+hJ8b4Hoq5opIYJNnV2/F5eEYFRWpyh5zrYlfUIrnppvwhqSfPMk+QObsu bBatE6Ug9B+H7uhdgFXaALb+1axIXh7KSrDB73Qp0BEBgStGXlIYW6fa30FLlVGdHx6yYt JirlAvZiuX3JcAgGvExQQpEaY7b464Dvio60D4kusiQs60wXEyxuQo2+oBLHLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhG1Jdsz11pP for ; Tue, 18 Nov 2025 16:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 88ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 16:24:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 39ee24182b92 - main - rc.subr: Support setting the audit user when starting services List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39ee24182b92114d006abc2b8095334a1d8a083c Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 16:24:46 +0000 Message-Id: <691c9dce.88ae.1f053f59@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=39ee24182b92114d006abc2b8095334a1d8a083c commit 39ee24182b92114d006abc2b8095334a1d8a083c Author: Mark Johnston AuthorDate: 2025-11-17 16:45:58 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 16:24:21 +0000 rc.subr: Support setting the audit user when starting services When an unprivileged user restarts a service using, e.g., sudo, the service runs with the audit user ID set to that of the unprivileged user. This can have surprising effects: for instance, a user that restarts a jail that is running sshd will end up with their UID attached to all audit logs associated with users who log in via that sshd instance. (sshd will set the audit user, but this is disallowed in jails by default.) Add support for rc.conf directives which cause rc to override the audit user. Specifically, make _audit_user=foo cause the audit user to be set to "foo" for service . A plain audit_user=foo directive causes all services to be started as foo. Note, like other similar rc features, this feature is limited to rc services which are run by executing a command. Shell functions can't be wrapped this way. Reviewed by: 0mp MFC after: 2 weeks Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53747 --- libexec/rc/rc.subr | 18 +++++++++++++++++- share/man/man5/rc.conf.5 | 14 ++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index b0b255e8b6ff..5199a915297d 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -55,6 +55,7 @@ JAIL_CMD=/usr/sbin/jail _svcj_generic_params="path=/ mount.nodevfs host=inherit" JID=0 CPUSET="/bin/cpuset" +SETAUDIT="/usr/sbin/setaudit" # Cache the services that we loaded with load_rc_config. _loaded_services="" @@ -933,6 +934,9 @@ startmsg() # Meant to be used in /etc/rc.conf to override # ${command}. # +# ${name}_audit_user n Override the audit user for ${command}, +# specified as a user name or UID. +# # ${name}_chroot n Directory to chroot to before running ${command} # Requires /usr to be mounted. # @@ -1151,6 +1155,15 @@ run_rc_command() _cpusetcmd="$CPUSET -l $_cpuset" fi + eval _audit_user=\$${name}_audit_user + if [ -z "$_audit_user" -a -n "$audit_user" ]; then + _audit_user=$audit_user + fi + _setauditcmd= + if [ -n "$_audit_user" ]; then + _setauditcmd="setaudit -U -a $_audit_user" + fi + # If a specific jail has a specific svcj request, honor it (YES/NO). # If not (variable empty), evaluate the global svcj catch-all. # A global YES can be overriden by a specific NO, and a global NO is overriden @@ -1515,6 +1528,7 @@ run_rc_command() _doit="\ ${_nice:+nice -n $_nice }\ $_cpusetcmd \ +$_setauditcmd \ ${_fib:+setfib -F $_fib }\ ${_env:+env $_env }\ chroot ${_user:+-u $_user }${_group:+-g $_group }${_groups:+-G $_groups }\ @@ -1524,7 +1538,9 @@ $_chroot $command $rc_flags $command_args" _doit="\ ${_fib:+setfib -F $_fib }\ ${_env:+env $_env }\ -$_cpusetcmd $command $rc_flags $command_args" +$_cpusetcmd \ +$_setauditcmd \ +$command $rc_flags $command_args" if [ -n "$_user" ]; then _doit="su -m $_user -c 'sh -c \"$_doit\"'" fi diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 6274c1ee5b94..fa8d8aab8c4e 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 5, 2025 +.Dd November 14, 2025 .Dt RC.CONF 5 .Os .Sh NAME @@ -190,6 +190,17 @@ Setting this option will bypass that check at boot time and always test whether or not the service is actually running. Enabling this option is likely to increase your boot time if services are enabled that utilize the force_depend check. +.It Ao Ar name Ac Ns Va _audit_user +.Pq Vt str +A user name or UID to use as the +.Xr audit 4 +user for the service. +Run the chrooted service under this system group. +By default, when an unprvileged user restarts a service using a utility +such as sudo or doas, the service's will audit session will point to the +unprivileged user, which may be undesirable. +In that case, this variable can be used to override the audit user using +.Xr setaudit 8 . .It Ao Ar name Ac Ns Va _chroot .Pq Vt str .Xr chroot 8 @@ -209,7 +220,6 @@ The value to run the service under. .It Ao Ar name Ac Ns Va _group .Pq Vt str -Run the chrooted service under this system group. Unlike the .Ao Ar name Ac Ns Va _user setting, this setting has no effect if the service is not chrooted. From nobody Tue Nov 18 16:24:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhH4z0Vz6HP6M for ; Tue, 18 Nov 2025 16:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9qhH2Zysz4JX4 for ; Tue, 18 Nov 2025 16:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Llrc7nT3cZqRcsR9CJkYvm5PhXqkejZRpjAZVy1MxeE=; b=ifX6gB85E7UdmjY4DmqUUmwsMUsqkJVLjhy94LHQLjnGsDgDTeATA8oZzvxs+ql7XgcrPh WhbLEeub4ELIgLnXUVABBAY+uZP6oiq1j/M+DoI9mLkB+IZuX6nK13GoD1D3hdpCFdTrko qyNWp2ftiW2kXpea/NLFXgP9T1CCuC1/ohMZoDVjmWI1C8B+xX4kAztd7h7T82BwJnM7u4 yX+530vEdzfbUiEEcb9dyhItp0w/POa0s5TGTeIq66EjdGAXhUfAhoZZ+mTCwRkUpxAqq8 D5R4/+GkH0TMkxgqQD+EBYjJU8jPPKgLyiDIblfVQJemZtMu3YZmowqdE+1k4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Llrc7nT3cZqRcsR9CJkYvm5PhXqkejZRpjAZVy1MxeE=; b=CHkozCd38xOQoUBjEngsfiNeY6MCFWdcvNTcOu+3f0OE8H8kLxwh8n68NvxephJ46YV5YM VXFiZ6aRY5VpmIAYmEUFtJDWJqPdPRUx+WqMwI0CkBH91sZchctJZ19JKqaSiFOMsWbLM4 FSy5cfzjn0lU0/HRdFKr9ypbWYQBGcopFMFTMwfpwLN1LYpmfMdt9095BLZY3TrZNDq5t4 TZqAtkalXOUBDzXRz855X1KSzzjz23Sr6+MK7obOzKr1qrOhkEWvreHhQ1pxgWAr/4kX2/ zdnRDI5UO+Cq3MlvfzrpgTm3SXl+X31Gtw7Swh4r4T4kruch6s1mCyVyoDGfIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763483087; a=rsa-sha256; cv=none; b=AxCZ+nykHMm1j21FTp7rRgvoxhrg+YJhiy6vsy4NN8Atd+279OScfdg/v63ncMyZCOjXSr IuUAsTAmzN3Ey5W7HwLEOZdO5M3r2i1JXSMD+Yy1bK5WyslbSKMgns+XYidqS4w3wOTo25 ohkM7BsAS9u21Zoh3ao6NwVPCGJznAKBRwMjF2sDwyDC7xWdQfQvGkxqfXPzdw7z7LDUK+ Wi8iLEzaTBPQRzqIVLnGEbPLWK6oXMM2U6dnZuLHikTrFoNynCyTTk5wf6+B3vSjZ2LS1h 7C5b604b0U74NH5L5Wu9346+GgqOicmhxGZaX4feh4M1RnUNPSjsLfYvqguCkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhH27m6z121x for ; Tue, 18 Nov 2025 16:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f040 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 16:24:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d795c753e262 - main - kevent: Hold the knlist mutex when invoking f_event(NOTE_FORK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d795c753e262b97a93dc353aa66b858e1b1969d1 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 16:24:47 +0000 Message-Id: <691c9dcf.3f040.6dbd3106@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d795c753e262b97a93dc353aa66b858e1b1969d1 commit d795c753e262b97a93dc353aa66b858e1b1969d1 Author: Mark Johnston AuthorDate: 2025-11-18 14:22:04 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 16:24:21 +0000 kevent: Hold the knlist mutex when invoking f_event(NOTE_FORK) In general f_event is supposed to be called with the knlist mutex held, so lock it earlier to follow this protocol. Also make sure that the update to kn_fflags is synchronized. Lock the kqueue itself earlier in the case where the knote is activated, to avoid locking and unlocking the kqueue twice. PR: 291005 Reported by: Qiu-ji Chen Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53762 --- sys/kern/kern_event.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 1baa24d278bf..a48408fd482a 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -627,12 +627,20 @@ knote_fork(struct knlist *list, int pid) kev.data = kn->kn_id; /* parent */ kev.udata = kn->kn_kevent.udata;/* preserve udata */ error = kqueue_register(kq, &kev, NULL, M_NOWAIT); + + /* + * Serialize updates to the kn_kevent fields with threads + * scanning the queue. + */ + list->kl_lock(list->kl_lockarg); if (error) kn->kn_fflags |= NOTE_TRACKERR; - if (kn->kn_fop->f_event(kn, NOTE_FORK)) - KNOTE_ACTIVATE(kn, 0); - list->kl_lock(list->kl_lockarg); - KQ_LOCK(kq); + if (kn->kn_fop->f_event(kn, NOTE_FORK)) { + KQ_LOCK(kq); + KNOTE_ACTIVATE(kn, 1); + } else { + KQ_LOCK(kq); + } kn_leave_flux(kn); KQ_UNLOCK_FLUX(kq); } From nobody Tue Nov 18 16:24:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhK2sFdz6HNp2 for ; Tue, 18 Nov 2025 16:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9qhK0LwLz4Jr6 for ; Tue, 18 Nov 2025 16:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S0z3fN+RL+KlZgr6pzf6x2WnRAPmONPjtkLaBSk0U08=; b=IgmyBGGU6YwUyEACpRdiIAEaBzLBvkRnAk2mDb0XQjn6+oNU02ZvCob5KxmvebR2AGvehm 9yqvRKdEcFPDCo+8h385jvJsqzpYUxTU8u2xKlJGxUYSbdN1UDIPfy7nWDFJGb0QzRUEos ySfHM/0C110VAaRVyFcBDSYHrHK9ZF+2ZecwXci/xv3LmSC2YKOtdmToHmwaHOVJgRZwdA 98RC3V7tZgoPnez/9NztHm1WhU09R7iROVUXnp3pHf9WoKKTgQ9Ih5hjmGfvDkHT2H/KkB 4V+d+dK/8r8Z8OdWsNVoyuBWwHDg/YAujgqJmcu+ZmvONmx2ek9oeQ+m+K7f1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S0z3fN+RL+KlZgr6pzf6x2WnRAPmONPjtkLaBSk0U08=; b=I2viyEiARRsvEwczkFxNINPZ7ZDfTVf9fsuAA2pj0Qx0Fr/MeTI4E3i6kJ731z93w9mlMn V4IcmdUpH0qz8HRIDDg8Bqr01xUFQmLIvi3rBCvTWLEHTeLg4wP1V48iu+qm/7ZKnOo/rN zl3dq2/bZ69l+TJE8DtcfIExxR4Xipyh69ixC50bkQadH8g0r+VdwaDBoG+2gFL7HJ8dIW vGriTyb9jFE4QERAbrFWWVGQiry5GrWWrwV4YP59/QSiMjXfjRPIEGPjfdeYCXLYCxdiwc b8n8zZ3vyeCQNoxXcKB4YGQxO82sKQod29iBMI/6dxt6iqwqkklnZf2CSevtbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763483089; a=rsa-sha256; cv=none; b=wLTvzTb9qwXUKRJVtAu3C2ZOaG2ADxyyGRQaTMvhLEcK87xm0+gCAXrIjQeRhrXwchQxf6 pFbFMjpSKmW+nOwQbOfnOHvOicn8SmMs6zK/b/Kylb2oDpPRUOaUsSQKxoHpj9ciye8REU Z0gdGBAtD3SxIvTFIX4gdGXjZ8iCt4MSSjHTGMgzLK6tUJE3XNW3GnAZxf3lKW2ceo5q3S Ku0W8TjQLwHqKUNEvVwumPzkS7mV9W2/1OKjjyeqlOIH9mce7mwcIlunioloi5BSOxYmxW yk4GcvgYe6n5gB0QA8K6kv2TjmR++7A/E36/W5A6vYFrSrIxATWGiYT09dOqWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhC6pcSz128n for ; Tue, 18 Nov 2025 16:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8191 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 16:24:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1238610a27d5 - main - setaudit: Add an update mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1238610a27d5bc0914f524296ff587d86eec4c52 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 16:24:43 +0000 Message-Id: <691c9dcb.8191.1e4921e0@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1238610a27d5bc0914f524296ff587d86eec4c52 commit 1238610a27d5bc0914f524296ff587d86eec4c52 Author: Mark Johnston AuthorDate: 2025-11-17 16:45:29 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 16:24:20 +0000 setaudit: Add an update mode By default, setaudit(8) overwrites the whole audit session state. For the purpose of overwriting only a single field, e.g., the audit user, this is inconvenient. Add -U to accomodate this case: when specified, setaudit(8) will first fetch the current session state block and then will only overwrite those fields specified on the command line. Reviewed by: csjp MFC after: 2 weeks Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53672 --- usr.sbin/setaudit/setaudit.8 | 12 +++++++++++- usr.sbin/setaudit/setaudit.c | 38 ++++++++++++++++++++++++++++---------- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/usr.sbin/setaudit/setaudit.8 b/usr.sbin/setaudit/setaudit.8 index 7dc3e05a4473..7dd66225979c 100644 --- a/usr.sbin/setaudit/setaudit.8 +++ b/usr.sbin/setaudit/setaudit.8 @@ -28,7 +28,7 @@ .Nd "specify audit configurations on a process" .Sh SYNOPSIS .Nm -.Op Fl 46 +.Op Fl 46U .Op Fl a Ar auid .Op Fl m Ar mask .Op Fl s Ar source @@ -44,6 +44,16 @@ The following options are available: Use IPv4. .It Fl 6 Use IPv6. +.It Fl U +Update audit session state rather than overwriting it. +By default, +.Nm +will overwrite the entire audit session state using the specified +parameters. +If +.Fl U +is specified, only the parameters given on the command line will be +updated, leaving the rest unchanged. .It Fl a Ar auid Audit user ID or user name. .It Fl m Ar mask diff --git a/usr.sbin/setaudit/setaudit.c b/usr.sbin/setaudit/setaudit.c index adea52a83a8d..af8f481afcb3 100644 --- a/usr.sbin/setaudit/setaudit.c +++ b/usr.sbin/setaudit/setaudit.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -44,7 +45,7 @@ static void usage(char *prog) { (void)fprintf(stderr, - "usage: %s [-46] [-a auid] [-m mask] [-s source] [-p port] command ...\n", + "usage: %s [-46U] [-a auid] [-m mask] [-p port] [-s source] command ...\n", prog); exit(1); } @@ -56,19 +57,21 @@ main(int argc, char *argv []) struct sockaddr_in *sin; struct addrinfo hints; auditinfo_addr_t aia; - struct addrinfo *res; - struct passwd *pwd; char *aflag, *mflag, *sflag, *prog; + dev_t term_port; + uint32_t term_type; int ch, error; + bool Uflag; aflag = mflag = sflag = NULL; + Uflag = false; prog = argv[0]; bzero(&aia, sizeof(aia)); bzero(&hints, sizeof(hints)); - aia.ai_termid.at_type = AU_IPv4; + term_type = AU_IPv4; hints.ai_family = PF_UNSPEC; - while ((ch = getopt(argc, argv, "46a:m:p:s:")) != -1) + while ((ch = getopt(argc, argv, "46a:m:p:s:U")) != -1) switch (ch) { case '4': hints.ai_family = PF_INET; @@ -83,11 +86,14 @@ main(int argc, char *argv []) mflag = optarg; break; case 'p': - aia.ai_termid.at_port = htons(atoi(optarg)); + term_port = htons(atoi(optarg)); break; case 's': sflag = optarg; break; + case 'U': + Uflag = true; + break; default: usage(prog); /* NOT REACHED */ @@ -96,7 +102,14 @@ main(int argc, char *argv []) argv += optind; if (argc == 0) usage(prog); + + if (Uflag) { + if (getaudit_addr(&aia, sizeof(aia)) < 0) + err(1, "getaudit_addr"); + } if (aflag) { + struct passwd *pwd; + pwd = getpwnam(aflag); if (pwd == NULL) { char *r; @@ -112,6 +125,8 @@ main(int argc, char *argv []) err(1, "getauditflagsbin"); } if (sflag) { + struct addrinfo *res; + error = getaddrinfo(sflag, NULL, &hints, &res); if (error) errx(1, "%s", gai_strerror(error)); @@ -121,20 +136,23 @@ main(int argc, char *argv []) bcopy(&sin6->sin6_addr.s6_addr, &aia.ai_termid.at_addr[0], sizeof(struct in6_addr)); - aia.ai_termid.at_type = AU_IPv6; + term_type = AU_IPv6; break; case PF_INET: sin = (struct sockaddr_in *)(void *)res->ai_addr; bcopy(&sin->sin_addr.s_addr, &aia.ai_termid.at_addr[0], sizeof(struct in_addr)); - aia.ai_termid.at_type = AU_IPv4; + term_type = AU_IPv4; break; } } - if (setaudit_addr(&aia, sizeof(aia)) < 0) { - err(1, "setaudit_addr"); + if (!Uflag || sflag) { + aia.ai_termid.at_port = term_port; + aia.ai_termid.at_type = term_type; } + if (setaudit_addr(&aia, sizeof(aia)) < 0) + err(1, "setaudit_addr"); (void)execvp(*argv, argv); err(1, "%s", *argv); } From nobody Tue Nov 18 18:02:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ss715PXz6HWcf for ; Tue, 18 Nov 2025 18:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9ss66pdKz3HgB for ; Tue, 18 Nov 2025 18:02:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rzd46T6+d711jun4MOU36phybPDFynEmuzSoE78zcQY=; b=cp4Fr7prqNJDcQPRvFVKNINVUQMM1z0aIVjDEGt72p1PxkKJPLIplEXtGyHEKz8vlWh1wO Ype1oRQZEUsS6c8uaaOL4eCbLyY1vTBdj89RBOnlU0YW6M8n+n8RBdg3LCrrTo1P/c7b3S wORfG1m5Wb3KxVIHSLvG5etn+53ty/J9gxxSYQyYOftd11h0B67RNjqvlD2/xlM9DKPnac +pkMc1D7DND/nzv8XcQ+zIq3LUaOVSsZoRvcQ2gDlhr3cazP8BoL26+/zVVjbjfM/mXCe2 mB8MT/nymyp10rnx3wMsjoDix/vxeQ/xoR8IanHwjlxJNs7IzV0uXCe0ABBPQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rzd46T6+d711jun4MOU36phybPDFynEmuzSoE78zcQY=; b=OJkMkHlgycHj0qRwLEyXMDeiFYkEozNK/kyEteZW/MVJYXmQok7lNlXzvb27sgUWK4iq/G ybHRPk50OpM6MqcZDvecM90z+ClWA2ee88g/ojBTGXy1H24lgQLie46eTTquoIkQENUy8P hrfbn0npdwp5kPdLQECQNVjGzROOd3Skmcl3KNI4yPWH8keGWh5ie9weYmoKYhyZY6JNu5 0P41iadKc25B3Oxx6h8MLOmL/E3typwDfQocJ+oGseDhq61lGxIUToof1cxSXHrF8E3ik3 nUOoun2JsqUMv0XTPitE85jqdKPgYGqDdNJ1NlVJKRiPY6QGc2p45OCu0lrbZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763488955; a=rsa-sha256; cv=none; b=ZNqGE/psKeXzUflQ+81Dp4XSh1EHHdbf7wJndjx1wsAJMV0bDBuDq1m3hr0NrnZAtaCjDa TZJcbU5g1Y2jdKP7zjrUyVjEu0iGCC72Kr95B60q35CZ3AnNcXihc6J+kro02cgQWJVch1 rocx8cZvRJJDSYW9NyOD5z6KIN7wTzd/8SGUGbKEEjXoqI+JJZaOJz7VLHyuRTA86M4NWA xBODMD7s2l6j+EayAbNyrPuiM8q9J+PhxiCZo0qxFeDH0FtRN4dcNrFpTNfGUwYJgVZlrC eDjTVgWX2W2dOnrbALOLyhHDP1rCha7u0Z94/rNiQstyMIUR+LUf3HjKlJwSdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9ss66H4pz14q0 for ; Tue, 18 Nov 2025 18:02:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22f84 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 18:02:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 68e6422c6c91 - main - dev/fdt: Add support for non-PCI MSI interrupts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68e6422c6c91170a615e77028683a157e8e39d05 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 18:02:34 +0000 Message-Id: <691cb4ba.22f84.6534df2a@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=68e6422c6c91170a615e77028683a157e8e39d05 commit 68e6422c6c91170a615e77028683a157e8e39d05 Author: Andrew Turner AuthorDate: 2025-11-18 18:00:30 +0000 Commit: Andrew Turner CommitDate: 2025-11-18 18:00:30 +0000 dev/fdt: Add support for non-PCI MSI interrupts Some non-PCI devices can send interrupts, e.g. the Arm SMMU or GICv5 Interrupt Wire Bridge. Add support for these by implementing pci_get_id and pci_alloc_msi and the MSI/MSI-X parts of the PCIB interface. Only the MSI parts of the PCI interface are added as that is all I am able to test. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53330 --- sys/dev/fdt/simplebus.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/sys/dev/fdt/simplebus.c b/sys/dev/fdt/simplebus.c index a301fb0f247c..3e77f13104ff 100644 --- a/sys/dev/fdt/simplebus.c +++ b/sys/dev/fdt/simplebus.c @@ -40,6 +40,9 @@ #include +#include "pci_if.h" +#include "pcib_if.h" + /* * Bus interface. */ @@ -62,6 +65,21 @@ static ssize_t simplebus_get_property(device_t bus, device_t child, static const struct ofw_bus_devinfo *simplebus_get_devinfo(device_t bus, device_t child); +/* + * PCI interface for MSI interrupts + */ +static pci_get_id_t simplebus_get_id; +static pci_alloc_msi_t simplebus_alloc_msi; + +/* + * PCIB interface + */ +static pcib_alloc_msi_t simplebus_pcib_alloc_msi; +static pcib_release_msi_t simplebus_pcib_release_msi; +static pcib_alloc_msix_t simplebus_pcib_alloc_msix; +static pcib_release_msix_t simplebus_pcib_release_msix; +static pcib_map_msi_t simplebus_pcib_map_msi; + /* * Driver methods. */ @@ -105,6 +123,17 @@ static device_method_t simplebus_methods[] = { DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), + /* PCI interface for MSI interrupts */ + DEVMETHOD(pci_get_id, simplebus_get_id), + DEVMETHOD(pci_alloc_msi, simplebus_alloc_msi), + + /* PCIB interface */ + DEVMETHOD(pcib_alloc_msi, simplebus_pcib_alloc_msi), + DEVMETHOD(pcib_release_msi, simplebus_pcib_release_msi), + DEVMETHOD(pcib_alloc_msix, simplebus_pcib_alloc_msix), + DEVMETHOD(pcib_release_msix, simplebus_pcib_release_msix), + DEVMETHOD(pcib_map_msi, simplebus_pcib_map_msi), + DEVMETHOD_END }; @@ -534,3 +563,108 @@ simplebus_print_child(device_t bus, device_t child) rv += bus_print_child_footer(bus, child); return (rv); } + +static int +simplebus_get_id(device_t dev, device_t child, enum pci_id_type type, + uintptr_t *id) +{ + phandle_t node, xref; + pcell_t *cells; + uintptr_t rid; + int error, ncells; + + if (type != PCI_ID_MSI) + return (EINVAL); + + node = ofw_bus_get_node(child); + error = ofw_bus_parse_xref_list_alloc(node, "msi-parent", "#msi-cells", + 0, &xref, &ncells, &cells); + if (error != 0) + return (error); + + rid = 0; + if (ncells > 0) + rid = cells[0]; + + *id = rid; + return (0); +} + +static int +simplebus_alloc_msi(device_t bus, device_t child, int *count) +{ + struct simplebus_devinfo *ndi; + struct resource_list_entry *rle; + int error, i, irq_count, *irqs; + + if (*count < 1) + return (EINVAL); + + ndi = device_get_ivars(child); + if (ndi == NULL) + return (ENXIO); + + /* Only MSI or non-MSI for now */ + rle = resource_list_find(&ndi->rl, SYS_RES_IRQ, 0); + if (rle != NULL && rle->res != NULL) + return (ENXIO); + + irq_count = *count; + irqs = mallocarray(irq_count, sizeof(int), M_DEVBUF, M_WAITOK | M_ZERO); + + error = PCIB_ALLOC_MSI(bus, child, irq_count, irq_count, irqs); + if (error != 0) + goto out; + + for (i = 0; i < irq_count; i++) { + error = bus_generic_rl_set_resource(bus, child, SYS_RES_IRQ, + i + 1, irqs[i], 1); + if (error != 0) + break; + } + + /* Clean up resources if something failed */ + if (error != 0) { + for (int j = 0; j < i; j++) { + bus_generic_rl_delete_resource(bus, child, SYS_RES_IRQ, + j + 1); + } + } +out: + free(irqs, M_DEVBUF); + return (error); +} + +static int +simplebus_pcib_alloc_msi(device_t dev, device_t child, int count, int maxcount, + int *irqs) +{ + return (PCIB_ALLOC_MSI(device_get_parent(dev), child, count, maxcount, + irqs)); +} + +static int +simplebus_pcib_release_msi(device_t dev, device_t child, int count, int *irqs) +{ + return (PCIB_RELEASE_MSI(device_get_parent(dev), child, count, irqs)); +} + +static int +simplebus_pcib_alloc_msix(device_t dev, device_t child, int *irq) +{ + return (PCIB_ALLOC_MSIX(device_get_parent(dev), child, irq)); +} + +static int +simplebus_pcib_release_msix(device_t dev, device_t child, int irq) +{ + return (PCIB_RELEASE_MSIX(device_get_parent(dev), child, irq)); +} + +static int +simplebus_pcib_map_msi(device_t dev, device_t child, int irq, uint64_t *addr, + uint32_t *data) +{ + return (PCIB_MAP_MSI(device_get_parent(dev), child, irq, addr, + data)); +} From nobody Tue Nov 18 18:02:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ss83Fkmz6HWsK for ; Tue, 18 Nov 2025 18:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9ss80Rz4z3HnJ for ; Tue, 18 Nov 2025 18:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=prfEOP0RN2DXzBbHJTPKm7TgDHF68xP2a1BG9r1J8Lc=; b=Rxlc3pu0bctCDdDgOvroAnnRVVd3n6dipCid2GvsBEUDoURxW3wZtiJ/issLsujdgkh1aQ 4EFsOoGYuwm3S90rfb1/+rpcvhP4lAbWi03fRKdIGV+2EEi3WAShz4OGqzQESY8bC0YhGr TytO2en1xtRQS8JolLoovpE+KB7o+1r9Y7vr2s9d6+Gs5AI78m7F8hemXdotglCCuABjas 4T6iXMvT4KXbkTyYfNI0f1dUYG8kxsLf4WWezyMWpLgRoOEzQhmYD/VPnFguE7YNJ+1M4I zlCEFEsBkbT3bZHkz00LpQ7tZfNLeD1JbWyHsomoiOPbeAwiZl4erfpfvQkGTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=prfEOP0RN2DXzBbHJTPKm7TgDHF68xP2a1BG9r1J8Lc=; b=sYd1ef0c6tBdhf5O2se8Ek/bCAIj9+2RWSvPUoBrZy+7pKvbS9ly0p74NXab3VHLbz6blv DYiJicbAt9Qng17LVxw7u5SKynbFl2M/0RKby8bENREh+hC5vOYJDon8NUTKaXIyYVFVy0 fgZDTo10OcMguoenKT1m0JRbMTrL3ydeNEwMzdUmes/6MnMy6Yt7hLBTbZvK1EEtj4mRFe twP59LeTlCfu29eJCNtq3/bF0rO4b0ET78FV/XbWM2FOUANEWwQzCNXGkXXZ4FWew8vVel kuTTv0zb35b0XsLV7LNcsIfNnWoTs/Q0s+79ttvGkl8EddOPsl3wKlfDybz0cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763488956; a=rsa-sha256; cv=none; b=b/SpyuFbIlWNNU6NK7wi+JhvTLJWJKw6r4y2L8mLNYgIRksLkFh/U/NbmFn5f4hbmwBaBt I/FU+78OwC8KADK9otwMSBEJxnv82yRl1uz/X6HoMZuYdS9n9vrR+WPJGF4S0GjckY0dkI obFQ4IW4c+NBT6chi2rQBdF0lZpsZsM52KR17PiESvEnlSGhF2X68AAKSKrYW5CdUNcKHd Tr3Vf/NzjfATU9TE+szOiW595+mEOLo443lvbojQIZqcKw5nRUfZx9p7KUNnFiwS6Mh+x2 QBayojtu+cp2EHP9AY6xPwYDWM//y1zukWzI1ZFA0Qm7o17T8wJbH1pqopmbJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9ss7725Nz14Bc for ; Tue, 18 Nov 2025 18:02:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22c59 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 18:02:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 4713f5401317 - main - arm64: Add non-PCI MSI support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4713f54013176fc73ada29cf094016fd3b328c80 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 18:02:35 +0000 Message-Id: <691cb4bb.22c59.19cdc0e7@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4713f54013176fc73ada29cf094016fd3b328c80 commit 4713f54013176fc73ada29cf094016fd3b328c80 Author: Andrew Turner AuthorDate: 2025-11-18 18:00:30 +0000 Commit: Andrew Turner CommitDate: 2025-11-18 18:00:30 +0000 arm64: Add non-PCI MSI support Add the arm64 parts to support for non-PCI MSI and MSI-X interrupts. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53331 --- sys/arm64/arm64/nexus.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c index 26b3389db172..012bf859eb3c 100644 --- a/sys/arm64/arm64/nexus.c +++ b/sys/arm64/arm64/nexus.c @@ -72,6 +72,8 @@ #include "acpi_bus_if.h" #endif +#include "pcib_if.h" + extern struct bus_space memmap_bus; static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device"); @@ -123,6 +125,15 @@ static bus_get_bus_tag_t nexus_get_bus_tag; #ifdef FDT static ofw_bus_map_intr_t nexus_ofw_map_intr; +/* + * PCIB interface + */ +static pcib_alloc_msi_t nexus_fdt_pcib_alloc_msi; +static pcib_release_msi_t nexus_fdt_pcib_release_msi; +static pcib_alloc_msix_t nexus_fdt_pcib_alloc_msix; +static pcib_release_msix_t nexus_fdt_pcib_release_msix; +static pcib_map_msi_t nexus_fdt_pcib_map_msi; + #endif static device_method_t nexus_methods[] = { @@ -441,6 +452,13 @@ static device_method_t nexus_fdt_methods[] = { /* OFW interface */ DEVMETHOD(ofw_bus_map_intr, nexus_ofw_map_intr), + /* PCIB interface */ + DEVMETHOD(pcib_alloc_msi, nexus_fdt_pcib_alloc_msi), + DEVMETHOD(pcib_release_msi, nexus_fdt_pcib_release_msi), + DEVMETHOD(pcib_alloc_msix, nexus_fdt_pcib_alloc_msix), + DEVMETHOD(pcib_release_msix, nexus_fdt_pcib_release_msix), + DEVMETHOD(pcib_map_msi, nexus_fdt_pcib_map_msi), + DEVMETHOD_END, }; @@ -518,6 +536,73 @@ nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int icells, irq = intr_map_irq(NULL, iparent, (struct intr_map_data *)fdt_data); return (irq); } + +static int +nexus_fdt_pcib_alloc_msi(device_t dev, device_t child, int count, int maxcount, + int *irqs) +{ + phandle_t msi_parent; + int error; + + error = ofw_bus_msimap(ofw_bus_get_node(child), 0, &msi_parent, NULL); + if (error != 0) + return (error); + + return (intr_alloc_msi(dev, child, msi_parent, count, maxcount, irqs)); +} + +static int +nexus_fdt_pcib_release_msi(device_t dev, device_t child, int count, int *irqs) +{ + phandle_t msi_parent; + int error; + + error = ofw_bus_msimap(ofw_bus_get_node(child), 0, &msi_parent, NULL); + if (error != 0) + return (error); + + return (intr_release_msi(dev, child, msi_parent, count, irqs)); +} + +static int +nexus_fdt_pcib_alloc_msix(device_t dev, device_t child, int *irq) +{ + phandle_t msi_parent; + int error; + + error = ofw_bus_msimap(ofw_bus_get_node(child), 0, &msi_parent, NULL); + if (error != 0) + return (error); + + return (intr_alloc_msix(dev, child, msi_parent, irq)); +} + +static int +nexus_fdt_pcib_release_msix(device_t dev, device_t child, int irq) +{ + phandle_t msi_parent; + int error; + + error = ofw_bus_msimap(ofw_bus_get_node(child), 0, &msi_parent, NULL); + if (error != 0) + return (error); + + return (intr_release_msix(dev, child, msi_parent, irq)); +} + +static int +nexus_fdt_pcib_map_msi(device_t dev, device_t child, int irq, uint64_t *addr, + uint32_t *data) +{ + phandle_t msi_parent; + int error; + + error = ofw_bus_msimap(ofw_bus_get_node(child), 0, &msi_parent, NULL); + if (error != 0) + return (error); + + return (intr_map_msi(dev, child, msi_parent, irq, addr, data)); +} #endif #ifdef DEV_ACPI From nobody Tue Nov 18 18:02:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ss92z9yz6HWck for ; Tue, 18 Nov 2025 18:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9ss90wHZz3HZL for ; Tue, 18 Nov 2025 18:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pxkum9abNf43BMqFoL249vi3/pMi+xs+XB5eXl80pxA=; b=pG7/O2/Kt2M373PeFUziABT8GrTsyLoKj9C3n0wb5yA3X1R/YeoMvVTv5u7ABo4pGpptsF hnR0iNCtMiErbSgcjANeueHMaMAqbBNWUGDnD76w6lNKOvfoP0s2QzwzDlBXUSjzobDEaR TFQH6IkP/cFKieBcg+z0nDz5BJbhmKM1h7o+poYKJAIpJQp4lDVqn66V+kr7f4tknOe2O2 /+kDRzAsmlsagEI9atbh8boq9LQC7pxE+i4CTpvAc8Ji2c6Ec0dTVNTWuDKz9fVQqRiHzw MrRx59G/LgA5hkcNJrnDsLzwh9JaTUcy/qnAZxk7/vBipgVCHZIUUrHa170k6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pxkum9abNf43BMqFoL249vi3/pMi+xs+XB5eXl80pxA=; b=S2zJPLq34jhw/68PJ0zAcE+bsoKO8AXyoHEOIyxNQQGmA99b9hDhDX7f6l/VhcAc8/lgNG 7u6smwqH2i8s5cHkAu9BZx1dhKzjqS1R5lSW3pTJE/Ki4HTDMgu1H3RPPxm4EWGKETOsOf Uhx6PDJOgZ0C0HyoD/OUY2UtwXtofmgBmB9dIOmSR/ec6TsR9FXorhVS1MUOsPBG09GzI+ MzEZoqzqorxLVvC68re4Sip+EoUo1e6FrngVKnKee0VxbOKATBh9f77qCT+vgRdkwK5iyB sw1jqbhH0qhMwm4PS0NG62MbuBT5RaxXlTaWR4uWuucxPRFBDf012DvQpsSNFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763488957; a=rsa-sha256; cv=none; b=Pdk/tcDWpbPGgls1r+LsnZCfnK06EVN40PFKZXRNdLjQXCcJZ3OGjEtlZbTydHIx1LgGog hdOfeRdlRMSTrhVSAUd4RLlo9HlLVXMWBCG38YUJDGKourXFtHnFcj0LvRdvWQ56ufmZlf qfC7R1+z+4LMT1DfPmgLAPEq7GpASw4irAssFlCAoa4NDJZ304G0263gj0JKPiRw6KzBSh MLMS8GcotBeYm1OiiTH9OSvdQSdoqgu+HrlIA+bllRsxiT4oYHbJh7fbls6MkcHLX1PY3y JXSKaPg1Z/oc0c4f2ySmt2w8aHrQXFXMvaQj/ygXX5qXPh8KjzT510SvyvLYaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9ss90Dntz14Db for ; Tue, 18 Nov 2025 18:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23997 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 18:02:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 262fadda3700 - main - arm: Handle GIC_IVAR_VGIC in the gic driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 262fadda370001eed2fd1a72592d79dbd533c650 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 18:02:37 +0000 Message-Id: <691cb4bd.23997.79d7b72@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=262fadda370001eed2fd1a72592d79dbd533c650 commit 262fadda370001eed2fd1a72592d79dbd533c650 Author: Andrew Turner AuthorDate: 2025-11-18 18:00:31 +0000 Commit: Andrew Turner CommitDate: 2025-11-18 18:00:31 +0000 arm: Handle GIC_IVAR_VGIC in the gic driver We don't have a GICv2 vgic so can just return 0. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53662 --- sys/arm/arm/gic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index b1b7aacd63ab..aca4410bf523 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -514,6 +514,9 @@ arm_gic_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) ("arm_gic_read_ivar: Invalid bus type %u", sc->gic_bus)); *result = sc->gic_bus; return (0); + case GIC_IVAR_VGIC: + *result = 0; + return (0); } return (ENOENT); From nobody Tue Nov 18 18:02:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssB32Clz6HWXn for ; Tue, 18 Nov 2025 18:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9ssB1Scwz3Hqn for ; Tue, 18 Nov 2025 18:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RxOoHhtY7nu+VxQrYos8a3+iSpxvjLLKZbNLdwoa4Kg=; b=Mw+JGzC247fJDV9t6n0+KFox92RQe0JzvOndC87lmhH82KCc/ynzgZO8zFsLNvjca37Ehg YiNiQbYAGCKdM9erC0oW/1VEAU6964ArevGbuBVhJz/z0PZ9FihcTihSy/AsPfr1Ps8BV2 o1gWEF4OOcrTB35WljwFQuKyVPyjva+JOCtOrfsD79COvwMJrvYw2j6PFvcAUMdqzr+/gn JUoZWDQcVbQLoUG6rurjvYI2S3QQc7a2HFRWUO5vSL2SpuBYR9RvaD8dLI8Yej14BRvIP0 wRvXoN/8zSbTTWIG/b69n1gvG+j9nIEi2ab3Jb2kZ9OCjQLeHk7rxqq8k+E8dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RxOoHhtY7nu+VxQrYos8a3+iSpxvjLLKZbNLdwoa4Kg=; b=kn3ONs9mYwshdWmDLWDy7Boi3ZzeP5ZM/g7duWnP06jnG8n71xvb2u9VJfvq+L/YjYZ3Vu ZU9/WGR/ci43soylKBEqrs2kD60Og1Aauf3pJZWZl3hB3l7rvviYuBtAH+hrgFmIZCWS/e 7OWhTlGTBaVaXlr+gFBWwKQ6xnsZKdDFdsDdbCRyt3Bn7JWjlaBFxtc3uKc/g5OwAmv40c 1+NCAxEcDPx40balrW7swha+e3KUdb9kQ9xUoY35rehiamxkp578NCOlaxio1UOGQIJQ7/ ElOGDcdi8Pg4CcrLbwBRkKbtNl9N/cOpARQOnsasd0Z4WV8hGmj5YQ7jcvdcEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763488958; a=rsa-sha256; cv=none; b=qezc0wri3lI7MZluhErqXajLEic3vBtc3UdLTkWPk3cEqPRBk9OcwMHOj799GYB7I0TFo2 MPCO5U5AZp2okcOIsn4NrEtsPoQC41j0oeHSx6UDLCUFKVHcVEtDuCQ3RtbX+PLzR5zogl PkTrFAnGLTcAWrcbRvhTDB0g/MS1k61bW43xVAW2RCUmx2dyx6uzeI8C+J+rnsg00iuUYc 2ZefJMLaxdtIwhX6fX/W2ZRGePrxL7PCe6HwnS0XV61jztiB3OEXLF4fI5dJsH37Yhuv24 pLrJ8VAFxUkADq6rxBQkRnKu4wfUBhwCevMPd7mExxO7/ywva+PyYywsXhjz6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssB11Y4z14q1 for ; Tue, 18 Nov 2025 18:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22f0a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 18:02:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 8178a4e3c132 - main - arm/gic: Make GICV3_IVAR_SUPPORT_LPIS generic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8178a4e3c13241804bb9625b2ef4c1b3fea3c7d9 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 18:02:38 +0000 Message-Id: <691cb4be.22f0a.559ce91@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=8178a4e3c13241804bb9625b2ef4c1b3fea3c7d9 commit 8178a4e3c13241804bb9625b2ef4c1b3fea3c7d9 Author: Andrew Turner AuthorDate: 2025-11-18 18:00:31 +0000 Commit: Andrew Turner CommitDate: 2025-11-18 18:00:31 +0000 arm/gic: Make GICV3_IVAR_SUPPORT_LPIS generic GICv5 will need this too, so move to the GIC_IVAR namespace. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53663 --- sys/arm/arm/gic.c | 3 +++ sys/arm/arm/gic_common.h | 2 ++ sys/arm64/arm64/gic_v3.c | 1 + 3 files changed, 6 insertions(+) diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index aca4410bf523..c1b2cf626ed8 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -517,6 +517,9 @@ arm_gic_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) case GIC_IVAR_VGIC: *result = 0; return (0); + case GIC_IVAR_SUPPORT_LPIS: + *result = false; + return (0); } return (ENOENT); diff --git a/sys/arm/arm/gic_common.h b/sys/arm/arm/gic_common.h index c45832ec1782..c2d1b1340b9b 100644 --- a/sys/arm/arm/gic_common.h +++ b/sys/arm/arm/gic_common.h @@ -38,6 +38,7 @@ struct arm_gic_range { #define GIC_IVAR_HW_REV 500 #define GIC_IVAR_BUS 501 #define GIC_IVAR_VGIC 502 +#define GIC_IVAR_SUPPORT_LPIS 503 /* GIC_IVAR_BUS values */ #define GIC_BUS_UNKNOWN 0 @@ -48,6 +49,7 @@ struct arm_gic_range { __BUS_ACCESSOR(gic, hw_rev, GIC, HW_REV, u_int); __BUS_ACCESSOR(gic, bus, GIC, BUS, u_int); __BUS_ACCESSOR(gic, vgic, GIC, VGIC, u_int); +__BUS_ACCESSOR(gic, support_lpis, GIC, SUPPORT_LPIS, bool); /* Software Generated Interrupts */ #define GIC_FIRST_SGI 0 /* Irqs 0-15 are SGIs/IPIs. */ diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c index 201cdae6de09..43743ba588f5 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -494,6 +494,7 @@ gic_v3_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) case GICV3_IVAR_REDIST: *result = (uintptr_t)&sc->gic_redists.pcpu[PCPU_GET(cpuid)]; return (0); + case GIC_IVAR_SUPPORT_LPIS: case GICV3_IVAR_SUPPORT_LPIS: *result = (gic_d_read(sc, 4, GICD_TYPER) & GICD_TYPER_LPIS) != 0; From nobody Tue Nov 18 18:02:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssC1qr4z6HWZy for ; Tue, 18 Nov 2025 18:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9ssB5vt1z3HwC for ; Tue, 18 Nov 2025 18:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tc5ZHtWj8neMV3xV3iQ/SYiwXcWRirSqC3V6mfpUhlA=; b=wi/7vj8mW5KtUGUAR+QZ0bNfNQLnBRJanrhTJYYkT8YO+0Ateibras7JB1gIsY7jHZPgwW N/41P3MFeoikntiP4jSckQIecdJPBXDzBHpj2DgNg8RFbi0WqPu3cMTwNDDVcwz3H103vS lWgsMKJhAP7zoEePlkk1GA8nynvt5AJkiGHGAcfqJpmbAqJPFmR0YxUFefEgLhussQ5uCg iwpe0EFZGgTiF9nBEsLz7hJvVLnch27s9KwxEufjWiJMz0TC7PzipcfBuvp8A4jEvl/GLS DBwqa/XycJ+0P77T4VG2UYB5YO0nleC2q/JZdyQynUjJepnG4FYqnvonqFwbMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tc5ZHtWj8neMV3xV3iQ/SYiwXcWRirSqC3V6mfpUhlA=; b=X2Mu4OjNh1r0Qq+9XZpFfZG2Vhg17Qb4NSxi7aBS90TbnZIMcSKZJd/R3c3Qvxoag3n83/ TQzF3L9CJZZoth2IsdyZtrESeTMG5S2vya5y/+XL0qvVgjX5lzkoMx6BYXxr8cp85Wzvj3 ZvnHuC9cyqfM6dGj377WbyWf+5FS/mC03SJxwe/2LeetUpIWYYTamL9bAucZKwBYAXulpR 0+DFRv2cxpER8vCp8xPrJehArWxuQQnMf9KWiAsTUCbSxrcKUtkg0w6PNNQsO/ZA7ecvgk QKAOnO+IelxUgU+0y4+C7no4rLgfS+TI3zVb2ouGvZgoEfMZtI2NN7YUAc/xVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763488958; a=rsa-sha256; cv=none; b=KlejSDrvMWbPLxY1/Z0IO44bDncuvTt5We/PzpjuHw5ZUp7kb2ixUQWLwsXEWZwKNoxS+l P3YcCndeVV5Wq1OhlFC05aNZlYxXKuYIX4BtzA+FCdLDggP7dZ3I+DgENfTfEMEjtQFgVD fvtQpxo0zj9scL5g/IYbefjpFJQ/4w4TF9IebQSW0QCdT+26WkCCPXYVU18xzNA9kIiyzO 150O9SfY0pxq4TztENiEgVXHrc2OEy5lNaQ1/5g/wSXyMLYvM1zYw+rRUUTSa7hbcUo1Mf M/WsnZwRl8xK7lptUK9bBOptLfYeRPi+Su6gMbqY7s8DHLymehPzK0WQEqUuOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssB5W10z14Dd for ; Tue, 18 Nov 2025 18:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22cb2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 18:02:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 6b12b94c8fd2 - main - dev/ofw: Teach ofw_cpu to find the pcpu on arm64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b12b94c8fd2d5d85060d02620ed807ac6233f71 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 18:02:33 +0000 Message-Id: <691cb4b9.22cb2.21540d51@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=6b12b94c8fd2d5d85060d02620ed807ac6233f71 commit 6b12b94c8fd2d5d85060d02620ed807ac6233f71 Author: Andrew Turner AuthorDate: 2025-11-18 18:00:29 +0000 Commit: Andrew Turner CommitDate: 2025-11-18 18:00:29 +0000 dev/ofw: Teach ofw_cpu to find the pcpu on arm64 Use the midr value to ensure we find the correct PCPU pointer on arm64. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53327 --- sys/dev/ofw/ofw_cpu.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/sys/dev/ofw/ofw_cpu.c b/sys/dev/ofw/ofw_cpu.c index 4b12f2e994e3..852ce6ea3759 100644 --- a/sys/dev/ofw/ofw_cpu.c +++ b/sys/dev/ofw/ofw_cpu.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -280,6 +281,28 @@ ofw_cpu_attach(device_t dev) } else sc->sc_reg_valid = true; +#ifdef __aarch64__ + if (sc->sc_reg_valid) { + uint64_t target_mpidr; + + target_mpidr = sc->sc_reg[0]; + if (psc->sc_addr_cells > 1) { + MPASS(psc->sc_addr_cells == 2); + target_mpidr <<= 32; + target_mpidr |= sc->sc_reg[1]; + } + target_mpidr &= CPU_AFF_MASK; + for (int cpu = 0; cpu <= mp_maxid; cpu++) { + if (cpuid_to_pcpu[cpu] == NULL) + continue; + + if (cpuid_to_pcpu[cpu]->pc_mpidr == target_mpidr) { + sc->sc_cpu_pcpu = cpuid_to_pcpu[cpu]; + break; + } + } + } +#endif #ifdef __powerpc__ /* * On powerpc, "interrupt-servers" denotes a SMT CPU. Look for any @@ -315,9 +338,10 @@ ofw_cpu_attach(device_t dev) device_printf(dev, "No CPU found for this device.\n"); return (ENXIO); } - } else + } #endif - sc->sc_cpu_pcpu = pcpu_find(device_get_unit(dev)); + if (sc->sc_cpu_pcpu == NULL) + sc->sc_cpu_pcpu = pcpu_find(device_get_unit(dev)); if (OF_getencprop(node, "clock-frequency", &cell, sizeof(cell)) < 0) { if (get_freq_from_clk(dev, sc) != 0) { From nobody Tue Nov 18 18:02:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssC4HxXz6HWsP for ; Tue, 18 Nov 2025 18:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9ssC2BLPz3Hyh for ; Tue, 18 Nov 2025 18:02:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0XVauBfT8ZWimI1PeLz0duVGT6vAfXoO7qyvRVB/1xw=; b=Nj6egOgMdl3aHIM2zrhw5PJKTy036pbBsTwzJR8NMmDS3hYUeEeWDJ3n+lJlpGxVX7vTYr SNAVDfKxpMrLXGsdWXK8mnj5GCfBoauMA/cK/m7zk+d68yPKaB9XqcHXB0sKADVYImox7T ltQnA1xXfrfgt1JUfB+QO3PnqxV+E98mI129EYY6y27w4CldmqNfeAeH0Tt0NAVFH4Qw3E xFULC0+eTLUsswu+a1EYQiJ6Ocu033v7qSt8z1g1VreZAdHqKi6VnjS4k7NaKssiPs785G gqAedt2C673jGapmxWxeyqFxGXC503YWXFo/sPyoT5yyfYf5+h1CvWrWslvyqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0XVauBfT8ZWimI1PeLz0duVGT6vAfXoO7qyvRVB/1xw=; b=ql/oimMyaxcacZhopl0bZR9vwIjwM2w1aFGjRaKHFnuDAQ0jhC6CdSl9+LRBW3VUMzeGkf fRzmvptor7HM3foeW+bBwcR+HfjeMFC5KRKgJrCvLNeZjbScxScnACbIwgKH45X/YeN9tL b1PKrPQ6oGOtuK0rg2f2bx9ZbgpzByWEh93+qrYXyduDBeFi00B9O4GHzDqzADjOUH3v5O yFzzU2bBLS+x/mQCx6dTiIeFxcAMYfjjghcQm2qU+prjToFZCAALRQQYkAJGvrLOYvkoh9 DFhVcn7nCFk/f1VKMcWALb+KznkL8sAS/WwKapUMqy0dZ49LNLtHf+9rAfWP5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763488959; a=rsa-sha256; cv=none; b=pv/X52V5+JaJQyzXjuwcaV6Cc7bONJlA2rJ0SBlbL7TWQAi1G2DezPKCk25eKGwqa+kM1K A5pu8632SFL1G0ilmqRmvuRFH5dSfNCWD9tV+kkYG2HA99mGRUP4ZKXgzXJREXM9lBqgx1 NRDeMbYmH99jVQzlevJK2NtMZjDu3RM0Ea0qPdTF8RkDDgiizWdAE+JlbAi6vZuloli4PN RkBCYPNuBa7dLAx9BWfTQYFTlkm6n7jxw6S1ZVjSJZoAFQLmBi1v7dw+lm2+6R4ZUXbcvM 3fMkHL3eAoxO7IEWVawaU/rJDjbQn0tk/tyVa3mtJxA0cK/GsdoHi5xl6tgDQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssC1WDtz13tc for ; Tue, 18 Nov 2025 18:02:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2383c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 18:02:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 3ef673e98af6 - main - arm64: Switch to gic_get_support_lpis in gicv3_its List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ef673e98af669b5cf4e496bb2a1aab9020c480d Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 18:02:39 +0000 Message-Id: <691cb4bf.2383c.41402de9@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3ef673e98af669b5cf4e496bb2a1aab9020c480d commit 3ef673e98af669b5cf4e496bb2a1aab9020c480d Author: Andrew Turner AuthorDate: 2025-11-18 18:00:32 +0000 Commit: Andrew Turner CommitDate: 2025-11-18 18:00:32 +0000 arm64: Switch to gic_get_support_lpis in gicv3_its The old gicv3_get_support_lpis will be removed. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53664 --- sys/arm64/arm64/gicv3_its.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index 546a225abf09..7821b1512083 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -2222,7 +2222,7 @@ gicv3_its_fdt_probe(device_t dev) if (!ofw_bus_is_compatible(dev, "arm,gic-v3-its")) return (ENXIO); - if (!gicv3_get_support_lpis(dev)) + if (!gic_get_support_lpis(dev)) return (ENXIO); device_set_desc(dev, "ARM GIC Interrupt Translation Service"); @@ -2294,7 +2294,7 @@ gicv3_its_acpi_probe(device_t dev) if (gic_get_hw_rev(dev) < 3) return (EINVAL); - if (!gicv3_get_support_lpis(dev)) + if (!gic_get_support_lpis(dev)) return (ENXIO); device_set_desc(dev, "ARM GIC Interrupt Translation Service"); From nobody Tue Nov 18 18:02:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssF5G5qz6HWtV for ; Tue, 18 Nov 2025 18:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9ssF2zZ2z3J2g for ; Tue, 18 Nov 2025 18:02:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P84FGAAjj2UF57YNHx4Z3r8bsCU86/ACWMRF5+BGQqs=; b=iDkvsZJExRVf9tQXddMLq7N/0kCnhIj7TDl3itUTGQhNnhgyKneBey69jmT922aCZ+N1NM sqK+3h50gA7LlDOw34+HS8Y8qasimzY3zmI9UpdScadQFPTWb3U+6vFOH/1BTApqSZOONV 8LmKdL8W4ZFitS3XAo3B/46fpcM3JoNvvhe6VL/FljnhsB6odu/V1rAX9kbbLayxEHqK26 3Axy0et08KK7NTMyas1Wfo167oKyW0jXJ2qwhK/vjo4UmFiITtGEezaEj2/H1RYWTy85AS uIhBvKvoQ7hNO6Z3ZllWWMrXyi40bc5hyZMYTjqkSzAT/d+v8fcIw6RR45Jsdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P84FGAAjj2UF57YNHx4Z3r8bsCU86/ACWMRF5+BGQqs=; b=tuBF6dfQyU2uVOdn+VwuKOsegtpuxWpibW8whUAVhcOQpqHwj90N1Hg3+m79zsVD3iNNr0 x2z+tPy2Rd+D4f+66jE0jPmREoeqKuQNWxdAfJd6TBEZgW5TGQrFqFBQsiLg5WYF5p/gyM WTUpmNJ9Jrnk3qqVEpGOK2i6owK5eiuuUQ4Q2LXE3eRY3uVDlmgu8DFGhwsPw1arlDCfAt cFUD7tnRMV2w+Ch/Nl2eE3iy28ScltEiiaUupyNAWbcgKsfLjCE1ouQ0/OiuphXAfTTSXE w124KDQog/iUKNkNDdC0eplkVi5ArQZL6IY5OC1Fp4HsZ4Bp73jVZGrROyo0jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763488961; a=rsa-sha256; cv=none; b=BO0zrEk/jaHmmIUV0F8/3nTMT7O9AAHzXybKf+rAOik6/wAaC90BNDPb2/VD87Ld0Zcudb y++oOfs73VOHR5lH/wFfwrbES7TVxd5qaHDJ3pZRGYG4l8sHtvi5zT1m2y4OqzfcLSm2ZX UrqZnkBXsAAgfDkE4P/CKI0T1GGk5RpPK6z3kwr6VyPqfLJ33IyljazFcUzqZuT1xLNld9 oHIuXTXJqbiOqVAovruNtBZg/n2UlVfti7HrCOYm3DuP4LqsL+aLGpp0uq2aQZkzMuzijc zGugMbv9RgSvxl3tVAfWuovZMxlnufa2Fdbk15v8hvxLM7b6QzI5wh2eHgn5kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssF2Xk7z14Hq for ; Tue, 18 Nov 2025 18:02:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 220bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 18:02:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a695ac2ce8bc - main - arm64: Move intr_pic_init_secondary earlier List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a695ac2ce8bc8e8b989359002659063f2e056dcf Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 18:02:41 +0000 Message-Id: <691cb4c1.220bb.22f9ecf6@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a695ac2ce8bc8e8b989359002659063f2e056dcf commit a695ac2ce8bc8e8b989359002659063f2e056dcf Author: Andrew Turner AuthorDate: 2025-11-18 18:00:32 +0000 Commit: Andrew Turner CommitDate: 2025-11-18 18:00:32 +0000 arm64: Move intr_pic_init_secondary earlier This may have been called after intr_irq_shuffle. For most interrupt controllers this appears to be safe, however for the GICv5 we need to read a per-CPU ID register before we can assign interrupts to a given CPU. Fix the race by moving intr_pic_init_secondary earlier in the boot, after devices have been enumerated and before the interrupts are moved to their assigned CPUs. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53685 --- sys/arm64/arm64/mp_machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index 0bdd2ecfd8a7..ba673ce9d6ee 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -270,6 +270,8 @@ init_secondary(uint64_t cpu) install_cpu_errata(); enable_cpu_feat(CPU_FEAT_AFTER_DEV); + intr_pic_init_secondary(); + /* Signal we are done */ atomic_add_int(&aps_started, 1); @@ -288,8 +290,6 @@ init_secondary(uint64_t cpu) ("pmap0 doesn't match cpu %ld's ttbr0", cpu)); pcpup->pc_curpmap = pmap0; - intr_pic_init_secondary(); - /* Start per-CPU event timers. */ cpu_initclocks_ap(); From nobody Tue Nov 18 18:02:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssD3q9bz6HWb0 for ; Tue, 18 Nov 2025 18:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9ssD2j3Wz3HwM for ; Tue, 18 Nov 2025 18:02:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5NdSQOO6XqsKJsLCMcMgTSs7CdydBHcn0/fdaj4yU4g=; b=cznACLZWuIfXyqvnkSPqSVNVxeMNXleg7fqtT4I8HtxPR756kpJjj00xifMsxV7Ng41g/T D1VRCvJcVW9RrIjv84mgilkuE/adnmhP76AQP1x//G8Yzv//NJNQ3tndLXX72v5KcysxyN 2hZ1ysiAV1sEHI2uYWzhpYjKc7NL7BD8+MUODrUlyyNQVzQvsLHxDvPxjPrQ3g/M6PHYal Y+TslnqWoMgvjg4BgURRp7IsfEunSaQKcThJnfYhMWjRr0ithxYuRfmIolsGW64hCNTMVU IBWI1T8Akf3U4pgJp8/p58Q+CxsU3juUMbnk5l+qTARz7OIA5n/puhHS6HJIKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5NdSQOO6XqsKJsLCMcMgTSs7CdydBHcn0/fdaj4yU4g=; b=Qnqg+s/Zweiwj5qdRkM96B4YhDE7APj4V4s4075UwOCylafQsr2NVdt9jncwcSj/W4Teni XoJYFkEvBeDWjMZhqU+wfnWEhHYj+KVC+oJCAfcN7a4JRvyTZbGWGGQVdONu+hq7Or7csF LTzM7UBAIsE4++6G5yeHF8M2R6EUIF4Op1QA8DCjr2Hb9VCQCgpR4gfaM4TvgE2UpvRijO o0AwGDG3Rr2FyrTntwmnyVtClz2o8YxiXsstdlIMqsmGZhkGaNR6nZiFgwV+Oo+Y0j8e5F GH9qdWJjPHQu4Cii7IcWdZP/0fHYitsc0OjkD+am/7Q7VgmFLdYgYQLHG46ImQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763488960; a=rsa-sha256; cv=none; b=BOb1q8pR7uk9hCOnce1sSt7iukOZPcy+TS+QbocrX0QOaruh3ya29cT2XcYHkg5nwSnNzF AZilGaBahIGFO9s8UTq4P8I9jDBy+Y1ZcM+3pURaHx++zmUNDNrpkpomi+QH9OzhFVbTvS JHJBBDAOQOjB42Eww95pEFE7ba5pg0IZUS6LOlOe6j9yWrYd0Kn594ZrlpFGdS+CHP7P9R X9n5v5153zsWXrMKH09yuVlfHTF7N/TJKgdHL02wuxB0SzogdrTz+ihzkVyk3pm1D9EFdt oeDtPn/UyFjHm8wBnq1Z1wnKRqlANCe2KqNNMI3zG5G4nkcjjy4LT4koxjf8FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssD2D34z13xH for ; Tue, 18 Nov 2025 18:02:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 232b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 18:02:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 2188e77bfdec - main - arm64: Remove gicv3_get_support_lpis List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2188e77bfdecfe6d7fa2007f64a471fdaa045892 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 18:02:40 +0000 Message-Id: <691cb4c0.232b3.7c1c2d80@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2188e77bfdecfe6d7fa2007f64a471fdaa045892 commit 2188e77bfdecfe6d7fa2007f64a471fdaa045892 Author: Andrew Turner AuthorDate: 2025-11-18 18:00:32 +0000 Commit: Andrew Turner CommitDate: 2025-11-18 18:00:32 +0000 arm64: Remove gicv3_get_support_lpis It's no longer used after moving to gic_get_support_lpis. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53665 --- sys/arm64/arm64/gic_v3.c | 1 - sys/arm64/arm64/gic_v3_var.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c index 43743ba588f5..641b6d6dbc5e 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -495,7 +495,6 @@ gic_v3_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) *result = (uintptr_t)&sc->gic_redists.pcpu[PCPU_GET(cpuid)]; return (0); case GIC_IVAR_SUPPORT_LPIS: - case GICV3_IVAR_SUPPORT_LPIS: *result = (gic_d_read(sc, 4, GICD_TYPER) & GICD_TYPER_LPIS) != 0; return (0); diff --git a/sys/arm64/arm64/gic_v3_var.h b/sys/arm64/arm64/gic_v3_var.h index 8bc0f456d91e..2570834c2818 100644 --- a/sys/arm64/arm64/gic_v3_var.h +++ b/sys/arm64/arm64/gic_v3_var.h @@ -108,11 +108,9 @@ MALLOC_DECLARE(M_GIC_V3); #define GICV3_IVAR_NIRQS 1000 /* 1001 was GICV3_IVAR_REDIST_VADDR */ #define GICV3_IVAR_REDIST 1002 -#define GICV3_IVAR_SUPPORT_LPIS 1003 __BUS_ACCESSOR(gicv3, nirqs, GICV3, NIRQS, u_int); __BUS_ACCESSOR(gicv3, redist, GICV3, REDIST, void *); -__BUS_ACCESSOR(gicv3, support_lpis, GICV3, SUPPORT_LPIS, bool); /* Device methods */ int gic_v3_attach(device_t dev); From nobody Tue Nov 18 18:02:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssG4rcQz6HWb5 for ; Tue, 18 Nov 2025 18:02: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9ssG3Ypfz3J4w for ; Tue, 18 Nov 2025 18:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V7Nda2F/wsFDw1GKBvTDY+2yBTS+kB2hwmq+D/MYhis=; b=y0uuu5WM7BGBBLSkBpR+ccw4MIS9k+Srd3Ou2wTtQuuw1gKr/uM6niPm2SqKU1uWgOWJLB G0iNxaQktM3zbQ0US9bl1mVHiji2gAY8VaNaUxHVw1amUNV4yIUtDsEY1BKHt4JmPNj2a5 x+3+iG9kXioORSVgpL1AJeuS0p+QwPSGZ5PkScKo5wCI7oiYHhF8HUKj0QTHmAHD/etSZl 1RLbGvQAu3D0dkJ7z/q9vp6I/u2kqj3fb6s6eIiU39AF6lhB1+Huy1RI+3z4bEEcPwTaPi BWJoCx+qySUgNRkKw6Zj6V9fCrqfGODnpVSrPlyZtL9GhUwLGlQ/KfCf1hYy5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V7Nda2F/wsFDw1GKBvTDY+2yBTS+kB2hwmq+D/MYhis=; b=RwZk+/ohwfikR1CoFw9S9lnCuTAR8rMpnyO4kZ6e7oXFU3bqpqagCzipyXZqiizNZDXWBG Cqvwt9/lQje/23t7TMHOoiWNtiNi6/H2MZ7PnSIPBym8bycCrK4Zl25ekvXrrxO+gCRi5v pl+2ZulVRxPeyN3Q43XOadr4NmkMuuYz06PZxEBunlDi75+dOnXqZnDTVu7RVmcA2qPGUu EZT7K7JIL7hq1gRSmYnc5+RpT7SiAw9/tzxpr7/qx5Z2ovYzcilIFuaLxPpfXTgXdLR64o DtVDZ6lgl7CFL6b4SoOZoA3cZGHrSVG2El9c0dbsuX7+aGa/Uhng07yO55R8HA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763488962; a=rsa-sha256; cv=none; b=o227XjNjpdAj75HQyefrqSh5kftAO69Tb2Dd2gmyMUv+qZDEgzzGqnkDxCAkoFlKFV1yn+ /zNRyCeTak7wYZVr/bQGuzr2bHyCcXBY+3sM9TB+zKR401SQPnGHwODJyiUHhYjE/hZsRs WKiXwZnwXtFHBurYQdbE8rrzhG2xPr2ARW7uj6ZdZJ7+JCjxBUudZoRUiY1fyV0uCsv3LR yBSvqTce+1Rgi/zpfAivRHn3E6syh9Dfn6KEIhkS9tamkyc9q+EXNVCTEholt9eYBWjOfZ RlkEbQdqrLqKIspkim4/mASs1NCN50EnEhrHq+pUcJtg9VI5dW6VDQF9w2E+og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssG31lfz14Hr for ; Tue, 18 Nov 2025 18:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 225e1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 18:02:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 7446569bbcb4 - main - conf: Mark vchiq as depending on fdt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7446569bbcb42c08c650a5e1015f544f13066d7f Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 18:02:42 +0000 Message-Id: <691cb4c2.225e1.4d43a3bb@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7446569bbcb42c08c650a5e1015f544f13066d7f commit 7446569bbcb42c08c650a5e1015f544f13066d7f Author: Andrew Turner AuthorDate: 2025-11-18 18:00:33 +0000 Commit: Andrew Turner CommitDate: 2025-11-18 18:00:33 +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 --- 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 938ef2ac15ea..886980de754b 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -594,23 +594,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 -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 Tue Nov 18 18:55:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9v2K2MG1z6HbZr for ; Tue, 18 Nov 2025 18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9v2J6QWLz3VH5 for ; Tue, 18 Nov 2025 18:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763492136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kKILXcX+L+/Qd+/QFJzd9QNlxDnJ5CK+55INdI9Z8/s=; b=tUTzBIjUwQirStcDa6X0YKErhv7AYuspy08TdcB3Ee2ewPnKXLekIUFWcAR5APUk50rHjP 92VrVfTLcxyvwayvGTjFvG8D4npW7ttdXSICauYIg2+NJ9YkcbHtktHS8I3TyNC95wfiyq 6Qc5OC8Yi3sIFdLGt2WF6SvooUDHp+y7kv49WklY4zBLEnqESFZVeAkDNjyRiIpkj5e6iT LxAlz0dl4ZVaVYdTzJklw9dKmYztrCt32jEzWQtlw/+p9AJ9cw1rKnc5uDOH0c96kEB8Kt WCZT7GCOnpHR1qkkq6DjpbfoubM9ENfXaFn30x2d8p2QhAG28ITk8VBPEpiFWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763492136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kKILXcX+L+/Qd+/QFJzd9QNlxDnJ5CK+55INdI9Z8/s=; b=jjwhqN5wFYYrnNyW2j0r8skmLI+KhIKwkCXUkotF8966tpxDwt8uh7b5r9C8m0hdcMhibI UsWJqWRN11EpurYsnFff2sx+Jn5plzYNdQBZBQ4DsxuJ6XM2IGUuvM1Z2YJGi71KFwtXPW Rm3lzeD8w5OGNh0rWh8Ix+249Cg1RvnyFD685WdQLxUFCUOrKhFw2ipBi/hNTflXISuXQc 5KIkGyyhqNCSIciCl0922tPN13vTVUY7trvKzaxUscm+J/qI99BmLhS6ysRz7OOgXr5pmg uFGJWOlwcqLIE178Rjkq8jGLI5oWq6gyX/qPWVW8nMUzSqJBVXm236S5GihLvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763492136; a=rsa-sha256; cv=none; b=LLTbgNjYva6jzrtN51NOikNzwwH9HdSgnzUlVeR/PGcJr4EMCCYv50NdxVafYkuetthvHX NEtKW0Bfok4sXsbImD3PW8smU482UkW1iQfM4/dl0s/7ZDYst/cfmrsrwQA4Mq9rdV2jie BEUvBESnXaTK1BGG4BsZyYbXBhX4bDKGbaVuvDy4tKKtsIwqVwTuVpirhol9i5weLHalO6 NBdBUhPwM6HyDJ+X+BptBkI6SElCpSs+vQF/69E658rorAhVM6QLn748ClE3w1QJODUD42 c+vEPHUFBIv9fZCZUIkRXF6fCA0VWfJYTQW1ZqjpiiHs3PI1cjQtvnvb9a254g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9v2J5QgSz15lZ for ; Tue, 18 Nov 2025 18:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 28783 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 18:55:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: abcb80f46c26 - main - diff3: Use logical-not, not bitwise for booleans List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: abcb80f46c2607fc16564ca87cc25f0908f29f99 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 18:55:36 +0000 Message-Id: <691cc128.28783.585613ea@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=abcb80f46c2607fc16564ca87cc25f0908f29f99 commit abcb80f46c2607fc16564ca87cc25f0908f29f99 Author: Ed Maste AuthorDate: 2025-11-18 13:20:40 +0000 Commit: Ed Maste CommitDate: 2025-11-18 18:53:24 +0000 diff3: Use logical-not, not bitwise for booleans And compare impcompat != 0 as it's actually an integer incremented on each use of one of the AeExX3 options. Reviewed by: fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53808 --- contrib/diff/src/diff3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/diff/src/diff3.c b/contrib/diff/src/diff3.c index c915d6b04c87..d0e8137756db 100644 --- a/contrib/diff/src/diff3.c +++ b/contrib/diff/src/diff3.c @@ -299,9 +299,9 @@ main (int argc, char **argv) } } - edscript = incompat & ~merge; /* -AeExX3 without -m implies ed script. */ - show_2nd |= ~incompat & merge; /* -m without -AeExX3 implies -A. */ - flagging |= ~incompat & merge; + edscript = (incompat != 0) & !merge; /* -AeExX3 without -m implies ed script. */ + show_2nd |= !incompat & merge; /* -m without -AeExX3 implies -A. */ + flagging |= !incompat & merge; if (incompat > 1 /* Ensure at most one of -AeExX3. */ || finalwrite & merge /* -i -m would rewrite input file. */ From nobody Tue Nov 18 19:25:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9vhd03hrz6GPmB for ; Tue, 18 Nov 2025 19:25:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9vhc6XZqz3YrL for ; Tue, 18 Nov 2025 19:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763493920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ze0L8sLle1YHYgzSzlPTrZH1rQdsGmeFWJ1Jo6evZXc=; b=OIiltfrK9oxLu1FQUx16J/TgVpJy3OH25/+Oy/PxYkUh4Zgwe1ZoeoFstvyMzo+gdmqTPu 481qcHTL/4i7/g5AQz6bT+hkixvJTUiS0+U9Get/u70R71BfIUgk/fRxN9mkSXcWH4YVpa GMKF+HTNAjTm17mM7YHw4/PRge2AVp9CewAZlQclTU6CYt3rbg6ukvGRsJ42HQDJW5aBaJ zXRFLmfyUaEuTMeXNgS/KxTeJbWl9YZ4UCrLJRd6wleE9FY05eUjCJY5chFTpR8Z+RsOjv mSGEydV7F3WTUQQUHKTLgKXjWaFQoXVuhQdCb+VjzYUgVxde4hTrixGUvRQfVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763493920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ze0L8sLle1YHYgzSzlPTrZH1rQdsGmeFWJ1Jo6evZXc=; b=jzNlvdh76z/qdXfDK7GpxC6E9VyCNI1M1sDnP7cqObpETV2Z+dyD1k2RmvQ80uKsYqtvv2 0Wq+QzPUHvV/EGHUenHLzJ3i/1rb434+EZrM/ffEw3ulNtdKCDx2bYYp6zq05lBdpW7UpE Jn5C0VKG4E6ADYKC4yekDKPveZrtnE+/OOsOOdL0Zbw0N6CHfvWnxbEh7CgCwpdYn8IFga eDzxpMkejGJX6/+4rRdeKqwUS+hbjwa7/NniVCwjeE0IiER5TgoaeRnMWO5iGFw0ADe38J G/Igx/C4V+Cw3GYDUqrjuKu6fttlazMJhTUe8dyukwxr/ciQvIHCr4aubIlkOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763493920; a=rsa-sha256; cv=none; b=ek6llN3nWq8VZqUz+iosktzfBoj1GO7AfyQwW0A2UZ+X2uWGAwVlLpOKiLvlT3KsXfsMQy ZOC7R812pXrg/N/xFZ/hczsgvIGqa2KkLkj5GzC6enUlsq2pgli2/UODx0eDjPGSlq2T1k ZFfKNfCOdXEHurM7cw2ny+mI+SITx+Cj8TkdB7PYFg9cgIqioINyEaoB616a+26nrotS6z W8n++79poIo4dZhsObSvEU8JiTmewLv9QyBa8d2h2XYXQhjmqWXpnTvg7mu1D+CpcuykhT epjTo9M7f8mGU8LO6SP1eOfLfVOnhW62U0MseB07ZkAmwSfnkaMRRsidv+1hJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9vhc681bz16VY for ; Tue, 18 Nov 2025 19:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2ad9f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 19:25:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: 5d53462af1d0 - main - iichid: The IICHID spec defines the response to the RESET command as two bytes of zeros. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d53462af1d0e892da77b52b701b337119b2f5d7 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 19:25:20 +0000 Message-Id: <691cc820.2ad9f.7db644f3@gitrepo.freebsd.org> The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=5d53462af1d0e892da77b52b701b337119b2f5d7 commit 5d53462af1d0e892da77b52b701b337119b2f5d7 Author: Poul-Henning Kamp AuthorDate: 2025-11-18 19:22:01 +0000 Commit: Poul-Henning Kamp CommitDate: 2025-11-18 19:25:10 +0000 iichid: The IICHID spec defines the response to the RESET command as two bytes of zeros. Our recent changes to iichid.c has caused us to attempt to read a full REPORT instead, and at least one keyboard hangs solid when we do that. This patch changes us to be spec-compliant. Differential Revision: https://reviews.freebsd.org/D53803 MFC after: 1 day Approved by: re(ccperciva) --- sys/dev/iicbus/iichid.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index 5ca3f1b84e48..430066bd8f52 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -271,6 +271,8 @@ static int iichid_cmd_read(struct iichid_softc* sc, void *buf, iichid_size_t maxlen, iichid_size_t *actual_len) { + int error; + /* * 6.1.3 - Retrieval of Input Reports * DEVICE returns the length (2 Bytes) and the entire Input Report. @@ -280,7 +282,10 @@ iichid_cmd_read(struct iichid_softc* sc, void *buf, iichid_size_t maxlen, struct iic_msg msgs[] = { { sc->addr, IIC_M_RD, maxlen, buf }, }; - int error; + + if (!sc->reset_acked) { + msgs[0].len = 2; + } error = iicbus_transfer(sc->dev, msgs, nitems(msgs)); if (error != 0) From nobody Tue Nov 18 21:04:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvP62fdz6GYG3 for ; Tue, 18 Nov 2025 21:04: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9xvP5CSvz3lJ0 for ; Tue, 18 Nov 2025 21:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/2pVRvFR/+OXTeBgTXPJmoMmJUsUWRgio2Fkr/9Mk50=; b=ZTrxaVEg/1+s+Tst23Wvg4dJHgYLa4t5f/52gA8IqYlgi8IpLsfE8idRpmBaFuZhkgWKOW 1rD/hC6IZMBsV+Ba31REa97/d9KZ5ZjaXKFjxnajy5Q7JmX2dGvyQGu1IaBr5x+XMAsBGc Y/kT0gXKpyspDkqkkChH/o8lKYsjQLVHMRUjL7+Jixxj5Y+B6oIH6zCdueECWDTQAbG3b1 8HcOqu6E6P19ZvtzA6Lth61XvuMykH1TefRyQ3TMxXUuOfMvLD3Njwo5Mr78fOo59/ljeV T2UoJlv5CAGvUifxanxAGAHZ0He0hpyt+Jwl9bFNom+RTLzYuJyBmf9EYwU8/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/2pVRvFR/+OXTeBgTXPJmoMmJUsUWRgio2Fkr/9Mk50=; b=mTHswIoLZ4KoWijhmdUd+UDB10kIfqVA6MiRN1OpmClNlIiQL7EMOP7AoqvqHE98l6gucv 2/nUCUBO472wDdDYjp9tr8aZaTfOfETJSreQ/8jBoK0i4GD0a9hkv1PcFpqwdclYYXaZF4 7XqhMKGwWutJe2T3zGkTSo9E3L7v07X00hWDWLNkmUcxynd60iFGzLPJZ3C03/9EnThIqH kOvioBEuCEG+J+qFQMEdZSPT6vWRLu9Gnj2Tl8eQxBWnZhUgi8+H41LQ01wehuH6OKyp93 b+5/ei49yFV9vffwwWzzlzn0cH4c/t6tpxe2dnimfeBI75m2j3g//RK3R5C6eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763499889; a=rsa-sha256; cv=none; b=IlO6PC2aVgRPtarqSdzU+4d/fVxoV+f+qG8vsbZPRSYffbnYOGyOq6tWB+TF577iss2GiQ wEBKbG2aO64pXEpyt4TjjkSWTKlR010RqXQenUVt3LsCsLDpXlE31bFqxbeBAlFY42oveU B+toXY2qQSdXLv5v/aqnUN/Ore3S5lZ8/ZCPxkbre4u7ZiBN57WDs5v6usoeDh2ygdCj4r dn0TcJI959KbZPgOTp01CtG+pz42+7CVIPE5MLDhn1J+blkckolYcDZ2MylHo3ehjjTCMu lyq4Kx4hSt7JwACw5sKhWCvK7ogvaRczsBG2RnKbZxOnwHw9pChsftIhwmgMEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvP4YpGz19VP for ; Tue, 18 Nov 2025 21:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33a6c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 21:04:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 27481c268916 - main - nvme: Fix backwards sense of error condition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27481c268916b0790c7ad16202a5b012625ce1a8 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 21:04:49 +0000 Message-Id: <691cdf71.33a6c.4a304873@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=27481c268916b0790c7ad16202a5b012625ce1a8 commit 27481c268916b0790c7ad16202a5b012625ce1a8 Author: Warner Losh AuthorDate: 2025-11-18 20:07:11 +0000 Commit: Warner Losh CommitDate: 2025-11-18 20:12:18 +0000 nvme: Fix backwards sense of error condition b21e67875bf0c tested for the good condition, not the error condition, so we'd never do anything else in this function. This was causing certain logging not to happen, and also prevented forthcoming namespace size change code from working as well. Fixes: b21e67875bf0c Sponsored by: Netflix --- sys/dev/nvme/nvme_ctrlr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index ab06c1d553d7..34d4abd826b7 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1153,7 +1153,7 @@ nvme_ctrlr_aer_task(void *arg, int pending) mtx_sleep(aer, &aer->mtx, PRIBIO, "nvme_pt", 0); mtx_unlock(&aer->mtx); - if (aer->log_page_size != (uint32_t)-1) { + if (aer->log_page_size == (uint32_t)-1) { /* * If the log page fetch for some reason completed with an * error, don't pass log page data to the consumers. In From nobody Tue Nov 18 21:04:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvQ6xpbz6GYSB for ; Tue, 18 Nov 2025 21:04: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9xvQ5wcrz3lfM for ; Tue, 18 Nov 2025 21:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499890; 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=FP5xQUPvDb+xHDJ7LvTgAsoYS5R0twFWuFA2Bgi988w=; b=Uo0bnF0yjVmPcfYiBquWl35awUSc2Upn78bYyENlwEgyKJD+/BAoT/3JGeRSpX/KWY1LvT ejJ94cHzEWaVE+OMYGK6/furbir43VAbMkY6k/AxUKJyGsmWhvHUAT1OWTB4I/I7GMREMY oDjX5iUE93zjJvFR6FwQD2IB8OdA/r61D+x7K0RS14Di64/DjlN3IyWc/oxPs6Bf6xpG4V WUQRe+b17mIR00osDpI2KMPRIema40DjIe+YIq6mWy14g+7wwC7vp8S04UiL50+mZkkZ+p W41efkfESHuWVW8L5x8BpRqnZQJ3vR9o0NUhAn4pRu6YCvjLr7VgWYWE0hAw6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499890; 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=FP5xQUPvDb+xHDJ7LvTgAsoYS5R0twFWuFA2Bgi988w=; b=Iulua25lMgGbNPs58kHpD+XIln7YNSc8ugbhgf+eRQl+/UIMQhClaa+T/zrCYdFivMEXmk mRUIYiS+sO+BaStHjMsWWl7r+XXOTyd3ynJIZCfJjj2ktOIZlP3jHxow7dbs/IvdWMfYEN 6yQveE+pARaOIs9oVYdBY/0/NhCQtwT4cMjXsLhRdgMwqMAOLliycnqoK6pH2+FsvdnbTG qvQyTk3bHgK0eZnSaKXfZcvrUEQdZxg2Fih2z0H4u0slgusXZoukVlwAJUEeh1DZqYO+z4 Ejz8P1t8+P5WuxJjNsSnwmz3RI4n/jJ47FrfAD3Tym7BxEeQ2izzi6bg2Qa5bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763499890; a=rsa-sha256; cv=none; b=QJyUeM4KiD2y+IPjmtlp1eInTB+aPMAnjRKzOifF4/y17AksE/0JY7vL4wxbQoOKCf/xa8 g58McBImgEE35FnJCAopeAGH5beGwjHrO1ABpR9toR8jIHWdOy7SxbplgRcwj9fjqm8cg0 c+fLZg7mRtG7PVUR/QcUEQtaE6WiTd196Q/feQyHTxsJYWCytWDrFhPbcQm+cPTiFRjEuK mQKFJet7oxtL35H+zi+LliG10AIBl4xHqkiMCZXXba4XTx9Kv51ITzp7HC82TaFuUbQsnQ xZAKWJkk72MQFUfWYYdTVz0F7Va9uOnr5xIxrhGjvNoj969rzTJFhFOw2XsNOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvQ5CHjz19W4 for ; Tue, 18 Nov 2025 21:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35308 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 21:04:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: 20e94950c54e - main - nvme: Notify namespace changes better List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20e94950c54e398049396647da36b9e2c3b639c1 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 21:04:50 +0000 Message-Id: <691cdf72.35308.1c1c6fc1@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=20e94950c54e398049396647da36b9e2c3b639c1 commit 20e94950c54e398049396647da36b9e2c3b639c1 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Warner Losh CommitDate: 2025-11-18 20:32:22 +0000 nvme: Notify namespace changes better When we get a namespace notification, we have to reconstrut the namespace to get the new identification data from the namespace. For each namespace in the AEN, we will reconstrict it before we call the notification. We also flag it as changed for the duration of the change callback (prior versions of the patch needed to keep track, but we no longer do, so this bit may be removed). Note when we've seen the namespace so we can notify when it goes away. Co-authored-by: imp Differential Revision: https://reviews.freebsd.org/D33032 --- sys/dev/nvme/nvme.h | 7 +++++-- sys/dev/nvme/nvme_ctrlr.c | 12 +++++++++++- sys/dev/nvme/nvme_ns.c | 9 ++++++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 22421f5600ec..8f7a7fbda14c 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1929,8 +1929,11 @@ typedef void (*nvme_cons_async_fn_t)(void *, const struct nvme_completion *, typedef void (*nvme_cons_fail_fn_t)(void *); enum nvme_namespace_flags { - NVME_NS_DEALLOCATE_SUPPORTED = 0x1, - NVME_NS_FLUSH_SUPPORTED = 0x2, + NVME_NS_DEALLOCATE_SUPPORTED = 0x01, + NVME_NS_FLUSH_SUPPORTED = 0x02, + NVME_NS_ADDED = 0x04, + NVME_NS_CHANGED = 0x08, + NVME_NS_GONE = 0x10, }; int nvme_ctrlr_passthrough_cmd(struct nvme_controller *ctrlr, diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 34d4abd826b7..41542d24c107 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1216,10 +1216,20 @@ nvme_ctrlr_aer_task(void *arg, int pending) } else if (aer->log_page_id == NVME_LOG_CHANGED_NAMESPACE) { struct nvme_ns_list *nsl = (struct nvme_ns_list *)aer->log_page_buffer; + struct nvme_controller *ctrlr = aer->ctrlr; + for (int i = 0; i < nitems(nsl->ns) && nsl->ns[i] != 0; i++) { + struct nvme_namespace *ns; + uint32_t id = nsl->ns[i]; + if (nsl->ns[i] > NVME_MAX_NAMESPACES) break; - nvme_notify_ns(aer->ctrlr, nsl->ns[i]); + + ns = &ctrlr->ns[id - 1]; + ns->flags |= NVME_NS_CHANGED; + nvme_ns_construct(ns, id, ctrlr); + nvme_notify_ns(ctrlr, id); + ns->flags &= ~NVME_NS_CHANGED; } } diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index f238fa552350..4ebcc03c4f04 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -78,7 +78,7 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, break; case NVME_PASSTHROUGH_CMD: pt = (struct nvme_pt_command *)arg; - return (nvme_ctrlr_passthrough_cmd(ctrlr, pt, ns->id, + return (nvme_ctrlr_passthrough_cmd(ctrlr, pt, ns->id, 1 /* is_user_buffer */, 0 /* is_admin_cmd */)); case NVME_GET_NSID: { @@ -558,8 +558,10 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, * standard says the entire id will be zeros, so this is a * cheap way to test for that. */ - if (ns->data.nsze == 0) - return (ENXIO); + if (ns->data.nsze == 0) { + ns->flags |= NVME_NS_GONE; + return ((ns->flags & NVME_NS_ADDED) ? 0 : ENXIO); + } flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, ns->data.flbas); @@ -623,6 +625,7 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, ns->cdev->si_drv2 = make_dev_alias(ns->cdev, "%sns%d", device_get_nameunit(ctrlr->dev), ns->id); ns->cdev->si_flags |= SI_UNMAPPED; + ns->flags |= NVME_NS_ADDED; return (0); } From nobody Tue Nov 18 21:04:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvS1Jl3z6GYKn for ; Tue, 18 Nov 2025 21:04: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9xvR6PQ0z3lWj for ; Tue, 18 Nov 2025 21:04:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499891; 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=a6Owkq6BS+ogLXdtAyGmhenbg8gdijda0cCZ+P1MMKw=; b=x84nobTFYjzQv1643VohglmAH/PwOdACrwf2M/CTUTNHvipyM24q9SzIxe1EEZYlmCsNgP dcePL/F9tVvBk2jfrpAMED6Pn3n71dM2BMk4jiKFkkk7unyyT/Pv3riQdCFORYwWe/3EgT znn0gxcTukvwgpKrzgyT+bYNPNaCPetSF2gtRpzmFEegVgGljORrXl7ADG/dOglA+su28J 2nnZZ6pvUkT8K/lHuvOPmdRyJSvJDkyORrIOZZfaPK8ONHaANs1g1XmA7O74zM23rq5Myg 4Gnoprt/c65er8o9J8NnGktAJGX7AmdJ1Q8OHc9VIlhZUTWs9wiEJns3W1WQiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499891; 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=a6Owkq6BS+ogLXdtAyGmhenbg8gdijda0cCZ+P1MMKw=; b=Um7hWHirqgr3O0SAGz93kUNlACwsYQMO7DwVcD6gx43P2Ccot3iNPCxHJZvprEqWPp4ExX D9HHeaN923/T48ctcoU2odleyO+DOBpW67hlGBRU8zavsZ3NWobPv2jtvVcUWzOd1Km1WC XW4SyGa4Mir6l2yVjoVeNs+pPCZqzF/MmYpELxz48gFhBW/7XB+a1iVFRYqEPlbM14i5yU iZ6GP8H/TxULwmA+XVbtQHrp5MEiVA1CgOdes33LfsoNkqYFlU4purZ01MsDEEJ+iwQOks E6CvHnexTDn5zFzWoQYWTcEt9TPGSJyBpr5K3hwWuUpUkWNhUAZ004p6JtaKUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763499891; a=rsa-sha256; cv=none; b=QoE16bDejpqc6FkGXAxvbrpOABi/NuBPXFqiRKRUuM1yIxSzcNPeXgajReK1A3rls5BTuR nxA2rLsTh7xCm7s52m23i7Iax9T31kjrhiBji4E6w+2nvwdNjWF1ydI4BkmE0uTjy8auhw kWR4DTJR1nqzwc0Rqe0MzTNdUVNPtVbiMINhOgiWAo50/yXWNfuRWIcMBNf0/gDqQj7Xyl fwiGX0RQRD7ffoC+cf3fb9KrOShRlOLqKJ4rrww4GgkGD+YThjWOoH5tc8RGJBG3NBfuoN 9TPr4Ux+SZ739/RInbdP0B/0Rh7F5O3fcA2wxupJm1DTS7e5Zprj3ECys3GuBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvR5y6mz19W5 for ; Tue, 18 Nov 2025 21:04:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33fbc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 21:04:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: dffd882d12d2 - main - nvme: Refactor geom setting to function. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dffd882d12d2a71aca464f48209ec9ae6f393b15 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 21:04:51 +0000 Message-Id: <691cdf73.33fbc.eb914bb@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dffd882d12d2a71aca464f48209ec9ae6f393b15 commit dffd882d12d2a71aca464f48209ec9ae6f393b15 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Warner Losh CommitDate: 2025-11-18 20:32:28 +0000 nvme: Refactor geom setting to function. Refactor setting of geometry for the disk to its own function. No functional changes. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 --- sys/cam/nvme/nvme_da.c | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 9c4707da482c..3e9efabe33cd 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -644,6 +644,35 @@ ndacleanup(struct cam_periph *periph) cam_periph_lock(periph); } +static void +ndasetgeom(struct nda_softc *softc, struct cam_periph *periph) +{ + struct disk *disk = softc->disk; + struct ccb_pathinq cpi; + const struct nvme_namespace_data *nsd; + const struct nvme_controller_data *cd; + uint8_t flbas_fmt, lbads, vwc_present; + + nsd = nvme_get_identify_ns(periph); + cd = nvme_get_identify_cntrl(periph); + + flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas); + lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]); + disk->d_sectorsize = 1 << lbads; + disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); + disk->d_delmaxsize = disk->d_mediasize; + disk->d_flags = DISKFLAG_DIRECT_COMPLETION; + if (nvme_ctrlr_has_dataset_mgmt(cd)) + disk->d_flags |= DISKFLAG_CANDELETE; + vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc); + if (vwc_present) + disk->d_flags |= DISKFLAG_CANFLUSHCACHE; + if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { + disk->d_flags |= DISKFLAG_UNMAPPED_BIO; + softc->unmappedio = 1; + } +} + static void ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg) @@ -847,7 +876,6 @@ ndaregister(struct cam_periph *periph, void *arg) const struct nvme_namespace_data *nsd; const struct nvme_controller_data *cd; char announce_buf[80]; - uint8_t flbas_fmt, lbads, vwc_present; u_int maxio; int quirks; @@ -904,21 +932,8 @@ ndaregister(struct cam_periph *periph, void *arg) else if (maxio > maxphys) maxio = maxphys; /* for safety */ disk->d_maxsize = maxio; - flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas); - lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]); - disk->d_sectorsize = 1 << lbads; - disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); - disk->d_delmaxsize = disk->d_mediasize; - disk->d_flags = DISKFLAG_DIRECT_COMPLETION; - if (nvme_ctrlr_has_dataset_mgmt(cd)) - disk->d_flags |= DISKFLAG_CANDELETE; - vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc); - if (vwc_present) - disk->d_flags |= DISKFLAG_CANFLUSHCACHE; - if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { - disk->d_flags |= DISKFLAG_UNMAPPED_BIO; - softc->unmappedio = 1; - } + ndasetgeom(softc, periph); + /* * d_ident and d_descr are both far bigger than the length of either * the serial or model number strings. From nobody Tue Nov 18 21:04:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvT4T6hz6GY2L for ; Tue, 18 Nov 2025 21:04: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9xvT045bz3lBr for ; Tue, 18 Nov 2025 21:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499893; 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=XckSYrT0AlXW6YxjCxQx4CVe6JaJW9ob3eOT6giBIHE=; b=qdJIeTpt9OPF9rj4xBwVGdUT35CBG3SFtfZG/uZm9CT8/hiSwfRXuxQ/RAB6Va/4w1Veym eY7z/HcF0yFYsolicmI9i49hVhH7eXeXhUB1bve03osAv8fEAAUwS5HROaLf8tHvibJ/dT v1jM3RKy2Q/jxUxwWf+Bz33nUzj1qRgvplxhkHLn5AfzvHgOg1rP8gOG0YjytLeMEgEcl0 xW+/4xcOoqdAbrN3xTDusWgKB4R8wLJJr1wHK8JS3Sa2c4A3pCCeptjCDfll9alX8KbLDV NSh7CWPFkv2HADd3OsqFGxy4zLkoQFZLXwjE/zK/xjr9sWkiqS2dgbSwcg5upA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499893; 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=XckSYrT0AlXW6YxjCxQx4CVe6JaJW9ob3eOT6giBIHE=; b=Aw6ysrzX8mFtgo4t1WWJQ9KYE3HeXtNadihOwd3s0JRLtbuVp2xEc4Ac7/6zgawSsvPTZh VAg+j6oE0QWwTlSuncwfMhmzsp55NSa+469uSwZIOeqfjpIIxXuh9DZ3ofq5sZOBhJy0nU qCbQ7kTsWjqTxsTbt5Iq0xcxqKU0WiD6+ZH1xbiSlQnQHb61UwS5dRpRTwawLcafzfBbsg pvQax0PCnHJ+DXqMVewirLl0A7TrHqNqDo6VtJFrMSGI542YsizNNm7LMqMxHjRZmMzcNT sEQ7xdJi0RS4pBikjCLpA8Rg38CxT4zZrWMeBIYnQ6KF8b3bl3fba8XMGpgadg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763499893; a=rsa-sha256; cv=none; b=i+q6e3Nq4o0pZ4LTYAvif93+Qm4PX3diQJOOGTHMMiuOAKr9j6mOOZl9xT/hgBfT68XyvD e/mRil3IreMAQ9Wrm0rrgLuAvfK8VejRnp2f7LqnyBWg+VFYpDRkTrn+3e+Je9/BotyIQQ bgYszVFcT/kB09mCSBCPPu8wQAUxB8fppGoMPwMzNM27UkDE4KKlvXMzD5tbLwB+GnRwyg aLCeT/rHm8QR9gDNJ80sAwey8A1v9AuGUEbuexnCdHoq5VVMt0KSyEtBp3taOKTOYfq54T i/5Z4IyhS1m600tRTuazpruf3diu/3PrxY88I8+pEe3A/jqyVlyPY/Ztm5QOsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvS6k6sz18lr for ; Tue, 18 Nov 2025 21:04:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35903 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 21:04:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: 86d3ec359a56 - main - nda: React to namespace change events List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86d3ec359a56d1b5d015718bd19ef4bda681a032 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 21:04:52 +0000 Message-Id: <691cdf74.35903.51f3c7fc@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=86d3ec359a56d1b5d015718bd19ef4bda681a032 commit 86d3ec359a56d1b5d015718bd19ef4bda681a032 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Warner Losh CommitDate: 2025-11-18 20:32:28 +0000 nda: React to namespace change events Register for AC_GETDEV_CHANGED. When we receive a namespace notification, we only create a new device if it was unconfigured. If it was configured, generate this async event. Rely on the fact that we reconstruct namespace to just get the data from the identify data and call disk_resised. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 --- sys/cam/nvme/nvme_da.c | 29 ++++++++++++++++++++--------- sys/cam/nvme/nvme_xpt.c | 2 ++ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 3e9efabe33cd..506fce3d99d3 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -674,12 +674,11 @@ ndasetgeom(struct nda_softc *softc, struct cam_periph *periph) } static void -ndaasync(void *callback_arg, uint32_t code, - struct cam_path *path, void *arg) +ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg) { - struct cam_periph *periph; + struct cam_periph *periph = callback_arg; + struct nda_softc *softc; - periph = (struct cam_periph *)callback_arg; switch (code) { case AC_FOUND_DEVICE: { @@ -710,17 +709,29 @@ ndaasync(void *callback_arg, uint32_t code, "due to status 0x%x\n", status); break; } + case AC_GETDEV_CHANGED: + { + int error; + + softc = periph->softc; + ndasetgeom(softc, periph); + error = disk_resize(softc->disk, M_NOWAIT); + if (error != 0) { + xpt_print(periph->path, "disk_resize(9) failed, error = %d\n", error); + break; + } + break; + + } case AC_ADVINFO_CHANGED: { uintptr_t buftype; + softc = periph->softc; buftype = (uintptr_t)arg; if (buftype == CDAI_TYPE_PHYS_PATH) { - struct nda_softc *softc; - - softc = periph->softc; disk_attr_changed(softc->disk, "GEOM::physpath", - M_NOWAIT); + M_NOWAIT); } break; } @@ -998,7 +1009,7 @@ ndaregister(struct cam_periph *periph, void *arg) * Register for device going away and info about the drive * changing (though with NVMe, it can't) */ - xpt_register_async(AC_LOST_DEVICE | AC_ADVINFO_CHANGED, + xpt_register_async(AC_LOST_DEVICE | AC_ADVINFO_CHANGED | AC_GETDEV_CHANGED, ndaasync, periph, periph->path); softc->state = NDA_STATE_NORMAL; diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index f6667df07be0..c22d5fed350c 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -463,6 +463,8 @@ device_fail: if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0) done_ccb->ccb_h.func_code = XPT_GDEV_TYPE; xpt_action(done_ccb); xpt_async(AC_FOUND_DEVICE, path, done_ccb); + } else { + xpt_async(AC_GETDEV_CHANGED, path, NULL); } NVME_PROBE_SET_ACTION(softc, NVME_PROBE_DONE); break; From nobody Tue Nov 18 21:04:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvV3TvWz6GYKp for ; Tue, 18 Nov 2025 21:04: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9xvV15dcz3llL for ; Tue, 18 Nov 2025 21:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499894; 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=KiaIPb+bYVTddydk5m2iPdIQ+iH5+QSWq5jYcdiLV0A=; b=oWMwQ57215GTGoWNliqTmJnqRKww2kxeVpDLnReGVUUWFTqW6x0ETuE6bzl4BQzQ6ilji7 veOUXjrF8VGZFIQzLTRa89c+Ka4qXahA73Z0atj4QUBH8jlftt35KrK3Mq4QqtjJQOEqSk egLfohwCvYuZQvPFcS8yfeq+4Uxttcb/eGs2TB6lAWQIodoWnOW2Y17gEPI3enZGin3qPr nJ6tpCy0VwnwFl0RZQ2RE1HCuuDMV+TN6gs65ORaDufG5yrJ0eDVVMC9zdrIrZ1aUjT1hW uLmGN8AQfGL1C55pWiATY0yNq4MjlblaOahx84VVVZKzx90K/3bS2pyT6Sh+nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499894; 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=KiaIPb+bYVTddydk5m2iPdIQ+iH5+QSWq5jYcdiLV0A=; b=IKzmA8yU1ehGeNMG98zuxww4hfiGgYTMD08jAx+QRTsC4Iai3agA+wlM79E2NLzFlJFaix I8A1rn1VOG8Avvh8nw7JslycPYWvATDhaFWpiDSwgtVPxRYQsr7SL+2oPIr27GCq6Zyuy8 aLHHNhM9/Zn3Y36F4RBt4TUGj31ejwMqMWOVxsTYAl/ZhhKNdo+/65X7IhUYfBQT9HomGZ Jysm3Q/wzvR62IUVMzDHdtylip+BAfVVjiuts5hhP9FIq854qDxvT+hydhUuh999dSLsHk gSdjquKUggbej/RbtgDVRn878MxAD0UrY1jRQ2AOdB592FNOSNKzRIRG449nbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763499894; a=rsa-sha256; cv=none; b=NiMM7qgH7XxR6d4ydGiJIfc1qnkxZqgTcbzWx5+pZmjEK7x7Hxex5ZKMFmpGpB6o6xVXfP 0cQjcZ7tSBW8SAk/rG9sNiodJLEszVGpTLBWCU+8Ha0J4p3MCpKVZavOQMTS8ACrFRgLGF JXR4FRND1zi1J0cQ0eqjYcYIzY6d/6cbkKfX8Cxs+/hdPxTrL5+d2MRNXHDlhoXvrvHUDT fDXDdhxSd/4MyHR7QlZlKG0R1/R7YoR6xmkE8vcqmG9Uc4k1lZKbHXsJk+fQUJfQQh75IM uFqxRahT/kneojcJP7NhpoED/6DZWqm0eZxPT7c9IVL3t1zS50vCTC/vDgS40w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvV0L2Rz19Ny for ; Tue, 18 Nov 2025 21:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33b71 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 21:04:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: bd769e73d8f1 - main - nvd: handle namespace changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd769e73d8f1d5141b1c2eb2322b4c6caed5d9e0 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 21:04:54 +0000 Message-Id: <691cdf76.33b71.39b25744@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bd769e73d8f1d5141b1c2eb2322b4c6caed5d9e0 commit bd769e73d8f1d5141b1c2eb2322b4c6caed5d9e0 Author: Wanpeng Qian AuthorDate: 2025-11-18 17:24:13 +0000 Commit: Warner Losh CommitDate: 2025-11-18 21:01:43 +0000 nvd: handle namespace changes Signal the new media size when the namespace changes size. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 --- sys/dev/nvd/nvd.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvd/nvd.c b/sys/dev/nvd/nvd.c index 33b43efd24c1..4737b2b03ae9 100644 --- a/sys/dev/nvd/nvd.c +++ b/sys/dev/nvd/nvd.c @@ -61,6 +61,7 @@ static void nvd_done(void *arg, const struct nvme_completion *cpl); static void nvd_gone(struct nvd_disk *ndisk); static void *nvd_new_disk(struct nvme_namespace *ns, void *ctrlr); +static void *nvd_ns_changed(struct nvme_namespace *ns, void *ctrlr); static void *nvd_new_controller(struct nvme_controller *ctrlr); static void nvd_controller_fail(void *ctrlr); @@ -154,7 +155,7 @@ nvd_load(void) TAILQ_INIT(&ctrlr_head); TAILQ_INIT(&disk_head); - consumer_handle = nvme_register_consumer(nvd_new_disk, + consumer_handle = nvme_register_consumer(nvd_ns_changed, nvd_new_controller, NULL, nvd_controller_fail); return (consumer_handle != NULL ? 0 : -1); @@ -512,6 +513,48 @@ nvd_new_disk(struct nvme_namespace *ns, void *ctrlr_arg) return (ndisk); } +static void +nvd_resize(struct nvd_disk *ndisk) +{ + struct disk *disk = ndisk->disk; + struct nvme_namespace *ns = ndisk->ns; + + disk->d_sectorsize = nvme_ns_get_sector_size(ns); + disk->d_mediasize = (off_t)nvme_ns_get_size(ns); + disk->d_maxsize = nvme_ns_get_max_io_xfer_size(ns); + disk->d_delmaxsize = (off_t)nvme_ns_get_size(ns); + if (disk->d_delmaxsize > nvd_delete_max) + disk->d_delmaxsize = nvd_delete_max; + + disk_resize(disk, M_NOWAIT); + + printf(NVD_STR"%u: NVMe namespace resized\n", ndisk->unit); + printf(NVD_STR"%u: %juMB (%ju %u byte sectors)\n", disk->d_unit, + (uintmax_t)disk->d_mediasize / (1024*1024), + (uintmax_t)disk->d_mediasize / disk->d_sectorsize, + disk->d_sectorsize); +} + +static void * +nvd_ns_changed(struct nvme_namespace *ns, void *ctrlr_arg) +{ + struct nvd_disk *ndisk; + struct nvd_controller *ctrlr = ctrlr_arg; + + if ((ns->flags & NVME_NS_CHANGED) == 0) + return (nvd_new_disk(ns, ctrlr_arg)); + + mtx_lock(&nvd_lock); + TAILQ_FOREACH(ndisk, &ctrlr->disk_head, ctrlr_tailq) { + if (ndisk->ns->id != ns->id) + continue; + nvd_resize(ndisk); + break; + } + mtx_unlock(&nvd_lock); + return (ctrlr_arg); +} + static void nvd_controller_fail(void *ctrlr_arg) { From nobody Tue Nov 18 21:04:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvW666Lz6GYKw for ; Tue, 18 Nov 2025 21:04: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9xvW29bwz3lZj for ; Tue, 18 Nov 2025 21:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499895; 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=HMK8jkE5bbcgRhyVkefZjSLo6iLGMy56/HipYRBvbWo=; b=wJcgUJvu5jiWpI8hWF+MqRvx9MWwj03noFIgS5yU2aLFLwBk3QKktBW7+LKtrIp0MgOfFX oYv7UXUFc+hnzaX78AV83k0U4ySibrb3X1rK5IO6mxQeq1a5V8g5iqZUga8ZyxXlfUBSZK yGrVj0aUdbnQx7c7BI1Igsm2TZ6MXPePVe/SFDebvNAdQ0xpZszt0HC3lhD9TzjNaGBEwq N4bRHZZmLnjbs2Y2NpRRxnrBqSHNyX8vYJQERzc70pEglhap1Id6FB3Nor3gx4KIfEaxmE FjI/NpOLcmZFR0LLjbyeRl08ZUQO9qzxTPsYk9ZfpIN5yq8pPSW3urYbs/04SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499895; 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=HMK8jkE5bbcgRhyVkefZjSLo6iLGMy56/HipYRBvbWo=; b=urxVCk09VRwIIiwS6PnPztJQadUEmnJyE7AnBQ1+XFfBr3pIKDCT3fHFTYaIocgs+pMf47 EKJAil2FSe/Wx2f+IXBO6hOVeBTFMacrHclD8l02KYFXYt+3pHaa0KQk8mQ0yy0G+N0rsW n3NTMeOJgJ6OGNl9Lkc2xIvcIcwgJ3MELfcoyWHQ2kQTzCeruV+LVGjG0x7+FMp3MKLr/Q K9y/eLaFZvpYqI7DPGrNLWBd16PdxVrCjsGFSjfT3ennUrcx3OfZDs4mJhPQ5+/tVQwRJE md8dpPanJAKN55yNY3yjGKAutyhPHWm1tAifx6AhaOKLLZnbgYtWNPLjDlNdPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763499895; a=rsa-sha256; cv=none; b=YwwtfxXHCF5Dr3n74wYDLzpeG4uZYxqsD9AfJTC/mrqABuhyZH9GvecFJbmW+2OqxZj49m Nn/9Okx5ShretUGdhZgVbnNB0Gw3HG+S6jLLDpAOBUtj352T5C1VfC91Q1Wbk/ykg3+l12 7lpSBRwPLYjyAjiHFFKvwkDRG0zrj7aH6W0UqLm+7Uyi+9R6Cn2WzoRIDz/Bc0wGZT06fX p/u/CHxfp5je5BEsb+ktVfDyS24A/3r3hLaJS1lfe5GJhWW32ZUiq0z349uepCn1TKCx2S KCmO5aDrECXtCYhqup3EVJZcq+GXVzEtAPvn5HF4HzoC1a8G6zNNFFPcGcqlhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvW158tz19W8 for ; Tue, 18 Nov 2025 21:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33fc1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 21:04:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: 4640f5008922 - main - nvme_sim: signal namespace depature List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4640f5008922c5b189d2f7b63edf73300277e6df Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 21:04:55 +0000 Message-Id: <691cdf77.33fc1.65f3627e@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4640f5008922c5b189d2f7b63edf73300277e6df commit 4640f5008922c5b189d2f7b63edf73300277e6df Author: Wanpeng Qian AuthorDate: 2025-11-18 17:24:13 +0000 Commit: Warner Losh CommitDate: 2025-11-18 21:01:43 +0000 nvme_sim: signal namespace depature Signal when the namespace is gone so we can tear down the disk when a nvme drive is removed. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 --- sys/dev/nvme/nvme_sim.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index 7693aa6d54d3..e015fbe4d072 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -352,25 +352,35 @@ static void * nvme_sim_ns_change(struct nvme_namespace *ns, void *sc_arg) { struct nvme_sim_softc *sc = sc_arg; + struct cam_path *tmppath; union ccb *ccb; + if (xpt_create_path(&tmppath, /*periph*/NULL, + cam_sim_path(sc->s_sim), 0, ns->id) != CAM_REQ_CMP) { + printf("unable to create path for rescan\n"); + return (NULL); + } + /* + * If it's gone, then signal that and leave. + */ + if (ns->flags & NVME_NS_GONE) { + xpt_async(AC_LOST_DEVICE, tmppath, NULL); + xpt_free_path(tmppath); + return (sc_arg); + } + ccb = xpt_alloc_ccb_nowait(); if (ccb == NULL) { printf("unable to alloc CCB for rescan\n"); return (NULL); } + ccb->ccb_h.path = tmppath; /* - * We map the NVMe namespace idea onto the CAM unit LUN. For - * each new namespace, we create a new CAM path for it. We then - * rescan the path to get it to enumerate. + * We map the NVMe namespace idea onto the CAM unit LUN. For each new + * namespace, scan or rescan the path to enumerate it. tmppath freed at + * end of scan. */ - if (xpt_create_path(&ccb->ccb_h.path, /*periph*/NULL, - cam_sim_path(sc->s_sim), 0, ns->id) != CAM_REQ_CMP) { - printf("unable to create path for rescan\n"); - xpt_free_ccb(ccb); - return (NULL); - } xpt_rescan(ccb); return (sc_arg); From nobody Tue Nov 18 23:28:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB15812N2z6Gn1B for ; Tue, 18 Nov 2025 23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB158000jz4303 for ; Tue, 18 Nov 2025 23: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=1763508508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Omnsv/RVmut1Nt7kwJQ7ZKpogkObV5UuT7ClECvPO8M=; b=PdLVANhngGKmk0eBs/hQ9hMKOhIZtlpLEzbKfe48pvTIpOxvue3Dr7oMKc8mBgupKRfSBm YN+XWV+v/uMloUQ9LoHPekD+HG9tKfnXQrFAqmLz2psXIo3lcSkvNqSt7yT7WWnBvqm1oS tXvLJjXE4HMbJNUTnKAFXsYXKhsvUR6OOoYOetrRSz7R9dqqSM9mAcxpJi4V9dTrnvKhyg IGbCkTCppxPrSmf3410LvnDWld/298JRrHxF8mpLd38J6FhsNRfh5Bu49HYgkzdEe0UFp/ WZ4wdlkne/Athzzxp0P02I4aQ9JijRO5aHRBYahJT2HqvIVWrKCdazO3n8O5Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763508508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Omnsv/RVmut1Nt7kwJQ7ZKpogkObV5UuT7ClECvPO8M=; b=qnUDt90fFLob6EXT0tYKjjefOJyyeUvFJ/0Jw0D9R4twW1wYwspaLY/zx6zZrRDyFLbMbi cnG8h53TNSpGl2JYglorN2V0XdP7nMC+zJte7tmlcLzeqelek9dw6Ak5YBaNclFFFKZuAd Odjrbx5HFSGpxWMYserYnn/vLRI3Ww5YHm8kokTIJbzTfazL3fbPxK5wZlFAm6bd7T1nKh NM3FTPuOVKw80Khx7PoNL4+fgzBf7xnEjrhURwXJb+wHIi1tZg7BMQAY0iw4Im97BCZXOm Fpm5jWOH9T0flOX7e1PsipxLnpoysBtsjXLmbidlLMdUfJRlOzU17nSGlavvvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763508508; a=rsa-sha256; cv=none; b=b6WbhC3+F5yjU+cX8Z2RntllbqmjcspnI9ZW6cXZu0eygjrlcxa4uAS91oPX9AueUWhyiZ MXJdKIrdtr64bBjYmWgtMp9GsnzwyG+GEH5eIRxptoCunGABz+sZTnG1/OWBYkgJkKTRj6 2oBAiIHCj1W7NynZIXKXVO0e/AgvE2mYKIImlyrM3vIP8nxnzhuuaDGWsGV4hpo3DHsU7Y Xp+76wBBc73Y1AKuCXktGb3tER0Bju42f04l47qRBUg2AjkjXVnbQipcCUYa8qi8fgVSgT wNccXEKn+7S+AgPlqpVc9hkDvMnJydeEpuoTHCOEo71kVz10zk010wvcZVNJCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB1576Q4bznL for ; Tue, 18 Nov 2025 23:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8d7a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 23:28:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 3e4a3e161c00..079ba86d7157 - vendor/openzfs/zfs-2.2-release - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/zfs-2.2-release X-Git-Reftype: branch X-Git-Commit: 079ba86d71571bf997ff688da061d8c4aa2fd052 X-Git-Oldrev: 3e4a3e161c00273303cd9fa9e0dc09ead3499a8a X-Git-Newrev: 079ba86d71571bf997ff688da061d8c4aa2fd052 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 23:28:27 +0000 Message-Id: <691d011b.8d7a.43b8f352@gitrepo.freebsd.org> The branch vendor/openzfs/zfs-2.2-release has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=3e4a3e161c00..079ba86d7157 9dbaa04128ee ZTS: Use FreeBSD cloudinit images 9abb79767792 CI: run ztest on compressed zpool 3c5e1bae3867 CI: Switch from FreeBSD 13.4 to 13.5 c6a32e57caa7 ZTS: Fix FreeBSD 15.0 ksh errors 4712c76c9f21 CI: Add CentOS Stream 9/10 to the FULL_OS runner list 82d516c2f4f6 CI: Remove Debian backports 629108efc9d7 Add CodeQL mismatched dsl_dataset_hold/_rele pairs check 03825197eda4 CI: match and trim out internal timestamp for test prefix 387886009163 FreeBSD 15.0 is now "PRERELEASE" 5a5bff98f73d CI: Add optional patch level, fix hostname on F42 2b486e152128 CI: Add Debian 13 to the FULL_OS runner list a70e507b5933 CI: Increase 'Setup QEMU' timeout to 15 minutes e72a630c90cd ci: use real head sha instead of GITHUB_SHA when generating CI type 2617d6271709 ci: fix syntax issues in zfs-qemu.yml 6eca9f33e989 CI: Increase setup timeout to 20min, add timestamps 62e871a98bdd CI: Switch FreeBSD 15 to 15.0-ALPHA2 323e7ee2e4f8 CI: update perf and bpftools with the kernel packages bc21a1c2c38c CI: Remove Buildbot references 9d48e0150ce6 CI: Switch FreeBSD 15 to 15.0-ALPHA3 c2a641e4b8e7 CI: Add ZTS -O option, log Setup Testing Machines step 46ee121c39cc docs: fix a few small typos (#17804) 91f7bd02d353 CI: Switch FreeBSD 15 to 15.0-ALPHA4 and add FreeBSD 16 52233a725317 CI: Fix FreeBSD 15.0 by staying on ALPHA4 due to broken ALPHA5 image 01ddee5df44a Linux build: handle CONFIG_OBJTOOL_WERROR=y 46bc182a5dc1 Linux 6.16: remove writepage and readahead_page 3a8e23d0f818 Skip dbuf_evict_one() from dbuf_evict_notify() for reclaim thread e1a807b50d1c linux/zvol_os: fix crash with blk-mq on Linux 4.19 f3421697d086 Linux 6.16 compat: META 7d7ae8979acf Linux 6.17: d_set_d_op() is no longer available 3167b0db10c0 Fix 'zpool add' safety check corner cases 5e10fb6d7288 Add interface to interface spa_get_worst_case_min_alloc() function 824d156a55e7 Linux 6.17 compat: META ea5d37a1b946 ZTS: make uses of mktemp consistent 6a02c099426d zvol: Fix blk-mq sync 689145a01ac3 zvol: verify IO type is supported 2203f41697b3 [zfs-2.2.9] Fix zpl_ctldir.c checkstyle fb994a3cdec3 contrib/initramfs/scripts/zfs: shellcheck fixup fdc683e86309 dnode_next_offset: backtrack if lower level does not match 0d6a0e50122c objtool wrapper: use absolute path to call the wrapper 3515c887153c objtool-wrapper: Update Debian packaging f55b7464144e Debian rules: install scripts/objtool-wrapper.in into dkms tree 67ea51710a59 Several improvements to ARC shrinking (#16197) 10208765ead2 Soften pruning threshold on not evictable metadata 2910b5f5ca5b enforce arc_dnode_limit d96e139c060c config/zfs-build.m4: sort vendors 4f1d6b4861c4 Add building support for Artix Linux (#16265) 82cf24522163 build: use correct bashcompletiondir on arch 1ced0ff5de5d Reduce zfs_dmu_offset_next_sync penalty a7d6dff421ea pyzfs: Update ax_python_devel.m4 to serial 37 a5ba57ad823f Validate mountpoint on path-based unmount using statx 91f3622a2c5f Faster checksum benchmark on system boot 3a2b089a9acb Linux 6.17 compat: Fix broken projectquota on 6.17 0cfd940b6c24 freebsd: unbreak module/Makefile.bsd build on 15-CURRENT-arm64 6e4acd7893d2 zstd: disable intrinsics 5f8b3fbe56ef CI: Update FreeBSD versions and ci-type handling 5a77c19c8f4a BRT: Fix ranges to blocks conversion math 079ba86d7157 Tag zfs-2.2.9 From nobody Wed Nov 19 01:12:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB3P61SQPz6Gx7J for ; Wed, 19 Nov 2025 01: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB3P60kLtz3J0h for ; Wed, 19 Nov 2025 01: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=1763514746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v+iT1kVbiKSkuBDRLM3cM//WE4zJLGOAwogYYX6/Qj4=; b=nJZWibuVDI930MVPa6SgrvVfeZ79ssCqZ25D07A8FZN5xgzg8VkOoK43Os59hcHOvx7mzD xV/SBu9DVL8Z2U5BPC4oOOUf6k1LA6XQ3mVluw+Xbk+O3OhWoWmp2/I8z9L24QGZj2TpEl emFhnWUmMjmyUBaxa+qep2tGxO3HuCC0hDqLmt+LrNfwc/RZtDOgyKuEqkVHVLyqqky2tV 212Mkbm6x0fFtxgN/i2GQjKu7z5WHpvYWnKmYi4H54lEFZGYdnH5HuCfObkrT+weBKnXg9 uB5OQi61cormskdKdzthWY/AL22zL6+58wy72xU5SrmpPB0XdmIGW4eXUuRcUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763514746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v+iT1kVbiKSkuBDRLM3cM//WE4zJLGOAwogYYX6/Qj4=; b=obbo9jdMXo0NEHNQIL5NsZxflc7dVtscSa4BrSgor87clqLViBZ20IiUWGqXKpT5pAtG+w CiZdWoFMrrRowwn+bgB93b3Olsw/U6vJ4dbReDRWF+dQYW0Q32ckIqCRSgPZCBOL1ufqSA HmQH+5knORY6N7TDZ62qfCG8WeAMXwtCprvTkQQGD/R3g0h0Q4mDq4SfJLKE9hc42jfxAK XB6VUUJ0+P1hUpRl71q8rwcyYUHoasOXssJLfW40uTDjkvwfflEgfU5kR9Q0RsRRsdaSXm wvecrp2KHh7R1NPAzZV7p5cOCiCysxRL/WyoX/WfJpNeOIzwkvUj0zY9neMsQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763514746; a=rsa-sha256; cv=none; b=yk6xGVmo7SxlEx5Vkr87GdUTNoI+e1sqibZZBlV2AAi85t7BrJ+DFnqUEpNgTle867lFmB EIxuiwPxyACRjyFxcapGViwgwPnUlKVB1MUGAUX8a63uA610GoF95UyXbUDTtI+gJoiB8S +gAj3Mj6EiMUxLkWtAhBbHKmHt8LQ9UvmOOpSHX4hbdfx8L79tmiU3ecQdB4ebl7SuffGw 7ie3KTFPlzpGbbnh0Y+kfT7VxlRnVa7E1iTiWjDBHOjSd/IvRK6aBmVocnWn4yQGlPp3q/ TpYsE2RNDSzKqeV05Kx7KpjGc7BTdfK+Mg12RQxJIWHF/8r8epyC0+3JDcd9VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB3P60GtTz3WD for ; Wed, 19 Nov 2025 01:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25f7d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 01:12:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 0628400590e0 - main - local-unbound: Read a tab separated resolv.conf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 0628400590e025b7db1c0905e6ee488a24ef3f60 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 01:12:26 +0000 Message-Id: <691d197a.25f7d.72efc9ca@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=0628400590e025b7db1c0905e6ee488a24ef3f60 commit 0628400590e025b7db1c0905e6ee488a24ef3f60 Author: Jose Luis Duran AuthorDate: 2025-11-19 01:09:58 +0000 Commit: Jose Luis Duran CommitDate: 2025-11-19 01:09:58 +0000 local-unbound: Read a tab separated resolv.conf Use [[:space:]] rather than a white space character to delimit the keys and the values in the resolv.conf file. PR: 236079 Reviewed by: des MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53811 --- usr.sbin/unbound/setup/local-unbound-setup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/unbound/setup/local-unbound-setup.sh b/usr.sbin/unbound/setup/local-unbound-setup.sh index 25cfef48b6f0..ec3aeb673ecc 100755 --- a/usr.sbin/unbound/setup/local-unbound-setup.sh +++ b/usr.sbin/unbound/setup/local-unbound-setup.sh @@ -118,8 +118,8 @@ set_chrootdir() { get_nameservers() { while read line ; do local bareline=${line%%\#*} - local key=${bareline%% *} - local value=${bareline#* } + local key=${bareline%%[[:space:]]*} + local value=${bareline#*[[:space:]]} case ${key} in nameserver) case ${value} in @@ -145,8 +145,8 @@ gen_resolv_conf() { local edns0=no while read line ; do local bareline=${line%%\#*} - local key=${bareline%% *} - local value=${bareline#* } + local key=${bareline%%[[:space:]]*} + local value=${bareline#*[[:space:]]} case ${key} in nameserver) case ${value} in From nobody Wed Nov 19 02:27:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB53h2wcmz6H45k for ; Wed, 19 Nov 2025 02:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB53h1JtNz3Sy9 for ; Wed, 19 Nov 2025 02:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763519248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wFnAmx5hqj+eWiXgnHAVa3gKErRWW89ZCseMnR94wMw=; b=CtY3AYt+Cn7ygzQI5y0XTqnAVLYq1vxrE/4+OVqE84EZFvtNhhVidp3g7G1eGT1wkUzWZI Su/1A71uHjOZu0bdABh8vezoCsXNQNbCTgRyAfOtdCqsjwiCAzffzQVrWhdxKgltaJMsZ2 4/x88vOL2Kj0FINGZSgh7xOTBo19bw7JJcYGzk/dY+mE/yPlQ4jOYcQlR2TCavelXfct1f 95Z9xQpHIk3NM0TW6yRU320iuT8JjC4IDe1kyy3dCDRUS/Skku/gpuRxqXTEFbVhYDSbSy unGFl9DhjsQZXl9fqVPPwhXMUwMo4pdaGmK81z+antMjyvcgVu+fJ+hfBologw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763519248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wFnAmx5hqj+eWiXgnHAVa3gKErRWW89ZCseMnR94wMw=; b=a5/tgj7J/DxSX+Fk2IZ/OODk7uM0IbCzfDQeFMi7vksME8K+s63Z5P80HPSMpSF/K4vNS6 RZVhstFnHUZg3FAvF1vYklsjb57WhtPV8BYY8tZZlAWX2Eb6OwiEZj/6rfk4e6OBA7oNLt kaTAwgCwcsUpr8LGAonc9NhAQS8hYbIb6q49K7CzMaDBfQV40Sl//z83n7DdBPqXP9iC+b E3z3tQanH6R9xKauh4U/4g1ooyXmMLBA0DuxBeBllN7zMJknUDZbrlEyDJfTx3+oczmqjq ELO19MS4+zHWpQ2nYge2f18sijnoFhJqhF5bUAUOAavim46/j8t++utu66sRbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763519248; a=rsa-sha256; cv=none; b=BahrMit/qAVKs7B0NrkyQicppfiYPcdwkV9oj3+renZOrgca09BPZa199ex2YmIxg0kUPr zBZ6lVs6Ot0AGj2FSyrIle/HXorYQ7Y9ddOmkOLUsRTuA6UZrHDjKFmY7vK/7DjY0N9lgz tAogr6u96qSebdy/HfkHtOdfacwi0KV+gQn13Qp5plM4VyAPkT//lMlgAfUCSNyh12pMwh oK4RMuNtdVAKK/ni5RpWKBeMinksimkhA/CGRL/KlGmOiToNFpbAfcg8gaDuXMC5q5HUvS MkUf4wBqz2n7NGDcTkKiEkidyjHoBN8u9YOcRfgqXwTla8DSvnlM5eSfUP/xMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB53h0skRz5wl for ; Wed, 19 Nov 2025 02:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2cac1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 02:27:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9040277864ab - main - iwlwifi/mld: only get tid after checking that it is a dataqos frame List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9040277864ab28cabfc53f238e900bc19ac75d7e Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 02:27:28 +0000 Message-Id: <691d2b10.2cac1.617e629d@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9040277864ab28cabfc53f238e900bc19ac75d7e commit 9040277864ab28cabfc53f238e900bc19ac75d7e Author: Bjoern A. Zeeb AuthorDate: 2025-11-19 02:13:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-11-19 02:25:38 +0000 iwlwifi/mld: only get tid after checking that it is a dataqos frame Like we did for mvm, only get the tid after all the other checks are done by the function in order to not trigger an assert. Linux will likely return a random value there which later is not used as the driver does an early return. In LinuxKPI we do check that the frame assumptions hold up, which does not go so well for a random frame. Sponsored by: The FreeBSD Foundation MFC after: 3 days PR: 290808 --- sys/contrib/dev/iwlwifi/mld/agg.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mld/agg.c b/sys/contrib/dev/iwlwifi/mld/agg.c index 3a346bcd6665..e3bc8767297a 100644 --- a/sys/contrib/dev/iwlwifi/mld/agg.c +++ b/sys/contrib/dev/iwlwifi/mld/agg.c @@ -201,7 +201,11 @@ iwl_mld_reorder(struct iwl_mld *mld, struct napi_struct *napi, struct iwl_mld_link_sta *mld_link_sta; u32 reorder = le32_to_cpu(desc->reorder_data); bool amsdu, last_subframe, is_old_sn, is_dup; +#if defined(__linux__) u8 tid = ieee80211_get_tid(hdr); +#elif defined(__FreeBSD__) + u8 tid; +#endif u8 baid; u16 nssn, sn; u32 sta_mask = 0; @@ -243,6 +247,10 @@ iwl_mld_reorder(struct iwl_mld *mld, struct napi_struct *napi, for_each_mld_link_sta(mld_sta, mld_link_sta, link_id) sta_mask |= BIT(mld_link_sta->fw_id); +#if defined(__FreeBSD__) + tid = ieee80211_get_tid(hdr); +#endif + /* verify the BAID is correctly mapped to the sta and tid */ if (IWL_FW_CHECK(mld, tid != baid_data->tid || From nobody Wed Nov 19 02:27:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB53j4Tfcz6H3b6 for ; Wed, 19 Nov 2025 02:27: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB53j2MFdz3SyB for ; Wed, 19 Nov 2025 02:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763519249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JnvfzoXqA7w4OdclGoavHRQ/KYC5mSxxcyy4QylMmSk=; b=WVbZB3sGZqPbhgq0tOAZhljwScE56AQi1G35Lr3+F0KDJDkyCMRjSmNXWM+rngHgCET/yn XxtF+qCsyCPQiSvbQdT/arKv/kjvKZg6VFg4UmqGBq+HCJn6ZIa+M5JrbygmDmsMcHnR5b kDyXaxL4qsVklKv8RSXeuvRQcS6Ku70+suM/DiSG8qiiG8iI+d1pGk3H4bi6IcPB89KApd 5YvCMAUcaP0/6zjweFD/jXD7jI9buUIf1vO0fjWluttAXCOsejOSakLqsFu+aTl9zQseUr rAbdZbtDxa2Sf03ZllU2p6qKIDtKI3wtNzaCkEuW01Y6wiVXcgyubAp9DZGXMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763519249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JnvfzoXqA7w4OdclGoavHRQ/KYC5mSxxcyy4QylMmSk=; b=GO3pl1Ux/nqQhLLuwnHU6tZ0/l8pZsJhIh7Q2uzAXA59ycpZbXwZhFpvzx5ftAt9nXJsG1 7mnVsauuwn+UUWrb7kNsIDPCDcMvk1fyuukh43dsPReC277r+4ahw3DAHsSSvBHlIHXi9h gUw4kKoq6bNJ4Jwd99/E7F9GeXHfzKuoLh1VomYEFjAl7/mlGF06Rt/NPk/4ImS8CNdTp0 EyNgaM0swS6Ql75TH6b82NZtTPe3pQE1DKi91MXq6FskgSctmH8Of9fiyfsxvpfJlhcIUy ryAXO82M+iJGiii9hEsVtg5GeYGOn7g6SW9VMP0VZ9K+isr0FouyJBAIcyAGDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763519249; a=rsa-sha256; cv=none; b=DZsGf2zRhLBmCgVcDt6u3rY+/f2+DWjyHg2XYVS8nI4oEq968+afMN7gZV2N1ZnFRyj8Fm JVVO0LtSg57HhSka8Ip82qTSa7GpziGV56W3jR53l4Nd2a/CAzeMjxgMf0iJ2QwAZBA8eR nk58yVtHYluUoRlGx4hLJAXCGCTkfOrRn18nDSM3G94PiJAGdx/dc30t1JeHwvjJih7W00 llWfAXPj7z7mNk9EIVjF/n8aIex7m5ZLVHAmPMC4lrJxnv8i5zl5Q6VYc3W0ZnAY4FgieZ HfmhuihdYD18sTvYQdlhBeLD6N0pbapU5evmFwTnOBilguAGNnyupUm1rr3Zwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB53j1j3Tz5vK for ; Wed, 19 Nov 2025 02:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2d25d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 02:27:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 0021f70800a1 - main - LinuxKPI: 802.11: use a _check rather than a _protected version for linksta List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0021f70800a1d83a42e3a4dff10c352e67a1bcce Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 02:27:29 +0000 Message-Id: <691d2b11.2d25d.3a415d84@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0021f70800a1d83a42e3a4dff10c352e67a1bcce commit 0021f70800a1d83a42e3a4dff10c352e67a1bcce Author: Bjoern A. Zeeb AuthorDate: 2025-11-19 02:16:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-11-19 02:25:38 +0000 LinuxKPI: 802.11: use a _check rather than a _protected version for linksta Switch to link_sta_dereference_check rather than _protected to access the value. The actual problem we hit was elsewhere though. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index ee1ace3684de..0eda07a8235c 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1315,7 +1315,7 @@ ieee80211_hw_restart_disconnect(struct ieee80211_vif *vif) for (_linkid = 0; _linkid < nitems((_sta)->link); _linkid++) \ if ( ((_vif)->active_links == 0 /* no MLO */ || \ ((_vif)->active_links & BIT(_linkid)) != 0) && \ - (_linksta = link_sta_dereference_protected((_sta), (_linkid))) ) + (_linksta = link_sta_dereference_check((_sta), (_linkid))) ) /* -------------------------------------------------------------------------- */ From nobody Wed Nov 19 02:27:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB53k5CT4z6H47k for ; Wed, 19 Nov 2025 02:27: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB53k38dJz3Sq1 for ; Wed, 19 Nov 2025 02:27:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763519250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XS72GTKY3CaMdwQIJze7D8ye5KxLjj9e1ejTjXUPWxo=; b=WQte+LuUj2XZ2djGWrsSWVwkuaVYlhuDgr+gqjhpHtWFol2MARFU3L0sjKu+41Ir4awTJb jtuRUCu/YRlyp6mqpn95mZHL1GUgf1SfMzfO0Jk9ZWZO4xZnj2g2eO3rz/+mYeV+mHXDZL B7LD63D6exTNUOilE5d7Qw4BDwCuNaHYHwCtZk2d4K4EaRPbKJab+qcdEWNex+BNPUOTWN wjWsaXOvgqo09wqFqzAA7EMq7lLS5x3xmOqNOrhNZ1KnvYdEMW2IW8DiCMzVmvs/0I2lAv iav5Khe+tQHGeFIMZN6MiKED4r/drta54JpJdONh0iv7GQJUDPUTKj4XsyTicg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763519250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XS72GTKY3CaMdwQIJze7D8ye5KxLjj9e1ejTjXUPWxo=; b=Lp7mmkzbPsq09OUXyc1pW6YwDgqTEG0AaA5yuDZPqkIPhLabfWRIaHpZzVgBctvU6OpiUZ 1OvjcRpDcKmxC81oiO4ufu4q06UHppp/bdNLt+SxCKjBx2/b60rEtol7a9Fvl0q05DpL8j XtIfK6p0LLOYZtBraCZhpHv9vSHqqUAntCn8qX3E+P7Y7FqmgBONu/bA1xmUwSdzWVvrjD +cbAq6W51ocE4J2OQ+vvbMxDjF8Zycc9QoJo2eJkntb86LfBLKDYwUkxgO9RvQdNgBBv38 m1AGOpo8Wnw5lvqS7XGw+iby9epUn9Jam6uMOBzLbNij5p6C2EXauV7egYr9nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763519250; a=rsa-sha256; cv=none; b=wXejzsyTri+sKtPuYYzUNbVCdlTBRCyJr7sR85rn456FDCvPEBjZ28gXiYiXnU4Eq4HF4y dzIgU/Fpk+BtU5L0AAohpCe2vI6rxcwqsN6FYrM6Q0N8JGaJfEqWNvkvmTsuW0IOlDQwTF LnjH7UjQC6UfTiHL3xzn83ppMnMRAYK1f3uOR3OsdSiW/Wn0dQLiYO6nVCPUAZy7nGNxXB BoZTW/kCF6wBtqKalunOQdGKZ6dvalFHAQ6sRVVm2ADd9l7qgHXQkf5+13T6Kfo/kpORxp WdZP23e2IbmSBP1fNScYgaxU5bAh9lOdKVaqbBmus+rsJTvm1g/SPMuh7d6krw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB53k2Mqmz5hS for ; Wed, 19 Nov 2025 02:27:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e073 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 02:27:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 90b6a9ac0c1f - main - LinuxKPI: 802.11: implement mtx support for ieee80211_iterate_interfaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90b6a9ac0c1f4333f87f4b172482f40979324d7c Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 02:27:30 +0000 Message-Id: <691d2b12.2e073.1278a2cc@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=90b6a9ac0c1f4333f87f4b172482f40979324d7c commit 90b6a9ac0c1f4333f87f4b172482f40979324d7c Author: Bjoern A. Zeeb AuthorDate: 2025-11-19 02:18:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-11-19 02:25:38 +0000 LinuxKPI: 802.11: implement mtx support for ieee80211_iterate_interfaces Implement the lockdep_assert_wiphy call for ieee80211_iterate_active_interfaces_mtx() to avoid a warning when used and to make sure callers comply with assumptions. Leave an "IMPROVE" note as we can likely switch another of the multiple callers to RCU. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index f025f191a3bd..c68ed4491c3b 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -6906,17 +6906,23 @@ linuxkpi_ieee80211_iterate_interfaces(struct ieee80211_hw *hw, if (flags & ~(IEEE80211_IFACE_ITER_NORMAL| IEEE80211_IFACE_ITER_RESUME_ALL| IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER| - IEEE80211_IFACE_ITER_ACTIVE|IEEE80211_IFACE_ITER__ATOMIC)) { + IEEE80211_IFACE_ITER_ACTIVE|IEEE80211_IFACE_ITER__ATOMIC| + IEEE80211_IFACE_ITER__MTX)) { ic_printf(lhw->ic, "XXX TODO %s flags(%#x) not yet supported.\n", __func__, flags); } + if ((flags & IEEE80211_IFACE_ITER__MTX) != 0) + lockdep_assert_wiphy(hw->wiphy); + active = (flags & IEEE80211_IFACE_ITER_ACTIVE) != 0; atomic = (flags & IEEE80211_IFACE_ITER__ATOMIC) != 0; nin_drv = (flags & IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER) != 0; - if (atomic) + if (atomic) { + IMPROVE("LKPI_80211_LHW_LVIF_LOCK atomic assume to be rcu?"); LKPI_80211_LHW_LVIF_LOCK(lhw); + } TAILQ_FOREACH(lvif, &lhw->lvif_head, lvif_entry) { struct ieee80211vap *vap; From nobody Wed Nov 19 02:27:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB53m0P1Cz6H41q for ; Wed, 19 Nov 2025 02:27: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB53l3pSXz3SyS for ; Wed, 19 Nov 2025 02:27:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763519251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mhVLzG1JcP08eYjpX2bxsU/5pL1oJNFdpurGDQ9uqwc=; b=B0ERzajjmksaHzBGXAp54wIzejfsA50cFditvQxE6SGeRh7sWDiav59PhuoNBAPc2WEoeV gbf31OaSKqWscmcYZrp7t74RSippQ8aWwO2NhtTCCVw///2aHX95ICbQmz5bNK93ewKrka +uc7pKWSO60MYltXa+hCml29eJF1XSsOi11sDSiSmFuh4sKV8VTB64ItusKjyKciNmsMG4 OLEBTqdhi8wml57qFmPlRfvffs94+b1ccgEXQab6tUmyCM0agr8MNE/2QQJu6WSb0P8W1D 5Ml/7mK9s9dCIaL6OV7KpJgXsS21/VQXFNNcgNJERZGsYWSsKvm3LG1cUbmmeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763519251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mhVLzG1JcP08eYjpX2bxsU/5pL1oJNFdpurGDQ9uqwc=; b=TxFj1uBtbbfx3j4hBH9f8HFAbMy9yfqGLCJqfgs+FPNVVDCQ5764nNDAbL9NSCQgGKpqZ8 ZXEioQg52I3rXj0No0XKwmmHv4OSbwXIxGFkrwLFM9iH68S87m/8/9DY6BMuHxRyh56pCY k5Xw/el5ZnBiyhFCiJwRTzLuNTv0w90xekXw4+ZuYofn1J0xc3qbsEGAIqyFEp6OAWdDhN 8+xIefFv4QDmmwtWK4yI5UBowe7o5oj5/lF5BycczMlsasiLSxgyptW616S+rQFTntSX74 TMY7Q15r5G1PIgMMyN+Kavl7Kz+O/x+ugEbNkK/bguGViqMef4Nh/ZYagkLebw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763519251; a=rsa-sha256; cv=none; b=cS4e8s/3UeH0ISCf18QmZeQr0Lfh8S3L9tEeiD3IaYhKkPGDP5ns6/rNgQ4lLi01YUwsP6 MxdgGs3QwCEt/P/Yhx9iLtVurqc1bJdiCVHcbdIAgwBobsXOtAiee0Cza+a11ubwpQ5t6f 5gS4y953igH1Nl2T+CxMydzIhO/0GFLZzwmu/3ILnVWzmolnrj1QV0hqIdEw2mh8EgOHPp 6c8qWyLm2yAVLlGHmtftyXrkwvmLEy1Rulr20cQvxMvD6JlY3T86IyfvdTI7nNc5a5Di2p ZR7MjK//N5QHYQi3o2ivL8PtmDz5uS/QmAIFNVgTzBlwmOit5JN1rjGW43P1Yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB53l3Cndz5fS for ; Wed, 19 Nov 2025 02:27:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2de07 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 02:27:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d1180baa9b99 - main - LinuxKPI: 802.11: initialize a backpointer on the link_sta List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1180baa9b99538481f3780fc8f4e6e464a15e99 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 02:27:31 +0000 Message-Id: <691d2b13.2de07.57b4269f@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d1180baa9b99538481f3780fc8f4e6e464a15e99 commit d1180baa9b99538481f3780fc8f4e6e464a15e99 Author: Bjoern A. Zeeb AuthorDate: 2025-11-19 02:21:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-11-19 02:25:38 +0000 LinuxKPI: 802.11: initialize a backpointer on the link_sta iwlwifi/mld uses the back pointer in iwl_mld_link_sta_from_mac80211(). Initialize it to make BE200 cards work again. Sponsored by: The FreeBSD Foundation MFC after: 3 days PR; 290808 --- sys/compat/linuxkpi/common/src/linux_80211.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index c68ed4491c3b..8b1f5f0e0399 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -832,6 +832,7 @@ lkpi_lsta_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN], sta->deflink.smps_mode = IEEE80211_SMPS_OFF; sta->deflink.bandwidth = IEEE80211_STA_RX_BW_20; sta->deflink.rx_nss = 1; + sta->deflink.sta = sta; lkpi_sta_sync_from_ni(hw, vif, sta, ni, false); From nobody Wed Nov 19 04:13:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Ps14x5z6HCg1 for ; Wed, 19 Nov 2025 04:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB7Ps0TfMz3gmF for ; Wed, 19 Nov 2025 04:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9fY5NR3dNiQF5NUVL3U1sFk3AC+6Su7lDiSN5qnzrfA=; b=fTSnkFY8BWkHLUPxW8MLtJlB916lb7XflKowX4UB2pfKqKZUZXRJtBZzzaLAY1a+keRyal Hx8bJxbztg4+Qz23mDyJ2F2V5nRy2u/W5HsFgq/J9pk2LLHAXfbGknHiGNOOpWn+Orr5xl PwKFAPob8KAwk8oR92aQqRdVeM0fc9u28SQTBuFPQkDwccXm7XPgeAU2aUMfVpLfMGBnec iTzGijhU21K6x9R//1rej1+cSwuwKChGpjyaah/sovAaSMnsRZUxjTgRJ8VSfnrlXlEWVo MrVn3DELfyu8BIAc1bSsSJX1GN0UBLwVfa6n56si/SnisEOCMbH74PbTY4hZUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9fY5NR3dNiQF5NUVL3U1sFk3AC+6Su7lDiSN5qnzrfA=; b=WmWYBw6IOqPEc/GGIiK759dFAhgkDPqyhwe1sCpHg3wpfeSqqZegAriVSW17e6TzjrL/zT nU217us/d0PRgMxkrBnClN7dWIXk5K6vPESVJaNsJum3p1ysVvGYnnf6HhulS8ogKzp7ts J7d2LkIGCJi8LFti41iifrJrYC8+S0yFZOxxktqCsjzPAjjPrKTm+/Lrtg/JkdCjueEXkZ 5/sUxsrXeLdrA00UxOztAVdqwDZUWisDr3OC0DHKpuQbWsMU6fLygk6bJbpJ5h6U1Ncs8A EDcw340fRJ1w70eyP3NyCXjcTFv0mULQAGDXPVFPJyfr9V8Y6zleaMQCnJQCfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525601; a=rsa-sha256; cv=none; b=l+vOt1QKBGzoAkDOPIDHcb/r/6QfNqDdD4eIwQ+I6RUngwpfijN4RWbQqesyJBuYde5upz 9QwiYRm/HpU+pPJfQ1ab7bbBfMz4vHupCBH/qtPzXmQZEbQ4im6zncGQEyZCpXxmxKRwLs c3WMRyk5ZzH7YUkkl1vjI3A9JYU1yNiPQ56UFnQIrJFCL3cF+Q5lJf2IjXLZBCBGmtAEv6 /FNXT0JHoSCoIiwGrNY1BC3XaMG3oKZKMxH+rgRjFDAP9VIRr4iftxYsQVmXFlpWeq+2dO LV50ABwk8S9Xj2bkSo/aMYnAQ/RNkR5BFM2bP4H++laYNYc9O7rrvsJfjTNI2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Ps03xXz8pC for ; Wed, 19 Nov 2025 04:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 849a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: fd737810a163 - stable/15 - nvme: Fix backwards sense of error condition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fd737810a16329449d9ceb1e77e5429fdbb51953 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:21 +0000 Message-Id: <691d43e1.849a.37f97953@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd737810a16329449d9ceb1e77e5429fdbb51953 commit fd737810a16329449d9ceb1e77e5429fdbb51953 Author: Warner Losh AuthorDate: 2025-11-18 20:07:11 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:52 +0000 nvme: Fix backwards sense of error condition b21e67875bf0c tested for the good condition, not the error condition, so we'd never do anything else in this function. This was causing certain logging not to happen, and also prevented forthcoming namespace size change code from working as well. Fixes: b21e67875bf0c Sponsored by: Netflix (cherry picked from commit 27481c268916b0790c7ad16202a5b012625ce1a8) --- sys/dev/nvme/nvme_ctrlr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 6ed9cb33f991..07c1bcdfbf08 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1153,7 +1153,7 @@ nvme_ctrlr_aer_task(void *arg, int pending) mtx_sleep(aer, &aer->mtx, PRIBIO, "nvme_pt", 0); mtx_unlock(&aer->mtx); - if (aer->log_page_size != (uint32_t)-1) { + if (aer->log_page_size == (uint32_t)-1) { /* * If the log page fetch for some reason completed with an * error, don't pass log page data to the consumers. In From nobody Wed Nov 19 04:13:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Pt38Ncz6HD2R for ; Wed, 19 Nov 2025 04:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB7Pt1vqDz3gpV for ; Wed, 19 Nov 2025 04:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525602; 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=UQJhkCN3MIW2wAc4fhCo6hUl5r2co1DB1M1XPRm1m9M=; b=qgfSvZzUif/w4D9nHRt2Lx9OqifMlHWBFHTLA7fJYwYTWcsd7ZJPKZ5ihUq9urFrQGrpew oiDvcUZguUK3KLyFv2gHAYFhwityyEk/cA9EUsxMEXtRMH0C8z6sedQAksE3I//JtV4QBc 2oKC3Gf0wRnNGaW6WVj72e+dCG0dp5ZahmkbsU33b8kxC6YQfOG97nOo5s23QfqZtedVef vIxJ2FGwO35mKPRn05xZ8m2VQhfu5at7maaJ+xBAYEEXeRD9pxP6i7pplW7qXETB+CvmPI KOb6TVmkWLk67yC8zBYVXyZGi5pT++k9ssMZiLIW6v9eO9sZlcHQ7437pjhqdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525602; 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=UQJhkCN3MIW2wAc4fhCo6hUl5r2co1DB1M1XPRm1m9M=; b=ablsZ94h+DQJLQSkKobMgWq5Sf6CVSNGebFsk0A2wRtHrbyRcCBUtrbjhfoYztvjNGdXNa 27ivD3mQviKw+yLPmu10IsBbqCmDKhe0VHR6XSxPnGbkDhBSeIRW1PutCfti4/flo7NOCU aUli1vl3uQx+Zti/Gh6Sjx0hyz2P67aLrcxCQ8oQUVVObLqQxTsMUEYvQLMzHvtJcwyICo 5hHrVAJOA98IbOfmj+nU60qag2Uj7/bG4G93sSalEPSh6KMbFRxp5pegTYoSolERywTTLm b8Fd5GcoAX81G2F2I2vZdJBchyajpCfZXE3hvSLwfDOI7GTZ1TC5k+2JZQZoZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525602; a=rsa-sha256; cv=none; b=QhaGCR4ciGzzf5ulZGnoEeR1wskt7eeoQfnKm6EerhLDOMCXrayCMdGuy8S5JevTJWH24M 5ECzAQxqbofhb2SKkv07MdganeUGdM98qwgJwwplGcRtiiV78uTmW+BjMNQCvLboGAxifD xJj1OEypvXNFQhUs1jrMNJ5/7BcDkxU6X9PfVfykxaD64Vj6oOPSibWMQo5n3bRI6xJrT/ Gyz7Qgf0PIk0UmCax11qYjCFOTtMx8I3tVZt75zh8rrnjPSnn7JyJSPF0OnHoF+mfTi96l RLXgVkFeaM+fJakv0BUTysi1y3uFQiC9YR/CEEAe5MpQD17xBA3vK3I8QNE1+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Pt0sjkz8pD for ; Wed, 19 Nov 2025 04:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8593 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: fe6ee00d174e - stable/15 - nvme: Notify namespace changes better List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fe6ee00d174e0d7f4c7a38db9af7b94c56579054 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:22 +0000 Message-Id: <691d43e2.8593.68367ce7@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fe6ee00d174e0d7f4c7a38db9af7b94c56579054 commit fe6ee00d174e0d7f4c7a38db9af7b94c56579054 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:53 +0000 nvme: Notify namespace changes better When we get a namespace notification, we have to reconstrut the namespace to get the new identification data from the namespace. For each namespace in the AEN, we will reconstrict it before we call the notification. We also flag it as changed for the duration of the change callback (prior versions of the patch needed to keep track, but we no longer do, so this bit may be removed). Note when we've seen the namespace so we can notify when it goes away. Co-authored-by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit 20e94950c54e398049396647da36b9e2c3b639c1) --- sys/dev/nvme/nvme.h | 7 +++++-- sys/dev/nvme/nvme_ctrlr.c | 12 +++++++++++- sys/dev/nvme/nvme_ns.c | 9 ++++++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 17c5cdb4db87..8e69c0ffe339 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1930,8 +1930,11 @@ typedef void (*nvme_cons_async_fn_t)(void *, const struct nvme_completion *, typedef void (*nvme_cons_fail_fn_t)(void *); enum nvme_namespace_flags { - NVME_NS_DEALLOCATE_SUPPORTED = 0x1, - NVME_NS_FLUSH_SUPPORTED = 0x2, + NVME_NS_DEALLOCATE_SUPPORTED = 0x01, + NVME_NS_FLUSH_SUPPORTED = 0x02, + NVME_NS_ADDED = 0x04, + NVME_NS_CHANGED = 0x08, + NVME_NS_GONE = 0x10, }; int nvme_ctrlr_passthrough_cmd(struct nvme_controller *ctrlr, diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 07c1bcdfbf08..63b8643d97d7 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1216,10 +1216,20 @@ nvme_ctrlr_aer_task(void *arg, int pending) } else if (aer->log_page_id == NVME_LOG_CHANGED_NAMESPACE) { struct nvme_ns_list *nsl = (struct nvme_ns_list *)aer->log_page_buffer; + struct nvme_controller *ctrlr = aer->ctrlr; + for (int i = 0; i < nitems(nsl->ns) && nsl->ns[i] != 0; i++) { + struct nvme_namespace *ns; + uint32_t id = nsl->ns[i]; + if (nsl->ns[i] > NVME_MAX_NAMESPACES) break; - nvme_notify_ns(aer->ctrlr, nsl->ns[i]); + + ns = &ctrlr->ns[id - 1]; + ns->flags |= NVME_NS_CHANGED; + nvme_ns_construct(ns, id, ctrlr); + nvme_notify_ns(ctrlr, id); + ns->flags &= ~NVME_NS_CHANGED; } } diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index e84d2066930e..21d7965bf7a6 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -78,7 +78,7 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, break; case NVME_PASSTHROUGH_CMD: pt = (struct nvme_pt_command *)arg; - return (nvme_ctrlr_passthrough_cmd(ctrlr, pt, ns->id, + return (nvme_ctrlr_passthrough_cmd(ctrlr, pt, ns->id, 1 /* is_user_buffer */, 0 /* is_admin_cmd */)); case NVME_GET_NSID: { @@ -557,8 +557,10 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, * standard says the entire id will be zeros, so this is a * cheap way to test for that. */ - if (ns->data.nsze == 0) - return (ENXIO); + if (ns->data.nsze == 0) { + ns->flags |= NVME_NS_GONE; + return ((ns->flags & NVME_NS_ADDED) ? 0 : ENXIO); + } flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, ns->data.flbas); @@ -622,6 +624,7 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, ns->cdev->si_drv2 = make_dev_alias(ns->cdev, "%sns%d", device_get_nameunit(ctrlr->dev), ns->id); ns->cdev->si_flags |= SI_UNMAPPED; + ns->flags |= NVME_NS_ADDED; return (0); } From nobody Wed Nov 19 04:13:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Pw6PQ9z6HCpP for ; Wed, 19 Nov 2025 04:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB7Pw3H3Nz3gsD for ; Wed, 19 Nov 2025 04:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525604; 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=zWdoNFkzfMuFD9TbV+K7cVjddaJF6nqb4sBd9r40c1w=; b=PcfLUhyDgkd0YSAvJ6smI+BZzgwoOG7siZEOPHGFvrtdAzWuP/blSZPrb5QlTtSqrdhA5a UDx7ovMTL+6LTz6Y6NeA2MYkjybUdBvHjHpHvBvxJBkr+9tBa0KgxYpxU5oz6fp72bsrnw UBHSA4nq7Zq4xpqZvP3QmYDWJygy0muRh2l3uVgxwVedWkmQw8e2OViNuv5d+HZYaRqg0F XWG/TYpNw0F64ydn5XDvfd6cDKluEqQecjlLwRUkq/Bk67yyUlcvo9C7E0RKS14IhmeDsY 8Uxmgow8X0Lzud/BEv1nkLu9Y5ruSmMM9scig2P/eF59rCAzfukTcYLSZ8cqww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525604; 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=zWdoNFkzfMuFD9TbV+K7cVjddaJF6nqb4sBd9r40c1w=; b=hIhv6PvcD2wpsEcmREpD4EAgfl3X9PFHgkg6fT1u9iR/ikHUVgd8wHoZ/BU67OVjz0D/Wj ZH+Ubpd9W8WsychAHaJPf/WTzNNMw/CFaBVQpCdrMR5URvxQkDEQFKs4+vlNPg5qGb/eBY 13vIxtl4nEr2Z/nugzdHFG2pL5DngXerxbhHasxtJKmIob3k3XunnrK/1sDDUjfCsL69dD FJcE59UbbkjCMX4p3GLr428DwrRKdskrdOf81OHjGZKmcPF+XFuJqepjxqhVzKqY1UlFqN I1iHZ01I6AvT3RyIlUHk6sB/V0xCGycqPpYniz+l5p1cRqonB140bFf2hloEsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525604; a=rsa-sha256; cv=none; b=ucTI8NsNhX7p98c3SCx/3GHyYVzVGoJXsBtmGfTKIw2Dupl8oAOm/ys4cMcSQ7VKW64S2I wxszNOqAJep5zfkiuGnQbCS+pndrdIaUP/cEkdUKNps/QHBuPWKNymgvLEvRFlLXkPdX/O s9EK21BKhGUOdCyfAU5RzGntpnJaqX6c1VTmk6b7MC3aF1j48vYL9P/3vC8mhvTers2Qss pohZgyJlNZMqkewH4JDoQHqxRhxBaoliLUotDmCHhe6uqI+5SpMxIoNaRDAtdC3MZ0U2Ne R6ZzFzBF/kIg2I5fdnitlJTSF/QoUbQ0UAN8gPTKw+XgK05lAIX6Ten0epinjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Pw2MB9z7x5 for ; Wed, 19 Nov 2025 04:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 91a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: 9a465b37ea17 - stable/15 - nda: React to namespace change events List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9a465b37ea17642d45597d4ee7d3283b02dfa6f0 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:24 +0000 Message-Id: <691d43e4.91a6.765ccaff@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9a465b37ea17642d45597d4ee7d3283b02dfa6f0 commit 9a465b37ea17642d45597d4ee7d3283b02dfa6f0 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:53 +0000 nda: React to namespace change events Register for AC_GETDEV_CHANGED. When we receive a namespace notification, we only create a new device if it was unconfigured. If it was configured, generate this async event. Rely on the fact that we reconstruct namespace to just get the data from the identify data and call disk_resised. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit 86d3ec359a56d1b5d015718bd19ef4bda681a032) --- sys/cam/nvme/nvme_da.c | 29 ++++++++++++++++++++--------- sys/cam/nvme/nvme_xpt.c | 2 ++ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 330f4ca66e1e..2eb43809f4b1 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -673,12 +673,11 @@ ndasetgeom(struct nda_softc *softc, struct cam_periph *periph) } static void -ndaasync(void *callback_arg, uint32_t code, - struct cam_path *path, void *arg) +ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg) { - struct cam_periph *periph; + struct cam_periph *periph = callback_arg; + struct nda_softc *softc; - periph = (struct cam_periph *)callback_arg; switch (code) { case AC_FOUND_DEVICE: { @@ -709,17 +708,29 @@ ndaasync(void *callback_arg, uint32_t code, "due to status 0x%x\n", status); break; } + case AC_GETDEV_CHANGED: + { + int error; + + softc = periph->softc; + ndasetgeom(softc, periph); + error = disk_resize(softc->disk, M_NOWAIT); + if (error != 0) { + xpt_print(periph->path, "disk_resize(9) failed, error = %d\n", error); + break; + } + break; + + } case AC_ADVINFO_CHANGED: { uintptr_t buftype; + softc = periph->softc; buftype = (uintptr_t)arg; if (buftype == CDAI_TYPE_PHYS_PATH) { - struct nda_softc *softc; - - softc = periph->softc; disk_attr_changed(softc->disk, "GEOM::physpath", - M_NOWAIT); + M_NOWAIT); } break; } @@ -997,7 +1008,7 @@ ndaregister(struct cam_periph *periph, void *arg) * Register for device going away and info about the drive * changing (though with NVMe, it can't) */ - xpt_register_async(AC_LOST_DEVICE | AC_ADVINFO_CHANGED, + xpt_register_async(AC_LOST_DEVICE | AC_ADVINFO_CHANGED | AC_GETDEV_CHANGED, ndaasync, periph, periph->path); softc->state = NDA_STATE_NORMAL; diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index f6667df07be0..c22d5fed350c 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -463,6 +463,8 @@ device_fail: if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0) done_ccb->ccb_h.func_code = XPT_GDEV_TYPE; xpt_action(done_ccb); xpt_async(AC_FOUND_DEVICE, path, done_ccb); + } else { + xpt_async(AC_GETDEV_CHANGED, path, NULL); } NVME_PROBE_SET_ACTION(softc, NVME_PROBE_DONE); break; From nobody Wed Nov 19 04:13:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Pw4ztbz6HCpN for ; Wed, 19 Nov 2025 04:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB7Pv26ZMz3gdG for ; Wed, 19 Nov 2025 04:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525603; 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=c/Q07TZjiHh+PEKooR+4fGit1mPVtWxRzET1GiILAZM=; b=R3ROnhNQjKXiXsFMvzbhazUwM8gocOVp2FcFodBBRATFXOwRTQCz6xkhSji4BUOMsajHl7 P8PZpdMnof0uJ6u5jSK6YsWKGFQfUYtfaNZWhg37OkrQstuZ6sfZcmpef0/PEA+e5wD4CB CLntetf12ORrV3Z7xPQYAU6ppgGAVaZubDFlJEKGSAU0zpvHh3nv5tSuliqyj3fxSVYKXC vHujKDRitLFK6ir1rTxZ7vcVKRXHRNnFpsdiD2syjgcKUs5+cjOqVO0XxFjswgMRFmh/yH 95N4puc8jZhIQM1cJwyGTuZlvRdkbzpGJ5gnMHZyyUbHsVP5LRwy2wQsh8f0pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525603; 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=c/Q07TZjiHh+PEKooR+4fGit1mPVtWxRzET1GiILAZM=; b=IwdJHEr3wflAiqS1sxMGwHYtFxA8a+rkszpDVHarDAgf++HUXXbvWCucemQ2bB9T/XtlwF q2lZKKzbzMuL6mSb5bKm4iDjahMNy29wjx6i3PCU+i7smsy7+rUxzh5OBLbaQ8wxFj48uW yTEEk6XtW9Zr8H+jSpzFLfDSKZTK+OlzgON4LnNeJKkRZty3TZCaJnJjzGLBJSeuQyH7jQ vjLnJiBbSTY++m+eqU2CFTb7Cgd0KF75AXdOb6hQMCcGjQuCLG7CxPzYS6jMDVT0f+4bap 9YbmKj+hIqdfo14EUQAXhSkGGQYPRK2DpQQOphvRgYiNn43h35aqFAIi0hJjVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525603; a=rsa-sha256; cv=none; b=EbeP/yZtxarb5htN+gscSMRXi1m6wjXuYCa5gczoDNdJpLoYDK40LQjpqR2d3cicF9oiYw O0QOscqAUGghTTSsFpSU0lLk8GeIeV90n1KZIPU8OpAXqvdArLkPDL2MnL1V5Ml46qHNMX o/yRYqZq2Gvvv88WnjAc/WjN3EsiYZmisiPt4Abr//GC+gsCojUW0w1vgbqLyp1vetKrFN x/H50rB0gylcwJWMdu7VK63tQ36q6OkKseAdYU1HyjmwxgBsR81NlBkONuEwmCuMpNJWDE JOmI2S7qEYkrRDFnxY9t5SxV3mNaA7SlD/o9eVhdwy+hWrV5vwK895pvmBfBBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Pv1Zyzz8r6 for ; Wed, 19 Nov 2025 04:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8699 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: 31412fda9fa7 - stable/15 - nvme: Refactor geom setting to function. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 31412fda9fa71d85a19604151d662ac65c301c2a Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:23 +0000 Message-Id: <691d43e3.8699.67b8660c@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=31412fda9fa71d85a19604151d662ac65c301c2a commit 31412fda9fa71d85a19604151d662ac65c301c2a Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:53 +0000 nvme: Refactor geom setting to function. Refactor setting of geometry for the disk to its own function. No functional changes. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit dffd882d12d2a71aca464f48209ec9ae6f393b15) --- sys/cam/nvme/nvme_da.c | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 1c0d5e8381d8..330f4ca66e1e 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -643,6 +643,35 @@ ndacleanup(struct cam_periph *periph) cam_periph_lock(periph); } +static void +ndasetgeom(struct nda_softc *softc, struct cam_periph *periph) +{ + struct disk *disk = softc->disk; + struct ccb_pathinq cpi; + const struct nvme_namespace_data *nsd; + const struct nvme_controller_data *cd; + uint8_t flbas_fmt, lbads, vwc_present; + + nsd = nvme_get_identify_ns(periph); + cd = nvme_get_identify_cntrl(periph); + + flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas); + lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]); + disk->d_sectorsize = 1 << lbads; + disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); + disk->d_delmaxsize = disk->d_mediasize; + disk->d_flags = DISKFLAG_DIRECT_COMPLETION; + if (nvme_ctrlr_has_dataset_mgmt(cd)) + disk->d_flags |= DISKFLAG_CANDELETE; + vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc); + if (vwc_present) + disk->d_flags |= DISKFLAG_CANFLUSHCACHE; + if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { + disk->d_flags |= DISKFLAG_UNMAPPED_BIO; + softc->unmappedio = 1; + } +} + static void ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg) @@ -846,7 +875,6 @@ ndaregister(struct cam_periph *periph, void *arg) const struct nvme_namespace_data *nsd; const struct nvme_controller_data *cd; char announce_buf[80]; - uint8_t flbas_fmt, lbads, vwc_present; u_int maxio; int quirks; @@ -903,21 +931,8 @@ ndaregister(struct cam_periph *periph, void *arg) else if (maxio > maxphys) maxio = maxphys; /* for safety */ disk->d_maxsize = maxio; - flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas); - lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]); - disk->d_sectorsize = 1 << lbads; - disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); - disk->d_delmaxsize = disk->d_mediasize; - disk->d_flags = DISKFLAG_DIRECT_COMPLETION; - if (nvme_ctrlr_has_dataset_mgmt(cd)) - disk->d_flags |= DISKFLAG_CANDELETE; - vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc); - if (vwc_present) - disk->d_flags |= DISKFLAG_CANFLUSHCACHE; - if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { - disk->d_flags |= DISKFLAG_UNMAPPED_BIO; - softc->unmappedio = 1; - } + ndasetgeom(softc, periph); + /* * d_ident and d_descr are both far bigger than the length of either * the serial or model number strings. From nobody Wed Nov 19 04:13:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Py04D1z6HD2V for ; Wed, 19 Nov 2025 04:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB7Px49Lnz3gvb for ; Wed, 19 Nov 2025 04:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525605; 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=uyu+JfvO2JrBfNvN8OAKnJB6kdXP0CF+nPXK3pdsuKY=; b=Ic0pl0AtYB2FMF1AE7SQxEEOEcxEF1Gozy8et9LsyA+2iL7uEYFCLLB6ckIEYLVpIqXjAu OcD2ZQg/OPkQ4H5nbi/NM6CAjajtbnaVDgy8x5ZNh1gn3y8RekIqNt4CmiOzc9TXwtqP4x gs1XvoBhs8ArhKYHL4M3VBAYKxydLeaPxKCI8/uszgDNEpV5LMS27B8LMJF2yNRqB19d0U zSarvp5ctDhK0/+6vN7iGr6EnkTWFEr99bgGyclIcIit5GDWb2a+2Qc9Phx33m/BJvGeYS Ny839ZoLhOvGbxn0PtXpaEy8Xg092QDO+XCWpzPAB7wwGJrbB0xuVg99NMyrkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525605; 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=uyu+JfvO2JrBfNvN8OAKnJB6kdXP0CF+nPXK3pdsuKY=; b=s8JXvZsCPH5icqDvfxVqSjRDlrwMBOiMJjdCvf9B2q2t4GBAV+S+b0O5lvjCLsyPIorykW sSsoDV+0v5CsfMXiwuHH1sLEVVZHaVk8LSReoyU0FMV3UXRycPxOqg3Rz+jZcKLRDMGK4t MtVFJ6b5zlzjFJ80/rhtTq3VOrDXPilKWamQoNWRJnihvvEypwIJRDGPZnxKKMTA8hHzeD HQr9TcqfhcoRXV2dLNU3VgLOFfLQ/5DF/PR4x89tbTdRrf4bVLsVMgkMNV0UAZAtFJfZbl T6RRaXTZFnCM7xX3bK5O82/LbGRAqTRfYb2tz1zSd48EsjIB0qF6z8xcm9+iUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525605; a=rsa-sha256; cv=none; b=lYV155FBIGh5flaFvK/YsW66+ZENW32EcyWkeBdpnUqeT2mrKEqiitu+/XKqjTLkvzcRDW NFwCcllXDs6zRQP+uGMqkcwSjL7GrfKOiTl5tVmyAS6FmvT5Y7yoZ0FLu63JAgc8dTK3Ap 5UT30FefdA0UwjJuXbz1d3q6gAkySmsfVi1+MSgTlftWtCj3t2avywwsyfQxn6i2EuRRnY LVRVS5TZJ0Ws5KsoWvr9SITdPlnP6+1mAT+2OUruxbdURrNITGhp2Z0xyOTv2/qEXSHIVY seRuRNOWvwfpO2i2gHPATYlyP9Px++cwT9cxs7MnxS768DJMng+7w/3/56RPIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Px354sz8C2 for ; Wed, 19 Nov 2025 04:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 849e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: 96a7ed1e7fb4 - stable/15 - nvd: handle namespace changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 96a7ed1e7fb41df17e783503371533cc8db98540 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:25 +0000 Message-Id: <691d43e5.849e.20667202@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=96a7ed1e7fb41df17e783503371533cc8db98540 commit 96a7ed1e7fb41df17e783503371533cc8db98540 Author: Wanpeng Qian AuthorDate: 2025-11-18 17:24:13 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:53 +0000 nvd: handle namespace changes Signal the new media size when the namespace changes size. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit bd769e73d8f1d5141b1c2eb2322b4c6caed5d9e0) --- sys/dev/nvd/nvd.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvd/nvd.c b/sys/dev/nvd/nvd.c index 33b43efd24c1..4737b2b03ae9 100644 --- a/sys/dev/nvd/nvd.c +++ b/sys/dev/nvd/nvd.c @@ -61,6 +61,7 @@ static void nvd_done(void *arg, const struct nvme_completion *cpl); static void nvd_gone(struct nvd_disk *ndisk); static void *nvd_new_disk(struct nvme_namespace *ns, void *ctrlr); +static void *nvd_ns_changed(struct nvme_namespace *ns, void *ctrlr); static void *nvd_new_controller(struct nvme_controller *ctrlr); static void nvd_controller_fail(void *ctrlr); @@ -154,7 +155,7 @@ nvd_load(void) TAILQ_INIT(&ctrlr_head); TAILQ_INIT(&disk_head); - consumer_handle = nvme_register_consumer(nvd_new_disk, + consumer_handle = nvme_register_consumer(nvd_ns_changed, nvd_new_controller, NULL, nvd_controller_fail); return (consumer_handle != NULL ? 0 : -1); @@ -512,6 +513,48 @@ nvd_new_disk(struct nvme_namespace *ns, void *ctrlr_arg) return (ndisk); } +static void +nvd_resize(struct nvd_disk *ndisk) +{ + struct disk *disk = ndisk->disk; + struct nvme_namespace *ns = ndisk->ns; + + disk->d_sectorsize = nvme_ns_get_sector_size(ns); + disk->d_mediasize = (off_t)nvme_ns_get_size(ns); + disk->d_maxsize = nvme_ns_get_max_io_xfer_size(ns); + disk->d_delmaxsize = (off_t)nvme_ns_get_size(ns); + if (disk->d_delmaxsize > nvd_delete_max) + disk->d_delmaxsize = nvd_delete_max; + + disk_resize(disk, M_NOWAIT); + + printf(NVD_STR"%u: NVMe namespace resized\n", ndisk->unit); + printf(NVD_STR"%u: %juMB (%ju %u byte sectors)\n", disk->d_unit, + (uintmax_t)disk->d_mediasize / (1024*1024), + (uintmax_t)disk->d_mediasize / disk->d_sectorsize, + disk->d_sectorsize); +} + +static void * +nvd_ns_changed(struct nvme_namespace *ns, void *ctrlr_arg) +{ + struct nvd_disk *ndisk; + struct nvd_controller *ctrlr = ctrlr_arg; + + if ((ns->flags & NVME_NS_CHANGED) == 0) + return (nvd_new_disk(ns, ctrlr_arg)); + + mtx_lock(&nvd_lock); + TAILQ_FOREACH(ndisk, &ctrlr->disk_head, ctrlr_tailq) { + if (ndisk->ns->id != ns->id) + continue; + nvd_resize(ndisk); + break; + } + mtx_unlock(&nvd_lock); + return (ctrlr_arg); +} + static void nvd_controller_fail(void *ctrlr_arg) { From nobody Wed Nov 19 04:13:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Py6YJFz6HCg8 for ; Wed, 19 Nov 2025 04:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB7Py4YkPz3gdq for ; Wed, 19 Nov 2025 04:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525606; 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=i6x8gXW0s1f4uFDxpFwdEkLamxsrG7Mn47x1dnzfTH0=; b=Wy3afBwa5Q1TzSp1HhO4oqEZ+2OHTWAzXzzy6WSsrvS7rmNP/s9ZmEWr9+sk5UXOqNCRJ5 ae6mmjlHOs6NOOSrc2S77EvQH+6h9ZU9naDu94H6zx9lPek9FljVdfrOhi4VoB0jaCbvu0 mNY51gWnVigeKG3mTn3y2b5RLBYZ9Cwc6tBc/GsbCqAqFQq7McgI5I2QxCnUhEW3W7VBvY RtuMjIaGf6A4OLx3aZ7+bUGDGWaRWTBxDJsLocGqA0aIrzsOZ/G+lU4q0EYPVloWfAvEZz T9E+FDQf7M+KsN0YtKYVBYdrrYRK4MJvXmA/e82rZIf7Sxyx+XOdd8aYiOwLaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525606; 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=i6x8gXW0s1f4uFDxpFwdEkLamxsrG7Mn47x1dnzfTH0=; b=Hf0+XggsreXBxux4fq+xcucuxJW07OmOHy2iF8DIVY0IbLn3ug/1l8rEjrY9hj2bvjNA9D xWF0H1shJsVj1a1YdTfvFwQhFy0XX6jNOrNenEFRsA0jIMGMd7z0Sq9b/vjvi908yFrJUN c3QvTAGKtBUJbIbIBc464bihb2yoPav96506XxbX1baHzLVSvvHsHIeViMbVXSXAP47y3T LwvAVDdjfCntZXt77x8S9h0F+lqo6e2y6vdIXGQGBoOgfIt9d+VUxE77zK5E8oYW2Q8f+3 CAdsy6GwWHbi20rE3Nu+DLkZA4aE+b0xOKLR9bSkMjTCzzocsJkKWBiHaBg8ZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525606; a=rsa-sha256; cv=none; b=hLXp7U9rrUJgDzqiKoLoRfKtBmO2vm6IXpUaZlm/ekMpU/9qZRWiE8j5Q3Pf6QF2P1Vzdq Drn8zOPBpCgH+3vPwaem7m9/bdbDYY1jQmsnnMAtx/YrO2z2eQj7ptx/bFOyOKh0+pH9UK d4N+1NAyRezJgmn0WC3tE22EKHdsroOc/LE0Ol+0aR7TYroOMtXK4wZurC/7HjOGDB5c27 iuCl8rvXbBghtQk0CB25G8xzQ3fRhmWat2JIJN1z8xLNYi44E/UMjWRoFFaS2fw+zaVrtx gUwdze6MvW2mz+C33fJ2tTJJ+m1HjcjPHXK8aftZkhaTzRlWQWG8YvypxPjLHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Py3mhJz8NZ for ; Wed, 19 Nov 2025 04:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 365d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: b7ffac04541f - stable/15 - nvme_sim: signal namespace depature List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b7ffac04541f98d3d8c6078092d59f0fed88b1ef Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:26 +0000 Message-Id: <691d43e6.365d7.2c0a2518@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b7ffac04541f98d3d8c6078092d59f0fed88b1ef commit b7ffac04541f98d3d8c6078092d59f0fed88b1ef Author: Wanpeng Qian AuthorDate: 2025-11-18 17:24:13 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:53 +0000 nvme_sim: signal namespace depature Signal when the namespace is gone so we can tear down the disk when a nvme drive is removed. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit 4640f5008922c5b189d2f7b63edf73300277e6df) --- sys/dev/nvme/nvme_sim.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index a06774a64761..f7fd0cee931b 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -352,25 +352,35 @@ static void * nvme_sim_ns_change(struct nvme_namespace *ns, void *sc_arg) { struct nvme_sim_softc *sc = sc_arg; + struct cam_path *tmppath; union ccb *ccb; + if (xpt_create_path(&tmppath, /*periph*/NULL, + cam_sim_path(sc->s_sim), 0, ns->id) != CAM_REQ_CMP) { + printf("unable to create path for rescan\n"); + return (NULL); + } + /* + * If it's gone, then signal that and leave. + */ + if (ns->flags & NVME_NS_GONE) { + xpt_async(AC_LOST_DEVICE, tmppath, NULL); + xpt_free_path(tmppath); + return (sc_arg); + } + ccb = xpt_alloc_ccb_nowait(); if (ccb == NULL) { printf("unable to alloc CCB for rescan\n"); return (NULL); } + ccb->ccb_h.path = tmppath; /* - * We map the NVMe namespace idea onto the CAM unit LUN. For - * each new namespace, we create a new CAM path for it. We then - * rescan the path to get it to enumerate. + * We map the NVMe namespace idea onto the CAM unit LUN. For each new + * namespace, scan or rescan the path to enumerate it. tmppath freed at + * end of scan. */ - if (xpt_create_path(&ccb->ccb_h.path, /*periph*/NULL, - cam_sim_path(sc->s_sim), 0, ns->id) != CAM_REQ_CMP) { - printf("unable to create path for rescan\n"); - xpt_free_ccb(ccb); - return (NULL); - } xpt_rescan(ccb); return (sc_arg); From nobody Wed Nov 19 04:40:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB81B65BTz6HFmP for ; Wed, 19 Nov 2025 04:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB81B5V2Lz3l7V for ; Wed, 19 Nov 2025 04:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763527230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UYJrBxSFajPQ4PapCzM4XpTK7TyhAvdxfBW6T+8RTDI=; b=viqub/yNIQvsircbKlianxbElrTgHy7kYOW+LIYQkmlzfT1FCLyoQY/uB0xRGtHT9K0bGN XEhckEVvh6r3RCb8krPFJ6pWHOpVlJM2ts1wxzM2dThaIiso8LJsR8E2pYDPNblb8+67Hi jGV+uAswn5nTgztcF/3PQCfDSXQ7bxCAOO9AvXKqUxZQlHlLnoreG/X6uCfiWZqhvJUnEW ct3ix00zG8fE3yvqhz59pZYrxQOgi17t+RwiLVyfDer+T4oYk5HZicMnxJVoNpZGXn37e3 YyneRKZm7chGF8Svb6MQFpAk0G/TiPIx5xGw5R+Gyw126kPp3VkdzeVyWrQM5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763527230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UYJrBxSFajPQ4PapCzM4XpTK7TyhAvdxfBW6T+8RTDI=; b=k5o0o5FH2vIJ56pWUIVGCmb17ILn5g8AAExV3Gw/AX6SdqMoNHLRytwiGSF9hMNJ77Y6f/ 6IyvOpsbYtua+ZMGNQVBtiKPeEX/bo7z2XLwe/Hpd/XJ3+yIjvr0zC1u0lxSjyX79CIGjL hKmBp1+I52/mveBUq/NGvVmury3ncSz6WRp+kI5IGBlROelH2R7J8cUrZxEAui3+vUeQ6D 0qVvR4hKI+rxEDuxR6trvnukaTpQ5A03Gz73i/memzHFDfO75PTlL9JCK8IlIh7hLNFxVt Q6wZ/qH5pKHoI2upBSK2odweItspVRVyabKfYjYmaJTFHjcZZXNiBIix8sLdyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763527230; a=rsa-sha256; cv=none; b=qMIF/tsN6VWe4254jDAz6dNfjbPZdNE6U6uTqYnSVK9+RuSZq5x6U8Q0T7fb2TyGxyoAzQ T2aTVM73bcnmfLA2mtj8dTZNMJsBIsy4I6UhiPMc1AGgLezxtUCZk6LKaa0vQ8yxEJIBDx Qs/IK9/xf+mvb10LQx4YzPNk4kmO8HLpQFejtNQbJeyoMtcA63WYzVJIa2rYXsPDdWkdWu ND3pCrzsemazhJdyx3GprYA2TuK2tGPXnMm1SnwlbLOemQ6B5wudEvbngJnkeuGUZsw/fH B1kl6GipkuU/27ZQCGR43NdpoydAskucJ8Ufqp0qht6/uqXSf+PEtam4IWo9Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB81B4wJXz9Jt for ; Wed, 19 Nov 2025 04:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b5e8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:40:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 9b0102837e30 - main - powerpc: Don't use cache to zero pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b0102837e305ca75de2bc14d284f786a33f9a6a Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:40:25 +0000 Message-Id: <691d4a39.b5e8.1a3bb356@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=9b0102837e305ca75de2bc14d284f786a33f9a6a commit 9b0102837e305ca75de2bc14d284f786a33f9a6a Author: Justin Hibbits AuthorDate: 2025-11-14 16:56:42 +0000 Commit: Justin Hibbits CommitDate: 2025-11-19 04:40:09 +0000 powerpc: Don't use cache to zero pages pmap_zero_page() may be called on uncached pages, so using the cache to zero uncached pages may trigger a fault. MFC after: 2 weeks --- sys/powerpc/aim/mmu_oea.c | 5 ++--- sys/powerpc/aim/mmu_oea64.c | 10 ++++------ sys/powerpc/booke/pmap_32.c | 5 ++--- sys/powerpc/booke/pmap_64.c | 5 ++--- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index ae17b3289593..b1f74597aa42 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -1090,10 +1090,9 @@ moea_copy_pages(vm_page_t *ma, vm_offset_t a_offset, void moea_zero_page(vm_page_t m) { - vm_offset_t off, pa = VM_PAGE_TO_PHYS(m); + vm_offset_t pa = VM_PAGE_TO_PHYS(m); - for (off = 0; off < PAGE_SIZE; off += cacheline_size) - __asm __volatile("dcbz 0,%0" :: "r"(pa + off)); + bzero((void *)pa, PAGE_SIZE); } void diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index 01bf4c7e90a8..62bbb6ddaf9b 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -1567,15 +1567,14 @@ void moea64_zero_page(vm_page_t m) { vm_paddr_t pa = VM_PAGE_TO_PHYS(m); - vm_offset_t va, off; + vm_offset_t va; mtx_lock(&moea64_scratchpage_mtx); moea64_set_scratchpage_pa(0, pa); va = moea64_scratchpage_va[0]; - for (off = 0; off < PAGE_SIZE; off += cacheline_size) - __asm __volatile("dcbz 0,%0" :: "r"(va + off)); + bzero((void *)va, PAGE_SIZE); mtx_unlock(&moea64_scratchpage_mtx); } @@ -1584,11 +1583,10 @@ void moea64_zero_page_dmap(vm_page_t m) { vm_paddr_t pa = VM_PAGE_TO_PHYS(m); - vm_offset_t va, off; + vm_offset_t va; va = PHYS_TO_DMAP(pa); - for (off = 0; off < PAGE_SIZE; off += cacheline_size) - __asm __volatile("dcbz 0,%0" :: "r"(va + off)); + bzero((void *)va, PAGE_SIZE); } vm_offset_t diff --git a/sys/powerpc/booke/pmap_32.c b/sys/powerpc/booke/pmap_32.c index efeefb6a91c5..5186a8852ed3 100644 --- a/sys/powerpc/booke/pmap_32.c +++ b/sys/powerpc/booke/pmap_32.c @@ -803,15 +803,14 @@ mmu_booke_zero_page_area(vm_page_t m, int off, int size) static void mmu_booke_zero_page(vm_page_t m) { - vm_offset_t off, va; + vm_offset_t va; va = zero_page_va; mtx_lock(&zero_page_mutex); mmu_booke_kenter(va, VM_PAGE_TO_PHYS(m)); - for (off = 0; off < PAGE_SIZE; off += cacheline_size) - __asm __volatile("dcbz 0,%0" :: "r"(va + off)); + bzero((void *)va, PAGE_SIZE); mmu_booke_kremove(va); diff --git a/sys/powerpc/booke/pmap_64.c b/sys/powerpc/booke/pmap_64.c index affa08ebee3f..5a414b9026c8 100644 --- a/sys/powerpc/booke/pmap_64.c +++ b/sys/powerpc/booke/pmap_64.c @@ -679,12 +679,11 @@ mmu_booke_zero_page_area(vm_page_t m, int off, int size) static void mmu_booke_zero_page(vm_page_t m) { - vm_offset_t off, va; + vm_offset_t va; va = PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m)); - for (off = 0; off < PAGE_SIZE; off += cacheline_size) - __asm __volatile("dcbz 0,%0" :: "r"(va + off)); + bzero((void *)va, PAGE_SIZE); } /* From nobody Wed Nov 19 07:47:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBD8m6q9Mz6HH6G for ; Wed, 19 Nov 2025 07:47: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBD8m6593z41SS for ; Wed, 19 Nov 2025 07:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763538440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=om/NJUZIVOLgBGsGTJrA1QETt5xagL1G0Sw5N+mAgVo=; b=VeSfUJ5DxG/HoPhtmxmZua0eC/5+oLMabtEvlEyFAdP/GkGN7G3CY8IGdAug8rq9pf8s4j 6TBlHEDD5gzvcNFAAmjB9TdtMIaCpP3mWuKk7kBZ3TDvMSoboWOaHnhNAAQCFypLlqTVWE T0nQoUpHsV0diWP/CsLHa7yc15KFHs+J4+NjIaOzk/5OaC+XscXoOK1/0qZfvJT9Z+dcJW OxJ3m/FXabP1up94sv+H9Skr5Wo1UtN4oaYA/ico+4+ahd+5DpDoDg1O9qdjNrdjrv6MiO aMAEdAD4JzC0pfaGlalDlb9j6S6jycGjPH+/F4Xs3zutb+QWcvEid2Q5DF0Qlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763538440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=om/NJUZIVOLgBGsGTJrA1QETt5xagL1G0Sw5N+mAgVo=; b=saCm+NCB+j5Cc0K8SvBbD65oU+Lhard4aez2Q9C1t9xhff47Jffkkc/qBZaSNgtA/PXKC1 FAs5LvmG3xRQHI7Wdx7cCGKpmYLG2UTXVKJ9lkn4CqDrkf9yvXO5m1kQr8s9rOYc5KAxxn s9vX9bkTpD0oCB+VaFutbFd+S/aRyKV9hDPxbRdKUgHpRWeDG6nBbyHR9wXlUCdpsn4hFf GBWBs0Jz7cCp66p8uP3YJBp2pkzmszfQHw9Tt8JiI7xCquLG3urZwypuOyfC6N3W3PnDmv MizjtD/3smsba/3IZWspyr4xaORTwfGOhbfQvPXCOOhAOniqsDl4W0FhWjl4+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763538440; a=rsa-sha256; cv=none; b=c9MuaWNvx6eVWUBs3DYkPFHTosa3qsBtOEBtJBid3xXfbQ8eTBBVrw4rrvM9Siw3iDE/FG jbtOqvVRydCs6ra9VLbZiWftuTG/RtDEMbWJ6RR+4gxcl9Vz8YNadZB3rNcgjdH5kPcYjY KWEhYaEcRs2Hz6yyc2PgFXykZeVuggGCgCmSQx8I6GhFwtQDq2VbylV13wFlFhfHBqC51c 0swK/SZjoIjpiMAG6vNYYdvBuiHctovja+XdhPJkrwHkYAPx3UIE0gpr5Y/YeU7CwkEn1/ RtKBC61IgLbqOb+Ll1xCA2EL0Wl0lLEKGOj1xJJz6+lWy16jKxLk7aYdJn1caw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBD8m57s6zWfY for ; Wed, 19 Nov 2025 07:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e615 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 07:47:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 709465f2c4f1 - stable/14 - zfs: merge openzfs/zfs@079ba86d7 (zfs-2.2-release) into stable/14 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 709465f2c4f12fe9b820ca8097de9021bff0c84b Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 07:47:14 +0000 Message-Id: <691d7602.2e615.4803bdc7@gitrepo.freebsd.org> The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=709465f2c4f12fe9b820ca8097de9021bff0c84b commit 709465f2c4f12fe9b820ca8097de9021bff0c84b Merge: 18391412cecf 079ba86d7157 Author: Martin Matuska AuthorDate: 2025-11-18 23:29:00 +0000 Commit: Martin Matuska CommitDate: 2025-11-18 23:29:00 +0000 zfs: merge openzfs/zfs@079ba86d7 (zfs-2.2-release) into stable/14 OpenZFS release 2.2.9 Notable upstream pull request merges: #16025 fdc683e86 dnode_next_offset: backtrack if lower level does not match #16197 67ea51710 Several improvements to ARC shrinking #16401 10208765e Soften pruning threshold on not evictable metadata #17434 1ced0ff5d Reduce zfs_dmu_offset_next_sync penalty #17542 2910b5f5c enforce arc_dnode_limit #17561 3a8e23d0f Skip dbuf_evict_one() from dbuf_evict_notify() for reclaim thread #17758 5e10fb6d7 Add interface to interface spa_get_worst_case_min_alloc() function #17563 91f3622a2 Faster checksum benchmark on system boot #17765 6a02c0994 zvol: Fix blk-mq sync #17780 3167b0db1 Fix 'zpool add' safety check corner cases #17904 6e4acd789 zstd: disable intrinsics #17915 5a77c19c8 BRT: Fix ranges to blocks conversion math Obtained from: OpenZFS OpenZFS commit: 079ba86d71571bf997ff688da061d8c4aa2fd052 OpenZFS tag: zfs-2.2.9 .../.github/ISSUE_TEMPLATE/feature_request.md | 2 +- .../openzfs/.github/PULL_REQUEST_TEMPLATE.md | 5 - sys/contrib/openzfs/.github/codeql-cpp.yml | 1 + .../cpp/dslDatasetHoldReleMismatch.ql | 34 ++++ .../.github/workflows/scripts/generate-ci-type.py | 12 +- .../.github/workflows/scripts/qemu-1-setup.sh | 10 ++ .../.github/workflows/scripts/qemu-2-start.sh | 178 ++++++++++++------- .../.github/workflows/scripts/qemu-3-deps-vm.sh | 16 +- .../.github/workflows/scripts/qemu-4-build-vm.sh | 23 ++- .../.github/workflows/scripts/qemu-5-setup.sh | 39 ++++- .../.github/workflows/scripts/qemu-6-tests.sh | 8 +- .../.github/workflows/zfs-qemu-packages.yml | 15 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 75 ++++---- sys/contrib/openzfs/.github/workflows/zloop.yml | 24 +-- sys/contrib/openzfs/META | 4 +- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 47 ++++- sys/contrib/openzfs/cmd/zfs/zfs_project.c | 36 +++- sys/contrib/openzfs/cmd/zpool/zpool_vdev.c | 26 +-- sys/contrib/openzfs/config/ax_python_devel.m4 | 4 +- .../openzfs/config/kernel-dentry-operations.m4 | 10 +- sys/contrib/openzfs/config/kernel-objtool.m4 | 17 ++ .../config/kernel-pagemap-readahead-page.m4 | 23 +++ ...kernel-readpages.m4 => kernel-vfs-readpages.m4} | 0 sys/contrib/openzfs/config/kernel-vfs-writepage.m4 | 24 +++ sys/contrib/openzfs/config/kernel.m4 | 4 + sys/contrib/openzfs/config/user-statx.m4 | 34 ++++ sys/contrib/openzfs/config/user.m4 | 1 + sys/contrib/openzfs/config/zfs-build.m4 | 136 +++++++++----- sys/contrib/openzfs/configure.ac | 2 + sys/contrib/openzfs/contrib/debian/rules.in | 6 +- sys/contrib/openzfs/contrib/initramfs/scripts/zfs | 3 +- sys/contrib/openzfs/contrib/intel_qat/readme.md | 2 +- .../pyzfs/libzfs_core/test/test_libzfs_core.py | 2 +- sys/contrib/openzfs/etc/init.d/README.md | 2 +- .../openzfs/include/os/freebsd/spl/sys/misc.h | 5 + sys/contrib/openzfs/include/os/linux/Makefile.am | 1 + .../include/os/linux/kernel/linux/blkdev_compat.h | 18 -- .../include/os/linux/kernel/linux/dcache_compat.h | 26 --- .../include/os/linux/kernel/linux/pagemap_compat.h | 36 ++++ .../openzfs/include/os/linux/spl/sys/misc.h | 6 + sys/contrib/openzfs/include/sys/arc_impl.h | 6 +- sys/contrib/openzfs/include/sys/brt_impl.h | 2 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 2 + sys/contrib/openzfs/include/sys/spa.h | 1 + sys/contrib/openzfs/include/sys/spa_impl.h | 1 + sys/contrib/openzfs/include/sys/zfs_context.h | 5 + sys/contrib/openzfs/include/sys/zfs_project.h | 10 +- sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + .../openzfs/lib/libspl/include/os/linux/sys/stat.h | 5 + .../openzfs/lib/libspl/include/os/linux/sys/vfs.h | 33 ++++ .../openzfs/lib/libspl/os/linux/getmntany.c | 36 +++- sys/contrib/openzfs/man/man4/zfs.4 | 7 + sys/contrib/openzfs/module/Kbuild.in | 3 +- sys/contrib/openzfs/module/Makefile.bsd | 40 ++--- sys/contrib/openzfs/module/Makefile.in | 1 + .../openzfs/module/os/freebsd/spl/spl_misc.c | 9 + sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 13 +- .../openzfs/module/os/linux/spl/spl-thread.c | 12 ++ sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 88 +++++----- .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 65 +++++++ .../openzfs/module/os/linux/zfs/zpl_ctldir.c | 56 +++++- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 102 ++++++++--- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 68 +++++-- sys/contrib/openzfs/module/zfs/arc.c | 152 +++++++++------- sys/contrib/openzfs/module/zfs/dbuf.c | 10 +- sys/contrib/openzfs/module/zfs/dmu.c | 16 +- sys/contrib/openzfs/module/zfs/dnode.c | 65 +++++-- sys/contrib/openzfs/module/zfs/spa_config.c | 2 + sys/contrib/openzfs/module/zfs/spa_misc.c | 15 ++ sys/contrib/openzfs/module/zfs/vdev.c | 15 +- sys/contrib/openzfs/module/zfs/vdev_label.c | 2 + sys/contrib/openzfs/module/zfs/zfs_chksum.c | 69 +++++--- .../openzfs/module/zstd/include/aarch64_compat.h | 37 ---- .../openzfs/module/zstd/lib/common/compiler.h | 3 - .../openzfs/module/zstd/lib/common/zstd_internal.h | 9 + sys/contrib/openzfs/scripts/.gitignore | 1 + sys/contrib/openzfs/scripts/objtool-wrapper.in | 36 ++++ sys/contrib/openzfs/scripts/zfs-tests.sh | 9 +- sys/contrib/openzfs/tests/runfiles/common.run | 3 +- .../tests/test-runner/bin/test-runner.py.in | 61 +++++++ .../openzfs/tests/zfs-tests/tests/Makefile.am | 4 +- .../tests/functional/acl/off/posixmode.ksh | 2 +- .../tests/functional/arc/dbufstats_001_pos.ksh | 4 +- .../tests/functional/arc/dbufstats_002_pos.ksh | 2 +- .../cli_root/zfs_send/zfs_send_007_pos.ksh | 4 +- .../functional/cli_root/zpool_add/zpool_add.kshlib | 42 +++++ ...l_add_010_pos.ksh => zpool_add_warn_create.ksh} | 100 ++--------- .../cli_root/zpool_add/zpool_add_warn_degraded.ksh | 195 +++++++++++++++++++++ .../cli_root/zpool_add/zpool_add_warn_removal.ksh | 117 +++++++++++++ .../zpool_import/zpool_import_rename_001_pos.ksh | 2 +- .../functional/redacted_send/redacted_panic.ksh | 2 +- .../tests/functional/snapshot/snapshot_002_pos.ksh | 2 +- .../tests/functional/snapshot/snapshot_006_pos.ksh | 2 +- .../user_namespace/user_namespace_004.ksh | 2 +- .../functional/zvol/zvol_misc/zvol_misc_fua.ksh | 44 ++++- .../functional/zvol/zvol_misc/zvol_misc_trim.ksh | 11 +- .../functional/zvol/zvol_stress/zvol_stress.ksh | 2 +- 97 files changed, 1864 insertions(+), 661 deletions(-) diff --cc sys/contrib/openzfs/.github/codeql/custom-queries/cpp/dslDatasetHoldReleMismatch.ql index 000000000000,fb5dae35092f..fb5dae35092f mode 000000,100644..100644 --- a/sys/contrib/openzfs/.github/codeql/custom-queries/cpp/dslDatasetHoldReleMismatch.ql +++ b/sys/contrib/openzfs/.github/codeql/custom-queries/cpp/dslDatasetHoldReleMismatch.ql diff --cc sys/contrib/openzfs/config/kernel-pagemap-readahead-page.m4 index 000000000000,30f3d56682fb..30f3d56682fb mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-pagemap-readahead-page.m4 +++ b/sys/contrib/openzfs/config/kernel-pagemap-readahead-page.m4 diff --cc sys/contrib/openzfs/config/kernel-vfs-writepage.m4 index 000000000000,d438e85b457c..d438e85b457c mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-vfs-writepage.m4 +++ b/sys/contrib/openzfs/config/kernel-vfs-writepage.m4 diff --cc sys/contrib/openzfs/config/user-statx.m4 index 000000000000,0315f93e0c20..0315f93e0c20 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/user-statx.m4 +++ b/sys/contrib/openzfs/config/user-statx.m4 diff --cc sys/contrib/openzfs/include/os/linux/kernel/linux/pagemap_compat.h index 000000000000,a0465ede0105..a0465ede0105 mode 000000,100644..100644 --- a/sys/contrib/openzfs/include/os/linux/kernel/linux/pagemap_compat.h +++ b/sys/contrib/openzfs/include/os/linux/kernel/linux/pagemap_compat.h diff --cc sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h index 000000000000,c7b567ff44a4..c7b567ff44a4 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h +++ b/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h diff --cc sys/contrib/openzfs/scripts/objtool-wrapper.in index 000000000000,0451f8718233..0451f8718233 mode 000000,100644..100644 --- a/sys/contrib/openzfs/scripts/objtool-wrapper.in +++ b/sys/contrib/openzfs/scripts/objtool-wrapper.in diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh index 000000000000,ded9cb3c68f8..ded9cb3c68f8 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_removal.ksh index 000000000000,56feaf1f9965..56feaf1f9965 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_removal.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_removal.ksh From nobody Wed Nov 19 07:47:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBD8q0bThz6HH6H for ; Wed, 19 Nov 2025 07:47: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBD8p6Sz6z41fD for ; Wed, 19 Nov 2025 07:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763538442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HmHNMTBZJKc3XWjsd8OxdQ1dAjdm3LgzIAYq+anVoG8=; b=IQVuXQU0w7Gp017Sia7h9kDoHLfRhFsAc9siEiFgRZ8Rn4PLtXncPGYofmj5kG0QWWqQTm KHQbvCYhSD5ARQNdXas/1iqZIe95KwDQVq93HmY4HsTAphaHZy/bArrPSzb+kyuyUqMsKL vOGCTj32GuFBi3qs2sv3D5LjEAOJJiZhWG63pgPBJiqDuKaddQkYTrXCdYWOV9jMeoZ685 CWa90NG1TGqrYyzFWzWBzqpjF1U6gcci0ihT7Cf5uINWefPSDZPeHMVyLeWxw+91hNUYL1 7q0EGituSDH6ZkJagGBS0KN55bgdrrp4na80ufofR1eSRq2EGZn4cRcp8rjtaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763538442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HmHNMTBZJKc3XWjsd8OxdQ1dAjdm3LgzIAYq+anVoG8=; b=sYR+3XBK2Mttyijc0/Gg1Lxq4uKg3TD8XUOFL1I+J0OiXSZ0y6t8DdKOEqWc8QIx3AQuzM l4nm/gl3YwUgTpamaIHYHmo87mkX9O6UKinqpHzett0aLNUkElq45hT3ueVjloyARxxWs8 3p/bD8a7gulPWSvYkA8xMYj9+5tE6IM3yFTu0J10QpsD1ogbCL1uHRwlcRdWk9G8vy0TpT i6/Y/egHzSeHfE/trVICE9ZaSjb5rBbMZNfYaOOcG49fbXQwlXLzqvdrWdXpC9D08rXyKW NTsgoZYlLFrCPOgRjTKqObxhkNQ15euZr3tBTr+q3DW7tpwR+sYUZBM6ELdnyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763538442; a=rsa-sha256; cv=none; b=qh6Qpz2vy6Lr18rqSf1TJjplZmsO8oFHbnP4wZiLfE36+Ktoyo+EvNUQUmnteh7TuVO26N CfvtMjcb7CmrOvk/iPA6pvmD5S790v8NKC0fLucL4oTc2Fmh2IBuNMojLt3nP11zG43k2Q mODv8edLYwTaXlcWf62IPGaC2HmeRS1pF5IZ90AQ6J+MhVO5+VlDLOml5i/nMyppw0X0FY H/zOlFGjY4nw326/EJKCta54Y+BnNw1667PJFJkEsjL4i3KfngLgFsMpe/eheSejZNLBFv SIQZF7k9zESdMcKAHlan+1A2UN1flyqqwyqmEi6OCxpislxjFikQV22Rn7CasQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBD8p5yYBzX1h for ; Wed, 19 Nov 2025 07:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e4a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 07:47:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: b12f5537df39 - stable/14 - zfs: fix aarch64 build after zfs-2.2.9 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b12f5537df397d40ae02adf2c9ecaa7cd0b5a512 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 07:47:22 +0000 Message-Id: <691d760a.2e4a0.58ec89ca@gitrepo.freebsd.org> The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b12f5537df397d40ae02adf2c9ecaa7cd0b5a512 commit b12f5537df397d40ae02adf2c9ecaa7cd0b5a512 Author: Martin Matuska AuthorDate: 2025-11-17 19:15:33 +0000 Commit: Martin Matuska CommitDate: 2025-11-18 23:47:32 +0000 zfs: fix aarch64 build after zfs-2.2.9 (cherry picked from commit fb709935d64d5fd4ad21cf8c69faf580760999e4) --- sys/modules/zfs/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index ad5f52d05038..71c635ef0749 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -466,8 +466,6 @@ CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICA CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} .if ${MACHINE_ARCH} == "aarch64" -__ZFS_ZSTD_AARCH64_FLAGS= -include ${SRCDIR}/zstd/include/aarch64_compat.h -CFLAGS.zstd.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.error_private.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.fse_compress.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} From nobody Wed Nov 19 07:47:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBD8v0CNlz6HGb6 for ; Wed, 19 Nov 2025 07:47: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBD8t5gcpz41T5 for ; Wed, 19 Nov 2025 07:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763538446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Op0MSI1SwcwxoXKF93XapXEVJYe2UCF2Kdss7K8tU+Y=; b=rqm+87kRpjuesoCvU8SHibiuaxaH5eCNKEpRYKQuTTlA1Or+bKUcoQxhK6dE/CBn4p4G1K JpVywNm3BLLfmgjf6uKBrA1zboQqnWF7YQcOx610wSrIO0fWewZkeyAMrYQFL0v/RaLhzn oGaPAABnazO0M7RkpHLxX6furEHaaJniPLFEEhjo6/S4v2RlUvDgubuU4fGkKlaiNNMPa8 XAWnQyASmSuI2IJYtmF/7JyA669SPKVv0c/hPhunZevJerjy91kMpmXqcyQddGtGZtLCFT qcP3piDsca0I2XO+eJ2mFEo/uvD9C4+yaJfQG5kW6p72KhpDxRi5FQcmjOlAkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763538446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Op0MSI1SwcwxoXKF93XapXEVJYe2UCF2Kdss7K8tU+Y=; b=KXHZP0LU3i3tDBA4rA67bASxcN3WIpaTBWXhrdbvYAgpwYG63i6+fEfRqEwoIRAmb77LRN mTh2bEN+E5ttCguWGd+ZSRLrSdUxKKkL/3XM4ypzhlSGS71k/LyDIW67hi/002MlPr7xcH KAwA6m33lO1DNsjfmb+KGC87AQpLOBE6J01DLqCga3HtmWfcZIWywtI1SNXl3PDK8KyZsC wdRF0r+WQyI/eNEtooCKu2ODUcR/VZi/wH7hiYItOMoeRu+t7KWn7xhnWVZaUnvoQXiezn RN2wG1kNVEIsrjuxIDfsbM/Xym48u//GzQrfHefm+uroc3tGMTb6F5l0UpBCUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763538446; a=rsa-sha256; cv=none; b=m81AIQN8n+o851WUdBGqc7gcDMIPFc227iPscbN2jEv65GScPh3vo70R5NMtHjiy6gFyg8 a/mtUQD5Jb1AcrpvmiKE7093z0kvOKfQNgSczZpmSATxRNx5MF8MuhXthgcISuqNekEiTF kKOKJjYm4cuZhLevf4V2ZRVZ8nqCrNMDQy75+HEhc3zo0EvCwE5E4ioRAoQzkOUfYxrw0O HV6M42XyAEi80FIwCg569zV//XVuFXeSEmn6y2ITf+CCWLRCZMpFKX8F76nhDl4qheuH0G u66mXaCgJlHNUlcjjXCJBAzwBY2MijDG/Tl9OzXyB0RGwiHLdEbSQuVx9zA4OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBD8n5Cl9zX1g for ; Wed, 19 Nov 2025 07:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e8fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 07:47:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 2d2d945440ff - stable/14 - zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.2.9 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2d2d945440ff3baa3475c13b3be43b06bc1fa587 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 07:47:21 +0000 Message-Id: <691d7609.2e8fd.619be253@gitrepo.freebsd.org> The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2d2d945440ff3baa3475c13b3be43b06bc1fa587 commit 2d2d945440ff3baa3475c13b3be43b06bc1fa587 Author: Martin Matuska AuthorDate: 2025-11-18 23:46:58 +0000 Commit: Martin Matuska CommitDate: 2025-11-18 23:46:58 +0000 zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.2.9 --- sys/modules/zfs/zfs_config.h | 23 +++++++++++++++++++---- sys/modules/zfs/zfs_gitrev.h | 2 +- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index b0fc72c654f3..92498273dc13 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -477,6 +477,9 @@ /* Define if you have [uuid] */ /* #undef HAVE_LIBUUID */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LINUX_STAT_H */ + /* makedev() is declared in sys/mkdev.h */ /* #undef HAVE_MAKEDEV_IN_MKDEV */ @@ -504,6 +507,9 @@ /* folio_wait_bit() exists */ /* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ +/* readahead_page() exists */ +/* #undef HAVE_PAGEMAP_READAHEAD_PAGE */ + /* part_to_dev() exists */ /* #undef HAVE_PART_TO_DEV */ @@ -602,6 +608,12 @@ /* standalone exists */ /* #undef HAVE_STANDALONE_LINUX_STDARG */ +/* statx() is available */ +/* #undef HAVE_STATX */ + +/* STATX_MNT_ID is available */ +/* #undef HAVE_STATX_MNT_ID */ + /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -722,6 +734,9 @@ /* splice_copy_file_range() is available */ /* #undef HAVE_VFS_SPLICE_COPY_FILE_RANGE */ +/* address_space_operations->writepage exists */ +/* #undef HAVE_VFS_WRITEPAGE */ + /* __vmalloc page flags exists */ /* #undef HAVE_VMALLOC_PAGE_KERNEL */ @@ -809,7 +824,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.8-FreeBSD_g3e4a3e161" +#define ZFS_META_ALIAS "zfs-2.2.9-FreeBSD_g079ba86d7" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -818,7 +833,7 @@ /* #undef ZFS_META_DATA */ /* Define the maximum compatible kernel version. */ -#define ZFS_META_KVER_MAX "6.15" +#define ZFS_META_KVER_MAX "6.17" /* Define the minimum compatible kernel version. */ #define ZFS_META_KVER_MIN "4.18" @@ -839,10 +854,10 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_g3e4a3e161" +#define ZFS_META_RELEASE "FreeBSD_g079ba86d7" /* Define the project version. */ -#define ZFS_META_VERSION "2.2.8" +#define ZFS_META_VERSION "2.2.9" /* count is located in percpu_ref.data */ /* #undef ZFS_PERCPU_REF_COUNT_IN_DATA */ diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 7a81682b6bc3..984cb6555d08 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.2.8-0-g3e4a3e161" +#define ZFS_META_GITREV "zfs-2.2.9-0-g079ba86d7" From nobody Wed Nov 19 09:58:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBH423snvz6HS6X for ; Wed, 19 Nov 2025 09:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBH420F8Nz3CVl for ; Wed, 19 Nov 2025 09:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763546306; 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=+svvB2ZzZg3liwXnEjJNbOeNXN17nWB7JQzlpBzlRbo=; b=eFdixLLippPtM+4IICFk4AP9TrLB4OUYuq+WN1d+vOglF44nagSCX8LRNxpR9zzzAsv/qd Hq2XVUUXH5wFpCgrRT6pkuXv6bDQ6a1GnonOjAgm0lggzAcVpcdqYGxY3KGUNXAar/aYZh wA3LMAIV0Wgo5UV9rwlmm8EKhmppzch8HeVVO2NRj0im9vnNr5wzz5GNLz40XeRPmJlpwp 8qgm3IFe0NkdFfexs7k5RyUmqywAS/DtgnQ1KIH9A7SCiLhHkV5RFd7nnXt3uI8PNIoF4Z RyjPcNhinZHRALYBLTJ+OEcbT+YKao+ZetYpBeszfHmItvhwQzORXKZojTDdDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763546306; 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=+svvB2ZzZg3liwXnEjJNbOeNXN17nWB7JQzlpBzlRbo=; b=ll/+hk1ZG7PwbWa8bTsPJ7fR+fo1tLLiXksyvQvL/pIjsvrUU3QJp/KWc+6KYSdCrh4M6k 3g5aluQA/Iczu1/VQpI8mEPSRz5at9BDxls4/rXrRlAgIkmHjXGw/yKcB+Ii5cCK7XKGxl lUIaUybFWhRfmi3cp0L+y3Xa2XW5Zr5g5LbFKhHHEIK6Xlj+73NdxDNo2RIvYAMVDBPERq ndqXmFTasSxBQ5BQQ4qWTyOsux2inL0a7qpj18kwzV0x8UNB5nMRMHEDBbO28pEx1u/mwy PPZsB5K4j4QIneDP8q3PCMsJ3wVyz0TuBn2mfNe++H1BKBCQEL0TqBg92or6AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763546306; a=rsa-sha256; cv=none; b=DjjDyMSKFy9Gs4JvQ3SpPPnpMaFP1AKnOcF+lxgfToqLJwqON0okmbNtDlP0g/Qv5bzf7y f6CH99jbP6WLtKiszU0/BzC5E5jIpOKAFNxEInXutyA+2o3p3qV2QMAqOy+xofDgcqo9iG UxHQacSQ2AjJcDM0U7sXy97Yp21PaEhVqAmAmpA28WLTWEHptvpEYsIw79+p5RY9wT2xTh eX/hYX9ack2oM+ZiE/tNbkhqs6cG9Nk+AI9yjRBmOnhH21/7O4I8+cjjifvso7nRlR+yll j51+kEbSXV1UWWv6QZAwG+NZcY96aximTplevuzCUvGIF1v2pMQOSnlGqvQ+Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBH416Vr9zbvb for ; Wed, 19 Nov 2025 09:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ac2d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 09:58:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Goran=?utf-8?Q? Meki=C4=87?= From: Christos Margiolis Subject: git: 282015e7a07d - stable/15 - sound examples: Extend and clean up List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 282015e7a07df0aa3e871a217213b569186cec78 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 09:58:25 +0000 Message-Id: <691d94c1.3ac2d.6b7dcabb@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=282015e7a07df0aa3e871a217213b569186cec78 commit 282015e7a07df0aa3e871a217213b569186cec78 Author: Goran Mekić AuthorDate: 2025-11-12 20:15:59 +0000 Commit: Christos Margiolis CommitDate: 2025-11-19 09:57:51 +0000 sound examples: Extend and clean up - Simplify directory and file structure. - Clean up and improve code. Add more comments. - Add polling examples. MFC after: 1 week Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D53353 (cherry picked from commit 6a569666868b36f5f436eea9d66789b6df191b8a) --- share/examples/Makefile | 14 +- share/examples/sound/kqueue.c | 79 ++++++++++ share/examples/sound/oss.h | 222 ++++++++++++++++++++++++++++ share/examples/sound/oss/README | 66 --------- share/examples/sound/oss/audio.c | 310 --------------------------------------- share/examples/sound/poll.c | 70 +++++++++ share/examples/sound/select.c | 70 +++++++++ share/examples/sound/simple.c | 147 +++++++++++++++++++ 8 files changed, 595 insertions(+), 383 deletions(-) diff --git a/share/examples/Makefile b/share/examples/Makefile index 0a65b8c40d39..09bbf820e574 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -319,13 +319,13 @@ SE_SCSI_TARGET= \ SE_DIRS+= sound SE_SOUND= \ - sndstat_nv.c \ - midi.c - -SE_DIRS+= sound/oss -SE_SOUND_OSS= \ - README \ - audio.c + kqueue.c \ + midi.c \ + oss.h \ + poll.c \ + select.c \ + simple.c \ + sndstat_nv.c SE_DIRS+= sunrpc SE_SUNRPC= Makefile diff --git a/share/examples/sound/kqueue.c b/share/examples/sound/kqueue.c new file mode 100644 index 000000000000..9117d7a389bb --- /dev/null +++ b/share/examples/sound/kqueue.c @@ -0,0 +1,79 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Goran Mekić + * + * 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 "oss.h" + +int +main(int argc, char *argv[]) +{ + struct config config = { + .device = "/dev/dsp", + .mode = O_RDWR, + .format = AFMT_S32_NE, + .sample_rate = 48000, + }; + struct kevent event = {}; + int rc, bytes, kq; + + oss_init(&config); + bytes = config.buffer_info.bytes; + + if ((kq = kqueue()) < 0) + err(1, "Failed to allocate kqueue"); + EV_SET(&event, config.fd, EVFILT_WRITE, EV_ADD | EV_CLEAR, 0, 0, 0); + if (kevent(kq, &event, 1, NULL, 0, NULL) < 0) + err(1, "Failed to register kevent"); + for (;;) { + if (kevent(kq, NULL, 0, &event, 1, NULL) < 0) { + warn("Event error"); + break; + } + if (event.flags & EV_ERROR) { + warn("Event error: %s", strerror(event.data)); + break; + } + if ((rc = read(config.fd, config.buf, bytes)) < bytes) { + warn("Requested %d bytes, but read %d!\n", bytes, rc); + break; + } + if ((rc = write(config.fd, config.buf, bytes)) < bytes) { + warn("Requested %d bytes, but wrote %d!\n", bytes, rc); + break; + } + } + EV_SET(&event, config.fd, EVFILT_WRITE, EV_DELETE, 0, 0, 0); + if (kevent(kq, &event, 1, NULL, 0, NULL) < 0) + err(1, "Failed to unregister kevent"); + close(kq); + + free(config.buf); + close(config.fd); + + return (0); +} diff --git a/share/examples/sound/oss.h b/share/examples/sound/oss.h new file mode 100644 index 000000000000..437c6d69d454 --- /dev/null +++ b/share/examples/sound/oss.h @@ -0,0 +1,222 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Goran Mekić + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include +#include +#include +#include +#include +#include + +/* + * Minimal configuration for OSS. For real world applications, this structure + * will probably contain many more fields + */ +struct config { + char *device; + int mode; + int fd; + int format; + int sample_count; + int sample_rate; + int sample_size; + int chsamples; + int mmap; + void *buf; + oss_audioinfo audio_info; + audio_buf_info buffer_info; +}; + +/* + * The buffer size used by OSS is (2 ^ exponent) * number_of_fragments. + * Exponent values range between 4 and 16, so this function looks for the + * smallest exponent which can fit a buffer of size "x". The fragments + * determine in how many chunks the buffer will be sliced into, hence if the + * exponent is 4, and number of fragments is 2, the requested size will be 2^4 + * * 2 = 32. Please note that the buffer size is in bytes, not samples. For + * example, a 24-bit sample will be represented with 3 bytes. If you're porting + * an audio application from Linux, you should be aware that 24-bit samples on + * it are represented with 4 bytes (usually int). The idea of a total buffer + * size that holds number of fragments is to allow application to be + * number_of_fragments - 1 late. That's called jitter tolerance. + * + * Official OSS development howto: + * http://manuals.opensound.com/developer/DSP.html + */ +static inline int +size2exp(int x) +{ + int exp = 0; + + while ((1 << exp) < x) + exp++; + + return (exp); +} + +static void +oss_init(struct config *config) +{ + unsigned long request = SNDCTL_DSP_GETOSPACE; + int tmp = 0; + + if ((config->fd = open(config->device, config->mode)) < 0) + err(1, "Error opening the device %s", config->device); + + /* Get device information */ + if (ioctl(config->fd, SNDCTL_ENGINEINFO, &config->audio_info) < 0) + err(1, "Unable to get device info"); + + /* Get device capabilities */ + if (ioctl(config->fd, SNDCTL_DSP_GETCAPS, &config->audio_info.caps) < 0) + err(1, "Unable to get capabilities"); + + /* Check if device supports triggering */ + if (!(config->audio_info.caps & PCM_CAP_TRIGGER)) + errx(1, "Device doesn't support triggering!\n"); + + /* Handle memory mapped mode */ + if (config->mmap) { + if (!(config->audio_info.caps & PCM_CAP_MMAP)) + errx(1, "Device doesn't support mmap mode!\n"); + tmp = 0; + if (ioctl(config->fd, SNDCTL_DSP_COOKEDMODE, &tmp) < 0) + err(1, "Unable to set cooked mode"); + } + + /* Set sample format */ + if (ioctl(config->fd, SNDCTL_DSP_SETFMT, &config->format) < 0) + err(1, "Unable to set sample format"); + + /* Set sample channels */ + if (ioctl(config->fd, SNDCTL_DSP_CHANNELS, &config->audio_info.max_channels) < 0) + err(1, "Unable to set channels"); + + /* Set sample rate */ + if (ioctl(config->fd, SNDCTL_DSP_SPEED, &config->sample_rate) < 0) + err(1, "Unable to set sample rate"); + + /* Calculate sample size */ + switch (config->format) { + case AFMT_S8: + case AFMT_U8: + config->sample_size = 1; + break; + case AFMT_S16_BE: + case AFMT_S16_LE: + case AFMT_U16_BE: + case AFMT_U16_LE: + config->sample_size = 2; + break; + case AFMT_S24_BE: + case AFMT_S24_LE: + case AFMT_U24_BE: + case AFMT_U24_LE: + config->sample_size = 3; + break; + case AFMT_S32_BE: + case AFMT_S32_LE: + case AFMT_U32_BE: + case AFMT_U32_LE: + case AFMT_F32_BE: + case AFMT_F32_LE: + config->sample_size = 4; + break; + default: + errx(1, "Invalid audio format %d", config->format); + break; + } + + /* + * Set fragment and sample size. This part is optional as OSS has + * default values. From the kernel's perspective, there are few things + * OSS developers should be aware of: + * + * - For each sound(4)-created channel, there is a software-facing + * buffer, and a hardware-facing one. + * - The sizes of the buffers can be listed in the console with "sndctl + * swbuf hwbuf". + * - OSS ioctls only concern software-facing buffer fragments, not + * hardware. + * + * For USB sound cards, the block size is set according to the + * hw.usb.uaudio.buffer_ms sysctl, meaning 2ms at 48kHz gives 0.002 * + * 48000 = 96 samples per block. Block size should be set as multiple + * of 96, in this case. The OSS driver insists on reading/writing a + * certain number of samples at a time, one fragment full of samples. + * It is bound to do so at a fixed time frame, to avoid under- and + * overruns during communication with the hardware. + */ + config->buffer_info.fragments = 2; + tmp = size2exp(config->sample_size * config->audio_info.max_channels); + tmp = ((config->buffer_info.fragments) << 16) | tmp; + if (ioctl(config->fd, SNDCTL_DSP_SETFRAGMENT, &tmp) < 0) + err(1, "Unable to set fragment size"); + + /* Get buffer info */ + if ((config->mode & O_ACCMODE) == O_RDONLY) + request = SNDCTL_DSP_GETISPACE; + if (ioctl(config->fd, request, &config->buffer_info) < 0) + err(1, "Unable to get buffer info"); + if (config->buffer_info.fragments < 1) + config->buffer_info.fragments = config->buffer_info.fragstotal; + if (config->buffer_info.bytes < 1) + config->buffer_info.bytes = config->buffer_info.fragstotal * config->buffer_info.fragsize; + if (config->buffer_info.bytes < 1) { + errx(1, "OSS buffer error: buffer size can not be %d\n", + config->buffer_info.bytes); + } + config->sample_count = config->buffer_info.bytes / config->sample_size; + config->chsamples = config->sample_count / config->audio_info.max_channels; + config->buf = malloc(config->buffer_info.bytes); + + printf("bytes: %d, fragments: %d, fragsize: %d, fragstotal: %d, " + "samples: %d\n", + config->buffer_info.bytes, config->buffer_info.fragments, + config->buffer_info.fragsize, config->buffer_info.fragstotal, + config->sample_count); + + /* Set the trigger */ + switch (config->mode & O_ACCMODE) { + case O_RDONLY: + tmp = PCM_ENABLE_INPUT; + break; + case O_WRONLY: + tmp = PCM_ENABLE_OUTPUT; + break; + case O_RDWR: + tmp = PCM_ENABLE_INPUT | PCM_ENABLE_OUTPUT; + break; + default: + errx(1, "Invalid mode %d", config->mode); + break; + } + if (ioctl(config->fd, SNDCTL_DSP_SETTRIGGER, &tmp) < 0) + err(1, "Failed to set trigger"); +} diff --git a/share/examples/sound/oss/README b/share/examples/sound/oss/README deleted file mode 100644 index 0188a26348c8..000000000000 --- a/share/examples/sound/oss/README +++ /dev/null @@ -1,66 +0,0 @@ -Briefly summarised, a general audio application will: -- open(2) -- ioctl(2) -- read(2) -- write(2) -- close(2) - -In this example, read/write will be called in a loop for a duration of -record/playback. Usually, /dev/dsp is the device you want to open, but it can -be any OSS compatible device, even user space one created with virtual_oss. For -configuring sample rate, bit depth and all other configuring of the device -ioctl is used. As devices can support multiple sample rates and formats, what -specific application should do in case there's an error issuing ioctl, as not -all errors are fatal, is upon the developer to decide. As a general guideline -Official OSS development howto should be used. FreeBSD OSS and virtual_oss are -different to a small degree. - -For more advanced OSS and real-time applications, developers need to handle -buffers more carefully. The size of the buffer in OSS is selected using fragment -size size_selector and the buffer size is 2^size_selector for values between 4 -and 16. The formula on the official site is: - -int frag = (max_fragments << 16) | (size_selector); -ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag); - -The max_fragments determines in how many fragments the buffer will be, hence if -the size_selector is 4, the requested size is 2^4 = 16 and for the -max_fragments of 2, the total buffer size will be - -(2 ^ size_selector) * max_fragments - -or in this case 32 bytes. Please note that size of buffer is in bytes not -samples. For example, 24bit sample will be represented with 3 bytes. If you're -porting audio app from Linux, you should be aware that 24 bit samples are -represented with 4 bytes (usually int). - -FreeBSD kernel will round up max_fragments and size of fragment/buffer, so the -last thing any OSS code should do is get info about buffer with audio_buf_info -and SNDCTL_DSP_GETOSPACE. That also means that not all values of max_fragments -are permitted. - -From kernel perspective, there are few points OSS developers should be aware of: -- There is a software facing buffer (bs) and a hardware driver buffer (b) -- The sizes can be seen with cat /dev/sndstat as [b:_/_/_] [bs:_/_/_] (needed: - sysctl hw.snd.verbose=2) -- OSS ioctl only concern software buffer fragments, not hardware - -For USB the block size is according to hw.usb.uaudio.buffer_ms sysctl, meaning -2ms at 48kHz gives 0.002 * 48000 = 96 samples per block, all multiples of this -work well. Block size for virtual_oss, if used, should be set accordingly. - -OSS driver insists on reading / writing a certain number of samples at a time, -one fragment full of samples. It is bound to do so in a fixed time frame, to -avoid under- and overruns in communication with the hardware. - -The idea of a total buffer size that holds max_fragments fragments is to give -some slack and allow application to be about max_fragments - 1 fragments late. -Let's call this the jitter tolerance. The jitter tolerance may be much less if -there is a slight mismatch between the period and the samples per fragment. - -Jitter tolerance gets better if we can make either the period or the samples -per fragment considerably smaller than the other. In our case that means we -divide the total buffer size into smaller fragments, keeping overall latency at -the same level. - -Official OSS development howto: http://manuals.opensound.com/developer/DSP.html diff --git a/share/examples/sound/oss/audio.c b/share/examples/sound/oss/audio.c deleted file mode 100644 index 4dd3c8b82575..000000000000 --- a/share/examples/sound/oss/audio.c +++ /dev/null @@ -1,310 +0,0 @@ -/* - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2021 Goran Mekić - * Copyright (c) 2024 The FreeBSD Foundation - * - * Portions of this software were developed by Christos Margiolis - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -#include -#include -#include -#include -#include -#include -#include - -#ifndef SAMPLE_SIZE -#define SAMPLE_SIZE 16 -#endif - -/* Format can be unsigned, in which case replace S with U */ -#if SAMPLE_SIZE == 32 -typedef int32_t sample_t; -int format = AFMT_S32_NE; /* Signed 32bit native endian format */ -#elif SAMPLE_SIZE == 16 -typedef int16_t sample_t; -int format = AFMT_S16_NE; /* Signed 16bit native endian format */ -#elif SAMPLE_SIZE == 8 -typedef int8_t sample_t; -int format = AFMT_S8_NE; /* Signed 8bit native endian format */ -#else -#error Unsupported sample format! -typedef int32_t sample_t; -int format = AFMT_S32_NE; /* Not a real value, just silencing - * compiler errors */ -#endif - -/* - * Minimal configuration for OSS - * For real world applications, this structure will probably contain many - * more fields - */ -typedef struct config { - char *device; - int channels; - int fd; - int format; - int frag; - int sample_count; - int sample_rate; - int sample_size; - int chsamples; - int mmap; - oss_audioinfo audio_info; - audio_buf_info buffer_info; -} config_t; - -/* - * Error state is indicated by value=-1 in which case application exits with - * error - */ -static inline void -check_error(const int value, const char *message) -{ - if (value == -1) - err(1, "OSS error: %s\n", message); -} - - -/* Calculate frag by giving it minimal size of buffer */ -static inline int -size2frag(int x) -{ - int frag = 0; - - while ((1 << frag) < x) - ++frag; - - return (frag); -} - -/* - * Split input buffer into channels. Input buffer is in interleaved format - * which means if we have 2 channels (L and R), this is what the buffer of 8 - * samples would contain: L,R,L,R,L,R,L,R. The result are two channels - * containing: L,L,L,L and R,R,R,R. - */ -static void -oss_split(config_t *config, sample_t *input, sample_t *output) -{ - int channel, index, i; - - for (i = 0; i < config->sample_count; ++i) { - channel = i % config->channels; - index = i / config->channels; - output[channel * index] = input[i]; - } -} - -/* - * Convert channels into interleaved format and place it in output - * buffer - */ -static void -oss_merge(config_t *config, sample_t *input, sample_t *output) -{ - int channel, index; - - for (channel = 0; channel < config->channels; ++channel) { - for (index = 0; index < config->chsamples; ++index) { - output[index * config->channels + channel] = - input[channel * index]; - } - } -} - -static void -oss_init(config_t *config) -{ - int error, tmp, min_frag; - - /* Open the device for read and write */ - config->fd = open(config->device, O_RDWR); - check_error(config->fd, "open"); - - /* Get device information */ - config->audio_info.dev = -1; - error = ioctl(config->fd, SNDCTL_ENGINEINFO, &(config->audio_info)); - check_error(error, "SNDCTL_ENGINEINFO"); - printf("min_channels: %d\n", config->audio_info.min_channels); - printf("max_channels: %d\n", config->audio_info.max_channels); - printf("latency: %d\n", config->audio_info.latency); - printf("handle: %s\n", config->audio_info.handle); - if (config->audio_info.min_rate > config->sample_rate || - config->sample_rate > config->audio_info.max_rate) { - errx(1, "%s doesn't support chosen samplerate of %dHz!\n", - config->device, config->sample_rate); - } - if (config->channels < 1) - config->channels = config->audio_info.max_channels; - - /* - * If device is going to be used in mmap mode, disable all format - * conversions. Official OSS documentation states error code should not - * be checked. - * http://manuals.opensound.com/developer/mmap_test.c.html#LOC10 - */ - if (config->mmap) { - tmp = 0; - ioctl(config->fd, SNDCTL_DSP_COOKEDMODE, &tmp); - } - - /* - * Set number of channels. If number of channels is chosen to the value - * near the one wanted, save it in config - */ - tmp = config->channels; - error = ioctl(config->fd, SNDCTL_DSP_CHANNELS, &tmp); - check_error(error, "SNDCTL_DSP_CHANNELS"); - /* Or check if tmp is close enough? */ - if (tmp != config->channels) { - errx(1, "%s doesn't support chosen channel count of %d set " - "to %d!\n", config->device, config->channels, tmp); - } - config->channels = tmp; - - /* Set format, or bit size: 8, 16, 24 or 32 bit sample */ - tmp = config->format; - error = ioctl(config->fd, SNDCTL_DSP_SETFMT, &tmp); - check_error(error, "SNDCTL_DSP_SETFMT"); - if (tmp != config->format) { - errx(1, "%s doesn't support chosen sample format!\n", - config->device); - } - - /* Most common values for samplerate (in kHz): 44.1, 48, 88.2, 96 */ - tmp = config->sample_rate; - error = ioctl(config->fd, SNDCTL_DSP_SPEED, &tmp); - check_error(error, "SNDCTL_DSP_SPEED"); - - /* Get and check device capabilities */ - error = ioctl(config->fd, SNDCTL_DSP_GETCAPS, &(config->audio_info.caps)); - check_error(error, "SNDCTL_DSP_GETCAPS"); - if (!(config->audio_info.caps & PCM_CAP_DUPLEX)) - errx(1, "Device doesn't support full duplex!\n"); - - if (config->mmap) { - if (!(config->audio_info.caps & PCM_CAP_TRIGGER)) - errx(1, "Device doesn't support triggering!\n"); - if (!(config->audio_info.caps & PCM_CAP_MMAP)) - errx(1, "Device doesn't support mmap mode!\n"); - } - - /* - * If desired frag is smaller than minimum, based on number of channels - * and format (size in bits: 8, 16, 24, 32), set that as frag. Buffer - * size is 2^frag, but the real size of the buffer will be read when - * the configuration of the device is successful - */ - min_frag = size2frag(config->sample_size * config->channels); - - if (config->frag < min_frag) - config->frag = min_frag; - - /* - * Allocate buffer in fragments. Total buffer will be split in number - * of fragments (2 by default) - */ - if (config->buffer_info.fragments < 0) - config->buffer_info.fragments = 2; - tmp = ((config->buffer_info.fragments) << 16) | config->frag; - error = ioctl(config->fd, SNDCTL_DSP_SETFRAGMENT, &tmp); - check_error(error, "SNDCTL_DSP_SETFRAGMENT"); - - /* When all is set and ready to go, get the size of buffer */ - error = ioctl(config->fd, SNDCTL_DSP_GETOSPACE, &(config->buffer_info)); - check_error(error, "SNDCTL_DSP_GETOSPACE"); - if (config->buffer_info.bytes < 1) { - errx(1, "OSS buffer error: buffer size can not be %d\n", - config->buffer_info.bytes); - } - config->sample_count = config->buffer_info.bytes / config->sample_size; - config->chsamples = config->sample_count / config->channels; -} - -int -main(int argc, char *argv[]) -{ - int ret, bytes; - int8_t *ibuf, *obuf; - config_t config = { - .device = "/dev/dsp", - .channels = -1, - .format = format, - .frag = -1, - .sample_rate = 48000, - .sample_size = sizeof(sample_t), - .buffer_info.fragments = -1, - .mmap = 0, - }; - - /* Initialize device */ - oss_init(&config); - - /* - * Allocate input and output buffers so that their size match frag_size - */ - bytes = config.buffer_info.bytes; - ibuf = malloc(bytes); - obuf = malloc(bytes); - sample_t *channels = malloc(bytes); - - printf("bytes: %d, fragments: %d, fragsize: %d, fragstotal: %d, " - "samples: %d\n", - bytes, config.buffer_info.fragments, - config.buffer_info.fragsize, config.buffer_info.fragstotal, - config.sample_count); - - /* Minimal engine: read input and copy it to the output */ - for (;;) { - ret = read(config.fd, ibuf, bytes); - if (ret < bytes) { - fprintf(stderr, "Requested %d bytes, but read %d!\n", - bytes, ret); - break; - } - oss_split(&config, (sample_t *)ibuf, channels); - /* All processing will happen here */ - oss_merge(&config, channels, (sample_t *)obuf); - ret = write(config.fd, obuf, bytes); - if (ret < bytes) { - fprintf(stderr, "Requested %d bytes, but wrote %d!\n", - bytes, ret); - break; - } - } - - /* Cleanup */ - free(channels); - free(obuf); - free(ibuf); - close(config.fd); - - return (0); -} diff --git a/share/examples/sound/poll.c b/share/examples/sound/poll.c new file mode 100644 index 000000000000..53bdf572e991 --- /dev/null +++ b/share/examples/sound/poll.c @@ -0,0 +1,70 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Goran Mekić + * + * 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 "oss.h" + +int +main(int argc, char *argv[]) +{ + struct config config = { + .device = "/dev/dsp", + .mode = O_RDWR, + .format = AFMT_S32_NE, + .sample_rate = 48000, + }; + struct pollfd pfds[1]; + int rc, bytes; + + oss_init(&config); + bytes = config.buffer_info.bytes; + + for (;;) { + pfds[0].fd = config.fd; + pfds[0].events = POLLOUT; + if (poll(pfds, sizeof(pfds) / sizeof(struct pollfd), -1) < 0) + err(1, "poll"); + if (pfds[0].revents != 0) { + if ((rc = read(config.fd, config.buf, bytes)) < bytes) { + warn("Requested %d bytes, but read %d!\n", + bytes, rc); + break; + } + if ((rc = write(config.fd, config.buf, bytes)) < bytes) { + err(1, "Requested %d bytes, but wrote %d!\n", + bytes, rc); + break; + } + } + } + + free(config.buf); + close(config.fd); + + return (0); +} diff --git a/share/examples/sound/select.c b/share/examples/sound/select.c new file mode 100644 index 000000000000..762d0b2b86a7 --- /dev/null +++ b/share/examples/sound/select.c @@ -0,0 +1,70 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Goran Mekić + * + * 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 "oss.h" + +int +main(int argc, char *argv[]) +{ + struct config config = { + .device = "/dev/dsp", + .mode = O_RDWR, + .format = AFMT_S32_NE, + .sample_rate = 48000, + }; + fd_set fds; + int rc, bytes; + + oss_init(&config); + bytes = config.buffer_info.bytes; + + for (;;) { + FD_ZERO(&fds); + FD_SET(config.fd, &fds); + if (select(config.fd + 1, &fds, NULL, NULL, NULL) < 0) + err(1, "select"); + if (FD_ISSET(config.fd, &fds)) { + if ((rc = read(config.fd, config.buf, bytes)) < bytes) { + warn("Requested %d bytes, but read %d!\n", + bytes, rc); + break; + } + if ((rc = write(config.fd, config.buf, bytes)) < bytes) { + warn("Requested %d bytes, but wrote %d!\n", + bytes, rc); + break; + } + } + } + + free(config.buf); + close(config.fd); + + return (0); +} diff --git a/share/examples/sound/simple.c b/share/examples/sound/simple.c new file mode 100644 index 000000000000..e458841f596a --- /dev/null +++ b/share/examples/sound/simple.c @@ -0,0 +1,147 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 The FreeBSD Foundation + * Copyright (c) 2025 Goran Mekić + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "oss.h" + +/* + * Split input buffer into channels. The input buffer is in interleaved format, + * which means if we have 2 channels (L and R), this is what the buffer of 8 + * samples would contain: L,R,L,R,L,R,L,R. The result of this function is a + * buffer containing: L,L,L,L,R,R,R,R. + */ +static void +to_channels(struct config *config, void *output) +{ + uint8_t *in = config->buf; + uint8_t *out = output; + int i, channel, index, offset, byte; + + /* Iterate over bytes in the input buffer */ + for (byte = 0; byte < config->buffer_info.bytes; + byte += config->sample_size) { + /* + * Get index of a sample in the input buffer measured in + * samples + */ + i = byte / config->sample_size; + + /* Get which channel is being processed */ + channel = i % config->audio_info.max_channels; + + /* Get offset of the sample inside a single channel */ + offset = i / config->audio_info.max_channels; + + /* Get index of a sample in the output buffer */ + index = (channel * config->chsamples + offset) * + config->sample_size; + + /* Copy singe sample from input to output */ + memcpy(out+index, in+byte, config->sample_size); + } +} + *** 77 LINES SKIPPED *** From nobody Wed Nov 19 09:58:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBH431blqz6HRtL for ; Wed, 19 Nov 2025 09:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBH426dB3z3CCk for ; Wed, 19 Nov 2025 09:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763546306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DQbuuAZKnY5QVIBo0gYrBCDvPy9OqxgTtRMCZ8AfHqA=; b=oM/Y31PifTHH4TK22hF0h8hEDs8AwXrRAglqRC55t4R0prux6c1f8ssQCsRmeTp4joNQDE AbS1ACeoqLtVYex65qTO0UPHD+bqsRoNPyyJVsIpywj6ALNyvjO8UFSivy1bNpy0dguar2 6EeFlqNKdxu2cTrXnVMTzqMNAM+28hZV7nWa9qhV7swZv5GMBjaE7XgKQz5gnQwymVxIYz fTc8ifJEC93M4D7DMAWtcKn3QAjuYTlNEXckgsl+A9C0QnkaG18+8jdsKCW68PVanE9780 3BqjABP6okC1E2AmLQnSGQihrC1uEexbxre0jxYPmyisP8X2TjP4ztOxPLbkug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763546306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DQbuuAZKnY5QVIBo0gYrBCDvPy9OqxgTtRMCZ8AfHqA=; b=ScbgiPT4243NRF2bRe3g4JuedViw37WJ+F5aXImrgowSrrH5UCsSRJgzJO6HQxcELgvHXR 19T2d0DtAkyx6sK8mP2k4EoRaJ7h6EVfsZkU/JNbspKj2bCf4CjQNY2UfGJ62ipJO5XSms xeWBjj207mx7IjLOstmo4Dns3+FYH/gmr0TI3/cAqXcFMPg4OlHnu7CB04vofLgM43pADj PSRyvKpPDe58wLFZYbixwWganh9n3p1mP8nZDL2ERbN/Q55bqsBJ+0LgllucGMYFSbcd0w QEmI+e+GqHeKDn3wa0ASf+6dDUk1El7bxqY2M8pVcwz5rHpLfRW4aCMXRt0RNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763546306; a=rsa-sha256; cv=none; b=fCslryVFFkrtT0rerw6OClOjHPuJXzjOJtkDnE/yqY8R1iu4A13TWVVqOiqZeY1P/ToSda WQ3eJ5wRYE8KccG+T/7BZAMbTILQcCQJPBCknfwqT8RyuC9UOJ4XA460HWDswYp4LF45kU 4lANsl5ajKr/wVdNEW6McjzQgorrQVUXEo6HF9mt+AXS5mqOQ8Mr6wJBBN0ikNeVtnDnM+ zSQIWZFfM+Kp4MRaCY8zoaHyMWB4GIDpg2c7mVpKspo0WzGsGs4JmXKNsb1tKChg5nEjHs ieXoE95EBIVo1OuVxaq8urPHA2Euqky0Hfi1U4FoP140ngW0IXWX75Q5cHSrxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBH426Bcfzb9s for ; Wed, 19 Nov 2025 09:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b178 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 09:58:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: cff21ddcb756 - stable/15 - sound: Remove KOBJMETHOD_END re-definitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cff21ddcb7566fc0e964332ae03136e0a4861036 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 09:58:26 +0000 Message-Id: <691d94c2.3b178.64eb22b7@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=cff21ddcb7566fc0e964332ae03136e0a4861036 commit cff21ddcb7566fc0e964332ae03136e0a4861036 Author: Christos Margiolis AuthorDate: 2025-11-12 20:30:58 +0000 Commit: Christos Margiolis CommitDate: 2025-11-19 09:57:51 +0000 sound: Remove KOBJMETHOD_END re-definitions No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D53696 (cherry picked from commit 4c05ff1d5ad206d6074151f747a1dd272487555c) --- sys/dev/sound/midi/midi.c | 4 ---- sys/dev/sound/midi/mpu401.c | 4 ---- sys/dev/sound/pcm/sound.h | 4 ---- 3 files changed, 12 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 6753f864ba9c..eed7ce89a919 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -62,10 +62,6 @@ #include MALLOC_DEFINE(M_MIDI, "midi buffers", "Midi data allocation area"); -#ifndef KOBJMETHOD_END -#define KOBJMETHOD_END { NULL, NULL } -#endif - #define MIDI_DEV_MIDICTL 12 enum midi_states { diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index 224ebb1b01f4..af3149ec8180 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -49,10 +49,6 @@ #include "mpu_if.h" #include "mpufoi_if.h" -#ifndef KOBJMETHOD_END -#define KOBJMETHOD_END { NULL, NULL } -#endif - #define MPU_DATAPORT 0 #define MPU_CMDPORT 1 #define MPU_STATPORT 1 diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 75fb57e33733..c5107d5fba1c 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -76,10 +76,6 @@ #include #include -#ifndef KOBJMETHOD_END -#define KOBJMETHOD_END { NULL, NULL } -#endif - struct pcm_channel; struct pcm_feeder; struct snd_dbuf; From nobody Wed Nov 19 10:09:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHKB4061z6HSpD for ; Wed, 19 Nov 2025 10:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHKB3N9kz3DkJ for ; Wed, 19 Nov 2025 10:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763546990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vGXD4NExFgIFkm/KcwQkEdPXWxXeASjCCLy/gpdhF1Y=; b=QF3kcwTTrTavy60Z9ckGqhL2cgFnRds9URegyszHrZqrJwqRzpCngbiDb0S0uZ8xv8hdjM Sj8EhqX6q85mHoqTRHh37ETsBOu0dj1yxSr+tAr1EHmNQ1uxj6O2AHXX7P8x2FRUFmJRd2 GlXgUrmblNWde1Z+BrGDujLjj7Pp0Yt4i96aSwwx9948ixgnJDT1k61BgsTlEF/TtuX8jO AkFo79MTEIT0dE7ZNquJA1p4ftSgAsG8kPf3PVeQbYUl7vtVih7iqNObwoGNyPVLbPry2/ WmQ5XQzawbKcWZCS89NTLQfkXY8xqEVZKOjtCB2201OGPsjw9Jnh+DSK84kAMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763546990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vGXD4NExFgIFkm/KcwQkEdPXWxXeASjCCLy/gpdhF1Y=; b=MO9KDTfBqN66Suw+DJTUDTKB4VJpvRXDb1zhYhRyVgMmitfcQLQbLmw6aNGbX58BdBgju1 9R3scQvEV9iWM9bUSlZZCyW0ZgcVxJdvjusj/7rsGFqOLGrtCiGgZvhkQpNVWg/wf9zMl8 2RAMZPt47nloR04APhGY8tEMlKSmgsQGRBhJF818d0rRcyHBAET4Mp6KWXhysCILFLlUb1 K74x7JMP15UG9kSq/hvaElhytHaFo04tQaeXh+KZJhq7nlkGVxWWfC9pX3WjzvtVNIrjbE +BrrP1A0h8jxqeiDk9sbe5Lw7NZ8qHr1ojkSWzVXBQAwkknMdEpyzExFpP4ygA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763546990; a=rsa-sha256; cv=none; b=bIxONYHEiOiYrszACxShUdQynQvhhcgOzTEShgffzEFC1N/ljMcWDF5bQMTo17zseyeDec aT7eQk592mrXMCmkBL2FA85vv+DWE0Vv6ub5RTcm7HbWvVAy6txbSu9MIWrMw4EldlLwTz nkOJ5L2Ae0zpqo9jZBeCR4ma6v6pnq2o5l5jklOMwEP6gc/kZhlb2eT2JNr5pvcqGss9EJ 6pTImCwq7GV1q2sV8UzJTzmRrMhumaHgYIZ2XKGrxNsWAqr0NCu7vJYlUfA0wl+pOapE3j qWXIxtpZirq/3XUrUZhh+MmXXhZYDMzsVQqH4PnZ9BGUDBnmh2/sxpMdErka9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHKB29qzzby0 for ; Wed, 19 Nov 2025 10:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b0ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:09:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a2754976efe2 - stable/14 - nvmecontrol(8): Fix a typo in an error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a2754976efe2f8989dd056f6126020a4bbfc4e32 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:09:50 +0000 Message-Id: <691d976e.3b0ae.5187c1f6@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a2754976efe2f8989dd056f6126020a4bbfc4e32 commit a2754976efe2f8989dd056f6126020a4bbfc4e32 Author: Gordon Bergling AuthorDate: 2025-10-26 15:08:31 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:09:37 +0000 nvmecontrol(8): Fix a typo in an error message - s/speciifed/specified/ (cherry picked from commit 44004bcffabc3372d6812c2e0c4bf90386919e21) --- sbin/nvmecontrol/perftest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/perftest.c b/sbin/nvmecontrol/perftest.c index 0afab9951e50..c98e0fbab8e4 100644 --- a/sbin/nvmecontrol/perftest.c +++ b/sbin/nvmecontrol/perftest.c @@ -172,7 +172,7 @@ perftest(const struct cmd *f, int argc, char *argv[]) arg_help(argc, argv, f); } if (opt.time == 0) { - fprintf(stderr, "No time speciifed\n"); + fprintf(stderr, "No time specified\n"); arg_help(argc, argv, f); } io_test.time = opt.time; From nobody Wed Nov 19 10:10:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHLT2RGDz6HSYv for ; Wed, 19 Nov 2025 10:10: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHLT1V8vz3Dv7 for ; Wed, 19 Nov 2025 10:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kzNjtAP/CD0vkahbW+sD6kMUoRFJrx7wzdkHsjv3CVE=; b=gK4FBbSkTd4QcFLu1JeVKodBTl9Mhaqh3CoL4+lWgiqzYTk074jrCOxe3U57y9sEqiTGq7 1d4UxnSsYMIDBOHQmb7XR95Aa8MTNq3pUDX6u0I0QAHLD7ioFVZ0eG61A4e5UKJ0nydSFC rHbUqTXgD/Iq1HzLnLNhVw1E66PYUZ35y40wUKpykVUispL9CByg+UyT4rKd8aPVRsxlFv pVYtoT1JwbpcJJDH0m9aSKR4BdnbcUkwwagxp5+LtTmHChw03qDEYHx+YTCDNwjUMv+d7Z 8CvZixSNbYZM2IR8Ib7MLAPHDjfJWkrvRWw9SP8C61MLHTostLcxwLeQVLAxQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kzNjtAP/CD0vkahbW+sD6kMUoRFJrx7wzdkHsjv3CVE=; b=ac9u7eRjHrWTfq/DZTIr4EHh1spg+IbPZa7d/NZwZk3vL5Ph5yQrLLBdAhMMaBics0iTyv Qk7LIhChzq1gJgUi4j3O4BlhyLCt7A0hAxTMKYB4npUqKJRRYdtYDgIwfUPRV6QLsrL2j9 E8+TJY2SBrZHlfFZ08OctgD1hV7r0tV42bH9fvR004Rwd0C2ohgZ1aJsr8cjqwmq01PFmf zdzh0sPbl/cdENChM4lNjju6qm7scyBlkAvLFG+4snmVcv3IGkO6WT3VqWjO/yN+3HV6ad DlFYAxLqhj0a2SouBFJPwpJ6NPtBU/CJeNBnznDgk+qNlYE5MBy+dPSNmnV7QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547057; a=rsa-sha256; cv=none; b=YvQYff+LOtirtUsw3NMBW38tbqIZri8b9d7qjRhpWc6dG6xnYnsrOb7xHRVsE9hyeJK5VD oA5c5omFZlzCkEHrHxYG2LO3mAxTtUtGbgI73aXuFiWZLo5icj7A/Dhe9neiwQYOoVqhQj lpiLFiQzz+SWr4j+DcX7du2xG47/rjmPEo5SKEiwFx72ISjSqS92t7yzAildYMnAbPrf9q UiColxrIJ2xSz7TCtmzVQZstgQ3mULNqDhByfqH8WSHiePpIe8l+AJXeQG3dv6jii1X9Dq pBIsqoXY8fYz7iUHyoprQMAqM7pzgoqPqn0109rYuj/PErcJs9vsqCloKxEslw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHLT0thGzc0S for ; Wed, 19 Nov 2025 10:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c336 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:10:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 906934ac391c - stable/14 - rtlbtfw(8): Fix a typo in an error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 906934ac391c815f0cd23406545c15ba5c79ea6d Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:10:57 +0000 Message-Id: <691d97b1.3c336.289fd212@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=906934ac391c815f0cd23406545c15ba5c79ea6d commit 906934ac391c815f0cd23406545c15ba5c79ea6d Author: Gordon Bergling AuthorDate: 2025-10-26 15:26:21 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:10:44 +0000 rtlbtfw(8): Fix a typo in an error message - s/Parseing/Parsing/ (cherry picked from commit 39d43543b306ac686aa684303ae972c386ccea12) --- usr.sbin/bluetooth/rtlbtfw/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bluetooth/rtlbtfw/main.c b/usr.sbin/bluetooth/rtlbtfw/main.c index e87a98036265..13551fe47900 100644 --- a/usr.sbin/bluetooth/rtlbtfw/main.c +++ b/usr.sbin/bluetooth/rtlbtfw/main.c @@ -482,7 +482,7 @@ main(int argc, char *argv[]) } else r = rtlbt_parse_fwfile_v1(&fw, rom_version); if (r < 0) { - rtlbt_err("Parseing firmware file failed"); + rtlbt_err("Parsing firmware file failed"); goto shutdown; } From nobody Wed Nov 19 10:11:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHM84KZbz6HSqm for ; Wed, 19 Nov 2025 10:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHM80nh4z3FQD for ; Wed, 19 Nov 2025 10:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hgBX3O6Ox4WM9gxdmc4FQEutwqeXk5eJHHd9Zj0GL7A=; b=k4kOmsscpaw2dPSWnQ7Jh13SA/LgjXOd2CY4mYg7MzxE09wEFE1ntUAnojSR+bB/Rtp5Te liQqm+wAxgMKdVff9QUJnd4O+JMrOdPMMQr/0tKRbotGR9bcfgwCnL5yqfG+AWxvFZKPWT Cz9wHP98vm+KPon6IVhk+lHzv83DqgwzKFuxiszOTwRdlnX1lYMjO2iYAwAMpo676UQR88 l0Y+6ZYS4aSwxcgbOq9gDg6esRAK/Xh5HE28++UA663VIq6RQB/QdUemSZqATFO1eV228L af0fQ/62Lp86DnHEt1BIU+0idaGptafUpkPvm9Ua88QjYZMszHkYeMNSxB4juQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hgBX3O6Ox4WM9gxdmc4FQEutwqeXk5eJHHd9Zj0GL7A=; b=hzVtT0G4FvVWR06C4ZWJ40ixZxNz/TPCDn1db0KFdGDsr4t/Jhhb2J2NTGvqAmVfEN0EIz YyVRbYtE6FPVyinkq7Z/IZ/K8diw4OTAKbKlZpqtosx/4Y+5yzm9bZ/hhXt+uTXOUEbJZG tvQPE55ErZGs0lZVBD7p5wbNHenGbb0LeqNJC2+Sj71YxysXW0B+p149hcqpws0dffSwVm 6lH4Qq8avrDPdl/uu8xwzuO0eeHResw1gqoc3NhY3Q6HpbAv2136ENJgSAF1ZuX64MQ874 RxR+G19Z3rge1xLED04aaQiIPI8TQYd4sAvgwS1otxG/FhP1IOO7beBK7uAI/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547092; a=rsa-sha256; cv=none; b=vSjIOCdkLgTOa20vwUh16hrwIJu5tDlp88yTGKZIZ2/Glu+PL5o1jVopgdHQfz/KQNovlO M7XiSv+eyoNAiwzK8k9imhx+2sQl36hxjgIcQCErZe+SO+nBnucfVI7mTazXXpKgSfRybV 7NED8doATKx+lOUeETbjEs3TTlzIJIbN4jtp/kjwOrvrTaK9ehbhsApp1XuzUTSR95tkDz AzajDdFYbu2Oy/EOEgmD0rjPnT3mVI/fCgV1dt8+vyrLX4Y2COJA8/8yj2F3v8Up8PT/JH p7BnbPHeVWFykosX7yb2DhP0iqajil2M4tM+11XrE5rJlgtYo3h023J9a9ucGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHM80P2MzcN1 for ; Wed, 19 Nov 2025 10:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d193 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:11:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e39f64a7a3eb - stable/14 - pmcstat(8): Fix a typo in an error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e39f64a7a3ebb39e47b62c84ebd5c8e40d08b99d Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:11:32 +0000 Message-Id: <691d97d4.3d193.58c5faeb@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e39f64a7a3ebb39e47b62c84ebd5c8e40d08b99d commit e39f64a7a3ebb39e47b62c84ebd5c8e40d08b99d Author: Gordon Bergling AuthorDate: 2025-10-26 15:29:08 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:11:21 +0000 pmcstat(8): Fix a typo in an error message - s/evalation/evaluation/ (cherry picked from commit 780a50c729c7bc0ac1750947223feadd918b17e8) --- usr.sbin/pmcstat/pmcstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c index c36cee436e55..49a0e0ce1046 100644 --- a/usr.sbin/pmcstat/pmcstat.c +++ b/usr.sbin/pmcstat/pmcstat.c @@ -216,7 +216,7 @@ pmcstat_find_targets(const char *spec) SLIST_INSERT_HEAD(&args.pa_targets, pt, pt_next); } else if (rv != REG_NOMATCH) { regerror(rv, ®, errbuf, sizeof(errbuf)); - errx(EX_SOFTWARE, "ERROR: Regex evalation failed: %s", + errx(EX_SOFTWARE, "ERROR: Regex evaluation failed: %s", errbuf); } } From nobody Wed Nov 19 10:12:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHN90xp1z6HT8P for ; Wed, 19 Nov 2025 10:12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHN83bQGz3G6K for ; Wed, 19 Nov 2025 10: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=1763547144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/bHbqKJ310i3eaCro5tk7aqZrs8i2IMRbxxFqIeORiM=; b=Dc/iVBsg1vlxE7GSW3ItLU5qF4LzrsSLmFpNOox1LUKGPI+WrmdDsxNB+mmmaVTIVEUsKQ +OfytgD6PvA3FJ3JJ8l3fAbbvFe/0Y8Gwfj78qs/ocsXfqBRxavjxDunOIqs9oeSErvZWy w3X1Bt8QM0DhJVMCrb+6DarR7aG78qzuNe5p7jmGBjPlGW5cGyl1VGPXg6n8XCSbFz3tBa iOzaMmp/3Zze6H4vI+ZfPs9A4IlfYRS1hJ+LuzdrJhkO1T4GGAYwReGvAzzTIDhAGgF7Zt 75JOEcBzZep+2ldM0zonpRDWy/NNNxcxXRWW1pC2+YFiC7d8DbuFIkNzqyMcMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/bHbqKJ310i3eaCro5tk7aqZrs8i2IMRbxxFqIeORiM=; b=w/wwz4IpDSoOkMPXKnAxuvVRloHgEylAxIrPymdjNH1qZ5n0TqLftw+txtTXEkl/b/AGyP p+sVgdxFiTRMZpToGdC6xHqG4W+6UTD9TM6uy2Btq5QoZLwMPcHalzQWzs0+cWvtP3MW3t HK2xZ3CH6sxzNa8YwsqJKlzgx9h02vM5YijSMHuceQ955MxkVpr9TuGZtraDgkWYzVjTWU LCatqkV3y/N1BglKV+efEwkTJ8odKQHBFjRZuIHzoTIDsq8y/xglH++pstlyY/hOqFlnq6 K0Xj5uCcTVI5T2tIy7N7nUcz6kCld8uEYXLBgWD7KTYfbCY2LnItieqOz6KGBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547144; a=rsa-sha256; cv=none; b=ZYPJ+p3B+CvrNZiYc3rNDtJo2C5sVZMS92EW1Ubu1Rzigxpz1mBOgE18GA6Fh0R/E3PVT2 rTdaRE2S2UxOwNE/POhl8FoVxAB1cxQIHEs+k2KgK9K4Y3v1s8UZgBrjS1lSQNNcDOsJp/ kqx1jBu60KS1tgLM4Wjw8Bp6apsKx4der5GaVT6eG3X0Wo0MlmVnrEL6aK5PvFrduEzLkA 0yujAkMYKoekdUBJFItRZbDkolLOj+FpF7lTAkeNZSJOHyBp/oasW4/jvI5tznwE38fCf+ 3HL3i8pdveMBNx7q7dz/5Q8VePaGLA4EAVi1By1aY1xSSGp93mkq4EP+pXXiAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHN838xlzcLm for ; Wed, 19 Nov 2025 10:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ad57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:12:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d4ada3b1f8d5 - stable/14 - fwcontrol(8): Fix a typo in a message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d4ada3b1f8d59835284635f470656f029bdc4345 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:12:24 +0000 Message-Id: <691d9808.3ad57.59229e4e@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d4ada3b1f8d59835284635f470656f029bdc4345 commit d4ada3b1f8d59835284635f470656f029bdc4345 Author: Gordon Bergling AuthorDate: 2025-10-26 15:30:48 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:12:13 +0000 fwcontrol(8): Fix a typo in a message - s/verndor/vendor/ (cherry picked from commit 56a72214a35965197932b6366ffad0fe1e3fc398) --- usr.sbin/fwcontrol/fwcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/fwcontrol/fwcontrol.c b/usr.sbin/fwcontrol/fwcontrol.c index ce908341a42a..195697475973 100644 --- a/usr.sbin/fwcontrol/fwcontrol.c +++ b/usr.sbin/fwcontrol/fwcontrol.c @@ -440,7 +440,7 @@ show_crom(u_int32_t *crom_buf) if (hdr->info_len == 1) { /* minimum ROM */ reg = (struct csrreg *)hdr; - printf("verndor ID: 0x%06x\n", reg->val); + printf("vendor ID: 0x%06x\n", reg->val); return; } printf("info_len=%d crc_len=%d crc=0x%04x", From nobody Wed Nov 19 10:12:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHNw0xqNz6HT1P for ; Wed, 19 Nov 2025 10:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHNp6tWkz3GCB for ; Wed, 19 Nov 2025 10:12:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hCat4Uec1lmtV5+IeHzPwuyDb0n8i5xi3g6peBK/WHM=; b=QlmdmS8BrMzTiQGZCtXL299IDocD3hdeGN2zjY5nA/2foORBycvewfORDBOztFXglZxz+v y2I1PocI4hrfKc/sUW9D16eFsKtunJjSWqdBTDAeHy8yXroxVNsQ0kwnuNqx4X34tnWkJQ 2kLGXSvXnWIFO5beOjh4TQR0FcfW3DbnKKsstQxiIVLS/6bV+b4kCXDm+oci8YXBSyROJn FA8wCpjBiB/rwkemN8dIBJfNSnTVjO6aJ+BJSGUP7CZ0IEovtjC8AGUrSyGoTZ4OSCjMxi tzSXo3YNoOEgex2iXmz7tV7f9CPH89VLp5hb38eFXABmpjsw8fe94JiED9DQPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hCat4Uec1lmtV5+IeHzPwuyDb0n8i5xi3g6peBK/WHM=; b=NpwjANOIVXhPXQosu8sbkRaSgGY357mr43ScvaAZw0uCozHD7NarHC5Z7VZLUJR8CIYw5j gcdl5KpWBh6jvKkl2p9gJiJbhF7ZiVKHqKBX6940Z4Kp7M1JSjlL6IJ5wgRbelhSxehdDv 2ZtLOICU2B3tdKciqWzM+mr303T3n7G0UxdO9F7g65YuWJT7oQ9p+AD91iyrqPdgtLLkPV SaFXcidXBqXKUSu/XdBMcyPfCThfjnihrQ03avTL6bIzvFNi1cKbe2rGQxdiSUXhnTNn4r hMAUtAd6BrATicz4Vjw1EEtWc1ta5KA+3WGQOc/LesjfkfVjZWXLNlgebVSZ/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547179; a=rsa-sha256; cv=none; b=xQ5xRZlCi/ENvXF4iavjhYhnx878bh3XeIFvGStsOwaJ7o7wBVHoHVZl2+2e0RewNePMpQ KcDGCh0GArC5/t/pSnmSvVT728EuwwfPEMswykJPVlDDnR1Uordw1ahtisg621TGTVoIuL YHMceTWvN7HYZt3qEs21mFqBfkyvuJP8VN6sWqFJn+FH84AQRBWlhCgjHBC2W7c8QRQ2mf qZPm9Tdmblu9/+sev03B+MtOhYb2avxa5s4l9baMdlBfSmK2fRNMdTH0A2SQB5zYW6WJdo bq04VGdpj8v9yLWIf7w/QFHFg0bIh/KoF4pR4tHtdC7p0y17Soi9so2iSVeRmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHNp6PmPzcfn for ; Wed, 19 Nov 2025 10:12:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d197 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:12:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9eae326a58eb - stable/14 - PCI_IOV_ADD_VF.9: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9eae326a58ebfcd30f44f6e2cf88bb0efd02fd7e Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:12:58 +0000 Message-Id: <691d982a.3d197.597a9b49@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9eae326a58ebfcd30f44f6e2cf88bb0efd02fd7e commit 9eae326a58ebfcd30f44f6e2cf88bb0efd02fd7e Author: Gordon Bergling AuthorDate: 2025-10-26 15:34:56 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:12:49 +0000 PCI_IOV_ADD_VF.9: Fix a typo in the manual page - s/initializating/initializing/ (cherry picked from commit d81fe0b206325b40e13625f5684ec8d19fdccf04) --- share/man/man9/PCI_IOV_ADD_VF.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/PCI_IOV_ADD_VF.9 b/share/man/man9/PCI_IOV_ADD_VF.9 index d13cb6e1ddc9..97acac0e9df3 100644 --- a/share/man/man9/PCI_IOV_ADD_VF.9 +++ b/share/man/man9/PCI_IOV_ADD_VF.9 @@ -41,7 +41,7 @@ The .Fn PCI_IOV_ADD_VF method is called by the PCI Single-Root I/O Virtualization .Pq SR-IOV -infrastructure when it is initializating a new Virtual Function (VF) as a child +infrastructure when it is initializing a new Virtual Function (VF) as a child of the given Physical Function (PF) device. This method will not be called until a successful call to .Xr PCI_IOV_INIT 9 From nobody Wed Nov 19 10:13:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHQ12jqlz6HSw4 for ; Wed, 19 Nov 2025 10:14: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHQ11yBPz3GNX for ; Wed, 19 Nov 2025 10:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XHTvMj8x/R5MV45goupM5KhgzUG0phLKddGLZKN2TlQ=; b=P6BCr2HCSHMmFwNCApF/bOgkzr4KgGPyfub6SO9gRkrHfJEA9op9/a7ee6RBZ24pPkwhTy EIRiH/MZT4ZnswNj+vb8g39t3PwP4CDNmJzVTYo4pcis4YS87WBBmPifuUgOlepF7uCvLU tlfXizB9RewUT8waGa+z3LnpIZUY73MQHVCq9pAwGE+frSzEoaMAxRGkf67djFgPQpFXSi HJcoR3fSEUw/Iqyw3TVomahNZeeQaxCE+jpnSb+dghzb8+nI8Ddu6Q2bxAAT7NVXcg4Rx5 I4bsmR3zUCjuzpT2lld+ajdEO9LUC1PDUxBmBZwaehaC5wqwYtJ+aTvdKpM0RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XHTvMj8x/R5MV45goupM5KhgzUG0phLKddGLZKN2TlQ=; b=gfGV0LK501YQy9e8UOPpIC4g7FUHK8mgO73pkub/XY1az0383LephkI5h1ciEUlwDyvKfi OpSREM8xe+bz+0XKAjCpQyZPapYArsRTWXhjHWWWnOFftzspLLlxaBeR7s7RWe55QGt1Bj HTb8ISD2J8QySqhhCqVKcWH6OFc5a8ZHqadcwslX2q8vnphBjhFUIXma9KeGTjbJ9aIeST oyvpcUJdYzb0TlbAzLKmq34rl0CqBZNZk0ioe7cDq2fBsENj5mdIsWj2K0Tc7oE7YVAT8w baLqp5kFxDx/vl3elftXPJnjU46NJxeORxSXIqjVPioDCoM8XPM8uy5/9zz+gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547241; a=rsa-sha256; cv=none; b=vFZYnct2Z8sdeWcG+MuSlLjmJRqdaxTI2+96gA8irbzutBmSuGEtRzjCZkqvE/tDXUYptl u9oslqC5tEPoJxsi/TRVFh9VtOHMK5t4AcAG+RC/qAQJiYtvjhr3eVUto/h2SHZ2G0899l gZjUxLqW3CCVb1BYS4OpLvA+cXKs0YYRUFvHO78rsYTIidMgmVfJlk5cKjpxCDbwv1f9oB zZiBOJa04PGXz41X9cehubgD6C09PFg6+BQ8EpH2ISRqadaOUuDNkahjmIkDtIPxOyzeHz jKKR9xbxzcX8Jzv6p0hokgNWa4MaLDVEq0iQUx+0haQl6A/8H7oVMORBZaKaIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHPw1PQnzcLn for ; Wed, 19 Nov 2025 10:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b0e7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:13:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: af45b1efc9b5 - stable/14 - atomic.9: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: af45b1efc9b55ddf1a623b94b81d09b4bdac3b05 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:13:56 +0000 Message-Id: <691d9864.3b0e7.49abeac3@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=af45b1efc9b55ddf1a623b94b81d09b4bdac3b05 commit af45b1efc9b55ddf1a623b94b81d09b4bdac3b05 Author: Gordon Bergling AuthorDate: 2025-10-26 15:35:50 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:13:46 +0000 atomic.9: Fix a typo in the manual page - s/constrast/contrast/ (cherry picked from commit 2f263badccf842470323b64613eccb0c0b9a12c1) --- share/man/man9/atomic.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/atomic.9 b/share/man/man9/atomic.9 index af94b5773f0e..b027a0ff0bca 100644 --- a/share/man/man9/atomic.9 +++ b/share/man/man9/atomic.9 @@ -306,7 +306,7 @@ In C11, a release fence by one thread synchronizes with an acquire fence by another thread when an atomic load that is prior to the acquire fence (by program order) reads the value written by an atomic store that is subsequent to the release fence. -In constrast, in +In contrast, in .Fx , because of the atomicity of ordinary, naturally aligned loads and stores, fences can also be synchronized by ordinary loads From nobody Wed Nov 19 10:14:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHQV1GRfz6HT4H for ; Wed, 19 Nov 2025 10:14: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHQT5gRSz3Gxh for ; Wed, 19 Nov 2025 10:14:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ko5vNYB7i1h1DqZnZaJDE28lODulO81+Ybx9HbfVyzw=; b=IsOcyhaBzGEX1zfmgedUMbT0fOxnkbkSgIiVi5B/oZvjVjWvpHUARZKKVzxCOdY+fsSq3W gmh15ShJEUkO1oZhwKK+yX9Sj6xjzI9o7fraiF97n4hLP59r+M2j5FyzP3OzOeYo2k9Il6 DSy0SA/PaUn+du2kMX+JCAnVaeeCgJSAIpNgi6cykccNhawguSW/WKAblcqahHR3JM90hl P4Ug98om9p96pbr+Z7+t7NZecmc+Ms/BUNjyPleU5U/MAJaUub9Ewd+Hi+5LGIAiD4ax7x Z7/6+3yyxanLqVXf+8isnwR+NWUx3vUBlznuKgMXW3W7H6Rlu7KNgCn06tzjqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ko5vNYB7i1h1DqZnZaJDE28lODulO81+Ybx9HbfVyzw=; b=wOuuinrbc5dGwTpSjA82Jj3OR3x+oS+lc6LpjOCuI/uUDaM0jZ5xTIyVyNsgZbP8F4KhBn LIaMftezyYaSedTfcxFuItJPkoivek8IR9ZDg6Xje+J/kWtalDjb9/PNw7kmDErFV8TATo Jnol8IelsuZwX8r5ktGj1XYupq43ZhPEjFhKhK9dCSCZYzg7LIoFni9SW42zU9p23kMjx1 8DAq4ceMSrem+Ewr+/DCqvUBygSmseN/hubXuhoXZYdrBczl//j1uqhZ4Vtnxl9Axw5YSt U4CVVr3G65hiDjSp3PYIpVZK3n6k8DgfNYxmlvsDuetw2/NVtzcEc+i+OgZMFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547265; a=rsa-sha256; cv=none; b=XCxTz3k1xP07ZaKQfIEwFos63J8HXWGZB0Ck2FpgyKFhjg8PFFVsIThT37s/+qL9hMTBEy 3dkfAIUFKGYkKy8YiYmZ6Pk5j8VL5KqHOeTNs07IBTiOoYht41SlJPy4GMALbkEDvB4Exx Tw7fTPNLVbQxfz2JjpKwcFPR0uNjMjfF6F+dOMR9ABlG7D7WfAtGqk+BQIWTsbTXAxPWBQ xZRyc3yUfe7WhyGEzbBUKaDxCDNbOtJDU+1J06J+lJCN43C8NJn1SnamOh/u6kfAFqMAf6 sACuVZ31kO5j/ZiM5QAFpChLWljUbJYz+VjkLq95abIEu6LU6t2bX42xo739RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHQT58zDzcjR for ; Wed, 19 Nov 2025 10:14:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b047 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:14:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: b92d5b797f05 - stable/14 - bhnd.9: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b92d5b797f05e695fa33e86891ae1dab00cc05e1 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:14:25 +0000 Message-Id: <691d9881.3b047.dead555@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b92d5b797f05e695fa33e86891ae1dab00cc05e1 commit b92d5b797f05e695fa33e86891ae1dab00cc05e1 Author: Gordon Bergling AuthorDate: 2025-10-26 15:36:51 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:14:16 +0000 bhnd.9: Fix a typo in the manual page - s/devce/device/ (cherry picked from commit 3ceaf4d80401fab49895a5ac3bb1fe602f588da8) --- share/man/man9/bhnd.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/bhnd.9 b/share/man/man9/bhnd.9 index 722ae6b6a393..ed3007ea748d 100644 --- a/share/man/man9/bhnd.9 +++ b/share/man/man9/bhnd.9 @@ -2350,7 +2350,7 @@ function retains and returns a reference to the provider registered for .Fa service with the parent .Xr bhnd 4 -bus of devce +bus of device .Fa dev , if available. On success, the caller is responsible for releasing this provider reference From nobody Wed Nov 19 10:15:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHRJ5gP5z6HTFR for ; Wed, 19 Nov 2025 10:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHRJ4Rskz3H7c for ; Wed, 19 Nov 2025 10:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+R8LgkOoWME8HDNNdaa3cKDWlwC/LTbGoGhBf+0GZ4Q=; b=jJo4rLpcK1OSy3H4RLHAHdpx6ckOgHp26HJ8mdOfs7ghG2wozIQ6IcNdHxLANmkf1Z1qa+ t0T6aIwFchF/+wV4b6h1CvN8BE4k4kYLQUc45DnnL2D9mZqxf070U1xD7bUqHFNVtIuxJ1 X7AbCH+9Fa5JXS3avwS/PlIIC/QTG4e4VFwpQO4uN9qMncWViHjKpakE0FcuPIlHOvcBJc GHPAiW6dAkD8/FUOKTbTFXdHgS7HotIoVqv5a+SHPKktVfAmvB7BUSYBjiqzysN97cySAo loXq8Xq7+7/5ykuOQxGSWaN2/NJ+Oky6EVu6FYt76w0zT/vtJxX7zMlv0Ysnpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+R8LgkOoWME8HDNNdaa3cKDWlwC/LTbGoGhBf+0GZ4Q=; b=xt9eBCe4dQAZM+FUUSZIOhQ8t0bxcPOc/q8HkgJvUjyYYBQNyZx0Okpr6kqNUcN+f1LSGL e24pTo5iTy83sjP35hdz1C3gdYWfBeXeNmAyXLCQdpYtAkg1L5kijvT/AC//NeGXeav5w5 qnTgpEZqFg84p0SKE6z4JgVIHs13/vMptJMW7NrFml0gfbJvip8D1tHuEMMh2+atuZ+fk4 J4MUrAhkOgeiUkO6U9m4DRebDRRfoZHH/T75EvEMPQqHXcHjoEoQiaqzAGrMKuOa8jifD7 tg8jQETCz/YOdUB9oh7zB2+udDYzojmeRWSkC+fNo/T6j5r/jCafMq83zLMvpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547308; a=rsa-sha256; cv=none; b=YMZGgqHwgGpnahYrXrIJQJIKsoV3beAiHTWr7aq6O1UGdDYDUr3G9tK7JRO73mvBNnqq9t cOsyeMJ+NBmSnEpHhXeENuRI6rFIuXlIvKCY7G4r6iLJ/B0r09o+KLbeE4z2bRb1B69S/Q 8T3/Gt1enqw+7Mpd7vUBGQ0JKE/ELrfTTqZ/DXu0aefIDfDK7PtP1fxkGhTj+F/+vy2qbb 8KmJILjCYff4XXifM9QrvGYd1FldhT3oX2IskNPFsJCQ+Zs+HNlS5xumXextfob4dDJGBm GKCnk/pTl2/Qx0QVJascXPaWC9isppooFlPejR2DoXPeMKEpvVYbzb2Ta5agrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHRJ3wMHzcN8 for ; Wed, 19 Nov 2025 10:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c0d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:15:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 4539d9f3b473 - stable/14 - bus_dma.9: Fix two typos in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4539d9f3b4731d489f5018ef9dec627683aea33d Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:15:08 +0000 Message-Id: <691d98ac.3c0d8.f969b5d@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4539d9f3b4731d489f5018ef9dec627683aea33d commit 4539d9f3b4731d489f5018ef9dec627683aea33d Author: Gordon Bergling AuthorDate: 2025-10-26 15:38:29 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:14:58 +0000 bus_dma.9: Fix two typos in the manual page - s/decribes/describes/ - s/Muliple/Multiple/ (cherry picked from commit 5215760811a5ce75d77f9017e392445014e6b1bb) --- share/man/man9/bus_dma.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/bus_dma.9 b/share/man/man9/bus_dma.9 index 832ddb4daa22..922365d1f772 100644 --- a/share/man/man9/bus_dma.9 +++ b/share/man/man9/bus_dma.9 @@ -197,7 +197,7 @@ in addition to restrictions that differ between unrelated groups of transactions, the driver can first create a .Dq parent -tag that decribes the common restrictions. +tag that describes the common restrictions. The per-group tags can then inherit these restrictions from this .Dq parent tag rather than having to list them explicitly when creating the per-group tags. @@ -741,7 +741,7 @@ Fills in the selected fields of the template with a variable number of key-value parameters. The macros listed below take an argument of the specified type and encapsulate it into a key-value structure that is directly usable as a parameter argument. -Muliple parameters may be provided at once. +Multiple parameters may be provided at once. .Bd -literal BD_PARENT() void * BD_ALIGNMENT() uintmax_t From nobody Wed Nov 19 10:15:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHRv0vhLz6HT4X for ; Wed, 19 Nov 2025 10:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHRv06L2z3HDv for ; Wed, 19 Nov 2025 10:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K4bl2w0QpFtmrP+wEfHgNWRUDpPvQv864j/ZBcQAAVE=; b=EvJr6C6N7eYToxI8lYZ+zP1PO7tjIonYNN0n+dGlPR8D1B7AdsMvz+yAz1MwhoEpcxZNEf 8MDR/XIxWrNri1thXU8FWPMCmVGigOIsI+T7C6+PmfntkSdYoBDLoJdCY6vgBhPjovb21Z XOfpUmUYQgHw7+HcDauC7hrAGSoKRdjC4a/iWYBkl527yC5saj0s0OUh1Opf8TF4Wzt/go mwcPjb/D8j4WOyfa8JYbPVawpw11eTLWjL+z8mqoCKxw5bOPrwAFOMPeHEYr6y+qW7woLz C9VfYX+nvQtipGOWiz8819xJ0JnrBtmHp21WC1eOk4Ee9T+T0ygip4u38a7DXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K4bl2w0QpFtmrP+wEfHgNWRUDpPvQv864j/ZBcQAAVE=; b=VoRxdB+sw9R2fADb1MeRQxibSluidcE4/kNJHS66kytfrot6L0GplmhecCE9jbKZGjA1gB ++JYTl/HXNXDl9fvH/y1dyPryOBKrOFZ5ZXVe1ieh4bv0UH3Fx+NB9RF1Bj7YdJrcRPaMb 0Q+k+2WZXBgcW5p7mdOg7/gqPTNoCUds46WjdadKNQ1I9Y44SP3/a+dVOEMCf9pbNSpuQZ pWZdTjOKjvWmK/izk4iRLALFmXo6gD73OPeeoStQtF7uPcqHGUt7gII8O6yhzCr/sS/O3C rMX0e1GO2GYbCrImr+A9HWJOIOQCgj5KUCsefobeJrNMuCC/miUIOiywgwxSIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547339; a=rsa-sha256; cv=none; b=Ko6hppCMJ3w9VLTPJaJabtK8lo5rq6s27nIE1Um2GXRmXKK4uiX4rKUJolH/z6LFJf5OGn 9CoSrT8M0AAHK9uLljo9xJ6i7ma1Hd2Hea0QFZ/Pi5zrXkvy4cWhZSumzHzgy9M0G56nxy QESwPIhUR0U1/TLoOwhcLkxaqxuIPl7t8g2VuqSOrVsQ+hODQfDBBaTPNePZoHUpG6Smf7 0l1jK6rhm72xv5l53dWRL5hcn9RLuybq9WPYxyQWmkyDZqEcP+fRTxucL0Wf6cueyOrerw GdN6lnh2tFUDFRkVNSeukeT3LxppOetRFIB8bFH4yRAm757A1CkdM4GXNZILZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHRt6qPMzcfq for ; Wed, 19 Nov 2025 10:15:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d377 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:15:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 29f2f316a179 - stable/14 - crypto_request.9: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 29f2f316a179cf6c4c7bd9b45b6637bea05c67b1 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:15:38 +0000 Message-Id: <691d98ca.3d377.55d33a80@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=29f2f316a179cf6c4c7bd9b45b6637bea05c67b1 commit 29f2f316a179cf6c4c7bd9b45b6637bea05c67b1 Author: Gordon Bergling AuthorDate: 2025-10-26 15:40:47 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:15:28 +0000 crypto_request.9: Fix a typo in the manual page - s/througput/throughput/ (cherry picked from commit a1e76a3af8d64b400100d8ab595eeb32cd79d358) --- share/man/man9/crypto_request.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/crypto_request.9 b/share/man/man9/crypto_request.9 index 45c3b62eea26..0cbcd1c01c50 100644 --- a/share/man/man9/crypto_request.9 +++ b/share/man/man9/crypto_request.9 @@ -383,7 +383,7 @@ depending on whether the driver is implemented by software or hardware. dispatches the request asynchronously. If the driver is inherently synchronous, the request is queued to a taskqueue backed by a pool of worker threads. -This can increase througput by allowing requests from a single producer to be +This can increase throughput by allowing requests from a single producer to be processed in parallel. By default the pool is sized to provide one thread for each CPU. Worker threads dequeue requests and pass them to the driver asynchronously. From nobody Wed Nov 19 10:16:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHST0GPTz6HTC8 for ; Wed, 19 Nov 2025 10:16:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHSS6XhJz3HjB for ; Wed, 19 Nov 2025 10:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5PXIfjHbDua6B9Bl/j3esiNb5G0DK1ooE152YmJ1Sew=; b=kh5z2qNZNqvpbBds6QptNMfL7P9qpQSxs+ybhh1hKSACgUrjDlk8IzhGDtgNubucbHv/+J ym0vrNraQpBlUcdlVPmfzRWwxm8RkArivJOKu/X1O3OlD155Q6UDHyGsbK5T3MIcWXJzxb zPy1ENU4gT9VGNRqr2es/4SZRp5k6+Yw6DvD3kE1vPVVKrDRgw/oFxgSIVNkQuZaLeZh1m mR6tPJgAno1l6HGnLq9iVTcukstbvhS0SzMt6KEVIy3kWUXhzEDTJ+soj55RHeIBYmXY/i 4a7Z9gfVk32OGx2ZlDSVF03LXaM9KsYF35EvhccUgULDJyihrpsCGESNcrCEBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5PXIfjHbDua6B9Bl/j3esiNb5G0DK1ooE152YmJ1Sew=; b=E+KSq3vpo+4Y5pyhw/t7kLvz6P6hl4IxdEzN8sSBEGjkr/uX5ZA9EYPSQAS+nyEloD6yJt TvnBzKVKK/i7+ajcuzAJvw42NDXMoADePE4GhHigxt1zYvqu2D6/v7/c0QcLXE/9Bh7rRO zj6vjQ6DOkDD4C6AOSIGHYQ3JX8TdZAglwmGZU4d8iu4G4FaDls9bfirrRFvVrhq0/CyP2 X45aFpAlxPbY7URleoGMcQipUY0r6qM8UOuNeveRR4dtVDDjT3XHcOkbJeuTmWDYg0iCDx HbS4gKtuuvbmCsw5LorhsWf31Ps6GRIeXtv302SjP9Z8/8tQw4BQdajhDQe4iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547369; a=rsa-sha256; cv=none; b=wSryJ+PPsfeZYYt19WHnkdRrzAhllZfjwjRq8q0crN6xyTp4pAaWK9nWnz0wzvfOh2XeVj i/BC7yYyqsfvbdF8NWQGrxP3tUXpDJ/g0Xdsxc7sjKjL5Cn0OrLnlP1vSYcvoiTSUbGtwM Lsj1BkU2dq0QSPKTqq0hglYtgXwgqx0k5ZaHHKkZaJbS01+O8sAnw3w1GCSd4ayaivnM99 cdO1kmI/J8wjlEZCWB30/OSCO7Pp00rA2eEoApEQVtvJmW4agRzqcOeK6iHujQFvK2OhFY jxj6Z77v4Fo+pas1YOkM8T3Vf57wXpJpVxghG0c6pV4LDQR431mlaX6UOVclrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHSS674BzcjT for ; Wed, 19 Nov 2025 10:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3af7f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:16:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: fef3a18a0b55 - stable/14 - domain.9: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fef3a18a0b55d62d0a6e0411e0bcef7724bc5847 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:16:08 +0000 Message-Id: <691d98e8.3af7f.6a5c02ab@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fef3a18a0b55d62d0a6e0411e0bcef7724bc5847 commit fef3a18a0b55d62d0a6e0411e0bcef7724bc5847 Author: Gordon Bergling AuthorDate: 2025-10-26 15:41:37 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:15:57 +0000 domain.9: Fix a typo in the manual page - s/exprimental/experimental/ (cherry picked from commit e17c87d4a27509ed8324e69056b06dec878db064) --- share/man/man9/domain.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9 index dab8cff89e12..d7e743eaf247 100644 --- a/share/man/man9/domain.9 +++ b/share/man/man9/domain.9 @@ -173,7 +173,7 @@ Once a domain is added it cannot be completely unloaded. This is because there is no reference counting system in place to determine if there are any active references from sockets within that domain. -However, the exprimental +However, the experimental .Fn domain_remove exists, and unloadable domains may be supported in the future. .Pp From nobody Wed Nov 19 10:17:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHV25tDtz6HT5s for ; Wed, 19 Nov 2025 10:17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHV22Zg9z3J9b for ; Wed, 19 Nov 2025 10:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FFGl71EVgTD5zsYlkTdGRv1/9Q3gNJurIaKXwg2/yJU=; b=OKHy29E7B9gc2M69kYqbK43iqQQeHAq6qGukgtAC/hVlnV+2pD2Xj2DBIo1ByeUKZvRi0I 0ljt5Mrf3XWzL/sxwVeNWB03mL+MviDPZvRqsS4WsRC6tUnER32mgl9JzQgOqsGMots0/U nTfyMBE9ONrvspmyro0PT08fDdu1beNyJVfCMMVJjCxKvAO8PHy/ctdcKPQOmE5D3tjXGn krbHeJJRCrzE66u3X3Cv/0ftBLssU8+tg6pBNd8tTShaVeFrkWdd+iWt/320fvYHLTJsWZ N/FuFelEWTNQSSC1RG/IXEvG086fkc12yiBy3/UKlvF/brX/FrYOrtzfeQ9u5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FFGl71EVgTD5zsYlkTdGRv1/9Q3gNJurIaKXwg2/yJU=; b=mUZdAisFBLCp9pUGpq/KA8JZG9xiO5KVrsYzMvbWZU9XW7LF3412vNYJMwTlFCNknsxZtN 3ROOzbJlAeQgrT+WejHY4dT61/Vm82xKXU6NlTCzpA5ae3CELhUzzMjSbyYOYNyhBqRwr1 iqh5ebXsTcLgwwwZ1KsLtYGmwRFYEGiVz8AwM1CI35g7NRZK4tZWbvvxoqyM+K3waBVpoi bMCCEeqmQKiYd34HB3+la6BauquLUfCB4h4IAiYd4FIrget3+nF86AWvh+swlAmnTdKkKs snEDZsJKuorD4ap3/Skk3qOOz5yg/yUbmZGeOqH9wvynaqHsnwg6ibBH2UleUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547450; a=rsa-sha256; cv=none; b=lif7ncJ7NcqH5HE93ssRGQrgPlUFpKlamMleIOG9ce6cKPc6vCUxM4/luz50CLd6QHXyJz vYLknN1Uh+EUCKx/M5/u+lJEkpHeqTqrIyYNDtUGhPUhPVXO2+9hH98eVx+GHsls8G/YqU zusi255TI93OLbbSrHhPZrSl39CdeNfTVtWhMa5Pww+YOS1nz98Z+rGoSEB2Fe3iKFgsE3 qKhLhQssII2uW6lxwOYHDPxVjYXfgzznMAU51UG7JozLSRBrgHUNjrseu9Q+z5HhbyN85m CZ2LjHKo2uZyGR763W25z/UcMAy0Hn52Xv0lIwpRmKQeV1mwB1ceLy/dG36zIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHV222zSzc3n for ; Wed, 19 Nov 2025 10:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ad5b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:17:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 3319c8d1e4de - stable/14 - gone_in.9: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3319c8d1e4decbec638e3437d7b347b5c93026bf Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:17:30 +0000 Message-Id: <691d993a.3ad5b.670b0627@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3319c8d1e4decbec638e3437d7b347b5c93026bf commit 3319c8d1e4decbec638e3437d7b347b5c93026bf Author: Gordon Bergling AuthorDate: 2025-10-26 15:44:30 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:17:18 +0000 gone_in.9: Fix a typo in the manual page - s/Initializaiton/Initialization/ (cherry picked from commit 576e735efb85cae5213621981ed33ced8878a352) --- share/man/man9/gone_in.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/gone_in.9 b/share/man/man9/gone_in.9 index 7521adfda204..ebdc1ab19bfa 100644 --- a/share/man/man9/gone_in.9 +++ b/share/man/man9/gone_in.9 @@ -1,6 +1,6 @@ .\" Copyright (c) 2021 The FreeBSD Foundation .\" -.\" This document was written by Ed Maste under sponsorhip from +.\" This document was written by Ed Maste under sponsorship from .\" The FreeBSD Foundation. .\" .\" Redistribution and use in source and binary forms, with or without @@ -72,7 +72,7 @@ Obsolete code will be removed soon: void sample_init(void) { - /* Initializaiton code omitted. */ + /* Initialization code omitted. */ gone_in(14, "Giant-locked filesystem"); } From nobody Wed Nov 19 10:18:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHW871wDz6HTD2 for ; Wed, 19 Nov 2025 10:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHW86PVmz3JY2 for ; Wed, 19 Nov 2025 10:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oP7w2vGMFHAe1kFfI+8TkygVEPb4gdaL8g2lyKSi9AA=; b=aV3emBgQiObafLJ6TjPHo4bxttDeiCZFEnZOCRq2GDIFwvo4PaF/kdAUT/+z4a5NMrmmnM mCRt+/9XVxPJcPbF4tSYnbLeMQRh7lw7ZtG/DZtJ5fYWl0wrBoT6G5EXgIT37P1kVikpaQ Zk3LTRkTkTSf1ZWnBE21KMosNT8H/WBF9UUts8IsF8WfnAha+1LbmHgIRubdwOgVNPyCcP OPiA4Eln1XuJzVoUB7oFF5yNBr9VXqP++957HnTdr11uCkIQbev6H4N7hBoMYa3jjQjkkd THZAhLRmlcFh8EyTVwwAE2F0FlJTWOlDLJwHNkf4s6uWS+syPlu2OYLIZuOqkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oP7w2vGMFHAe1kFfI+8TkygVEPb4gdaL8g2lyKSi9AA=; b=xKgmmQT3F4MJaP6f9gHk2ZNQkGTnq+KzpEymE1uZ4rM4ApdriYK6XGwEuEH9FUsgGCSnRf YtO2W1aqSvtSrgKnswXdNyy99d7QX+VLQD+ysbyfCamjPWMSB7/ciQLMLXP09B3b5Lin80 gQTsrMIS4aC5ziFaBMe0EMi7Yg6XxgPA/f7BR63fl9TSvbn5osL+Nw9/TxTMGhTxeVDnKW 3Y1/H4ki9lxvI9yBJaChR4kX+oB7DhIRng6ByIAp5brDihUxz0bfS6WoaKiXF4DMYeN1I5 rDMw1VrRdLfMyrQabFq5hdqp3e6xN3MmyYA5JR7+njipTB2DGfjDLcHPjEuZKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547508; a=rsa-sha256; cv=none; b=Oh1xkeIPEPKGtzcIOJxH44v5Rf84QxwHvgStg7ljtLcOZ8zuRmV/4ztGYVjwLTt0qQFQGq CdwfyeGNKN3FM/hnhLRyffdBXy41Tevo5j5ndWivUn+J+sc0Mx/ROl6xQRAO64X28c99cD +COOU7B7MTlURsfwU9kQjcC3CXZhxd4tXLk1UU2dWGboC+My+IsMQ4YXzmjIagNaW6Rba7 1l8UE8n/X9ZDx3u07DTpBcPfx7+NYtc46IORenlIsDIlDwykS/XV+39R3A7nwJzOELk79r QG6agib9Cj9Y2DCEI9qV7EZaLxAWdP8x6DC7k09zeUjUC7k5NvxLcYdvS9BVbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHW85r7wzcfr for ; Wed, 19 Nov 2025 10:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bf49 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:18:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a05a924995ae - stable/14 - nvmem.9: Fix multiple typos in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a05a924995ae4bc98db31c2dfd6d96148cd96382 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:18:28 +0000 Message-Id: <691d9974.3bf49.5c6bd09b@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a05a924995ae4bc98db31c2dfd6d96148cd96382 commit a05a924995ae4bc98db31c2dfd6d96148cd96382 Author: Gordon Bergling AuthorDate: 2025-10-26 15:46:26 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:18:14 +0000 nvmem.9: Fix multiple typos in the manual page - s/sucess/success/ (cherry picked from commit 005603cd3dee7610587f1193f9529eb2a42781d7) --- share/man/man9/nvmem.9 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man9/nvmem.9 b/share/man/man9/nvmem.9 index 812cd09a5e35..fa88cbb91854 100644 --- a/share/man/man9/nvmem.9 +++ b/share/man/man9/nvmem.9 @@ -59,19 +59,19 @@ Get the size of the cell base on the reg property on the node. Return the size or ENOENT if the cell name wasn't found .It Fn nvmem_read_cell_by_name "phandle_t node" "const char *name" "void *cell" "size_t buflen" Get the cell content based on the name. -Return 0 on sucess or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, +Return 0 on success or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, EINVAL if the size isn't correct. .It Fn nvmem_read_cell_by_idx "phandle_t node" "int idx" "void *cell" "size_t buflen" Get the cell content based on the id. -Return 0 on sucess or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, +Return 0 on success or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, EINVAL if the size isn't correct. .It Fn nvmem_write_cell_by_name "phandle_t node" "const char *name" "void *cell" "size_t buflen" Write the cell content based on the name. -Return 0 on sucess or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, +Return 0 on success or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, EINVAL if the size isn't correct. .It Fn nvmem_write_cell_by_idx "phandle_t node" "int idx" "void *cell" "size_t buflen" Write the cell content based on the id. -Return 0 on sucess or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, +Return 0 on success or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, EINVAL if the size isn't correct. .El .Sh DEVICE METHODS From nobody Wed Nov 19 10:18:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHWk6rtfz6HTH6 for ; Wed, 19 Nov 2025 10:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHWk6Dhtz3K1T for ; Wed, 19 Nov 2025 10:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n1xwy/bqMwEH37sjK7wvMdYi7L7rWv9WBP3abPl6tJ0=; b=IBr5ILEqNtJTMxZwkwWEJDphmkUz8fnPnt2fSg2H6AAUQ9G7FN6X4MokilZ/LWDG43dSyO JYMRY6MlCEMRNqZXXjrFXpfYeor3lo70o0IbcaTxaj7OILBksRGxb46ao7X5LUZsnf/Ir9 dicgymjEw0abP49mDuBN5JJHni8xvluew73CqSYdM7KKkXNmMEBhCXd/2nxhWDOV2mZXxd 0CoKl4YdoXS4yiueHIJ4yUhZLOG7+bJpHdF+HjdKZn7yy7TItedNniWsoR3wgFV7qDl52l Rh15zRQAhds6QLiY5zC9WNK38DuA8oZ7TQh9yYM/4qnjcjTUz/Xo7xxIgKIBzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n1xwy/bqMwEH37sjK7wvMdYi7L7rWv9WBP3abPl6tJ0=; b=wm2lhWQ+pA3xH/iJkBhNR5yR45kvoueypHtvSKWj7kkVH58xnHPGawDgFwA40zAzJMrl9W mi8PgJqZUZaFkitbO47bdOe9W+zPM8Flu4HqRznKG5PkARKJ8rvY6sTC5uW5JMHRoPz9+T m8Q5UnjElcpQDlfTESSas50aPW9xk9F+IW6F4sLXVgLz9TjsWTgkRnaZFnKq4UdzkHAIf2 Nrj3UYFeOoJb1ITfIQ/1HU8L0BxVFRcYPvvrRMU/y8f6s+RH+nCrmrVmlOXLTpmnKn7cOd KewB6IELMespfeBZ5P/b2nmSrX9k+/O6XfFwvX4AfBfh0d0pbd97Mdc1FqMyGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547538; a=rsa-sha256; cv=none; b=b+obOLwhMPqHNtbxkAhfZWCy3Pzye6CNFfrStO1eH1AP0SSuTpnjZVAYZrs71BJqFFbGjY R8hu73l9fNL6g+subdzhNw7qiUCyZB6uGs7q/+9sluf5S2SsiK6T4o5smALC6jdF86t10e N1Q+9YTl1gM3XHc5Y8rKamR1TEEZes/mmreVQovypRc029kyMyzGEHCl+dqWPI2LQb+FWd RIKXetEGdwxOmgWnKw7EHznE7gRr8/ZzuFngk4gA2p1TINTYqLp9ivkhLYWnNnrDu8D9rX AZKepMoYnsj+NRWr4x2jGy/0z7aP4JZilCHoRTRehiYMEiDL8/nKhYu7mqvdYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHWk5W7HzcNC for ; Wed, 19 Nov 2025 10:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b1fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:18:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: b20d8a0ba402 - stable/14 - ofw_bus_is_compatible.9: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b20d8a0ba40215569405f6f79131bb001623da98 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:18:58 +0000 Message-Id: <691d9992.3b1fb.5544ad18@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b20d8a0ba40215569405f6f79131bb001623da98 commit b20d8a0ba40215569405f6f79131bb001623da98 Author: Gordon Bergling AuthorDate: 2025-10-26 15:47:44 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:18:47 +0000 ofw_bus_is_compatible.9: Fix a typo in the manual page - s/compatibile/compatible/ (cherry picked from commit b1f96b1c4c95df5c04e067c638e52c9652f86721) --- share/man/man9/ofw_bus_is_compatible.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/ofw_bus_is_compatible.9 b/share/man/man9/ofw_bus_is_compatible.9 index 1b44807e84e8..fcfe8755cf86 100644 --- a/share/man/man9/ofw_bus_is_compatible.9 +++ b/share/man/man9/ofw_bus_is_compatible.9 @@ -61,7 +61,7 @@ older revisions of the driver. If hardware revision B is backward compatible with revision A device tree node can signal this compatibility by providing both "vndr,hrdwrA" and "vndr,hrdwrB" strings in -the "compatibile" property value. +the "compatible" property value. This way older driver can use features available only in revision A, and the new version of the driver can take advantage of revision B feature set. From nobody Wed Nov 19 10:19:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHXH65kZz6HTVc for ; Wed, 19 Nov 2025 10:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHXH5W5Zz3KDG for ; Wed, 19 Nov 2025 10:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Jp/x2Vw/rWpz6nFVeQSkUjEcTCyQeyRnUQjT/EOIpM=; b=sz1NuOiET51+lLy5/ABhDG6gkPhoDPGJ1DIzgR3NG82LEPh+UDieBKcSMINZoMq0TQs8tJ nZ+gXfydqZ1TNfKiRFfQG99aciX553sP+tW8Fc+gIcUDlV+WVrKbMuqePpxKEt43LGnm17 E1ijILnd07zwdwbnYsXlGRxFz4N4qh/kW0CQ5iJPY1byJoYSE+JEVOSZeFeAQbNc6X2f8e 7Np7zynCelG8UMHSpS1jMJy0igL3O3xG5Lsb754aekguYSJ9kr3dKSBrQ4k6l6SDpbCAqt +h2FdFqAVwZdaKqPJkMY60x6fnFDtMcfIeRpZ8oHrqICxIjjaH08RH5lgEq3kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Jp/x2Vw/rWpz6nFVeQSkUjEcTCyQeyRnUQjT/EOIpM=; b=Sd8y2CVZVdfsW5Dk+H8veIkCiBklk7bAKzK8ib21vSUIs/dgvA4c363PdoX+uqq9INa/EP eFgENPrwMs6hxM7/CzuqCBRyXJK8/lqzHj2hdmedIhSihJCWGhspXFTaMGzm4GiNLaargT zRtZQ5BPZC6u05BUDdnAmZsiqEftYaZ23Ie4s6EwZZgydh70X0Ak73054+DeQVXkSsLxZ1 MgrNHbTP/jH/EEI3slnmwm152ha2zI26CrgzgR+vEDI8kTokhrBQk9sk/x8pi+2PQXoN3V IjAFs6orZCdzBK0p4g+NJ4eHnUXrl/DJAT4nvEiLl7yR0d2NF2lnBJO3rfguRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547567; a=rsa-sha256; cv=none; b=jGEsakl2OwpEN20GeqmMw/gJtujdkBu6D5u3Riad1fjM6Zd8ALDxsri+f6u1D3Qr2mpOVd u8WWm74N3inyeT89NDd8Oe/rCB6gCCaeKG9VNfyalGYaGOloQ/eqo+LeL4awwdUTul2JRl yY1gHNqqkNbMiEuP6+u62G27/CXAlfZynAofyH45BqXf+Znp6VFiYnEo5oanAVC/flY6MX kSo82lEAcKcN7x3Xk3a+FrfyFeRKf/TiEsWz/aOR8VT+050hL5cB0Nx3P3lAse9FpYlYWT 0Zu0I+BPL0kDRK1KD0gH/3DdFcLyLTuv/U4CVcOIkAb06cZV5ZIriUFzkT2V9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHXH53Bdzc3r for ; Wed, 19 Nov 2025 10:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c33a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:19:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: c00ad4a56c78 - stable/14 - pci.9: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c00ad4a56c7861aae85db455854c3e786f496ff8 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:19:27 +0000 Message-Id: <691d99af.3c33a.794b2abc@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c00ad4a56c7861aae85db455854c3e786f496ff8 commit c00ad4a56c7861aae85db455854c3e786f496ff8 Author: Gordon Bergling AuthorDate: 2025-10-26 15:48:36 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:19:16 +0000 pci.9: Fix a typo in the manual page - s/maxmimum/maximum/ (cherry picked from commit a859a5c6978de121efc7771351d32550ee430b7c) --- share/man/man9/pci.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index 8f772e76ba99..b01b51683b4f 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -523,7 +523,7 @@ device is not a PCI-express device, returns zero. When completion timeouts are disabled for .Fa dev , -this function returns the maxmimum timeout that would be used if timeouts +this function returns the maximum timeout that would be used if timeouts were enabled. .Pp The From nobody Wed Nov 19 10:49:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJCQ1pRBz6HVv8 for ; Wed, 19 Nov 2025 10:49: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJCQ18zBz3M9R for ; Wed, 19 Nov 2025 10:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jVWZZDuN1iemkXckkjIgkQ3+YMuAgmNyPRVB2ZMFQqY=; b=HODy729NJcJeGdecv5+d8drtduKH0xu5R9mS+DsxGMJ4hjRFhmd9OdMYDm+NUH2Fiq3TL1 tMvwxFIEZujPaCAmXSzD6brr9q0zemeL3HfOCRbtd0Heri0ekhEU4km2+dKw5NruNa5f30 nHN9YWegDbkdck5kDdoyiDcniEei9MuajQrzN2Mc4Xpqa742DZkJSVAiCMw10vqG7s3+XN i8zZzCFFrXJwy1ndI+sXSVXMuNB7HJnqRP+H9PBJ4dswg6K2qKbvPQ+rRqrBrwl6yq5U6R QN1pAiZx8vVBeUgbLDJrSH1vdl8PvR5BOtCwi4df6ZZGKwmDeKoEJSZMSKdJ2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jVWZZDuN1iemkXckkjIgkQ3+YMuAgmNyPRVB2ZMFQqY=; b=DDGLOq/yIl8ew9Wx7OXNYzYJNp++dtGusUdtiqsn6l0ptFdePecGLSJ4MpVcZQ5huXErZu drWvXTce7lKVkdzIBbVBmotlwq5OHA+2NN9WVmlB121epO25BsK4yKstpcjgJMp+s6OCLM 1SIGfyo0JscyOK6KmWFxuYWtgDFNDnc6Z7gXLpcvVX+hjEs0DBLILoO59KZhhTZ4Lp0GYg uUiMgRKq/4vl5C/KHRu4YtLZuzC/J7cga4Q1XLkxchpvJuyMaoTgibXYWukYi7k5xSLKaL CWruZ7hZSjnlvuKe2ZdpznwEaEKHWOoALTz29h52hUP40KwWx0oggen6tD/nJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763549394; a=rsa-sha256; cv=none; b=Og1M75GsNEC7t+tPdqfqOiThHgVelOOiPif0fXoM8VLabQVmmOYSoP8J/uOMz8X5TMSOzN KC5Dj32XtPa/9wRONY7LXErQmMIB+Rr4UgPgLtd/LTr72lWmnJZJR3CIsPJhB2P8ytnIyE 1EgGEtgAmQLX0Yy492jtd9KzM7p939kJvbBl0xEloCdTiqdtLEfcaIbERqCtac6QRngwuS OJ9NeaI3M4oc9FRS4+Li0cMx460CfOeFgOy5KOWncyJAOtw38cYk2VS8hfIFnQ6UafHQOu 0GRnlErD4o9D12oqKpMKGZWOgpYt/ssItDIwvJ6CAlLL8KgitDzRGpl387Jwtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJCQ0QK4zcx1 for ; Wed, 19 Nov 2025 10:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f47e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:49:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3c2643a7dbac - main - sh: Don't assume EINTR means SIGALRM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c2643a7dbac370b7232f4e5ac15fd77b9ff396d Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:49:54 +0000 Message-Id: <691da0d2.3f47e.332ff678@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3c2643a7dbac370b7232f4e5ac15fd77b9ff396d commit 3c2643a7dbac370b7232f4e5ac15fd77b9ff396d Author: Dag-Erling Smørgrav AuthorDate: 2025-11-19 10:43:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 10:43:59 +0000 sh: Don't assume EINTR means SIGALRM While waiting for input in the read builtin, if select() is interrupted but there is no pending signal, we act like we timed out, and return the same status as if we had been interrupted by SIGALRM, instead of looping until we actually do time out. * Replace the single select() call with a ppoll() loop. * Improve validation of the timeout value. We now accept things like "1h30m15s", which we used to silently truncate to "1h". The flip side is that we no longer accept things like "1hour" or "5sec". * Modify the existing `read -t 0` test case to verify that read returns immediately when there is input and fails immediately when there isn't. * Add a second test case which performs the same tests with a non-zero timeout value. PR: 290844 MFC after: 1 week Fixes: c4539460e3a4 ("sh: Improve error handling in read builtin:") Reviewed by: jilles, bdrewery Differential Revision: https://reviews.freebsd.org/D53761 --- bin/sh/miscbltin.c | 83 +++++++++++++++++++++++++++++------------- bin/sh/sh.1 | 6 ++- bin/sh/tests/builtins/Makefile | 1 + bin/sh/tests/builtins/read11.0 | 19 +++++++++- bin/sh/tests/builtins/read12.0 | 32 ++++++++++++++++ 5 files changed, 112 insertions(+), 29 deletions(-) diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c index 9d0280bb548a..bbf0aa5b8bde 100644 --- a/bin/sh/miscbltin.c +++ b/bin/sh/miscbltin.c @@ -40,11 +40,14 @@ #include #include #include -#include + #include +#include +#include #include #include #include +#include #include "shell.h" #include "options.h" @@ -162,17 +165,18 @@ readcmd(int argc __unused, char **argv __unused) int is_ifs; int saveall = 0; ptrdiff_t lastnonifs, lastnonifsws; - struct timeval tv; - char *tvptr; - fd_set ifds; + sigset_t set, oset; + intmax_t number, timeout; + struct timespec tnow, tend, tresid; + struct pollfd pfd; + char *endptr; ssize_t nread; int sig; struct fdctx fdctx; rflag = 0; prompt = NULL; - tv.tv_sec = -1; - tv.tv_usec = 0; + timeout = -1; while ((i = nextopt("erp:t:")) != '\0') { switch(i) { case 'p': @@ -184,22 +188,29 @@ readcmd(int argc __unused, char **argv __unused) rflag = 1; break; case 't': - tv.tv_sec = strtol(shoptarg, &tvptr, 0); - if (tvptr == shoptarg) - error("timeout value"); - switch(*tvptr) { - case 0: - case 's': - break; - case 'h': - tv.tv_sec *= 60; - /* FALLTHROUGH */ - case 'm': - tv.tv_sec *= 60; - break; - default: - error("timeout unit"); - } + timeout = 0; + do { + number = strtol(shoptarg, &endptr, 0); + if (number < 0 || endptr == shoptarg) + error("timeout value"); + switch (*endptr) { + case 's': + endptr++; + break; + case 'h': + number *= 60; + /* FALLTHROUGH */ + case 'm': + number *= 60; + endptr++; + break; + } + if (*endptr != '\0' && + !(*endptr >= '0' && *endptr <= '9')) + error("timeout unit"); + timeout += number; + shoptarg = endptr; + } while (*shoptarg != '\0'); break; } } @@ -212,13 +223,33 @@ readcmd(int argc __unused, char **argv __unused) if ((ifs = bltinlookup("IFS", 1)) == NULL) ifs = " \t\n"; - if (tv.tv_sec >= 0) { + if (timeout >= 0) { /* * Wait for something to become available. */ - FD_ZERO(&ifds); - FD_SET(0, &ifds); - status = select(1, &ifds, NULL, NULL, &tv); + pfd.fd = STDIN_FILENO; + pfd.events = POLLIN; + status = sig = 0; + sigfillset(&set); + sigprocmask(SIG_SETMASK, &set, &oset); + if (pendingsig) { + /* caught a signal already */ + status = -1; + } else if (timeout == 0) { + status = poll(&pfd, 1, 0); + } else { + clock_gettime(CLOCK_UPTIME, &tnow); + tend = tnow; + tend.tv_sec += timeout; + do { + timespecsub(&tend, &tnow, &tresid); + status = ppoll(&pfd, 1, &tresid, &oset); + if (status >= 0 || pendingsig != 0) + break; + clock_gettime(CLOCK_UPTIME, &tnow); + } while (timespeccmp(&tnow, &tend, <)); + } + sigprocmask(SIG_SETMASK, &oset, NULL); /* * If there's nothing ready, return an error. */ diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 7ef22fa352bb..affb653cd3ae 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 1, 2025 +.Dd November 17, 2025 .Dt SH 1 .Os .Sh NAME @@ -2544,6 +2544,10 @@ to explicitly specify seconds, minutes or hours. If none is supplied, .Ql s is assumed. +Multiple value-unit groups may be stringed together, in which case +they are added up, e.g.\& +.Ql 1h30m15s +which adds up to 5,415 seconds. .Pp The .Fl e diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile index 407d2aeaa061..0246009cce81 100644 --- a/bin/sh/tests/builtins/Makefile +++ b/bin/sh/tests/builtins/Makefile @@ -143,6 +143,7 @@ ${PACKAGE}FILES+= read8.0 ${PACKAGE}FILES+= read9.0 ${PACKAGE}FILES+= read10.0 ${PACKAGE}FILES+= read11.0 +${PACKAGE}FILES+= read12.0 ${PACKAGE}FILES+= return1.0 ${PACKAGE}FILES+= return2.1 ${PACKAGE}FILES+= return3.1 diff --git a/bin/sh/tests/builtins/read11.0 b/bin/sh/tests/builtins/read11.0 index 5bae80318b15..07bd3e70644c 100644 --- a/bin/sh/tests/builtins/read11.0 +++ b/bin/sh/tests/builtins/read11.0 @@ -1,3 +1,5 @@ +# Verify that `read -t 0 v` succeeds immediately if input is available +# and fails immediately if not set -e @@ -6,12 +8,25 @@ trap 'rm -rf "$T"' 0 cd $T mkfifo fifo1 # Open fifo1 for writing -{ sleep 10; } >fifo1 & +{ echo new_value; sleep 10; } >fifo1 & # Wait for the child to open fifo1 for writing exec 3fifo1 & +# Wait for the child to open fifo1 for writing +exec 3; Wed, 19 Nov 2025 10:57: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJNc054gz3NHt for ; Wed, 19 Nov 2025 10:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k4yJbTUBDDChmxQyQ01veeFrPrOZcIwtW9nUK27dCJQ=; b=T1hCv2Y2L7xhL+zlJJABR/YDGmZ8QSwg5xQAvwZNEtnGUcAjRfN1M9WlrG6SD2Ett0unxC ePjdB2ZF1yp/iCNGR1/tBc8AT6liiaefB/XF2WQR97ADIfW8t3Bx4uB0msCTCSYTqh0vb0 tyVK1Tj1MrXBtYBziHb7KtItSfS9p+H9o4dA8DQbVbrjsjpfBilm2KRt+Wu7GOF2+GmZdk dhuLm9iOtcd54vSKCnGr8m8C6VoeyAStWZaQl7AvEA1/PZZz+JkuA+fMQButYEYhywD3// bYI3FIySXW1aKiZtzmegHCdIVkj28N/BXLFdXdi7G22FhlsTyCSudHnMMQrYMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k4yJbTUBDDChmxQyQ01veeFrPrOZcIwtW9nUK27dCJQ=; b=jzD0XLuv9vNZv1rwuwFKJ/1WW2IHzNzQ+EqLBLUfrQMtzoJuoWx9XXmmnrVIbQ5PU/8KeM xdmInWuFMzESnzQrm1k/5POJTNvY5olMAgFz/9+sQswIdi+JKsjy79cjvqbDhWILJLUUai QWPHepunBYyz3JAgZ9Nis3QRKHvSZLWqlp6bJDvZyzetNxhCCqb6A2W3FKW3HEPBXmTT2p lS3zK8QyZwEGHhpybdRTI00l1wMR6RxqxudvlwVftT1/LDG6GYU7iiotTE4vSgPr9NZA+o K4BnclgfKttupV5MBFajGbYx7aCBwR+GVNAi38xtTPG6xJcC3bIIxlmApem/oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763549872; a=rsa-sha256; cv=none; b=oHnm5qTxL/4RFZHZRXCpyB+4uhC0aj3gbPAQhcJHhwiXO0kHUi5rnvDEcZpUOJV7RByCLl PdqHcDMTCdBS/S9oQYp0XvsLkY4WXoFxsACG+vDKFpf3mJ9GGhNUe3x/fA9RHt7n76lSy2 CIt0vixeNiA5LebOdzkerRXQ+FCoc3F9y8i3nA455wfQW9kpcCQRrVFyaaKjmMED2de5uV cGIM500n+2BTcId6mEDjBy+OBBiP/xfor0RkZL7eR6HuPAiaHnm05tZ1eQLfHP0blceeuq Oo/RbsnTq8J5cOIDnJI9FTWqP7WKuS7Vnw6qq0OMUoygCc4CpToJZL/CXUfN7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJNb5zWpzd0v for ; Wed, 19 Nov 2025 10:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8c92 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:57: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: 758d7ce63a61 - stable/15 - date: Improve nanosecond support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 758d7ce63a617a5bb1d18b5259216a753587e057 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:57:51 +0000 Message-Id: <691da2af.8c92.63ebe696@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=758d7ce63a617a5bb1d18b5259216a753587e057 commit 758d7ce63a617a5bb1d18b5259216a753587e057 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-11 14:58:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 10:56:50 +0000 date: Improve nanosecond support Add support for a field width, which defaults to 9 if unspecified or zero. If the width is not exactly 9, we have to either cut off digits or append zeroes to make up the difference. If the width is a dash, we pick a width based on the clock's reported resolution. This brings us in line with GNU coreutils. PR: 287080 MFC after: 1 week Reviewed by: 0mp Differential Revision: https://reviews.freebsd.org/D53667 (cherry picked from commit 38839c872e7af6a1424009bf07d6b4450e9ca61d) --- bin/date/date.1 | 50 ++++++++++-- bin/date/date.c | 148 ++++++++++++++++++++++++----------- bin/date/tests/format_string_test.sh | 2 + 3 files changed, 147 insertions(+), 53 deletions(-) diff --git a/bin/date/date.1 b/bin/date/date.1 index f68892bd408d..374a687fcbdc 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 5, 2025 +.Dd November 10, 2025 .Dt DATE 1 .Os .Sh NAME @@ -186,7 +186,7 @@ Print the date and time represented by .Ar seconds , where .Ar seconds -is the number of seconds since the Epoch +is the number of seconds since the Unix Epoch (00:00:00 UTC, January 1, 1970; see .Xr time 3 ) , @@ -321,20 +321,43 @@ Refer to the examples below for further details. .Pp An operand with a leading plus .Pq Sq + -sign signals a user-defined format string +sign specifies a user-defined format string which specifies the format in which to display the date and time. The format string may contain any of the conversion specifications described in the .Xr strftime 3 -manual page and -.Ql \&%N -for nanoseconds, as well as any arbitrary text. +manual page, as well as any arbitrary text. +.Pp +The following extensions to the regular +.Xr strftime 3 +syntax are supported: +.Bl -tag -width "xxxx" +.It Cm \&% Ns Ar n Ns Cm N +Replaced by the +.Ar n Ns +-digit fractional part of the number of seconds since the Unix Epoch. +If +.Ar n +is omitted or zero, a default value of 9 is used, resulting in a +number with nanosecond resolution (hence the choice of the letter +.Sq N +for this conversion). +Note that the underlying clock may not necessarily support nanosecond +resolution. +.It Cm \&%-N +As above, but automatically choose the precision based on the reported +resolution of the underlying clock. +If the +.Fl r +option was specified, the default precision of 9 digits is used. +.El +.Pp A newline .Pq Ql \en character is always output after the characters specified by the format string. The format string for the default display is -.Dq +%+ . +.Dq %+ . .Pp If an operand does not have a leading plus sign, it is interpreted as a value for setting the system's notion of the current date and time. @@ -448,6 +471,13 @@ The utility exits 0 on success, 1 if unable to set the date, and 2 if able to set the local date, but unable to set it globally. .Sh EXAMPLES +The command +.Pp +.Dl "date +%s.%3N" +.Pp +will print the time elapsed since the Unix Epoch with millisecond +precision. +.Pp The command: .Pp .Dl "date ""+DATE: %Y-%m-%d%nTIME: %H:%M:%S""" @@ -619,3 +649,9 @@ The .Ql \&%N conversion specification was added in .Fx 14.1 . +Support for the +.Ql \&% Ns Ar n Ns Cm N +and +.Ql \&%-N +variants was added in +.Fx 15.1 . diff --git a/bin/date/date.c b/bin/date/date.c index 01797084c0d6..9a40ac43d58b 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -55,10 +56,10 @@ static void badformat(void); static void iso8601_usage(const char *) __dead2; static void multipleformats(void); static void printdate(const char *); -static void printisodate(struct tm *, long); +static void printisodate(struct tm *, long, long); static void setthetime(const char *, const char *, int, struct timespec *); static size_t strftime_ns(char * __restrict, size_t, const char * __restrict, - const struct tm * __restrict, long); + const struct tm * __restrict, long, long); static void usage(void) __dead2; static const struct iso8601_fmt { @@ -78,26 +79,24 @@ static const char *rfc2822_format = "%a, %d %b %Y %T %z"; int main(int argc, char *argv[]) { - struct timespec ts; + struct timespec ts = { 0, 0 }, tres = { 0, 1 }; int ch, rflag; bool Iflag, jflag, Rflag; const char *format; char buf[1024]; - char *fmt, *outzone = NULL; - char *tmp; + char *end, *fmt, *outzone = NULL; struct vary *v; const struct vary *badv; struct tm *lt; struct stat sb; size_t i; + intmax_t number; v = NULL; fmt = NULL; (void) setlocale(LC_TIME, ""); rflag = 0; Iflag = jflag = Rflag = 0; - ts.tv_sec = 0; - ts.tv_nsec = 0; while ((ch = getopt(argc, argv, "f:I::jnRr:uv:z:")) != -1) switch((char)ch) { case 'f': @@ -131,13 +130,15 @@ main(int argc, char *argv[]) break; case 'r': /* user specified seconds */ rflag = 1; - ts.tv_sec = strtoq(optarg, &tmp, 0); - if (*tmp != 0) { - if (stat(optarg, &sb) == 0) { - ts.tv_sec = sb.st_mtim.tv_sec; - ts.tv_nsec = sb.st_mtim.tv_nsec; - } else - usage(); + number = strtoimax(optarg, &end, 0); + if (end > optarg && *end == '\0') { + ts.tv_sec = number; + ts.tv_nsec = 0; + } else if (stat(optarg, &sb) == 0) { + ts.tv_sec = sb.st_mtim.tv_sec; + ts.tv_nsec = sb.st_mtim.tv_nsec; + } else { + usage(); } break; case 'u': /* do everything in UTC */ @@ -155,8 +156,12 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - if (!rflag && clock_gettime(CLOCK_REALTIME, &ts) == -1) - err(1, "clock_gettime"); + if (!rflag) { + if (clock_gettime(CLOCK_REALTIME, &ts) == -1) + err(1, "clock_gettime"); + if (clock_getres(CLOCK_REALTIME, &tres) == -1) + err(1, "clock_getres"); + } format = "%+"; @@ -191,14 +196,14 @@ main(int argc, char *argv[]) badv = vary_apply(v, lt); if (badv) { fprintf(stderr, "%s: Cannot apply date adjustment\n", - badv->arg); + badv->arg); vary_destroy(v); usage(); } vary_destroy(v); if (Iflag) - printisodate(lt, ts.tv_nsec); + printisodate(lt, ts.tv_nsec, tres.tv_nsec); if (format == rfc2822_format) /* @@ -208,7 +213,8 @@ main(int argc, char *argv[]) setlocale(LC_TIME, "C"); - (void)strftime_ns(buf, sizeof(buf), format, lt, ts.tv_nsec); + (void)strftime_ns(buf, sizeof(buf), format, lt, + ts.tv_nsec, tres.tv_nsec); printdate(buf); } @@ -222,7 +228,7 @@ printdate(const char *buf) } static void -printisodate(struct tm *lt, long nsec) +printisodate(struct tm *lt, long nsec, long res) { const struct iso8601_fmt *it; char fmtbuf[64], buf[64], tzbuf[8]; @@ -231,10 +237,10 @@ printisodate(struct tm *lt, long nsec) for (it = iso8601_fmts; it <= iso8601_selected; it++) strlcat(fmtbuf, it->format_string, sizeof(fmtbuf)); - (void)strftime_ns(buf, sizeof(buf), fmtbuf, lt, nsec); + (void)strftime_ns(buf, sizeof(buf), fmtbuf, lt, nsec, res); if (iso8601_selected > iso8601_fmts) { - (void)strftime_ns(tzbuf, sizeof(tzbuf), "%z", lt, nsec); + (void)strftime_ns(tzbuf, sizeof(tzbuf), "%z", lt, nsec, res); memmove(&tzbuf[4], &tzbuf[3], 3); tzbuf[3] = ':'; strlcat(buf, tzbuf, sizeof(buf)); @@ -370,16 +376,17 @@ setthetime(const char *fmt, const char *p, int jflag, struct timespec *ts) */ static size_t strftime_ns(char * __restrict s, size_t maxsize, const char * __restrict format, - const struct tm * __restrict t, long nsec) + const struct tm * __restrict t, long nsec, long res) { - size_t prefixlen; size_t ret; char *newformat; char *oldformat; const char *prefix; const char *suffix; const char *tok; - bool seen_percent; + long number; + int i, len, prefixlen, width, zeroes; + bool seen_percent, seen_dash, seen_width; seen_percent = false; if ((newformat = strdup(format)) == NULL) @@ -392,36 +399,85 @@ strftime_ns(char * __restrict s, size_t maxsize, const char * __restrict format, * If the previous token was a percent sign, * then there are two percent tokens in a row. */ - if (seen_percent) + if (seen_percent) { seen_percent = false; - else + } else { seen_percent = true; + seen_dash = seen_width = false; + prefixlen = tok - newformat; + width = 0; + } break; case 'N': - if (seen_percent) { - oldformat = newformat; - prefix = oldformat; - prefixlen = tok - oldformat - 1; - suffix = tok + 1; + if (!seen_percent) + break; + oldformat = newformat; + prefix = oldformat; + suffix = tok + 1; + /* + * Prepare the number we are about to print. If + * the requested width is less than 9, we need to + * cut off the least significant digits. If it is + * more than 9, we will have to append zeroes. + */ + if (seen_dash) { /* - * Construct a new format string from the - * prefix (i.e., the part of the old format - * from its beginning to the currently handled - * "%N" conversion specification), the - * nanoseconds, and the suffix (i.e., the part - * of the old format from the next token to the - * end). + * Calculate number of singificant digits + * based on res which is the clock's + * resolution in nanoseconds. */ - if (asprintf(&newformat, "%.*s%.9ld%s", - (int)prefixlen, prefix, nsec, - suffix) < 0) { - err(1, "asprintf"); - } - free(oldformat); - tok = newformat + prefixlen + 9; + for (width = 9, number = res; + width > 0 && number > 0; + width--, number /= 10) + /* nothing */; + } + number = nsec; + zeroes = 0; + if (width == 0) { + width = 9; + } else if (width > 9) { + zeroes = width - 9; + width = 9; + } else { + for (i = 0; i < 9 - width; i++) + number /= 10; } + /* + * Construct a new format string from the prefix + * (i.e., the part of the old format from its + * beginning to the currently handled "%N" + * conversion specification), the nanoseconds, and + * the suffix (i.e., the part of the old format + * from the next token to the end). + */ + asprintf(&newformat, "%.*s%.*ld%.*d%n%s", prefixlen, + prefix, width, number, zeroes, 0, &len, suffix); + if (newformat == NULL) + err(1, "asprintf"); + free(oldformat); + tok = newformat + len - 1; seen_percent = false; break; + case '-': + if (seen_percent) { + if (seen_dash || seen_width) { + seen_percent = false; + break; + } + seen_dash = true; + } + break; + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + if (seen_percent) { + if (seen_dash) { + seen_percent = false; + break; + } + width = width * 10 + *tok - '0'; + seen_width = true; + } + break; default: seen_percent = false; break; diff --git a/bin/date/tests/format_string_test.sh b/bin/date/tests/format_string_test.sh index c2fe2111373f..5f199a3b5fd6 100755 --- a/bin/date/tests/format_string_test.sh +++ b/bin/date/tests/format_string_test.sh @@ -132,6 +132,8 @@ atf_init_test_cases() format_string_test M M 04 20 format_string_test m m 02 11 format_string_test N N 000000000 000000000 + format_string_test 3N 3N 000 000 + format_string_test 12N 12N 000000000000 000000000000 format_string_test p p AM PM format_string_test R R 07:04 21:20 format_string_test r r "07:04:03 AM" "09:20:00 PM" From nobody Wed Nov 19 10:57:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJNd1gj4z6HWRJ for ; Wed, 19 Nov 2025 10:57: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJNc6gnTz3NHv for ; Wed, 19 Nov 2025 10:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=flsXq64ukJWdO5OuwOpFWe6wGjrytt5KG/eBXwrUQ3Q=; b=beJQ541w1GnGnQ62OOD7faILlSpt7JCBTv9Q9gMRJB/5UdiIgmS9n8hw9DOeujNICzWjiY vnoq+p6TTpv0gGYRSByKGL8Cm7pKI9OD7qn6bDufkKqAnoGX2Abxh0/hUmDJAoFdie2+C2 2/IAaqXQtMYs4VygcuPpvQbwnOimIqUXTyCKw2PidGTTr712zRuEwjfblj2H8RHWZvZZj+ i2ReusE0rA94Qqnhrmx7aaQ5iQzbZ054O91S4vxXm/SUjhgnyivNcP4haFPDr/ucF+BEYX LZyZf+F1iEmc4h9xVRUm1o5T67GyADxaZQGZhO01Y6RNsIo8GCYm6x4R/pBAdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=flsXq64ukJWdO5OuwOpFWe6wGjrytt5KG/eBXwrUQ3Q=; b=NU5Um+fO7+im0iw+5lcC85AX84+0dJ84JKT4Y0voMNef1BxxL19255YVY77vp4KjHVf7+0 zOyy4DVGbAZk9cKtOs6aqaqgMRo4ZFMV7ncsDdaJKzqwB5NUu5GHnvyEwFphi0AKxEIJuk 5+vjNWrtKpSli3L3gUucIUc0RaGtaHioSUMeFVL1COsRYM6EsVZIG600rSoMMF6vj/U1NI nSu1L5XJRqPBdyHYaViY+rU/bFFZ2JSof+OuS3YBm5G2PhS5f4XYf01vhVI549rTsZmOLh u9zOt7dfFVn/cTCtSJqV84+l5j9Xeq1OFu+rTfK2lh51ozLggb38WbTUD/rBhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763549872; a=rsa-sha256; cv=none; b=XMxjcQRPpTaEEqCkq8lz+rtBkb7kQDoSC+nX/ZefpTcNWadWvly9dQwvEW18iQ/3PkEK2i qgSSKow0AI54pMCuVj/spCya3pj2UOVwEISAuOcN9rock46JhwwrSMtj5QecbNVVut7QBf DyiEzQLDvYAcg7eU6XvVqy63dYsPLwO4EWnm1F97UhTbk5WbM5igJ9KSxIJ0Okjnn5eOMM 5/xCQnJ5Y2QoUqNuB/CxJjZhMZGto4LWyhSQrxApySwNcj6ofRS9KJnEf6N6SG9y8uuznS xXKdSIVpC7ujBsSbyaQJUtQXCjEA9weKaPNlkVtccrYPM8nmBMke8WvWazX4Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJNc5y0wzddw for ; Wed, 19 Nov 2025 10:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8b23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:57: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: a87ffad35b05 - stable/15 - tarfs: Fix support for large files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a87ffad35b05fef35a7ff157f5ec7f0c4e7c6667 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:57:52 +0000 Message-Id: <691da2b0.8b23.39bf461b@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a87ffad35b05fef35a7ff157f5ec7f0c4e7c6667 commit a87ffad35b05fef35a7ff157f5ec7f0c4e7c6667 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-12 21:23:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 10:56:50 +0000 tarfs: Fix support for large files * When fast-forwarding through a zstd frame, we incorrectly used the min() inline function instead of the MIN() macro. The function truncates the result to unsigned int, resulting in a decompression error when trying to seek more than 4 GB into the frame. * POSIX states that a size extended header record overrides the size field in the header if present, and that one must be included if the size of the file exceeds 8 GB (the size field maxes out at 64 GB). * Reduce repetition in the exthdr parser by deduplicating the syntax error handler. MFC after: 1 week Sponsored by: Klara, Inc. Fixes: 69d94f4c7608 ("Add tarfs, a filesystem backed by tarballs.") Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D53718 (cherry picked from commit a34a57d4b4eba88dfa5541d7d77b63b01c1a1a9a) --- sys/fs/tarfs/tarfs_io.c | 2 +- sys/fs/tarfs/tarfs_vfsops.c | 48 +++++++++++++++++++--------------------- tests/sys/fs/tarfs/tarfs_test.sh | 27 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 26 deletions(-) diff --git a/sys/fs/tarfs/tarfs_io.c b/sys/fs/tarfs/tarfs_io.c index a3d8df62d7df..e250c5cbce5a 100644 --- a/sys/fs/tarfs/tarfs_io.c +++ b/sys/fs/tarfs/tarfs_io.c @@ -444,7 +444,7 @@ tarfs_zread_zstd(struct tarfs_zio *zio, struct uio *uiop) } if (zio->opos < off) { /* to be discarded */ - zob.size = min(off - zio->opos, len); + zob.size = MIN(off - zio->opos, len); zob.pos = 0; } else { zob.size = len; diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index a534b18ebf34..e1ba925ccb0f 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -441,7 +441,7 @@ tarfs_alloc_one(struct tarfs_mount *tmp, size_t *blknump) int endmarker = 0; char *namep, *sep; struct tarfs_node *parent, *tnp, *other; - size_t namelen = 0, linklen = 0, realsize = 0, sz; + size_t namelen = 0, linklen = 0, realsize = 0, extsize = 0, sz; ssize_t res; dev_t rdev; gid_t gid; @@ -588,10 +588,7 @@ again: char *eol, *key, *value, *sep; size_t len = strtoul(line, &sep, 10); if (len == 0 || sep == line || *sep != ' ') { - TARFS_DPF(ALLOC, "%s: exthdr syntax error\n", - __func__); - error = EINVAL; - goto bad; + goto syntax; } if ((uintptr_t)line + len < (uintptr_t)line || line + len > exthdr + sz) { @@ -606,16 +603,18 @@ again: key = sep + 1; sep = strchr(key, '='); if (sep == NULL) { - TARFS_DPF(ALLOC, "%s: exthdr syntax error\n", - __func__); - error = EINVAL; - goto bad; + goto syntax; } *sep = '\0'; value = sep + 1; TARFS_DPF(ALLOC, "%s: exthdr %s=%s\n", __func__, key, value); - if (strcmp(key, "path") == 0) { + if (strcmp(key, "size") == 0) { + extsize = strtol(value, &sep, 10); + if (sep != eol) { + goto syntax; + } + } else if (strcmp(key, "path") == 0) { name = value; namelen = eol - value; } else if (strcmp(key, "linkpath") == 0) { @@ -625,47 +624,42 @@ again: sparse = true; major = strtol(value, &sep, 10); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "GNU.sparse.minor") == 0) { sparse = true; minor = strtol(value, &sep, 10); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "GNU.sparse.name") == 0) { sparse = true; name = value; namelen = eol - value; if (namelen == 0) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "GNU.sparse.realsize") == 0) { sparse = true; realsize = strtoul(value, &sep, 10); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "SCHILY.fflags") == 0) { flags |= tarfs_strtofflags(value, &sep); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } } goto again; } + /* do we have a size from an exthdr? */ + if (extsize > 0) { + sz = extsize; + } + /* sparse file consistency checks */ if (sparse) { TARFS_DPF(ALLOC, "%s: %s: sparse %ld.%ld (%zu bytes)\n", __func__, @@ -832,6 +826,10 @@ skip: sbuf_delete(namebuf); } return (0); +syntax: + TARFS_DPF(ALLOC, "%s: exthdr syntax error\n", __func__); + error = EINVAL; + goto bad; eof: TARFS_DPF(IO, "%s: premature end of file\n", __func__); error = EIO; diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index d4de71271985..505bfc5325f0 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -396,6 +396,32 @@ tarfs_git_archive_cleanup() { tarfs_cleanup } +atf_test_case tarfs_large cleanup +tarfs_large_head() { + atf_set "descr" "Test support for large files" + atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" + atf_set "timeout" "600" +} +tarfs_large_body() { + tarfs_setup + local tarball="${PWD}/tarfs_test.tar.zst" + local exp off + for exp in 31 32 33 34 35 36 ; do + for off in 1 0 ; do + local size=$(((1<; Wed, 19 Nov 2025 10:57: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJNf0D1Nz3Nl7 for ; Wed, 19 Nov 2025 10:57:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4xaM5DrmWmXCetCEo87P501OWaor9BX786ALYJEF5Hs=; b=d/2WyjhLc9b4yv4N2ijN3WBSd2MIdVtGi1hRXrg9/rxJRhYS4Zn+CngYVFkcE0cBQ0pPGL /SIzSLVU/g6haryyvYCO9cVQvZYdnpwZ7jxxxbw1Vgy2v0/IrdPif8TCsH31KnDuhXEio7 n/4crsXxsOr6AifhUqzh8HryN+VZ44sx+49hqWUpLneEkF/227K7Sl4ylyPckKFZUtcwVK Y4sKH+Mw0SJySy9ue9z+7HuSSW8o96atnWfXe2gbp9W+rMuOWJEAkxzz8oDOGBOJAy3T3l eyZ9iVFjjJMrSHG1CGRjVB9ClJvSBKRgIqf333KJtxIzwIpzY6s+eiYJ/+Fjug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4xaM5DrmWmXCetCEo87P501OWaor9BX786ALYJEF5Hs=; b=FZs9DxW96mnAOfiHEVMAw6zUcW/4wj03O18GHfjEVuFg/Iw6Sw91H06tnsRNrm6FrRjf+g bAc9q2/78IBRLInLtE9sLHhiRHI64MyX+Yj0gpMf6larABkmZopuzBG480NmBRptjFn29t 9vFt5T7knSqmD7pQaF5j/kThMnA8BHAGOR0BL8wO1uGGrxYX9X2ApIO4Bu1E8jySI6XrlB EPhUlftE2lAyllq9ntreIAPNxi2BCyZ6BaCIKAPuNNGOlgwjR8w1SyJdKeBJ6Am1hYi7Km tX8snAXXJ6sL6kk83lt1B/LSQdYJ+DoUZBzBrCS5CfDpqjl5jEyApVMbL0xaBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763549874; a=rsa-sha256; cv=none; b=NqNrNktEZaxa3EBhhSiHXyj476lbHjCvQQsGPrwUgx7a9FSJsStu6i0l//ZlMs56avS4N5 v++yuzxIP//2zwgaK6+mnFQSjq+ZZiJXvTcFraLSUC7akDMWdxUX79fBGAPPgtdUWihCQF s1fsII3HY6znIBQ0V2+M1QB5VY36t+AOHBGRhJ6CVzEg72ebixaPWk3TNfIMKX55diUR/L yqDLi/isB0t/xjUA5t4A2/0o9MgyWwrWDBrxIEdKLAoxlbVjWkY4ezjnilmHXAB9A9Jaxq YyjCfbUcMoyVEDuvOXWsAgWlzpiDFCrJgti+Dve5rQbSE/moxvNZVqzr/l7dpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJNd6q8wzdhJ for ; Wed, 19 Nov 2025 10:57:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ffeb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:57:53 +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: d019d36707d3 - stable/15 - quot: Rewrite -n mode input parser List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d019d36707d35a982d527f568dd68179f6f747b2 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:57:53 +0000 Message-Id: <691da2b1.3ffeb.2785c685@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d019d36707d35a982d527f568dd68179f6f747b2 commit d019d36707d35a982d527f568dd68179f6f747b2 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-14 14:28:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 10:56:50 +0000 quot: Rewrite -n mode input parser The existing parser was needlessly complicated and wildly inconsistent in how it handled invalid input. Rewrite using getline() and treat invalid input consistently: silently ignore lines that don't begin with a number, and print a warning if the inode number is out of range. PR: 290992 MFC after: 1 week Reviewed by: obrien Differential Revision: https://reviews.freebsd.org/D53726 (cherry picked from commit fa272a5276865a97b01823fe6546940eaaf1b164) --- usr.sbin/quot/quot.8 | 3 ++- usr.sbin/quot/quot.c | 47 +++++++++++++++++++++------------------- usr.sbin/quot/tests/quot_test.sh | 19 ++++++++++++++++ 3 files changed, 46 insertions(+), 23 deletions(-) diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8 index 32e666e2a863..69c0a2d84b9b 100644 --- a/usr.sbin/quot/quot.8 +++ b/usr.sbin/quot/quot.8 @@ -27,7 +27,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 15, 2025 +.Dd November 13, 2025 .Dt QUOT 8 .Os .Sh NAME @@ -60,6 +60,7 @@ By default, all sizes are reported in 512-byte block counts. Given a list of inodes (plus some optional data on each line) in the standard input, for each file print out the owner (plus the remainder of the input line). +Lines that do not begin with a number are ignored. This is traditionally used in the pipe: .Bd -literal -offset indent diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 5dda36ac8499..d2f7646f7041 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -390,41 +391,43 @@ douser(int fd, struct fs *super) static void donames(int fd, struct fs *super) { - int c; - ino_t maxino; - uintmax_t inode; union dinode *dp; + char *end, *line; + size_t cap; + ssize_t len; + intmax_t inode, maxino; maxino = super->fs_ncg * super->fs_ipg - 1; - /* first skip the name of the filesystem */ - while ((c = getchar()) != EOF && (c < '0' || c > '9')) - while ((c = getchar()) != EOF && c != '\n'); - ungetc(c, stdin); - while (scanf("%ju", &inode) == 1) { - if (inode > maxino) { - warnx("illegal inode %ju", inode); - return; + line = NULL; + cap = 0; + while ((len = getline(&line, &cap, stdin)) > 0) { + if (len > 0 && line[len - 1] == '\n') + line[--len] = '\0'; + inode = strtoimax(line, &end, 10); + /* + * Silently ignore lines that do not begin with a number. + * For backward compatibility reasons, we do not require + * the optional comment to be preceded by whitespace. + */ + if (end == line) + continue; + if (inode <= 0 || inode > maxino) { + warnx("invalid inode %jd", inode); + continue; } if ((dp = get_inode(fd, super, inode)) != NULL && !isfree(super, dp)) { printf("%s\t", user(DIP(super, dp, di_uid))->name); /* now skip whitespace */ - while ((c = getchar()) == ' ' || c == '\t') - /* nothing */; + while (*end == ' ' || *end == '\t') + end++; /* and print out the remainder of the input line */ - while (c != EOF && c != '\n') { - putchar(c); - c = getchar(); - } - putchar('\n'); + printf("%s\n", end); } else { /* skip this line */ - while ((c = getchar()) != EOF && c != '\n') - /* nothing */; } - if (c == EOF) - break; } + free(line); } static void diff --git a/usr.sbin/quot/tests/quot_test.sh b/usr.sbin/quot/tests/quot_test.sh index 21088d162a53..c5e6717adca1 100644 --- a/usr.sbin/quot/tests/quot_test.sh +++ b/usr.sbin/quot/tests/quot_test.sh @@ -15,6 +15,8 @@ quot_setup() atf_check mount /dev/$dev "$mnt" echo "/dev/$dev: ($mnt)" >expect printf "%5d\t%5d\t%-8s\n" 8 2 "#0" >>expect + printf "%s\n" "/dev/$dev" >ninput + echo "/dev/$dev: ($mnt)" >nexpect } # Create a directory owned by a given UID @@ -23,12 +25,25 @@ quot_adduid() local uid=$1 atf_check install -d -o $uid -g 0 mnt/$uid printf "%5d\t%5d\t%-8s\n" 4 1 "#$uid" >>expect + ls -di mnt/$uid >>ninput + printf "%s\t%s\n" "#$uid" mnt/$uid >>nexpect } # Perform the tests quot_test() { local dev=$(cat dev) + # Deliberately add invalid lines to our -n input before the + # valid ones to verify that quot does not abort on first + # error. Note that quot deliberately ignores initial lines + # that don't start with a number, and that after encountering + # at least one line that does start with a number, quot would + # previously terminate on encountering one that doesn't (now + # it simply ignores them). This also tests that we don't + # require whitespace between the inode number and the comment. + echo "0zero" >>ninput + echo "invalid" >>ninput + echo "-1minusone" >>ninput # Create inodes owned by a large number of users to exercise # hash collisions and rehashing. The code uses an open hash # table that starts out with only 8 entries and doubles every @@ -50,6 +65,10 @@ quot_test() atf_check mount -ur /dev/$dev atf_check -o file:expect quot -fkN /dev/$dev atf_check -o file:expect quot -fkN $(realpath mnt) + # Test -n option + atf_check -o file:nexpect \ + -e inline:"quot: invalid inode 0\nquot: invalid inode -1\n" \ + quot -Nn /dev/$dev ; Wed, 19 Nov 2025 10:57: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJNg1VWhz3NZj for ; Wed, 19 Nov 2025 10:57:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dtZ0sXvDJBWS+f46h3OoQcTGoh0w4fspa1nDc99pHC4=; b=t/W6JRE1CQ1tT7fSEgxuiOCUuPoclL67JiD1BkpS9x5vAfQ92esMlL6DQrSwAPGFWyCMKp CVUhlK1G9jZGYj+rL/PFxSQ3hVfhhyjceEfOpbFp/Edqe8j2J0vp+oeugvRAU9fdtZtwxm nu86HSXDCy00BaWNUSk6L6Ch+s7e3LhBYV/KDL8gX8jdQC8JE2i/wr2loKvEjnKFfU9QrQ bUS6WFnUupr5R2jWZTsi1SPeYhM9voVZH/Ehbxm/WVjntbkEqEfaZHReEzSQLhS1wtLpDu MT8Wi1ZvA2syFNKCUmEk6QoPBboXu31Xc49pRArvZI43FYv62r2XJ1Dy6b2KUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dtZ0sXvDJBWS+f46h3OoQcTGoh0w4fspa1nDc99pHC4=; b=aeuRaJFHb+RpX8p0wPY5W+pbfv1z6pdG/dUcULZ5puWIYVkTdWRdXsjAwPyRdjg3THkBII Nd/XRNvjoRD/ZKHtt2m8nUhP7YM6PaJcBXfwsnB2Q7S1eLSY8eg9N+BN8bcfs5NGhG7AcX JeqWhiiPeZqsCrhleNIvsIsdCC2Xqh5TWYke8GhzKDjGDe37xCRKunP0CG9QxO8q1CtPmK YacRGqxElfGsRAH0tA1TF6mtBq6lmBTX93OqZfUlu+4iLUZXdz6I+SsXEeVdqIFqdwkjwt ZARKaJKp7x+ctQi4uvVGAG9yg3OHxppdDR77/QkL4jLSyHlUrLHaZGuqWN2IHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763549875; a=rsa-sha256; cv=none; b=f7TVQT+zf8DLR9MvrN0KneH1zmSTmQ5Bdcc9X7+Gn8SxXYje6uOLX8SjoQpVPt9KqH08EA agoxBfiwX/t1y/cXvjrVO78ZoexQfKaN2/uD00SkgqVk46dqlCtZFdiMJix0py7z7enpl6 KLrxsCqFV0BdEYsBGBF/vH6tDreo0NABH71KL23q7nEBK+UVOh/uwGPVUReKDyf8pwizaN Ym7fFEPhu9u/zFuOOZcnNk7qRQ+JfyPMwrXvlkfQ+mCDOyXtUT59KjAw7sX/HuCzoE7/DP IRPW4I+ISAxA4H1GZFT5+taDddwzkw/J/1uNAt9bE6GPYuwZdw01t1GjljPFBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJNg0XMFzddx for ; Wed, 19 Nov 2025 10:57:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 81f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:57:55 +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: 9a7afecc503b - stable/15 - quot: Improve manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9a7afecc503b1364132a60d2342b4b56811cf439 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:57:55 +0000 Message-Id: <691da2b3.81f0.116beb68@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9a7afecc503b1364132a60d2342b4b56811cf439 commit 9a7afecc503b1364132a60d2342b4b56811cf439 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-14 14:28:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 10:56:50 +0000 quot: Improve manual page * Rewrite the first paragraph to clarify that quot(8) only supports FFS. * Document which options can or cannot be combined with each other. MFC after: 1 week Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D53727 (cherry picked from commit 2f3adab9d512faec3e1891e505d1888db5d0240e) --- usr.sbin/quot/quot.8 | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8 index 69c0a2d84b9b..b4b40bf395e9 100644 --- a/usr.sbin/quot/quot.8 +++ b/usr.sbin/quot/quot.8 @@ -41,7 +41,9 @@ The .Nm utility -is used to gather statistics about the disk usage for each local user. +is used to gather per-user disk usage statistics from +.Xr ffs 7 +file systems. .Pp The following options are available: .Bl -tag -width indent @@ -51,8 +53,16 @@ Include statistics for all mounted file systems. Display three columns containing number of blocks per file, number of files in this category, and aggregate total of blocks in files with this or lower size. +This option is mutually exclusive with the +.Fl n +option. .It Fl f For each user, display count of files and space occupied. +This option has no effect if combined with the +.Fl c +or +.Fl n +options. .It Fl k Force the numbers to be reported in kilobyte counts. By default, all sizes are reported in 512-byte block counts. @@ -69,9 +79,17 @@ ls -i | sed -e 's,^ *,,' | sort -k 1n | quot -n filesystem .Ed .Pp to get a report of files and their owners. +This option is mutually exclusive with the +.Fl c +option. .It Fl v In addition to the default output, display the number of files not accessed within 30, 60 and 90 days. +This option has no effect if combined with the +.Fl c +or +.Fl n +options. .El .Sh ENVIRONMENT .Bl -tag -width BLOCKSIZE @@ -88,6 +106,7 @@ size block. .Xr quota 1 , .Xr getmntinfo 3 , .Xr fstab 5 , +.Xr ffs 7 , .Xr mount 8 .Sh HISTORY This implementation of From nobody Wed Nov 19 10:58:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJP83zbTz6HWyT for ; Wed, 19 Nov 2025 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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJP76shBz3PRp for ; Wed, 19 Nov 2025 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=1763549900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tUq1u9ArtfJf7Ok+ogTT0ZaeJ33zeMPPYPxPEmShBzY=; b=L2ZWsT12c/ae8yRw2wnP+UGnXu1CyB4fRBt5ruZCkZxoYlWpy+7/RtrkX5cQbbxjs/6Tsh d8zV0LEBuOWViIqjFsxvDlAaWiN58dnHNteKAAWruukfqztXvdOtSUGyxVLf7U9tI8WLbj Yo046281lRzpjF/tR+loDiy1NzopDZpanKfGM8lBPBeX6+It2TAwvkPX3tLlbidXiq+GoY o3eNlNC4Zl9TLKo7DAb/cLnUXWT76LkB+2PZWXqxIDq39fYxkpqikpXh5jt7YLm7PvFQ00 9TUjCyaPft6Zvnse3d1r7otcDIIDnpWUE+DpZhBr4dzkUwmeYrxlcsENUq/Wwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tUq1u9ArtfJf7Ok+ogTT0ZaeJ33zeMPPYPxPEmShBzY=; b=x9Pl6ZT8OYT0oa8nPk3bmnEKovkdmzSX3zuBwJFqqiXeCh1IlxP6Oaw32TlYm1UFgDKbUk zShmfuqtWa4o0KpWQkNH72Y1PCd+7g/uYW6kwPuiVZ2ZD3FBtHMM747/kU5kbiO0g4Sp9g EY+U7RCgfIlc37dsEAsL4hi5tzlfZJawJcRcI1JofZYcJx7/LTEGLG8kIOxzLsadr/hKVS J1NeRavTtAAIUJ56jtAPtaJf3AO8qCBnX5SJlkxVY1/DHpqWaDQFXK7q07MXhm6Qpds1CD JyBarDMMH/7Vcij93GDX71cwTP7Uo2vfYByM6uJsim8TUmpXACaLTQ7yAVHZMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763549900; a=rsa-sha256; cv=none; b=iKjZC47m09lr19XmKIUSJv4LOPKXP0H7EfKIKquGDrAqjvASZbgEVgF9JecRh7JVJL2yk9 eXOM1aU/ZdFLvzmPkfh3FT2RMvFF/LToZVzd13s2JOsmrpa0DgxV/PiSoxSZHf+rKXcRs5 BCVkdHQ+SjH5GxPt4W7SOaBIx2Q1TYWVi8V95rpD5g+O7iNlUjcTRmDfhK7CLg5xqkp+EC zMBbkQVVxN7eJUsEiHMW8eEwsCKszZJFcbA5rTGeN+RyvnaqOL4iFfAv4UQyaOoN2SNBi4 qMVflmNHDmFzwE6i3b6W1/uzjAPK+JUNVK8hDvtkfXkl8gOQX34Q9QwAuArsJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJP75WgRzdcY for ; Wed, 19 Nov 2025 10:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ffef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:58:19 +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: b0abbe05dfa1 - stable/14 - date: Improve nanosecond support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0abbe05dfa144ff6ceabeb317e9493a13c0917d Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:58:19 +0000 Message-Id: <691da2cb.3ffef.737c02dd@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b0abbe05dfa144ff6ceabeb317e9493a13c0917d commit b0abbe05dfa144ff6ceabeb317e9493a13c0917d Author: Dag-Erling Smørgrav AuthorDate: 2025-11-11 14:58:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 10:57:39 +0000 date: Improve nanosecond support Add support for a field width, which defaults to 9 if unspecified or zero. If the width is not exactly 9, we have to either cut off digits or append zeroes to make up the difference. If the width is a dash, we pick a width based on the clock's reported resolution. This brings us in line with GNU coreutils. PR: 287080 MFC after: 1 week Reviewed by: 0mp Differential Revision: https://reviews.freebsd.org/D53667 (cherry picked from commit 38839c872e7af6a1424009bf07d6b4450e9ca61d) --- bin/date/date.1 | 50 ++++++++++-- bin/date/date.c | 148 ++++++++++++++++++++++++----------- bin/date/tests/format_string_test.sh | 2 + 3 files changed, 147 insertions(+), 53 deletions(-) diff --git a/bin/date/date.1 b/bin/date/date.1 index f68892bd408d..374a687fcbdc 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 5, 2025 +.Dd November 10, 2025 .Dt DATE 1 .Os .Sh NAME @@ -186,7 +186,7 @@ Print the date and time represented by .Ar seconds , where .Ar seconds -is the number of seconds since the Epoch +is the number of seconds since the Unix Epoch (00:00:00 UTC, January 1, 1970; see .Xr time 3 ) , @@ -321,20 +321,43 @@ Refer to the examples below for further details. .Pp An operand with a leading plus .Pq Sq + -sign signals a user-defined format string +sign specifies a user-defined format string which specifies the format in which to display the date and time. The format string may contain any of the conversion specifications described in the .Xr strftime 3 -manual page and -.Ql \&%N -for nanoseconds, as well as any arbitrary text. +manual page, as well as any arbitrary text. +.Pp +The following extensions to the regular +.Xr strftime 3 +syntax are supported: +.Bl -tag -width "xxxx" +.It Cm \&% Ns Ar n Ns Cm N +Replaced by the +.Ar n Ns +-digit fractional part of the number of seconds since the Unix Epoch. +If +.Ar n +is omitted or zero, a default value of 9 is used, resulting in a +number with nanosecond resolution (hence the choice of the letter +.Sq N +for this conversion). +Note that the underlying clock may not necessarily support nanosecond +resolution. +.It Cm \&%-N +As above, but automatically choose the precision based on the reported +resolution of the underlying clock. +If the +.Fl r +option was specified, the default precision of 9 digits is used. +.El +.Pp A newline .Pq Ql \en character is always output after the characters specified by the format string. The format string for the default display is -.Dq +%+ . +.Dq %+ . .Pp If an operand does not have a leading plus sign, it is interpreted as a value for setting the system's notion of the current date and time. @@ -448,6 +471,13 @@ The utility exits 0 on success, 1 if unable to set the date, and 2 if able to set the local date, but unable to set it globally. .Sh EXAMPLES +The command +.Pp +.Dl "date +%s.%3N" +.Pp +will print the time elapsed since the Unix Epoch with millisecond +precision. +.Pp The command: .Pp .Dl "date ""+DATE: %Y-%m-%d%nTIME: %H:%M:%S""" @@ -619,3 +649,9 @@ The .Ql \&%N conversion specification was added in .Fx 14.1 . +Support for the +.Ql \&% Ns Ar n Ns Cm N +and +.Ql \&%-N +variants was added in +.Fx 15.1 . diff --git a/bin/date/date.c b/bin/date/date.c index d32993dc1eda..993254c85e94 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -49,6 +49,7 @@ static char sccsid[] = "@(#)date.c 8.2 (Berkeley) 4/28/95"; #include #include #include +#include #include #include #include @@ -68,10 +69,10 @@ static void badformat(void); static void iso8601_usage(const char *) __dead2; static void multipleformats(void); static void printdate(const char *); -static void printisodate(struct tm *, long); +static void printisodate(struct tm *, long, long); static void setthetime(const char *, const char *, int, struct timespec *); static size_t strftime_ns(char * __restrict, size_t, const char * __restrict, - const struct tm * __restrict, long); + const struct tm * __restrict, long, long); static void usage(void) __dead2; static const struct iso8601_fmt { @@ -91,26 +92,24 @@ static const char *rfc2822_format = "%a, %d %b %Y %T %z"; int main(int argc, char *argv[]) { - struct timespec ts; + struct timespec ts = { 0, 0 }, tres = { 0, 1 }; int ch, rflag; bool Iflag, jflag, Rflag; const char *format; char buf[1024]; - char *fmt, *outzone = NULL; - char *tmp; + char *end, *fmt, *outzone = NULL; struct vary *v; const struct vary *badv; struct tm *lt; struct stat sb; size_t i; + intmax_t number; v = NULL; fmt = NULL; (void) setlocale(LC_TIME, ""); rflag = 0; Iflag = jflag = Rflag = 0; - ts.tv_sec = 0; - ts.tv_nsec = 0; while ((ch = getopt(argc, argv, "f:I::jnRr:uv:z:")) != -1) switch((char)ch) { case 'f': @@ -144,13 +143,15 @@ main(int argc, char *argv[]) break; case 'r': /* user specified seconds */ rflag = 1; - ts.tv_sec = strtoq(optarg, &tmp, 0); - if (*tmp != 0) { - if (stat(optarg, &sb) == 0) { - ts.tv_sec = sb.st_mtim.tv_sec; - ts.tv_nsec = sb.st_mtim.tv_nsec; - } else - usage(); + number = strtoimax(optarg, &end, 0); + if (end > optarg && *end == '\0') { + ts.tv_sec = number; + ts.tv_nsec = 0; + } else if (stat(optarg, &sb) == 0) { + ts.tv_sec = sb.st_mtim.tv_sec; + ts.tv_nsec = sb.st_mtim.tv_nsec; + } else { + usage(); } break; case 'u': /* do everything in UTC */ @@ -168,8 +169,12 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - if (!rflag && clock_gettime(CLOCK_REALTIME, &ts) == -1) - err(1, "clock_gettime"); + if (!rflag) { + if (clock_gettime(CLOCK_REALTIME, &ts) == -1) + err(1, "clock_gettime"); + if (clock_getres(CLOCK_REALTIME, &tres) == -1) + err(1, "clock_getres"); + } format = "%+"; @@ -204,14 +209,14 @@ main(int argc, char *argv[]) badv = vary_apply(v, lt); if (badv) { fprintf(stderr, "%s: Cannot apply date adjustment\n", - badv->arg); + badv->arg); vary_destroy(v); usage(); } vary_destroy(v); if (Iflag) - printisodate(lt, ts.tv_nsec); + printisodate(lt, ts.tv_nsec, tres.tv_nsec); if (format == rfc2822_format) /* @@ -221,7 +226,8 @@ main(int argc, char *argv[]) setlocale(LC_TIME, "C"); - (void)strftime_ns(buf, sizeof(buf), format, lt, ts.tv_nsec); + (void)strftime_ns(buf, sizeof(buf), format, lt, + ts.tv_nsec, tres.tv_nsec); printdate(buf); } @@ -235,7 +241,7 @@ printdate(const char *buf) } static void -printisodate(struct tm *lt, long nsec) +printisodate(struct tm *lt, long nsec, long res) { const struct iso8601_fmt *it; char fmtbuf[64], buf[64], tzbuf[8]; @@ -244,10 +250,10 @@ printisodate(struct tm *lt, long nsec) for (it = iso8601_fmts; it <= iso8601_selected; it++) strlcat(fmtbuf, it->format_string, sizeof(fmtbuf)); - (void)strftime_ns(buf, sizeof(buf), fmtbuf, lt, nsec); + (void)strftime_ns(buf, sizeof(buf), fmtbuf, lt, nsec, res); if (iso8601_selected > iso8601_fmts) { - (void)strftime_ns(tzbuf, sizeof(tzbuf), "%z", lt, nsec); + (void)strftime_ns(tzbuf, sizeof(tzbuf), "%z", lt, nsec, res); memmove(&tzbuf[4], &tzbuf[3], 3); tzbuf[3] = ':'; strlcat(buf, tzbuf, sizeof(buf)); @@ -383,16 +389,17 @@ setthetime(const char *fmt, const char *p, int jflag, struct timespec *ts) */ static size_t strftime_ns(char * __restrict s, size_t maxsize, const char * __restrict format, - const struct tm * __restrict t, long nsec) + const struct tm * __restrict t, long nsec, long res) { - size_t prefixlen; size_t ret; char *newformat; char *oldformat; const char *prefix; const char *suffix; const char *tok; - bool seen_percent; + long number; + int i, len, prefixlen, width, zeroes; + bool seen_percent, seen_dash, seen_width; seen_percent = false; if ((newformat = strdup(format)) == NULL) @@ -405,36 +412,85 @@ strftime_ns(char * __restrict s, size_t maxsize, const char * __restrict format, * If the previous token was a percent sign, * then there are two percent tokens in a row. */ - if (seen_percent) + if (seen_percent) { seen_percent = false; - else + } else { seen_percent = true; + seen_dash = seen_width = false; + prefixlen = tok - newformat; + width = 0; + } break; case 'N': - if (seen_percent) { - oldformat = newformat; - prefix = oldformat; - prefixlen = tok - oldformat - 1; - suffix = tok + 1; + if (!seen_percent) + break; + oldformat = newformat; + prefix = oldformat; + suffix = tok + 1; + /* + * Prepare the number we are about to print. If + * the requested width is less than 9, we need to + * cut off the least significant digits. If it is + * more than 9, we will have to append zeroes. + */ + if (seen_dash) { /* - * Construct a new format string from the - * prefix (i.e., the part of the old format - * from its beginning to the currently handled - * "%N" conversion specification), the - * nanoseconds, and the suffix (i.e., the part - * of the old format from the next token to the - * end). + * Calculate number of singificant digits + * based on res which is the clock's + * resolution in nanoseconds. */ - if (asprintf(&newformat, "%.*s%.9ld%s", - (int)prefixlen, prefix, nsec, - suffix) < 0) { - err(1, "asprintf"); - } - free(oldformat); - tok = newformat + prefixlen + 9; + for (width = 9, number = res; + width > 0 && number > 0; + width--, number /= 10) + /* nothing */; + } + number = nsec; + zeroes = 0; + if (width == 0) { + width = 9; + } else if (width > 9) { + zeroes = width - 9; + width = 9; + } else { + for (i = 0; i < 9 - width; i++) + number /= 10; } + /* + * Construct a new format string from the prefix + * (i.e., the part of the old format from its + * beginning to the currently handled "%N" + * conversion specification), the nanoseconds, and + * the suffix (i.e., the part of the old format + * from the next token to the end). + */ + asprintf(&newformat, "%.*s%.*ld%.*d%n%s", prefixlen, + prefix, width, number, zeroes, 0, &len, suffix); + if (newformat == NULL) + err(1, "asprintf"); + free(oldformat); + tok = newformat + len - 1; seen_percent = false; break; + case '-': + if (seen_percent) { + if (seen_dash || seen_width) { + seen_percent = false; + break; + } + seen_dash = true; + } + break; + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + if (seen_percent) { + if (seen_dash) { + seen_percent = false; + break; + } + width = width * 10 + *tok - '0'; + seen_width = true; + } + break; default: seen_percent = false; break; diff --git a/bin/date/tests/format_string_test.sh b/bin/date/tests/format_string_test.sh index c2fe2111373f..5f199a3b5fd6 100755 --- a/bin/date/tests/format_string_test.sh +++ b/bin/date/tests/format_string_test.sh @@ -132,6 +132,8 @@ atf_init_test_cases() format_string_test M M 04 20 format_string_test m m 02 11 format_string_test N N 000000000 000000000 + format_string_test 3N 3N 000 000 + format_string_test 12N 12N 000000000000 000000000000 format_string_test p p AM PM format_string_test R R 07:04 21:20 format_string_test r r "07:04:03 AM" "09:20:00 PM" From nobody Wed Nov 19 10:58:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJP93FYMz6HWsQ for ; Wed, 19 Nov 2025 10:58: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJP86v9Vz3PVl for ; Wed, 19 Nov 2025 10:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KuNiQ40NoHOWktDtYo5AV6OMcfitr7Mj16Eok7aQqjE=; b=exf3vSTcXWFAo9BOpIF2AawaqFnm83INCfhT6fo+4pw19NvpRefb9U5V+5wtiOv37/ZBD3 bHD0QyDzGTMwssXpNLsxqMR0BqZkne1Ro/puKEj6smko+if6FJkdoQA/UdmGtJ9CHrO5sH tAMyyzJCQRMQjyvHAjfaa9O23lJnjKI3d3MSOzEivM7NHdW6CinCrbDtZDS6lGwO30qVVe iOXzVJsiEtDd1mbH/LI+STl1crrlLYEbWr038+egm5kaDYh7Vd26+BudsYZ7tDo42CPNuL DyXR4sQY/VufpFis55Z1dGD8zVg/kB/n5hFlQ8eyYpfBGRtsEGQTXVJGLKJi4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KuNiQ40NoHOWktDtYo5AV6OMcfitr7Mj16Eok7aQqjE=; b=JtZbGMxjgqgVCbNppPzokrphuP7MG/QugIRtZZeTZW6MXbb9OOl2aho7EXexvaROVecS9i y3PnWgcf8ZHpCyt6wVKqYED/JdSml9MMzVxvrGYNA1LoF8DMG/ol5M+e16wQv35GcxqK/a 6RpoVreiz96lXTGfnEfsLz5lKr9C6arsgi4K0VENIY6I64FRQYN3yF99zpII2QGudAhNpV wM9NleSDF02GUB20tGw9D0kZVW7w1WDHKnmaa0oXky+kroUBVlx00RAf63k6pfW2l0gLvV Npw+RsL19MQPllL2N9ifvzYAjwkQothAW9ElVuc+BWZI/Ctuia0q0tQ2iSLaKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763549901; a=rsa-sha256; cv=none; b=PlEOiGxcKZKt9ABZp+i6XxxprW7Ta8qcecizk8cf3oqlMWccGv5Q1sNUoKCNPCUB3N1TyU vqQI7vlocQuNC3QCP/riCIC6YH0s5fcKMhwwlIg6/TNrTEh7LJ6us3oZ6Ggmk4tx2WN0EA 1s1s6+S+pyRCz/7kjicDCvkBp7+cyWsRQwjsIWDEo3HlMnv8vg33e/wlf6+/glfhNPziKw GuYC4C/O3yzYfWroF6xyUCk9EPTK4QwDOssWT+b9w296PCFvzpM8Lu7EJtGq4npwl+rmAX SpsH6tUqzwpovdF9rCq1jUiY7VKSbbkualUjSK0WN0XWZiJw+xixFpHf1VPCTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJP86NqTzdcZ for ; Wed, 19 Nov 2025 10:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eefc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:58:20 +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: 35c612fbabd8 - stable/14 - tarfs: Fix support for large files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35c612fbabd8a6fd23e65881595873d0797da4b8 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:58:20 +0000 Message-Id: <691da2cc.3eefc.7e6b46e4@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=35c612fbabd8a6fd23e65881595873d0797da4b8 commit 35c612fbabd8a6fd23e65881595873d0797da4b8 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-12 21:23:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 10:57:40 +0000 tarfs: Fix support for large files * When fast-forwarding through a zstd frame, we incorrectly used the min() inline function instead of the MIN() macro. The function truncates the result to unsigned int, resulting in a decompression error when trying to seek more than 4 GB into the frame. * POSIX states that a size extended header record overrides the size field in the header if present, and that one must be included if the size of the file exceeds 8 GB (the size field maxes out at 64 GB). * Reduce repetition in the exthdr parser by deduplicating the syntax error handler. MFC after: 1 week Sponsored by: Klara, Inc. Fixes: 69d94f4c7608 ("Add tarfs, a filesystem backed by tarballs.") Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D53718 (cherry picked from commit a34a57d4b4eba88dfa5541d7d77b63b01c1a1a9a) --- sys/fs/tarfs/tarfs_io.c | 2 +- sys/fs/tarfs/tarfs_vfsops.c | 48 +++++++++++++++++++--------------------- tests/sys/fs/tarfs/tarfs_test.sh | 27 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 26 deletions(-) diff --git a/sys/fs/tarfs/tarfs_io.c b/sys/fs/tarfs/tarfs_io.c index a3d8df62d7df..e250c5cbce5a 100644 --- a/sys/fs/tarfs/tarfs_io.c +++ b/sys/fs/tarfs/tarfs_io.c @@ -444,7 +444,7 @@ tarfs_zread_zstd(struct tarfs_zio *zio, struct uio *uiop) } if (zio->opos < off) { /* to be discarded */ - zob.size = min(off - zio->opos, len); + zob.size = MIN(off - zio->opos, len); zob.pos = 0; } else { zob.size = len; diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index a534b18ebf34..e1ba925ccb0f 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -441,7 +441,7 @@ tarfs_alloc_one(struct tarfs_mount *tmp, size_t *blknump) int endmarker = 0; char *namep, *sep; struct tarfs_node *parent, *tnp, *other; - size_t namelen = 0, linklen = 0, realsize = 0, sz; + size_t namelen = 0, linklen = 0, realsize = 0, extsize = 0, sz; ssize_t res; dev_t rdev; gid_t gid; @@ -588,10 +588,7 @@ again: char *eol, *key, *value, *sep; size_t len = strtoul(line, &sep, 10); if (len == 0 || sep == line || *sep != ' ') { - TARFS_DPF(ALLOC, "%s: exthdr syntax error\n", - __func__); - error = EINVAL; - goto bad; + goto syntax; } if ((uintptr_t)line + len < (uintptr_t)line || line + len > exthdr + sz) { @@ -606,16 +603,18 @@ again: key = sep + 1; sep = strchr(key, '='); if (sep == NULL) { - TARFS_DPF(ALLOC, "%s: exthdr syntax error\n", - __func__); - error = EINVAL; - goto bad; + goto syntax; } *sep = '\0'; value = sep + 1; TARFS_DPF(ALLOC, "%s: exthdr %s=%s\n", __func__, key, value); - if (strcmp(key, "path") == 0) { + if (strcmp(key, "size") == 0) { + extsize = strtol(value, &sep, 10); + if (sep != eol) { + goto syntax; + } + } else if (strcmp(key, "path") == 0) { name = value; namelen = eol - value; } else if (strcmp(key, "linkpath") == 0) { @@ -625,47 +624,42 @@ again: sparse = true; major = strtol(value, &sep, 10); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "GNU.sparse.minor") == 0) { sparse = true; minor = strtol(value, &sep, 10); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "GNU.sparse.name") == 0) { sparse = true; name = value; namelen = eol - value; if (namelen == 0) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "GNU.sparse.realsize") == 0) { sparse = true; realsize = strtoul(value, &sep, 10); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "SCHILY.fflags") == 0) { flags |= tarfs_strtofflags(value, &sep); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } } goto again; } + /* do we have a size from an exthdr? */ + if (extsize > 0) { + sz = extsize; + } + /* sparse file consistency checks */ if (sparse) { TARFS_DPF(ALLOC, "%s: %s: sparse %ld.%ld (%zu bytes)\n", __func__, @@ -832,6 +826,10 @@ skip: sbuf_delete(namebuf); } return (0); +syntax: + TARFS_DPF(ALLOC, "%s: exthdr syntax error\n", __func__); + error = EINVAL; + goto bad; eof: TARFS_DPF(IO, "%s: premature end of file\n", __func__); error = EIO; diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index d4de71271985..505bfc5325f0 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -396,6 +396,32 @@ tarfs_git_archive_cleanup() { tarfs_cleanup } +atf_test_case tarfs_large cleanup +tarfs_large_head() { + atf_set "descr" "Test support for large files" + atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" + atf_set "timeout" "600" +} +tarfs_large_body() { + tarfs_setup + local tarball="${PWD}/tarfs_test.tar.zst" + local exp off + for exp in 31 32 33 34 35 36 ; do + for off in 1 0 ; do + local size=$(((1<; Wed, 19 Nov 2025 11:11: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJhd0db3z3RRM for ; Wed, 19 Nov 2025 11:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8aAsuH5mU48rZGdAFU0clLA6LETT92nZFARECyzRKYI=; b=xywfzdjPf1fNxX8ZoiiZuZZaqBMNwzN30gwZa/eD03zduKg0e+mdfoj6LtJ57yNKJHL8G8 eHpA73PtkaLWAT94kA10/I2UHmwOOJUtO4o7Px8eoR5NeyVg83J0XVkJzm6QxKkR9rfHy7 udHhxcnKY3Q2Q2rrOziQrDRMVBTA/8BApzGSsboebwlNMrfcL52L0r/yTCgsDibJUz6fPT IXR3lXI9QO/iGHf121ymZKYxGcCJbgX2RKhiqOwKVHMkvs6DNw+MlBfxODMKKyKpeXneh2 tBhEBWw3+xscowUkDT2Z/FcN8GuSI2KnyClrkbOr97mb9CA24smrorrKKbgkHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8aAsuH5mU48rZGdAFU0clLA6LETT92nZFARECyzRKYI=; b=R53Xe9ysWYAsUWlYuQHQuZ0QOqEPqcT8yEnGmuxvr8fB5Ghi2tqcx4RcVLD8JLU0MxKM1t GbLAlVl6QSoOcTFouZXkEEHd5utav1yUfj8YwXdh6hXaukgAMQxXNpgHbD/i+UfNvCv2y7 spbp78Us4yp/YetCPEBkfeNensgMWBDyS2e1kC+ZiC2gxwyDbAH+QAL8BnC2q22ACfnRwf GIoOCqRaGZqpeGF/+aEybx0PyKSELL2bjNzpw4xuIcsjlc/Neli9h8htAaSWCeXdI3yR4q jO2NLjSvq086T7U5yYWszwtkrVdTubUcqDhRjNyDF02131IPE3IKpxfso3ba+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550705; a=rsa-sha256; cv=none; b=DQEf+LYtmcqBu8Wmp4xnCwyha/BfvYT6dJUjYILLE3zNg6pHNItlgpQ7y5kyiOMHilZNLQ WNUPyXl2KWimM3wgwp1Zu09GfU/pNGYLMJKWWsM8qLAYWiC6a8LwTTm6Nj3yBoFhM0YTbF E2Jnw1+rTkYvjJavpJth6KS4uipZRSV+oyogqh9S163OQjXBViB5yiruzwwAL7q4pBraa8 bPd3v06sqZCF41HrCqaiXbBsCC5uFEgEI0186sIu4Skb9vqox8c0ujMHw0S7nltY/w+bwr xt2vXEOLZC3OKiiHrpe7VPCgJuR0r3Z66JnFktjjZAQ0MaNwcHJ1xYsTFACLzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJhd09ymzdgN for ; Wed, 19 Nov 2025 11:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id aae5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:11:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: b709dbfe4875 - stable/14 - refcount.9: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b709dbfe4875e3ac8bd2d25d8c500886668e0d23 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:11:45 +0000 Message-Id: <691da5f1.aae5.77a2fbc7@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b709dbfe4875e3ac8bd2d25d8c500886668e0d23 commit b709dbfe4875e3ac8bd2d25d8c500886668e0d23 Author: Gordon Bergling AuthorDate: 2025-10-26 15:49:28 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:11:33 +0000 refcount.9: Fix a typo in the manual page - s/sucessfully/successfully/ (cherry picked from commit 40fae644ba9a27227ca6f7c290e54fcef462b341) --- share/man/man9/refcount.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/refcount.9 b/share/man/man9/refcount.9 index 78631f9a865a..7375f429a607 100644 --- a/share/man/man9/refcount.9 +++ b/share/man/man9/refcount.9 @@ -106,7 +106,7 @@ but additionally checks that the value does not overflow as result of the operation. It returns .Dv true -if the reference was sucessfully obtained, and +if the reference was successfully obtained, and .Dv false if it was not, due to the overflow. .Pp From nobody Wed Nov 19 11:12:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJjD4LNyz6HY2G for ; Wed, 19 Nov 2025 11: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJjD3PRRz3RpZ for ; Wed, 19 Nov 2025 11: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=1763550736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EkskUM5uKi6SeUnfxIF/QLOVPrDUmKgkf4AeN6dmakY=; b=cl1W9nt5AN0bWpF2Ac9jg450e6XL0SYZBKSAdCY0juquE39hcmzMbbVTsKEvFMvKCL97cP uQo+TFR/hjEzYntvD+AbT1sVrThXRJxaX25hQFnSvTKLZpAfuUQluahuU9po5NcpYAnblA YLDGHF32/rWNeDf5Pee7Ht50JqIiPIBtLpWNLzYiLJovOaG8ieYujxWh8cLmwcugocqBDc nTH8WUiQ74BzoPy5CpJmWEGoki9CdJMVRBqd6XcVvw3+Gams5ptjsZqgp8qkJ48o7qQSow ppJZyPAQs6aIx4obeXXAyfjdyQ4pEHrzOnTRh56jrUep7CvHPSASaK+pJ6nHdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EkskUM5uKi6SeUnfxIF/QLOVPrDUmKgkf4AeN6dmakY=; b=WotFf36aqNn91fpniwYhZW88rJ0sVPzy5oKlKVnNpztqGX3MXHDIOScSCudTpO2VfSQZoY DeRlUDF21J25ddEmEPvEaQogvJnomLYO7O2rjUC41aSmjY4Qx0t5TEs3uzezq0rRZzpADs 2DWThedo1fCCXD0436W7CglvDWiHo0eq3KGhc623bWI7559uNA09iNAG8fjDh/QeWW17a9 XdtVyXZkBBU0uGwltpfOs24kt7vFTSX+XHUJ7fL2W1Q7h1w71Bem8TB4ZTmbn4AeChirxJ jwXcI29mo+TsOSDED3ou/m3HPKZXCXytrwlUddHGC3++04X/cp6iZ0Nv4PfusA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550736; a=rsa-sha256; cv=none; b=yOjMEZJ+MdNdVBC4SZA/mCtGeh1QqGGMQFv3ECcRIfLEDjxcjowhjNYBHsXMgQgxdUevVJ tytwpd+lkXyCy3kXPNzBkdoeUTfiC6ZUweAhR1kHZFtfAxt+ncb+Uwk4kG/QTNzUIicCpS 9GyIWQnS6TdbVWJ6KVxhgBgdQOgSqo/st3yrZOXWNtw+imiJlM4U2lYR3iEyl+ocsITJIf rIK0Zj7xHxIZt5OCmIvSGqpZvgOI49kCyP0UfZqCogR4uqzk/XN5jFu37tC8rCAKjhtGQ9 XKH5jud5zGDAZzGDVXYWgN3TRz/P5k7u/gGHVHg/Gn8CWokGS6cOJufQ+RwlNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJjD2x32zdvV for ; Wed, 19 Nov 2025 11:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a3e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:12:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 695ff7a3a562 - stable/14 - seqc.9: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 695ff7a3a56278d642fb74677770c98060c320dd Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:12:16 +0000 Message-Id: <691da610.a3e2.23467b4b@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=695ff7a3a56278d642fb74677770c98060c320dd commit 695ff7a3a56278d642fb74677770c98060c320dd Author: Gordon Bergling AuthorDate: 2025-10-26 15:50:26 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:12:05 +0000 seqc.9: Fix a typo in the manual page - s/changees/changes/ (cherry picked from commit fe45f7ddb53f16198a60cd015c20f5fc524aed89) --- share/man/man9/seqc.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/seqc.9 b/share/man/man9/seqc.9 index e13d73ecb5d7..b1e59b6b7af1 100644 --- a/share/man/man9/seqc.9 +++ b/share/man/man9/seqc.9 @@ -81,7 +81,7 @@ repeated. In case when sequence number is odd the object change is in progress and the reader will wait until the write will the sequence number will become even. .Sh EXAMPLES -The following example for a writer changees the +The following example for a writer changes the .Va var1 and .Va var2 From nobody Wed Nov 19 11:13:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJkN6dgcz6HXc4 for ; Wed, 19 Nov 2025 11:13:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJkN64SJz3S4G for ; Wed, 19 Nov 2025 11:13:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8LfFywjWHELfBP1rh6bCb1x/s70geK6mAzMkIturl0=; b=p00POBN/ghtfO4n+vQVX27LHgbJoLryEW/vXGz+j+6JgaggLHGTdWTe6avMIwwbBPWYsO7 9pLk1lHLIRRBEprqkSzguE6QR5NrT0xSWidnpiWpjQ3dwRXFVR+3l0Syy5H7PLZIZsSpFj yHLFjKsfaG2UsFe6hZO8dhhQOTNEqt1gDwcP+YZck2Xh1Z+m8tmhG4CzRuECvXb9y9ZxA2 /elat0Zg+WsrRGMtJ9NoNcvPhyCkt9qAeVLioLGnGTciC31ap4udoV0djkJIz/bq3GaDwF RvB/kvL/fSM9wtx4qPsmGrlnN0L6HACyOnmGYrk0nrtAPwQFEXDjP4wW8pgWVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8LfFywjWHELfBP1rh6bCb1x/s70geK6mAzMkIturl0=; b=ISsBA2SLVnDudcp+g53CiSPI+OsAhX61A3GMOYHAlaFn6w1Pi+I4kBTvu3srD18gY/fU1C ZskZG9wHPnytauz29WQaTBGP+vzEYT2mdlNQWWbfqtN5BJHp06t5sAhdDWNl4XMUu9HFkT eqJnCgWmqd6y5/ne0opgCxK0+efkY291Qai4UfToOocd/j2s59BA27N7eqNlhne0Ju+EaV jdimy9WLcEya3WGwe8hsDtoFmwwHCfpnEJH8RBux3HsmWFJRfsqQUgBPRlefNCjt7uCP0m oqucVk5Eo/oePlor0pz2T2H46CGaMr75wY0H9z9g9rUbhyNUUIMp/7tBvsnAAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550796; a=rsa-sha256; cv=none; b=rNiciTnsBCemxTUNrlaIe7nT14MBdJvObZ7MHepdrm/Bvc1fs3Dm/E3FkayhTAIb9NVpRF 2yfguZi7IgGNfmjc5RyITOikNE7TcxmRfyD64ejHNU5tsSR8wdkUHHDcUQctlI3278oDY4 7nAeHYewQJykTE+M4th3Ln38X4Sbu9vJ7dvivRo+PulYN7tyIhOe4y3OvhVmPX3zO3Llaw COkrCvhsho2+MniZC1UBFoVzQrCU0uhtVkcUqF22+InEadyczWLqyjZ7aff/y/ByQeryhw RCqmladgmUXeHnDFnKLFqKPB10e70KEIiiXFPoYWQoh8S8PYfbZ7NK2K9eM5jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJkN5f5czfDx for ; Wed, 19 Nov 2025 11:13:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 99cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:13:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 727a1f189d28 - stable/14 - vn_fullpath.9: Fix two typos in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 727a1f189d2871bb3a45d28e9d286e534930622c Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:13:16 +0000 Message-Id: <691da64c.99cb.1ce987f8@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=727a1f189d2871bb3a45d28e9d286e534930622c commit 727a1f189d2871bb3a45d28e9d286e534930622c Author: Gordon Bergling AuthorDate: 2025-10-26 15:53:22 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:13:05 +0000 vn_fullpath.9: Fix two typos in the manual page - s/resulting/resulting/ - s/initally/initially/ (cherry picked from commit 3b79697040a7d3f9a4a21fb2e66d9031feb6af84) --- share/man/man9/vn_fullpath.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/vn_fullpath.9 b/share/man/man9/vn_fullpath.9 index 9815abc3c86c..af459ed281c0 100644 --- a/share/man/man9/vn_fullpath.9 +++ b/share/man/man9/vn_fullpath.9 @@ -107,7 +107,7 @@ than one name (hard links), not all file systems use the name cache be used for more than one file (in the context of file systems covering other file systems); a file may have no name (if deleted but still open or referenced). -However, the resulting string may still be more useable to a user than +However, the resulting string may still be more usable to a user than a vnode pointer value, or a device number and inode number. Code consuming the results of this function should anticipate (and properly handle) failure. @@ -187,7 +187,7 @@ otherwise, an error number is returned. .Xr free 9 .Sh AUTHORS .An -nosplit -This manual page was initally written by +This manual page was initially written by .An Robert Watson Aq Mt rwatson@FreeBSD.org to describe the .Fn vn_fullpath From nobody Wed Nov 19 11:13:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJl05KnWz6HY83 for ; Wed, 19 Nov 2025 11:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJl03H2Nz3SF1 for ; Wed, 19 Nov 2025 11:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jvjuoAlowXEXLdTIPgfGiKa0LLRODeGhuHlsxOD8xLo=; b=YfGpeYFxdJdJOWR8MTfckrwsNgSDAYtRabbwUYhmSPLTqYHUWaAiiOBkdDV/1Us0e13jSQ htOzvPtPb7uDrCoZSqZHQ3yakFSW1nVQu2u+I77D4Z8QXpXkC02pLCaOeTDrlizohiQqI+ H5wefDb+IeiX0cUf2g6fNcdbdVG86F4+fAa+SbnrDoQhVbe19/yV/ITwhpo/nfrX0Nxfft qDBw6A3x6AA8aeVHEYxqJ/UI+w8K0KZ7pJebyXoX0R/0OlIc046NAUdLXpvLU9pW+XwrQ2 oBrr56Vpo3fuiPcMD2ShKi3w3+pPG52hU6FB+TYSt0gujslC7ZdG6PeaZrrW7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jvjuoAlowXEXLdTIPgfGiKa0LLRODeGhuHlsxOD8xLo=; b=tNhdtVoSOlc2u0TzyqgJNCKvZIEDmmwG2ZXXbOka/9ZrG7yQdFRl0lbPGoVibD/xKubUVN 0D7vA4EnvB69ZIk1yhp1EPoed7e2BzYoev/4GkzQYmSNOea9R5UcZRsng5mAlXv8VrUdLY dXhjTykt/Z269Wtw/YU1Lzqv7FCGUVOdMIlS4eeE7xtoDhTR4qHMXK7UliMP3F4ys8M8a9 f4hA1xQlCoRsQ//GKCQa1Qgo+B54Eey3rSWhyRTc8yDpBoYOfSmf6W4KccHjzSYae9BWg9 P3fR/YxpMJpGpMv/digNwQ46VmCf4gHEypL27wa3+QpHUEGGLRDraiGKlCXjbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550828; a=rsa-sha256; cv=none; b=BNdB9KnqyBoNcTDpXtLJ3jmQMvRypVWE0wI1TAS8L6eiKoPxfhGD7V7b3ZxJhIWjs0+hXQ GKAkE6zXcpT1iFLezMkQhpfp3cQBibdpEPx1WYgDQABPLB1UbffDNqUOT66z3Ekr9jcEGg yj4I1Myz7RLU4r247MhnlbVCIvmsaNC+zPvgDwgbEykhJwnnKTw+xOeyyvpNjdkhNOopR/ R0vIKW+xWDjpyNanXg0Q/hD31XHfqCbFb2Y2uo97yKphpKaK7sHQs16SLc7nSWeA5n1afH lO27Acl5ToOuBBoLcgUdXIGhX3DAkLzhErwRkle5cmCOZUkssqsEzbocxzu2sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJl02pmVzdgw for ; Wed, 19 Nov 2025 11:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9cdf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:13:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 305382935a4f - stable/14 - arm/nvidia/tegra: Fix a couple of typos in kernel messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 305382935a4f9fb687f02d36efc2814c5bf88fb7 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:13:48 +0000 Message-Id: <691da66c.9cdf.41d064ff@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=305382935a4f9fb687f02d36efc2814c5bf88fb7 commit 305382935a4f9fb687f02d36efc2814c5bf88fb7 Author: Gordon Bergling AuthorDate: 2025-10-28 08:04:33 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:13:36 +0000 arm/nvidia/tegra: Fix a couple of typos in kernel messages - s/intialization/initialization/ - s/Cannott/Cannot/ - s/ivalid/invalid/ - s/wating/waiting/ (cherry picked from commit b87836e824ea40793317d551eb13a8e2814f83f9) --- sys/arm/nvidia/tegra_ahci.c | 2 +- sys/arm/nvidia/tegra_lic.c | 4 ++-- sys/arm/nvidia/tegra_mc.c | 2 +- sys/arm/nvidia/tegra_xhci.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm/nvidia/tegra_ahci.c b/sys/arm/nvidia/tegra_ahci.c index b2ca1f9e496b..3f314af2f098 100644 --- a/sys/arm/nvidia/tegra_ahci.c +++ b/sys/arm/nvidia/tegra_ahci.c @@ -526,7 +526,7 @@ tegra_ahci_ctrl_init(struct tegra_ahci_sc *sc) rv = sc->soc->init(sc); if (rv != 0) { device_printf(sc->dev, - "SOC specific intialization failed: %d\n", rv); + "SOC specific initialization failed: %d\n", rv); return (rv); } } diff --git a/sys/arm/nvidia/tegra_lic.c b/sys/arm/nvidia/tegra_lic.c index e1d641635351..6956dc0ca849 100644 --- a/sys/arm/nvidia/tegra_lic.c +++ b/sys/arm/nvidia/tegra_lic.c @@ -213,12 +213,12 @@ tegra_lic_attach(device_t dev) } sc->parent = OF_device_from_xref(parent_xref); if (sc->parent == NULL) { - device_printf(dev, "Cannott find parent controller\n"); + device_printf(dev, "Cannot find parent controller\n"); goto fail; } if (bus_alloc_resources(dev, lic_spec, sc->mem_res)) { - device_printf(dev, "Cannott allocate resources\n"); + device_printf(dev, "Cannot allocate resources\n"); goto fail; } diff --git a/sys/arm/nvidia/tegra_mc.c b/sys/arm/nvidia/tegra_mc.c index 4c567657a96b..76fe51b63f50 100644 --- a/sys/arm/nvidia/tegra_mc.c +++ b/sys/arm/nvidia/tegra_mc.c @@ -157,7 +157,7 @@ tegra_mc_intr(void *arg) if (stat & MC_INT_DECERR_VPR) printf(" - VPR requirements violated\n"); if (stat & MC_INT_INVALID_APB_ASID_UPDATE) - printf(" - ivalid APB ASID update\n"); + printf(" - invalid APB ASID update\n"); if (stat & MC_INT_INVALID_SMMU_PAGE) printf(" - SMMU address translation error\n"); if (stat & MC_INT_ARBITRATION_EMEM) diff --git a/sys/arm/nvidia/tegra_xhci.c b/sys/arm/nvidia/tegra_xhci.c index 2c2c69d177ea..3f0211f3ade4 100644 --- a/sys/arm/nvidia/tegra_xhci.c +++ b/sys/arm/nvidia/tegra_xhci.c @@ -818,7 +818,7 @@ load_fw(struct tegra_xhci_softc *sc) DELAY(100); } if (i <= 0) { - device_printf(sc->dev, "Timedout while wating for DMA, " + device_printf(sc->dev, "Timedout while waiting for DMA, " "state: 0x%08X\n", CSB_RD4(sc, XUSB_CSB_MEMPOOL_L2IMEMOP_RESULT)); return (ETIMEDOUT); @@ -835,7 +835,7 @@ load_fw(struct tegra_xhci_softc *sc) DELAY(100); } if (i <= 0) { - device_printf(sc->dev, "Timedout while wating for FALCON cpu, " + device_printf(sc->dev, "Timedout while waiting for FALCON cpu, " "state: 0x%08X\n", CSB_RD4(sc, XUSB_FALCON_CPUCTL)); return (ETIMEDOUT); } From nobody Wed Nov 19 11:14:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJlb2K0Pz6HY2y for ; Wed, 19 Nov 2025 11:14: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJlb1Wftz3Stk for ; Wed, 19 Nov 2025 11:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k0yKJPYafwftXPy2bBu2s14hW+T9t04D2OYT4Jmjc5A=; b=m1oHJ6M+ITi6krGQoLXV+OAxRdE4WqxmOSZrzD/6ERVy1yOpygHEtTortHJ0eVE88QtOd8 qeJ4Nuiro3EH2hueMEeQjNhjd9ydbotNJKiF1XynXuWpLa2tDYn/dUr37QMFdPhpvQ+8Eb 7lBZ0fUmxFo1TF8w0z5zTw9E4uKotdkqHPeoJ3GtYKnQX+viBpMS7oUmV0/oGhk0ZqHWot grAkpaP8bXNuueaUiI+arQRFrdk8MjPAf4DFjYQdEG35DsbEjL4Y9jTfP+zB0YQOj3539S 08USqBL1Msdq8U7M6gdCR57KIwdVz7YnZwuHgAcF4LcF8P1VO+3rjQf+9p1p2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k0yKJPYafwftXPy2bBu2s14hW+T9t04D2OYT4Jmjc5A=; b=QWyBfCPGkSG8Pss4nBd1xD6Z2QHy7g82SHkcsNXCzoc6fqLyn+8KjskuIb6LJCmov2LF4H VztKp0nZ2dltuQl1AkIPS4Ko3o9fjSN+3HpXjIDIKalbj3JnvhHrIWQfbsOX4bAo0ZQ2jl /v9ICVVR4sARnY2xxjJw7j+Us+KVFQs3nozjBq+u8TgSGP5qScCDW3mcrikfYFWUWO3wbm lMGIS/TlamoMP6OZeyG8EQue7/QBTGg+LIChYBFyIAnqFTjZMR27OQLy859MtpLKYb2kV5 jrcvrnTgLbuwA8I8x59qHbW1DrDAQmWTtIhe8zO37vblUj4PFMoylcgKrMKM7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550859; a=rsa-sha256; cv=none; b=s22rGHaSYG1DbrQsHwaTq79/Hn4XQBaD4jDXk6+pbT5EbAmBQ3CmXQwC8DapydZ5VpcOLJ AHUTxuYdOt+uwjeEXW9l/h/6p1+4lfY5GCdEZ7YLGv1j2OKKuIOowQ6jgCSvQlCpSgIUAA ih0d/kFzrbL9KuEWxWiOKIcldInghpUt0xYkNBVPU8wM99Z4PKsOGWp+vtGq77wlDNX/7x wo7Orbaw9pi1dSBdPhz/sfCluHWDwg/NwZXv6srmQ7fen/kgxM+f3zd3mIOyrz8ir/tbFV QZ/OIcddtioyXYno5zRv31F0xz1ZbbJdMQd502tasnYpqngGFEpq4RUB/p/kQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJlb170Hzf0v for ; Wed, 19 Nov 2025 11:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ac0b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:14:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 28fd874b5628 - stable/14 - hyper-v: Fix a couple of typos in kernel messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 28fd874b5628699590207f16fbb76a7862bced7a Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:14:19 +0000 Message-Id: <691da68b.ac0b.2d3a92ef@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=28fd874b5628699590207f16fbb76a7862bced7a commit 28fd874b5628699590207f16fbb76a7862bced7a Author: Gordon Bergling AuthorDate: 2025-10-28 08:07:28 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:14:09 +0000 hyper-v: Fix a couple of typos in kernel messages - s/tranparent/transparent/ - s/Unknow/Unknown/ - s/qury/query/ (cherry picked from commit 1ef6fef9d5c82a106ba8e42c1e087f9b5d1dfec6) --- sys/dev/hyperv/netvsc/if_hn.c | 6 +++--- sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c | 2 +- sys/dev/hyperv/utilities/hv_kvp.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index db5ebdfd65bc..24b0beac8075 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -3574,7 +3574,7 @@ hn_rxpkt(struct hn_rx_ring *rxr) } /* - * If VF is activated (tranparent/non-transparent mode does not + * If VF is activated (transparent/non-transparent mode does not * matter here). * * - Disable LRO @@ -3591,7 +3591,7 @@ hn_rxpkt(struct hn_rx_ring *rxr) do_lro = 0; /* - * If VF is activated (tranparent/non-transparent mode does not + * If VF is activated (transparent/non-transparent mode does not * matter here), do _not_ mess with unsupported hash types or * functions. */ @@ -7601,7 +7601,7 @@ hn_sysinit(void *arg __unused) */ if (hn_xpnt_vf && hn_use_if_start) { hn_use_if_start = 0; - printf("hn: tranparent VF mode, if_transmit will be used, " + printf("hn: transparent VF mode, if_transmit will be used, " "instead of if_start\n"); } #endif diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c index 70a5f414d986..f668405e3219 100644 --- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c +++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c @@ -2088,7 +2088,7 @@ create_storvsc_request(union ccb *ccb, struct hv_storvsc_request *reqp) break; } default: - printf("Unknow flags: %d\n", ccb->ccb_h.flags); + printf("Unknown flags: %d\n", ccb->ccb_h.flags); return(EINVAL); } diff --git a/sys/dev/hyperv/utilities/hv_kvp.c b/sys/dev/hyperv/utilities/hv_kvp.c index 92dc8ccb1db3..29f1ca4fcaa0 100644 --- a/sys/dev/hyperv/utilities/hv_kvp.c +++ b/sys/dev/hyperv/utilities/hv_kvp.c @@ -622,7 +622,7 @@ hv_kvp_process_request(void *context, int pending) } else { if (!sc->daemon_busy) { - hv_kvp_log_info("%s: issuing qury to daemon\n", __func__); + hv_kvp_log_info("%s: issuing query to daemon\n", __func__); mtx_lock(&sc->pending_mutex); sc->req_timed_out = false; sc->daemon_busy = true; From nobody Wed Nov 19 11:14:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJm84cTmz6HY8Q for ; Wed, 19 Nov 2025 11:14: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJm83lvkz3TC0 for ; Wed, 19 Nov 2025 11:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KPeQsf1OFI1D6ImgydGO/UMGfsusn3mcStIGjGVX1bg=; b=bi3/CDYyblOGRRCl3q6/+bu1KZgCLa0YOf/4dwNXOxjyPnQT7pc7HDIHJTMXOyJARLLT5Y a2OSIsAXoi+HfuddpIXttluufog9y/eWpZdCFRbAS6P2FixZ38yc/+ZVXJBxsN43ZzZkF1 dOBAk3OfUcQZqTzYEvaBhGq/U7jrwOLdJp3/zxy01Iboef5aD2YAcRs7S+iNqZvYDHR+PB Jikv1nGGVgROcX2A7FWOncof+B2k0R/mgOm7i9IMM8iPYGNXYtkR8lOMSBVmCYypKLh91+ 6f19pcSQlTis21KpYO/jchMrrnJHANgsE9b/malmUIEq3mHxkhcCGU/nmEemSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KPeQsf1OFI1D6ImgydGO/UMGfsusn3mcStIGjGVX1bg=; b=V5fzudO8h5OxqDl8TQsSDZKqvkhY6MqgfYerPIHwioqcY9iNNp696kXxjyRTXccVPDBmN6 Ih64Jp+Ux2GOqXPJdxs5fA2zym2y662VvmAYBj+u09DUzdNrgclJdwjRfzgpM90T+te7G4 9hsm04Nmu6fLrPBEuamJx9/BYnwyPFBWf8MM0o9AJmk/Zv/d+qbkAOQIGm+zDcZ+qVXxuy uNsHHqhLCgc1ADeIJWJCTwuqzRLVV9FXAJRm/lb8YKsEX7ihx4/FMHt9pa1yFZVa/wZC+X Lkqh8KNgjvS63Fc8RvxtglCPo8lHeaH0m7WdjHW+MGBmqHiYUv29VIrD34azjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550888; a=rsa-sha256; cv=none; b=nu8E/BMraHnGDRsKICmgKP+FuRolRB0KthRAmlSs1YZZ8Nd4muOid4PxIfXg98QiKU/9eI FX8cDps5vNURQRC2TjA9RNg67WWFIsqdjNK5xrWWsufzLy30zA6i8WRZ4oa8FaXSyp7PGe XBITEHT3tmdfeZeplSqo7xRmX2v0ZHAEoS5r2yAnxAZIbCr1Aq+cLP4NKvh9iBiqTRkmaB qAdERsuR8RgEUiLoX8Bs69A+Eub0xzxPesdrENVjIS/mbqCQLUOyI20Fg6HuX3B3rgTcHa +Xr0Vbl3ynk1p2bcsGlbA9FkLRtQ1SDL38k/QBM6pxtespjj1O40KRkfbpnRPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJm837BVzdm6 for ; Wed, 19 Nov 2025 11:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9c2d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:14:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 8f381ddfa4fc - stable/14 - ocs_fc(4): Fix a couple of typos in kernel messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f381ddfa4fc9943c1b7c1e75fd2eb0020e9caa6 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:14:48 +0000 Message-Id: <691da6a8.9c2d.5a5c0f4d@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8f381ddfa4fc9943c1b7c1e75fd2eb0020e9caa6 commit 8f381ddfa4fc9943c1b7c1e75fd2eb0020e9caa6 Author: Gordon Bergling AuthorDate: 2025-10-28 08:11:11 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:14:36 +0000 ocs_fc(4): Fix a couple of typos in kernel messages - s/unexpectd/unexpected/ - s/Unexected/Unexpected/ - s/niether/neither/ - s/sucessfully/successfully/ - s/Inavlid/Invalid/ - s/toplogy/topology/ (cherry picked from commit aa0cd9e5b4d21b11097e1c21a3c0eb23525c15c3) --- sys/dev/ocs_fc/ocs_device.c | 2 +- sys/dev/ocs_fc/ocs_els.c | 4 ++-- sys/dev/ocs_fc/ocs_gendump.c | 4 ++-- sys/dev/ocs_fc/ocs_ioctl.c | 2 +- sys/dev/ocs_fc/ocs_scsi.c | 2 +- sys/dev/ocs_fc/ocs_xport.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_device.c b/sys/dev/ocs_fc/ocs_device.c index 7f0c5526b1c3..d9c283541d3c 100644 --- a/sys/dev/ocs_fc/ocs_device.c +++ b/sys/dev/ocs_fc/ocs_device.c @@ -825,7 +825,7 @@ __ocs_d_init(ocs_sm_ctx_t *ctx, ocs_sm_event_t evt, void *arg) ocs_node_transition(node, __ocs_d_wait_topology_notify, NULL); break; default: - node_printf(node, "received PLOGI, with unexpectd topology %d\n", + node_printf(node, "received PLOGI, with unexpected topology %d\n", node->sport->topology); ocs_assert(FALSE, NULL); break; diff --git a/sys/dev/ocs_fc/ocs_els.c b/sys/dev/ocs_fc/ocs_els.c index c62f71d4eb4f..cf4f01477f69 100644 --- a/sys/dev/ocs_fc/ocs_els.c +++ b/sys/dev/ocs_fc/ocs_els.c @@ -314,7 +314,7 @@ _ocs_els_io_free(void *arg) ocs_list_remove(&node->els_io_pend_list, els); els->els_pend = 0; } else { - ocs_log_err(ocs, "assertion failed: niether els->els_pend nor els->active set\n"); + ocs_log_err(ocs, "assertion failed: neither els->els_pend nor els->active set\n"); ocs_unlock(&node->active_ios_lock); return; } @@ -363,7 +363,7 @@ ocs_els_make_active(ocs_io_t *els) } else { /* must be retrying; make sure it's already active */ if (!els->els_active) { - ocs_log_err(node->ocs, "assertion failed: niether els->els_pend nor els->active set\n"); + ocs_log_err(node->ocs, "assertion failed: neither els->els_pend nor els->active set\n"); } } ocs_unlock(&node->active_ios_lock); diff --git a/sys/dev/ocs_fc/ocs_gendump.c b/sys/dev/ocs_fc/ocs_gendump.c index 83155d90c3a3..6a1abfefadfc 100644 --- a/sys/dev/ocs_fc/ocs_gendump.c +++ b/sys/dev/ocs_fc/ocs_gendump.c @@ -153,7 +153,7 @@ ocs_gen_dump(ocs_t *ocs) ocs_log_test(ocs, "Failed to see dump after 30 secs\n"); rc = -1; } else { - ocs_log_debug(ocs, "sucessfully generated dump\n"); + ocs_log_debug(ocs, "successfully generated dump\n"); } /* now reset port */ @@ -219,7 +219,7 @@ ocs_fdb_dump(ocs_t *ocs) return -1; } - ocs_log_debug(ocs, "sucessfully generated dump\n"); + ocs_log_debug(ocs, "successfully generated dump\n"); } else { ocs_log_err(ocs, "dump request to hw failed\n"); diff --git a/sys/dev/ocs_fc/ocs_ioctl.c b/sys/dev/ocs_fc/ocs_ioctl.c index 71ba17d5f72a..d3cea434b2be 100644 --- a/sys/dev/ocs_fc/ocs_ioctl.c +++ b/sys/dev/ocs_fc/ocs_ioctl.c @@ -796,7 +796,7 @@ ocs_sys_fwupgrade(SYSCTL_HANDLER_ARGS) break; default: ocs_log_warn(ocs, - "Unexected value change_status: %d\n", + "Unexpected value change_status: %d\n", fw_change_status); break; } diff --git a/sys/dev/ocs_fc/ocs_scsi.c b/sys/dev/ocs_fc/ocs_scsi.c index af9fc798b01c..1bbf60b9014b 100644 --- a/sys/dev/ocs_fc/ocs_scsi.c +++ b/sys/dev/ocs_fc/ocs_scsi.c @@ -720,7 +720,7 @@ ocs_scsi_build_sgls(ocs_hw_t *hw, ocs_hw_io_t *hio, ocs_hw_dif_info_t *hw_dif, o case OCS_HW_DIF_BK_SIZE_520: blocksize = 520; break; case OCS_HW_DIF_BK_SIZE_4104: blocksize = 4104; break; default: - ocs_log_test(hw->os, "Inavlid hw_dif blocksize %d\n", hw_dif->blk_size); + ocs_log_test(hw->os, "Invalid hw_dif blocksize %d\n", hw_dif->blk_size); return -1; } for (i = 0; i < sgl_count; i++) { diff --git a/sys/dev/ocs_fc/ocs_xport.c b/sys/dev/ocs_fc/ocs_xport.c index d997ea245132..9e69bf0ed98f 100644 --- a/sys/dev/ocs_fc/ocs_xport.c +++ b/sys/dev/ocs_fc/ocs_xport.c @@ -482,12 +482,12 @@ ocs_xport_initialize(ocs_xport_t *xport) /* Setup persistent topology based on topology mod-param value */ rc = ocs_topology_setup(ocs); if (rc) { - ocs_log_err(ocs, "%s: Can't set the toplogy\n", ocs->desc); + ocs_log_err(ocs, "%s: Can't set the topology\n", ocs->desc); return -1; } if (ocs_hw_set(&ocs->hw, OCS_HW_TOPOLOGY, ocs->topology) != OCS_HW_RTN_SUCCESS) { - ocs_log_err(ocs, "%s: Can't set the toplogy\n", ocs->desc); + ocs_log_err(ocs, "%s: Can't set the topology\n", ocs->desc); return -1; } ocs_hw_set(&ocs->hw, OCS_HW_RQ_DEFAULT_BUFFER_SIZE, OCS_FC_RQ_SIZE_DEFAULT); From nobody Wed Nov 19 11:16:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJnm0ZJcz6HY3H for ; Wed, 19 Nov 2025 11:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJnl6v8Dz3Td3 for ; Wed, 19 Nov 2025 11:16:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/3+0oevW5kAO1/r9wX4p2qFqNDz+IveAnE4Qdv0NrAA=; b=DHUeuE3MGgfpNc2aj4J/jIYSiwwrpxjGiRRp86K2joB1k5lXm01aS1tFkecWzgiGFe3dvZ 3WLPreAwOVyoPRibbqiVQmXJ8RswC/bOS8r8FEg9SmFnirN8jbiDg5XKRrzSZDYoqzGbwu 4syfPqNfQKCccYEmTVxvLQVgoiu11+HjLYOcGvPoJvCbBS5xOCJn9zbUjnK5lWsntCItm7 O65fg8mvxs3Cx1j/+0h2TGQwtllUyXV5fU01jahadcgEtzgfuuv5Javv14Itphh0+d972q OeKy3mKg9saQwYsgbL98VujEq2g7KjX0Cs+MKOt/b1c8XoDwljt4UZyZcl5k0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/3+0oevW5kAO1/r9wX4p2qFqNDz+IveAnE4Qdv0NrAA=; b=RRK0OFjXnaMXa0HcjqFmxuU7uDuWzipK0kIc/eOV3f9yeKIxcYjDU6zJHboRC7hmoP0LMb U+y2v5CTxl5nipiqE37t4sZgLpx04ZTR2HXIg74wuC/Y2hkO0oVHip3qzDKNDbIBN06a4A ohNRusWsIvU6D9RwA3PHdJ2JAkkpJKhMkKSdOOyRNyZhn8WEsM053myNtMW9QuAqvs+Dpx M+K06ZswJqFnL1P4YXswH8MEvRNsW5iu5Jp35Czi265aLlLQUsj50gaQqomBEH+iYmPu50 I9Mn7ojkQR8SJjVitBwMUllsFRE15D+MaswAQpfcVOnHsUTKteugsWf66a8vxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550972; a=rsa-sha256; cv=none; b=yN7KPyQRZHLVMDZsaX59KF2y9NkEXFJI6PHVsB5EjnzJa2x5ESyKjnjs5S4X6b8e2rx7qj 4k0CRHZ5MkkEvFNh1bxnENO+UekWpBflHBbL62A8eZFSHLg4cpeeXS4n9mJuOY+4QWjJkG H0s7fSHFdQcnvh4mwizEeUygg6J4ySULJMcVYgzYaASb7heF0CsQDqRm0USQq4LJwpKo0K owMuAY/6byhOayz/H6e7NP/ukCa4PPSW8ton9Rkn9fZy2AjqLOO5dCyV7LdUyDRsx7deb/ Xg24GxPp0D6qQgIZWz1C9unS6xUxSqXLw+94e0y2AYhNCwVzOtyuBDIwsTEN0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJnl6Kyjzf5n for ; Wed, 19 Nov 2025 11:16:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9f6b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:16:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: f48472795049 - stable/14 - cam: Fix three typos in kernel messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f48472795049ea612dc062d1de04dabd41e3fdfb Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:16:11 +0000 Message-Id: <691da6fb.9f6b.e3d6daf@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f48472795049ea612dc062d1de04dabd41e3fdfb commit f48472795049ea612dc062d1de04dabd41e3fdfb Author: Gordon Bergling AuthorDate: 2025-10-29 08:23:51 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:16:01 +0000 cam: Fix three typos in kernel messages - s/maximun/maximum/ - s/queing/queueing/ - s/exhausing/exhausting/ (cherry picked from commit adfe14dcc2747a20dff961044d6817c507087327) --- sys/cam/ctl/ctl.c | 2 +- sys/cam/scsi/scsi_enc.c | 2 +- sys/cam/scsi/scsi_enc_ses.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 0c2c21ba42fa..b60a63e66032 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -2149,7 +2149,7 @@ ctl_remove_initiator(struct ctl_port *port, int iid) mtx_assert(&softc->ctl_lock, MA_NOTOWNED); if (iid > CTL_MAX_INIT_PER_PORT) { - printf("%s: initiator ID %u > maximun %u!\n", + printf("%s: initiator ID %u > maximum %u!\n", __func__, iid, CTL_MAX_INIT_PER_PORT); return (-1); } diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c index f93fd6e31861..4f779317b24d 100644 --- a/sys/cam/scsi/scsi_enc.c +++ b/sys/cam/scsi/scsi_enc.c @@ -734,7 +734,7 @@ enc_update_request(enc_softc_t *enc, uint32_t action) { if ((enc->pending_actions & (0x1 << action)) == 0) { enc->pending_actions |= (0x1 << action); - ENC_DLOG(enc, "%s: queing requested action %d\n", + ENC_DLOG(enc, "%s: queueing requested action %d\n", __func__, action); if (enc->current_action == ENC_UPDATE_NONE) wakeup(enc->enc_daemon); diff --git a/sys/cam/scsi/scsi_enc_ses.c b/sys/cam/scsi/scsi_enc_ses.c index 34e79b55ed51..40efb882d652 100644 --- a/sys/cam/scsi/scsi_enc_ses.c +++ b/sys/cam/scsi/scsi_enc_ses.c @@ -1627,7 +1627,7 @@ ses_process_status(enc_softc_t *enc, struct enc_fsm_state *state, } else { if (cur_stat <= last_stat) ENC_VLOG(enc, "Status page, exhausted objects before " - "exhausing page\n"); + "exhausting page\n"); enc_update_request(enc, SES_PUBLISH_CACHE); err = 0; } From nobody Wed Nov 19 11:16:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJpJ2fJbz6HYGy for ; Wed, 19 Nov 2025 11:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJpJ1xdsz3Tfk for ; Wed, 19 Nov 2025 11:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tm6LMQzOlsHLO2lE2dSujwd5bS9Gd4ThzkK1DiJYiGE=; b=WnjUArGpUk20hBky01ztLy3pdVunc4PTbGh/khlvcHLRl9Mvj9vPleVUBCGtqS3q8zp47o 5OZ1Xm20maJSldbJGXWwdengE8707FPZDXkQfJT5drc46HYGCYLUrWREjBbIwaBKzGuYIm BMSUnfOWQX0Om70db5uP1NOqJEoRuYpKWYdm1BepcppSvADLTfKpdKnMScSGyK2vIK1zF1 zuk/HaGFIk2h6tQ8DvtlIZb0arDPB+dHall6ycL/uFiKXWKQlfcCYpUnCM0XzotIPARQGF LSfUUdDgSkIpdXwVWVoG3rp0OKGSEbJSSeeJG7kONflfDuVvvbp8sKGNNz32Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tm6LMQzOlsHLO2lE2dSujwd5bS9Gd4ThzkK1DiJYiGE=; b=Dc9PDTRsdjLyr5lN45FW8EHVQ0QdM+DAluOOr6I76rWTiYZ8lzeZD2HYArnqM94Y7xHN99 jKE6KAhRw1aV5mMxfUspDMgA+uDYyf+3gtqPlAt1GYKvHjnxhWAzbwjgyFsUkERXL3ZoYW TEtAsM3YUmZ3TujdbP3Wi9eAoRM1ksPF9uwl1zV1TnpZmruDsQ1gzga+sw9q+BRM2vdp/T 71kwRB2dLFffxBS0cHbCamF+6aijGRxPB+SpfvG6jzroh7UhdOhweQ/yTXydSJpgSqnKpu nHqOM2owf/8TULZnlEDx8lt3a/Z0dp6S/PBowcqmPigWaX1F1ch+K94W5OAxyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551000; a=rsa-sha256; cv=none; b=UE/ewBP7cuiq06Hm4ja8vAld4upOtFvU+EL4WXJTVHX/2oX3cvUDfn2em5ufBlMswX50BG ygxdwoxQm+MQoKbs2p7ESXjfUTetE/LhmBMOJbPzhq2hcVmySs0VLMvrJKhEuZEJQATEkm bUDlv2To7dyzkcr3bIJGmTkzyGwSKY14OPFSLE10ULtaTlWPn+/darf9DShDXpEhZapGw0 4gh81kHoxggjc9ppURxWMmB6b6QbOr6ROfNEIqhG3JHHsvz2nS4fUiUdPHnTgIBjhfShH/ u45NZlvi6gaD9krj09LEZYGZUj6SK3K+SG32sei0SS1wRlFIc11a0OPixd23Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJpJ1THFzdm8 for ; Wed, 19 Nov 2025 11:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b287 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:16:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 17f4fc2bdbef - stable/14 - nfsclient: Fix a typo in a panic message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 17f4fc2bdbef631aa9e2812907615f4dd1400872 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:16:40 +0000 Message-Id: <691da718.b287.1a04f70f@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=17f4fc2bdbef631aa9e2812907615f4dd1400872 commit 17f4fc2bdbef631aa9e2812907615f4dd1400872 Author: Gordon Bergling AuthorDate: 2025-10-29 08:26:23 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:16:29 +0000 nfsclient: Fix a typo in a panic message - s/eroneous/erroneous/ (cherry picked from commit 08a6620093dc2786051bf6ae6f40ae048027021b) --- sys/fs/nfsclient/nfs_clrpcops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 387c5465618a..fe36119e08dc 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -9438,7 +9438,7 @@ nfsm_split(struct mbuf *mp, uint64_t xfer) pgno++; } while (pgno < m->m_epg_npgs); if (pgno == m->m_epg_npgs) - panic("nfsm_split: eroneous ext_pgs mbuf"); + panic("nfsm_split: erroneous ext_pgs mbuf"); m2 = mb_alloc_ext_pgs(M_WAITOK, mb_free_mext_pgs); m2->m_epg_flags |= EPG_FLAG_ANON; From nobody Wed Nov 19 11:17:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJpq325Sz6HYCD for ; Wed, 19 Nov 2025 11:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJpq2KVzz3TpH for ; Wed, 19 Nov 2025 11:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+gUqbqU+36DLt2uUfCOdXqkB8cFSo8iGaXLkVtGualU=; b=COhz948GLkNcDN6WWCJzZFIezc2nvcNM6OYRrFahL23hoeR3hk0l6EQXZZtaoKyTPwcGbT c/WzCH8Vw9p4I1IJvprhqDfB7Wq5aW52lU4XOX3ipSO8H6VFzZJiook/zeo510jpU+uhfN 61RThkEMInG1n8mhsf59IYdO+oNCTiQFxHCnb+WwUkJNHcwPylufhuJ+F7jv52l3yLugxY VZnOjdfPqVsVC+5SxNYsYwpH2Yzm5xSZwV3/8JE8dMZZ1q2vaBxeb2paXTeXcZh7zS83gp mqawmV6yrjed2ffZkGbwhqr49l1gnNNAAMU2WRcFOIJd4U6JZZkk94GuobcHtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+gUqbqU+36DLt2uUfCOdXqkB8cFSo8iGaXLkVtGualU=; b=Qd31QxnH5kudelh+xbv4ZXMXlBG5mOoEQN5AMxlKX3MIA1DnJMPKlwwbFCMKVtj5sqi8qQ 88wIwe1sDNBGaPkwPUTToa7RvQTds0xmv9PtANQ6+sYCRMFcEaUVIT5jM/lKiV8vX7xCm5 wTZk2CZ60UhKG2tlpj/4G40cdo3gu4+F1lKZAzXMoiJY8FrQ4nOyGv8xYkc3A3rwH1EEu1 cqDmMaX7jV+HAdlAnXCYr8v6/x4N3Iql4tYJ6qWWmHM5GQakAhlRxVYLjOuVmrvg89BpYY 8of0hRNWn22Q9sN+e1QkQMwtnzCw7T7YSymTFMnUnoS9td8kHOKHYvISR2vgHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551027; a=rsa-sha256; cv=none; b=GddFkU6ZA8Z4oX8CI9OA3T6zlKC3pujDc3I8JGrlyRYh5LXCJKAOZwj54H88SuRJm7sXXN RGx8t0r32QSa1perh29PDmoPn2/qt3TnViDz5jLd8PvgvtkrO81j9QATmiBlLJTmykMXbx W7STiA0SpXNCgVBm27Pnnk/nK1r4YfvR07rEn+v3JI+PAWD8BxMHphSI8TnXFIPq/elSyA 2lFWV9Ln7EYN6UFAFgZQOYavvQnVXuPzv3nAnZJkzNw3KgOYXkvn17g9oYLPAVpvOC87C7 D+xnDyKog825WC8iSYTMCNud/3Zx7CoZDl1vjcYSnEme2hEc3DtHadgCYWvu+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJpq1pxSzf3x for ; Wed, 19 Nov 2025 11:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b17e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:17:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: dac93faa4265 - stable/14 - aic7xxx: Fix a couple of typos in device messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dac93faa4265b68d9435bb229077463a52357376 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:17:07 +0000 Message-Id: <691da733.b17e.441124a9@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=dac93faa4265b68d9435bb229077463a52357376 commit dac93faa4265b68d9435bb229077463a52357376 Author: Gordon Bergling AuthorDate: 2025-10-29 08:29:08 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:16:54 +0000 aic7xxx: Fix a couple of typos in device messages - s/Reseting/Resetting/ - s/staus/status/ - s/referrenced/referenced/ (cherry picked from commit d1e39f3d6e5fce1a30a5713d522f87d83654c4bd) --- sys/dev/aic7xxx/aic79xx.c | 6 +++--- sys/dev/aic7xxx/aic7xxx.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c index 58b795a9d4ce..54b58d387488 100644 --- a/sys/dev/aic7xxx/aic79xx.c +++ b/sys/dev/aic7xxx/aic79xx.c @@ -2022,7 +2022,7 @@ ahd_handle_lqiphase_error(struct ahd_softc *ahd, u_int lqistat1) ahd_outb(ahd, CLRINT, CLRSCSIINT); ahd_unpause(ahd); } else { - printf("Reseting Channel for LQI Phase error\n"); + printf("Resetting Channel for LQI Phase error\n"); AHD_CORRECTABLE_ERROR(ahd); ahd_dump_card_state(ahd); ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE); @@ -8195,7 +8195,7 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb) AHD_UNCORRECTABLE_ERROR(ahd); break; case SIU_PFC_TMF_NOT_SUPPORTED: - printf("TMF not supportd\n"); + printf("TMF not supported\n"); AHD_UNCORRECTABLE_ERROR(ahd); break; case SIU_PFC_TMF_FAILED: @@ -8329,7 +8329,7 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb) break; } case SCSI_STATUS_OK: - printf("%s: Interrupted for staus of 0???\n", + printf("%s: Interrupted for status of 0???\n", ahd_name(ahd)); /* FALLTHROUGH */ default: diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 4d97d8ee6367..f071c55137bd 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -85,7 +85,7 @@ struct ahc_hard_error_entry { static struct ahc_hard_error_entry ahc_hard_errors[] = { { ILLHADDR, "Illegal Host Access" }, - { ILLSADDR, "Illegal Sequencer Address referrenced" }, + { ILLSADDR, "Illegal Sequencer Address referenced" }, { ILLOPCODE, "Illegal Opcode in sequencer program" }, { SQPARERR, "Sequencer Parity Error" }, { DPARERR, "Data-path Parity Error" }, @@ -483,7 +483,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat) aic_set_scsi_status(scb, hscb->shared_data.status.scsi_status); switch (hscb->shared_data.status.scsi_status) { case SCSI_STATUS_OK: - printf("%s: Interrupted for staus of 0???\n", + printf("%s: Interrupted for status of 0???\n", ahc_name(ahc)); break; case SCSI_STATUS_CMD_TERMINATED: From nobody Wed Nov 19 11:17:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJqW4Lyzz6HYH6 for ; Wed, 19 Nov 2025 11:17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJqW3hxVz3VCX for ; Wed, 19 Nov 2025 11:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fTeTJ/W0b/9Oj0jKjovNIg+7PUWMLdvZwnuNVkJagpM=; b=IRMtZi+RxeijYovm8Cy++2lCygdFoMSUz/JRPJfeNMKBzTi14mz8zu5NNXJCJXO5zOVHsG AXkMGtlvFIRwrP2PXuJgw5ntJ2TrSdIImlhxfQkga2ItZghqr2H7KIbsRetnQFT/hwgfpC Swd8yNzV+fsvLcBaaSofuZhkgEHCvRBPP3O1cXwkcDt5GnGOZTXipPGzb0vziydcramcpe j+0nHAnvV8IIouvdLtDbriOlf4KODC7ygbLRMPRzBSI+t7+HMiHdqxrk05C7PLfNA/TmPB jpPamlyMN0TZvp52XvfVXfDhVmSgLS0DuRL7vKLdXeFtBBfD6wRrw9P5YOL78w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fTeTJ/W0b/9Oj0jKjovNIg+7PUWMLdvZwnuNVkJagpM=; b=RvLPtQ/Jmb0CVvKxwgAOXsgEKF1UD6WyR4pGsgoiBmE6MUwDRxLbdYq5oYowP8XPZ6JYrW ugJb+0vhnruzcGhMwlvB+6UW4VP6Fu4yLC74JJ9DChkvPzZ55qy90mUsab2ODeb4ihhvW7 mSCxPdAza2G7lpYElqHlXGhcwKYwsZxhrCvW7VmUelvby0+r4dFrPGOpBiPjrVih6S64Ec muobiCQvpeQ8Y3K+xrWLZhGkf6EmQLpyTtY8mUtYieUZP4w6srCedzU+wGcmoSfkea2LiP fZlYyc+0D3mieUCAOGGaR67jgbpg5wwtv05EONq1vNvJXnjU2tFejulGpySeWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551063; a=rsa-sha256; cv=none; b=ACFQSVe1Mzm8C/zmodd/amv2ztOFOMLQ0DN16Kf5ZMq1ZD2GaT+93V/yLefxoJoHENvmse HWocRov2AU2bPVFvV0bjw/1WA6fK3ux+HDrgfo9DxgOu6iCKbOwXq11xilMNBM5uAKHZZ/ uX2loQsZvKU9clIarruo8pRK7XZuyd1HMdGmFC40SkVYijkdlDBk2/UcgDqL7uA+BQmcT4 pmTjEgn4OGkmLNAfKcUUTACDcYVrEJ5kBGmaTb3h9iss03zM+6GQkaA+HTHPKUxXuavjdx lLc5zO8kXJIwNGmPsk4cjNmrK7F9n6bOnDgxPXpF3JDV/mAZVvcOofQ2RHz8gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJqW34tnzdh2 for ; Wed, 19 Nov 2025 11:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b271 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:17:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 1a1eae617d3f - stable/14 - audit(4): Fix a typo in an kernel error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1a1eae617d3f3bf9e2bb48519d9f5abe204ba727 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:17:43 +0000 Message-Id: <691da757.b271.449a9eec@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1a1eae617d3f3bf9e2bb48519d9f5abe204ba727 commit 1a1eae617d3f3bf9e2bb48519d9f5abe204ba727 Author: Gordon Bergling AuthorDate: 2025-10-29 15:05:43 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:17:32 +0000 audit(4): Fix a typo in an kernel error message - s/Authenticateion/Authentication/ (cherry picked from commit 63af953e09ccd11f2f5b4d83b10cc231f691de46) --- sys/security/audit/bsm_errno.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/security/audit/bsm_errno.c b/sys/security/audit/bsm_errno.c index a26e3f174ce5..4016dbc157b1 100644 --- a/sys/security/audit/bsm_errno.c +++ b/sys/security/audit/bsm_errno.c @@ -515,7 +515,7 @@ static const struct bsm_errno bsm_errnos[] = { #else ERRNO_NO_LOCAL_MAPPING, #endif - ES("Authenticateion error") }, + ES("Authentication error") }, { BSM_ERRNO_ENEEDAUTH, #ifdef ENEEDAUTH ENEEDAUTH, From nobody Wed Nov 19 11:18:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJr418R4z6HY6h for ; Wed, 19 Nov 2025 11:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJr40Lxmz3Vg3 for ; Wed, 19 Nov 2025 11:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D8fMDZQ0Cdh47ixnrJEgDuBj2AYpuGyK76Cgj2Sc1x4=; b=JuI75G7roNR7l8Es5p6inO8A1uURE1qFqUtWFZYi1YEwg8ZLQyFgvAKaaAVBg4Nw5ZqgCu 1NiryfxaUDD0qq2OBp8tSGRzN2uz5cQbeMfEB3FFhf9hw7ZN/u4p8fULuKcT0PPhUyPBo2 LU24bCmjCi5aqODu+h43EOc2cx9DNalBWKqLYSwJ7hlTehWBAOBcgEPmFaoS4p35f62suN fX3ZkH6CK+MJcHaoo3x6IrPoCr0C58VijnDudFcZ0HeKcmxp1F5unVnD/mvjXz8kpFDQ9h h8ETfQLm4IrFudgjM6f4Rk2oo9H1pcbXiXZaxUEQB7/q84RwkO14fjgVCSKNJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D8fMDZQ0Cdh47ixnrJEgDuBj2AYpuGyK76Cgj2Sc1x4=; b=gUy9+Hw4rNB1HqNQfkYP33puXR/0Mc++YkdCyg6OBnygUDlL+ibqg4iHkKKH5FG92Stlvo 0H3pAjcKLTk7ZRudBXUNKi6AGQtS+Q2GcLhtpRwm3nAWpja2M44CyUQIFnHpG6vfJOI23r LKttHWBu9OGR7p+LUsgjwsvtx52BVYfNScDdHNGyXCvi3mW7xu2Yilw8AYKgJoGOwEy0/Z u4DDYhd9FLWzvMwTJZnmnqeq9mA36t8prafbJd4mwqApj8rgGlHlJIo/xbkSxZPIPLZGYe 9xh6qLgd1FblPNGNRaWq7zE8LK9okUEjYR48nAFWwgJJN7gmuYXEvQBkovU5wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551092; a=rsa-sha256; cv=none; b=uYk3pG5urPJ6fnT11tx+J6zfrffWULtG/w/e7VJxYGEKhmexeJXj2b2OHfo9sk2w2LcT+f 5nPsMUcMm52UziNiqrmolGnUYz8dFksO9twkxyAv25Rxv+Af4OFR4iWdigD0J+Nz0L2pPp 5uiP4mHGM2daXoGOtmRUVSaG3W8hR3cy8N2SJSdKohCH0XjdOKIU6xQc7KsbBTfXnyqkxm ZqLYV5um2+YURZSKUzNA4COR6KhQY9FkR7XaMdV10Tf3AIIJt/c7dWSX9w+U4Ge9m7d8Cy xUwTT3n83CtnwOSsB0k9nIDbAnwIfhw+TOVjk9hLl/MFNg/u1IsYu10LQvxx3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJr36p6xzdh3 for ; Wed, 19 Nov 2025 11:18:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id aae9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:18:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 6561d5296fb9 - stable/14 - usb(4): Fix typos in upgt(4) and zyd(4) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6561d5296fb96f921ca61f504e2e295fe963a146 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:18:11 +0000 Message-Id: <691da773.aae9.4aa52624@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6561d5296fb96f921ca61f504e2e295fe963a146 commit 6561d5296fb96f921ca61f504e2e295fe963a146 Author: Gordon Bergling AuthorDate: 2025-10-29 15:08:31 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:18:00 +0000 usb(4): Fix typos in upgt(4) and zyd(4) - s/frequence/frequency/ - s/finsihed/finished/ (cherry picked from commit 679976d8162004f879a1a0d5ca0c5d2ade5fa1bd) --- sys/dev/usb/wlan/if_upgt.c | 6 +++--- sys/dev/usb/wlan/if_zyd.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c index 55d231e2c655..4fee47ddbfe3 100644 --- a/sys/dev/usb/wlan/if_upgt.c +++ b/sys/dev/usb/wlan/if_upgt.c @@ -1172,7 +1172,7 @@ upgt_eeprom_parse_freq3(struct upgt_softc *sc, uint8_t *data, int len) sc->sc_eeprom_freq3[channel] = freq3[i]; - DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", + DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n", le16toh(sc->sc_eeprom_freq3[channel].freq), channel); } } @@ -1214,7 +1214,7 @@ upgt_eeprom_parse_freq4(struct upgt_softc *sc, uint8_t *data, int len) sc->sc_eeprom_freq4[channel][j].pad = 0; } - DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", + DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n", le16toh(freq4_1[i].freq), channel); } } @@ -1242,7 +1242,7 @@ upgt_eeprom_parse_freq6(struct upgt_softc *sc, uint8_t *data, int len) sc->sc_eeprom_freq6[channel] = freq6[i]; - DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", + DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n", le16toh(sc->sc_eeprom_freq6[channel].freq), channel); } } diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c index 2d75b5a5542c..54881a219879 100644 --- a/sys/dev/usb/wlan/if_zyd.c +++ b/sys/dev/usb/wlan/if_zyd.c @@ -825,7 +825,7 @@ zyd_cmd(struct zyd_softc *sc, uint16_t code, const void *idata, int ilen, if (error) device_printf(sc->sc_dev, "command timeout\n"); STAILQ_REMOVE(&sc->sc_rqh, &rq, zyd_rq, rq); - DPRINTF(sc, ZYD_DEBUG_CMD, "finsihed cmd %p, error = %d \n", + DPRINTF(sc, ZYD_DEBUG_CMD, "finished cmd %p, error = %d \n", &rq, error); return (error); From nobody Wed Nov 19 11:18:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJrp16qSz6HYNH for ; Wed, 19 Nov 2025 11:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJrp0DKyz3Vwj for ; Wed, 19 Nov 2025 11:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rz+SNczVM6PXsxv3WyBDf/GP6rKmckjURZwykxG+RSc=; b=bjG10WiCQqJcFxz+mmBvdrClwfpTCstHxIvU103oOU0F/7IsMgeskNhuv+4NcW+dl61jBJ s0hgAwCPsXul629ZTKJO1S4LY+9RaZms8vSyF5Jh/S6PaFIJChbyhYdFw4e9hfkEEKMRpG Ze1vJJFTDgDwp0xcnOT0XaE1d/sYilhDK9jvMmFiVr05p/Hro1WWaXa41l83IYUDsJmQ4D lWz8bc82/LAsbpIfXYMe27hJpiZjH4EhwhxLmtkHxmFvpsZOAB0J0LcjwZ1AgIUS7MDnwV zdIN9IYx/jVmGgwq8C4K6PPcsMpPkqS6boPVluyxChdX3tF2UcXTzyhTz/8DYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rz+SNczVM6PXsxv3WyBDf/GP6rKmckjURZwykxG+RSc=; b=gAk78xHolvG+A5sK5iiTiKDrlX3aMx1E/pii2dPZ4S9QLqnn7zKX4G54P9IqOjbH0oElrG SVFW6iTYxj4fvfo5ZbwVBXX6SzBMg54lpGsu4k6cYeBJlpGWv2sMA31BW2EFiKue0nimUU oKwPrP1lWTLdrR3XDLl9RpZRwZ8LCAOCUJGCeHTlZ9oKIpn/RdHTEYY+BblK2BANu6CIfR reevIbnPyISPJdQJx9R4CCrXOGcFIUOjoV0NizP9qCINexQTm5XuWnUoCufD24gflAF2eF kQCal4+ZKjodpG57Ypefvnuk1XFZdcy9KW1BruDmryRntTsFzFDg+IZPiUiy1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551130; a=rsa-sha256; cv=none; b=U7mADfS1U3T5jADlXJE4NSTFUEKfFhYtj24uB9SNPICKCGWpaHgRVTAt2+TdXr6O9jXylS H6ajSV9sQ3g1QX+MOj0cmYjDtDGxyzTi/vF5rnQ5pSKNYB49eRHVj+c/uIISPFSD9sF9H2 avE3yR7qpe4ieMLEsE9lwEZWzwrNPMYFgPDtBehjTA1iaEKhW9bXjiJqq7LH7D4envUM54 PhoVj74r/4jqf7AZy6gRErobzSZ1LRt5iMswktJ73Da7AoLrxhIFKaCEfjxM06xbdxDTq0 4ZxjR9dAtl2NmyCB8QQi4KFhVppBysT0gyEZX9GLGsF8/krpleK/Hs+jLdEquw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJrn6hFSzf3y for ; Wed, 19 Nov 2025 11:18:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a8f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:18:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 99ee702464b7 - stable/14 - geom(4): Fix typo in a kernel message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 99ee702464b7a579600e784d2d3ae272fe3e3934 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:18:49 +0000 Message-Id: <691da799.a8f5.11a5b60f@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=99ee702464b7a579600e784d2d3ae272fe3e3934 commit 99ee702464b7a579600e784d2d3ae272fe3e3934 Author: Gordon Bergling AuthorDate: 2025-10-29 15:10:09 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:18:39 +0000 geom(4): Fix typo in a kernel message - s/supressing/suppressing/ (cherry picked from commit 57b78a557b3ce07b1589c9c21debe97d45599391) --- sys/geom/geom_vfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/geom_vfs.c b/sys/geom/geom_vfs.c index 6caa570de250..d3f3782d5d96 100644 --- a/sys/geom/geom_vfs.c +++ b/sys/geom/geom_vfs.c @@ -154,7 +154,7 @@ g_vfs_done(struct bio *bip) g_print_bio("g_vfs_done():", bip, "error = %d%s", bip->bio_error, bip->bio_error != ENXIO ? "" : - " supressing further ENXIO"); + " suppressing further ENXIO"); } } bp->b_error = bip->bio_error; From nobody Wed Nov 19 11:19:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJsT50Ftz6HYNc for ; Wed, 19 Nov 2025 11:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJsT4MPzz3WMR for ; Wed, 19 Nov 2025 11:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sD3e+N761dYzYmzR8KY1DH+rfl5p6b/FYQDexyvfkV0=; b=Nkpyqgy5ItrAPmt0PdjUwmfjIS3hcmKKlwPviehgKIHkXw/3tDPY1IApuXdXwNP831fVyV 9xkU970wVvnLJpL4JsUrm5XDwq47fwzL69tW+Xz1mnEr/3yNI+3Enainprdbkv8cevT+N9 3xg+XdJNxpSLt2sRwQr1vmFtm0oeFlwjuajF5oadf5QrwWsZmqN30kR/lRPuV0Dlz1K2CS aFcXYF4cRS/VCPlBqGsbJCl+yRgZ8o2zhjJ68NDIj3P5Vfu1/bS8OHZB0FQBALGMGm0rd8 Q5XogZSbG1FhydhbNLwI/EaNMrijQif2knD5I9cqhT4c0sf+LZ/1S7Fl4WX3dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sD3e+N761dYzYmzR8KY1DH+rfl5p6b/FYQDexyvfkV0=; b=qbqppW4qGHYRWIiMF78XsHuWwUNcfK2Hjpt90R+Sa3sLuQkrTXmMvDWMLWt0nkpQ/6GlZe qBOpuPYDnWJJ5dKvy36iNoMBL1Mw2k+bdimF7Xqw9HCN3c2O9X6Ws37J3CTPxYvNfxhdbU xyLilH8eBBhXFT0IiGRQuzVbuDKBTiWr2hwcsSFE64H9EKHMJs1/7H5tmdLdX6lXBpnfP9 xrZ/X4BoyhOxDVzFrIqnjsxhizcjqws2vSzVx7yjqdL4JYHP4vrvTU1kNkUv2IUbMp4dsz R1DG1FjvXfMjWFu3kNLkvd8QZXnkBxZ3FQlld9mKRJa9FNIKtpCD1KjWo6MelQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551165; a=rsa-sha256; cv=none; b=rJvWu/KcTPN7J5QRBmNLM0B4y4idZFR3KOlqB53T15UOFVrMDRmpu4Jsbf1SDZMUviS5fR YHU0odh3dIAVB24UwXF9ckR00tqLcF5YAVFCKja1pRbBIajgmF1qzwH0Zm1tcXZumkXZn7 sLOMo2kQGCpleDpJw0hbRwJISVUvJNDRJA7Gy1DZIfqS0qsFl002xr3c5XIWanoBip0nAK PegOrn5BKsQX63jcEuj3Q1lTJO6v5TExDoT0OpSMqDKKjBvQXntW8QL2eqySwIKfqEFzx9 QV5vPXKz+ghKpl+UvghzMvgOZOxIBksD/YWonhD7MngGY63xBatULT/HpQuBfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJsT3xjpzf40 for ; Wed, 19 Nov 2025 11:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 99cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:19:25 +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: b41551753a2b - stable/14 - quot: Add tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b41551753a2baff6646e2958acb4a7fcd205b69c Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:19:25 +0000 Message-Id: <691da7bd.99cf.4af747a@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b41551753a2baff6646e2958acb4a7fcd205b69c commit b41551753a2baff6646e2958acb4a7fcd205b69c Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:55:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 11:19:07 +0000 quot: Add tests To facilitate the task, we change the comparison function so that users with equal filesystem usage are sorted by UID, and add an undocumented option that prevents quot from replacing numerical UIDs with names. We also switch from getfsfile(3) to getmntpoint(3) so the first line is identical regardless of whether we pass quot a mountpoint or a device. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53133 (cherry picked from commit aa870a1935bccb66e02c4c31630706768a3e7d74) (cherry picked from commit b5f3f1a661ab69986c3379fa4c9c2b38785933db) --- etc/mtree/BSD.tests.dist | 2 + usr.sbin/quot/Makefile | 5 +- usr.sbin/quot/quot.c | 11 ++++- usr.sbin/quot/tests/Makefile | 4 ++ usr.sbin/quot/tests/quot_test.sh | 101 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 3 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 6833d35bae76..214d6f6162cb 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1217,6 +1217,8 @@ .. pw .. + quot + .. rpcbind .. sa diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile index b18c37126448..1f87278f1bfa 100644 --- a/usr.sbin/quot/Makefile +++ b/usr.sbin/quot/Makefile @@ -1,7 +1,10 @@ +.include PROG= quot MAN= quot.8 -LIBADD= ufs +LIBADD= ufs util +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests WARNS?= 2 diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 7a7362dea996..5005622987dc 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -55,6 +55,7 @@ /* some flags of what to do: */ static char estimate; static char count; +static char noname; static char unused; static void (*func)(int, struct fs *, char *); static long blocksize; @@ -281,7 +282,7 @@ user(uid_t uid) usr--) { if (!usr->name) { usr->uid = uid; - if (!(pwd = getpwuid(uid))) { + if (noname || !(pwd = getpwuid(uid))) { asprintf(&usr->name, "#%u", uid); } else { usr->name = strdup(pwd->pw_name); @@ -308,7 +309,10 @@ cmpusers(const void *v1, const void *v2) u1 = (const struct user *)v1; u2 = (const struct user *)v2; - return u2->space - u1->space; + return (u2->space > u1->space ? 1 : + u2->space < u1->space ? -1 : + u1->uid > u2->uid ? 1 : + u1->uid < u2->uid ? -1 : 0); } #define sortusers(users) (qsort((users),nusers,sizeof(struct user), \ @@ -576,6 +580,9 @@ main(int argc, char *argv[]) while (--argc > 0 && **++argv == '-') { while (*++*argv) { switch (**argv) { + case 'N': + noname = 1; + break; case 'n': func = donames; break; diff --git a/usr.sbin/quot/tests/Makefile b/usr.sbin/quot/tests/Makefile new file mode 100644 index 000000000000..d4e64691f905 --- /dev/null +++ b/usr.sbin/quot/tests/Makefile @@ -0,0 +1,4 @@ +PACKAGE= tests +ATF_TESTS_SH= quot_test + +.include diff --git a/usr.sbin/quot/tests/quot_test.sh b/usr.sbin/quot/tests/quot_test.sh new file mode 100644 index 000000000000..7da9d23ca11f --- /dev/null +++ b/usr.sbin/quot/tests/quot_test.sh @@ -0,0 +1,101 @@ +# +# Copyright (c) 2025 Dag-Erling Smørgrav +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# Create and mount a UFS filesystem on a small memory disk +quot_setup() +{ + atf_check -o save:dev mdconfig -t malloc -s 16M + local dev=$(cat dev) + atf_check -o ignore newfs "$@" /dev/$dev + atf_check mkdir mnt + local mnt=$(realpath mnt) + atf_check mount /dev/$dev "$mnt" + echo "/dev/$dev:" >expect + printf "%5d\t%5d\t%-8s\n" 8 2 "#0" >>expect +} + +# Create a directory owned by a given UID +quot_adduid() +{ + local uid=$1 + atf_check install -d -o $uid -g 0 mnt/$uid + printf "%5d\t%5d\t%-8s\n" 4 1 "#$uid" >>expect +} + +# Perform the tests +quot_test() +{ + local dev=$(cat dev) + # Create inodes owned by a large number of users to exercise + # hash collisions and rehashing. The code uses an open hash + # table that starts out with only 8 entries and doubles every + # time it fills up. + local uid + for uid in $(seq 1 32); do + quot_adduid $uid + done + # Also create inodes owned by users with long UIDs, up to the + # highest possible value (2^32 - 2, because chown(2) and + # friends interpret 2^32 - 1 as “leave unchanged”). + local shift + for shift in $(seq 6 32); do + quot_adduid $(((1 << shift) - 2)) + done + # Since quot operates directly on the underlying device, not + # on the mounted filesystem, we remount read-only to ensure + # that everything gets flushed to the memory disk. + atf_check mount -ur /dev/$dev + atf_check -o file:expect quot -fkN /dev/$dev +} + +# Unmount and release the memory disk +quot_cleanup() +{ + if [ -d mnt ]; then + umount mnt || true + fi + if [ -f dev ]; then + mdconfig -d -u $(cat dev) || true + fi +} + +atf_test_case ufs1 cleanup +ufs1_head() +{ + atf_set descr "Test quot on UFS1" + atf_set require.user root +} +ufs1_body() +{ + quot_setup -O1 + quot_test +} +ufs1_cleanup() +{ + quot_cleanup +} + +atf_test_case ufs2 cleanup +ufs2_head() +{ + atf_set descr "Test quot on UFS2" + atf_set require.user root +} +ufs2_body() +{ + quot_setup -O2 + quot_test +} +ufs2_cleanup() +{ + quot_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case ufs1 + atf_add_test_case ufs2 +} From nobody Wed Nov 19 11:19:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJsW08jQz6HYLj for ; Wed, 19 Nov 2025 11:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJsV4wy5z3WDC for ; Wed, 19 Nov 2025 11:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dG7S1gfwSUU2XDEmGbSaKd60+6xrg3dN3EIiWrcm9MM=; b=xW9SFV8+9i7bI24U+pnKB/fjYCAaO1P1u5e8aeU9F9I5MLUvHyMN+UCaSdWFmPE3VhzgkQ AuKOSGPnrZaFBEveDocljoqEO4iVS+zG9RwuaSYEIErBrImaAesl/0niYYqOiJeLFPBRPi vu7mU4dTMvZDBJfgTidmAHRcg+lS9Jh1X4tlsWSdsCo8VE8L5jNqCSxDqEqwyMqHbZthuD We4atUcq/ixR/t+ETtEkiKVGEqxPcl17AtLB900T31pcH9nc4of/IioOohsk1p5Fhbi2oR LL8KU6yONMd/qY/+zTZbFovEg1YeC3ZYUfJqf5fx330nHD8j5RXru4KBgDnLmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dG7S1gfwSUU2XDEmGbSaKd60+6xrg3dN3EIiWrcm9MM=; b=w9iu/EPuaw4VYNZdrJjtT2n8HfwszxJyeUbtVtDzz1KOdPP/3IJn4QELS1cErJxhHQNfpu Qfuu2o+BPS2gaZAHQd9NymCGIzIqVqACLiWpmzJ5jrkg1dnDLcdq+2ljvqTe7I0RAuQlWo fdiCjpAXbPR2Nzj43TCvkIAF494raTTb+Vqax1uEFtVBsv70rNFwDd07Q46FnTe/uvx7Ey yKh7d7uHIkYWTNtaM6HPrFQ7dcYdggnWhMMKiH+R7GVoPSFA3CtxQsLea9W+YH0tSuDh/x AMFlkcYE7akA+9pMCPVGFoV8BcapazPOVQRYRgQ1jE3MFHTU7/Sjy5eWaK5AtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551166; a=rsa-sha256; cv=none; b=kRtGNj+4WmJvedqqXfyUaTj6TlSEFiKvtGwVpG6UVMgxLjXzG60zZq67+XFYsK196d9MfB G7YGAo26y1T81H072zsO1rQA9SEoBzheQ1oIU4Pr4sBzZuyr33pFnnXybHJUfNuUfIuKy6 4uwXouumgsFWbqKo3xdbWRWovkmEqfaaefbM1kaQeRHi7ryfwycJhOZwUcCzqiR71h9Bl6 mpq776n/7f9s/HCWEZLd4sZ9LvJZQoKt9DB8U7ArKWDO52/icxLPhcHMDDEMkYTEI1rYZi Hc6FPU4G87PZCYSgzxWU1IQVtQAlM3yYaCbj+OJPK9dBe4KaqdxcMHUti0ZmIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJsV4QGLzfF4 for ; Wed, 19 Nov 2025 11:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ab0c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:19:26 +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: 179fa1d81c73 - stable/14 - quot: Rewrite -n mode input parser List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 179fa1d81c73ab7ef231e17da73f230e4f8ee5a2 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:19:26 +0000 Message-Id: <691da7be.ab0c.7c3d009a@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=179fa1d81c73ab7ef231e17da73f230e4f8ee5a2 commit 179fa1d81c73ab7ef231e17da73f230e4f8ee5a2 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-14 14:28:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 11:19:07 +0000 quot: Rewrite -n mode input parser The existing parser was needlessly complicated and wildly inconsistent in how it handled invalid input. Rewrite using getline() and treat invalid input consistently: silently ignore lines that don't begin with a number, and print a warning if the inode number is out of range. PR: 290992 MFC after: 1 week Reviewed by: obrien Differential Revision: https://reviews.freebsd.org/D53726 (cherry picked from commit fa272a5276865a97b01823fe6546940eaaf1b164) --- usr.sbin/quot/quot.8 | 3 ++- usr.sbin/quot/quot.c | 47 ++++++++++++++++++++++------------------ usr.sbin/quot/tests/quot_test.sh | 19 ++++++++++++++++ 3 files changed, 47 insertions(+), 22 deletions(-) diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8 index 0338457f6aeb..b777aef7288e 100644 --- a/usr.sbin/quot/quot.8 +++ b/usr.sbin/quot/quot.8 @@ -27,7 +27,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 8, 1994 +.Dd November 13, 2025 .Dt QUOT 8 .Os .Sh NAME @@ -65,6 +65,7 @@ By default, all sizes are reported in 512-byte block counts. Given a list of inodes (plus some optional data on each line) in the standard input, for each file print out the owner (plus the remainder of the input line). +Lines that do not begin with a number are ignored. This is traditionally used in the pipe: .Bd -literal -offset indent diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 5005622987dc..877fccd35f16 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -40,9 +40,10 @@ #include #include +#include #include #include -#include +#include #include #include #include @@ -480,43 +481,47 @@ douser(int fd, struct fs *super, char *name) static void donames(int fd, struct fs *super, char *name) { - int c; - ino_t maxino; - uintmax_t inode; union dinode *dp; + char *end, *line; + size_t cap; + ssize_t len; + intmax_t inode, maxino; maxino = super->fs_ncg * super->fs_ipg - 1; - /* first skip the name of the filesystem */ - while ((c = getchar()) != EOF && (c < '0' || c > '9')) - while ((c = getchar()) != EOF && c != '\n'); - ungetc(c,stdin); - while (scanf("%ju", &inode) == 1) { - if (inode > maxino) { - warnx("illegal inode %ju", inode); - return; + line = NULL; + cap = 0; + while ((len = getline(&line, &cap, stdin)) > 0) { + if (len > 0 && line[len - 1] == '\n') + line[--len] = '\0'; + inode = strtoimax(line, &end, 10); + /* + * Silently ignore lines that do not begin with a number. + * For backward compatibility reasons, we do not require + * the optional comment to be preceded by whitespace. + */ + if (end == line) + continue; + if (inode <= 0 || inode > maxino) { + warnx("invalid inode %jd", inode); + continue; } errno = 0; if ((dp = get_inode(fd,super,inode)) && !isfree(super, dp)) { printf("%s\t",user(DIP(super, dp, di_uid))->name); /* now skip whitespace */ - while ((c = getchar()) == ' ' || c == '\t'); + while (*end == ' ' || *end == '\t') + end++; /* and print out the remainder of the input line */ - while (c != EOF && c != '\n') { - putchar(c); - c = getchar(); - } - putchar('\n'); + printf("%s\n", end); } else { if (errno) { err(1, "%s", name); } /* skip this line */ - while ((c = getchar()) != EOF && c != '\n'); } - if (c == EOF) - break; } + free(line); } static void diff --git a/usr.sbin/quot/tests/quot_test.sh b/usr.sbin/quot/tests/quot_test.sh index 7da9d23ca11f..fd3d6df7b021 100644 --- a/usr.sbin/quot/tests/quot_test.sh +++ b/usr.sbin/quot/tests/quot_test.sh @@ -15,6 +15,8 @@ quot_setup() atf_check mount /dev/$dev "$mnt" echo "/dev/$dev:" >expect printf "%5d\t%5d\t%-8s\n" 8 2 "#0" >>expect + printf "%s\n" "/dev/$dev" >ninput + echo "/dev/$dev:" >nexpect } # Create a directory owned by a given UID @@ -23,12 +25,25 @@ quot_adduid() local uid=$1 atf_check install -d -o $uid -g 0 mnt/$uid printf "%5d\t%5d\t%-8s\n" 4 1 "#$uid" >>expect + ls -di mnt/$uid >>ninput + printf "%s\t%s\n" "#$uid" mnt/$uid >>nexpect } # Perform the tests quot_test() { local dev=$(cat dev) + # Deliberately add invalid lines to our -n input before the + # valid ones to verify that quot does not abort on first + # error. Note that quot deliberately ignores initial lines + # that don't start with a number, and that after encountering + # at least one line that does start with a number, quot would + # previously terminate on encountering one that doesn't (now + # it simply ignores them). This also tests that we don't + # require whitespace between the inode number and the comment. + echo "0zero" >>ninput + echo "invalid" >>ninput + echo "-1minusone" >>ninput # Create inodes owned by a large number of users to exercise # hash collisions and rehashing. The code uses an open hash # table that starts out with only 8 entries and doubles every @@ -49,6 +64,10 @@ quot_test() # that everything gets flushed to the memory disk. atf_check mount -ur /dev/$dev atf_check -o file:expect quot -fkN /dev/$dev + # Test -n option + atf_check -o file:nexpect \ + -e inline:"quot: invalid inode 0\nquot: invalid inode -1\n" \ + quot -Nn /dev/$dev ; Wed, 19 Nov 2025 11:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJvj6SH9z3XGP for ; Wed, 19 Nov 2025 11:21:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xug/iisEJbhz/h7Gx/Gpt74qw0N6wEFGTXvpk6soXT0=; b=RtxUViDE0BV8d+28/IHYEwb4pPuQLxQ0A5NCgT0lg/17iuRa4JofHuOEcZ6V5ioFzt2NKi SOwBEedWh7xNllAbCbs83V/8MWZOWLCr321uvpyijEGl60mH1t6p3SUYnZkCfmAGSYvkTz OkSGCHWgpC+kN/GqonSN97bJUb/BrcEzaAJGiYQwF5dkc+gD2n1OeUeHIl/I9/hU1PUnU7 fJOhf8mZkguDKo9J8Av/g8veikvy7ZFdz2VXv+VGb8I2VVC5MLg+h3qfaWwBustTZ2pQ1O aJpyL/grxvEhAVBz36cdW254ePnf6gS4c0e4CNNU83cEFkECQD6l6b5MdPeT9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xug/iisEJbhz/h7Gx/Gpt74qw0N6wEFGTXvpk6soXT0=; b=iQ21wofggnBJsCAhnFTsUrITsq66o5Bs3wVj+ueuq2z238YbgdpNl9qe36hParjVvUa+2s s91TYrLvIBDFsdAamG+ILzHveyXLJdEhjgHGk61kT9TcfCgw1vjO1+xUziKNsSgoKO18Pf UTXGIZeTwrmoie5J8VyciDUjf/GpKJqchRNl7QbxnDHiXMkgnL/GuA2c4OMEtLsVwnx2Cb UPIqcGpSSzUrnUJocc2tAHkFZCej6hxnVsXLqGvk7yX211hHsv8YoapSAerE+zeIr7oxgt lTeHo3zuWeka7pIuAwyUbuCSZ0VGXKMxBy1pAVWaKM11ppV6XLfMzi8AoyUOWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551281; a=rsa-sha256; cv=none; b=Wur7tSULvRL3mzT8wLzEUIYz9vGFiKCmQKEb41jPHUMVet8Ugk52BGrpygrPuAqQua9H4Z DL4g4uB9MmU4RqNCBrjNgfMHE9ynms4K9uIrimoQOGov7xc2rFoIVSfwBLBNp4McxVfWvI 6BuYluiqagaxqfXkNRV6jQbKY05MTHNBxqCl1oTT50Uyo7axon0F6AsBnaNV5yj0i+QRd1 NqHSRRfe0XU/9gLA1z0S5RTmUjuanmAG/Bg7n3BJ7/DRGmzdw10dlWxdiDEK/hHyFxisUR bXuxf73XDp3FTFl3sOlXJG/AMI4MKuHK3Aziko+HOOHIogDbBMkAhwnAqYVWnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJvj4pc4zfTY for ; Wed, 19 Nov 2025 11:21:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bdb2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:21:21 +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: a2630fec78b6 - stable/13 - quot: Rewrite -n mode input parser List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a2630fec78b60844e68cae8b9e1f65b7322a5f05 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:21:21 +0000 Message-Id: <691da831.bdb2.4cb4b478@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a2630fec78b60844e68cae8b9e1f65b7322a5f05 commit a2630fec78b60844e68cae8b9e1f65b7322a5f05 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-14 14:28:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 11:20:30 +0000 quot: Rewrite -n mode input parser The existing parser was needlessly complicated and wildly inconsistent in how it handled invalid input. Rewrite using getline() and treat invalid input consistently: silently ignore lines that don't begin with a number, and print a warning if the inode number is out of range. PR: 290992 MFC after: 1 week Reviewed by: obrien Differential Revision: https://reviews.freebsd.org/D53726 (cherry picked from commit fa272a5276865a97b01823fe6546940eaaf1b164) (cherry picked from commit 179fa1d81c73ab7ef231e17da73f230e4f8ee5a2) --- usr.sbin/quot/quot.8 | 3 ++- usr.sbin/quot/quot.c | 47 ++++++++++++++++++++++------------------ usr.sbin/quot/tests/quot_test.sh | 19 ++++++++++++++++ 3 files changed, 47 insertions(+), 22 deletions(-) diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8 index 0338457f6aeb..b777aef7288e 100644 --- a/usr.sbin/quot/quot.8 +++ b/usr.sbin/quot/quot.8 @@ -27,7 +27,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 8, 1994 +.Dd November 13, 2025 .Dt QUOT 8 .Os .Sh NAME @@ -65,6 +65,7 @@ By default, all sizes are reported in 512-byte block counts. Given a list of inodes (plus some optional data on each line) in the standard input, for each file print out the owner (plus the remainder of the input line). +Lines that do not begin with a number are ignored. This is traditionally used in the pipe: .Bd -literal -offset indent diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 28a7173e7340..acde6e411091 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -40,9 +40,10 @@ #include #include +#include #include #include -#include +#include #include #include #include @@ -480,43 +481,47 @@ douser(int fd, struct fs *super, char *name) static void donames(int fd, struct fs *super, char *name) { - int c; - ino_t maxino; - uintmax_t inode; union dinode *dp; + char *end, *line; + size_t cap; + ssize_t len; + intmax_t inode, maxino; maxino = super->fs_ncg * super->fs_ipg - 1; - /* first skip the name of the filesystem */ - while ((c = getchar()) != EOF && (c < '0' || c > '9')) - while ((c = getchar()) != EOF && c != '\n'); - ungetc(c,stdin); - while (scanf("%ju", &inode) == 1) { - if (inode > maxino) { - warnx("illegal inode %ju", inode); - return; + line = NULL; + cap = 0; + while ((len = getline(&line, &cap, stdin)) > 0) { + if (len > 0 && line[len - 1] == '\n') + line[--len] = '\0'; + inode = strtoimax(line, &end, 10); + /* + * Silently ignore lines that do not begin with a number. + * For backward compatibility reasons, we do not require + * the optional comment to be preceded by whitespace. + */ + if (end == line) + continue; + if (inode <= 0 || inode > maxino) { + warnx("invalid inode %jd", inode); + continue; } errno = 0; if ((dp = get_inode(fd,super,inode)) && !isfree(super, dp)) { printf("%s\t",user(DIP(super, dp, di_uid))->name); /* now skip whitespace */ - while ((c = getchar()) == ' ' || c == '\t'); + while (*end == ' ' || *end == '\t') + end++; /* and print out the remainder of the input line */ - while (c != EOF && c != '\n') { - putchar(c); - c = getchar(); - } - putchar('\n'); + printf("%s\n", end); } else { if (errno) { err(1, "%s", name); } /* skip this line */ - while ((c = getchar()) != EOF && c != '\n'); } - if (c == EOF) - break; } + free(line); } static void diff --git a/usr.sbin/quot/tests/quot_test.sh b/usr.sbin/quot/tests/quot_test.sh index 7da9d23ca11f..fd3d6df7b021 100644 --- a/usr.sbin/quot/tests/quot_test.sh +++ b/usr.sbin/quot/tests/quot_test.sh @@ -15,6 +15,8 @@ quot_setup() atf_check mount /dev/$dev "$mnt" echo "/dev/$dev:" >expect printf "%5d\t%5d\t%-8s\n" 8 2 "#0" >>expect + printf "%s\n" "/dev/$dev" >ninput + echo "/dev/$dev:" >nexpect } # Create a directory owned by a given UID @@ -23,12 +25,25 @@ quot_adduid() local uid=$1 atf_check install -d -o $uid -g 0 mnt/$uid printf "%5d\t%5d\t%-8s\n" 4 1 "#$uid" >>expect + ls -di mnt/$uid >>ninput + printf "%s\t%s\n" "#$uid" mnt/$uid >>nexpect } # Perform the tests quot_test() { local dev=$(cat dev) + # Deliberately add invalid lines to our -n input before the + # valid ones to verify that quot does not abort on first + # error. Note that quot deliberately ignores initial lines + # that don't start with a number, and that after encountering + # at least one line that does start with a number, quot would + # previously terminate on encountering one that doesn't (now + # it simply ignores them). This also tests that we don't + # require whitespace between the inode number and the comment. + echo "0zero" >>ninput + echo "invalid" >>ninput + echo "-1minusone" >>ninput # Create inodes owned by a large number of users to exercise # hash collisions and rehashing. The code uses an open hash # table that starts out with only 8 entries and doubles every @@ -49,6 +64,10 @@ quot_test() # that everything gets flushed to the memory disk. atf_check mount -ur /dev/$dev atf_check -o file:expect quot -fkN /dev/$dev + # Test -n option + atf_check -o file:nexpect \ + -e inline:"quot: invalid inode 0\nquot: invalid inode -1\n" \ + quot -Nn /dev/$dev ; Wed, 19 Nov 2025 11:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJvn5Vpxz3XJC for ; Wed, 19 Nov 2025 11:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qh1vAZVxGa4nnmLETrV7z0v81Cybx95JhEE7lTyd57k=; b=LFse0BPGbHk5TTEYlI81Du8035cbApvjbmIsH/x2NZVHE2i/BxZ6Hnq8pdz1LxxXPsLHIM 0VQrD33xSkEPPdPsw2iqmjcBscCKOmWA7TAtMjXAzUmRlKZpVS7ls5U4JEZLtXSUkyqXh+ 6jJwq775QFu8Cbs64FXI1YJVzhjJtYVMOgNv1MUf7fqcC5UcNJn0I2cFtWVyy4XgImFTrx sjLz6GpOaLiibJLnY7ZXJdyBZ63pgUGyZTUeyE0MQiNbxbxLzSkOlkwOtSRWAJ6RoSsKCQ zruDKLN8K0UWPI7X1e3uUbdxdemCaMjxOqXTcFgolzE8d2KHQR1+/DGu66WiWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qh1vAZVxGa4nnmLETrV7z0v81Cybx95JhEE7lTyd57k=; b=gPzDgn3UKSElUP5fvr1TWvLH9FqhJ7QYK6eeu3b9piLq/dKKHdkU4FtM9lGuRatTSQZwUd up5SAPBEF0VmoNqyMZya560uKNqM+FV9dxbZGloSVYb0EdjAtQldhiIXxqth+4Q7Nz5vFy xDyGCEGL642izMYNCsSgwcky2PCZmsR4TDsk/m5Ibkdty8EfYF/THGRH9cE10M1t2o8+8s oOfWnTPeBmzfJ4PTpkJ18/zXEBw/kQziMR3bDbmaDuAefjbnQqVAS/Sas76ziqi3EyBmps tlAM1hCU6JpIujYWMYUwWiJcG23DPzRWSyIs6HCnNH0AFIVf3+a0L1E/9LXgpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551285; a=rsa-sha256; cv=none; b=c8CzGYkVx4CnSo7YqFWuPmlDU7dm+ZbqiAC/drjlCl9vY9G+i74GDsN1Day9xbpF4Rt1Ad oNSLhuDz0AuRwtIhiMptgPdNnMfQZumcwcEzSK7aEgDh2cvZBjVt7HnUvb8mesllV2n5xR hzoaMk13mu9Xy0PFb1JK3m0r2iAPGx7DYngnlMSgDkugaouZtA/Rvc3yDAms6C+k/052u7 B8ogw4kHSEVhx09LRn0Z5krHMj9nimq8YU+pYz++D3uwX4LuPDBIwX4uTifKYhuiS5mZAs 50ntMEGqLMwg2eQPcPqvcMETeJLuKzDX/lWrJts7GvlArZy0AD9z8ZrhpAUDUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJvn3z9pzf6B for ; Wed, 19 Nov 2025 11:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b7c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:21:20 +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: 29343c4b8f94 - stable/13 - quot: Add tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 29343c4b8f94f3e7a6f0d26fec8fda625773a4c3 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:21:20 +0000 Message-Id: <691da830.b7c9.95f0608@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=29343c4b8f94f3e7a6f0d26fec8fda625773a4c3 commit 29343c4b8f94f3e7a6f0d26fec8fda625773a4c3 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:55:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 11:20:30 +0000 quot: Add tests To facilitate the task, we change the comparison function so that users with equal filesystem usage are sorted by UID, and add an undocumented option that prevents quot from replacing numerical UIDs with names. We also switch from getfsfile(3) to getmntpoint(3) so the first line is identical regardless of whether we pass quot a mountpoint or a device. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53133 (cherry picked from commit aa870a1935bccb66e02c4c31630706768a3e7d74) (cherry picked from commit b5f3f1a661ab69986c3379fa4c9c2b38785933db) (cherry picked from commit b41551753a2baff6646e2958acb4a7fcd205b69c) --- etc/mtree/BSD.tests.dist | 2 + usr.sbin/quot/Makefile | 5 +- usr.sbin/quot/quot.c | 11 ++++- usr.sbin/quot/tests/Makefile | 4 ++ usr.sbin/quot/tests/quot_test.sh | 101 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 3 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index bbd0862c226b..5ae161ed5cd2 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1177,6 +1177,8 @@ .. pw .. + quot + .. rpcbind .. sa diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile index b18c37126448..1f87278f1bfa 100644 --- a/usr.sbin/quot/Makefile +++ b/usr.sbin/quot/Makefile @@ -1,7 +1,10 @@ +.include PROG= quot MAN= quot.8 -LIBADD= ufs +LIBADD= ufs util +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests WARNS?= 2 diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 7042acf07bc4..28a7173e7340 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -55,6 +55,7 @@ /* some flags of what to do: */ static char estimate; static char count; +static char noname; static char unused; static void (*func)(int, struct fs *, char *); static long blocksize; @@ -281,7 +282,7 @@ user(uid_t uid) usr--) { if (!usr->name) { usr->uid = uid; - if (!(pwd = getpwuid(uid))) { + if (noname || !(pwd = getpwuid(uid))) { asprintf(&usr->name, "#%u", uid); } else { usr->name = strdup(pwd->pw_name); @@ -308,7 +309,10 @@ cmpusers(const void *v1, const void *v2) u1 = (const struct user *)v1; u2 = (const struct user *)v2; - return u2->space - u1->space; + return (u2->space > u1->space ? 1 : + u2->space < u1->space ? -1 : + u1->uid > u2->uid ? 1 : + u1->uid < u2->uid ? -1 : 0); } #define sortusers(users) (qsort((users),nusers,sizeof(struct user), \ @@ -578,6 +582,9 @@ main(int argc, char *argv[]) while (--argc > 0 && **++argv == '-') { while (*++*argv) { switch (**argv) { + case 'N': + noname = 1; + break; case 'n': func = donames; break; diff --git a/usr.sbin/quot/tests/Makefile b/usr.sbin/quot/tests/Makefile new file mode 100644 index 000000000000..d4e64691f905 --- /dev/null +++ b/usr.sbin/quot/tests/Makefile @@ -0,0 +1,4 @@ +PACKAGE= tests +ATF_TESTS_SH= quot_test + +.include diff --git a/usr.sbin/quot/tests/quot_test.sh b/usr.sbin/quot/tests/quot_test.sh new file mode 100644 index 000000000000..7da9d23ca11f --- /dev/null +++ b/usr.sbin/quot/tests/quot_test.sh @@ -0,0 +1,101 @@ +# +# Copyright (c) 2025 Dag-Erling Smørgrav +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# Create and mount a UFS filesystem on a small memory disk +quot_setup() +{ + atf_check -o save:dev mdconfig -t malloc -s 16M + local dev=$(cat dev) + atf_check -o ignore newfs "$@" /dev/$dev + atf_check mkdir mnt + local mnt=$(realpath mnt) + atf_check mount /dev/$dev "$mnt" + echo "/dev/$dev:" >expect + printf "%5d\t%5d\t%-8s\n" 8 2 "#0" >>expect +} + +# Create a directory owned by a given UID +quot_adduid() +{ + local uid=$1 + atf_check install -d -o $uid -g 0 mnt/$uid + printf "%5d\t%5d\t%-8s\n" 4 1 "#$uid" >>expect +} + +# Perform the tests +quot_test() +{ + local dev=$(cat dev) + # Create inodes owned by a large number of users to exercise + # hash collisions and rehashing. The code uses an open hash + # table that starts out with only 8 entries and doubles every + # time it fills up. + local uid + for uid in $(seq 1 32); do + quot_adduid $uid + done + # Also create inodes owned by users with long UIDs, up to the + # highest possible value (2^32 - 2, because chown(2) and + # friends interpret 2^32 - 1 as “leave unchanged”). + local shift + for shift in $(seq 6 32); do + quot_adduid $(((1 << shift) - 2)) + done + # Since quot operates directly on the underlying device, not + # on the mounted filesystem, we remount read-only to ensure + # that everything gets flushed to the memory disk. + atf_check mount -ur /dev/$dev + atf_check -o file:expect quot -fkN /dev/$dev +} + +# Unmount and release the memory disk +quot_cleanup() +{ + if [ -d mnt ]; then + umount mnt || true + fi + if [ -f dev ]; then + mdconfig -d -u $(cat dev) || true + fi +} + +atf_test_case ufs1 cleanup +ufs1_head() +{ + atf_set descr "Test quot on UFS1" + atf_set require.user root +} +ufs1_body() +{ + quot_setup -O1 + quot_test +} +ufs1_cleanup() +{ + quot_cleanup +} + +atf_test_case ufs2 cleanup +ufs2_head() +{ + atf_set descr "Test quot on UFS2" + atf_set require.user root +} +ufs2_body() +{ + quot_setup -O2 + quot_test +} +ufs2_cleanup() +{ + quot_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case ufs1 + atf_add_test_case ufs2 +} From nobody Wed Nov 19 11:22:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJxR5h46z6HYky for ; Wed, 19 Nov 2025 11:22: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJxR4tjCz3Xlt for ; Wed, 19 Nov 2025 11:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B1oIOitd64za4DWfEd8oWTlcMkVx284KS8F5GtA9VZA=; b=WwEu3a+Frh1CKJ2CLjx9dhmiJQ2q171ruqZoPgiMBjLRNrREAaKZ4+ip1MxWvNCwS1PZhz KeJEkejWlWCPBf2XyZEuC9mFLytEtF0NvEI2JbaxH4AIJ7kzyeHsioZlTwYeIlXu94wdsV Mt/84ipGJD+xOP2L/fED8jwQT8iyBvPDOjSsT/+jX1qqMPNHdRGiuGPMxafXxR5OVkEZg3 THfCAArXz5A/Sn9zC3FjlpjMX7NionjeXUfZ4E0VT/QXXlqd5q6niGDq1L/lcJiA2t11oW GzKvWdxDSw1c2MgnJQH3kiwBg8P5zsFyDMvMqPtU7S8ZCZYIKuCkbB5DEG9d4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B1oIOitd64za4DWfEd8oWTlcMkVx284KS8F5GtA9VZA=; b=qzX3RsEndz4wxUt0A9lfmC/F5fSKx4+VsSu2G+v9M7foX6JsmBf0O6P41xPdVi64WNRrLL 7To9FXAWtPCadQZTHPIPDYxuhHD1Bvux4vMmVmM5Vd9xwLwMT5Y+rumgk9Q7W6MITKQxj7 HJYot00r9MKOLdL4IavQc32Fze9VJJjkt5G+l/QRtOFK0eH+LzwQf0lBON0evMhWCEwLBN o35HwFEHdLqRFYBhs5uhdMtScNz9JIHyMSiSWvIYQXZS90dy51QXykGXzZIooK9uf9vs3G x7I7Ywpv1ilFwTJ6Y6faFThoPHnj4oGVfjQ+nHZSe7SoDRVRnwJYc2PZc6QWwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551371; a=rsa-sha256; cv=none; b=x50vmeXrDUy0hnLl4mCZd6OzflTnHRCyYBtvVSSqnruWliAWlU/iuuSsv0bIhX1KyAQtQD jGmCzidwDTtINDGTAGZBuPxXyNSJ4opoeMgAcTLHRqJvCQ2aUSdAco1nm7/P6qizvWwCp+ BZrhlB2sGKT0FNtIenrTmrCRqPzjaAvzPIr4yW6ZL0djO58RLX+Vm5p86kqSbIwUjNqCPm 9/I6kTNSUg0Z9dsKYY03tNGm47tR9M4QaCcFdIxrJKod2MRmUua4shssDnXdja4vriJgvV W3i5JJmq38m7AYXEfPCMso9/WvfNCd4HViePrUSAnIK3jzteISGlMVNsolpWhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJxR4MsNzf4j for ; Wed, 19 Nov 2025 11:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b7cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:22:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a7ce2f34b43e - stable/14 - arm/mv: Fix typo in a kernel error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a7ce2f34b43e102595b7eb31248726b5d8da63e0 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:22:51 +0000 Message-Id: <691da88b.b7cd.1c5ce917@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a7ce2f34b43e102595b7eb31248726b5d8da63e0 commit a7ce2f34b43e102595b7eb31248726b5d8da63e0 Author: Gordon Bergling AuthorDate: 2025-10-29 15:12:52 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:22:43 +0000 arm/mv: Fix typo in a kernel error message - s/Unkown/Unknown/ (cherry picked from commit b074d146969d3097c1e144623360b36083d74927) --- sys/arm/mv/mv_cp110_icu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/mv/mv_cp110_icu.c b/sys/arm/mv/mv_cp110_icu.c index c29a22538622..deab2e2c4626 100644 --- a/sys/arm/mv/mv_cp110_icu.c +++ b/sys/arm/mv/mv_cp110_icu.c @@ -258,7 +258,7 @@ mv_cp110_icu_init(struct mv_cp110_icu_softc *sc, uint64_t addr) WR4(sc, ICU_SETSPI_SEI_AH, (addr >> 32) & UINT32_MAX); break; default: - panic("Unkown ICU type."); + panic("Unknown ICU type."); } sc->initialized = true; From nobody Wed Nov 19 11:22:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJxT08njz6HYPS for ; Wed, 19 Nov 2025 11:22: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJxS5ngsz3Y1y for ; Wed, 19 Nov 2025 11:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6vkQHlsMD5TfDVaYTDd5eyAfbTdJSE01x78TRkpt714=; b=tkzVAVwPdr+FTdV3sFigFfmA7y0dIhN153cIhQfxdmo6EaYBOXzJC06cF8EU49lgKMvN+l TKWLhcQCBOIGabAp9rFi1K1VXTzhqzZwty98YMBo1iAQpBohXx0AEEqrvyFGMqpN+eaAaP 5FKazAjJcPatdKW1KAw8Iv6W5ORkkdY/KcRE7CT+nvP7OhAxBNvE63OqVlXJzYeCWg6kC1 UyIoPhBmRRK0TrKvW1B1JLBBpcADZPbgIAAkhybJ7NzYe8vLcO1Oexok/QigIp5M3Z1+x5 VbIOJfLaW+dbiaibuP69IVSCMf2nob2TGHavpsap47nW451XnQu4sY9z4ghxcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6vkQHlsMD5TfDVaYTDd5eyAfbTdJSE01x78TRkpt714=; b=GSKjm2NkhfxLrR1zbHy3m8aES6JEG+XcIqx9L2ELqPvK4LAKTQIGw/TUZpmHl3zB9CH+Jn GqWjAhVWfOrMzf9VexRPiPH4xDlbSBLXeMX00/JDA2wz4GgDpNddqGRu+Bhsqy6DkCFhiV VX7YyBSf6Nd9AjxCbsogKuoYAODcLf2WdOcwlNVhNXazmU4Zr4BE09Ww6SeZt6yYT7XFBA orIAIzVv0Gzmkj7q6e/zd0XF2wKPktAD8Xy/+N+pREIKOyL1eSPH4/uylHUmqn993Ug0jl W/n3ohdv4MlJIgpJuiyOl8T8K65z1P8de/T0v+veGdVd1siygdZoGFdU9SVJ4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551372; a=rsa-sha256; cv=none; b=Pqpz66AHCTR8qUfX5oTK8rzIZNA83Dcy30AeUIvAvruYPgo9Z7wK9CwCA9IMoMmCZOEyOw yRQiKE8hjs85TN5WV9filzFjnuPEXqUk2xddKZemhv74VVHeeuvLemY9qifVOGSeVze8dL uzLWmiaMv9iXIGOj+I+aScFYMrHPxUtA/RuRCMo66/vedXdHKpYqT8oigwNv10xoNEs8Bv HblvCXGE6ruGsZTtRe3s7ODbJAuFRK2k9AcnYd1RcSuGG7zWMlmG1BR/IX+/qO/K0NTcrv hxXkGEhmW0hJBVbvXA4a4x9cf4Uv853uwaRkwBDydBARJs5FHn/9TbztB0VEFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJxS57k5zdn0 for ; Wed, 19 Nov 2025 11:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b99b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:22:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 88b980ad9474 - stable/14 - arm/ti: Fix typo in a KASSERT message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 88b980ad94746c58a43dbf0f92e3e8c56f578d1a Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:22:52 +0000 Message-Id: <691da88c.b99b.b3d80fc@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=88b980ad94746c58a43dbf0f92e3e8c56f578d1a commit 88b980ad94746c58a43dbf0f92e3e8c56f578d1a Author: Gordon Bergling AuthorDate: 2025-10-29 15:14:23 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:22:44 +0000 arm/ti: Fix typo in a KASSERT message - s/patcket/packet/ (cherry picked from commit 862024c00f3126220ac425f9ec1f3d4286064688) --- sys/arm/ti/cpsw/if_cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c index 8cb748cfc119..f56dfc651260 100644 --- a/sys/arm/ti/cpsw/if_cpsw.c +++ b/sys/arm/ti/cpsw/if_cpsw.c @@ -1650,7 +1650,7 @@ cpsw_rx_dequeue(struct cpsw_softc *sc) port = (bd.flags & CPDMA_BD_PORT_MASK) - 1; KASSERT(port >= 0 && port <= 1, - ("patcket received with invalid port: %d", port)); + ("packet received with invalid port: %d", port)); psc = device_get_softc(sc->port[port].dev); /* Set up mbuf */ From nobody Wed Nov 19 11:22:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJxV062Tz6HYTb for ; Wed, 19 Nov 2025 11:22: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJxT621rz3XwG for ; Wed, 19 Nov 2025 11:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UfvrZZyXj+tUnyahH1L/UNBzvS8f74zuM6ZdcIh1DRw=; b=vlp4WXgmUPgyM1/PO5FoE3JuIoCBTyfJE2EbdQaCNb9tm3viW/XaW4nUp1O+2//5HyfdQp BYCXK/o1EKAHsfQoMdq5Gjs54jhzXkFStuPx3TIsRg1Y4bs+xV8cgveuMrBb9Vjaq0jojj j6NUeAQKr0HpSq/9PdPSO53yZZPQPQd7TzfaiSuqOnZ+SL5dgacAyb4vWtGCLRrcjO+fC3 TnvfuqdVj1DkQxKghPucPiZTel9xC8xLPq64IKTVNFBKq6gA9sGHpOxkH+t5cFVGiH7IDo OnTgaijTnp27cNrwUXMGRDAc/gyG6Mn6iJYvsmskSGZY3XdJIfp47pnhwArq/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UfvrZZyXj+tUnyahH1L/UNBzvS8f74zuM6ZdcIh1DRw=; b=eVSE5HazvnO2YvAUV2Sk0GAO38E4fmyToIvL6D5bpyHcYpoTAZcC8kkx8WrGqmvUyNYeUl 5Gwle99Ogu8R2RPKoM/b5wpXcnDne5eERjSCv3WZD0B0Bu46UggWzKDQlbyDxIs+L0x1UX ObZTxyxlvRHmuh4AHJ4xCHwtQN+RxntAHXWQOaaRNOzBk22ojeMqC91iQ9E1oV5wQZ7vp5 X5nYWAVSeEz4/oMqNWGzLxV/Ykrw/MXtuWbZl/lRGtuTEVoVM4z6pDBVo7OC8D/JH8MU1Z OGUrX3xUFZLAW1sFLBs0bhVilZN0Q7471qmNl3fCTSwlSoSuufH3VACiO39j8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551373; a=rsa-sha256; cv=none; b=L4JmwH6KElqJYH0vdNkGH9OkmQAW291i2Zr2Uo2IEIzR3msQsa2Je4+mPKGKscZsSUgWmp DVz/+wXyzGvCt0HwK1JiBXCxe5CvkX9KHjJ1o4LXNSwPcu/NDd+D4MJNAXvwuXlotiyKF2 TavRmhYJmkNGikuYrPOnM/0lSW21gSGi4ISHVp2JkuaUW+vaqvqMRagaSFg+1rzXfUzQm7 RnM1eVOW3tn6VkRhEY7u0ox2ssEctDtRanLCUM3lbuUXR7GfkdzGZcWyRDyXUT/qL2yBbl 2BxMV7dV8n1YBNZGJmcQ2x5XZllP9BYeVEbNex3nQeJZ/PVnmznng7l/msLKrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJxT5VnvzdyJ for ; Wed, 19 Nov 2025 11:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id abba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:22:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 18e3b0c3cd4f - stable/14 - tegra210: Fix typo in a kernel message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 18e3b0c3cd4ffc5e2a0b20de4d327ca37d51c568 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:22:53 +0000 Message-Id: <691da88d.abba.1f3c9d2a@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=18e3b0c3cd4ffc5e2a0b20de4d327ca37d51c568 commit 18e3b0c3cd4ffc5e2a0b20de4d327ca37d51c568 Author: Gordon Bergling AuthorDate: 2025-10-29 15:16:41 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:22:44 +0000 tegra210: Fix typo in a kernel message - s/volatge/voltage/ (cherry picked from commit 6a02851a0e346cbff074dab87807c9ee9d1e8d94) --- sys/arm64/nvidia/tegra210/max77620_regulators.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/nvidia/tegra210/max77620_regulators.c b/sys/arm64/nvidia/tegra210/max77620_regulators.c index 7743779a3fbf..f6cd97709ac9 100644 --- a/sys/arm64/nvidia/tegra210/max77620_regulators.c +++ b/sys/arm64/nvidia/tegra210/max77620_regulators.c @@ -365,7 +365,7 @@ max77620_get_sel(struct max77620_reg_sc *sc, uint8_t *sel) rv = RD1(sc->base_sc, sc->def->volt_reg, sel); if (rv != 0) { - printf("%s: cannot read volatge selector: %d\n", + printf("%s: cannot read voltage selector: %d\n", regnode_get_name(sc->regnode), rv); return (rv); } @@ -385,7 +385,7 @@ max77620_set_sel(struct max77620_reg_sc *sc, uint8_t sel) rv = RM1(sc->base_sc, sc->def->volt_reg, sc->def->volt_vsel_mask, sel); if (rv != 0) { - printf("%s: cannot set volatge selector: %d\n", + printf("%s: cannot set voltage selector: %d\n", regnode_get_name(sc->regnode), rv); return (rv); } From nobody Wed Nov 19 11:23:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJyD0JdGz6HYRy for ; Wed, 19 Nov 2025 11:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJyC5S9Sz3YkR for ; Wed, 19 Nov 2025 11:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cl6ZacvPsUmBRZC7t5Bo5f9PGyJ2MsicjYOfu0c2wxA=; b=FWM8poZAhqDlptW7O6vnxTknzg4kVsOUxLPHlzO5WbZkwj9LNPWmKUk/Gyk9I11OYZXMpT 0qcR3xZ1h8RsM9HnAdgINhEPTpL1iVcv+p35eeVqZGqRUMRXZ/eoLdfNvuKD+mH/ITZjdH WhC97OhAiyvCJ8wKdTlEEp9QDnCcB3iTWvHLliAUBAIUh5HZyWnZE9A1YXddW9XzE6TIaC RL3a0l2yBa7bYb0UOPE061p8VuH58IQ8m6YAvqTe538ULzaBlgYEnLbgG/RxB35ewnWmWE xdTcdJ75jTqUvBgcNIcuGLnBFfMfxQiUUsZDB1n9x3po485VZ6YOYY0NgGLHcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cl6ZacvPsUmBRZC7t5Bo5f9PGyJ2MsicjYOfu0c2wxA=; b=p7rry4+wkhCZMDqCr/V0Y8EQsOCVJaOnDnbrFcpRHDWV7I6gDsqpMnpN8WrShZPxj5rscY AJaihDtnssS7dsGmr+gp3EguVah6oO6ebl8hIDjoJrpzwgbSpEneT2509QotTQUSTop/EM QZt2YKNZ89Rt0hAA7rQsJPJSIhs+S43APBY9juFkkwEV2WubsseiVEi1VDDFRhqZDJZoKa F7XLALQxXbAK7kV2oyiUswONafAic4l+gFnQVuUFBCY81Bq3fQja40mgXDYHFn83Uf1D5J JWtLv9ZMj/1RJkd1MqxZV+rk6Xdw0qPLy884O3pNq7p5Jh1LDCgSJA9nfNHMNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551411; a=rsa-sha256; cv=none; b=u2pX7WdwMitWOPTm7P6hb/Ej8F0Efkaf4A1zUDP6YATFr/ByBVTGz7mS6+iRyw/5WZNWgB 3Lp0Aaom/YR12897k6fJ+MgN2kncd5dLpQS4Y1k/I56ydRGD42nEYrs0F1iXY5JnQh+2Ts 55PG8Zd/aPWGm0ZnKYFYG/ciLoZezmLunuerRDRzPvH+t1jLGNXc7PW73y+K87djSA5kxz LADlm4b0op449A4LP986jRNVjQ2JhKdv4j1nbx6FaIC7ZcGAj2MlnYOAAxu5t+ywdKx1WV qqpcu0mrGAYvCFyWFe5ceh8E9P613PPcruCLPVV5xlT5ah9VhPQ613x14OdaNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJyC546Wzdn3 for ; Wed, 19 Nov 2025 11:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id baa1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:23:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 5d82245e983e - stable/14 - acpi(4): Fix typo in a panic message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5d82245e983e5d610d6060e70735b7a620ce6c00 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:23:31 +0000 Message-Id: <691da8b3.baa1.9f72ca8@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5d82245e983e5d610d6060e70735b7a620ce6c00 commit 5d82245e983e5d610d6060e70735b7a620ce6c00 Author: Gordon Bergling AuthorDate: 2025-10-29 15:17:32 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:23:15 +0000 acpi(4): Fix typo in a panic message - s/depenedent/dependent/ (cherry picked from commit f51fb91d616d49e91f3c2c706263a38b98176911) --- sys/dev/acpica/acpi_pcib_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index f2b05a98a0d1..b5a106ee017d 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -199,7 +199,7 @@ acpi_pcib_producer_handler(ACPI_RESOURCE *res, void *context) switch (res->Type) { case ACPI_RESOURCE_TYPE_START_DEPENDENT: case ACPI_RESOURCE_TYPE_END_DEPENDENT: - panic("host bridge has depenedent resources"); + panic("host bridge has dependent resources"); case ACPI_RESOURCE_TYPE_ADDRESS16: case ACPI_RESOURCE_TYPE_ADDRESS32: case ACPI_RESOURCE_TYPE_ADDRESS64: From nobody Wed Nov 19 11:24:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJz00r6bz6HYVq for ; Wed, 19 Nov 2025 11:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJyz6ybSz3Z7K for ; Wed, 19 Nov 2025 11:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eF++AAjdVAnY6ixfRzl7AiRG/7ZAqbot+iaXczs/aN8=; b=mQYna49PNIRPbHGwpAKU6Fg/hJMmL/ud2YofrQAvf/pyc/gZipc1/6VsRoWRUfWcLc18d1 QJ0M0pbk/OiaviLUDYca/V+9olkmisx3cylISxIIdeay4FO5UvjeHE44cpxONZKm9IzeKV 6HRzfm8E9uUaVWHjRd81e9bXELWA44cFy12cM3uRobn0I7YdluSAasJvoOmaYhJF7TrwRw O2QdzLoSFpBaC68V94yOXoG7R/EWgSo9++f+sZ0+eUK0VDDyoaekdTY6Z5LomEb3bm/EZm tn018DK2ifOd6Yo5vI9mP16wOShIk3RcCARlipBFioRkQPSQwxO/Mj7mUCWLyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eF++AAjdVAnY6ixfRzl7AiRG/7ZAqbot+iaXczs/aN8=; b=hhOe+8pih6vnytvZLh/XXL9dnHajkuFfVPPZxeKuTH8qS6BjolGMKWjbtLMPF2oxZe1/Fv AImLgie79CkzOi+Ih+0MVHvQAcGllqQsT2IsnlYDCMSizCRtgojEHz49VY0CLV40YiiEWJ F68CxGwqk1strlWASzWrSsLSoYsYw64xq7ILUNz8rT6nTCY3CpkglnQfGnNJR5f+Hqqld3 dyCcGql6QK9E5R8eMXrVXYa+qbI68Ov4yfA+T+ls6Mcr6p4gYYqdSDmXXAocBl6XOh82zR 2zbAb9aeQBKtD0HrH/C2+X3MIQYwK0sFxQPoDgkawSRPRW0eKTW/BplLBer0nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551452; a=rsa-sha256; cv=none; b=K9Uh3PMvS7cRTYnIfzI8W8g1O/TzZAdVC4PWb6Cfecfd6GjvVooUGQhLvO/NoEYYxco2ZP D9BNFS0oQedVuyJ5xCe4roL/UH/TFEkvsLt376Kd0gTZ4auQqd/WYTh/0XVnjjVY2U9Q2u It4kqKn3puwHiCnF5s4PO4cLPBslYd7vlnI/A93IHzIZYJG5QC/hF7zP9gsERhi77rAkAq X8EMUjbOcHMXRk8T7J3srv97dGld0EL7eq4Qr4Yc/H1meFjypzacb7xT2c609okbzYO3uJ g+OufRyA7ZtGNzCPHSx+Wa5DpoaH8M0Yy8Qy0Ofs9S6SkefTBIYQ3QVgmkXSFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJyz6Yx0zf6k for ; Wed, 19 Nov 2025 11:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b91a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:24:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e8785943e769 - stable/14 - ale(4): Fix typo in a kernel message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e8785943e769708c15009ea2e04a2f9b0ea4c7ec Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:24:11 +0000 Message-Id: <691da8db.b91a.653b5f12@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e8785943e769708c15009ea2e04a2f9b0ea4c7ec commit e8785943e769708c15009ea2e04a2f9b0ea4c7ec Author: Gordon Bergling AuthorDate: 2025-10-29 15:18:31 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:24:02 +0000 ale(4): Fix typo in a kernel message - s/sequnce/sequence/ (cherry picked from commit a675f3bb63774a63f668749c6c3c8dfbb6be1cd6) --- sys/dev/ale/if_ale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c index e0b936994ada..70a0ace28929 100644 --- a/sys/dev/ale/if_ale.c +++ b/sys/dev/ale/if_ale.c @@ -818,7 +818,7 @@ ale_sysctl_node(struct ale_softc *sc) /* Misc statistics. */ ALE_SYSCTL_STAT_ADD32(ctx, child, "reset_brk_seq", &stats->reset_brk_seq, - "Controller resets due to broken Rx sequnce number"); + "Controller resets due to broken Rx sequence number"); tree = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "stats", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "ATE statistics"); From nobody Wed Nov 19 11:24:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJzW3fR3z6HYw5 for ; Wed, 19 Nov 2025 11:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJzW2wbjz3Zf2 for ; Wed, 19 Nov 2025 11:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M7I2pZ+cxWoxv0GpHEv5gY6nSH9oZWN9xMEyz4lMHwU=; b=C8tBTKNhGSnpvRRJhSLEHtYulA/rnlVXLTwBYqOUrtOWrgdYwhIOwBuUXPClsKp+DsCDka LR2qyl2ghxUcxf7j37s21DfU6byrnKbJro838D4hdSq9mEoIxeW22iy2dYLtViXSEb+ijj 928ZNhCAbyi+TIvJlxCj34OjNBF0siFbXateQV8ZaK6eTL1MV48O+7XEsRTRmmSGRuNHrf Q00A2W4baEmCIEgQ5x77ZHLLGfDv13GBUU5IiXJjKkjpmcxns7++RMUEwpRIunjz0TeSpH zCr+PF5U20YENUTIr2qVVDPgY8deM9s+f7D1s7yhqlE19GHIw9VqzZAdl4az4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M7I2pZ+cxWoxv0GpHEv5gY6nSH9oZWN9xMEyz4lMHwU=; b=SVh7dE4Wa6kZStG1moq1Ma5jinvutitWmd7DHHNLEKfZGd9DpAzIhzuRQ2aO3NA2pBd5VZ ma7MPd6s4vUiZ4a+SnYh40SOqdTPX2w69hYL+trG5ErAXIao9934butAF4mq9pQzfxag/y MQirsT+whBFyUhWhOh0yq+pj5EK9dqhXcIAGldaC6SYyG9IFa82XivZedW2bEhpYJntzVj iX/UQqD2vQV+xhpROW5q0FxN/ZpCh1EtpitRzlqr7npG4Udlz2jS5N/BYWa55BNtbifHZz l0qVUvgJUYUzTJWEyavlN2D1bBQvxOnSFZ7HKfSk+LaJLxh6F9D8s7en0cWaXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551479; a=rsa-sha256; cv=none; b=Gc10E2bp7dtR4Qxu5H3dEGMKXlLaa6xJWVOtjwluvsHAc3mpBrvUfBNg4TK19qMlilnUhy 7VxIIyoj645gZesFN1C1F4Smxw734Sui73i7kbrWg7sB4ltR/YvRX3Ix9F8mQ1RfE3ojyd vE7nGA5lTOqyBrDsSjcWChSBIgHx9kAi4QUvs+HSMzmPlC1U1QCsjTYTDY0UkHKVeeAY41 NanMvsLsKBoR9Zjr2dVQMecMEOyEZnPfATGdUHiU27wfC0+k9fMa6wo+q0ALozCAlVA00u E8fdmQ9vHQpnwhpQCy0ddwQ0bnawAx8C1E40IzWhNv70W1R3M7yWR4xhksHMhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJzW2Rjxzdn4 for ; Wed, 19 Nov 2025 11:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bb9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:24:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 07792c725bb4 - stable/14 - amdtemp(4): Fix typo in a sysctl description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 07792c725bb4c974222c61bb79ba80dbe70e018b Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:24:39 +0000 Message-Id: <691da8f7.bb9b.64e87ee7@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=07792c725bb4c974222c61bb79ba80dbe70e018b commit 07792c725bb4c974222c61bb79ba80dbe70e018b Author: Gordon Bergling AuthorDate: 2025-10-29 15:21:25 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:24:28 +0000 amdtemp(4): Fix typo in a sysctl description - s/temparature/temperature/ (cherry picked from commit 85d6c86f4b53e6ac2a9b163c553b48466638f394) --- sys/dev/amdtemp/amdtemp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c index 1305337112b6..12a451b05207 100644 --- a/sys/dev/amdtemp/amdtemp.c +++ b/sys/dev/amdtemp/amdtemp.c @@ -643,7 +643,7 @@ amdtemp_intrhook(void *arg) OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, sensor, amdtemp_sysctl, "IK", - "Current temparature"); + "Current temperature"); } } if (sc->sc_ich.ich_arg != NULL) From nobody Wed Nov 19 11:25:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK096cv7z6HYtG for ; Wed, 19 Nov 2025 11:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK095Sdtz3ZtX for ; Wed, 19 Nov 2025 11:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aiXFXiwIBBTlYhZHlnacjhRm5PoBLKIsFowHazGBZVk=; b=YjdVlOaDI/ax93cJ535UZ1rmSacJgN6DvqXxnrI61GbQT8j9LZr21G34D9cVeFd+PHyJxG +EK4o0qNQTbP/0HT2clR6NEstcp+RUzQRZ1ImbCzaxyai/WZwdYxO0ubY8KjVQJyiD5dQP GjWAqByZhd6fL2NKpAmVCif5e8KglrWNcYN6sMGOv03xMYlJx+pxzviObud06gRLH29WZR d95jEbXmsjIi6OLX7WTIMYimyXnfbtBET0zA/bBHkC89A7R040bRpvOz3VqiJ4y3oGjtrV R1sRhRwMTav+7VI43iGDnPkCiJfxe+T71WLECvUYFsiBmQF+AU07wneAO3TgxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aiXFXiwIBBTlYhZHlnacjhRm5PoBLKIsFowHazGBZVk=; b=OONcosIrysQRHw4zNpPYPh2RixRa8iGyjWwg7UJiM+y9xbtmtTsaj5ADqVK2PhcZ0aUFSe wneU3I1C99RBOq4s+omtHm4pzusLm0///0m2APn1Z9VSVVFZ8A3A2CK42b2fRbKOtLjawt PkKyXC/OTtOGDZZX4vRooCX+uQU4UkeKemhs5TOaGOL2WdAd7ELFOUqs5mwMLOC4+Q090J H1Ifmds9toDSygLcd9d0nZV7R1hol9LDh6CBXYGIuttRgFY/3JF5XlnhMWarUbeYzG0t5R uLcSGDDw6B55ZeGsd5lc07PkeLkqDBniVsnvgx7j54+aUguVKvTYDYA6azIRog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551513; a=rsa-sha256; cv=none; b=Oy191n/HVu7/myAVi/ffbnoFq2kE7Jm1BZkMzuIm300Jns9p1ZMz9rHxyH+cqfyBkaEvDq EKEW3/YNeDhmGMJuWwJhoYrpG7VPlDgCIYmAw/ZbIyIC0uJYS83KdXFfncOO1sx55m1Joe /lTkH1btqBLe2oiAWrvEYjO0KHDepR/aZbwVPdWHc1TNr0oWCW2BO4b2kfQma3N5nhKwuJ XrSh8VDqa3pkNqDKxva8iEyrWH8yQVrMa9GwTqxNtBtnTJkZbFzIoDrQqjVVW8Rn6BEaDu 4GIXW0crg/Y8QMMKNsyWD6mUL1OHhBexuGYyy+voiUa6GKIhw42p9yQhyF9new== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK0951ZbzfTw for ; Wed, 19 Nov 2025 11:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id abbe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:25:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: c1500bede861 - stable/14 - oce(4): Fix a couple of typos in a sysctl descriptions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c1500bede861e36ab48132bf54821c3657523f30 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:25:13 +0000 Message-Id: <691da919.abbe.3f048ef8@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c1500bede861e36ab48132bf54821c3657523f30 commit c1500bede861e36ab48132bf54821c3657523f30 Author: Gordon Bergling AuthorDate: 2025-10-29 15:24:00 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:25:02 +0000 oce(4): Fix a couple of typos in a sysctl descriptions - s/Fragements/Fragments/ - s/Recived/Received/ - s/Alignmnet/Alignment/ (cherry picked from commit 542f5985a8c2e7cccc9beb9801ec166082bb7e68) --- sys/dev/oce/oce_sysctl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/oce/oce_sysctl.c b/sys/dev/oce/oce_sysctl.c index 1b903d8d027a..544bec9438c4 100644 --- a/sys/dev/oce/oce_sysctl.c +++ b/sys/dev/oce/oce_sysctl.c @@ -716,7 +716,7 @@ oce_add_stats_sysctls_be3(POCE_SOFTC sc, "Total Received Bytes"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_frags", CTLFLAG_RD, &stats->rx.t_rx_frags, 0, - "Total Received Fragements"); + "Total Received Fragments"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_mcast_pkts", CTLFLAG_RD, &stats->rx.t_rx_mcast_pkts, 0, "Total Received Multicast Packets"); @@ -748,7 +748,7 @@ oce_add_stats_sysctls_be3(POCE_SOFTC sc, "Receive Packets"); SYSCTL_ADD_QUAD(ctx, queue_stats_list, OID_AUTO, "rx_bytes", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_bytes, - "Recived Bytes"); + "Received Bytes"); SYSCTL_ADD_UINT(ctx, queue_stats_list, OID_AUTO, "rx_frags", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_frags, 0, "Received Fragments"); @@ -786,7 +786,7 @@ oce_add_stats_sysctls_be3(POCE_SOFTC sc, "ERX Errors"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "alignment_errors", CTLFLAG_RD, &stats->u0.be.rx_drops_too_many_frags, 0, - "RX Alignmnet Errors"); + "RX Alignment Errors"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "in_range_errors", CTLFLAG_RD, &stats->u0.be.rx_in_range_errors, 0, "In Range Errors"); @@ -932,7 +932,7 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC sc, "Total Received Bytes"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_frags", CTLFLAG_RD, &stats->rx.t_rx_frags, 0, - "Total Received Fragements"); + "Total Received Fragments"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_mcast_pkts", CTLFLAG_RD, &stats->rx.t_rx_mcast_pkts, 0, "Total Received Multicast Packets"); @@ -961,7 +961,7 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC sc, "Receive Packets"); SYSCTL_ADD_QUAD(ctx, queue_stats_list, OID_AUTO, "rx_bytes", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_bytes, - "Recived Bytes"); + "Received Bytes"); SYSCTL_ADD_UINT(ctx, queue_stats_list, OID_AUTO, "rx_frags", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_frags, 0, "Received Fragments"); @@ -989,7 +989,7 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC sc, "CRC Errors"); SYSCTL_ADD_UQUAD(ctx, rx_stat_list, OID_AUTO, "alignment_errors", CTLFLAG_RD, &stats->u0.xe201.rx_alignment_errors, - "RX Alignmnet Errors"); + "RX Alignment Errors"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "in_range_errors", CTLFLAG_RD, &stats->u0.xe201.rx_in_range_errors, 0, "In Range Errors"); From nobody Wed Nov 19 11:25:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK0h1957z6HZ1t for ; Wed, 19 Nov 2025 11:25: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK0g6rWCz3bF5 for ; Wed, 19 Nov 2025 11:25:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dOrZJgUQ6unb7izFsW9ZalRX2T5BBbhNGrtM6b7PXzM=; b=M5Vc9W2/EIXxifQCiOu8PPsBFmIKsJ7lzpI920DLC1d6y4ZNXlXMR2Glk0x94L1T25ZZ0A A1+RZRmbwMQh2c5iYqqDps8UkcB7d/+NYbI2+Cb+sTiikQ5DpSMPbacAB3C1kXTD/KXmGt uYmitF/9WIgpDnVjbBvRnKTuDIXqVH5TvrCMgYysLBgBSBhkRiSVVUeaIuirLG4EcpLZPa jqCvcIuMUlSTyBxPb8SbzQ5mPWjlz91XP3RJYOYhJPC7LeWe+uALphUzIytFe6/fT0R3dV /122rnAGF45fmYqiC54DKJZDBMyYS7V/El6NuMQmNSWqSRjiT7QNj2KH7Y+hRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dOrZJgUQ6unb7izFsW9ZalRX2T5BBbhNGrtM6b7PXzM=; b=OnAjVgEGidQR7q5JLVggwdD2kfgyrwCFnmSiDBSTrEN2tbUY1nIB6EnuM0MhKAdIMNU94J Y6dnDiEmRF2Dvv1luWc2TiVIGZ1JVnTBjBPJl94vjh9CLUBxKAwEGNEwCVN5fka8DnnMyu uKFTA99QiEZCBMvViVESNltx607HcE+2b/EjQaeij3KOYU6g6NFjLnjDnH/3Mb8srl+vbU Zn7nPG0ijW/VOgxGhrkgQ34TgtRHKTBzcsWVggvaBYyBJGbFRrUzS9H5FmbgfnAavVeedn QVrGKlW4cQSdeGOvMnOhpwoDLbfVg01WXGOkUxLto5XXZN7aHymVp6dtq3EByQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551540; a=rsa-sha256; cv=none; b=kuxvgEUVSPRvvpKCTDK9tnIga80BMn6XxCjyC6eo+alKaOva1VpWuxKqwKKGei83eISmWr ryIRKNf94YWE9xtzHCOscWDPFN+5qY1V/Sd0WoL6y/a8ahsYYN0hvzsse497csstw3Raju QXOVpk7RM4qlOuoNHD5IaYv5YyH0ch6WOPi+3Re0Vpr+jQitiu55RrOmJXD+kGIF1FzPOK b+JNIqxPXYk+VYszvKyTNhOEINaqY6X+q5NY1YmmYh3tDhza38wd/sKL5rrZTOxkkdTrTu fOLLQ5VGsSrVMsjsEhWYJwH6q5QRpkRzuK5CQfFq7iCswBd51IbDBTrtUx/Otg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK0g6RmXzf6n for ; Wed, 19 Nov 2025 11:25:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bb1b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:25:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a24f891d999c - stable/14 - vnic: Fix a typo in a device messsage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a24f891d999cd6f2a91bd80af139cd329cd02115 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:25:39 +0000 Message-Id: <691da933.bb1b.7198fc89@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a24f891d999cd6f2a91bd80af139cd329cd02115 commit a24f891d999cd6f2a91bd80af139cd329cd02115 Author: Gordon Bergling AuthorDate: 2025-10-29 15:25:33 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:25:30 +0000 vnic: Fix a typo in a device messsage - s/interrups/interrupts/ (cherry picked from commit 74a44a0bc8ab965d28d1ce804d3f0aead035faf0) --- sys/dev/vnic/nicvf_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vnic/nicvf_main.c b/sys/dev/vnic/nicvf_main.c index dd44e420c78f..59f7abeacdd5 100644 --- a/sys/dev/vnic/nicvf_main.c +++ b/sys/dev/vnic/nicvf_main.c @@ -1402,7 +1402,7 @@ nicvf_allocate_net_interrupts(struct nicvf *nic) /* MSI-X must be configured by now */ if (!nic->msix_enabled) { - device_printf(nic->dev, "Cannot alloacte queue interrups. " + device_printf(nic->dev, "Cannot alloacte queue interrupts. " "MSI-X interrupts disabled.\n"); return (ENXIO); } From nobody Wed Nov 19 11:26:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK1B3fHgz6HYyM for ; Wed, 19 Nov 2025 11:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK1B2jxxz3bWq for ; Wed, 19 Nov 2025 11:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/2F942xFPnHMb7akXSVH4sdeL41VQQSyo9+fO83qows=; b=WYokD4Tjplk2nHX3HisgQ/wutf4AK636OiYGG+nLyQfu0ShHrOywihXsVv81M3t7sXxddv VmTOZCrv2WRZRs2x6aNfyxEiOYAtDptMd6CdN/sjNWNUKOT0GpNtDRjrN4W/pHAy+Xf9sD bzoNTHfRbK1M6P25NUMUKmRAeyxGEO+z69bOwWHVT4FeKyULQYz6NQGIUdrl/h0mGiIntF VSPrAGj57Zw7aMtEiYk70rRWa/Xa4aRdpcbfBCJ7rt/5E6OLykuJwFcPYJyooVbeLFL9oG mhecT+jx/eEbmNN3nrVx4rrLMtpHsU9jaMXZAj9WT+jWfIrzxF88F8TNyX9XvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/2F942xFPnHMb7akXSVH4sdeL41VQQSyo9+fO83qows=; b=RKhnho4tWgLyL+++m8dkWpwoFfnG3MeaRIcP17ii6oHjB5Ch4qwrAdKCLLDpYhqtUyIcuT WzXXSeAXOqOHkF68OspV5f3CoOy4h31vI9KI5aU7hUxNfsOa2+kayRnKVUiiezuI75z3ST tZ+s+rI1Q6b0my8EEHF+/IHziXzzly24aedhR1JZIojOmPanBFlO7Pw8dNAX13eiy88LkJ X+3iMPV62Gd3lO7VIpV+ivNeNwzZSnTx40nkuLgSeNs6MaJwiaUl4XNHXJdf6wjYA29goL 1jo4XEegI35RXgu36JxJFWkUa6EGCv0JIE0pMq26jHfVjGB8o1yfUSFS8PJ3ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551566; a=rsa-sha256; cv=none; b=Ouz8SJRpxDnnBtCYL+qL4OdiDIosKNjUa6yC8KgFUY6AWUQvlJnPsP8Won9jIrgPP6FQXS S3Q1QMXUq2HbzJvP4PnCNmA2EYrGIXOoYourihlyusHbMmTMSrzyCTK+7lR/HUm4PsBFEi YHZbXO0HSy7CCQ/6e6fRE1Jo6YDrJNqWXEpUWLFHs6bjoVxJRY2uDBuE/sR9LvFJxHUiHt 9RWi+iP2SjRcMhJUu/8RVjnKvEJiN3H7vtJCPbRCY7Xi6O/yFFJMUreYOb7nw72/vkcGQO kA7rBlZ4uBwha2KpDJzUh3V4L4ORwXxTraE666vQtr4HWGAhyFnM0wpjZbIoSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK1B2HkLzf6p for ; Wed, 19 Nov 2025 11:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bd2e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:26:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 5054789b93fa - stable/14 - ath(4): Fix a typo in a device messsage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5054789b93fac7625a46d51ce58e1a104dcd2d28 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:26:06 +0000 Message-Id: <691da94e.bd2e.67a1eec2@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5054789b93fac7625a46d51ce58e1a104dcd2d28 commit 5054789b93fac7625a46d51ce58e1a104dcd2d28 Author: Gordon Bergling AuthorDate: 2025-10-29 15:26:59 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:25:56 +0000 ath(4): Fix a typo in a device messsage - s/Orignal/Original/ (cherry picked from commit 3eaa2a852b475c7f063bbf677fa536e76514d309) --- sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c b/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c index a0c27828bbc1..50d7cc0aa7a8 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c @@ -76,7 +76,7 @@ ar5416IQCalibration(struct ath_hal *ah, uint8_t numChains) HALDEBUG(ah, HAL_DEBUG_PERCAL, "Start IQ Cal and Correction for Chain %d\n", i); HALDEBUG(ah, HAL_DEBUG_PERCAL, - "Orignal: iq_corr_meas = 0x%08x\n", iqCorrMeas); + "Original: iq_corr_meas = 0x%08x\n", iqCorrMeas); iqCorrNeg = 0; /* iqCorrMeas is always negative. */ From nobody Wed Nov 19 11:26:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK1n4rnNz6HYwk for ; Wed, 19 Nov 2025 11:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK1n46ncz3bWh for ; Wed, 19 Nov 2025 11:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pec13gA7IbXvnFP1igyzpkI5PDxvZP81+j1C6a1kxyo=; b=suqyi3vjkUmbn8fsVVXSJ3bPVca8vVGYyCwc92EYksHagROvOE/tE7lay8aGtmPPHc09HH gvs72D0F1k6qhTwqjUalRVT0SQxUt33BVjf7w7IuQ13OwogkTBtYy0DrEDe8BWa/6zKk+y 35L2j/LtlRaMs6z+GGJ6bEhRIoD/tm0Dtw49FSXxpb4frsVbZQB3S8bwAEq8ByFC1XruPW KKFuNx/hwvIrXxjr+5HnhRxfE8+T4eYByJaG8J5DeoZUJpOY2sdf21shm1VGkKgYwslW24 gNZiXq5aWb6zbjVDeqb6N/hSaUCvBuZdrhR6KVa8bTMPNSd1/bJGz4eFFTHGfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pec13gA7IbXvnFP1igyzpkI5PDxvZP81+j1C6a1kxyo=; b=wxrxoDFWpNQDIpJ1tmjnTkox1gGcVgh2ONhkeZVqW0hDWHApSvF+wdqWtiWRv8+hUFSAy0 psytn+JTp1GAVN/NFUzske+tuJ1FvjrgsbXu5Xo7BUAJEQL7sh6lwtnGVCJ/SNLQ3HEIdv WxRLtDnMtTr2yIOn1qbQkarpS1yAjFdOXDGFl9HIEVQkONJ/IIajdCKt+GTLzb323GS+cL d0gRgiln9dTtlghUMwFe9FMTRuQwrPkM9CRsQ3kGk0ALfP9aTcmykUqgjXb2K8qyqcmsCY JWdm+avQSk3veU2826LVTJOyFBYJ23yfn5bGHlWiJlNxV+fZiE+7StWGjW2vVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551597; a=rsa-sha256; cv=none; b=Lk7LHiQHbFoNI/iSgGOxCI5k1oP4uAFMhrUv6IYDZn8ooLaN4d6z3xz3YIaZdTc8970Y/c FeP1CphvSKIAG/SEojqIDRmWNLmCXqwWVOyWrHOmQokPB+mwW1TYQNikZaTHfB4U26X4Bo hxek1TW+QrEz4AX9LqMyRWfo5Zpj1BLEpBEeCoNCITJvrC11I6HxuRalHqDV0CkWTwm4p1 Kf5uYClFwNMj1Zue+n16eGcI9n6tck+iQaw0rcLxQQHvEpIg4+VG1sZr3VdZRDSEceHLhV yLm8JYysiA+LVe1AT9MlZCu8sYkK7B15pvkZJ8kZQnbKUb1Jaqw998ST/gVa/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK1n3RKzzf6q for ; Wed, 19 Nov 2025 11:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b91e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:26:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 08e65097a1f3 - stable/14 - bwi(4): Fix a typo in a panic messsage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 08e65097a1f3fb155e98a0ae9b9a7098cea8ffd4 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:26:32 +0000 Message-Id: <691da968.b91e.87efd78@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=08e65097a1f3fb155e98a0ae9b9a7098cea8ffd4 commit 08e65097a1f3fb155e98a0ae9b9a7098cea8ffd4 Author: Gordon Bergling AuthorDate: 2025-10-29 15:28:06 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:26:22 +0000 bwi(4): Fix a typo in a panic messsage - s/unsupport/unsupported/ (cherry picked from commit 404af374b10ca56c6f82510a5bb23232a9f25c34) --- sys/dev/bwi/if_bwi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bwi/if_bwi.c b/sys/dev/bwi/if_bwi.c index f9a6b2357cc0..44b16dba5f8a 100644 --- a/sys/dev/bwi/if_bwi.c +++ b/sys/dev/bwi/if_bwi.c @@ -2896,7 +2896,7 @@ bwi_plcp_header(const struct ieee80211_rate_table *rt, else if (modtype == IEEE80211_T_DS) bwi_ds_plcp_header(plcp, pkt_len, rate); else - panic("unsupport modulation type %u\n", modtype); + panic("unsupported modulation type %u\n", modtype); } static int From nobody Wed Nov 19 11:26:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK2D0m5Fz6HYqq for ; Wed, 19 Nov 2025 11:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK2D0C2Yz3c5q for ; Wed, 19 Nov 2025 11:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R2mhM39Qr1CJSuKfmuAbn1M/QbLPzfEQmB6ZQDwWazE=; b=Hy+NSSIlO7rMSCyxiLFuVk3qrD0a/ap5Ib4Bsi3XxrrQOoeSO3X9yg9V1FEE7HkYPFWPC3 10cSxa+lMuvb6lK0uKxmELL2yKtYl69VCtW0ySwDgeVwl5SFpWXXxGdo46TJgAntpvimA+ QWIt3RilRcD+CCbKHbxpQAmCni2vheBzLCVF3Jx8bsya2Syc7WuUtc2pDskTl/WmlaH5UM H8akPuhmd4uhR4TjYZeNS85G4jzx/xGoaKixEA6Buk/YZrCum5NSvOsZSLqzRvP7lz9Bzk 5/+hRc6iuhtB+o+5/BiZzJ1uZbdwRVWyz7EOAXcXKGKe1ReMwcVypl4JL19ZVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R2mhM39Qr1CJSuKfmuAbn1M/QbLPzfEQmB6ZQDwWazE=; b=UCjZt5S3y57IxskrsB66L+AlQhByn474TVusJ0bQP6gQ2vGpfOD6dsyM9qktDZrVH2UO6j Pvlv+Zhix568Id9VdtTCSVr1JCHy1/ZvWht3wrEP35mDqMzDgiYb7E2stAvGLEMOvzFuAn FryQp3RDdySYGscnUqY83qb/bvypcG9/qXIKalgafOFecCe3DNHliRyhA7YjKhGq0F/reA W1+lRhJhjiK53RO4uD8S4N8S+M5rwKMGbneV4yYt6e1PlwptzesO+91Z42HAIs65D5YNp2 TLMszkHzkZ+TcFRfaopzZgJC8qYc/q+YJ4KRIEHZOTSvVcrN/F7GeAP7846m7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551620; a=rsa-sha256; cv=none; b=U1FLcaqSOIjNUbcG7Cp1h9tFNyM3Q3UgEe0IKNDU4ar7+hF6HX3v3ZqVggljf89hHbuYa2 D2BeKX040nfzurst+dNlB+jZ9fm6UeC1SczbIwRTg6x2kjF5KK6E5L4mz9ET031zqLg5K7 NXyqDuhzxPi507CB9LwM9HfxEOHDIz3D1syZ83IZ0/tnAZ40xjbvC+hBv4UJ+MT4HxCGe4 jv/GcOHDHdp86DPoThrNVLmy/M2HQ+1TpLvoMC+ZDGeJjJG+OMO1o74/0L9Gd8lq0gqzP9 t8qtmXfO71xEG4bVnHgsbuAdVZwhnNMO/3nukYoeLKYB9xDxKCUItSpZyr/DXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK2C6svSzf1M for ; Wed, 19 Nov 2025 11:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bcfe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:26:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 27ef84d447aa - stable/14 - cesa: Fix a typo in a device messsage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 27ef84d447aa304ac5119630151e9c0bcdb118c0 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:26:59 +0000 Message-Id: <691da983.bcfe.7ad937c4@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=27ef84d447aa304ac5119630151e9c0bcdb118c0 commit 27ef84d447aa304ac5119630151e9c0bcdb118c0 Author: Gordon Bergling AuthorDate: 2025-10-29 15:35:35 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:26:49 +0000 cesa: Fix a typo in a device messsage - s/exhaused/exhausted/ (cherry picked from commit 081aa26778f3facdd836c28b2e3fed5de2f8b7b4) --- sys/dev/cesa/cesa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/cesa/cesa.c b/sys/dev/cesa/cesa.c index 516aaec45387..d7f7bf5ee48a 100644 --- a/sys/dev/cesa/cesa.c +++ b/sys/dev/cesa/cesa.c @@ -287,7 +287,7 @@ cesa_alloc_tdesc(struct cesa_softc *sc) CESA_GENERIC_ALLOC_LOCKED(sc, ctd, tdesc); if (!ctd) - device_printf(sc->sc_dev, "TDMA descriptors pool exhaused. " + device_printf(sc->sc_dev, "TDMA descriptors pool exhausted. " "Consider increasing CESA_TDMA_DESCRIPTORS.\n"); return (ctd); @@ -300,7 +300,7 @@ cesa_alloc_sdesc(struct cesa_softc *sc, struct cesa_request *cr) CESA_GENERIC_ALLOC_LOCKED(sc, csd, sdesc); if (!csd) { - device_printf(sc->sc_dev, "SA descriptors pool exhaused. " + device_printf(sc->sc_dev, "SA descriptors pool exhausted. " "Consider increasing CESA_SA_DESCRIPTORS.\n"); return (NULL); } From nobody Wed Nov 19 11:28:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK3T1b1Xz6HYyn for ; Wed, 19 Nov 2025 11:28: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK3T0zW5z3cTQ for ; Wed, 19 Nov 2025 11:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wW0eJkNhp1J+cd6+NF0gGf4urqV6VYc1+vcqmE3qKB4=; b=T3+jlwdTHhbjo6B3eaM06FYHIlBmIhsl/4AL1h0Z4n7qqekHo/ZkVegjMpzYfo+Vnxkzs3 bsijUTgCiUPGjqlqbCu159RSXRy3lzMg9Zn2x3IWSed4YDyxoXkpwfcXnulzoIhwEXVMbX k3ayQhi1M6C4EG/6Ire+JfBmv3P398S9d3+xh6dIQCly2sTbdzJgmOjl2k3PNqZKxVJkeB ge8h2B0abeJ9zIZ58i0gQ87mManb7cePNoRMzv0WgyQXbTY0HpJEEaAqfdPjMl7sefsB+F P1GPKSuwysRB4axBeIROrg4Mpue0HZUa/zRQvcCiV1+RgIEBYUIj8VG9u3gnrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wW0eJkNhp1J+cd6+NF0gGf4urqV6VYc1+vcqmE3qKB4=; b=ZSHNR2hul0f75s0o7qAUagWCfPqTBG2PCgKjMymgmuICnKuA/XCmmAWoIpI6LQpePu7i7W 8G1TmjmbP22zf4r35V5acq0tdgilcbI2Ak8DzxYZC5nS+jwwy5XBiXy/ynCaZWKdBIuNxC 4q9OsO4mBISSKUNVZYbzLP+p7xb44RtXjLYepDbG0/ORYRYUiWV1GT0iVPlBQZFD1wJSV1 5CqNFuP2pDbSdakjC1H7Bd26XxJTY8j6JvDWS1SfhJpe8ktWIUBgSuNCZRZK+ku7/e17Ss WTJCwbii+JrC3Js3POiuSF68y53CAF1yiqCq0E5U+ozN4cwtlb37qoytCJOGbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551685; a=rsa-sha256; cv=none; b=awDE0ebuv4WpeKa8HvUidrpAYHHESFyuayNbPBL7PMW6iAmRGK3Kl3Sa2ujuZu3WVvNqfx X+UkFsxBKMblx6Z6FH0bQO1o/qYvguNNQXE5XGvj5vyYUCnC7DKKG47kDqSIYSNFJSLFh5 a1iC0AhG8AL655Z43CNK7jlABUC3ltloxhbn0MlRdjqb5V7NLFk2ABLv9i3N50keZdgoC9 c/+Hy3ebCbvnn94StdHcBiIq4cL/dEwpaTDvLw3O+GYN0CX2tucWdZkLhFaAMlBrUPvXNz NeGwzD0N329fhso0kQ9qnbZ602hFj0MjSK0ws56wpGbOdWUdiwtdmQnAlGXhEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK3T0Rgbzf4r for ; Wed, 19 Nov 2025 11:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c11c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:28:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: aba5152d983e - stable/14 - ciss(4): Fix a typo in a debug messsage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aba5152d983e42d5d755c35cb32a0c4fbc78b7fa Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:28:05 +0000 Message-Id: <691da9c5.c11c.17def6ad@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=aba5152d983e42d5d755c35cb32a0c4fbc78b7fa commit aba5152d983e42d5d755c35cb32a0c4fbc78b7fa Author: Gordon Bergling AuthorDate: 2025-10-29 15:36:50 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:27:55 +0000 ciss(4): Fix a typo in a debug messsage - s/unspported/unsupported/ (cherry picked from commit 84d75bb018e1800d610760191ff64c3eebcb46d7) --- sys/dev/ciss/ciss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index 6723d05e0cfe..36030dd86eef 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -3078,7 +3078,7 @@ ciss_cam_action(struct cam_sim *sim, union ccb *ccb) } default: /* we can't do this */ - debug(1, "unspported func_code = 0x%x", ccb->ccb_h.func_code); + debug(1, "unsupported func_code = 0x%x", ccb->ccb_h.func_code); ccb->ccb_h.status = CAM_REQ_INVALID; break; } From nobody Wed Nov 19 11:28:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK425JXsz6HZ7B for ; Wed, 19 Nov 2025 11: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK424kx3z3cdW for ; Wed, 19 Nov 2025 11: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=1763551714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IXbQNtY5E7eWVy+LR5+Zs5zl0K0CB4WyhUVB0jOd7bs=; b=N7TVr+UxBwNTDUh40vFPpDe29Fib02gahmSUEXo60FyuRnHtEtnJl9RlRKcaS6QuiWqp1l OpRcHWMFm3GKca1NIkLGbeWCKt5tPWLB8yIDptSa2+krRWhWLhIvmnF873zqjAkvU3qxSg 3IKa1pYuThHqqEGH3etsFUgAfMoR4SHxsL0zNU/kQM7Q2Y/0hzYZbIlYS24hIsBUBwEe5C WvkkzXzmmnTUDhsRJz9MBBsSqdrrpqL/2H5gv4sZT6jCcXKiC/7yBa723iJILFUN8x0bzY r66xVf4UkwqSITd4x5E0BkryQ9ZtDXXvcWCqw5ViPKpKvaSLIYWAlNLC9NKvXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IXbQNtY5E7eWVy+LR5+Zs5zl0K0CB4WyhUVB0jOd7bs=; b=i8rywgVR4LcSnvJDzUSN3zUneqQAiWhkeUrJ4zB1S/T/gBWST+leyc/HNZBVATLgWLLxHk c/oM8PCqWbIAvUxcBrgWN4/D1MqJFfUvTWas4IQ+QvdzJb2zo++qtQrMLXuY1KNQiKWh6N yUnxHf/Rw/lCQJ/wUcVZoxI5ZcqsjD+hNP++JvEyVzpLiiltMLOB/lhxojE4Z8nqB5XYQx yBdHWoP1UvfmMaEUyy6FA0jItgg496d9heZLAcyldI4WO2DtG9G0Ddy92u3AHjIGYsiIHA +Ul4qN2F0gS6XNzxdVsElguenBxi8EqVT7FUZ+D0LNXSdeNGt/W+sp5HwPrAhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551714; a=rsa-sha256; cv=none; b=ws/5ntYZzbhTqi6BEsRC+zAJZYuNIfjWLs3GtZ6PWFefvTreWnGarx3x1BtuSUvMBOSH4+ HsTecuCXmwbXfDOPPAfKdm4eow4GywB+wUGuUmI2pvKkLT4K6hpUKDiTHW5XQLYS8MAvox oGhK/2zNuGLfcCUkQINMmHY09IYzNv+O59oPD7LXeurmFV0FtjfuicmZCYqgz8kztHNNOj sGuuEHbK5Qbdvi8Ln3lfIB2STKh1zzMj7yrNHyzhQTH3GvPyf6WL4R/A8TsHp+d7yexpG6 IrSouKXhvUcuRl2OQO0xDfbtTfB9F5AVK9vP0DIFw61XE4fv80SvEo+vVwrm0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK424JHqzfFr for ; Wed, 19 Nov 2025 11:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bdb9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:28:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 2c7e44d93139 - stable/14 - igc(4): Fix a typo in a sysctl description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2c7e44d93139d2331e3d86b60e4d736a5056b3bc Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:28:34 +0000 Message-Id: <691da9e2.bdb9.39460e94@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2c7e44d93139d2331e3d86b60e4d736a5056b3bc commit 2c7e44d93139d2331e3d86b60e4d736a5056b3bc Author: Gordon Bergling AuthorDate: 2025-10-29 15:38:03 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:28:23 +0000 igc(4): Fix a typo in a sysctl description - s/Recevied/Received/ (cherry picked from commit defe77554d134964d7c197a2f3ca552778e8b41a) --- sys/dev/igc/if_igc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index a1ae35c7aa43..8c9ec0566a38 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -2816,7 +2816,7 @@ igc_add_hw_stats(struct igc_softc *sc) "Oversized Packets Received"); SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_jabber", CTLFLAG_RD, &sc->stats.rjc, - "Recevied Jabber"); + "Received Jabber"); SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_errs", CTLFLAG_RD, &sc->stats.rxerrc, "Receive Errors"); From nobody Wed Nov 19 11:29:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK4p3jplz6HZ0f for ; Wed, 19 Nov 2025 11:29: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK4p2tPXz3dFp for ; Wed, 19 Nov 2025 11:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3lSO+DlV2bPRxZgHRRPlXojQHf8WaXfiwzQPd952j2k=; b=R7OEOUtnBPUTteW5aujzB+6M0d3UuHMRJtqUky3dRZry8roUNWmmBi6jtWec0raM9+ptM8 shBIvnmZjhDzo0Hwv1bYJrdEFzV1eTMDewKjZsWo/oco430iwTUVcCAEqs31F0YNW/V03l p3iYvndm9rhPWSDVHlAiEYbTUCMm7gI8vwt5eOYRauvBC6mgOk9nAeDAFqaqmyTbr7RAQ4 a4Z6ELq32HoXNJADtXq0W12VbeGlwmqxsmPTLwnlYToV+3Y2rxGveYSBzmobZAXCVoT+fM va32KnQx0IQehl7HwkAvlPYhfV6jp4VEpjdNmwM1wcQaO++/nGKmaLEIf6i3lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3lSO+DlV2bPRxZgHRRPlXojQHf8WaXfiwzQPd952j2k=; b=U0Cbi7qiuVav9DQGqB2+WnWgN9+Pm/F81wpOdd27cJ9daZA+ob+9s8sa0m46jgXMoAhG9X 36CqaxkemZk6GNFiA/W80k1BwQX+MnhQp/EVMDUISb+TTcuifTSv+6QIbj9sKKIf8E/z9Y O3tQJS+Sou+PjyXWWVEn95VfYPvCJlsCCIthmNQicI0+bx74YZOo78cZ/ce94BWWwrYjDc SFdiZQdxUbHhrH1rCC9h1Grh3tOI6MxCouMwYh1YcBfGX9Vne2cjcQY8Mdn4IKYG0/UR1O Z0QOMpVUYnvtYBG3ZHxJ1H3wd8qWWKz+WTtc+TYoa3yA7CGIJ0TeIo2/COOa0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551754; a=rsa-sha256; cv=none; b=gacNBQtVpHapM/cVlub4PxEbHGCLf4qUYYOf8kYmUWsJUht5dVBI5cpbsU14mjoyM70/Hu WrVWGCVoD7f3H6d0Z2b371kuLDmtpD30XwcKk8BAGpGz4LgO7RgYQ89Z+DR/Erz5G+tCsn HpGxTIzwuQ6D/a/rKjygn0EVre3yJTuCeWGR1dU2hgXFopVkpeWfJ0wS1un/xQBnKS7Nyw Vy2aL5HZmqeikNtGKn23ep8o2ghw2fdDKdNMPq+nm2KkqNPCYVeNHyZx5iJuiNL6U/ifct eyUee+Qkz/zF1KlN1gPH+Q6swQs2NqaHA6qgCqRbw+nFgpjpoUJML4g+iWKEEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK4p2TTxzfFs for ; Wed, 19 Nov 2025 11:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b7d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:29:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: df8a1f9863fc - stable/14 - mfi(4): Fix a typo in a KASSERT message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: df8a1f9863fcafd05dbab0075d08c3ddbda120ff Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:29:14 +0000 Message-Id: <691daa0a.b7d1.332ac09b@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=df8a1f9863fcafd05dbab0075d08c3ddbda120ff commit df8a1f9863fcafd05dbab0075d08c3ddbda120ff Author: Gordon Bergling AuthorDate: 2025-10-29 15:38:59 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:29:04 +0000 mfi(4): Fix a typo in a KASSERT message - s/dissappeared/disappeared/ (cherry picked from commit a25172844edaaa7e18c1dcecb6df8b8832456334) --- sys/dev/mfi/mfi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index f95ba0341a70..cd84e0a1970b 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -2827,7 +2827,7 @@ mfi_check_command_post(struct mfi_softc *sc, struct mfi_command *cm) if (ld->ld_id == cm->cm_frame->dcmd.mbox[0]) break; } - KASSERT(ld != NULL, ("volume dissappeared")); + KASSERT(ld != NULL, ("volume disappeared")); if (cm->cm_frame->header.cmd_status == MFI_STAT_OK) { mtx_unlock(&sc->mfi_io_lock); bus_topo_lock(); From nobody Wed Nov 19 11:29:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK5M4v7Mz6HZGD for ; Wed, 19 Nov 2025 11:29: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK5M47Kdz3dBV for ; Wed, 19 Nov 2025 11:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ztAInQ5qlDhDclEPccQ6Z+fqhFAaa1OPcXELRmeunNc=; b=psTEvSGMcwKIUbasMQRK790GDJdTkBKssN9ljGpOYnvICFgR+72QyixyZzQfRtg9bjJCOj UR+KRBp6nEAVz2ViHJARDfBaEjHvehigopTCuee75AxBGklrzUtOUqdwFNwacLCld9qhJH ena4MH04RIYVUFe6ypaUroNrZiRfvnMqJ+oFcWEofA4ELZrMwUvIaaAmLsxjOYSNvW3Vrn 9+0HOmsvyz2hLkVo4t16zGM4OvFLYRwsBD089nCSmJBDuV0v4U3MQNSyExC0dkcIwon/Lm ksQY+dERz8h9tvHEEWQgrBsNYLh+JUfWBilUQodMx57RfRVRP83qMKg+RLizsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ztAInQ5qlDhDclEPccQ6Z+fqhFAaa1OPcXELRmeunNc=; b=DYLO7KHd9IoektKAoC31hK0TibWghlIqgUt9Z/ylI47lyMtGWoScdCk65YSTc7jmu0CbTo M7CAQQoDtwJ7KkFMV8PTvLqUwUYz0avzhyACfLDOVdPJfTlPA/PFF58Lzc0tuyfb5zco7e 7q3JV+t5uCWUOSJOQoUjGOpGThua1Vq0iBXASqAKO3ZlqSHNHk0HHDo+8w6KRsDP7dyf7a 07abHMlc+limqozpv4HLjf8xhMQgXrmTBYeADkKECBcYG/BUXlvgEU4itN3Eh3qwvzPcnm YJp719RlojerKVhN+el/iaCAQjCjb6Khr95V1jRQ8SA1n8aHBd9WcfKeQoRbWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551783; a=rsa-sha256; cv=none; b=JZvdcoDaCv3A+T15CyLH+paMurFoWkDUluI8T6DOA3ZEdd4/ZjYywF42wdLteKIw/9rpPo H/DwXoWOzrHYiP0bpx6swPq1JQmZKvpJtVdjBXR1wwNMLK7LGE2o4eWWhrPH6z8cW324gp fyQGlli+ukEY7ZwEwm+hRpV0Jh8nCQP/A+5PvNJbZVCuFUgTefQujx/ziRCAxn9aQf60tI lNl0ttd98fnpBUuyeM4KghGgfcEAQf9xV1TUF59aCKxcpljiVliMT0+LCqHPrfnIhF1GtY t++6fdEO6FMju1HYMVzsDvwdmilmDTfJ4G7hcqAraM3g4wwUOGpbG4ZZ9mQ63w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK5M3l18zf4s for ; Wed, 19 Nov 2025 11:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ba2f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:29:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a35f62fcd4d0 - stable/14 - isci(4): Fix two typos in a log messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a35f62fcd4d0384971046a1713998e42f2cb399f Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:29:43 +0000 Message-Id: <691daa27.ba2f.14206ebd@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a35f62fcd4d0384971046a1713998e42f2cb399f commit a35f62fcd4d0384971046a1713998e42f2cb399f Author: Gordon Bergling AuthorDate: 2025-10-29 15:41:06 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:29:33 +0000 isci(4): Fix two typos in a log messages - s/suspeneded/suspended/ (cherry picked from commit 7b11940d4a66589069c21534dd0b969f79ae79df) --- sys/dev/isci/scil/scic_sds_remote_node_context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/isci/scil/scic_sds_remote_node_context.c b/sys/dev/isci/scil/scic_sds_remote_node_context.c index aa1e8d840282..42dd81aa1874 100644 --- a/sys/dev/isci/scil/scic_sds_remote_node_context.c +++ b/sys/dev/isci/scil/scic_sds_remote_node_context.c @@ -663,7 +663,7 @@ SCI_STATUS scic_sds_remote_node_context_invalidating_state_event_handler( SCIC_LOG_OBJECT_SSP_REMOTE_TARGET | SCIC_LOG_OBJECT_SMP_REMOTE_TARGET | SCIC_LOG_OBJECT_STP_REMOTE_TARGET, - "SCIC Remote Node Context 0x%x was suspeneded by hardware while being invalidated.\n", + "SCIC Remote Node Context 0x%x was suspended by hardware while being invalidated.\n", this_rnc )); status = SCI_SUCCESS; @@ -718,7 +718,7 @@ SCI_STATUS scic_sds_remote_node_context_resuming_state_event_handler( SCIC_LOG_OBJECT_SSP_REMOTE_TARGET | SCIC_LOG_OBJECT_SMP_REMOTE_TARGET | SCIC_LOG_OBJECT_STP_REMOTE_TARGET, - "SCIC Remote Node Context 0x%x was suspeneded by hardware while being resumed.\n", + "SCIC Remote Node Context 0x%x was suspended by hardware while being resumed.\n", this_rnc )); status = SCI_SUCCESS; From nobody Wed Nov 19 11:31:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK7C2q2Bz6HZ3l for ; Wed, 19 Nov 2025 11:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK7C2NCLz3dtJ for ; Wed, 19 Nov 2025 11:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3H68nfU08LZUpn6agsxRqXSiIZVek++n/GyXGvtV+6E=; b=e7upPL92x7K2Nj/bVv/H2le2KK8FxzZf0nLyUhpzpukXXlXDDC4TiaPzP1eN2FO9MROApa NeLYC7Bgf+bC5eF7b4gv1q6xu3OBO8BmirgnJ8yiQIjNspNM1chqM1lmSxVSABUHqNi1s1 F27rSBGLe8lOEucFiRThsBG1zikOCREIUAWl5zCkBgS60Jugnj1wDYTi4LpKWeO6WK778v oQhgV3LVzZHnHaoO1RAdm1EzvHfiLq4Y5c3mqIhwlgOxr+S/bgVo1/ttIpI2CN+CpYZjXK L7q3gXVTlFsRmvAlxQtoD82PTwDE35kcKZ5MLg/jkt3e4reGPYXfnxICHK83Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3H68nfU08LZUpn6agsxRqXSiIZVek++n/GyXGvtV+6E=; b=s+TGpuBRalSxXiQ+C+bswn1l9klxuSKWLarImFIgOqawFToQtw+mFzJsGQTZW2doHIFa51 utMoVMSSw/tMgiL62A3qKpx5gRn33vLggyEZdCjyTmGDd7TuxKAFe8Ye1V1fKum1L/egxC PBlk5+GFdzuWw6TgNeewnfmyjJbuaBeH1ICqILtbOPoQGRlId7jcH16LBfFsKMGZYJdC2u GAGiRwsVGUtEKnskVXnOiDGzaTe5Rh2FvoJJTeMeu8PIYmGHhAu4Ck8JdEQ8n+iCB5IKCs t+OivAsQsuQKUquIA7Jt5COcqWh3M1xNVz7qYRPFA5d/B8h0X0PCfQam3/zPpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551879; a=rsa-sha256; cv=none; b=iv4+u1oyZ/5B7eZk0oNYj9DN2S4fJmUHuAe0xwDId9LF4v+/I+nyE/uceh+Pg2yvMQZeRq hIq0qeAFLq3AddcBTfO+Br3bF/nSXqOYlA6tvh/LDW8FJ4DOjz65c3ZgsoyZMK7lEIngEF sWlCfSXKFYcEdVDXOP6lCh0EDZ0d+DmLc79w/YzFh95MaPVgxen4JQSYP6oR1HXpn/hPEY XAsjfcee42J7VynIYV6LZ0A9XX7CAn6nsyvHajxxzUxAwAd56sWbFOjEx6iUrsiJKLDVvP BwrT6c7czUnC9xBlpG8zpgh54LalaQcobSDOebIst+jt1xwEyMLSzus5cJk3rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK7C1v4kzf1S for ; Wed, 19 Nov 2025 11:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id abe2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:31:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 35dc35e3b289 - stable/14 - copy.9: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35dc35e3b28907617f855ad52e49794e1e674ed8 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:31:19 +0000 Message-Id: <691daa87.abe2.4107e4d5@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=35dc35e3b28907617f855ad52e49794e1e674ed8 commit 35dc35e3b28907617f855ad52e49794e1e674ed8 Author: Gordon Bergling AuthorDate: 2025-10-26 15:39:32 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:31:10 +0000 copy.9: Fix a typo in the manual page - s/heterogenous/heterogeneous/ (cherry picked from commit ad7bbe691b453039980df729f32fffaf02ffd21c) --- share/man/man9/copy.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/copy.9 b/share/man/man9/copy.9 index 8b2d0dc67727..3a3105ddf644 100644 --- a/share/man/man9/copy.9 +++ b/share/man/man9/copy.9 @@ -43,7 +43,7 @@ .Nm copyout_nofault , .Nm copystr , .Nm copyinstr -.Nd heterogenous address space copy functions +.Nd heterogeneous address space copy functions .Sh SYNOPSIS .In sys/types.h .In sys/systm.h From nobody Wed Nov 19 11:31:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK7p1WjKz6HZMY for ; Wed, 19 Nov 2025 11:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK7p0l1zz3f6M for ; Wed, 19 Nov 2025 11:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AClAOjyCco3FsXGzL/BOO3ubDRv5PfBEMXxvsEVISqY=; b=m+InvQ6l6NyrfNKWVL45qFzzTZjhUWFu2D2IUJ0PLqiFhcOsqTxFnMwwrgYJO3MusLc2DM 6VUcF8QZUPQa16+q0Nzc5ltkprbciYBldGwR9QzUad/4a7G7JuozCICISrCvM8iMkIrGxU p82cJsSsnVEujhHzwotsrgYbwDwdpDbd7VJPclVpj/SER2J4H1zZ4wPhVbK08GMeHsOsgz gJAwH1YHeK3JBZyf+njmV37BmNDNABJKALJuHthxOjTa/lguQa6zPqfCqakxOCDzPkfrmS RI17+u+uRpgfSx+BU8n5j/nibMGfgSCqRMpBlpbHoXB+2usItnO7Q3MNfpNrLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AClAOjyCco3FsXGzL/BOO3ubDRv5PfBEMXxvsEVISqY=; b=XKkSTlwCumKlmPQgswz6MWG6N8VykXYf55dpXYv9dk96uTcq87/u285SCoONYh8EcYMVr0 6XD8YnhmV/c8wQe8xvp8nU1za3pIldBq/NCPS/kERTgFfyPukfb1a5yYWYzJsR5o1+oghb qNC6beFqs4MYBiL32FepW8SRuLKtxL4maTpjvH6WCHjOhGCwdGJyrIeS6c3m5ZB1TgkS52 WdqyRHYIUcaId572lOIUaEvwwK0GhXRHICQkVIeZvvsB69EiCNN4kOMf/xvW59xAMLzQ8t +8QLeq/n00wK+ugSXzxq6oTKTbGDrUGuFsi1AQQNR7nxjrpxDxYlStIe4Pu4VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551910; a=rsa-sha256; cv=none; b=vholRavWnyjOHpyUfkWE7nOuBoWgfFr3FnlmuRxTiilTv/3hn17Fs5C1AgeKu2qP3Z8OoU TzATj0Ul8W8WYu8jIl+7odLdYWXE/xG45DpewqNRXYlzJ5+IiupXsHpPP9mzL+d7V/8bNQ P3tyNxQGonivg31yEJcuBYtQusFUDkjvj1JI1assh54Vnnbhmp/+PdfC+GncOn0HaAL7ke KCeaYiMZY7P/cSxgQp3l3JXeYlCkPq0m4M5+eWdsjNaJpKsLY47PjuPgXE4kIEebFIdwgj l3gfxId+CUr1quMSwlpTtqtvq1tL2q7OsSyXT2byvzN5AvmqbXG76QABs3sQZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK7p0G6PzfXD for ; Wed, 19 Nov 2025 11:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bde4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:31:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: fa1337393b84 - stable/14 - efirt.9: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fa1337393b84203bbf9431057e2a5671d6198aaa Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:31:50 +0000 Message-Id: <691daaa6.bde4.1b8dbd18@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fa1337393b84203bbf9431057e2a5671d6198aaa commit fa1337393b84203bbf9431057e2a5671d6198aaa Author: Gordon Bergling AuthorDate: 2025-10-26 15:42:42 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:31:39 +0000 efirt.9: Fix a typo in the manual page - s/retireved/retrieved/ (cherry picked from commit 1a28455cb5f59de98cd6085fce500b457eb80847) --- share/man/man9/efirt.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/efirt.9 b/share/man/man9/efirt.9 index c31f52bf2245..e085916801d5 100644 --- a/share/man/man9/efirt.9 +++ b/share/man/man9/efirt.9 @@ -183,7 +183,7 @@ is NULL. .It Dv EIO The variable could not be retrieved due to a hardware error. .It Dv EDOOFUS -The variable could not be retireved due to an authentication failure. +The variable could not be retrieved due to an authentication failure. .El .Pp The From nobody Wed Nov 19 13:22:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBMbz01zTz6HjPt for ; Wed, 19 Nov 2025 13:22: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBMby6HZPz3rHK for ; Wed, 19 Nov 2025 13:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763558574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w5FnnmeIAY/TpPC5KL+c8+Wb+TgburGGbnbP7stKvJI=; b=KAYjbK1pEP9pwpjhFJ6hr6U4cSD/QDqhNj4KOFDABEaoLW5kDx/POdlDXl8s72H51Ocr7w H7UIRtwNteJQPpzTn5hd1RViGlFIUckxxsjhiglBzMGLPunWkJPLkFdO9HCZGUpjFTTHIj viP5XRB26bhlj4wgE9IBHfosA81mNMcKlWZh4xFLxh4sUUewl3Z5XkHymVcLsg0HKdCy+M Lpq8Owkf1vyZVfQubenrFBiTbQ+8z+PKG1ygvgeCzofqy/UeXBM6Q8Jc8N3zeWf917IIVA JX9XnGkl6a152sj0o+zw9IWFlajDhV3Pksyv8fskx+wn5AfK1xvFs11VLx2GWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763558574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w5FnnmeIAY/TpPC5KL+c8+Wb+TgburGGbnbP7stKvJI=; b=xgTtBv9xirmjBDkeyXoIVH3lDDYBrDv8zmZ5v072mVkyTSezRnAQ5wZcesOAsJOc1vs5Ze Z761q9Rwnu1/QLhOuPSkwUUtLCJaqLRQM7u4NlL7AZISZIbCKoXeNn3vkRdXMYa0rAPzIi vx/Ph12qXUI2QWxMpp+TwriwaeOeBwTeuPUcoBgGEzOkjbPcfJFjJV7K3yAUQM5i9qk7PA iQsogWS3S5INwHTtZGft3Nx4o86FjPmXf9+DZZbXZLy9r00eXjc0z7QNCQs/eUYV1WHvmB M/F5BqteLHj/MAsj6AkyQi1Zrf24ph0lksX/9tsrnGCv/C2aSLY86g6ruyzjAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763558574; a=rsa-sha256; cv=none; b=YTVSGTXr90BEIjilVABVOl7gYHW5kNeUnYQQwne9uwwnmPVqUM9FaC7M1dX1kSJiIc3gk0 vmB1xyAVTynLYz9PdX4j34tcw6MZxKpGrrkTW74SuMOJOEkjIOjJ29C6k15yW9bIItMqNW 20KU65lgCgWpeALLT+cxCG1CPXBX3SMBQ2Fg9bMn27Icicov1Q1wtcZbZtwvDdjO6QKIp5 o5DEWXGCMNn2b/VFUeEwj6F6UBGVLLY+PjjEZEYP9FAKQxMmjlKUjXfSm4WyNdU5gbw7lg x+Nu0wjoziMedNhpW/wEhDC4+ifJhdjr06NGMZc1L8ZzSHpfWH0TpBuHG3Z0sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBMby5Q7Bzj7Q for ; Wed, 19 Nov 2025 13:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27972 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 13:22:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 8f38cbcd9c4a..f1aa8e6d5147 - vendor/libarchive - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/libarchive X-Git-Reftype: branch X-Git-Commit: f1aa8e6d514762c50266103ac44a2f3c38347c24 X-Git-Oldrev: 8f38cbcd9c4a4f27bdccf2e75a7e20026cff5181 X-Git-Newrev: f1aa8e6d514762c50266103ac44a2f3c38347c24 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 13:22:54 +0000 Message-Id: <691dc4ae.27972.3260fe89@gitrepo.freebsd.org> The branch vendor/libarchive has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=8f38cbcd9c4a..f1aa8e6d5147 f1aa8e6d5147 Update vendor/libarchive to 3.8.3 From nobody Wed Nov 19 13:54:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBNJJ5WFNz6HkjD for ; Wed, 19 Nov 2025 13:54: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBNJJ4hLRz3tbw for ; Wed, 19 Nov 2025 13:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763560464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h3NZn3YSb3S0lZvYTb+nCzn90UbDpF+2VlcUvldxkVQ=; b=vJXXZB/KigTthT3JckY84nTFSwAaU0rMBYX4S1Be2g0qAmF8Y207ZgaeQMBCcE4Q0fKVlo zqyDZ4jKE0THRDvp8SZd5Rz6DF6uwsKbW87eUxVcHZswFvLKFqwvEhYc1JQwXJwHOGur9n KziOoW+iNkdPX+u2HRUSkjsfmolUvUmMSJ0DXPP2Q25TBV9YIaE3azpwfPxd9OQdNxyGzi 3k+Bn8ZF+IN2EnbiJwoZraCfFYtnywBIYbP0RE16kRQE6HpuYNQbWAZKxsdA/+KKHFLH2C aZELyBXLMIhy/HC8eapdnVd7FalDMzp+EPWMRZtfLW9WMdQXt7zBwZXQpKGnyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763560464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h3NZn3YSb3S0lZvYTb+nCzn90UbDpF+2VlcUvldxkVQ=; b=lgRXLhbXJwO1NOJwjFoY4UZGk12jIkC3FVUjh3kXwI4FXZN/TBGhtqiOzzlF8gjw/woHEN RScjYmw9VGI6cwxMXNCXzDstHvA5HYppZP2KJcTQqn5NtWrIcvNBCnLCSB43IGZ+gId9yc +pnBDRKPogcD1zTbNIF9qEJUf7DnSUsReXwSqRlQ1DN0pEaZp0ZiVNc57rwl7kVn1C+Aun U4ojSgnK56eoPi14bfCiFGgS3PeNKe5esA2jNFedpcbz9ikSoFWhXtQMzNuHM0ADWJYqU0 xf6h3/UOVnWOkqXBPX+/Ne6UPTSTbYC/ryaUhCmP3Pn0VHAq8IvQ2snF0RKejA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763560464; a=rsa-sha256; cv=none; b=PFw8WklgaE+BQN7FZs7GLp9ycj8mjshAf3eoCQRKKFdXMdaFnphdJ+V61YSlmeEQulYThp Ic0q10mnwpi3REk0DXC85DKQma7bdAZpvVPQeHv0L7XVGBa3vE2XmddonztvDFDvPLUcAi jiOW/d1m+7jgEmfqIAJWSOvoKDF1TyTq0a1BY+cgx5GNWIvhAo4X8OSSRUTukVALXUMdVy PcbodUlNhuz0fh85+aBKwa+cHYk8YPFUEuYGzVPgLCmxPWBJI88ADv4vxBDTX0sV5KjM45 f6fGTMctczC3ySxhNqdkt2a7c6Cm+j2xgASY/pV+jLvTHrOLO12NIWnV37YTcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBNJJ4Gl5zk72 for ; Wed, 19 Nov 2025 13:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2bf9c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 13:54:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 007679a13808 - main - libarchive: merge from vendor branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 007679a138089676aadc9a712277f4004403b905 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 13:54:24 +0000 Message-Id: <691dcc10.2bf9c.6a7076fc@gitrepo.freebsd.org> The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=007679a138089676aadc9a712277f4004403b905 commit 007679a138089676aadc9a712277f4004403b905 Merge: 3c2643a7dbac f1aa8e6d5147 Author: Martin Matuska AuthorDate: 2025-11-19 13:33:40 +0000 Commit: Martin Matuska CommitDate: 2025-11-19 13:53:24 +0000 libarchive: merge from vendor branch libarchive 3.8.3 Important bugfixes: #2753 lib: Create temporary files in the target directory #2768 lha: Fix for an out-of-bounds buffer overrun when using p[H_LEVEL_OFFSET] #2769 7-zip: Fix a buffer overrun when reading truncated 7zip headers #2771 lz4 and zstd: Support both lz4 and zstd data with leading skippable frames Obtained from: libarchive Vendor commit: 1368b08875351df8aa268237b882c8f4ceb0882d MFC after: 1 week contrib/libarchive/NEWS | 2 + contrib/libarchive/libarchive/archive.h | 4 +- contrib/libarchive/libarchive/archive_entry.h | 2 +- contrib/libarchive/libarchive/archive_entry_stat.3 | 2 +- .../libarchive/archive_read_disk_entry_from_file.c | 10 +- .../libarchive/archive_read_disk_posix.c | 10 +- .../libarchive/archive_read_support_filter_lz4.c | 82 +- .../libarchive/archive_read_support_filter_zstd.c | 67 +- .../libarchive/archive_read_support_format_7zip.c | 8 +- .../libarchive/archive_read_support_format_lha.c | 2 +- .../libarchive/archive_read_support_format_tar.c | 1 + .../libarchive/archive_read_support_format_zip.c | 28 +- contrib/libarchive/libarchive/archive_string.c | 20 + contrib/libarchive/libarchive/archive_string.h | 4 + .../libarchive/archive_write_disk_posix.c | 20 +- .../libarchive/archive_write_open_filename.c | 2 + contrib/libarchive/libarchive/module.modulemap | 34 + .../libarchive/test/test_archive_string.c | 38 + .../libarchive/libarchive/test/test_compat_lz4.c | 2 + .../test_compat_lz4_skippable_frames_B4.tar.lz4.uu | 6739 ++++++++++++++++++++ .../test/test_read_format_7zip_issue2765.7z.uu | 5 + .../test/test_read_format_7zip_issue2765.c | 51 + .../libarchive/tar/test/test_option_safe_writes.c | 1 + contrib/libarchive/tar/util.c | 5 +- contrib/libarchive/test_utils/test_main.c | 27 +- lib/libarchive/tests/Makefile | 3 + 26 files changed, 7109 insertions(+), 60 deletions(-) diff --cc contrib/libarchive/libarchive/module.modulemap index 000000000000,70f70fc3a1a2..70f70fc3a1a2 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/module.modulemap +++ b/contrib/libarchive/libarchive/module.modulemap diff --cc contrib/libarchive/libarchive/test/test_compat_lz4_skippable_frames_B4.tar.lz4.uu index 000000000000,f45b1ac8f8dd..f45b1ac8f8dd mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_compat_lz4_skippable_frames_B4.tar.lz4.uu +++ b/contrib/libarchive/libarchive/test/test_compat_lz4_skippable_frames_B4.tar.lz4.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_7zip_issue2765.7z.uu index 000000000000,734561a20879..734561a20879 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_7zip_issue2765.7z.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_7zip_issue2765.7z.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_7zip_issue2765.c index 000000000000,7c45c313b315..7c45c313b315 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_7zip_issue2765.c +++ b/contrib/libarchive/libarchive/test/test_read_format_7zip_issue2765.c diff --cc lib/libarchive/tests/Makefile index 930250d974c5,000000000000..880c0d3ce0c6 mode 100644,000000..100644 --- a/lib/libarchive/tests/Makefile +++ b/lib/libarchive/tests/Makefile @@@ -1,748 -1,0 +1,751 @@@ +.include + +PACKAGE= tests + +WARNS?= 3 + +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive + +ATF_TESTS_SH+= functional_test + +TEST_METADATA.functional_test+= timeout="600" + +BINDIR= ${TESTSDIR} + +PROGS+= libarchive_test + +CFLAGS+= -I${.CURDIR} -I${.CURDIR:H} -I${.OBJDIR} +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive -I${_LIBARCHIVEDIR}/libarchive/test +CFLAGS+= -I${_LIBARCHIVEDIR}/test_utils +CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib + +CFLAGS.test_utils.c+= -Wno-cast-align + +# Uncomment to link against dmalloc +#LDADD+= -L/usr/local/lib -ldmalloc +#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC + +.PATH: ${_LIBARCHIVEDIR}/libarchive/test +TESTS_SRCS= \ + test_7zip_filename_encoding.c \ + test_acl_nfs4.c \ + test_acl_pax.c \ + test_acl_platform_nfs4.c \ + test_acl_platform_posix1e.c \ + test_acl_posix1e.c \ + test_acl_text.c \ + test_ar_mode.c \ + test_archive_api_feature.c \ + test_archive_clear_error.c \ + test_archive_cmdline.c \ + test_archive_digest.c \ + test_archive_match_time.c \ + test_archive_match_owner.c \ + test_archive_match_path.c \ + test_archive_pathmatch.c \ + test_archive_parse_date.c \ + test_archive_read.c \ + test_archive_read_add_passphrase.c \ + test_archive_read_close_twice.c \ + test_archive_read_close_twice_open_fd.c \ + test_archive_read_close_twice_open_filename.c \ + test_archive_read_multiple_data_objects.c \ + test_archive_read_next_header_empty.c \ + test_archive_read_next_header_raw.c \ + test_archive_read_open2.c \ + test_archive_read_set_filter_option.c \ + test_archive_read_set_format_option.c \ + test_archive_read_set_option.c \ + test_archive_read_set_options.c \ + test_archive_read_support.c \ + test_archive_set_error.c \ + test_archive_string.c \ + test_archive_string_conversion.c \ + test_archive_write_add_filter_by_name.c \ + test_archive_write_set_filter_option.c \ + test_archive_write_set_format_by_name.c \ + test_archive_write_set_format_filter_by_ext.c \ + test_archive_write_set_format_option.c \ + test_archive_write_set_option.c \ + test_archive_write_set_options.c \ + test_archive_write_set_passphrase.c \ + test_bad_fd.c \ + test_compat_bzip2.c \ + test_compat_cpio.c \ + test_compat_gtar.c \ + test_compat_gtar_large.c \ + test_compat_gzip.c \ + test_compat_lz4.c \ + test_compat_lzip.c \ + test_compat_lzma.c \ + test_compat_lzop.c \ + test_compat_mac.c \ + test_compat_perl_archive_tar.c \ + test_compat_plexus_archiver_tar.c \ + test_compat_solaris_tar_acl.c \ + test_compat_solaris_pax_sparse.c \ + test_compat_star_acl.c \ + test_compat_tar_directory.c \ + test_compat_tar_hardlink.c \ + test_compat_uudecode.c \ + test_compat_uudecode_large.c \ + test_compat_xz.c \ + test_compat_zip.c \ + test_compat_zstd.c \ + test_empty_write.c \ + test_entry.c \ + test_entry_strmode.c \ + test_extattr_freebsd.c \ + test_filter_count.c \ + test_gnutar_filename_encoding.c \ + test_link_resolver.c \ + test_open_fd.c \ + test_open_failure.c \ + test_open_file.c \ + test_open_filename.c \ + test_pax_filename_encoding.c \ + test_pax_xattr_header.c \ + test_read_data_large.c \ + test_read_disk.c \ + test_read_disk_directory_traversals.c \ + test_read_disk_entry_from_file.c \ + test_read_extract.c \ + test_read_file_nonexistent.c \ + test_read_filter_compress.c \ + test_read_filter_grzip.c \ + test_read_filter_gzip_recursive.c \ + test_read_filter_lrzip.c \ + test_read_filter_lzop.c \ + test_read_filter_lzop_multiple_parts.c \ + test_read_filter_program.c \ + test_read_filter_program_signature.c \ + test_read_filter_uudecode.c \ + test_read_filter_uudecode_raw.c \ + test_read_format_7zip.c \ + test_read_format_7zip_encryption_data.c \ + test_read_format_7zip_encryption_header.c \ + test_read_format_7zip_encryption_partially.c \ ++ test_read_format_7zip_issue2765.c \ + test_read_format_7zip_malformed.c \ + test_read_format_7zip_packinfo_digests.c \ + test_read_format_ar.c \ + test_read_format_cab.c \ + test_read_format_cab_filename.c \ + test_read_format_cpio_afio.c \ + test_read_format_cpio_bin.c \ + test_read_format_cpio_bin_Z.c \ + test_read_format_cpio_bin_be.c \ + test_read_format_cpio_bin_bz2.c \ + test_read_format_cpio_bin_gz.c \ + test_read_format_cpio_bin_le.c \ + test_read_format_cpio_bin_lzip.c \ + test_read_format_cpio_bin_lzma.c \ + test_read_format_cpio_bin_xz.c \ + test_read_format_cpio_filename.c \ + test_read_format_cpio_odc.c \ + test_read_format_cpio_svr4_gzip.c \ + test_read_format_cpio_svr4c_Z.c \ + test_read_format_cpio_svr4_bzip2_rpm.c \ + test_read_format_cpio_svr4_gzip_rpm.c \ + test_read_format_empty.c \ + test_read_format_gtar_filename.c \ + test_read_format_gtar_gz.c \ + test_read_format_gtar_lzma.c \ + test_read_format_gtar_redundant_L.c \ + test_read_format_gtar_sparse.c \ + test_read_format_gtar_sparse_length.c \ + test_read_format_gtar_sparse_skip_entry.c \ + test_read_format_huge_rpm.c \ + test_read_format_iso_Z.c \ + test_read_format_iso_multi_extent.c \ + test_read_format_iso_xorriso.c \ + test_read_format_isorr_rr_moved.c \ + test_read_format_isojoliet_bz2.c \ + test_read_format_isojoliet_long.c \ + test_read_format_isojoliet_rr.c \ + test_read_format_isojoliet_versioned.c \ + test_read_format_isorr_bz2.c \ + test_read_format_isorr_ce.c \ + test_read_format_isorr_new_bz2.c \ + test_read_format_isozisofs_bz2.c \ + test_read_format_lha.c \ + test_read_format_lha_bugfix_0.c \ + test_read_format_lha_filename.c \ + test_read_format_lha_filename_utf16.c \ + test_read_format_mtree.c \ + test_read_format_mtree_crash747.c \ + test_read_format_pax_bz2.c \ + test_read_format_rar.c \ + test_read_format_rar5.c \ + test_read_format_rar_encryption.c \ + test_read_format_rar_encryption_data.c \ + test_read_format_rar_encryption_header.c \ + test_read_format_rar_encryption_partially.c \ + test_read_format_rar_filter.c \ + test_read_format_rar_invalid1.c \ + test_read_format_rar_overflow.c \ + test_read_format_raw.c \ + test_read_format_tar.c \ + test_read_format_tar_V_negative_size.c \ + test_read_format_tar_concatenated.c \ + test_read_format_tar_empty_filename.c \ + test_read_format_tar_empty_pax.c \ + test_read_format_tar_empty_with_gnulabel.c \ + test_read_format_tar_filename.c \ + test_read_format_tar_invalid_pax_size.c \ + test_read_format_tar_mac_metadata.c \ + test_read_format_tar_pax_g_large.c \ + test_read_format_tar_pax_large_attr.c \ + test_read_format_tar_pax_negative_time.c \ + test_read_format_tbz.c \ + test_read_format_tgz.c \ + test_read_format_tlz.c \ + test_read_format_txz.c \ + test_read_format_tz.c \ + test_read_format_ustar_filename.c \ + test_read_format_warc.c \ + test_read_format_xar.c \ + test_read_format_xar_doublelink.c \ + test_read_format_zip.c \ + test_read_format_zip_7075_utf8_paths.c \ + test_read_format_zip_comment_stored.c \ + test_read_format_zip_encryption_data.c \ + test_read_format_zip_encryption_header.c \ + test_read_format_zip_encryption_partially.c \ + test_read_format_zip_extra_padding.c \ + test_read_format_zip_filename.c \ + test_read_format_zip_high_compression.c \ + test_read_format_zip_jar.c \ + test_read_format_zip_mac_metadata.c \ + test_read_format_zip_malformed.c \ + test_read_format_zip_msdos.c \ + test_read_format_zip_nested.c \ + test_read_format_zip_nofiletype.c \ + test_read_format_zip_padded.c \ + test_read_format_zip_sfx.c \ + test_read_format_zip_traditional_encryption_data.c \ + test_read_format_zip_winzip_aes.c \ + test_read_format_zip_winzip_aes_large.c \ + test_read_format_zip_with_invalid_traditional_eocd.c \ + test_read_format_zip_zip64.c \ + test_read_large.c \ + test_read_pax_empty_val_no_nl.c \ + test_read_pax_xattr_rht_security_selinux.c \ + test_read_pax_xattr_schily.c \ + test_read_pax_truncated.c \ + test_read_position.c \ + test_read_set_format.c \ + test_read_too_many_filters.c \ + test_read_truncated.c \ + test_read_truncated_filter.c \ + test_short_writes.c \ + test_sparse_basic.c \ + test_tar_filenames.c \ + test_tar_large.c \ + test_warn_missing_hardlink_target.c \ + test_ustar_filenames.c \ + test_ustar_filename_encoding.c \ + test_write_disk.c \ + test_write_disk_appledouble.c \ + test_write_disk_failures.c \ + test_write_disk_fixup.c \ + test_write_disk_hardlink.c \ + test_write_disk_hfs_compression.c \ + test_write_disk_lookup.c \ + test_write_disk_mac_metadata.c \ + test_write_disk_no_hfs_compression.c \ + test_write_disk_perms.c \ + test_write_disk_secure.c \ + test_write_disk_secure_noabsolutepaths.c \ + test_write_disk_secure744.c \ + test_write_disk_secure745.c \ + test_write_disk_secure746.c \ + test_write_disk_sparse.c \ + test_write_disk_symlink.c \ + test_write_disk_times.c \ + test_write_filter_b64encode.c \ + test_write_filter_bzip2.c \ + test_write_filter_compress.c \ + test_write_filter_gzip.c \ + test_write_filter_gzip_timestamp.c \ + test_write_filter_lrzip.c \ + test_write_filter_lz4.c \ + test_write_filter_lzip.c \ + test_write_filter_lzma.c \ + test_write_filter_lzop.c \ + test_write_filter_program.c \ + test_write_filter_uuencode.c \ + test_write_filter_xz.c \ + test_write_filter_zstd.c \ + test_write_format_7zip.c \ + test_write_format_7zip_empty.c \ + test_write_format_7zip_large.c \ + test_write_format_ar.c \ + test_write_format_cpio.c \ + test_write_format_cpio_empty.c \ + test_write_format_cpio_newc.c \ + test_write_format_cpio_odc.c \ + test_write_format_gnutar.c \ + test_write_format_gnutar_filenames.c \ + test_write_format_iso9660.c \ + test_write_format_iso9660_boot.c \ + test_write_format_iso9660_empty.c \ + test_write_format_iso9660_filename.c \ + test_write_format_iso9660_zisofs.c \ + test_write_format_mtree.c \ + test_write_format_mtree_absolute_path.c \ + test_write_format_mtree_classic.c \ + test_write_format_mtree_classic_indent.c \ + test_write_format_mtree_fflags.c \ + test_write_format_mtree_no_separator.c \ + test_write_format_mtree_preset_digests.c \ + test_write_format_mtree_quoted_filename.c \ + test_write_format_pax.c \ + test_write_format_raw.c \ + test_write_format_raw_b64.c \ + test_write_format_shar_empty.c \ + test_write_format_tar.c \ + test_write_format_tar_empty.c \ + test_write_format_tar_sparse.c \ + test_write_format_tar_ustar.c \ + test_write_format_tar_v7tar.c \ + test_write_format_warc.c \ + test_write_format_warc_empty.c \ + test_write_format_xar.c \ + test_write_format_xar_empty.c \ + test_write_format_zip.c \ + test_write_format_zip_compression_store.c \ + test_write_format_zip_compression_zstd.c \ + test_write_format_zip_compression_bzip2.c \ + test_write_format_zip_compression_lzmaxz.c \ + test_write_format_zip_empty.c \ + test_write_format_zip_empty_zip64.c \ + test_write_format_zip_entry_size_unset.c \ + test_write_format_zip_file.c \ + test_write_format_zip_file_zip64.c \ + test_write_format_zip_large.c \ + test_write_format_zip_zip64.c \ + test_write_format_zip64_stream.c \ + test_write_format_zip_stream.c \ + test_write_format_zip_windows_path.c \ + test_write_open_memory.c \ + test_write_read_format_zip.c \ + test_xattr_platform.c \ + test_zip_filename_encoding.c + +# Deterministic failures: +# Fails with `test_read_disk_directory_traversals.c:1094: File at has atime 886622, 1443306049 seconds ago` +BROKEN_TESTS+= test_read_disk_directory_traversals + +.if 0 +# test_fuzz.c is not a real test, but rather a simple fuzz-test using random(). +# Since this is not a regression/unit test, we don't include it by default. +# If you would still like to include it, comment out the `.if 0`. +TEST_SCRCS+= test_fuzz.c +${PACKAGE}FILES+= test_fuzz.cab.uu +${PACKAGE}FILES+= test_fuzz.lzh.uu +${PACKAGE}FILES+= test_fuzz_1.iso.Z.uu +# Non-deterministic failures: +# (Times out?) [and] crashes +BROKEN_TESTS+= test_fuzz_rar +.endif + +# Build the test program. +SRCS.libarchive_test= \ + ${TESTS_SRCS} \ + read_open_memory.c \ + list.h + +LIBADD.libarchive_test= archive + +.PATH: ${_LIBARCHIVEDIR}/test_utils +SRCS.libarchive_test+= test_main.c \ + test_utils.c + +# list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines +list.h: ${TESTS_SRCS} Makefile + @(cd ${_LIBARCHIVEDIR}/libarchive/test && \ + grep -E -h ^DEFINE_TEST ${.ALLSRC:N*Makefile} | \ + egrep -v '${BROKEN_TESTS:tW:C/ /|/g}') > ${.TARGET}.tmp + @mv ${.TARGET}.tmp ${.TARGET} + +CLEANTESTS+= list.h list.h.tmp +${PACKAGE}FILES+= README +${PACKAGE}FILES+= test_acl_pax_posix1e.tar.uu +${PACKAGE}FILES+= test_acl_pax_nfs4.tar.uu +${PACKAGE}FILES+= test_archive_string_conversion.txt.Z.uu +${PACKAGE}FILES+= test_compat_bzip2_1.tbz.uu +${PACKAGE}FILES+= test_compat_bzip2_2.tbz.uu +${PACKAGE}FILES+= test_compat_cpio_1.cpio.uu +${PACKAGE}FILES+= test_compat_gtar_1.tar.uu +${PACKAGE}FILES+= test_compat_gtar_2.tar.uu +${PACKAGE}FILES+= test_compat_gzip_1.tgz.uu +${PACKAGE}FILES+= test_compat_gzip_2.tgz.uu +${PACKAGE}FILES+= test_compat_lz4_1.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_2.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_3.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B4.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B4BD.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B4BDBX.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B5.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B5BD.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B6.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B6BD.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B7.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B7BD.tar.lz4.uu ++${PACKAGE}FILES+= test_compat_lz4_skippable_frames_B4.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lzip_1.tlz.uu +${PACKAGE}FILES+= test_compat_lzip_2.tlz.uu +${PACKAGE}FILES+= test_compat_lzip_3.lz.uu +${PACKAGE}FILES+= test_compat_lzip_4.tlz.uu +${PACKAGE}FILES+= test_compat_lzma_1.tlz.uu +${PACKAGE}FILES+= test_compat_lzma_2.tlz.uu +${PACKAGE}FILES+= test_compat_lzma_3.tlz.uu +${PACKAGE}FILES+= test_compat_lzop_1.tar.lzo.uu +${PACKAGE}FILES+= test_compat_lzop_2.tar.lzo.uu +${PACKAGE}FILES+= test_compat_lzop_3.tar.lzo.uu +${PACKAGE}FILES+= test_compat_mac-1.tar.Z.uu +${PACKAGE}FILES+= test_compat_mac-2.tar.Z.uu +${PACKAGE}FILES+= test_compat_perl_archive_tar.tar.uu +${PACKAGE}FILES+= test_compat_plexus_archiver_tar.tar.uu +${PACKAGE}FILES+= test_compat_solaris_pax_sparse_1.pax.Z.uu +${PACKAGE}FILES+= test_compat_solaris_pax_sparse_2.pax.Z.uu +${PACKAGE}FILES+= test_compat_solaris_tar_acl.tar.uu +${PACKAGE}FILES+= test_compat_star_acl_nfs4.tar.uu +${PACKAGE}FILES+= test_compat_star_acl_posix1e.tar.uu +${PACKAGE}FILES+= test_compat_tar_directory_1.tar.uu +${PACKAGE}FILES+= test_compat_tar_hardlink_1.tar.uu +${PACKAGE}FILES+= test_compat_uudecode_large.tar.Z.uu +${PACKAGE}FILES+= test_compat_xz_1.txz.uu +${PACKAGE}FILES+= test_compat_zip_1.zip.uu +${PACKAGE}FILES+= test_compat_zip_2.zip.uu +${PACKAGE}FILES+= test_compat_zip_3.zip.uu +${PACKAGE}FILES+= test_compat_zip_4.zip.uu +${PACKAGE}FILES+= test_compat_zip_5.zip.uu +${PACKAGE}FILES+= test_compat_zip_6.zip.uu +${PACKAGE}FILES+= test_compat_zip_7.xps.uu +${PACKAGE}FILES+= test_compat_zip_8.zip.uu +${PACKAGE}FILES+= test_compat_zstd_1.tar.zst.uu +${PACKAGE}FILES+= test_compat_zstd_2.tar.zst.uu +${PACKAGE}FILES+= test_pax_filename_encoding.tar.uu +${PACKAGE}FILES+= test_pax_xattr_header_all.tar.uu +${PACKAGE}FILES+= test_pax_xattr_header_libarchive.tar.uu +${PACKAGE}FILES+= test_pax_xattr_header_schily.tar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part1.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part2.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part3.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part4.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part5.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part6.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_single_file.part1.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_single_file.part2.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_single_file.part3.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part01.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part02.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part03.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part04.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part05.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part06.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part07.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part08.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part09.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part10.rar.uu +${PACKAGE}FILES+= test_read_filter_grzip.tar.grz.uu +${PACKAGE}FILES+= test_read_filter_gzip_recursive.gz.uu +${PACKAGE}FILES+= test_read_filter_lrzip.tar.lrz.uu +${PACKAGE}FILES+= test_read_filter_lzop.tar.lzo.uu +${PACKAGE}FILES+= test_read_filter_lzop_multiple_parts.tar.lzo.uu +${PACKAGE}FILES+= test_read_filter_uudecode_base64_raw.uu +${PACKAGE}FILES+= test_read_filter_uudecode_raw.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_bzip2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_lzma.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_deflate.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_deflate_arm64.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_deflate_powerpc.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma1_1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma1_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma2_1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma2_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_bzip2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_copy.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_deflate.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bzip2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_copy.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_copy_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_deflate.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_delta_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_delta_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_delta4_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_delta4_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_empty_archive.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_empty_file.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_encryption.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_encryption_header.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_encryption_partially.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_extract_second.7z.uu ++${PACKAGE}FILES+= test_read_format_7zip_issue2765.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma1_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma1_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_arm.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_arm64.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_powerpc.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_riscv.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_sparc.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_malformed.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_malformed2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_packinfo_digests.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_ppmd.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_sfx_elf.elf.uu +${PACKAGE}FILES+= test_read_format_7zip_sfx_modified_pe.exe.uu +${PACKAGE}FILES+= test_read_format_7zip_sfx_pe.exe.uu +${PACKAGE}FILES+= test_read_format_7zip_solid_zstd.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_symbolic_name.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd_arm.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd_bcj.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd_nobcj.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd_sparc.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_win_attrib.7z.uu +${PACKAGE}FILES+= test_read_format_ar.ar.uu +${PACKAGE}FILES+= test_read_format_cab_1.cab.uu +${PACKAGE}FILES+= test_read_format_cab_2.cab.uu +${PACKAGE}FILES+= test_read_format_cab_3.cab.uu +${PACKAGE}FILES+= test_read_format_cab_filename_cp932.cab.uu +${PACKAGE}FILES+= test_read_format_cpio_bin_be.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_bin_le.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_cp866.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_eucjp.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_koi8r.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_utf8_jp.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_utf8_ru.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_svr4_bzip2_rpm.rpm.uu +${PACKAGE}FILES+= test_read_format_cpio_svr4_gzip_rpm.rpm.uu +${PACKAGE}FILES+= test_read_format_gtar_filename_cp866.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_filename_eucjp.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_filename_koi8r.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_redundant_L.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_13.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix00.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix01.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix10.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_length.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_skip_entry.tar.Z.uu +${PACKAGE}FILES+= test_read_format_huge_rpm.rpm.uu +${PACKAGE}FILES+= test_read_format_iso.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_2.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_3.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet_by_nero.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet_long.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet_rockridge.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_multi_extent.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge_ce.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge_new.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge_rr_moved.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_xorriso.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_zisofs.iso.Z.uu +${PACKAGE}FILES+= test_read_format_lha_bugfix_0.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_filename_cp932.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_filename_utf16.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header0.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header1.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header2.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header3.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_lh0.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_lh6.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_lh7.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_withjunk.lzh.uu +${PACKAGE}FILES+= test_read_format_mtree.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_crash747.mtree.bz2.uu +${PACKAGE}FILES+= test_read_format_mtree_nomagic.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_nomagic2.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_nomagic3.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_noprint.mtree.uu +${PACKAGE}FILES+= test_read_format_rar.rar.uu +${PACKAGE}FILES+= test_read_format_rar_binary_data.rar.uu +${PACKAGE}FILES+= test_read_format_rar_compress_best.rar.uu +${PACKAGE}FILES+= test_read_format_rar_compress_normal.rar.uu +${PACKAGE}FILES+= test_read_format_rar_encryption_data.rar.uu +${PACKAGE}FILES+= test_read_format_rar_encryption_header.rar.uu +${PACKAGE}FILES+= test_read_format_rar_encryption_partially.rar.uu +${PACKAGE}FILES+= test_read_format_rar_endarc_huge.rar.uu +${PACKAGE}FILES+= test_read_format_rar_filter.rar.uu +${PACKAGE}FILES+= test_read_format_rar_invalid1.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multi_lzss_blocks.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0001.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0002.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0003.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0004.rar.uu +${PACKAGE}FILES+= test_read_format_rar_newsub_huge.rar.uu +${PACKAGE}FILES+= test_read_format_rar_noeof.rar.uu +${PACKAGE}FILES+= test_read_format_rar_overflow.rar.uu +${PACKAGE}FILES+= test_read_format_rar_ppmd_lzss_conversion.rar.uu +${PACKAGE}FILES+= test_read_format_rar_ppmd_use_after_free.rar.uu +${PACKAGE}FILES+= test_read_format_rar_ppmd_use_after_free2.rar.uu +${PACKAGE}FILES+= test_read_format_rar_sfx.exe.uu +${PACKAGE}FILES+= test_read_format_rar_subblock.rar.uu +${PACKAGE}FILES+= test_read_format_rar_symlink_huge.rar.uu +${PACKAGE}FILES+= test_read_format_rar_unicode.rar.uu +${PACKAGE}FILES+= test_read_format_rar_windows.rar.uu +${PACKAGE}FILES+= test_read_format_rar4_encrypted.rar.uu +${PACKAGE}FILES+= test_read_format_rar4_encrypted_filenames.rar.uu +${PACKAGE}FILES+= test_read_format_rar4_solid_encrypted.rar.uu +${PACKAGE}FILES+= test_read_format_rar4_solid_encrypted_filenames.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_arm.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_arm_filter_on_window_boundary.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_bad_window_sz_in_mltarc_file.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_data_ready_pointer_leak.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_blake2.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_block_size_is_too_small.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_compressed.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_decode_number_out_of_bounds_read.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_different_solid_window_size.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_different_window_size.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_different_winsize_on_merge.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_dirdata.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_distance_overflow.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_encrypted.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_encrypted_filenames.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_solid_encrypted.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_solid_encrypted_filenames.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_extra_field_version.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_fileattr.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_hardlink.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_invalid_dict_reference.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_leftshift1.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_leftshift2.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part01.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part02.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part03.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part04.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part05.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part06.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part07.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part08.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part01.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part02.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part03.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part04.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiple_files.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiple_files_solid.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_nonempty_dir_stream.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_only_crypt_exfld.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_owner.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_readtables_overflow.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_sfx.exe.uu +${PACKAGE}FILES+= test_read_format_rar5_solid.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_stored.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_stored_manyfiles.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_symlink.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_truncated_huff.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_unicode.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_unsupported_exfld.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_win32.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_window_buf_and_size_desync.rar.uu +${PACKAGE}FILES+= test_read_format_raw.bufr.uu +${PACKAGE}FILES+= test_read_format_raw.data.Z.uu +${PACKAGE}FILES+= test_read_format_raw.data.gz.uu +${PACKAGE}FILES+= test_read_format_raw.data.uu +${PACKAGE}FILES+= test_read_format_tar_V_negative_size.tar.uu +${PACKAGE}FILES+= test_read_format_tar_concatenated.tar.uu +${PACKAGE}FILES+= test_read_format_tar_empty_filename.tar.uu +${PACKAGE}FILES+= test_read_format_tar_empty_with_gnulabel.tar.uu +${PACKAGE}FILES+= test_read_format_tar_empty_pax.tar.Z.uu +${PACKAGE}FILES+= test_read_format_tar_filename_koi8r.tar.Z.uu +${PACKAGE}FILES+= test_read_format_tar_invalid_pax_size.tar.uu +${PACKAGE}FILES+= test_read_format_tar_mac_metadata_1.tar.uu +${PACKAGE}FILES+= test_read_format_tar_pax_g_large.tar.uu +${PACKAGE}FILES+= test_read_format_tar_pax_large_attr.tar.Z.uu +${PACKAGE}FILES+= test_read_format_tar_pax_negative_time.tar.uu +${PACKAGE}FILES+= test_read_format_ustar_filename_cp866.tar.Z.uu +${PACKAGE}FILES+= test_read_format_ustar_filename_eucjp.tar.Z.uu +${PACKAGE}FILES+= test_read_format_ustar_filename_koi8r.tar.Z.uu +${PACKAGE}FILES+= test_read_format_warc.warc.uu +${PACKAGE}FILES+= test_read_format_warc_incomplete.warc.uu +${PACKAGE}FILES+= test_read_format_xar_doublelink.xar.uu +${PACKAGE}FILES+= test_read_format_xar_duplicate_filename_node.xar.uu +${PACKAGE}FILES+= test_read_format_zip.zip.uu +${PACKAGE}FILES+= test_read_format_zip_7075_utf8_paths.zip.uu +${PACKAGE}FILES+= test_read_format_zip_7z_deflate.zip.uu +${PACKAGE}FILES+= test_read_format_zip_7z_lzma.zip.uu +${PACKAGE}FILES+= test_read_format_zip_bz2_hang.zip.uu +${PACKAGE}FILES+= test_read_format_zip_bzip2.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_bzip2_multi.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_comment_stored_1.zip.uu +${PACKAGE}FILES+= test_read_format_zip_comment_stored_2.zip.uu +${PACKAGE}FILES+= test_read_format_zip_encryption_data.zip.uu +${PACKAGE}FILES+= test_read_format_zip_encryption_header.zip.uu +${PACKAGE}FILES+= test_read_format_zip_encryption_partially.zip.uu +${PACKAGE}FILES+= test_read_format_zip_extra_padding.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_cp866.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_cp932.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_koi8r.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_utf8_jp.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_utf8_ru.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_utf8_ru2.zip.uu +${PACKAGE}FILES+= test_read_format_zip_high_compression.zip.uu +${PACKAGE}FILES+= test_read_format_zip_jar.jar.uu +${PACKAGE}FILES+= test_read_format_zip_length_at_end.zip.uu +${PACKAGE}FILES+= test_read_format_zip_lzma_alone_leak.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_lzma.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_lzma_multi.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_lzma_stream_end.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_mac_metadata.zip.uu +${PACKAGE}FILES+= test_read_format_zip_malformed1.zip.uu +${PACKAGE}FILES+= test_read_format_zip_msdos.zip.uu +${PACKAGE}FILES+= test_read_format_zip_nested.zip.uu +${PACKAGE}FILES+= test_read_format_zip_nofiletype.zip.uu +${PACKAGE}FILES+= test_read_format_zip_padded1.zip.uu +${PACKAGE}FILES+= test_read_format_zip_padded2.zip.uu +${PACKAGE}FILES+= test_read_format_zip_padded3.zip.uu +${PACKAGE}FILES+= test_read_format_zip_ppmd8.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_ppmd8_crash_1.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_ppmd8_crash_2.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_ppmd8_multi.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_sfx.uu +${PACKAGE}FILES+= test_read_format_zip_symlink.zip.uu +${PACKAGE}FILES+= test_read_format_zip_traditional_encryption_data.zip.uu +${PACKAGE}FILES+= test_read_format_zip_ux.zip.uu +${PACKAGE}FILES+= test_read_format_zip_with_invalid_traditional_eocd.zip.uu +${PACKAGE}FILES+= test_read_format_zip_winzip_aes128.zip.uu +${PACKAGE}FILES+= test_read_format_zip_winzip_aes256.zip.uu +${PACKAGE}FILES+= test_read_format_zip_winzip_aes256_large.zip.uu +${PACKAGE}FILES+= test_read_format_zip_winzip_aes256_stored.zip.uu +${PACKAGE}FILES+= test_read_format_zip_xz_multi.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_zip64a.zip.uu +${PACKAGE}FILES+= test_read_format_zip_zip64b.zip.uu +${PACKAGE}FILES+= test_read_format_zip_zstd.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_zstd_multi.zipx.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_aa.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ab.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ac.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ad.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ae.uu +${PACKAGE}FILES+= test_read_pax_empty_val_no_nl.tar.uu +${PACKAGE}FILES+= test_read_pax_xattr_rht_security_selinux.tar.uu +${PACKAGE}FILES+= test_read_pax_xattr_schily.tar.uu +${PACKAGE}FILES+= test_read_splitted_rar_aa.uu +${PACKAGE}FILES+= test_read_splitted_rar_ab.uu +${PACKAGE}FILES+= test_read_splitted_rar_ac.uu +${PACKAGE}FILES+= test_read_splitted_rar_ad.uu +${PACKAGE}FILES+= test_read_too_many_filters.gz.uu +${PACKAGE}FILES+= test_splitted_rar_seek_support_aa.uu +${PACKAGE}FILES+= test_splitted_rar_seek_support_ab.uu +${PACKAGE}FILES+= test_splitted_rar_seek_support_ac.uu +${PACKAGE}FILES+= test_write_disk_appledouble.cpio.gz.uu +${PACKAGE}FILES+= test_write_disk_appledouble_zip.zip.uu +${PACKAGE}FILES+= test_write_disk_hfs_compression.tgz.uu +${PACKAGE}FILES+= test_write_disk_mac_metadata.tar.gz.uu +${PACKAGE}FILES+= test_write_disk_no_hfs_compression.tgz.uu + +.include From nobody Wed Nov 19 14:00:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBNRH2wF0z6HlTQ for ; Wed, 19 Nov 2025 14:00:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBNRH0Vplz3vJS for ; Wed, 19 Nov 2025 14:00:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763560827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JECedc5gCVKXo01VFh/wF0ZNIYEZRl2d9Cq8KbZyGFU=; b=xuTb6ynlE9tpipAcsz9Cy5ioqiMqKBrcUA+0WE6dAHa0LOHTd8lfTyUkSs6Qv+3CaCl5c7 /L6cMa+0M+aa2ny7KRWpKX0ALym3p3Dc+dxibNIlKirU0YXIYq5a1h3d4HrHkWWVi4rhiP jBDntYIL9Oe3eDsse7Dtleubr1yAUNPeE5+PZaYw7Irr/okKHabMaeGNGPVVKzi1dSmTmH Qg9BDIormlu1iJ/OsYVpbgG0LCO+kqJ/kXYS9Rpv7uQZAVKLryFCraYfv9WmIpkNuJ5aNl jls9QLPvML2/ztA2EhOxmMBV196Lg14nKTd14asKw9OTp+khO/qGspfTKhnwkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763560827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JECedc5gCVKXo01VFh/wF0ZNIYEZRl2d9Cq8KbZyGFU=; b=ctxs9d0hUlftqd5Rw0laiTO3c9DJ7CVrKmAYJxHQBqr6YsFKlj0hZw4trsgKsOlIn243yu MTMCRtuiY7D2zyq2rctKmiaR47h28P34XOONLc2F9WbTjvunlkpMylX/FfguVMSi0mZeb9 hUMLxt+xxcqlhM1u/PY1+hxdTsLn6RTb+OjTV91ydOueZKBcY8FtwO7VRGnFl5bu5wz1UO ipn2DUFXaUP2eXoqO9A9lDzvkddc9czUIqXBPqc7M/wsi1B/6Ae/g6eO4mYCY1C6EpPVLR I30YW8+yHZaqUqt9sbsXqYMBN7hSj61gsKhieZ8OZDyaZvmhGXMqu4KwdJBn4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763560827; a=rsa-sha256; cv=none; b=QkemeP8kYUaLcCd954eTe8FiyqW/aBpc38AtNwjrZIWtJC+TjdY5CgUdd2zZod9yvhRSKM ckqpJxAL65tjG5N06iFKCtHQjIgg/CBU1m8M9h4Ou++3QU5aB2T23oRNHorlp31elJanrX q7hhRHl5m1OcZzWoOmr3STdFFeDA6NIb2MFxy0czF28DLfqplTnnMHNMurfbVz/U/SIJLq T12Ew9dJnJtA/AQa9aXnzrTMZxR1v8P8Ru0/J1XlMq+wiu3KvPQ++RhPvkQRT/uTD5MiWV dq6+F7jXkEmT63cfe6MvZkg2hgBnw4iwYEf5CmC01P0YcA/3McGqxToCJjPrZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBNRG6WDYzjWL for ; Wed, 19 Nov 2025 14:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2ce27 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 14:00:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 32605b159f3f - main - gdb: Fix some PEP 8 violations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32605b159f3fea3a5d4710055681650f3de9ea68 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 14:00:26 +0000 Message-Id: <691dcd7a.2ce27.4850c56c@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=32605b159f3fea3a5d4710055681650f3de9ea68 commit 32605b159f3fea3a5d4710055681650f3de9ea68 Author: Mark Johnston AuthorDate: 2025-11-19 13:58:11 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 14:00:05 +0000 gdb: Fix some PEP 8 violations Silence some warnings in my editor. No functional change intended. MFC after: 1 week --- sys/tools/gdb/acttrace.py | 2 ++ sys/tools/gdb/freebsd.py | 3 +++ sys/tools/gdb/pcpu.py | 3 +++ sys/tools/gdb/vnet.py | 3 ++- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/tools/gdb/acttrace.py b/sys/tools/gdb/acttrace.py index fdd18a4833cd..da79fda59da1 100644 --- a/sys/tools/gdb/acttrace.py +++ b/sys/tools/gdb/acttrace.py @@ -11,11 +11,13 @@ import gdb from freebsd import * from pcpu import * + class acttrace(gdb.Command): """ Print the stack trace of all threads that were on-CPU at the time of the panic. """ + def __init__(self): super(acttrace, self).__init__("acttrace", gdb.COMMAND_USER) diff --git a/sys/tools/gdb/freebsd.py b/sys/tools/gdb/freebsd.py index 81ea60373348..f88eef876c7f 100644 --- a/sys/tools/gdb/freebsd.py +++ b/sys/tools/gdb/freebsd.py @@ -6,6 +6,7 @@ import gdb + def symval(name): sym = gdb.lookup_global_symbol(name) if sym is None: @@ -72,4 +73,6 @@ def tdfind(tid, pid=-1): tdfind.cached_threads[int(ntid)] = td if ntid == tid: return td + + tdfind.cached_threads = dict() diff --git a/sys/tools/gdb/pcpu.py b/sys/tools/gdb/pcpu.py index 94c451e6eca5..08ae81e5121e 100644 --- a/sys/tools/gdb/pcpu.py +++ b/sys/tools/gdb/pcpu.py @@ -7,6 +7,7 @@ import gdb from freebsd import * + class pcpu(gdb.Function): """ A function to look up PCPU and DPCPU fields by name. @@ -16,6 +17,7 @@ class pcpu(gdb.Function): omitted, and the currently selected thread is on-CPU, that CPU is used, otherwise an error is raised. """ + def __init__(self): super(pcpu, self).__init__("PCPU") @@ -73,5 +75,6 @@ class pcpu(gdb.Function): obj = gdb.Value(pcpu_base + pcpu_entry_addr - start + base) return obj.cast(pcpu_entry.type.pointer()).dereference() + # Register with gdb. pcpu() diff --git a/sys/tools/gdb/vnet.py b/sys/tools/gdb/vnet.py index 5f416b2a515a..6175a5d6f551 100644 --- a/sys/tools/gdb/vnet.py +++ b/sys/tools/gdb/vnet.py @@ -5,9 +5,9 @@ # import gdb -import traceback from freebsd import * + class vnet(gdb.Function): """ A function to look up VNET variables by name. @@ -18,6 +18,7 @@ class vnet(gdb.Function): pointer to a struct vnet (e.g., vnet0 or allprison.tqh_first->pr_vnet) or a string naming a jail. """ + def __init__(self): super(vnet, self).__init__("V") From nobody Wed Nov 19 14:16:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBNp65KHFz6Hmbw for ; Wed, 19 Nov 2025 14:16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBNp64gtzz3wtH for ; Wed, 19 Nov 2025 14:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763561806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B47G/0cwTiverOXtiStTCE74Wt75S3U9FeqKRvo0ozQ=; b=CtA3Q2pApGRp14XfLbrOYD6oTgoNvWzj/CCQC1c0nHYMnl0RMaywB0XPLny63p350q8h52 ZErT9wDnQ3TeffXtnflSxcrb2cudhHJOcF+r74v/ftEG+qel0cdRItLBIi8GiHdwomfstc yLhWUrPRNgR8uwBotSZkgvbB4hbKX8xISxW1dx0CuatacDzjnaA0o4LXZrKp64agt0C5gf rTA+yDPvhrypcxUN01uilXziJHckjZs+ZgQP6DM8KJ4i8cPTV3Alcnu2mZBBrgmLXvjxE4 Lw9KLHqOSha2N9vprZozVCnMoiBkB4aGbe+9AXqmoUlEhJhaM6CBXXcBkb7kyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763561806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B47G/0cwTiverOXtiStTCE74Wt75S3U9FeqKRvo0ozQ=; b=sgGNK+8DfymwLXtZmeioXkVeixGOab1Z/MadN982peaSAxCtxUzrMeFeeFGN2s525a12qO xAbA173lJdCQ8Ttf9NZTmWzED+h99QaoWgBCG8YOZAua3fJGIDUpPc7AeMQwdl6SYg699a M5gf1/xC3Dhmc0Zbg6enoM5rh1R4t/eIj3I8uE8y2oM7zmUXliXD9QdGvDXlay6WYHc7gD XgHpnEHWh+U1a5Phyy2ocuF19LaA/bsHhtEXbd5WccUrQtc5ipmzqCriIqj5Budz93Syxr wg6uOm1CGiROGi+LQohjKCgNb6YRs2jZhoQirM4afMlbtgWGLAaMPnzoOlIfFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763561806; a=rsa-sha256; cv=none; b=lYFLvvA738cEvIskWCexBqI21/hi0ESJ9YJxoBEfBNUMv56kmctY+LbZmvXB5Vp0frYCOL qEwEU4QwiATmSkN4De11LR1saw0/c12UlBrzY4PSIQr9wAlJ/i5nqCI5ifov5a9VumAHbh Mr2Av1L/SEs9550jW3TnJ/DhGwVPFp3+GZTKUGTHyOTAnJgsN2ZT9UPOJNNNvUyOwAZ0UD U8d0yS2gGHoR7DCBTtZrvz4UjxiWOH4mU1VLzm0AJMJiM++N3Qqkj7XzU3xxIK59S05Ecb +ESP/xHY9hcQ7Yb6zSu+7KIX+yWqFxfv4tbrcZnF4x9FXO5heDYcnmeu9O2t1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBNp63xHYzkZD for ; Wed, 19 Nov 2025 14:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c3d0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 14:16:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: d76ea20f9996 - main - mpool(3): Fix a typo in statistical message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d76ea20f99965e8f3b9dbfcb41ca148711d528bb Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 14:16:46 +0000 Message-Id: <691dd14e.2c3d0.777b1ed9@gitrepo.freebsd.org> The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d76ea20f99965e8f3b9dbfcb41ca148711d528bb commit d76ea20f99965e8f3b9dbfcb41ca148711d528bb Author: Gordon Bergling AuthorDate: 2025-11-19 14:16:33 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 14:16:33 +0000 mpool(3): Fix a typo in statistical message - s/cacheing/caching/ MFC after: 5 days --- lib/libc/db/mpool/mpool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c index 9dab032134bc..1bab66d73baf 100644 --- a/lib/libc/db/mpool/mpool.c +++ b/lib/libc/db/mpool/mpool.c @@ -455,7 +455,7 @@ mpool_stat(MPOOL *mp) (void)fprintf(stderr, "%lu pages in the file\n", mp->npages); (void)fprintf(stderr, - "page size %lu, cacheing %lu pages of %lu page max cache\n", + "page size %lu, caching %lu pages of %lu page max cache\n", mp->pagesize, mp->curcache, mp->maxcache); (void)fprintf(stderr, "%lu page puts, %lu page gets, %lu page new\n", mp->pageput, mp->pageget, mp->pagenew); From nobody Wed Nov 19 14:17:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBNqQ6bpkz6HmNv for ; Wed, 19 Nov 2025 14:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBNqQ5n1zz3y0t for ; Wed, 19 Nov 2025 14:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763561874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jbUdTJJVPwkA2QcJAWFKzuIZZ5Sa9aiWLZVldk5x2rw=; b=s9DcwpWtp80esqLtgdOcmiIuDNpdzLdiV85MMZPAt4Ncl65iOmPH+MSvu+fbYwVld+XMKI PaTJ28m2KyUPVQmtzbw0xHH1TLmGQ5ukdbzVMwKDZQU1l2EHuGqO/X/lZOGS5NxPiIhYFH hWgcOAJ3w5rAL3hHrMq/SP397CPiWd+W81HNwzrZVMCcGVqs+NzTnRsjaMFNbuYP4H5G7p 2jtF397CyghkLuvIcAWPj9iT5iDOrIOOy6pWMdBE9JM//yySzmCtugAgx2Tv6wjajlaZEY K1TUztWmV+7bF5kmwn8UvTePJI3Bk4goMc1qceUZ/V2zbr2HzpRDnirlb5tLyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763561874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jbUdTJJVPwkA2QcJAWFKzuIZZ5Sa9aiWLZVldk5x2rw=; b=edTRdvAptkBIpaG7jdBxL5p9EFkTT37xl+6/Coz//HN0+s128YWerr2F9u30F/6n/a1HIx WEVkSJTde12k57FP15siPfyks2TqHzFbm6F/ZZsN5sT9GxBqNhnle0bcuhYHVPvF8jXmM3 EyGKPgb9v7DYzFbaE6/mbTx5TBH04XTbtL1TdxuuFdeEB8GyQOYPUKYqT44S6XwBAytk+i OZ7LsvXPB2p83hUHiRSQ62elysazRC3TkDjbAdJ7Ro2hmNlrBxIwCFSDBZynNI+QWR8nDy Jp2k6al5BiVeRRyuqGmVT9X4ZrzX47EHx1xNxTBZKuCsKE2s5CBjlQMAIPKGcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763561874; a=rsa-sha256; cv=none; b=OqTBorlKvbopAi47yRhRSrJUs4zM5nj1g3cRvAHKRs4vr4zay0rNjeg3qAiaVkOyTmcocJ fITi8o2gx4X9vU5zie8nWG78Czi2w9o1cl9XTUYkSRKH8hyStdoVvx7wjk8dYJUNE+p32C JYC48f/anPHhR+DYDC6Jpgr9MbdvSzWzWZ58oK4OURqPJSW6ldg4Tj9PI5IqParAYr4J6A BVX4pMM6SSTt5cFhzd25YApEBJnuH+sD7TX3xuUqt2xI1eip7a7N4/f4uTCgfkD+O3D8Pg uCDVWVVT2T7EdzzIhreAc8/4TTow6ZxydpuNCqLgVxQqoGVPc7GtN89YsDmBCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBNqQ4vmpzkP4 for ; Wed, 19 Nov 2025 14:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2ce6a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 14:17:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 9334fa3ef5e1 - main - exit.3: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9334fa3ef5e19de7d3dcdbefdaa3f6b6b653475a Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 14:17:54 +0000 Message-Id: <691dd192.2ce6a.27b8d571@gitrepo.freebsd.org> The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9334fa3ef5e19de7d3dcdbefdaa3f6b6b653475a commit 9334fa3ef5e19de7d3dcdbefdaa3f6b6b653475a Author: Gordon Bergling AuthorDate: 2025-11-19 14:17:40 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 14:17:40 +0000 exit.3: Fix a typo in the manual page - s/avaliable/available/ MFC after: 3 days --- lib/libc/stdlib/exit.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/stdlib/exit.3 b/lib/libc/stdlib/exit.3 index bfb14c5c9f83..40010e678e5f 100644 --- a/lib/libc/stdlib/exit.3 +++ b/lib/libc/stdlib/exit.3 @@ -104,7 +104,7 @@ may be used to provide more information to the parent process. .Pp The complete .Fa status -value is avaliable as +value is available as .Va si_status member of the .Vt siginfo_t From nobody Wed Nov 19 14:21:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBNvh30yVz6Hmx8 for ; Wed, 19 Nov 2025 14:21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBNvh25ckz40Ll for ; Wed, 19 Nov 2025 14:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763562096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vyWIfUabsYlkRkTi0LQy9640eZkjdSXw3GqS8hYc1M0=; b=JTM6vYspJKB3N0d2ieShr4eHCctJdjJSClLtAnOhsDE4o99MVXi5xWB9gspARwsW5r3LRr xIiA0eHTb9gU4saKW3vAokvgEADaWlL1N0iTOEG3EHwdVPVc8SeE5BLzjg0Ugx60PihG+K XQJPHdx+T9uizvf6JDlUrPEaFsiTYkcfR9MbbhrW9lNnecoJ3eGbwhgwXfFKgZGq7DgzM6 kBfVmJ6PncYvgQBAXJf9xR54SgZTGyVLvi7Q+eE65sj1p1RFDUKdG21xTSqxHYVFLlZehs hw7I5xOKDWjDx3QHRoupbJW+HeO6905vjPH0/z7JTiqzi/UNVgfhqmlnKpNkMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763562096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vyWIfUabsYlkRkTi0LQy9640eZkjdSXw3GqS8hYc1M0=; b=kUhqLZcqRzp5B8UHADOaOaDx49b/UA1Ti/mstufp5r1wk2k3yNKAJCF2090o/x++tQVfTa tMeIaugSL7fL0UkGAgr/hUhBV5wNsnf4lnuwv4An5bUmSLugc5UqmN24IR96WhJmCvHnFO VA5zziuVKO72f8zfNUtnFZcekh2jtPWH8J09fCQQUMIznGBkGkKgg0vO/5J/hsBw2WYY/j w6ykNnU4EMK4cWRpYkpCK5GcdAcrvy/yFPjLLvJTaQ4zXcjRxCZUohkZ2ea4ukRTKd4hIC OL9gquEbplhZ2Dy5qYrSz+RHO6OBfx86aEJgIUv+MbZZ2UiDha2et4VhngkKkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763562096; a=rsa-sha256; cv=none; b=X2n2j3t4/84VJPR+G0WXS4hGanz6zfyOkAYpuI98Cuntmxl5Udrbqw9HgR70m7l1PPL+8a 9Bjj31Ypbzez9sgi6z3BJO1KfEFjtjMsjg9cy1lky+eDWEDRokxSUybJ3IwXCY8qdZTcon LC3rwYRCUXYNZU/0c/yp9nTqVAEzLDm1B/rdTAzR50Dz041KzuqqK076qU55PjBq/c0FJD awlrOPaI1NAkGDL3Uf6lVswchX+S4jFBsej+NVwdpXS25Gp/a2lrVI/ghxXbxEttcoPhDG pbhngg3GXetNjXiMT9G4DLPlLP3OEwkvYX3G5P/kLdPf86nGd+Qlu1w/cAePuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBNvh1fx5zkPX for ; Wed, 19 Nov 2025 14:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2cffb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 14:21:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 64bbcff94459 - main - moused(8): Fix a couple of typos in the manual pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64bbcff94459153ae6e118d7776e379271bdc0b9 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 14:21:36 +0000 Message-Id: <691dd270.2cffb.5a4d070b@gitrepo.freebsd.org> The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=64bbcff94459153ae6e118d7776e379271bdc0b9 commit 64bbcff94459153ae6e118d7776e379271bdc0b9 Author: Gordon Bergling AuthorDate: 2025-11-19 14:21:09 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 14:21:09 +0000 moused(8): Fix a couple of typos in the manual pages - s/compatibiliy/compatibility/ - s/rewriten/rewritten/ - s/derrived/derived/ - s/suppported/supported/ - s/Horisontal/Horizontal/ - s/thesholds/thresholds/ MFC after: 3 days --- usr.sbin/moused/moused/moused.8 | 4 ++-- usr.sbin/moused/moused/moused.conf.5 | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/moused/moused/moused.8 b/usr.sbin/moused/moused/moused.8 index 2483f8a04b2a..b414b2ff787e 100644 --- a/usr.sbin/moused/moused/moused.8 +++ b/usr.sbin/moused/moused/moused.8 @@ -299,7 +299,7 @@ or .Dq Li generic . .It Fl l Ar level Ignored. -Used for compatibiliy with legacy +Used for compatibility with legacy .Nm . .It Fl m Ar N=M Assign the physical button @@ -529,7 +529,7 @@ The .Nm utility first appeared in .Fx 2.2 . -It was rewriten to support multiple input event devices in +It was rewritten to support multiple input event devices in .Fx 15.0 . .Sh AUTHORS .An -nosplit diff --git a/usr.sbin/moused/moused/moused.conf.5 b/usr.sbin/moused/moused/moused.conf.5 index bc62b5d00995..4b3955c8c7d1 100644 --- a/usr.sbin/moused/moused/moused.conf.5 +++ b/usr.sbin/moused/moused/moused.conf.5 @@ -37,7 +37,7 @@ file specifies how the (mouse daemon) should operate. It provides ability to adjust certain mice parameters on per-device basis. .Pp -Configuration file format is derrived from +Configuration file format is derived from .Xr libinput 1 device quirk files. A file may contain multiple section headers ([some identifier]) @@ -72,7 +72,7 @@ glob for the DMI modalias or the DeviceTree compatible string. .It MatchDevType One of touchpad, mouse, pointingstick, keyboard, joystick, tablet, tablet-pad. -Only touchpad and mouse types are suppported. +Only touchpad and mouse types are supported. .El .Ss List of currently available Moused tags. .Bl -tag -width indent @@ -296,10 +296,10 @@ Enable natural scrolling. .It MousedThreeFingerDrag Enable dragging with three fingers. .It MousedSoftButton2X -Horisontal position of 2-nd softbutton left edge in percents. +Horizontal position of 2-nd softbutton left edge in percents. (0-disable) .It MousedSoftButton3X -Horisontal position of 3-rd softbutton left edge in percents. +Horizontal position of 3-rd softbutton left edge in percents. (0-disable) .It MousedSoftButtonsY Vertical size of softbuttons area in percents. @@ -392,7 +392,7 @@ Predefined quirks processed before .Nm . .El .Sh EXAMPLES -Set touch pressure and palm detection thesholds for PS/2 Synaptics +Set touch pressure and palm detection thresholds for PS/2 Synaptics touchpad: .Bd -literal -offset indent [SynPS/2 Synaptics TouchPad] From nobody Wed Nov 19 14:23:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBNxm6JRNz6HnBk for ; Wed, 19 Nov 2025 14:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBNxm5fjsz412p for ; Wed, 19 Nov 2025 14:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763562204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hHcXWVEZXehBbuqpKOIzfbq82ajDjyxKAEAW66Vg6Pk=; b=oe4U5Z38ddrJG6XOLvWwAYTXj+KJLNjFCtEZ6LxEAwuaQ3AuFvoTsNbKT/QOTqrL2vo/gJ LoC3WOOHzUsxgAY3gT5rKksVrJ6477zjGzPE+XLCBJZkWKFWxxk3tZul8xbdwbQ7WY936Y wgVn5Zsy0wAhQKtNhV9D3rvNvf+azO3Ca+BgXB/Yd/G97fJ88D0MRUPlNbJsTmnKHXWzl5 h921Dr/W/z4zShcUVmHy+YUg2LoQxGq+cW4frUl+r+giCWMEIehM6lSHUsuEcH1x1QEKkV 1zVZx20CBWPbXdBJAKWMYTx0ja4dMRJGM9cpRjWpKUm8iFFeeqwt7sy/vJk2jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763562204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hHcXWVEZXehBbuqpKOIzfbq82ajDjyxKAEAW66Vg6Pk=; b=ZWhcLzAO6y4EHKKxL6HvM67JYCbtSHl3bx/rdyYGd4Zvte/mxEzIIbFJT9Xd2akxMfUYv/ ysfVq9qdtM3f2MROD7WVNa/o7fPQsHwgpLKa7r8/0eUALEEWAuMjk6TLNz6AFW0bTf8t3i HKsl9pTktMUm+21dxIsL8u66UW6R+I1oYJDpmC858EdI+6upmsPwRyjAYvLB61nZX1SmbC NYvm85QWd4mxH1eBSNWoo2//xHn1NDZmgvtniSn8O4IHQIFp3iX8lqmeoj0IBj8c6QcBUj Kbk7U1xi/TtsAUjw+u9iGW7l5vI8V/fMnFNmeyntqJBWUZG86F9XajTCNPsr+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763562204; a=rsa-sha256; cv=none; b=wHkCGBrwXaOeG8SGKpI8KtcQJEQwKmq4WeyrW16MLSU9p0IkqLcXGAUa3Js5vlYlAwlklZ R85AfD5U/7CqTz7bcdY8Hk+J26AjxMJAK0LdM46E7y33cPe6UU3MjtMe8j5geInanaxAg5 zWaln1uVB1nQpS/WTr1WWT8XsUWOj/jbIfbH1iWRrEiUkC2ATrwule84b3uodGCx20uDgL xLiANzu6D6e4TmLCZL3ZyR4IsdP4oRP+Y1Ov+pOl03Yso+NzjMQB3ycynnp2Om8xHytbMR JcnsDUe+hwbtO0SUVtnnvRXTXY0kdMA/ZKQJ1DlTjCoVMJ9ACDPV3NIbhFltiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBNxm59T8zl4C for ; Wed, 19 Nov 2025 14:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e166 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 14:23:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 6f14b6025a6f - main - stand/lua: Fix two typos in the manual pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f14b6025a6f6475522697362aaf6c84514b85bf Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 14:23:19 +0000 Message-Id: <691dd2d7.2e166.7c31a2dd@gitrepo.freebsd.org> The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6f14b6025a6f6475522697362aaf6c84514b85bf commit 6f14b6025a6f6475522697362aaf6c84514b85bf Author: Gordon Bergling AuthorDate: 2025-11-19 14:23:07 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 14:23:07 +0000 stand/lua: Fix two typos in the manual pages - s/Additionnaly/Additionally/ - s/commmand/command/ MFC after: 3 days --- stand/lua/config.lua.8 | 2 +- stand/lua/loader.lua.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/lua/config.lua.8 b/stand/lua/config.lua.8 index 7e8863203446..f918ab7ffbeb 100644 --- a/stand/lua/config.lua.8 +++ b/stand/lua/config.lua.8 @@ -66,7 +66,7 @@ as a configuration file .Pc and then process files listed in the .Ev loader_conf_files -variable. Additionnaly, the top-level call to readConf will process files listed in the +variable. Additionally, the top-level call to readConf will process files listed in the .Ev loader_conf_dirs and .Ev local_loader_conf_files diff --git a/stand/lua/loader.lua.8 b/stand/lua/loader.lua.8 index ffee46526c9f..b750d42e2158 100644 --- a/stand/lua/loader.lua.8 +++ b/stand/lua/loader.lua.8 @@ -90,7 +90,7 @@ Obtains the value of the environment variable returns .Va true if -.Va commmand +.Va command is present in the interpreter as a builtin. Otherwise it returns .Va nil From nobody Wed Nov 19 14:27:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBP2F2Hz9z6Hn1n for ; Wed, 19 Nov 2025 14:27: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBP2F1JdBz41Tp for ; Wed, 19 Nov 2025 14:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763562437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5C0E5Iuysfv5aKO7DZVj85Xgrdx727zOynImc0eZmBA=; b=Sh63Nx4gaAk8XcRILMwicPnCxEJw9OMxStk3fXC6dswPRcfRTc0Aa7MAVswgXsQKdV4NFF 6QrzR5y0XKpGxek9xVJYbTMR5fxsb1Q/jH4xpWUpAs70x1iqTURgQx47T9KBDDbyc+a7Sb IpHYpAg1jibLxC4s2nFAmaCSdRFIvlkBG9740thc7GJxFd+uZKs+b8VgjDSdCBHI9nWUPR t35pgiMtiuOBoR7hI+IQ35Du46AJ1aU+gXQH7y7Hys/zhAmFaRF3uIMtugaUMOtjQVXTbr 1maYpR8qFcvMEcPPPf+hB5TvoKmsVBFF8Abush4Cj2PrXWaj7CK1UbKstr6ZsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763562437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5C0E5Iuysfv5aKO7DZVj85Xgrdx727zOynImc0eZmBA=; b=l+U+WnBGAd/CBdwhkt3LqjUArjhoggLwCyYcCMRhrcF+paMuBSeystPwvVk6fF8oK0fAYy gDgNE+EVmHn7VffK6YL6vfYq07gorjmRcJZTjJM2fvZBOchpLX80Lz4jw02w2APz8nMtqg RxplY77HQOPr8WsM8UpRV5JHN6GfO0SdwSTtiU0JA1zf4L4kJO3n23pThFvN75Xo9311nw CMNpIOUA860oVHyVPYAR1kkrf63UowDTGIg0bEWJBkyT5+F7g8OzN2Bbm5yXcAypNa03s8 RPmw2pS5BkDQ3su8H9r05ehu+SY4qiQVHtMSM7WIg5+Go+p4lFB/dlBvwyRabA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763562437; a=rsa-sha256; cv=none; b=j6Rko8s+fve6FFs9W07KGvXTeBnXrDvAbv5rJTW6gb3sO9GU1uqTczpaQTLyHgqU2CqrG7 sFb2kCwLIO81QzWptqbiTTTXLIQFJifjIWxfjDl19IknkM8H2qYZO2SmegsZQ1W8ap1EXP RMIRftWzTn9w7eANBK4cEOk4yErtEc9vtTQK1fagHkMJdSLlZuY8j7cyS4cPRf57VG+Pdx IxMp/k+JrWzun6KZTEfeOIUxsoyhnKSOI28ZJJUK2KgCW5BhVPsR5wcS1r1aq4UNZIQOwN OsFFRdPA96esIC8XXxd+mWvgfSxQtlZ4Mlx/s9VU4hUM0AU5GDEJIcokYaWn5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBP2F0s0CzjyX for ; Wed, 19 Nov 2025 14:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f28e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 14:27:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 58b86e40ce76 - main - libexec/lua: Fix two typos in the manual pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58b86e40ce76de649db19d9d1f8571d5c942d44b Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 14:27:17 +0000 Message-Id: <691dd3c5.2f28e.256a46c8@gitrepo.freebsd.org> The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=58b86e40ce76de649db19d9d1f8571d5c942d44b commit 58b86e40ce76de649db19d9d1f8571d5c942d44b Author: Gordon Bergling AuthorDate: 2025-11-19 14:24:30 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 14:24:30 +0000 libexec/lua: Fix two typos in the manual pages - s/environnement/environment/ - s/interger/integer/ MFC after: 3 days --- libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua | 2 +- libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua b/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua index d254dd22c91c..242bdb4400fd 100644 --- a/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua +++ b/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua @@ -30,7 +30,7 @@ function. List of functions: .Bl -tag -width XXXX .It Dv table = freebsd.kenv.get() -Dump the kernel environnement into a key/value +Dump the kernel environment into a key/value .Fa table . .It Dv value = freebsd.kenv.get(key) Return the diff --git a/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua b/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua index 34198d20463e..fe189225b239 100644 --- a/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua +++ b/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua @@ -33,7 +33,7 @@ Load the kernel module named .Fa name and return the identifier .Pq fileid -as an interger. +as an integer. .It Dv ok, err, errno = freebsd.sys.linker.kldunload(fileid|name) Unload the kernel module identifier either by .Fa name From nobody Wed Nov 19 14:27:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBP2G3zCRz6HnJ5 for ; Wed, 19 Nov 2025 14:27: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBP2G2CC3z41ff for ; Wed, 19 Nov 2025 14:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763562438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DTUhJJaKHbw9gVM7LW9WY7PFYc889bAFCVbhipww95g=; b=eMZ3LD0790kGge9pqI7ZtH5QpOi+fUUSsXDqMcMBa3Abnphfw2dN0Lcsz+cUr3JUuC49n8 s0zxQw8k4p0fdvBWc44+/EjJc+fms3ozJ5aP0WnWjjare6WJbT6MwRyARIFYh2WYFR90KO i/WeWFRLnjhjpu8vSLVscKMnW0BWMi/PqgxBGqbFVV4xyGXcXQ6X3TxlXoAqyDg2mUJYZp lxhmrYhqqPlf7Ml4IYdrtNL0O+BN61O5Ofr6iCyRydRBxh0xuHlRefjlDW1W7DlXlV7Pl6 Ia9ZltGcKejC3hjRTYVTCNY6ehtVYerC489YlCX6DP/VsKgUxMEH1/7pEDcBmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763562438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DTUhJJaKHbw9gVM7LW9WY7PFYc889bAFCVbhipww95g=; b=eJyFE71j415+J2mVWC9YJ5yIja2kVDI4nZZtgtZxA9SE8/pnb1ctZMrnQMKeI7pgV4gCo0 0KKl2O/LG96mZJcrYB3qZoW6RAefH7Tilz0dr/1esaVNKoFaNWZNyzngrsAGC91W+5FZ5G zTxdiqMlQqiqT5gUk/RP4aFZoBPTiZl4H0OC4a1Ztqr57LcVWK93XVf8CCln2/OfJBDMxA zvG3un8sNzRh7mz/BhDpXuRDB9oCjOJKi7cr6apzg0uYGFyrbYazKCBoXpUCE67ejhxncV /4B6fUWKbspAcwDPeU9He2VrFGUF3hbo3BtpuSBLVSuHGUiAsgK/ddvPH4OTjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763562438; a=rsa-sha256; cv=none; b=V0t/C2KfRsmfgvzGl0hvz/qOmBgw9kr4+syso2bhDxaM9RxoqSzhU6u/c204Z/7PECG4j3 aKmIZtn0/pp8oSnuXbTtiUsyDwckFut6bilp5XzBOQvA9akg0Cx2vlWZirYTsS4xj0GZ3V WMqaXE4RQelZiFPsguWU59BuVkg+Z1TO5Nw9r+EFQaNDF/vml2LwJryiXZfbjiUdR/eCgd P1BJ77H0tv2sKKEhRHzxOU2Fehpybpxb7CjKvtsl3XQl4xx9WlSAoojCb7FDed5IDyFhEN uxj47K4uTQlb8OLDVH0LvRKBjfvKNT6rBy8gwn6FCkwewgbT0f298Byc+j+Zkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBP2G1dW8zkgj for ; Wed, 19 Nov 2025 14:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e4c5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 14:27:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 16d8aecdf5a8 - main - cxgbetool(8): Fix a typo in the stats description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16d8aecdf5a8eae201087116e8875706340617ed Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 14:27:18 +0000 Message-Id: <691dd3c6.2e4c5.5f7155c9@gitrepo.freebsd.org> The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=16d8aecdf5a8eae201087116e8875706340617ed commit 16d8aecdf5a8eae201087116e8875706340617ed Author: Gordon Bergling AuthorDate: 2025-11-19 14:27:02 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 14:27:02 +0000 cxgbetool(8): Fix a typo in the stats description - s/addres/address/ MFC after: 3 days --- usr.sbin/cxgbetool/tcbinfot7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/cxgbetool/tcbinfot7.c b/usr.sbin/cxgbetool/tcbinfot7.c index 93b97bddbda6..9dea19774044 100644 --- a/usr.sbin/cxgbetool/tcbinfot7.c +++ b/usr.sbin/cxgbetool/tcbinfot7.c @@ -856,7 +856,7 @@ _TCBVAR g_tcb_info7[]={ NULL , 0, 0, /* faka,flo,fhi */ "rq_start" , /* aka */ COMP_NONE , /* comp */ - "DW aligned starting addres of RQ", /*desc*/ + "DW aligned starting address of RQ", /*desc*/ NULL, /*akadesc */ }, {"rq_MSN" , 2, 986, 998, /* name,aux,lo,hi */ From nobody Wed Nov 19 14:30:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBP5d59crz6HnJf for ; Wed, 19 Nov 2025 14:30: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBP5d4fy8z42Rj for ; Wed, 19 Nov 2025 14:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763562613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sK7MBX5tKb00/zMHoMrpD1K7JnTFHHP95/xYHt46KGg=; b=qJC553i+NxcO6NAezBib70l122uc6IcGSJW2AmCz89QHU8yC/z5+fpSREbD3GASDkQuBTL RgJt/f3nsVS9Ma0fWwQL40D73yxZkj+jUiSJIMXcKaLhIDbZzBxIYKZZWlWMMfOVt3uS4a rgqslCyD2eXJmUzpoIIEw/4VB88TG5xfYeBnKTSzemWWCamjpxyb1MbTlto1qEbmk3Lxvl AmwimxdhGol2QpfIYE+IZmjuXWiB4ZqWixh+0Y0Hyn8+Gw/mNviOWyl1/KC+C55+55s4ir VbzdCpKq7db+JqYU+14SYNC9VtzBNWrQnqaNlVVmYwOHc4+srD2iSMjx3gI+sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763562613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sK7MBX5tKb00/zMHoMrpD1K7JnTFHHP95/xYHt46KGg=; b=H7b3S8u/htrqq7EMJI93VIh0XXAufPbmxrExJmCzrj/mIljBSCkqQJvxLlWrK39LolTrZE 69wY0e7WbCP3dbvs9voIV7j+aqeyqbBtccXEBsY5IL+FUTImJ1UOPm0dbBmNStuPO/gfEg hKa5T9ojF/bZORJmdWyG6f1MXIzrFoCjlqlPPF6zgjO54aGc+HzVyL4mODxecQquR93E41 34nWqtbOBSPQlT6GlHnVsRIBvPWh/+4BMcVvOR7wMD6IGogdPMEgbWnoiQbDQbAoEozHsj 2vEIu7JUYp9cdv1naSpUx9IsCP9Kz7ByPOBUAB3lQvhBegUpwoGw+klJ96Tbbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763562613; a=rsa-sha256; cv=none; b=tzLJpQJCLWKx6aYv2VnzH+ngMHAjDExj0CmqiG4dHxez11suOdHWpLGj0n9P3aDsDfGgks UTUYdS1vF7Ch154XkhZuHeA1QDOanacj5oJCn6+qAu45D3Qcm2NbVMDlTdnJUN+/uaf2OD Yk8oRI405gPU+zziT+rEFuwFX9pS5ugLdjKMVk0oUE05nzmJ4v5Y7WuWgEGsbtSnQ1edq9 JcrvrE1XnYWsY742OoU56GyQ8rLeG6r4M+RZMA9rd/M4KdxPAWkWBz7FgtOhYPI6Wf/cIq OeAC7hK5aYC+kaIcRhm/crfTJzuFvdt6HEpBrBpDQgLDFIrHja6fBv18cAdfwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBP5d3kWCzkgm for ; Wed, 19 Nov 2025 14:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f2b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 14:30:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 73a026d5e977 - main - nuageinit: Fix a typo in an error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73a026d5e9778ac182be4a5876771eefa2cd6f41 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 14:30:13 +0000 Message-Id: <691dd475.2f2b0.69421535@gitrepo.freebsd.org> The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=73a026d5e9778ac182be4a5876771eefa2cd6f41 commit 73a026d5e9778ac182be4a5876771eefa2cd6f41 Author: Gordon Bergling AuthorDate: 2025-11-19 14:28:54 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 14:28:54 +0000 nuageinit: Fix a typo in an error message - s/outout/output/ MFC after: 3 days --- libexec/nuageinit/nuageinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index f29fa8ba1bac..dc33f20464dc 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -64,7 +64,7 @@ local function get_ifaces_by_mac() ns:close() local res, err = parser:parse_string(netres) if not res then - nuage.warn("Error parsing netstat -i --libxo json outout: " .. err) + nuage.warn("Error parsing netstat -i --libxo json output: " .. err) return nil end local ifaces = parser:get_object() From nobody Wed Nov 19 14:30:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBP5f5l3Jz6Hmyy for ; Wed, 19 Nov 2025 14:30: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBP5f4TLtz42Pw for ; Wed, 19 Nov 2025 14:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763562614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4zf0cPvBOzcfJCIBnsIXTBIyhIBIzzqSDSzklVF9c4I=; b=YD8tVnQ6wfxYvAaYNQIeR9sVAoj1s5LSmCnS18Ra7pF/cH97l9kNhEGP5xXTCY4pBsa2nr meD0N81ZfEirxN2gUJwX3qn9Y4lUcxNivryfHwwijkOb54CNcCMst1piEVB8qtRt6/9jyI ANytXPFg8JcyAuCwcQ+P4IutUb7/dQsXvkAukE84+vvcvGvkwHKCu/T+3cXkU/wX7vVeDp cM9puyey4YxPej4W7SL9qu62GB5+P3RRuPPkAWGs7bnSVZEQzhSJAcqsn5xQknCym3vT1J nTdnoQoz8P28RP3TEjgdB7jdZ1oNHtHFc0xYJAuE3lAWP4vgJ4pm5nSGNmmNjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763562614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4zf0cPvBOzcfJCIBnsIXTBIyhIBIzzqSDSzklVF9c4I=; b=NNG4drP/etcWlxlLdlIRleG/8aJlgE5lXE2/cHFWvmcwIbMX0le7IHC2vmDNs/MPCgdVqn Ez7OuFCuMVc7VJSNRn6JiBKnkHbmX7IuE/0uaKMIwHpWKP1ibc34bH/bNEDjL//E8crBFU YQKf9iB22+3D2EyosGJ8rNJhXVOh+LEFobwZKHFrdkyZ5beLvNeNAAunET7nNDe8JRzT4a w9yjOsAJNk8mGEExmsKArVc5iczUjyRj4LHnyz7PadN+/9QsKWhT4Uy/vpxawoRbkPmMHk 3C3MgBEe7M3CJt0B4ZVHOrZhapmQ/hrV+gEhDQiulZIfTvs+SqsMu9CdIss7+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763562614; a=rsa-sha256; cv=none; b=Zlecv9r508Lld/+RqE5+1iPVyxcJJUS5QrQ7rJSKbPLnZ9UYEFrRvay1yf4kSLUcJgnf/Z +M3R7NfvJU4KefOzqRkHtaSgoY6eqvrA6v1iK+5yWsWZqosnNiBFypkvXnx5Z5zBtVVedp dAt7vWsnUBkLMoS1swNPZmD0Y6V1nPoHgU/qhSshLlxgSLBj7I41zqeO+SPUzzBUw4+dgs 1bFFpH2ZLrmInv4lJDPa61HV8ninBPiQwiC2icyJ9FlqHx3O2G2pHD5xfhr+Aw9bOKmZSR FRPGEr5yaIRd96i98GlPSw1oEY0QEfg70J5ajGWoIFUvEM6PXBurSs7C7DNluw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBP5f3nrlzktk for ; Wed, 19 Nov 2025 14:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e06a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 14:30:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 66d4a37bc389 - main - lpr(1): Fix a typo in a debug message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66d4a37bc389bf19ebf2210b0fff762baa659c32 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 14:30:14 +0000 Message-Id: <691dd476.2e06a.63d9ae27@gitrepo.freebsd.org> The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=66d4a37bc389bf19ebf2210b0fff762baa659c32 commit 66d4a37bc389bf19ebf2210b0fff762baa659c32 Author: Gordon Bergling AuthorDate: 2025-11-19 14:30:02 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 14:30:02 +0000 lpr(1): Fix a typo in a debug message - s/unexpect/unexpected/ MFC after: 5 days --- usr.sbin/lpr/lpr/lpr.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/lpr/lpr/lpr.1 b/usr.sbin/lpr/lpr/lpr.1 index 8acb9d23d9da..b73870a0f46e 100644 --- a/usr.sbin/lpr/lpr/lpr.1 +++ b/usr.sbin/lpr/lpr/lpr.1 @@ -105,7 +105,7 @@ phototypesetter commands from ancient versions of .Xr troff 1 Pq Pa ports/textproc/groff . .It Fl v The files are assumed to contain a raster image for devices like the -Benson Varian. +Benson Variant. .El .Pp These options apply to the handling of From nobody Wed Nov 19 14:31:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBP711txNz6HnZr for ; Wed, 19 Nov 2025 14:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBP711KLWz43Bj for ; Wed, 19 Nov 2025 14:31:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763562685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZiS693cOwaaovfJkjBwNVe4K22uNqS2osJNNSrOC9CI=; b=UU58Wap4GVSIk3hwwVFyj50q0coPKUDL0c60pMyinq5U/kwpnNPH8dC2yPZ6NP6EMxD3a8 1xIf5DynczuE8Q8pLlPgFzAsZaLXpkfKcryxK3SfJubdk5/Bhikpk+oWShJmzl9u+eVvOa SYmSLGrGOOyqDaI0MNY/NQvegKuzFSCX9Ezu6ZhpECiYm7iqjdKfPUoJQIq1LqpjLh4Wbs XnxLq6sNtW2wHkSzIICUoL5anp8DIGfax9uSXQfDnhuTvLJblT6nlPwVRjAMGaSpEIlnen 5KTDZNkdGCnaDLlh/WuvLld5As2xHOzWG+TU9qFQmMLJuwae+0TrMZrL6EtbZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763562685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZiS693cOwaaovfJkjBwNVe4K22uNqS2osJNNSrOC9CI=; b=b5kS91UQDDema1aHfdr8ZW7FW5xMRvm07yL4RzRdZUPOAfuRIGPoap3Iz9pyCDKFqhYAhW zMDWfmIUvoWJ8BNW3vAd+6vCcRlXue5jgT0F+zHolDr2DqmUsMpBA80XMihlk2bQRrAyw8 aNnXz29jCaGx2SARTOCyVK6G52sNGYRKx7gSoa/doI8b/DAuCO3m6PXZpsfbm7frhyQ/uJ rO4QLYnHwMHfnWB+sdIYeEb5yOvjl6ocrgShsCkSfKmansuDbJ3laSmTt8QYEhXO1o4cuX nM7cVmBpeX+aUaPE/cdE9mQDE9INuxLi9qnWVpUIQLjLlb+lF0ioBOv07VToaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763562685; a=rsa-sha256; cv=none; b=ccnHGTs4SewY4iADpAnS1Wao2p8425mImPqmleDD6jbNuovDaeLUkx2Lseht8QqUL3yoDG +skqYoRwjocqGEMW9MaQThiqDEBrsUIGvh8vI2GfXo0LG/njAqJKOoBdlm2SewHGZJJTIK RJuLuvflPkX4Ye2XlVA1hgzOOe11d6dBNxhcl/eGQBW+t4Hw3idoEn6kZ9zR2UWkZ8ueQV Y8cxeApwnO9lG2Cwg3OLBwC5Ivc63pcTtN+hBJd0i7111MpW5b4rjiynLnLatYuuaIHOQ4 IK06cpETrQr7wTTCtX/MDTgkcQcV2rjHBr+qvy0CuQ/LITfe3bKTSYkLj+o7gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBP710gF9zkv6 for ; Wed, 19 Nov 2025 14:31:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3020f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 14:31:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 843a4ad5814f - main - ypldap(8): Fix a typo in a debug message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 843a4ad5814fe4344b245819880d423343b2d5ab Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 14:31:25 +0000 Message-Id: <691dd4bd.3020f.25f39ba7@gitrepo.freebsd.org> The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=843a4ad5814fe4344b245819880d423343b2d5ab commit 843a4ad5814fe4344b245819880d423343b2d5ab Author: Gordon Bergling AuthorDate: 2025-11-19 14:31:13 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 14:31:13 +0000 ypldap(8): Fix a typo in a debug message - s/unexpect/unexpected/ MFC after: 5 days --- usr.sbin/ypldap/ldapclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ypldap/ldapclient.c b/usr.sbin/ypldap/ldapclient.c index a246a25a9605..76918de90366 100644 --- a/usr.sbin/ypldap/ldapclient.c +++ b/usr.sbin/ypldap/ldapclient.c @@ -317,7 +317,7 @@ client_dispatch_parent(int fd, short events, void *p) client_configure(env); break; default: - log_debug("client_dispatch_parent: unexpect imsg %d", + log_debug("client_dispatch_parent: unexpected imsg %d", imsg.hdr.type); break; From nobody Wed Nov 19 16:17:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBRT974S9z6Hw6H for ; Wed, 19 Nov 2025 16:17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBRT94cpPz4Nqh for ; Wed, 19 Nov 2025 16:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763569037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=11YBw5g6XtRE6XaQ+fNr5jpLGSoFlCcKEBOfmSiYIoo=; b=BEHowLPp0d8qsifgKMozOW6DFHmIQfMj2SA1v905tj52HijnUhYsIEHlSQAAlghJBO9Jam 85cs0EL9dHDpzOyvWQrTDXAV5PH2R98PFgmYZ0xGjgWcfHo9YhzLiouN4jeAa9X8bFttRV cs9t3/pOSTZB+s4ninGGiuyaAppwV77k7KlAel47qkhO/hnzs3V9J+BzbGfnGtYCbI+VRz KtoJ042BtjvPycsSujnGZQjr4p8EpY648+7HQM4eOvUccZXgKeD5pJP388z6WQGn2WLj/k eqCouOCIfDgq34l1nuVHHAUR4QFbmsGld2yn3gVzDZwj+uhT3cXY9FhcsxTfbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763569037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=11YBw5g6XtRE6XaQ+fNr5jpLGSoFlCcKEBOfmSiYIoo=; b=u6DIbKkF+pESsbcLJJu8S00EjDJdpAGogeDbiWffNWKzmuFtbafvBG7Eq1OqsAda16/8zO 87eGAGG9SKZjNd5g4AOyQhwex0J77NagHeQqfGIwI671LqsyiWhgDowaYmSRtoAY5vuEqO EBqN/5wS0Io5UvXt02/2QuQbURcQu1pKRlfp8/OlmWTeRLVjbC/6hodDAgyOgs6e9hxmn1 HdPnhxy6EL8HBsHzOLCj5kXP54L0x0iBtoQIGqPeW62RqdTGyyl6UuDPFzp77inqkwtpXt 5PxsSbnuYYsUNUT9k2PLu4ithgveME2Wj/SluhYDgCVr4gLBWDmkED2glsI8cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763569037; a=rsa-sha256; cv=none; b=ihzY156SqLUGpbfzledrCrOP65CXS8JxTIrjZlRIZMoUmRcnOUeRJFIJyhd+BWuTAg2jhU fB1EZdXMOa8PpcU+NEsZg+5ndmp2usigIyAKUgHK5c/42v4h3iE4T6FsDQwfToUN9SBTYZ 1wx2Lak9l688w0mde70zy9v2TFfFlzRnyG/7itbARb+KBENsuEkvpxiEXwC/o+diElmix5 6eWz95tI4PpNGgpD8Mz0kPKp5ZOs/1PjugNoYZZskf7MbAvYOlu5dBIg9X5i/N3JHvSAEk DZoV0fn0GNm2YT69skMYUAjhCtnt9z4hiUpSBKAp7/qfhTjB0wpNgkprVKpMYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBRT93vV1znh0 for ; Wed, 19 Nov 2025 16:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 398b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 16:17:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1f6e3abf4171 - stable/15 - inotify: Work around the vput() bug directly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1f6e3abf41718e8e4a309be122f0a6048e9c5772 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 16:17:17 +0000 Message-Id: <691ded8d.398b1.5f100ac8@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f6e3abf41718e8e4a309be122f0a6048e9c5772 commit 1f6e3abf41718e8e4a309be122f0a6048e9c5772 Author: Mark Johnston AuthorDate: 2025-11-15 18:00:44 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 16:17:08 +0000 inotify: Work around the vput() bug directly For 15.0, apply a minimal fix which at least ensures that inotify can't trigger the latent race described in commit 99cb3dca4773 ("vnode: Rework vput() to avoid holding the vnode lock after decrementing"). Reviewed by: olce, kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53774 (cherry picked from commit ebc17879f0885ca87644980f6275b9759b311eb3) --- sys/kern/vfs_inotify.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_inotify.c b/sys/kern/vfs_inotify.c index e60d8426ee42..fd1ef39b13f7 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -381,7 +381,14 @@ inotify_unlink_watch_locked(struct inotify_softc *sc, struct inotify_watch *watc static void inotify_free_watch(struct inotify_watch *watch) { - vrele(watch->vp); + /* + * Formally, we don't need to lock the vnode here. However, if we + * don't, and vrele() releases the last reference, it's possible the + * vnode will be recycled while a different thread holds the vnode lock. + * Work around this bug by acquiring the lock here. + */ + (void)vn_lock(watch->vp, LK_EXCLUSIVE | LK_RETRY); + vput(watch->vp); free(watch, M_INOTIFY); } From nobody Wed Nov 19 16:50:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBSCm5jHJz6HyQy for ; Wed, 19 Nov 2025 16:50: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBSCm4vchz3JYL for ; Wed, 19 Nov 2025 16:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763571044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4YWsA00OYnXs7NfWRm9MI5MarPXHZo1y/DBlY4krI0E=; b=lQKRfi58h1EwUey8hJwhC5HdAZNbeGgA5m4CWaSsI8zXaRNS3Ca0S4rr9/pyO1FeLxHkgO qc5QuuvrGcwqylX7iS9lwcOseg0vIyzQFORk4LdL++m81N672+oUvTqgaAACZkbypsep0M NteSZH82rBDeanwmT+/IxSu+vByE1WL0l+9FvR/tzmX+2zFuFGj3DgpFMbiJ+GctV6KWZW SJH/Q9ubG29WTITpd1i1JmpbP1NtQBDRJRalFdXKcjOV0TPnQOeTvjY8f1Bfq6lEjkOS6m 8Fm6e9NCVuE3DjxKYpujnVC/pnyYCwQH5B8SBIyx3Fahf7TTPTKGqAMm5c1xng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763571044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4YWsA00OYnXs7NfWRm9MI5MarPXHZo1y/DBlY4krI0E=; b=itTISH1kcVD/tk7FKaizUHY/onGlZ9TwVDgQ4QFa5305VeOZsHIecYa8zZbZIBKy6MpH53 obqjuEQ3B+2Ia3zRAQY0vQRTee4FNA/gG8dTWZVva1hJpPluYnboAfTrL73hWnpPSJU08w raxSi3dFItuqkDfYjhDKppC9t8fgOCNPGba7BU2vqvqnffwVjkmn87kgSIs9noNXvi+Sbp 3r9UbLx6fTjTv5yQIZhswRuj6LGi08n1ZHx1n766/jj/SBlRhzLs0htcaVL2efmiIcWMBS CcXnU0f0anmivKt/LRH5iYGwcJVEuyY4iFRlXpz/2c2R6c58vaB26cKSLF9nKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763571044; a=rsa-sha256; cv=none; b=kIocMzB0sGMJ2PYxybO3pxGZQq+XIZKnKsgWbGOeJAJSOKrsWNtxzl/nT2VNY3egoTydVQ khFuXF3ToGEgj2KkcXLPfm+LnzuCdzTEzPwCIzizsu+VmFdVPGcsNzApIMIsCFjB2MKlhg ZjZvou7XQYBplpIi5BO9tb8AUwZLxBbtUvjLtBihQ9N8fjkbjeqOtAcirCP+mr2aI0cYzd iI95su267EbMURVnEchIYuU5SdrPn/khOqlDF46kgzog7DRxP5soQkdHWkN2SowLER+AQv aoiA73qWDAEY2kC9GjmoqYSKHIysNV2z53ovw2zI5jwdd9XQesdqKj2CtQBlHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBSCm4RG2zpnZ for ; Wed, 19 Nov 2025 16:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3daf0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 16:50:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e22cc773f1a9 - main - jail: Make jaildesc_ops const List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e22cc773f1a926fed3558c51bf0dd7890af26a2b Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 16:50:44 +0000 Message-Id: <691df564.3daf0.3544186@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e22cc773f1a926fed3558c51bf0dd7890af26a2b commit e22cc773f1a926fed3558c51bf0dd7890af26a2b Author: Mark Johnston AuthorDate: 2025-11-19 16:02:08 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 16:02:08 +0000 jail: Make jaildesc_ops const No functional change intended. MFC after: 1 week --- sys/kern/kern_jaildesc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_jaildesc.c b/sys/kern/kern_jaildesc.c index a564393d3366..f4e31801201f 100644 --- a/sys/kern/kern_jaildesc.c +++ b/sys/kern/kern_jaildesc.c @@ -54,7 +54,7 @@ static fo_close_t jaildesc_close; static fo_fill_kinfo_t jaildesc_fill_kinfo; static fo_cmp_t jaildesc_cmp; -static struct fileops jaildesc_ops = { +static const struct fileops jaildesc_ops = { .fo_read = invfo_rdwr, .fo_write = invfo_rdwr, .fo_truncate = invfo_truncate, From nobody Wed Nov 19 16:50:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBSCn6ZJfz6HyG6 for ; Wed, 19 Nov 2025 16:50: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBSCn5hLfz3JYM for ; Wed, 19 Nov 2025 16:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763571045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=besUX+87UX0t+KFpmIKujEzLFRAC5AqV59/34rd3iF4=; b=t4gj464s2i6GMgn7KPjWS2Y21sGiJDmxstzT7ohhAifAihtleMM32a+iwje67w7mIk3+SG 95Izl45jjsahowS1x10CFJRoYvTLSQK2lSf98byslGTNcbo+Izfor4lIwosF7NlDJQz9eV dN2P/ERK1U8lo8SeMJ8+r5K96JQvbWEGB4oKyvI+9uHzJSPOeBhfY3w/SUvXpCXgkkOSBi dU5swWr2bvZC1SPktJa03KLvHLhIflDJ++UCa6wfgueZhiEKeyUdNlypJkvY3ZM63zovV6 vQBrQJVxpeXb1eS5FPimRIFRkVC+t5v7oh3em6Z7LU9VJrHFW5Mj4MfEMF0+Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763571045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=besUX+87UX0t+KFpmIKujEzLFRAC5AqV59/34rd3iF4=; b=qefTc34AmZYz222fTqVfT207Gfn4wOXA9QBfuQC6IBLD97kiaqHlSZ6QfNUTqQpp4vZgYR WRMkUrC1YeYnNCR73st2FANS+a+GpNEQ++28RwxUlyw1DN7q2ia43YEsBK9VOcDLTzTaaY s7hwZH2xCMH5dY3SWgG5ktZYD9vGVjYWs5LxJE4kjxLjy+l0/swW+Equh7IWkEFIoNbCHb 7IOy35eYii57sNAKojKVNgbR2bQRGaH1JAilSh+F8Tt5ZhfPufy3N7wOi+p44juonbFeUH 3LEXwR9IbXlj72RK5oOTjIimDBNFQhtZbNGnaF0I/GV+259ZTG/xpNG9Ly0g3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763571045; a=rsa-sha256; cv=none; b=tK6VL4fTkPzRtYd+Ew+QarSruBqmOTiXgjlBFoPJQOSIfVZ0IQACx4vEXfPfVJhCujzkKP DZqnQnHw+ton1ykRoZKUgFmcMmv12MWWveIzvMG0dv9BSzLyhbXIfZ8s+A/saUnOCEpCNN 3Klro/iHMK4MARnEZYa+DlGKxGvvS189s0yeIoMV5I3H2/CytlN4Axmq3b/Bj0r+Tse6Qb J0/I5p/5Xh+cC9bcwLOiqx1i3OJb3EbA+viz5WXHcJ54jD6gz8jpNny+6QegbaXgCu2A95 qfzJljrtCkXIPIKlyNzQUmrY5b64QnVtEaljkCW5wYOQ85uUgDUSYsPAMO0Jdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBSCn5H0GzpGn for ; Wed, 19 Nov 2025 16:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d78e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 16:50:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0e62ebd20172 - main - bhyve: Move the slirp backend out into a separate process List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e62ebd20172f67283bac9526c2aaeaffeb41b45 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 16:50:45 +0000 Message-Id: <691df565.3d78e.1199738c@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0e62ebd20172f67283bac9526c2aaeaffeb41b45 commit 0e62ebd20172f67283bac9526c2aaeaffeb41b45 Author: Mark Johnston AuthorDate: 2025-11-19 16:02:21 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 16:02:21 +0000 bhyve: Move the slirp backend out into a separate process The previous implementation implemented hostfwd rules which would allow the host to connect to the guest via a NATed TCP connection. libslirp also permits NAT in the other direction, but this was prevented by bhyve's capsicum sandbox. To make the slirp backend more useful, split the backend out into a separate process which does not enter capability mode if outbound connections are permitted (enabled by setting the new "open" keyword). The process communicates with the bhyve network frontend (typically a virtio network interface) using a unix SOCK_SEQPACKET socket pair. If the bhyve process exits, the helper will automatically exit. Aside from this restructuring, there is not much actual change. Many slirp parameters are still hard-coded for now, though this may change. The "restricted" feature is toggled by the new "open" keyword; in particular, the backend is restricted by default for compatibility with 15.0 and 14.3. Each packet now has to traverse an extra socket, but this overhead should be acceptable given that the slirp backend cannot be said to provide high-performance networking. With iperf3 I can get 4Gbps from the guest to the host on a Zen 4 system. MFC after: 1 month Sponsored by: CHERI Research Centre (EPSRC grant UKRI3001) Differential Revision: https://reviews.freebsd.org/D53454 --- usr.sbin/bhyve/Makefile | 2 + usr.sbin/bhyve/bhyve.8 | 11 +- usr.sbin/bhyve/net_backend_slirp.c | 622 +++++----------------------------- usr.sbin/bhyve/slirp/Makefile | 11 + usr.sbin/bhyve/{ => slirp}/libslirp.h | 0 usr.sbin/bhyve/slirp/slirp-helper.c | 570 +++++++++++++++++++++++++++++++ 6 files changed, 677 insertions(+), 539 deletions(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index e5e8bf9b5567..c454a280edba 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -77,6 +77,8 @@ SRCS+= snapshot.c .include "${MACHINE_CPUARCH}/Makefile.inc" +SUBDIR+= slirp + .if defined(BHYVE_FDT_SUPPORT) LIBADD+= fdt CFLAGS+= -I${SRCTOP}/sys/contrib/libfdt diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 27e067f50394..45450b5b5db5 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -532,7 +532,9 @@ considered unconnected. .Xc .It .Xo -.Cm slirp,hostfwd= Ar proto : Ar hostaddr : Ar hostport - Ar guestaddr : Ar guestport +.Cm slirp +.Op Cm \&,open +.Op Cm \&,hostfwd= Ar proto : Ar hostaddr : Ar hostport - Ar guestaddr : Ar guestport .Xc .El .Sm on @@ -598,6 +600,12 @@ configuration on the host system. It depends on the .Pa net/libslirp port. +If the +.Cm open +keyword is set, the guest will be able to make outbound network +connections, and +.Nm +will transparently handle the necessary address translation. The .Cm hostfwd option takes a 5-tuple describing how connections from the host are to be @@ -605,6 +613,7 @@ forwarded to the guest. Multiple rules can be specified, separated by semicolons. Note that semicolons must be escaped or quoted to prevent the shell from interpreting them. +The backend will provide DHCP and DNS service to the guest. .Ss Block storage device backends: .Bl -bullet .Sm off diff --git a/usr.sbin/bhyve/net_backend_slirp.c b/usr.sbin/bhyve/net_backend_slirp.c index 171c5b5bdbbd..c98e54b2ee88 100644 --- a/usr.sbin/bhyve/net_backend_slirp.c +++ b/usr.sbin/bhyve/net_backend_slirp.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2023 Mark Johnston + * Copyright (c) 2023, 2025 Mark Johnston * * This software was developed by the University of Cambridge Computer * Laboratory (Department of Computer Science and Technology) under Innovate @@ -31,13 +31,15 @@ */ /* - * The slirp backend enables unprivileged networking via libslirp, which must be - * installed on the host system via pkg or the ports tree. bhyve dlopen()s - * libslirp.so upon instantiating the slirp backend. Various network parameters - * are hard-coded in _slirp_init(). + * The slirp backend enables unprivileged userspace networking via libslirp, + * which must be installed on the host system via pkg or the ports tree. + * libslirp.so is dlopen()ed into a helper process with which this backend + * communicates. * * Packets received from the guest (i.e., transmitted by the frontend, such as a - * virtio NIC device model) are injected into the slirp backend via slirp_send(). + * virtio NIC device model) are injected into the slirp backend via slirp_send(), + * which sends the packet to the helper process. + * * Packets to be transmitted to the guest (i.e., inserted into the frontend's * receive buffers) are buffered in a per-interface socket pair and read by the * mevent loop. Sockets instantiated by libslirp are monitored by a thread @@ -46,14 +48,12 @@ */ #include +#include #include -#include -#include #include -#include -#include -#include +#include +#include #include #include #include @@ -61,537 +61,92 @@ #include "config.h" #include "debug.h" -#include "libslirp.h" #include "mevent.h" #include "net_backends.h" #include "net_backends_priv.h" -typedef int (*slirp_add_hostxfwd_p_t)(Slirp *, - const struct sockaddr *, socklen_t, const struct sockaddr *, socklen_t, - int); -typedef void (*slirp_cleanup_p_t)(Slirp *); -typedef void (*slirp_input_p_t)(Slirp *, const uint8_t *, int); -typedef Slirp *(*slirp_new_p_t)(const SlirpConfig *, const SlirpCb *, void *); -typedef void (*slirp_pollfds_fill_p_t)(Slirp *, uint32_t *timeout, - SlirpAddPollCb, void *); -typedef void (*slirp_pollfds_poll_p_t)(Slirp *, int, SlirpGetREventsCb, void *); - -/* Function pointer table, initialized by slirp_init_once(). */ -static slirp_add_hostxfwd_p_t slirp_add_hostxfwd_p; -static slirp_cleanup_p_t slirp_cleanup_p; -static slirp_input_p_t slirp_input_p; -static slirp_new_p_t slirp_new_p; -static slirp_pollfds_fill_p_t slirp_pollfds_fill_p; -static slirp_pollfds_poll_p_t slirp_pollfds_poll_p; - -static void -checked_close(int *fdp) -{ - int error; - - if (*fdp != -1) { - error = close(*fdp); - assert(error == 0); - *fdp = -1; - } -} - -static int -slirp_init_once(void) -{ - static void *handle = NULL; - - if (handle != NULL) - return (0); - handle = dlopen("libslirp.so.0", RTLD_LAZY); - if (handle == NULL) { - EPRINTLN("Unable to open libslirp.so.0: %s", dlerror()); - return (-1); - } - -#define IMPORT_SYM(sym) do { \ - sym##_p = (sym##_p_t)dlsym(handle, #sym); \ - if (sym##_p == NULL) { \ - EPRINTLN("failed to resolve %s", #sym); \ - goto err; \ - } \ -} while (0) - IMPORT_SYM(slirp_add_hostxfwd); - IMPORT_SYM(slirp_cleanup); - IMPORT_SYM(slirp_input); - IMPORT_SYM(slirp_new); - IMPORT_SYM(slirp_pollfds_fill); - IMPORT_SYM(slirp_pollfds_poll); -#undef IMPORT_SYM - - /* - * libslirp uses glib, which uses tzdata to format log messages. Help - * it out. - * - * XXX-MJ glib will also look for charset files, not sure what we can do - * about that... - */ - caph_cache_tzdata(); - - return (0); - -err: - dlclose(handle); - handle = NULL; - return (-1); -} +#define SLIRP_MTU 2048 struct slirp_priv { - Slirp *slirp; - -#define SLIRP_MTU 2048 + int s; + pid_t helper; struct mevent *mevp; - int pipe[2]; /* used to buffer data sent to the guest */ - int wakeup[2]; /* used to wake up the pollfd thread */ - - pthread_t pollfd_td; - struct pollfd *pollfds; - size_t npollfds; - - /* Serializes libslirp calls. */ - pthread_mutex_t mtx; -}; - -static void -slirp_priv_init(struct slirp_priv *priv) -{ - int error; - - memset(priv, 0, sizeof(*priv)); - priv->pipe[0] = priv->pipe[1] = -1; - priv->wakeup[0] = priv->wakeup[1] = -1; - error = pthread_mutex_init(&priv->mtx, NULL); - assert(error == 0); -} - -static void -slirp_priv_cleanup(struct slirp_priv *priv) -{ - int error; - - checked_close(&priv->pipe[0]); - checked_close(&priv->pipe[1]); - checked_close(&priv->wakeup[0]); - checked_close(&priv->wakeup[1]); - if (priv->mevp) - mevent_delete(priv->mevp); - if (priv->slirp != NULL) - slirp_cleanup_p(priv->slirp); - error = pthread_mutex_destroy(&priv->mtx); - assert(error == 0); -} - -static int64_t -slirp_cb_clock_get_ns(void *param __unused) -{ - struct timespec ts; - int error; - - error = clock_gettime(CLOCK_MONOTONIC, &ts); - assert(error == 0); - return ((int64_t)(ts.tv_sec * 1000000000L + ts.tv_nsec)); -} - -static void -slirp_cb_notify(void *param) -{ - struct slirp_priv *priv; - - /* Wake up the poll thread. We assume that priv->mtx is held here. */ - priv = param; - (void)write(priv->wakeup[1], "M", 1); -} - -static void -slirp_cb_register_poll_fd(int fd, void *param __unused) -{ - const int one = 1; - - (void)setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &one, sizeof(int)); -} - -static ssize_t -slirp_cb_send_packet(const void *buf, size_t len, void *param) -{ - struct slirp_priv *priv; - ssize_t n; - - priv = param; - - assert(len <= SLIRP_MTU); - n = send(priv->pipe[1], buf, len, 0); - if (n < 0) { - EPRINTLN("slirp_cb_send_packet: send: %s", strerror(errno)); - return (n); - } - assert((size_t)n == len); - - return (n); -} - -static void -slirp_cb_unregister_poll_fd(int fd __unused, void *opaque __unused) -{ -} - -/* Callbacks invoked from within libslirp. */ -static const struct SlirpCb slirp_cbs = { - .clock_get_ns = slirp_cb_clock_get_ns, - .notify = slirp_cb_notify, - .register_poll_fd = slirp_cb_register_poll_fd, - .send_packet = slirp_cb_send_packet, - .unregister_poll_fd = slirp_cb_unregister_poll_fd, }; static int -slirpev2pollev(int events) -{ - int ret; - - ret = 0; - if (events & SLIRP_POLL_IN) - ret |= POLLIN; - if (events & SLIRP_POLL_OUT) - ret |= POLLOUT; - if (events & SLIRP_POLL_PRI) - ret |= POLLPRI; - if (events & SLIRP_POLL_ERR) - ret |= POLLERR; - if (events & SLIRP_POLL_HUP) - ret |= POLLHUP; - return (ret); -} - -static int -pollev2slirpev(int events) -{ - int ret; - - ret = 0; - if (events & POLLIN) - ret |= SLIRP_POLL_IN; - if (events & POLLOUT) - ret |= SLIRP_POLL_OUT; - if (events & POLLPRI) - ret |= SLIRP_POLL_PRI; - if (events & POLLERR) - ret |= SLIRP_POLL_ERR; - if (events & POLLHUP) - ret |= SLIRP_POLL_HUP; - return (ret); -} - -static int -slirp_addpoll_cb(int fd, int events, void *param) -{ - struct slirp_priv *priv; - struct pollfd *pollfd, *pollfds; - size_t i; - - priv = param; - - for (i = 0; i < priv->npollfds; i++) - if (priv->pollfds[i].fd == -1) - break; - if (i == priv->npollfds) { - const size_t POLLFD_GROW = 4; - - priv->npollfds += POLLFD_GROW; - pollfds = realloc(priv->pollfds, - sizeof(*pollfds) * priv->npollfds); - if (pollfds == NULL) - return (-1); - for (i = priv->npollfds - POLLFD_GROW; i < priv->npollfds; i++) - pollfds[i].fd = -1; - priv->pollfds = pollfds; - - i = priv->npollfds - POLLFD_GROW; - } - pollfd = &priv->pollfds[i]; - pollfd->fd = fd; - pollfd->events = slirpev2pollev(events); - pollfd->revents = 0; - - return ((int)i); -} - -static int -slirp_poll_revents(int idx, void *param) -{ - struct slirp_priv *priv; - struct pollfd *pollfd; - short revents; - - priv = param; - assert(idx >= 0); - assert((unsigned int)idx < priv->npollfds); - pollfd = &priv->pollfds[idx]; - assert(pollfd->fd != -1); - - /* The kernel may report POLLHUP even if we didn't ask for it. */ - revents = pollfd->revents; - if ((pollfd->events & POLLHUP) == 0) - revents &= ~POLLHUP; - return (pollev2slirpev(revents)); -} - -static void * -slirp_pollfd_td_loop(void *param) -{ - struct slirp_priv *priv; - struct pollfd *pollfds; - size_t npollfds; - uint32_t timeout; - int error; - - pthread_set_name_np(pthread_self(), "slirp pollfd"); - priv = param; - - pthread_mutex_lock(&priv->mtx); - for (;;) { - int wakeup; - - for (size_t i = 0; i < priv->npollfds; i++) - priv->pollfds[i].fd = -1; - - /* Register for notifications from slirp_cb_notify(). */ - wakeup = slirp_addpoll_cb(priv->wakeup[0], POLLIN, priv); - - timeout = UINT32_MAX; - slirp_pollfds_fill_p(priv->slirp, &timeout, slirp_addpoll_cb, - priv); - - pollfds = priv->pollfds; - npollfds = priv->npollfds; - pthread_mutex_unlock(&priv->mtx); - error = poll(pollfds, npollfds, timeout); - if (error == -1 && errno != EINTR) { - EPRINTLN("poll: %s", strerror(errno)); - exit(1); - } - pthread_mutex_lock(&priv->mtx); - slirp_pollfds_poll_p(priv->slirp, error == -1, - slirp_poll_revents, priv); - - /* - * If we were woken up by the notify callback, mask the - * interrupt. - */ - if ((pollfds[wakeup].revents & POLLIN) != 0) { - ssize_t n; - - do { - uint8_t b; - - n = read(priv->wakeup[0], &b, 1); - } while (n == 1); - if (n != -1 || errno != EAGAIN) { - EPRINTLN("read(wakeup): %s", strerror(errno)); - exit(1); - } - } - } -} - -static int -parse_addr(char *addr, struct sockaddr_in *sinp) -{ - char *port; - int error, porti; - - memset(sinp, 0, sizeof(*sinp)); - sinp->sin_family = AF_INET; - sinp->sin_len = sizeof(struct sockaddr_in); - - port = strchr(addr, ':'); - if (port == NULL) - return (EINVAL); - *port++ = '\0'; - - if (strlen(addr) > 0) { - error = inet_pton(AF_INET, addr, &sinp->sin_addr); - if (error != 1) - return (error == 0 ? EPFNOSUPPORT : errno); - } else { - sinp->sin_addr.s_addr = htonl(INADDR_ANY); - } - - porti = strlen(port) > 0 ? atoi(port) : 0; - if (porti < 0 || porti > UINT16_MAX) - return (EINVAL); - sinp->sin_port = htons(porti); - - return (0); -} - -static int -parse_hostfwd_rule(const char *descr, int *is_udp, struct sockaddr *hostaddr, - struct sockaddr *guestaddr) -{ - struct sockaddr_in *hostaddrp, *guestaddrp; - const char *proto; - char *p, *host, *guest; - int error; - - error = 0; - *is_udp = 0; - - p = strdup(descr); - if (p == NULL) - return (ENOMEM); - - host = strchr(p, ':'); - if (host == NULL) { - error = EINVAL; - goto out; - } - *host++ = '\0'; - - proto = p; - *is_udp = strcmp(proto, "udp") == 0; - - guest = strchr(host, '-'); - if (guest == NULL) { - error = EINVAL; - goto out; - } - *guest++ = '\0'; - - hostaddrp = (struct sockaddr_in *)hostaddr; - error = parse_addr(host, hostaddrp); - if (error != 0) - goto out; - - guestaddrp = (struct sockaddr_in *)guestaddr; - error = parse_addr(guest, guestaddrp); - if (error != 0) - goto out; - -out: - free(p); - return (error); -} - -static int -config_one_hostfwd(struct slirp_priv *priv, const char *rule) -{ - struct sockaddr hostaddr, guestaddr; - int error, is_udp; - - error = parse_hostfwd_rule(rule, &is_udp, &hostaddr, &guestaddr); - if (error != 0) { - EPRINTLN("Unable to parse hostfwd rule '%s': %s", - rule, strerror(error)); - return (error); - } - - error = slirp_add_hostxfwd_p(priv->slirp, &hostaddr, hostaddr.sa_len, - &guestaddr, guestaddr.sa_len, is_udp ? SLIRP_HOSTFWD_UDP : 0); - if (error != 0) { - EPRINTLN("Unable to add hostfwd rule '%s': %s", - rule, strerror(errno)); - return (error); - } - - return (0); -} - -static int -_slirp_init(struct net_backend *be, const char *devname __unused, +slirp_init(struct net_backend *be, const char *devname __unused, nvlist_t *nvl, net_be_rxeof_t cb, void *param) { + extern char **environ; struct slirp_priv *priv = NET_BE_PRIV(be); - SlirpConfig config = { - .version = 4, - .if_mtu = SLIRP_MTU, - .restricted = true, - .in_enabled = true, - .vnetwork.s_addr = htonl(0x0a000200), /* 10.0.2.0/24 */ - .vnetmask.s_addr = htonl(0xffffff00), - .vdhcp_start.s_addr = htonl(0x0a00020f),/* 10.0.2.15 */ - .vhost.s_addr = htonl(0x0a000202), /* 10.0.2.2 */ - .enable_emu = false, - }; - const char *hostfwd; - int error, sndbuf; - - error = slirp_init_once(); - if (error != 0) - return (error); - - slirp_priv_init(priv); + nvlist_t *config; + posix_spawn_file_actions_t fa; + pid_t child; + const char **argv; + char sockname[32]; + int error, s[2]; + + if (socketpair(PF_LOCAL, SOCK_SEQPACKET | SOCK_NONBLOCK, 0, s) != 0) { + EPRINTLN("socketpair"); + return (-1); + } - priv->slirp = slirp_new_p(&config, &slirp_cbs, priv); - if (priv->slirp == NULL) { - EPRINTLN("Unable to create slirp instance"); + /* + * The child will exit once its connection goes away, so make sure only + * one end is inherited by the child. + */ + if (posix_spawn_file_actions_init(&fa) != 0) { + EPRINTLN("posix_spawn_file_actions_init"); goto err; } - - hostfwd = get_config_value_node(nvl, "hostfwd"); - if (hostfwd != NULL) { - char *rules, *tofree; - const char *rule; - - tofree = rules = strdup(hostfwd); - if (rules == NULL) - goto err; - while ((rule = strsep(&rules, ";")) != NULL) { - error = config_one_hostfwd(priv, rule); - if (error != 0) { - free(tofree); - goto err; - } - } - free(tofree); + if (posix_spawn_file_actions_addclose(&fa, s[0]) != 0) { + EPRINTLN("posix_spawn_file_actions_addclose"); + posix_spawn_file_actions_destroy(&fa); + goto err; } - error = socketpair(PF_LOCAL, SOCK_DGRAM | SOCK_CLOEXEC, 0, priv->pipe); + (void)snprintf(sockname, sizeof(sockname), "%d", s[1]); + argv = (const char *[]){ + "/usr/libexec/bhyve-slirp-helper", "-S", sockname, NULL + }; + error = posix_spawn(&child, "/usr/libexec/bhyve-slirp-helper", + &fa, NULL, __DECONST(char **, argv), environ); + posix_spawn_file_actions_destroy(&fa); if (error != 0) { - EPRINTLN("Unable to create pipe: %s", strerror(errno)); + EPRINTLN("posix_spawn(bhyve-slirp-helper): %s", + strerror(error)); goto err; } - error = pipe2(priv->wakeup, O_CLOEXEC | O_NONBLOCK); - if (error != 0) { - EPRINTLN("Unable to create wakeup pipe: %s", strerror(errno)); + config = nvlist_clone(nvl); + if (config == NULL) { + EPRINTLN("nvlist_clone"); goto err; } - - /* - * Try to avoid dropping buffered packets in slirp_cb_send_packet(). - */ - sndbuf = 1024 * 1024; - error = setsockopt(priv->pipe[1], SOL_SOCKET, SO_SNDBUF, &sndbuf, - sizeof(sndbuf)); + nvlist_add_string(config, "vmname", get_config_value("name")); + error = nvlist_send(s[0], config); + nvlist_destroy(config); if (error != 0) { - EPRINTLN("Could not set socket buffer size: %s", - strerror(errno)); + EPRINTLN("nvlist_send"); goto err; } - be->fd = priv->pipe[0]; + be->fd = s[0]; priv->mevp = mevent_add_disabled(be->fd, EVF_READ, cb, param); if (priv->mevp == NULL) { EPRINTLN("Could not register event"); goto err; } - error = pthread_create(&priv->pollfd_td, NULL, slirp_pollfd_td_loop, - priv); - if (error != 0) { - EPRINTLN("Unable to create pollfd thread: %s", strerror(error)); - goto err; - } + priv->helper = child; + priv->s = s[0]; + (void)close(s[1]); return (0); err: - slirp_priv_cleanup(priv); + (void)close(s[0]); + (void)close(s[1]); return (-1); } @@ -599,52 +154,43 @@ static ssize_t slirp_send(struct net_backend *be, const struct iovec *iov, int iovcnt) { struct slirp_priv *priv = NET_BE_PRIV(be); + struct msghdr hdr; - if (iovcnt == 1) { - /* We can avoid copying if there's a single segment. */ - pthread_mutex_lock(&priv->mtx); - slirp_input_p(priv->slirp, iov->iov_base, - (int)iov->iov_len); - pthread_mutex_unlock(&priv->mtx); - return (iov[0].iov_len); - } else { - uint8_t *pkt; - size_t pktlen; - - pktlen = 0; - for (int i = 0; i < iovcnt; i++) - pktlen += iov[i].iov_len; - pkt = malloc(pktlen); - if (pkt == NULL) - return (-1); - pktlen = 0; - for (int i = 0; i < iovcnt; i++) { - memcpy(pkt + pktlen, iov[i].iov_base, iov[i].iov_len); - pktlen += iov[i].iov_len; - } - pthread_mutex_lock(&priv->mtx); - slirp_input_p(priv->slirp, pkt, (int)pktlen); - pthread_mutex_unlock(&priv->mtx); - free(pkt); - return (pktlen); - } + memset(&hdr, 0, sizeof(hdr)); + hdr.msg_iov = __DECONST(struct iovec *, iov); + hdr.msg_iovlen = iovcnt; + return (sendmsg(priv->s, &hdr, MSG_EOR)); } static void -_slirp_cleanup(struct net_backend *be) +slirp_cleanup(struct net_backend *be) { struct slirp_priv *priv = NET_BE_PRIV(be); - slirp_priv_cleanup(priv); + if (priv->helper > 0) { + int status; + + if (kill(priv->helper, SIGKILL) != 0) { + EPRINTLN("kill(bhyve-slirp-helper): %s", + strerror(errno)); + return; + } + (void)waitpid(priv->helper, &status, 0); + } } static ssize_t slirp_peek_recvlen(struct net_backend *be) { struct slirp_priv *priv = NET_BE_PRIV(be); + uint8_t buf[SLIRP_MTU]; ssize_t n; - n = recv(priv->pipe[0], NULL, 0, MSG_PEEK | MSG_DONTWAIT | MSG_TRUNC); + /* + * Copying into the buffer is totally unnecessary, but we don't + * implement MSG_TRUNC for SEQPACKET sockets. + */ + n = recv(priv->s, buf, sizeof(buf), MSG_PEEK | MSG_DONTWAIT); if (n < 0) return (errno == EWOULDBLOCK ? 0 : -1); assert((size_t)n <= SLIRP_MTU); @@ -665,7 +211,7 @@ slirp_recv(struct net_backend *be, const struct iovec *iov, int iovcnt) hdr.msg_control = NULL; hdr.msg_controllen = 0; hdr.msg_flags = 0; - n = recvmsg(priv->pipe[0], &hdr, MSG_DONTWAIT); + n = recvmsg(priv->s, &hdr, MSG_DONTWAIT); if (n < 0) { if (errno == EWOULDBLOCK) return (0); @@ -707,8 +253,8 @@ slirp_set_cap(struct net_backend *be __unused, uint64_t features __unused, static struct net_backend slirp_backend = { .prefix = "slirp", .priv_size = sizeof(struct slirp_priv), - .init = _slirp_init, - .cleanup = _slirp_cleanup, + .init = slirp_init, + .cleanup = slirp_cleanup, .send = slirp_send, .peek_recvlen = slirp_peek_recvlen, .recv = slirp_recv, diff --git a/usr.sbin/bhyve/slirp/Makefile b/usr.sbin/bhyve/slirp/Makefile new file mode 100644 index 000000000000..da76fda45e86 --- /dev/null +++ b/usr.sbin/bhyve/slirp/Makefile @@ -0,0 +1,11 @@ +.PATH: ${.CURDIR}/../ + +PROG= bhyve-slirp-helper +SRCS= slirp-helper.c config.c +CFLAGS+= -I${.CURDIR}/../ +LIBADD= nv +MAN= + +BINDIR?= /usr/libexec + +.include diff --git a/usr.sbin/bhyve/libslirp.h b/usr.sbin/bhyve/slirp/libslirp.h similarity index 100% rename from usr.sbin/bhyve/libslirp.h rename to usr.sbin/bhyve/slirp/libslirp.h diff --git a/usr.sbin/bhyve/slirp/slirp-helper.c b/usr.sbin/bhyve/slirp/slirp-helper.c new file mode 100644 index 000000000000..ee62dd212369 --- /dev/null +++ b/usr.sbin/bhyve/slirp/slirp-helper.c @@ -0,0 +1,570 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023, 2025 Mark Johnston + * + * This software was developed by the University of Cambridge Computer + * Laboratory (Department of Computer Science and Technology) under Innovate + * UK project 105694, "Digital Security by Design (DSbD) Technology Platform + * Prototype". + */ + +/* + * A helper process which lets bhyve's libslirp-based network backend work + * outside bhyve's Capsicum sandbox. We are started with a SOCK_SEQPACKET + * socket through which we pass and receive packets from the guest's frontend. + * + * At initialization time, we receive an nvlist over the socket which describes + * the desired slirp configuration. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "config.h" +#include "libslirp.h" + +#define SLIRP_MTU 2048 + +struct slirp_priv { + Slirp *slirp; /* libslirp handle */ + int sock; /* data and control socket */ + int wakeup[2]; /* used to wake up the pollfd thread */ + struct pollfd *pollfds; + size_t npollfds; + size_t lastpollfd; +}; + +typedef int (*slirp_add_hostxfwd_p_t)(Slirp *, + const struct sockaddr *, socklen_t, const struct sockaddr *, socklen_t, + int); +typedef void (*slirp_cleanup_p_t)(Slirp *); +typedef void (*slirp_input_p_t)(Slirp *, const uint8_t *, int); +typedef Slirp *(*slirp_new_p_t)(const SlirpConfig *, const SlirpCb *, void *); +typedef void (*slirp_pollfds_fill_p_t)(Slirp *, uint32_t *timeout, + SlirpAddPollCb, void *); +typedef void (*slirp_pollfds_poll_p_t)(Slirp *, int, SlirpGetREventsCb, void *); + +/* Function pointer table, initialized by libslirp_init(). */ +static slirp_add_hostxfwd_p_t slirp_add_hostxfwd_p; +static slirp_cleanup_p_t slirp_cleanup_p; +static slirp_input_p_t slirp_input_p; +static slirp_new_p_t slirp_new_p; +static slirp_pollfds_fill_p_t slirp_pollfds_fill_p; +static slirp_pollfds_poll_p_t slirp_pollfds_poll_p; + +static int64_t +slirp_cb_clock_get_ns(void *param __unused) +{ + struct timespec ts; + int error; + + error = clock_gettime(CLOCK_MONOTONIC, &ts); + assert(error == 0); + return ((int64_t)(ts.tv_sec * 1000000000L + ts.tv_nsec)); +} + +static void +slirp_cb_notify(void *param) +{ + struct slirp_priv *priv; + + /* Wake up the poll thread. We assume that priv->mtx is held here. */ + priv = param; + (void)write(priv->wakeup[1], "M", 1); +} + +static void +slirp_cb_register_poll_fd(int fd, void *param __unused) +{ + const int one = 1; + + (void)setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &one, sizeof(int)); +} + +static ssize_t +slirp_cb_send_packet(const void *buf, size_t len, void *param) +{ + struct slirp_priv *priv; + ssize_t n; + + priv = param; + + assert(len <= SLIRP_MTU); + n = send(priv->sock, buf, len, MSG_EOR); + if (n < 0) { + warn("slirp_cb_send_packet: send"); + return (n); + } + assert((size_t)n == len); + + return (n); +} + +static void +slirp_cb_unregister_poll_fd(int fd __unused, void *opaque __unused) +{ +} + +/* Callbacks invoked from within libslirp. */ +static const struct SlirpCb slirp_cbs = { + .clock_get_ns = slirp_cb_clock_get_ns, + .notify = slirp_cb_notify, + .register_poll_fd = slirp_cb_register_poll_fd, + .send_packet = slirp_cb_send_packet, + .unregister_poll_fd = slirp_cb_unregister_poll_fd, +}; + *** 439 LINES SKIPPED *** From nobody Wed Nov 19 18:01:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBTnl6vj5z6J3tc; Wed, 19 Nov 2025 18:01:47 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E8" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBTnl4NGdz3VXS; Wed, 19 Nov 2025 18:01:47 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Authentication-Results: mx1.freebsd.org; none Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id D939EA64808; Wed, 19 Nov 2025 18:01:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zabbadoz.net; s=20240622; t=1763575285; bh=ZvfEbLhGifJ4fX/JEJfTVqNTjNHgi447mRaFBG0jA4o=; h=Date:From:To:cc:Subject:In-Reply-To:References; b=Trp22mvhcrfXxF4fw5GW0aMt31TaW/aNirzv6uDFcrCHSGsKJH/soGt6Ycwhkd4sg 5tQXdcYYrXi9vb203nGW6nb3o3z9VMWGKki28S1BDn8McxoAT51pDi7jGGI63OQ6hr uKwd1yBs7SpBAxSJW1Xj5QMg/d/gkoHRIabvzH9vgYb4BXemJ8/Dey0yUVGQnKkeAM /lYSP8km9AxAVs/2Lw3aTG6jTs+OFyFMsnRezXBgO1IfUF35U+sK/5JbgQBrxGp6kl YhcJX7Zjp+gCQDMISagpdFhVzgKOHar9cQUA3wV+RvdAfXgW7+a5ngJFhJqM53F0YU GtTuavzW+YxfiLCz2uU2eGQSgpzeoKYIl5I7fHMcTkva9rGpMU98SWTnwiJHCswk7Q UouU5JLtbDf8bDvWZdj7lb1vYSfv/FDacKbkCfuOy+JB/P/sPMhBFZwcG9JAZSiQiK dp8VYeQXEz33AAwkRdbk/c6pxmzkp+HC37D41fE6XlXM6e9NMnvokF0vIt/obJyAQN +fhm9VmgwMBVo+RfFgLeSzbPsxQISQpPQqmYskzkmI3pStsOUjF01ocWGZ6yopM2YZ zNdIjMBkKiM924QbcJty0zUH/m+wMM0ec1J3NaD4+qYbeZdA7wVjTCunzWDrUzSPrG dwkjvnFlAqI4ZmA4kkKu2K6E= Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 69FDA2D029E7; Wed, 19 Nov 2025 18:01:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id eJ5756f3IM3W; Wed, 19 Nov 2025 18:01:37 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 4DA8F2D029E6; Wed, 19 Nov 2025 18:01:37 +0000 (UTC) Date: Wed, 19 Nov 2025 18:01:37 +0000 (UTC) From: "Bjoern A. Zeeb" To: Warner Losh cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org, Wanpeng Qian Subject: Re: git: 20e94950c54e - main - nvme: Notify namespace changes better In-Reply-To: <691cdf72.35308.1c1c6fc1@gitrepo.freebsd.org> Message-ID: <1osso5q5-74o7-pr61-q328-n6451nor36q4@mnoonqbm.arg> References: <691cdf72.35308.1c1c6fc1@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:3320, ipnet:2003::/19, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dBTnl4NGdz3VXS On Tue, 18 Nov 2025, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=20e94950c54e398049396647da36b9e2c3b639c1 > > commit 20e94950c54e398049396647da36b9e2c3b639c1 > Author: Wanpeng Qian > AuthorDate: 2025-11-18 15:24:23 +0000 > Commit: Warner Losh > CommitDate: 2025-11-18 20:32:22 +0000 > > nvme: Notify namespace changes better > > When we get a namespace notification, we have to reconstrut the > namespace to get the new identification data from the namespace. For > each namespace in the AEN, we will reconstrict it before we call the > notification. We also flag it as changed for the duration of the change > callback (prior versions of the patch needed to keep track, but we no > longer do, so this bit may be removed). Note when we've seen the > namespace so we can notify when it goes away. > > Co-authored-by: imp > Differential Revision: https://reviews.freebsd.org/D33032 > --- > sys/dev/nvme/nvme.h | 7 +++++-- > sys/dev/nvme/nvme_ctrlr.c | 12 +++++++++++- > sys/dev/nvme/nvme_ns.c | 9 ++++++--- > 3 files changed, 22 insertions(+), 6 deletions(-) Just replying to one of the multiple commits: It seems from somewhere a VIMAGE enabled kernel is pulling in systm.h for memmove; LINT-NOVIMAGE fails without the below: % git diff diff --git sys/dev/nvme/nvme.h sys/dev/nvme/nvme.h index 8f7a7fbda14c..e17c2bf41a5a 100644 --- sys/dev/nvme/nvme.h +++ sys/dev/nvme/nvme.h @@ -31,6 +31,7 @@ #ifdef _KERNEL #include +#include #endif #include -- Bjoern A. Zeeb r15:7 From nobody Wed Nov 19 18:20:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBVCG2RqGz6J4gQ for ; Wed, 19 Nov 2025 18:20: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBVCF6jp9z3Y5S for ; Wed, 19 Nov 2025 18:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763576426; 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=fTlR/Zu9cGarsHf20PPZYshutdStx1gjJ5Ik0CsVrDg=; b=L2wnZLwFwABMVfHwHNZg7Qw1D0aWr7f47L3CBWHXQRPVCOqsdJM+8+Oo0uBlEnp1ghDsEa bglwTMSCQYxup7TNCoGIYenqzQGdfl8sKxP5bLmFvOM6YK3o+jLzNatQAlwEaGq3VigR0N xcoyE/iR5TFOGJPyNTtIrZJNvSKbcnaVwO7kJ3FNgbFnVDewybR0Xp4L01ptwrr7GOS4OS grtm5CoxdbBTJ06wJN8UGMbNlFHneVlF0lpvkBxM35qQ/wGpiSrHLx3pAVAQNpGSKEUqz3 rzP4NN2ZucmjhwiVZHVgWe0DwbX+v/NB2O9G0EZcHqas6O+DLUVkodLLF/v2wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763576426; 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=fTlR/Zu9cGarsHf20PPZYshutdStx1gjJ5Ik0CsVrDg=; b=nakXHxBbhhlOSNnt9LblH3Be5pUA7x1Rpqg0DkVhy08uzFbwomBqu9TQpdFdm3wdHvh4tI DoiullKPvGLnOn5hvkKXHQGHfhdea3I+b388E0d3xMMKguGFfOxBBrY2B2nypr/0x8+gPM IGSMNUxb6O49nJOHAUad0EOwjIOeZMIg24gVOr9KWbyk8TRqZ1fmml56GzxX3BqeAtiJEO lezKor9bgNr83Pze/D6x5zwUijLndt61rqwXcBuDoLqfWPLIzO2IYdjcmJSulei/gFoN3K XXQz73bMWDC7N3iY4YIA/nMMWMKS9roYteI6sm9cdp+kmsoCTBfJKxm4A+wtTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763576426; a=rsa-sha256; cv=none; b=ew5E2S++4TzWDG8Zb6A4jD31bygBXq4/NzWveAukJgN1W4hZOlJhf1+TVCe9vmVRznZh/5 VOQhHDWWUuSJeB2TRYzkwtzynX6ti10QOmGkoDVLzphYGHbfX1w3LJwIsX7xdSOjyXgKLD bRuwPOTClwWY8pqGZepLolFfn4ucRmXHx9pG2mnFCi7NLHnSjGtYxdIjnIbilc5/0GWKgr nYWknqZFMxjtMkl32OtEE2cr/5pi9ZjJ5eaANFZyyRLeo/jZl9vfJ1jTLWM64cy8GKa3Wy +moSFekqo8ix9lU1ozBrje9emzNGeRcF+hzP66WUpHIRj04PM0VDJAtCKgQ+0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBVCF5h28zrkX for ; Wed, 19 Nov 2025 18:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d3cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 18:20:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Poul-Henning Kamp From: Ed Maste Subject: git: d61be9d99470 - stable/15 - iichid: The IICHID spec defines the response to the RESET command as two bytes of zeros. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d61be9d994702ffb8443c686f3ae2a5c702df3c7 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 18:20:25 +0000 Message-Id: <691e0a69.d3cc.7d8aab3c@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d61be9d994702ffb8443c686f3ae2a5c702df3c7 commit d61be9d994702ffb8443c686f3ae2a5c702df3c7 Author: Poul-Henning Kamp AuthorDate: 2025-11-18 19:22:01 +0000 Commit: Ed Maste CommitDate: 2025-11-19 18:20:09 +0000 iichid: The IICHID spec defines the response to the RESET command as two bytes of zeros. Our recent changes to iichid.c has caused us to attempt to read a full REPORT instead, and at least one keyboard hangs solid when we do that. This patch changes us to be spec-compliant. Differential Revision: https://reviews.freebsd.org/D53803 MFC after: 1 day Approved by: re(ccperciva) (cherry picked from commit 5d53462af1d0e892da77b52b701b337119b2f5d7) --- sys/dev/iicbus/iichid.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index 5ca3f1b84e48..430066bd8f52 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -271,6 +271,8 @@ static int iichid_cmd_read(struct iichid_softc* sc, void *buf, iichid_size_t maxlen, iichid_size_t *actual_len) { + int error; + /* * 6.1.3 - Retrieval of Input Reports * DEVICE returns the length (2 Bytes) and the entire Input Report. @@ -280,7 +282,10 @@ iichid_cmd_read(struct iichid_softc* sc, void *buf, iichid_size_t maxlen, struct iic_msg msgs[] = { { sc->addr, IIC_M_RD, maxlen, buf }, }; - int error; + + if (!sc->reset_acked) { + msgs[0].len = 2; + } error = iicbus_transfer(sc->dev, msgs, nitems(msgs)); if (error != 0) From nobody Wed Nov 19 18:39:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBVdT73bGz6J5jk for ; Wed, 19 Nov 2025 18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBVdN54RKz3bTh for ; Wed, 19 Nov 2025 18:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763577576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=91koYLz2QitvhQQrW9YVIYvFCbP6Nfl3y5SoLsYVQFc=; b=OmSURetIUAb8bMQ9LEwNDykYebAILwm4rnMWPLz5nTPzr62Hd8wO1zLCHyHmgm4mTCoDZ6 TZpPouiiSKp+sxzUllMBUbuOC39CeqwhguunVkC3if2Yuh6RoF+VAJg5mMYDxRwWBQ08jr /FTWTGk8GLognnAwxx3gWgRQfydBUu0XChWINBYynOE5MEkcPMw3/nyu1nz9r5U/+7cSfZ cCw9gNWZbdukaXqg8tn8zHk0M4XSZS768SerIsFRaGvRuNooJ1QFVZD6UveLxUw+B9u0bc +LxcIzMzxtoyd6zEtWSPSX5aLHs8VASeKG+5v+LGs7DMrtkOng4XXq2+cz+5bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763577576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=91koYLz2QitvhQQrW9YVIYvFCbP6Nfl3y5SoLsYVQFc=; b=IdW0pRKcyvmj1AO84K1FYfFsSy27S4Vi2Mjal09C3GeLmSKTXTS+LSK76PZKZM7B5vT36M vBFiU0qvtD3IyZP9N3QFUAGa6NqtC2an3lx29RPYfgNfk6yp4rO81NKEJy1pTniZ+7GS4+ N0VThtk5oNDFiPPXDNr1tvX9XBUMvBFaiHKDb5zLSitRNLCfmavdENGgUMMA/QdlM/BUCg EHONBhgdD+MXx/W2a0ylNdRE3fRltEMQTJQ9SR0/0QIdGWwitd/+khMLktCMfGaNuaIzGn kuqRQgXIM+B8i5MKySFgAA6ELoD+K8bdwmS8m7i6aDePlvk1t4I3BNU+CW3Kmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763577576; a=rsa-sha256; cv=none; b=Pp0sX096T2JnNwokYWSiMm5mm4XaN/Pc8PMo5qOZKy0P+K7qeg5BrCF+tGX34rvwwubGNs BsiriAIR9Dt6A7JHIBz0j/fZtmViJ3kBZDaUhdLXY3fGLZIgc4uPk+RMqyhiLi8HIoz9Zb d6ChNM917bkc5o1GcrIAk6BbN4Jq09ZQM1jMZFIzVyHaQUNNckA2RNlvKnjJoLhZyT0rWJ IvLFlq38RGve2/AWIsabrz8TdlptwKwAER/OwtR3zLnLybi970MgYzcMJof/+zR2C8X+A1 HR6g2DeoBNirGi2KDtMmZF8xukDaIKfSp7R6Jd2zASmANA2hzkCd2C7P1bRbzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBVdN4KRhzrlY for ; Wed, 19 Nov 2025 18:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f30c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 18:39:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: fa546e9d18f4 - stable/15 - UPDATING: Document FreeBSD-base pkg .conf shuffle List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fa546e9d18f4dbbf5fa1fe152c78d97615d51bda Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 18:39:36 +0000 Message-Id: <691e0ee8.f30c.66e93304@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fa546e9d18f4dbbf5fa1fe152c78d97615d51bda commit fa546e9d18f4dbbf5fa1fe152c78d97615d51bda Author: Colin Percival AuthorDate: 2025-11-16 16:56:12 +0000 Commit: Colin Percival CommitDate: 2025-11-19 18:39:23 +0000 UPDATING: Document FreeBSD-base pkg .conf shuffle Reminded by: yasu MFC after: 3 days (cherry picked from commit 6ccdd2fc2328dd81b9c645fba025d01052a3c1a1) --- UPDATING | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/UPDATING b/UPDATING index faba80dc9a0e..2287ff9d8d22 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,16 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20251115: + The FreeBSD-base repository is now defined in /etc/pkg/FreeBSD.conf, + disabled by default. In -CURRENT and -STABLE this points at nightly + builds on pkg.freebsd.org; for BETA/RC/RELEASE builds it points at + release engineering builds on pkgbase.freebsd.org. + + Users of pkgbase will need to replace any existing definition of the + FreeBSD-base repository in /usr/local/etc/pkg/repos/ with a single + line "FreeBSD-base: { enabled: yes }". + 20251105: pf(4) now supports nat64 via the af-to keyword. From nobody Wed Nov 19 19:56:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBXLB1KC2z6JB6S for ; Wed, 19 Nov 2025 19:56:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBXL95Bg2z3nCV for ; Wed, 19 Nov 2025 19:56:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-29844c68068so1211335ad.2 for ; Wed, 19 Nov 2025 11:56:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1763582191; x=1764186991; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=KE5x/LhkKXEtj2065YOmwkggAPES+gd+A45VzXJkT88=; b=al1Hg39umg/vi5zj0sCkRWXVZ/7VoVV5HzOFzrL0RU72xCfml3+pWR+vcC7TljEmF7 a8PuE7+gWNceBDQLEamwZy/btr7/usgIm9sQ3kyufcHd9mc7U/aN6htW4Ex9lhxKa/bf xwvvbz3qrPaGV/PhdWvEQBv8XltQvdFJMmxcNUCkEWP4WYVjgLUO5/YWPHe65nW7pDX/ Sp7MnbxukW3qMKJQghWhaqvdIjQ4FjblNzZIEccVrLk/JDT2EYELknNABCsVSB0bSltQ OTYfBqKNvGSPbWGkypywstCxGGbKSgcVqKOOVyNQbxnjKeBxjpJfIeMN0dTFFNtGjxHb 5msA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763582191; x=1764186991; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=KE5x/LhkKXEtj2065YOmwkggAPES+gd+A45VzXJkT88=; b=NYH2RADIc9EYFsbZzQ31/b9mQ6S01GqEuKE6Xj6llP2vl7tc/tThkHP7chK8GHeqgu z9gALwOUmMXyXHuHBjJgZyEkFIYIpVcBSpB9TYc0TFkG1K3IxqmBSyGPP7RnZyBZ6sA5 ryVs6OWxi4DcI53PY5RwxX30yUQtvZn7eE9wtLjk21oaiOASF0UCcSA0TItM7c+J+NME Aavahn0qfPBBJPDhUbJcvMDwldlfhGHo/iEIXz9bfT4Lrg+dcxBDLptBqTesDtBX9lAh 62y/gc9Ag3XdMj+iIKOyGP0w3RnRJ3vW5lyUqUn+QJaHkxv88SM0/W3opC+dmQ/UEZtq s6FA== X-Forwarded-Encrypted: i=1; AJvYcCVmGfL1aGWKVVET+VyhH3QS0PThLwqzfm8gZKEwPxIs6yfADLE/qgcMK1w4aI9khIk6z/uXMxmYg+AnCnj2O3IPma8Q@freebsd.org X-Gm-Message-State: AOJu0YyowX0RruGmTJPLTRv0V3DwpsvmoNxmJzXzg8TdRbo0p+RKa0K4 n7bAD+nwq61NFBjzhpUBMMXWznDgScyMDwZ/xhP1L/NxvLwGenOpgOjjzfuk84j+qOigC9wRzd8 jAie0OMSFMoqyUBpXxOTD8IAts0SZWxpJbsvQ+wwFrQ== X-Gm-Gg: ASbGncsOyxEbWJ4HLt0zUM+u15ePp6kX+PZTP2m4Ye2TY99dib9SxlM3RsLw/joN0iG NqXrCzcU0JrKWhkZZqHDAMAVb3EAI5yi0Itldjg5m9xbKuCbUUmULqBj9zVcdGXWbGiUGlUker4 Gh2DfbWwdvrnDNU7rNXOe4NP4AgmoOx84ZMci/at9TNxIT9V6e6Bw3Zs4Z336VDjeCvep52rQb/ AD8lq8SAEBON6JcZVbak0u+EbrNi/pYv9PsbmGAmSWtujS+jkMZVJ1dwwhJvjsPR4FP2mzhWlWE n5L2ajB7/WZHBaRId0gigfzLiA== X-Google-Smtp-Source: AGHT+IFwX5xT8y//W3cmTehhX1p4gHJSYyZQhUcPcbxlD6TIBoIXPQZK/QDpq2OGyfrfIC996x9al7nw24d2BUxbzzg= X-Received: by 2002:a17:90b:3d8c:b0:343:bd86:b5a6 with SMTP id 98e67ed59e1d1-34728533820mr210891a91.34.1763582190960; Wed, 19 Nov 2025 11:56:30 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <691cdf72.35308.1c1c6fc1@gitrepo.freebsd.org> <1osso5q5-74o7-pr61-q328-n6451nor36q4@mnoonqbm.arg> In-Reply-To: <1osso5q5-74o7-pr61-q328-n6451nor36q4@mnoonqbm.arg> From: Warner Losh Date: Wed, 19 Nov 2025 12:56:18 -0700 X-Gm-Features: AWmQ_bnzGg-1c8DTJ0EELRwFiWhy9H6fwTcV_Hzk614EjUjs6Bb1D-5s8kRPhNM Message-ID: Subject: Re: git: 20e94950c54e - main - nvme: Notify namespace changes better To: "Bjoern A. Zeeb" Cc: Warner Losh , src-committers , "" , "" , Wanpeng Qian Content-Type: multipart/alternative; boundary="000000000000064edb0643f7faf5" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dBXL95Bg2z3nCV --000000000000064edb0643f7faf5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Nov 19, 2025, 11:01=E2=80=AFAM Bjoern A. Zeeb < bzeeb-lists@lists.zabbadoz.net> wrote: > On Tue, 18 Nov 2025, Warner Losh wrote: > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D20e94950c54e398049396647da36b9e= 2c3b639c1 > > > > commit 20e94950c54e398049396647da36b9e2c3b639c1 > > Author: Wanpeng Qian > > AuthorDate: 2025-11-18 15:24:23 +0000 > > Commit: Warner Losh > > CommitDate: 2025-11-18 20:32:22 +0000 > > > > nvme: Notify namespace changes better > > > > When we get a namespace notification, we have to reconstrut the > > namespace to get the new identification data from the namespace. For > > each namespace in the AEN, we will reconstrict it before we call the > > notification. We also flag it as changed for the duration of the > change > > callback (prior versions of the patch needed to keep track, but we n= o > > longer do, so this bit may be removed). Note when we've seen the > > namespace so we can notify when it goes away. > > > > Co-authored-by: imp > > Differential Revision: https://reviews.freebsd.org/D33032 > > --- > > sys/dev/nvme/nvme.h | 7 +++++-- > > sys/dev/nvme/nvme_ctrlr.c | 12 +++++++++++- > > sys/dev/nvme/nvme_ns.c | 9 ++++++--- > > 3 files changed, 22 insertions(+), 6 deletions(-) > > Just replying to one of the multiple commits: > > It seems from somewhere a VIMAGE enabled kernel is pulling > in systm.h for memmove; LINT-NOVIMAGE fails without the below: > > % git diff > diff --git sys/dev/nvme/nvme.h sys/dev/nvme/nvme.h > index 8f7a7fbda14c..e17c2bf41a5a 100644 > --- sys/dev/nvme/nvme.h > +++ sys/dev/nvme/nvme.h > @@ -31,6 +31,7 @@ > > #ifdef _KERNEL > #include > +#include > #endif > > #include > I'll take a look, but i didn=E2=80=99t think i added a memmove. Warner > -- > Bjoern A. Zeeb r15:7 > --000000000000064edb0643f7faf5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Wed, Nov 19, 2025, 11:01=E2= =80=AFAM Bjoern A. Zeeb <bzeeb-lists@lists.zabbadoz.net> wrote:
On Tue, 18 Nov 2025, Warner Losh wrote:

> The branch main has been updated by imp:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3D20e94950c54e398049396647da36b9= e2c3b639c1
>
> commit 20e94950c54e398049396647da36b9e2c3b639c1
> Author:=C2=A0 =C2=A0 =C2=A0Wanpeng Qian <wanpengqian@gmail.com>
> AuthorDate: 2025-11-18 15:24:23 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2025-11-18 20:32:22 +0000
>
>=C2=A0 =C2=A0 nvme: Notify namespace changes better
>
>=C2=A0 =C2=A0 When we get a namespace notification, we have to reconstr= ut the
>=C2=A0 =C2=A0 namespace to get the new identification data from the nam= espace. For
>=C2=A0 =C2=A0 each namespace in the AEN, we will reconstrict it before = we call the
>=C2=A0 =C2=A0 notification. We also flag it as changed for the duration= of the change
>=C2=A0 =C2=A0 callback (prior versions of the patch needed to keep trac= k, but we no
>=C2=A0 =C2=A0 longer do, so this bit may be removed). Note when we'= ve seen the
>=C2=A0 =C2=A0 namespace so we can notify when it goes away.
>
>=C2=A0 =C2=A0 Co-authored-by: imp
>=C2=A0 =C2=A0 Differential Revision: https://review= s.freebsd.org/D33032
> ---
> sys/dev/nvme/nvme.h=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 7 +++++--
> sys/dev/nvme/nvme_ctrlr.c | 12 +++++++++++-
> sys/dev/nvme/nvme_ns.c=C2=A0 =C2=A0 |=C2=A0 9 ++++++---
> 3 files changed, 22 insertions(+), 6 deletions(-)

Just replying to one of the multiple commits:

It seems from somewhere a VIMAGE enabled kernel is pulling
in systm.h for memmove; LINT-NOVIMAGE fails without the below:

% git diff
diff --git sys/dev/nvme/nvme.h sys/dev/nvme/nvme.h
index 8f7a7fbda14c..e17c2bf41a5a 100644
--- sys/dev/nvme/nvme.h
+++ sys/dev/nvme/nvme.h
@@ -31,6 +31,7 @@

=C2=A0 #ifdef _KERNEL
=C2=A0 #include <sys/types.h>
+#include <sys/systm.h>
=C2=A0 #endif

=C2=A0 #include <sys/param.h>

I'll take a look, but i didn=E2=80= =99t think i added a memmove.

Warner=C2=A0
--
Bjoern A. Zeeb=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0r15:7
--000000000000064edb0643f7faf5-- From nobody Wed Nov 19 20:06:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBXYr2djKz6JCLQ for ; Wed, 19 Nov 2025 20:06: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBXYr0lXvz3qb6 for ; Wed, 19 Nov 2025 20:06:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763582800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jVkqktzvZhBiU0r1vVYRg8iCFp6JuE8rbI3+nyiQd0E=; b=qgahqdkSmnhs3oouf3yFpnibQRmUhz7GUGEw2S6pKHhV0WFFx+wtnZ3WfkIBYnLIzUIG17 0e5WcccveGSB32I9g0ZlxScUNAewzP3XfzKHMAMHd0tLidWV82Btrn41shANcWk7to0Cvh oMvRQGmq9XWN7iPml+Ty63cFyoJyPKLzxdCHc17Qk7s912RqTp/YDKYhiOoxA8tPksAdh1 JAQHmsYkaMmN+WlH64o4WBGIIigkpBJ60Lf5dp0GoL9pHlBeLgO0dUuGTH2nPaLgcLcqWF 9+zGrikD/t9LBi1vWkAjm2VMXEX1kNrc4RoumQZbudF2n/a88brdyJwpCslLrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763582800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jVkqktzvZhBiU0r1vVYRg8iCFp6JuE8rbI3+nyiQd0E=; b=PS6w+yQ37UAdxXAv2fNKZPBSNuc/cq4dCgbTmeEmVkHYdM35VFgUJTj8gXyCRHOfuYqgDT jrQl5F4qbSM2Qylw1L6EIG78tpj16XKZENbV1mj1NjDnDNTfDtS3jPF6uYyAzVfeTnH0P0 wTX83iV+tjk7w+sX+aoi0Ibo1xAySkk0Ic+ogqvN//OaKC6LpUZYIimXhfedUPqlVIz268 P5VVY1mHUkcixcjrreG7xPXeOQNR7bYlwl8opN1PduVAI4/VqZfSiEmnEpIDFxbltQP5rk jqxKr9Js5hFsIDjBME4TNWx4vZdF1wbU+1Jkrf7A75E0Kf7+DMLSHUznnDaVtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763582800; a=rsa-sha256; cv=none; b=v+MRsKFlaL/fm4nM7IEuUME6SJTscdoPRmyu6XzxzuM53bo+ogjp60rat6KaR/qw4IoL76 uN83Yc94wLHUiBtbOmtOn47ZGu8NoBzivRPaF6qqlxHf94QO3a9lgqhLfzztBosmCL6J5L sjkHznHO9/RAPEAeZ7351oHw/B6Dr+rCmCZvcgHX+d/8MDCSARu6357KW2xeY4siJfam8N MESwmPZrBdcYtMax7evFMBiB47x0jVlnGI637N73IGwirCXacTZznD63NbyQ5W4DAf0bh4 R7A9VbnubCKETMC4/IEWKet+leZ0ypKnM6geslL0Y3venYkz69DlQ8Ml/R3gGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBXYr0JPTztsV for ; Wed, 19 Nov 2025 20:06:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 298c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 20:06:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 6cc6beb4c889 - main - release: Remove KDE from dvd1.iso List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6cc6beb4c889a049170d0aeaa9c88b9093776d6e Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 20:06:40 +0000 Message-Id: <691e2350.298c6.431905ba@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6cc6beb4c889a049170d0aeaa9c88b9093776d6e commit 6cc6beb4c889a049170d0aeaa9c88b9093776d6e Author: Colin Percival AuthorDate: 2025-11-18 05:41:47 +0000 Commit: Colin Percival CommitDate: 2025-11-19 20:06:18 +0000 release: Remove KDE from dvd1.iso Prior to this commit, we were shipping 2155 MB of packages (from the ports tree, not counting pkgbase) on dvd1.iso. Due to the amount of space required by shipping pkgbase packages *and* distribution sets on the DVD images, we only have 1696 MB available if we want to fit into the 4.7 GB limit for DVDs. Many users have indicated that this is indeed important. It is practically impossible to hit this target without removing KDE; while KDE and its dependencies narrowly fit (1550 MB), we exceed the limit as soon as we include either of freebsd-doc-all or gnome. While we would pick KDE over GNOME (surveys regularly indicate that KDE is the more widely used of the two), we believe that documentation is the most important thing to include. Since removing KDE leaves a bit of extra space, add editors/emacs and editors/vim. This takes the 15.0 amd64 dvd1.iso up to 4.689 GB. [1] Requested by: adamw [1] MFC after: immediately (for 15.0-RC3) Differential Revision: https://reviews.freebsd.org/D53800 --- release/scripts/pkg-stage.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 6d460a83e1da..083b1baa3358 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -15,6 +15,8 @@ export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES=" devel/git@lite +editors/emacs +editors/vim misc/freebsd-doc-all net/mpd5 net/rsync @@ -29,7 +31,6 @@ sysutils/tmux www/firefox www/links x11/gnome -x11/kde x11/sddm x11/xorg x11-wm/sway From nobody Wed Nov 19 20:08:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBXck6VRJz6JCMF; Wed, 19 Nov 2025 20:09:10 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E8" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBXch1H1Yz3qsb; Wed, 19 Nov 2025 20:09:07 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=zabbadoz.net header.s=20240622 header.b=ZDSofJ6u; dmarc=pass (policy=none) header.from=zabbadoz.net; spf=pass (mx1.freebsd.org: domain of bzeeb-lists@lists.zabbadoz.net designates 2003:a:140a:2200:6:594:fffe:19 as permitted sender) smtp.mailfrom=bzeeb-lists@lists.zabbadoz.net Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id CAC1CA64805; Wed, 19 Nov 2025 20:08:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zabbadoz.net; s=20240622; t=1763582925; bh=w/iSlTWMB7sDqDB2VYdCWZRqjXYwhZzqhMp4UV0wW4A=; h=Date:From:To:cc:Subject:In-Reply-To:References; b=ZDSofJ6ueNfVfZ8hXIAWQePqDs9U86r1QijdvfjBDQd9z8s3gr3Ok1NKfRFWtHiD2 3qN/rPPbzib+wexv4wdjdOqIPmAINh1SWeJpPckyNwMfhwrOAPfdZ3gMmB46lSt5Ai r9DM0FzZYMa63RECANDmluImQmtruwlK8eD8fhYPER1BYbjZFRX+fpg4/g2FR2h1xu 5gIspUGydXWuQowgCSgcEbfEjILrQQiHVE4fAT7Z270hxWNXRN8gwb3e79fLaaBGkj mppTfa4ib3tmtcXgWIoXeR6R5SHq9akOOQBKYw0wuqOcHzgOmlJk6YkjYKHzwpSUSv ILk0HigWV+xV9l+nr55cP80I84PZT0nBP5L87a2P2CYEv2IMo/ckpX/67nytMEjzZk hec+q8o++1uwfQgEld4lEPLDZmCEjfDS7Mcxei7ujtw2+dmHjNmu+RgliA3JzTjf5G lf+al2ks6QiyWap6CQfzfj4wA9g7DVP0d39qDOQX8WVQai0LDfmuGwDKY59L/PrwkD /7myZqaRH32oIvIN4muqS92cdcwLXGiG8kuXbs7ypicblof9VAGIUKiT7hzjmUY70W uZhV5oAbCr0zWV+2mNQ4FByUYq5Tyi2xSdo/eWnDlnEZAtl9oxl4eqkpWOKhCCl715 1H+/tjcpP9/u+QwI67uuPTtU= Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 5D0DC2D029E6; Wed, 19 Nov 2025 20:08:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id SIiD3E97ojev; Wed, 19 Nov 2025 20:08:57 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id E1BBF2D029D8; Wed, 19 Nov 2025 20:08:56 +0000 (UTC) Date: Wed, 19 Nov 2025 20:08:56 +0000 (UTC) From: "Bjoern A. Zeeb" To: John Baldwin cc: Warner Losh , src-committers , "" , "" , Wanpeng Qian Subject: Re: git: 20e94950c54e - main - nvme: Notify namespace changes better In-Reply-To: Message-ID: References: <691cdf72.35308.1c1c6fc1@gitrepo.freebsd.org> <1osso5q5-74o7-pr61-q328-n6451nor36q4@mnoonqbm.arg> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0-2078512504-1763582936=:11296" X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; CTYPE_MIXED_BOGUS(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.994]; DMARC_POLICY_ALLOW(-0.50)[zabbadoz.net,none]; R_DKIM_ALLOW(-0.20)[zabbadoz.net:s=20240622]; R_SPF_ALLOW(-0.20)[+ip6:2003:a:140a:2200:6:594:fffe:19]; MIME_GOOD(-0.10)[multipart/mixed,text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; MISSING_XM_UA(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+]; ASN(0.00)[asn:3320, ipnet:2003::/19, country:DE]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[freebsd.org,gmail.com]; RCPT_COUNT_FIVE(0.00)[6]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_ALL(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[zabbadoz.net:+] X-Rspamd-Queue-Id: 4dBXch1H1Yz3qsb This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --0-2078512504-1763582936=:11296 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Wed, 19 Nov 2025, Warner Losh wrote: > On Wed, Nov 19, 2025, 11:01 AM Bjoern A. Zeeb < > bzeeb-lists@lists.zabbadoz.net> wrote: > >> On Tue, 18 Nov 2025, Warner Losh wrote: >> >>> The branch main has been updated by imp: >>> >>> URL: >> https://cgit.FreeBSD.org/src/commit/?id=20e94950c54e398049396647da36b9e2c3b639c1 >>> >>> commit 20e94950c54e398049396647da36b9e2c3b639c1 >>> Author: Wanpeng Qian >>> AuthorDate: 2025-11-18 15:24:23 +0000 >>> Commit: Warner Losh >>> CommitDate: 2025-11-18 20:32:22 +0000 >>> >>> nvme: Notify namespace changes better >>> >>> When we get a namespace notification, we have to reconstrut the >>> namespace to get the new identification data from the namespace. For >>> each namespace in the AEN, we will reconstrict it before we call the >>> notification. We also flag it as changed for the duration of the >> change >>> callback (prior versions of the patch needed to keep track, but we no >>> longer do, so this bit may be removed). Note when we've seen the >>> namespace so we can notify when it goes away. >>> >>> Co-authored-by: imp >>> Differential Revision: https://reviews.freebsd.org/D33032 >>> --- >>> sys/dev/nvme/nvme.h | 7 +++++-- >>> sys/dev/nvme/nvme_ctrlr.c | 12 +++++++++++- >>> sys/dev/nvme/nvme_ns.c | 9 ++++++--- >>> 3 files changed, 22 insertions(+), 6 deletions(-) >> >> Just replying to one of the multiple commits: >> >> It seems from somewhere a VIMAGE enabled kernel is pulling >> in systm.h for memmove; LINT-NOVIMAGE fails without the below: >> >> % git diff >> diff --git sys/dev/nvme/nvme.h sys/dev/nvme/nvme.h >> index 8f7a7fbda14c..e17c2bf41a5a 100644 >> --- sys/dev/nvme/nvme.h >> +++ sys/dev/nvme/nvme.h >> @@ -31,6 +31,7 @@ >> >> #ifdef _KERNEL >> #include >> +#include >> #endif >> >> #include >> > > I'll take a look, but i didn’t think i added a memmove. It's in the header file. Oh I missed jhb's changes. It was him in 8d2a50bb38051. Sorry. -- Bjoern A. Zeeb r15:7 --0-2078512504-1763582936=:11296-- From nobody Wed Nov 19 20:32:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBY7Q5yX7z6JDvr for ; Wed, 19 Nov 2025 20:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBY7Q3L72z3vMR for ; Wed, 19 Nov 2025 20:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763584338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=agUbLijKfE6D9POo/jV7YQgU08zmsO7wh/qxCjSsueI=; b=qOP3KL5K0rnlp5YjNhcVcJqxB+kzVDBQO3n+E9FZgPeLGzkjWjZz3x6FLrstIQSrVoovc0 Ilj1kJLkdoOHNFQDCfb64cA2h5GyXw8hBSuOrljmSE73clcRY4okk+FznA4xU3NLcq+PY+ mCTPltHhR4gn2T8bly65jZGoCuSBi1U05mpB9t3SUkuNC447gJjxVisl9LCQIGwc0e+/+F wXTDnaRJqd3JpWDRFerTJpxN+RRY3YmnFwVBXGxVlGPzAYbG+/tb1+lJTKSdGlWfBf+44c 28DHuvnk/c61q33GPFRRQ6ARRhfFa2lGUXzEVVKJW/mD7Tu6ollj7TiKngLcrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763584338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=agUbLijKfE6D9POo/jV7YQgU08zmsO7wh/qxCjSsueI=; b=Mc38TasK4duMkGPLkP9SA6RJLo1/Eo99HkLuHP4NDMR/WoYjiJqihxaRpQFMzEVGLXmdjQ FWMW6HfGdwwpTagJT2UsZEgNGLlBfOx7VUTXJ0nQiPgr2MqB4L4IoGPmDIEhpKtTcfvEhE vuUsERpVDYW0lu/CaXwAaMEoye7lsyyh9Yj72rHwJUyJcmm0YCPP9yWO7J6j1uJzJX5nOO jRhpxxzZR8WVCSoa2ACgZPuVfsw1vCMZD+VitInQYWDwrNZMKbvZ6ZTEr1yKlw2IS7UfUP 9A418XsU0qt/xsdb0V4YDTeKZyRKmCGISurYW82enc1eD+cSGG42EG6u8XW++g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763584338; a=rsa-sha256; cv=none; b=Li6uwJUkLa4GFao2oz+TKOEfq0P6OFsCrxhLhCAGMw48KvPbY/9oIGjvvr+v3jQC3UZDbD g2/e/CU8uKfd4Ks+6nxx2Z2c9wsexsKn+Dj9Q/BC7RvoctLzwK4sJ11sEdMCGLLC5+D+ZL C8uUtcEpazQXmYpTt4KbtLXGs0w+5+U05KB7ELI5xdFNI8tCSqo993nJGS16lNUPv1xo8a aMzMI1gORJM5tbdrouuV3tMpqjbad39uyfengA8NwAB5ZZ/xqWbII/hBd382VgR1ajWoVm GZq8MqualKM09rnDJyTgnNmEdLMlThPVzqZxJX3YWy9QKBHcdtUmBLPVYIy0Tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBY7Q2f3RzwJG for ; Wed, 19 Nov 2025 20:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c970 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 20:32:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jilles Tjoelker Subject: git: f44ac8cc9c10 - main - sh: Fix job pointer invalidation with trapsasync List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jilles X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f44ac8cc9c10d7305223a10b8dbd8e234388cc73 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 20:32:18 +0000 Message-Id: <691e2952.2c970.6d79d13c@gitrepo.freebsd.org> The branch main has been updated by jilles: URL: https://cgit.FreeBSD.org/src/commit/?id=f44ac8cc9c10d7305223a10b8dbd8e234388cc73 commit f44ac8cc9c10d7305223a10b8dbd8e234388cc73 Author: Jilles Tjoelker AuthorDate: 2025-11-17 17:42:01 +0000 Commit: Jilles Tjoelker CommitDate: 2025-11-19 20:30:39 +0000 sh: Fix job pointer invalidation with trapsasync Calling dotrap() can do almost anything, including reallocating the jobtab array. Convert the job pointer to an index before calling dotrap() and then restore a proper job pointer afterwards. PR: 290330 Reported by: bdrewery Reviewed by: bdrewery Differential Revision: https://reviews.freebsd.org/D53793 --- bin/sh/jobs.c | 6 +++++- bin/sh/tests/execution/Makefile | 1 + bin/sh/tests/execution/bg14.0 | 9 +++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index 0aaff5e1e140..a4cd76473921 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -1078,6 +1078,7 @@ waitforjob(struct job *jp, int *signaled) #if JOBS int propagate_int = jp->jobctl && jp->foreground; #endif + int jobindex; int status; int st; @@ -1085,8 +1086,11 @@ waitforjob(struct job *jp, int *signaled) TRACE(("waitforjob(%%%td) called\n", jp - jobtab + 1)); while (jp->state == 0) if (dowait(DOWAIT_BLOCK | (Tflag ? DOWAIT_SIG | - DOWAIT_SIG_TRAP : 0), jp) == -1) + DOWAIT_SIG_TRAP : 0), jp) == -1) { + jobindex = jp - jobtab; dotrap(); + jp = jobtab + jobindex; + } #if JOBS if (jp->jobctl) { if (ttyfd >= 0 && tcsetpgrp(ttyfd, rootpid) < 0) diff --git a/bin/sh/tests/execution/Makefile b/bin/sh/tests/execution/Makefile index 53cb97db9393..dde562a082cd 100644 --- a/bin/sh/tests/execution/Makefile +++ b/bin/sh/tests/execution/Makefile @@ -18,6 +18,7 @@ ${PACKAGE}FILES+= bg10.0 bg10.0.stdout ${PACKAGE}FILES+= bg11.0 ${PACKAGE}FILES+= bg12.0 ${PACKAGE}FILES+= bg13.0 +${PACKAGE}FILES+= bg14.0 ${PACKAGE}FILES+= env1.0 ${PACKAGE}FILES+= fork1.0 ${PACKAGE}FILES+= fork2.0 diff --git a/bin/sh/tests/execution/bg14.0 b/bin/sh/tests/execution/bg14.0 new file mode 100644 index 000000000000..e27f77e9b7b3 --- /dev/null +++ b/bin/sh/tests/execution/bg14.0 @@ -0,0 +1,9 @@ +T=`mktemp -d ${TMPDIR:-/tmp}/sh-test.XXXXXXXX` +trap 'rm -rf "$T"' 0 +cd "$T" || exit 3 +mkfifo fifo1 || exit 3 +set -T +trap "for i in 1 2 3 4; do sleep 1 & done" USR1 +sleep 1 & +{ kill -USR1 "$$"; echo .; } >fifo1 & +(read dummy ; Wed, 19 Nov 2025 21:25: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZK569jlz46bn for ; Wed, 19 Nov 2025 21:25:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763587545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1gQ6p13uTSe4Nbtf6ok4KKiL1uSrhwm/Qu+Tc9gWFlE=; b=OqjROSfSPwE/bmuu5j5/GkcA6uDw1WLWyudGrl1e1ZvQuO1Wy2QLMsFj+ZVY4+/8obFgcd 6peDDvXGBriNiU3agiA27+/tH6plmPAyfI7lheSAMWzC+NFKOcl6PEEcXWspqVDTVzotPH 8P6N4bzMCdw9mZ6/SGoEZfZ5x55jE5dB+lz6uMu7+yj88dukx+U5sd+CouY17l0wj8Vbbs Ryypg1wGtty54EFFReAKehl9HTGR+F+CJ/g3BtPei+9eN5cosjkbWvaWeKz4iO0lXBHyF7 /GuWd6fLYc2dP/U7ER+VFNl6t01rggy7GVwAmHpdZixh5YRbwG94ebN77IkBBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763587545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1gQ6p13uTSe4Nbtf6ok4KKiL1uSrhwm/Qu+Tc9gWFlE=; b=EbWBzmJieBhZQGqYjYhiNZwCZgpOju48tz5Qt68ZvIqfskvyrGZwFQ06xN39/c+ADu5vYB PZDfRpb/Sn7XY9TJCpTwFLXCljT7MrzxDAPJxAfmzQeSbt5DiEBCa/vR3rmC5UE81Uu0ft Ih679dg8XykluKfsxVPRYyLkQkfGvvFbyPY2DxZIqSpFUF7TE6/qrbY7rbxb+UeWvMU2kU MY6+Kztn4qwi/YokNSnl7SdXlHJ8u1pcfiWYHxX0ofydMZL/vnhSHUI2MrD44UgVEp0LvZ DI8tPIKkTd1+Lj08eVzPqvaqGLxUGyDis2QcCR1Wd4ra0QE9cQFm6JEWerCQcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763587545; a=rsa-sha256; cv=none; b=heg2KOPWdwjXoHp9CgwuvRjyWseTrZ2dSlA2SVHFhvCERXtZJjtxqV7Dp4ESWGnEnllE4w nAdHI6sWn1L57EIgO9bQ5DIidOiGCjCrJVt1zEgOfFZFtiyVYEtes7A/oVgqXXaQt74hcN 1aU0eCI69sap3BrxQ2t+o9HHESTJL1NyZ2y+BjjCLZuNJnwXe9YwED5G9/OMIGpeweUfiy TueR3/6T0XWAf92C1PVBAQyNegr0I8EF4vsEQwTHZXEfxfuSblNumIFUF/d2zXVFZ6pt39 O1S1idMPMutQBc9L9XBkmTIWguExRpz1KWVyzL/lT8hIqb7G6QPnDTObsWUn4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZK55SDDzxhB for ; Wed, 19 Nov 2025 21:25:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f960 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:25:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 142df248ac06 - stable/15 - release: Remove KDE from dvd1.iso List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 142df248ac06bd255f5aa63a5544626bb502c656 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:25:45 +0000 Message-Id: <691e35d9.2f960.4471ebb8@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=142df248ac06bd255f5aa63a5544626bb502c656 commit 142df248ac06bd255f5aa63a5544626bb502c656 Author: Colin Percival AuthorDate: 2025-11-18 05:41:47 +0000 Commit: Colin Percival CommitDate: 2025-11-19 20:07:02 +0000 release: Remove KDE from dvd1.iso Prior to this commit, we were shipping 2155 MB of packages (from the ports tree, not counting pkgbase) on dvd1.iso. Due to the amount of space required by shipping pkgbase packages *and* distribution sets on the DVD images, we only have 1696 MB available if we want to fit into the 4.7 GB limit for DVDs. Many users have indicated that this is indeed important. It is practically impossible to hit this target without removing KDE; while KDE and its dependencies narrowly fit (1550 MB), we exceed the limit as soon as we include either of freebsd-doc-all or gnome. While we would pick KDE over GNOME (surveys regularly indicate that KDE is the more widely used of the two), we believe that documentation is the most important thing to include. Since removing KDE leaves a bit of extra space, add editors/emacs and editors/vim. This takes the 15.0 amd64 dvd1.iso up to 4.689 GB. [1] Requested by: adamw [1] MFC after: immediately (for 15.0-RC3) Differential Revision: https://reviews.freebsd.org/D53800 (cherry picked from commit 6cc6beb4c889a049170d0aeaa9c88b9093776d6e) --- release/scripts/pkg-stage.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 6d460a83e1da..083b1baa3358 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -15,6 +15,8 @@ export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES=" devel/git@lite +editors/emacs +editors/vim misc/freebsd-doc-all net/mpd5 net/rsync @@ -29,7 +31,6 @@ sysutils/tmux www/firefox www/links x11/gnome -x11/kde x11/sddm x11/xorg x11-wm/sway From nobody Wed Nov 19 21:44:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkh3kfYz6JJnS for ; Wed, 19 Nov 2025 21:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkh2zDCz3CGH for ; Wed, 19 Nov 2025 21:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5BaBWGVKhS9LmMI6qVU8Hp3kaM4rC3N3otOjk1AeQDM=; b=bqwk6s4K3IRTH2zB1v8bMUVchiOFoZzU+z9wZK9X5f4yRn5ksmF/7eyTzKeQKCyj+PRokB WuAy0TID92Gtu2kGq5JgOntCnbyToXR/8WUDlIYS5mfm4dYENMrBxmwq5BGR2AgxlbOz0T MHpu+zOAPhZodxmKIUsirbbIgpQesclcbiz9txRARQVeVbhTQF1SwOVlSjGlZyCdm6xhZb f4LHZXEivlRkp04Xyb787SC5nGu0sHrAvnkrnzNr62VtE1MPGdAVEz9vXrhn3k5kFewlq7 t5pNJ+TkQFr8xyzYQ0FSZtf+5yyD8XQp0idZhYLJiseS6ETqFzfa13yVoa7jew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5BaBWGVKhS9LmMI6qVU8Hp3kaM4rC3N3otOjk1AeQDM=; b=WqAzgO9eocU4Zf3W8VyvbTuN6foyU5aMLRkOu7BOfjQULclXfWipi7Yf+1XradS0HPfFrr KAb+5eAoXIfbtuPhQSoTObzSR/K4M6Ejgl9PQO6ElNXutr220FKT5pNh+/VqAs+K6uxSRP 79EjHMP2liOY2EwL1oxvuWSIeE3ENr+Og6ZB/Fhu3yps66x6/WoRCEOlKebr8Ig7QOdvRL b9yhFJ+ZFVlXR3Cau8RRfjdr4iauHPWLwHtn3jst7753WudgBMdnXusiLYkt6z3BJq6Z2G g/C+SS01lM0GQITbWOFiMYqezL15v+q0tC8n7SA1NgD0D5gtz7xEHsHyfl9HCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588668; a=rsa-sha256; cv=none; b=kPom/E+3UpWnn58GmycMz9EbjPJIsy+aEMh9P6CFFQQ0XKlZ/Dj3p1b3jsLizLy1ZPcgdR ryvJqA5JpYOj3OPu+AejOeb7qko71Lh2vwD6TBEO6vSNJh1YaQvNFBe52pj7BeVgV0Eg25 A2CeNGTKZqmGJQqFa8RnHf8qcnwZceCaecRfAtXjJ4LznZd8ygpz/4eyvOmsI5owGEYGzr 5nuyt3OdBsunsOUj5DOaYP40tV8H+Var7dzCILUwYy2xzlmTsJiu5wUc9B4BwG52kBifBC kX9goSYmokUOPWk1mw7MSiaTAxVqAmK999taW/8Etc+AdMnNpulFGdjf1NeDwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkh2WGPzy3M for ; Wed, 19 Nov 2025 21:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33e58 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 476aca498559 - releng/15.0 - UPDATING: Document FreeBSD-base pkg .conf shuffle List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 476aca498559d0a9d0be91f83bbf23e0d9f83ec9 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:28 +0000 Message-Id: <691e3a3c.33e58.7140c131@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=476aca498559d0a9d0be91f83bbf23e0d9f83ec9 commit 476aca498559d0a9d0be91f83bbf23e0d9f83ec9 Author: Colin Percival AuthorDate: 2025-11-16 16:56:12 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:36:44 +0000 UPDATING: Document FreeBSD-base pkg .conf shuffle Approved by: re (cperciva) Reminded by: yasu MFC after: 3 days (cherry picked from commit 6ccdd2fc2328dd81b9c645fba025d01052a3c1a1) (cherry picked from commit fa546e9d18f4dbbf5fa1fe152c78d97615d51bda) --- UPDATING | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/UPDATING b/UPDATING index 0d6ccdf8ea56..e15cb2e1a17c 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,16 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20251115: + The FreeBSD-base repository is now defined in /etc/pkg/FreeBSD.conf, + disabled by default. In -CURRENT and -STABLE this points at nightly + builds on pkg.freebsd.org; for BETA/RC/RELEASE builds it points at + release engineering builds on pkgbase.freebsd.org. + + Users of pkgbase will need to replace any existing definition of the + FreeBSD-base repository in /usr/local/etc/pkg/repos/ with a single + line "FreeBSD-base: { enabled: yes }". + 20251030: flua(1) has moved to the new FreeBSD-flua package. If you use flua, you may want to install this package if it's not otherwise installed From nobody Wed Nov 19 21:44:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkj5SKCz6JJwS for ; Wed, 19 Nov 2025 21:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkj40BXz3CGJ for ; Wed, 19 Nov 2025 21:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588669; 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=FlYRvSNpI2vPYX+XwM8ndlhNPgoOm0GynvQBWWkIoSk=; b=tZXMeQI9FU4HhTUv4wuyNkvsG9ZGbLcc4yree/TNfFdGkW6k3+zKdNHfZVw+WrigtDc/F/ gMNeJgt/7rYNpCOCBuiVPJpAqQc0HJ0PeG5q3+oWcM2TgvYa2JGQhzrEv4+S0EjuACSliV 9u5XYIp4Gat+TuOT+c3wlxwqOKx8Mc3VaYSo5JFBR22b6oD7MfGp7T+3MVhlFgw+jKAhnU 8DFpQO4I6ewYW9hbIW9KCrontQPlO66cBfRlOnDrYCbNYTz7q5yDM9K7MKOlcUCnoAgDf7 vcymsoKyRMmhbszsmPVwAXAt4Y8Mnb/Ak+nduwryIlr/1PV8VtdI16CYBXIpWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588669; 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=FlYRvSNpI2vPYX+XwM8ndlhNPgoOm0GynvQBWWkIoSk=; b=EE2vC6zt7TZoQOXq0RbS6bc/h5lHL8uhBvIb2YaOAz9fRatzeA5OUVg0hLN21hUzeFqMXC Ae2l1F+QUrGojjK84N+CGlTvPIVO3whxJ4gI1A2l4DEcHLfHn9fKSsZXKE9aWSA9cSGeFk Q3PeAALwtiqPFrh1AiVfku5cGgcankQSh0l6GGhkZnw2k2wiLzjK+ZM3eOGgT2MqQ6M/aW H/M7nzKC2nV4SF4BTWNy3+fVTfXRVf+v1TegxabVUSqBO8qmv29yGK8cRnN23bvM+lgmL/ nvaxbQjrM8aYe7MopsBLhhyigo7it5dNvh6SDsm3qEseX1ZCAKDmn5HA9NdC6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588669; a=rsa-sha256; cv=none; b=YOesEk0oWOrDauaPYVogm2OQPLOkmcqd2AvIa4Ei2onWCjRqiorSsNqc8wdZ4lAp5QYhHd k83PN7HExeSqEGx89M5lh6p4ovcYsgpZNUgadnacBZumzitzzuNc9okcxjzpB/Y1ZIR1qp h5tyga/4AJYqdlMvlsUJpX+dRMAjMpAdnnUcmlHPKoP9vUsrlVBLdt6A8H5sJbGL0WvOTS sKIIo//0m/xx1FXeNIkGDESmvV30ZcGGcfaBg7vIj58I2CbDxR4K3WZjGBnCFt1nlfwS6y Sy+WkhYNdoh/J/QjeKYsdnlCRDJI369wcHGU80Qj/tFuOcCC3fhsw6l5flu/eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkj3Lk0zxm1 for ; Wed, 19 Nov 2025 21:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33775 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Poul-Henning Kamp From: Colin Percival Subject: git: d02a08f89932 - releng/15.0 - iichid: The IICHID spec defines the response to the RESET command as two bytes of zeros. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: d02a08f899322dd9ed34cbf77e917068ba59b3ff Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:29 +0000 Message-Id: <691e3a3d.33775.6905fe84@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d02a08f899322dd9ed34cbf77e917068ba59b3ff commit d02a08f899322dd9ed34cbf77e917068ba59b3ff Author: Poul-Henning Kamp AuthorDate: 2025-11-18 19:22:01 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:36:49 +0000 iichid: The IICHID spec defines the response to the RESET command as two bytes of zeros. Our recent changes to iichid.c has caused us to attempt to read a full REPORT instead, and at least one keyboard hangs solid when we do that. This patch changes us to be spec-compliant. Approved by: re (cperciva) Differential Revision: https://reviews.freebsd.org/D53803 MFC after: 1 day Approved by: re(ccperciva) (cherry picked from commit 5d53462af1d0e892da77b52b701b337119b2f5d7) (cherry picked from commit d61be9d994702ffb8443c686f3ae2a5c702df3c7) --- sys/dev/iicbus/iichid.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index 5ca3f1b84e48..430066bd8f52 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -271,6 +271,8 @@ static int iichid_cmd_read(struct iichid_softc* sc, void *buf, iichid_size_t maxlen, iichid_size_t *actual_len) { + int error; + /* * 6.1.3 - Retrieval of Input Reports * DEVICE returns the length (2 Bytes) and the entire Input Report. @@ -280,7 +282,10 @@ iichid_cmd_read(struct iichid_softc* sc, void *buf, iichid_size_t maxlen, struct iic_msg msgs[] = { { sc->addr, IIC_M_RD, maxlen, buf }, }; - int error; + + if (!sc->reset_acked) { + msgs[0].len = 2; + } error = iicbus_transfer(sc->dev, msgs, nitems(msgs)); if (error != 0) From nobody Wed Nov 19 21:44:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkl1d8Wz6JJwZ for ; Wed, 19 Nov 2025 21:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkk5hrNz3C3P for ; Wed, 19 Nov 2025 21:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588670; 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=22ihXnQn0olhY5SV26sdfMLqFJjBgiyHw3obxmBzHsc=; b=uxGlB+unQUMl+udP1NbIKyVlalDoXgzcLd3OQeT2oayEpMtwswvGH5LMBYj3xm5COws3pf V9Cd5+NuxPycMbJdyWVKEkbAdbY7DXjGgtAE1EYZ47UWjae5BjdvzPogIRALEbZUOOu9FA t0YUsNLZqPSfDa+tyNCQFr0zNxOVcoX4yhP7uxRTV5zQVjEfdOnaio0A36Mx6/1YZ9kinJ U1a4Hs7vakPft+q33YR3Y5yQwt+1VK4xxzRxZGQQLJ0RkSp48XqHiChi2epD9opypcZ5wi JDDYgOQ6BkLygQDbGoPqkUfPCVdW+E6FU2V76JORrr/rPOHLOxWeZgyHKKY+sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588670; 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=22ihXnQn0olhY5SV26sdfMLqFJjBgiyHw3obxmBzHsc=; b=DR431cf/Y/AjqRhs8l+DxlhYTvbNlbsahmL8ppjcDdmNvxpVjq4Sr3zjDWVS5xtoC7FukE UmS4UvFl42FnO5DGjoNzpzKd+J/wO20VQ4jIfqnMfePHflenv7Wl0VaK9Urj606XGCNWeB CL2trHvFa0UIOYEBo21ItcbFDuAAI1LJziRpP/sdOrjVo7R4AX1orC0qz9g47Vj7LrxQJs tlgy+YdBuA37LVUhAc8IA8RdQNnrhEJKNAkgpJboRpL5lPIiJUw67svqMQoRjbJ+VSt3Hq V+jieSW9YZU1aHBiqdndAFeCZIDS1vys966XcqmDTKn0PK0HFQ1UbVF1kNtiwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588670; a=rsa-sha256; cv=none; b=l2tPivuw/KCZ/QFD8JzX1RAc0uKGfnFWJlYWwhHn29uFSpeOGMGH653sxtpZB78Fo0oKx5 zxk75WVvnJbJnA+nuJkeRuw3HUNFRTcl5MZz6zHAm2fvBO1rRvedIs5wN2Mn0NaQXpEpXt WxViUh8idMbOQev4kSIktqaZvLzKWvS/DPYwYibXZ8v6TtNodMazJjFUw3scqjhWVoLCS/ wCZfuS3x4WnrJGXoTkx3kt4KmgSERma8XiSLTBDMX6YvcGKWBrS1aPGTpD7CYNngE2b+9+ ssXKU1fmNMmMvT038ow8DdTbfo6b7wGrzCeFAuU73wwf541nWEO94wOfq/GFZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkk58kdzxfv for ; Wed, 19 Nov 2025 21:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31858 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Martin Matuska From: Colin Percival Subject: git: 7b5b0f43eb06 - releng/15.0 - zfs: merge openzfs/zfs@099f69ff5 (zfs-2.4-release) into stable/15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 7b5b0f43eb061f3af5c862ce8dc38d1be44fc287 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:30 +0000 Message-Id: <691e3a3e.31858.4543ef86@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7b5b0f43eb061f3af5c862ce8dc38d1be44fc287 commit 7b5b0f43eb061f3af5c862ce8dc38d1be44fc287 Author: Martin Matuska AuthorDate: 2025-11-18 11:44:03 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:36:55 +0000 zfs: merge openzfs/zfs@099f69ff5 (zfs-2.4-release) into stable/15 OpenZFS 2.4.0 rc4 Notable upstream pull request merges: #17477 1e8c96d7d Add knob to disable slow io notifications #17792 5582e8b08 Update dnode_next_offset_level to accept blkid instead of offset #17872 584762617 Pass flags to more DMU write/hold functions #17875 178a8be21 BRT: Round bv_entcount up to BRT_BLOCKSIZE #17875 e3acd0a72 Fix caching of DDT log and BRT #17877 67fc49433 Cleanup ZIO_FLAG_IO_RETRY vs TRYHARD usage #17824 dda711dbb Fix gang write late_arrival bug #17890 41878d57e Add BRT support to zpool prefetch command #17903 aaf374bd4 ZIO: Set minimum number of free issue threads to 32 #17906 ac0bc4cc0 spa_misc: add an API for spa_namespace_lock #17908 583db4003 FreeBSD: Add support for _PC_CASE_INSENSITIVE #17911 -multiple Update library ABI versions for v2.4.0 #17915 e305c7d59 BRT: Fix ranges to blocks conversion math #17916 002bc3da6 BRT: Increase block size from 4KB to 8KB #17921 e895c7619 ZAP: Remove dmu_object_info_from_dnode() call Approved by: re (cperciva) Obtained from: OpenZFS OpenZFS commit: 099f69ff5d3df7988632039db7ad6d183eb34042 OpenZFS tag: zfs-2.4.0-rc4 (cherry picked from commit 155d5b8a19baa864ebe9d8346d932bd04ea23aca) --- .../.github/workflows/scripts/generate-ci-type.py | 10 +- .../.github/workflows/scripts/qemu-2-start.sh | 20 +- .../.github/workflows/zfs-qemu-packages.yml | 2 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 38 ++- sys/contrib/openzfs/.mailmap | 8 + sys/contrib/openzfs/AUTHORS | 14 + sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/README.md | 2 +- sys/contrib/openzfs/autogen.sh | 61 +---- sys/contrib/openzfs/cmd/zdb/zdb.c | 8 +- sys/contrib/openzfs/cmd/zfs/zfs_project.c | 36 ++- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 34 ++- sys/contrib/openzfs/cmd/ztest.c | 39 +-- sys/contrib/openzfs/config/deb.am | 8 +- sys/contrib/openzfs/contrib/debian/Makefile.am | 8 +- sys/contrib/openzfs/contrib/debian/clean | 4 +- sys/contrib/openzfs/contrib/debian/control | 26 +- .../{openzfs-libzfs6.docs => openzfs-libzfs7.docs} | 0 ...bzfs6.install.in => openzfs-libzfs7.install.in} | 0 ...enzfs-libzpool6.docs => openzfs-libzpool7.docs} | 0 ...ol6.install.in => openzfs-libzpool7.install.in} | 0 .../openzfs/include/os/freebsd/spl/sys/mod.h | 3 + sys/contrib/openzfs/include/sys/brt.h | 1 + sys/contrib/openzfs/include/sys/brt_impl.h | 2 +- sys/contrib/openzfs/include/sys/dmu.h | 8 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 4 +- sys/contrib/openzfs/include/sys/spa.h | 14 +- sys/contrib/openzfs/include/sys/vdev_impl.h | 1 + sys/contrib/openzfs/include/sys/zfs_project.h | 10 +- sys/contrib/openzfs/lib/libnvpair/Makefile.am | 2 +- sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + .../openzfs/lib/libspl/include/os/linux/sys/vfs.h | 33 +++ .../openzfs/lib/libspl/include/sys/tunables.h | 12 +- sys/contrib/openzfs/lib/libuutil/libuutil.abi | 69 ----- sys/contrib/openzfs/lib/libzfs/Makefile.am | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 83 +----- sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c | 2 + sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 8 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 5 +- .../openzfs/lib/libzfs/os/linux/libzfs_util_os.c | 37 +++ .../openzfs/lib/libzfs_core/libzfs_core.abi | 70 +---- .../openzfs/lib/libzfsbootenv/libzfsbootenv.abi | 2 +- sys/contrib/openzfs/lib/libzpool/Makefile.am | 2 +- sys/contrib/openzfs/lib/libzpool/kernel.c | 4 +- sys/contrib/openzfs/man/man4/zfs.4 | 42 ++- sys/contrib/openzfs/man/man7/vdevprops.7 | 8 +- sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 5 + sys/contrib/openzfs/man/man8/zfs-jail.8 | 79 +++--- sys/contrib/openzfs/man/man8/zfs-rewrite.8 | 22 +- sys/contrib/openzfs/man/man8/zpool-events.8 | 73 ++++-- sys/contrib/openzfs/man/man8/zpool-prefetch.8 | 27 +- sys/contrib/openzfs/module/Kbuild.in | 3 +- sys/contrib/openzfs/module/Makefile.bsd | 24 -- sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c | 5 +- sys/contrib/openzfs/module/os/freebsd/zfs/spa_os.c | 10 +- .../openzfs/module/os/freebsd/zfs/vdev_label_os.c | 8 +- .../openzfs/module/os/freebsd/zfs/zfs_acl.c | 3 +- .../openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c | 4 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 20 +- .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 2 + .../openzfs/module/os/freebsd/zfs/zvol_os.c | 12 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 3 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 3 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 93 +++++-- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 6 +- sys/contrib/openzfs/module/zcommon/zpool_prop.c | 3 + sys/contrib/openzfs/module/zfs/arc.c | 8 +- sys/contrib/openzfs/module/zfs/bpobj.c | 7 +- sys/contrib/openzfs/module/zfs/bptree.c | 9 +- sys/contrib/openzfs/module/zfs/brt.c | 48 +++- sys/contrib/openzfs/module/zfs/dbuf.c | 5 +- sys/contrib/openzfs/module/zfs/ddt_log.c | 7 +- sys/contrib/openzfs/module/zfs/dmu.c | 27 +- sys/contrib/openzfs/module/zfs/dmu_redact.c | 6 +- sys/contrib/openzfs/module/zfs/dnode.c | 156 +++++------- sys/contrib/openzfs/module/zfs/metaslab.c | 8 +- sys/contrib/openzfs/module/zfs/mmp.c | 4 +- sys/contrib/openzfs/module/zfs/spa.c | 281 +++++++++++++-------- sys/contrib/openzfs/module/zfs/spa_checkpoint.c | 2 +- sys/contrib/openzfs/module/zfs/spa_config.c | 8 +- sys/contrib/openzfs/module/zfs/spa_history.c | 5 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 110 +++++--- sys/contrib/openzfs/module/zfs/space_map.c | 2 +- sys/contrib/openzfs/module/zfs/vdev.c | 86 +++++-- .../openzfs/module/zfs/vdev_indirect_births.c | 2 +- .../openzfs/module/zfs/vdev_indirect_mapping.c | 5 +- sys/contrib/openzfs/module/zfs/vdev_initialize.c | 8 +- sys/contrib/openzfs/module/zfs/vdev_label.c | 33 +-- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 2 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 4 +- sys/contrib/openzfs/module/zfs/vdev_removal.c | 20 +- sys/contrib/openzfs/module/zfs/vdev_trim.c | 12 +- sys/contrib/openzfs/module/zfs/zap_micro.c | 4 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 9 +- sys/contrib/openzfs/module/zfs/zfs_fuid.c | 2 +- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 41 +-- sys/contrib/openzfs/module/zfs/zio.c | 13 +- sys/contrib/openzfs/module/zfs/zio_inject.c | 8 +- sys/contrib/openzfs/module/zfs/zvol.c | 9 +- .../openzfs/module/zstd/include/aarch64_compat.h | 38 --- .../openzfs/module/zstd/lib/common/compiler.h | 3 - .../openzfs/module/zstd/lib/common/zstd_internal.h | 9 + sys/contrib/openzfs/rpm/generic/zfs.spec.in | 44 ++-- sys/contrib/openzfs/scripts/Makefile.am | 4 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 4 + sys/contrib/openzfs/scripts/zfs2zol-patch.sed | 32 --- sys/contrib/openzfs/scripts/zol2zfs-patch.sed | 20 -- sys/contrib/openzfs/tests/runfiles/common.run | 2 +- .../tests/test-runner/bin/test-runner.py.in | 33 ++- .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + .../functional/cli_root/zpool_get/vdev_get.cfg | 1 + .../zpool_prefetch/zpool_prefetch_001_pos.ksh | 12 +- .../zpool_prefetch/zpool_prefetch_002_pos.ksh | 95 +++++++ .../tests/functional/events/zed_slow_io.ksh | 44 +++- .../tests/functional/trim/autotrim_config.ksh | 2 +- 115 files changed, 1386 insertions(+), 1059 deletions(-) diff --git a/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py b/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py index 08021aabcb61..059d6ad3872b 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py +++ b/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py @@ -7,7 +7,7 @@ Prints "quick" if (explicity required by user): - the *last* commit message contains 'ZFS-CI-Type: quick' or if (heuristics): - the files changed are not in the list of specified directories, and -- all commit messages do not contain 'ZFS-CI-Type: full' +- all commit messages do not contain 'ZFS-CI-Type: (full|linux|freebsd)' Otherwise prints "full". """ @@ -70,7 +70,7 @@ if __name__ == '__main__': for line in last_commit_message_raw.stdout.decode().splitlines(): if line.strip().lower() == 'zfs-ci-type: quick': - output_type('quick', f'explicitly requested by HEAD commit {head}') + output_type('quick', f'requested by HEAD commit {head}') # check all commit messages all_commit_message_raw = subprocess.run([ @@ -83,8 +83,12 @@ if __name__ == '__main__': for line in all_commit_message: if line.startswith('ZFS-CI-Commit:'): commit_ref = line.lstrip('ZFS-CI-Commit:').rstrip() + if line.strip().lower() == 'zfs-ci-type: freebsd': + output_type('freebsd', f'requested by commit {commit_ref}') + if line.strip().lower() == 'zfs-ci-type: linux': + output_type('linux', f'requested by commit {commit_ref}') if line.strip().lower() == 'zfs-ci-type: full': - output_type('full', f'explicitly requested by commit {commit_ref}') + output_type('full', f'requested by commit {commit_ref}') # check changed files changed_files_raw = subprocess.run([ diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh index 422b3e9df388..5bdd84ca2435 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh @@ -47,16 +47,15 @@ case "$OS" in OSNAME="Archlinux" URL="https://geo.mirror.pkgbuild.com/images/latest/Arch-Linux-x86_64-cloudimg.qcow2" ;; + centos-stream9) + OSNAME="CentOS Stream 9" + URL="https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2" + ;; centos-stream10) OSNAME="CentOS Stream 10" - # TODO: #16903 Overwrite OSv to stream9 for virt-install until it's added to osinfo OSv="centos-stream9" URL="https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-10-latest.x86_64.qcow2" ;; - centos-stream9) - OSNAME="CentOS Stream 9" - URL="https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2" - ;; debian11) OSNAME="Debian 11" URL="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.qcow2" @@ -83,6 +82,11 @@ case "$OS" in OSv="fedora-unknown" URL="https://download.fedoraproject.org/pub/fedora/linux/releases/42/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-42-1.1.x86_64.qcow2" ;; + fedora43) + OSNAME="Fedora 43" + OSv="fedora-unknown" + URL="https://download.fedoraproject.org/pub/fedora/linux/releases/43/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-43-1.6.x86_64.qcow2" + ;; freebsd13-5r) FreeBSD="13.5-RELEASE" OSNAME="FreeBSD $FreeBSD" @@ -95,8 +99,8 @@ case "$OS" in FreeBSD="14.2-RELEASE" OSNAME="FreeBSD $FreeBSD" OSv="freebsd14.0" - KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz" URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI.raw.xz" + KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz" ;; freebsd14-3r) FreeBSD="14.3-RELEASE" @@ -120,8 +124,8 @@ case "$OS" in URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz" KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz" ;; - freebsd15-0c) - FreeBSD="15.0-ALPHA4" + freebsd15-0s) + FreeBSD="15.0-STABLE" OSNAME="FreeBSD $FreeBSD" OSv="freebsd14.0" URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz" diff --git a/sys/contrib/openzfs/.github/workflows/zfs-qemu-packages.yml b/sys/contrib/openzfs/.github/workflows/zfs-qemu-packages.yml index d8a95954fe1a..6367fb3a6ce2 100644 --- a/sys/contrib/openzfs/.github/workflows/zfs-qemu-packages.yml +++ b/sys/contrib/openzfs/.github/workflows/zfs-qemu-packages.yml @@ -52,7 +52,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['almalinux8', 'almalinux9', 'almalinux10', 'fedora41', 'fedora42'] + os: ['almalinux8', 'almalinux9', 'almalinux10', 'fedora41', 'fedora42', 'fedora43'] runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 diff --git a/sys/contrib/openzfs/.github/workflows/zfs-qemu.yml b/sys/contrib/openzfs/.github/workflows/zfs-qemu.yml index f1b189062bb7..2436b3d73e56 100644 --- a/sys/contrib/openzfs/.github/workflows/zfs-qemu.yml +++ b/sys/contrib/openzfs/.github/workflows/zfs-qemu.yml @@ -29,24 +29,34 @@ jobs: - name: Generate OS config and CI type id: os run: | - FULL_OS='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian12", "debian13", "fedora41", "fedora42", "freebsd13-5r", "freebsd14-3s", "freebsd15-0c", "ubuntu22", "ubuntu24"]' - QUICK_OS='["almalinux8", "almalinux9", "almalinux10", "debian12", "fedora42", "freebsd14-3s", "ubuntu24"]' + ci_type="default" + # determine CI type when running on PR - ci_type="full" if ${{ github.event_name == 'pull_request' }}; then head=${{ github.event.pull_request.head.sha }} base=${{ github.event.pull_request.base.sha }} ci_type=$(python3 .github/workflows/scripts/generate-ci-type.py $head $base) fi - if [ "$ci_type" == "quick" ]; then - os_selection="$QUICK_OS" - else - os_selection="$FULL_OS" - fi + + case "$ci_type" in + quick) + os_selection='["almalinux8", "almalinux9", "almalinux10", "debian12", "fedora42", "freebsd15-0s", "ubuntu24"]' + ;; + linux) + os_selection='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian11", "debian12", "debian13", "fedora41", "fedora42", "fedora43", "ubuntu22", "ubuntu24"]' + ;; + freebsd) + os_selection='["freebsd13-5r", "freebsd14-2r", "freebsd14-3r", "freebsd13-5s", "freebsd14-3s", "freebsd15-0s", "freebsd16-0c"]' + ;; + *) + # default list + os_selection='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian12", "debian13", "fedora42", "fedora43", "freebsd14-3r", "freebsd15-0s", "freebsd16-0c", "ubuntu22", "ubuntu24"]' + ;; + esac if ${{ github.event.inputs.fedora_kernel_ver != '' }}; then - # They specified a custom kernel version for Fedora. Use only - # Fedora runners. + # They specified a custom kernel version for Fedora. + # Use only Fedora runners. os_json=$(echo ${os_selection} | jq -c '[.[] | select(startswith("fedora"))]') else # Normal case @@ -62,13 +72,13 @@ jobs: strategy: fail-fast: false matrix: - # rhl: almalinux8, almalinux9, centos-stream9, fedora4x + # rhl: almalinux8, almalinux9, centos-streamX, fedora4x # debian: debian12, debian13, ubuntu22, ubuntu24 # misc: archlinux, tumbleweed - # FreeBSD variants of 2025-06: + # FreeBSD variants of november 2025: # FreeBSD Release: freebsd13-5r, freebsd14-2r, freebsd14-3r - # FreeBSD Stable: freebsd13-5s, freebsd14-3s - # FreeBSD Current: freebsd15-0c, freebsd16-0c + # FreeBSD Stable: freebsd13-5s, freebsd14-3s, freebsd15-0s + # FreeBSD Current: freebsd16-0c os: ${{ fromJson(needs.test-config.outputs.test_os) }} runs-on: ubuntu-24.04 steps: diff --git a/sys/contrib/openzfs/.mailmap b/sys/contrib/openzfs/.mailmap index e6f09c6c9d43..3397fbc3745d 100644 --- a/sys/contrib/openzfs/.mailmap +++ b/sys/contrib/openzfs/.mailmap @@ -53,6 +53,7 @@ Jason Harmening Jeremy Faulkner Jinshan Xiong John Poduska +Jo Zzsi Justin Scholz Ka Ho Ng Kash Pande @@ -67,6 +68,7 @@ Michael Gmelin Olivier Mazouffre Piotr Kubaj Quentin Zdanis +Roberto Ricci Roberto Ricci Rob Norris Rob Norris @@ -83,7 +85,10 @@ Youzhong Yang # Signed-off-by: overriding Author: Alexander Ziaee Felix Schmidt +Jean-Sébastien Pédron +Konstantin Belousov Olivier Certner +Patrick Xia Phil Sutter poscat Qiuhao Chen @@ -125,6 +130,7 @@ buzzingwires <131118055+buzzingwires@users.noreply.gi Cedric Maunoury <38213715+cedricmaunoury@users.noreply.github.com> Charles Suh Chris Peredun <126915832+chrisperedun@users.noreply.github.com> +classabbyamp <5366828+classabbyamp@users.noreply.github.com> Dacian Reece-Stremtan <35844628+dacianstremtan@users.noreply.github.com> Damian Szuberski <30863496+szubersk@users.noreply.github.com> Daniel Hiepler <32984777+heeplr@users.noreply.github.com> @@ -185,6 +191,7 @@ Michael Niewöhner Michael Zhivich <33133421+mzhivich@users.noreply.github.com> MigeljanImeri <78048439+MigeljanImeri@users.noreply.github.com> Mo Zhou <5723047+cdluminate@users.noreply.github.com> +nav1s <42621369+nav1s@users.noreply.github.com> Nick Mattis omni <79493359+omnivagant@users.noreply.github.com> Pablo Correa Gómez <32678034+pablofsf@users.noreply.github.com> @@ -206,6 +213,7 @@ Samuel Wycliffe <50765275+npc203@users.noreply.github Savyasachee Jha Scott Colby Sean Eric Fagan +Shreshth Srivastava <66148173+Shreshth3@users.noreply.github.com> Spencer Kinny <30333052+Spencer-Kinny@users.noreply.github.com> Srikanth N S <75025422+nssrikanth@users.noreply.github.com> Stefan Lendl <1321542+stfl@users.noreply.github.com> diff --git a/sys/contrib/openzfs/AUTHORS b/sys/contrib/openzfs/AUTHORS index 6c34c07f39ef..e496c0e8a807 100644 --- a/sys/contrib/openzfs/AUTHORS +++ b/sys/contrib/openzfs/AUTHORS @@ -154,6 +154,7 @@ CONTRIBUTORS: Chris Zubrzycki Chuck Tuffli Chunwei Chen + classabbyamp Clemens Fruhwirth Clemens Lang Clint Armstrong @@ -161,6 +162,7 @@ CONTRIBUTORS: Colin Ian King Colin Percival Colm Buckley + Cong Zhang Crag Wang Craig Loomis Craig Sanders @@ -217,6 +219,7 @@ CONTRIBUTORS: Eitan Adler Eli Rosenthal Eli Schwartz + Eric A. Borisch Eric Desrochers Eric Dillmann Eric Schrock @@ -288,6 +291,7 @@ CONTRIBUTORS: Henrik Riomar Herb Wartens Hiếu Lê + hoshinomori Huang Liu Håkan Johansson Igor K @@ -300,6 +304,7 @@ CONTRIBUTORS: ilovezfs InsanePrawn Isaac Huang + Ivan Shapovalov Ivan Volosyuk Jacek Fefliński Jacob Adams @@ -322,6 +327,7 @@ CONTRIBUTORS: Javen Wu Jaydeep Kshirsagar Jean-Baptiste Lallement + Jean-Sébastien Pédron Jeff Dike Jeremy Faulkner Jeremy Gill @@ -355,7 +361,9 @@ CONTRIBUTORS: Josh Soref Joshua M. Clulow José Luis Salvador Rufo + Jo Zzsi João Carlos Mendes Luís + JT Pennington Julian Brunner Julian Heuking jumbi77 @@ -388,6 +396,7 @@ CONTRIBUTORS: Kleber Tarcísio Kody A Kantor Kohsuke Kawaguchi + Konstantin Belousov Konstantin Khorenko KORN Andras kotauskas @@ -416,6 +425,7 @@ CONTRIBUTORS: luozhengzheng Luís Henriques Madhav Suresh + Maksym Shkolnyi manfromafar Manoj Joseph Manuel Amador (Rudd-O) @@ -482,6 +492,7 @@ CONTRIBUTORS: Nathaniel Clark Nathaniel Wesley Filardo Nathan Lewis + nav1s Nav Ravindranath Neal Gompa (ニール・ゴンパ) Ned Bass @@ -506,6 +517,7 @@ CONTRIBUTORS: Palash Gandhi Patrick Fasano Patrick Mooney + Patrick Xia Patrik Greco Paul B. Henson Paul Dagnelie @@ -605,6 +617,7 @@ CONTRIBUTORS: Shengqi Chen SHENGYI HONG Shen Yan + Shreshth Srivastava Sietse Simon Guest Simon Howard @@ -665,6 +678,7 @@ CONTRIBUTORS: Toyam Cox Trevor Bautista Trey Dockendorf + trick2011 Troels Nørgaard tstabrawa Tulsi Jain diff --git a/sys/contrib/openzfs/META b/sys/contrib/openzfs/META index 2bfa51841cc4..da43a41ab824 100644 --- a/sys/contrib/openzfs/META +++ b/sys/contrib/openzfs/META @@ -2,7 +2,7 @@ Meta: 1 Name: zfs Branch: 1.0 Version: 2.4.0 -Release: rc3 +Release: rc4 Release-Tags: relext License: CDDL Author: OpenZFS diff --git a/sys/contrib/openzfs/README.md b/sys/contrib/openzfs/README.md index a90736bb56b7..a39b88fedd12 100644 --- a/sys/contrib/openzfs/README.md +++ b/sys/contrib/openzfs/README.md @@ -10,7 +10,7 @@ This repository contains the code for running OpenZFS on Linux and FreeBSD. # Official Resources * [Documentation](https://openzfs.github.io/openzfs-docs/) - for using and developing this repo - * [ZoL Site](https://zfsonlinux.org) - Linux release info & links + * [ZoL site](https://zfsonlinux.org) - Linux release info & links * [Mailing lists](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html) * [OpenZFS site](https://openzfs.org/) - for conference videos and info on other platforms (illumos, OSX, Windows, etc) diff --git a/sys/contrib/openzfs/autogen.sh b/sys/contrib/openzfs/autogen.sh index 39eb82203d69..5cb152474698 100755 --- a/sys/contrib/openzfs/autogen.sh +++ b/sys/contrib/openzfs/autogen.sh @@ -1,62 +1,3 @@ #!/bin/sh -[ "${0%/*}" = "$0" ] || cd "${0%/*}" || exit -# %reldir%/%canon_reldir% (%D%/%C%) only appeared in automake 1.14, but RHEL/CentOS 7 has 1.13.4 -# This is an (overly) simplistic preprocessor that papers around this for the duration of the generation step, -# and can be removed once support for CentOS 7 is dropped -automake --version | awk '{print $NF; exit}' | ( - IFS=. read -r AM_MAJ AM_MIN _ - [ "$AM_MAJ" -gt 1 ] || [ "$AM_MIN" -ge 14 ] -) || { - process_root() { - root="$1"; shift - - grep -q '%[CD]%' "$root/Makefile.am" || return - find "$root" -name Makefile.am "$@" | while read -r dir; do - dir="${dir%/Makefile.am}" - grep -q '%[CD]%' "$dir/Makefile.am" || continue - - reldir="${dir#"$root"}" - reldir="${reldir#/}" - - canon_reldir="$(printf '%s' "$reldir" | tr -C 'a-zA-Z0-9@_' '_')" - - reldir_slash="$reldir/" - canon_reldir_slash="${canon_reldir}_" - [ -z "$reldir" ] && reldir_slash= - [ -z "$reldir" ] && canon_reldir_slash= - - echo "$dir/Makefile.am" >&3 - sed -i~ -e "s:%D%/:$reldir_slash:g" -e "s:%D%:$reldir:g" \ - -e "s:%C%_:$canon_reldir_slash:g" -e "s:%C%:$canon_reldir:g" "$dir/Makefile.am" - done 3>>"$substituted_files" - } - - rollback() { - while read -r f; do - mv "$f~" "$f" - done < "$substituted_files" - rm -f "$substituted_files" - } - - - echo "Automake <1.14; papering over missing %reldir%/%canon_reldir% support" >&2 - - substituted_files="$(mktemp)" - trap rollback EXIT - - roots="$(sed '/Makefile$/!d;/module/d;s:^\s*:./:;s:/Makefile::;/^\.$/d' configure.ac)" - - IFS=" -" - for root in $roots; do - root="${root#./}" - process_root "$root" - done - - set -f - # shellcheck disable=SC2086,SC2046 - process_root . $(printf '!\n-path\n%s/*\n' $roots) -} - -autoreconf -fiv && rm -rf autom4te.cache +autoreconf -fiv "$(dirname "$0")" && rm -rf "$(dirname "$0")"/autom4te.cache diff --git a/sys/contrib/openzfs/cmd/zdb/zdb.c b/sys/contrib/openzfs/cmd/zdb/zdb.c index 2560ad045db3..fa8e7fa691db 100644 --- a/sys/contrib/openzfs/cmd/zdb/zdb.c +++ b/sys/contrib/openzfs/cmd/zdb/zdb.c @@ -7899,11 +7899,11 @@ zdb_set_skip_mmp(char *target) * Disable the activity check to allow examination of * active pools. */ - mutex_enter(&spa_namespace_lock); + spa_namespace_enter(FTAG); if ((spa = spa_lookup(target)) != NULL) { spa->spa_import_flags |= ZFS_IMPORT_SKIP_MMP; } - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); } #define BOGUS_SUFFIX "_CHECKPOINTED_UNIVERSE" @@ -10022,13 +10022,13 @@ main(int argc, char **argv) * try opening the pool after clearing the * log state. */ - mutex_enter(&spa_namespace_lock); + spa_namespace_enter(FTAG); if ((spa = spa_lookup(target)) != NULL && spa->spa_log_state == SPA_LOG_MISSING) { spa->spa_log_state = SPA_LOG_CLEAR; error = 0; } - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); if (!error) { error = spa_open_rewind(target, &spa, diff --git a/sys/contrib/openzfs/cmd/zfs/zfs_project.c b/sys/contrib/openzfs/cmd/zfs/zfs_project.c index fbf5e6cbdc68..8925e6672bef 100644 --- a/sys/contrib/openzfs/cmd/zfs/zfs_project.c +++ b/sys/contrib/openzfs/cmd/zfs/zfs_project.c @@ -145,11 +145,11 @@ zfs_project_handle_one(const char *name, zfs_project_control_t *zpc) switch (zpc->zpc_op) { case ZFS_PROJECT_OP_LIST: (void) printf("%5u %c %s\n", fsx.fsx_projid, - (fsx.fsx_xflags & ZFS_PROJINHERIT_FL) ? 'P' : '-', name); + (fsx.fsx_xflags & FS_XFLAG_PROJINHERIT) ? 'P' : '-', name); goto out; case ZFS_PROJECT_OP_CHECK: if (fsx.fsx_projid == zpc->zpc_expected_projid && - fsx.fsx_xflags & ZFS_PROJINHERIT_FL) + fsx.fsx_xflags & FS_XFLAG_PROJINHERIT) goto out; if (!zpc->zpc_newline) { @@ -164,29 +164,30 @@ zfs_project_handle_one(const char *name, zfs_project_control_t *zpc) "(%u/%u)\n", name, fsx.fsx_projid, (uint32_t)zpc->zpc_expected_projid); - if (!(fsx.fsx_xflags & ZFS_PROJINHERIT_FL)) + if (!(fsx.fsx_xflags & FS_XFLAG_PROJINHERIT)) (void) printf("%s - project inherit flag is not set\n", name); goto out; case ZFS_PROJECT_OP_CLEAR: - if (!(fsx.fsx_xflags & ZFS_PROJINHERIT_FL) && + if (!(fsx.fsx_xflags & FS_XFLAG_PROJINHERIT) && (zpc->zpc_keep_projid || fsx.fsx_projid == ZFS_DEFAULT_PROJID)) goto out; - fsx.fsx_xflags &= ~ZFS_PROJINHERIT_FL; + fsx.fsx_xflags &= ~FS_XFLAG_PROJINHERIT; if (!zpc->zpc_keep_projid) fsx.fsx_projid = ZFS_DEFAULT_PROJID; break; case ZFS_PROJECT_OP_SET: if (fsx.fsx_projid == zpc->zpc_expected_projid && - (!zpc->zpc_set_flag || fsx.fsx_xflags & ZFS_PROJINHERIT_FL)) + (!zpc->zpc_set_flag || + fsx.fsx_xflags & FS_XFLAG_PROJINHERIT)) goto out; fsx.fsx_projid = zpc->zpc_expected_projid; if (zpc->zpc_set_flag) - fsx.fsx_xflags |= ZFS_PROJINHERIT_FL; + fsx.fsx_xflags |= FS_XFLAG_PROJINHERIT; break; default: ASSERT(0); @@ -194,11 +195,30 @@ zfs_project_handle_one(const char *name, zfs_project_control_t *zpc) } ret = ioctl(fd, ZFS_IOC_FSSETXATTR, &fsx); - if (ret) + if (ret) { (void) fprintf(stderr, gettext("failed to set xattr for %s: %s\n"), name, strerror(errno)); + if (errno == ENOTSUP) { + char *kver = zfs_version_kernel(); + /* + * Special case: a module/userspace version mismatch can + * return ENOTSUP due to us fixing the XFLAGs bits in + * #17884. In that case give a hint to the user that + * they should take action to make the versions match. + */ + if (strcmp(kver, ZFS_META_ALIAS) != 0) { + fprintf(stderr, + gettext("Warning: The zfs module version " + "(%s) and userspace\nversion (%s) do not " + "match up. This may be the\ncause of the " + "\"Operation not supported\" error.\n"), + kver, ZFS_META_ALIAS); + } + } + } + out: close(fd); return (ret); diff --git a/sys/contrib/openzfs/cmd/zpool/zpool_main.c b/sys/contrib/openzfs/cmd/zpool/zpool_main.c index 1feec55c0e8b..18952775bcfe 100644 --- a/sys/contrib/openzfs/cmd/zpool/zpool_main.c +++ b/sys/contrib/openzfs/cmd/zpool/zpool_main.c @@ -494,8 +494,7 @@ get_usage(zpool_help_t idx) "[--json-int, --json-pool-key-guid]] ...\n" "\t [-T d|u] [pool] [interval [count]]\n")); case HELP_PREFETCH: - return (gettext("\tprefetch -t [] \n" - "\t -t ddt \n")); + return (gettext("\tprefetch [-t ] \n")); case HELP_OFFLINE: return (gettext("\toffline [--power]|[[-f][-t]] " " ...\n")); @@ -4200,7 +4199,7 @@ zpool_do_checkpoint(int argc, char **argv) #define CHECKPOINT_OPT 1024 /* - * zpool prefetch [] + * zpool prefetch [-t ] * * Prefetchs a particular type of data in the specified pool. */ @@ -4245,20 +4244,27 @@ zpool_do_prefetch(int argc, char **argv) poolname = argv[0]; - argc--; - argv++; - - if (strcmp(typestr, "ddt") == 0) { - type = ZPOOL_PREFETCH_DDT; - } else { - (void) fprintf(stderr, gettext("unsupported prefetch type\n")); - usage(B_FALSE); - } - if ((zhp = zpool_open(g_zfs, poolname)) == NULL) return (1); - err = zpool_prefetch(zhp, type); + if (typestr == NULL) { + /* Prefetch all types */ + err = zpool_prefetch(zhp, ZPOOL_PREFETCH_DDT); + if (err == 0) + err = zpool_prefetch(zhp, ZPOOL_PREFETCH_BRT); + } else { + if (strcmp(typestr, "ddt") == 0) { + type = ZPOOL_PREFETCH_DDT; + } else if (strcmp(typestr, "brt") == 0) { + type = ZPOOL_PREFETCH_BRT; + } else { + (void) fprintf(stderr, + gettext("unsupported prefetch type\n")); + zpool_close(zhp); + usage(B_FALSE); + } + err = zpool_prefetch(zhp, type); + } zpool_close(zhp); diff --git a/sys/contrib/openzfs/cmd/ztest.c b/sys/contrib/openzfs/cmd/ztest.c index 89752dcb0f0f..89b1f68606ea 100644 --- a/sys/contrib/openzfs/cmd/ztest.c +++ b/sys/contrib/openzfs/cmd/ztest.c @@ -1228,10 +1228,10 @@ ztest_kill(ztest_shared_t *zs) * See comment above spa_write_cachefile(). */ if (raidz_expand_pause_point != RAIDZ_EXPAND_PAUSE_NONE) { - if (mutex_tryenter(&spa_namespace_lock)) { + if (spa_namespace_tryenter(FTAG)) { spa_write_cachefile(ztest_spa, B_FALSE, B_FALSE, B_FALSE); - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); ztest_scratch_state->zs_raidz_scratch_verify_pause = raidz_expand_pause_point; @@ -1246,9 +1246,9 @@ ztest_kill(ztest_shared_t *zs) return; } } else { - mutex_enter(&spa_namespace_lock); + spa_namespace_enter(FTAG); spa_write_cachefile(ztest_spa, B_FALSE, B_FALSE, B_FALSE); - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); } (void) raise(SIGKILL); @@ -2306,7 +2306,8 @@ ztest_replay_write(void *arg1, void *arg2, boolean_t byteswap) } if (abuf == NULL) { - dmu_write(os, lr->lr_foid, offset, length, data, tx); + dmu_write(os, lr->lr_foid, offset, length, data, tx, + DMU_READ_PREFETCH); } else { memcpy(abuf->b_data, data, length); VERIFY0(dmu_assign_arcbuf_by_dbuf(db, offset, abuf, tx, 0)); @@ -3688,10 +3689,10 @@ ztest_split_pool(ztest_ds_t *zd, uint64_t id) if (error == 0) { (void) printf("successful split - results:\n"); - mutex_enter(&spa_namespace_lock); + spa_namespace_enter(FTAG); show_pool_stats(spa); show_pool_stats(spa_lookup("splitp")); - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); ++zs->zs_splits; --zs->zs_mirrors; } @@ -3975,11 +3976,11 @@ raidz_scratch_verify(void) kernel_init(SPA_MODE_READ); - mutex_enter(&spa_namespace_lock); + spa_namespace_enter(FTAG); spa = spa_lookup(ztest_opts.zo_pool); ASSERT(spa); spa->spa_import_flags |= ZFS_IMPORT_SKIP_MMP; - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); VERIFY0(spa_open(ztest_opts.zo_pool, &spa, FTAG)); @@ -5243,7 +5244,8 @@ ztest_dmu_read_write(ztest_ds_t *zd, uint64_t id) * We've verified all the old bufwads, and made new ones. * Now write them out. */ - dmu_write(os, packobj, packoff, packsize, packbuf, tx); + dmu_write(os, packobj, packoff, packsize, packbuf, tx, + DMU_READ_PREFETCH); if (freeit) { if (ztest_opts.zo_verbose >= 7) { @@ -5258,7 +5260,8 @@ ztest_dmu_read_write(ztest_ds_t *zd, uint64_t id) " txg %"PRIx64"\n", bigoff, bigsize, txg); } - dmu_write(os, bigobj, bigoff, bigsize, bigbuf, tx); + dmu_write(os, bigobj, bigoff, bigsize, bigbuf, tx, + DMU_READ_PREFETCH); } dmu_tx_commit(tx); @@ -5513,7 +5516,8 @@ ztest_dmu_read_write_zcopy(ztest_ds_t *zd, uint64_t id) * We've verified all the old bufwads, and made new ones. * Now write them out. */ - dmu_write(os, packobj, packoff, packsize, packbuf, tx); + dmu_write(os, packobj, packoff, packsize, packbuf, tx, + DMU_READ_PREFETCH); if (ztest_opts.zo_verbose >= 7) { (void) printf("writing offset %"PRIx64" size %"PRIx64"" " txg %"PRIx64"\n", @@ -6119,7 +6123,8 @@ ztest_dmu_commit_callbacks(ztest_ds_t *zd, uint64_t id) "future leak: got %"PRIu64", open txg is %"PRIu64"", old_txg, txg); - dmu_write(os, od->od_object, 0, sizeof (uint64_t), &txg, tx); + dmu_write(os, od->od_object, 0, sizeof (uint64_t), &txg, tx, + DMU_READ_PREFETCH); (void) mutex_enter(&zcl.zcl_callbacks_lock); @@ -7422,11 +7427,11 @@ ztest_walk_pool_directory(const char *header) if (ztest_opts.zo_verbose >= 6) (void) puts(header); - mutex_enter(&spa_namespace_lock); + spa_namespace_enter(FTAG); while ((spa = spa_next(spa)) != NULL) if (ztest_opts.zo_verbose >= 6) (void) printf("\t%s\n", spa_name(spa)); - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); } static void @@ -8541,11 +8546,11 @@ ztest_run(ztest_shared_t *zs) /* * Verify that we can loop over all pools. */ - mutex_enter(&spa_namespace_lock); + spa_namespace_enter(FTAG); for (spa = spa_next(NULL); spa != NULL; spa = spa_next(spa)) if (ztest_opts.zo_verbose > 3) (void) printf("spa_next: found %s\n", spa_name(spa)); - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); /* * Verify that we can export the pool and reimport it under a diff --git a/sys/contrib/openzfs/config/deb.am b/sys/contrib/openzfs/config/deb.am index 9e58e1905b73..3e9a9379712e 100644 --- a/sys/contrib/openzfs/config/deb.am +++ b/sys/contrib/openzfs/config/deb.am @@ -58,9 +58,9 @@ deb-utils: deb-local rpm-utils-initramfs pkg1=$${name}-$${version}.$${arch}.rpm; \ pkg2=libnvpair3-$${version}.$${arch}.rpm; \ pkg3=libuutil3-$${version}.$${arch}.rpm; \ - pkg4=libzfs6-$${version}.$${arch}.rpm; \ - pkg5=libzpool6-$${version}.$${arch}.rpm; \ - pkg6=libzfs6-devel-$${version}.$${arch}.rpm; \ + pkg4=libzfs7-$${version}.$${arch}.rpm; \ + pkg5=libzpool7-$${version}.$${arch}.rpm; \ + pkg6=libzfs7-devel-$${version}.$${arch}.rpm; \ pkg7=$${name}-test-$${version}.$${arch}.rpm; \ pkg8=$${name}-dracut-$${version}.noarch.rpm; \ pkg9=$${name}-initramfs-$${version}.$${arch}.rpm; \ @@ -72,7 +72,7 @@ deb-utils: deb-local rpm-utils-initramfs path_prepend=`mktemp -d /tmp/intercept.XXXXXX`; \ echo "#!$(SHELL)" > $${path_prepend}/dh_shlibdeps; \ echo "`which dh_shlibdeps` -- \ - -xlibuutil3linux -xlibnvpair3linux -xlibzfs6linux -xlibzpool6linux" \ + -xlibuutil3linux -xlibnvpair3linux -xlibzfs7linux -xlibzpool7linux" \ >> $${path_prepend}/dh_shlibdeps; \ ## These -x arguments are passed to dpkg-shlibdeps, which exclude the ## Debianized packages from the auto-generated dependencies of the new debs, diff --git a/sys/contrib/openzfs/contrib/debian/Makefile.am b/sys/contrib/openzfs/contrib/debian/Makefile.am index 99d512312df6..3c219856005e 100644 --- a/sys/contrib/openzfs/contrib/debian/Makefile.am +++ b/sys/contrib/openzfs/contrib/debian/Makefile.am @@ -12,14 +12,14 @@ dist_noinst_DATA += %D%/openzfs-libpam-zfs.postinst dist_noinst_DATA += %D%/openzfs-libpam-zfs.prerm dist_noinst_DATA += %D%/openzfs-libuutil3.docs dist_noinst_DATA += %D%/openzfs-libuutil3.install.in -dist_noinst_DATA += %D%/openzfs-libzfs6.docs -dist_noinst_DATA += %D%/openzfs-libzfs6.install.in +dist_noinst_DATA += %D%/openzfs-libzfs7.docs +dist_noinst_DATA += %D%/openzfs-libzfs7.install.in dist_noinst_DATA += %D%/openzfs-libzfsbootenv1.docs dist_noinst_DATA += %D%/openzfs-libzfsbootenv1.install.in dist_noinst_DATA += %D%/openzfs-libzfs-dev.docs dist_noinst_DATA += %D%/openzfs-libzfs-dev.install.in -dist_noinst_DATA += %D%/openzfs-libzpool6.docs -dist_noinst_DATA += %D%/openzfs-libzpool6.install.in +dist_noinst_DATA += %D%/openzfs-libzpool7.docs +dist_noinst_DATA += %D%/openzfs-libzpool7.install.in dist_noinst_DATA += %D%/openzfs-python3-pyzfs.install dist_noinst_DATA += %D%/openzfs-zfs-dkms.config dist_noinst_DATA += %D%/openzfs-zfs-dkms.dkms diff --git a/sys/contrib/openzfs/contrib/debian/clean b/sys/contrib/openzfs/contrib/debian/clean index 4f52d01b8108..caabcd30c62a 100644 --- a/sys/contrib/openzfs/contrib/debian/clean +++ b/sys/contrib/openzfs/contrib/debian/clean @@ -6,6 +6,6 @@ contrib/pyzfs/libzfs_core/bindings/__pycache__/ contrib/pyzfs/pyzfs.egg-info/ debian/openzfs-libnvpair3.install debian/openzfs-libuutil3.install -debian/openzfs-libzfs6.install +debian/openzfs-libzfs7.install debian/openzfs-libzfs-dev.install -debian/openzfs-libzpool6.install +debian/openzfs-libzpool7.install diff --git a/sys/contrib/openzfs/contrib/debian/control b/sys/contrib/openzfs/contrib/debian/control index c5358dedc0fd..a886c2e86cc5 100644 --- a/sys/contrib/openzfs/contrib/debian/control +++ b/sys/contrib/openzfs/contrib/debian/control @@ -79,9 +79,9 @@ Architecture: linux-any Depends: libssl-dev | libssl1.0-dev, openzfs-libnvpair3 (= ${binary:Version}), openzfs-libuutil3 (= ${binary:Version}), - openzfs-libzfs6 (= ${binary:Version}), + openzfs-libzfs7 (= ${binary:Version}), openzfs-libzfsbootenv1 (= ${binary:Version}), - openzfs-libzpool6 (= ${binary:Version}), + openzfs-libzpool7 (= ${binary:Version}), ${misc:Depends} Replaces: libzfslinux-dev Conflicts: libzfslinux-dev @@ -91,18 +91,18 @@ Description: OpenZFS filesystem development files for Linux libraries of OpenZFS filesystem. . *** 5226 LINES SKIPPED *** From nobody Wed Nov 19 21:44:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkm1WS7z6JJrF for ; Wed, 19 Nov 2025 21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkl6Wprz3CJr for ; Wed, 19 Nov 2025 21:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588672; 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=FHtW8NJtFy7+Tw4sR8O+g7+xj59mWKPLHfapSIaaRxY=; b=ISDpJuvkBxXHOVEixs9rkluvk4wO8+KEQpCgPwB/BRWUXE4ZEhPbbXejA+BTiGZAcKuUty Sg9DtcNJaceL9i3FZdv3jg/mef/TwN6aaO/iIk5iqIC4So1fUrNMLYem45LX+lsMVxu0eL YM4fywYEcH3mmg0oEUJQTdvr13LNoQdQnd+YGt6Y5y9uBYF6KWTS8lERNtmAKgjPcDxRWK dNEQz8jFNUSiufXPSR6bqVRx3UcCdsak6SNikj0hNsjMUy8hdmwozdWzMi3HMqxw/Ba0pH 6I5uPQHwdKcVU+IgxBRjLVNmCcrx7HmT2e2ytfHvU3v4109wGgl2L0xl+kE4+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588672; 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=FHtW8NJtFy7+Tw4sR8O+g7+xj59mWKPLHfapSIaaRxY=; b=U7hLgwj9nGUG2OFawcp0tq6S9RHXFQK2COs/KwuhiPO3/VQS9B01HKlO2iLrpTlx0qfq4L hxCPc2ZcdnN29kSLLNYaiQ7eFQu0Z1W1RVzkNGQPIGhjq9RrrGYAGS9bFd+emhJPgb2MWL HAYezSMUcgIbJ0wOYkgDkSXgD68TzThOTfgxCUQwgED6lIqFOFNGCQmlXpCChIhHKCZZVd 4beor5N6bCeFTHn0pBTod6X5ojabETdRu4sH22Fqeq2eqLHmipFw7TGAOfVWO7kapci9io I52DTRqlAFS3sqjOM2fmaUokZNP7jburFjsQ6SxnzF4mjaane3TGFSvruTnP2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588672; a=rsa-sha256; cv=none; b=FgNl9AJRFQMevvneTSjeNjUX5k33tD6R6oMRMNPZmpZ4oQq1E0KIxF1QBgD4TRsPiUBeuN fu4syT30iDYEoNHIfgy2Hghh8H4AblMk6i8uQGL3yhAENl87/jgdpRZs4ppyEnQzrgKeHY L+Yk7/i5iiP0APUJbUbmZLMmOzY1Z8BljCVFdOGGNICf/jh6ZVmmJPhJrPFVjoBldBU4Kc yUQIMKE/0cl+5SIuRmZiodvDFVgTMHs/jOjBqYg3hJ06vYvbssH8YiLow82m5WLS7JuTWH gQ4vrqA7B4v6k0hlqkHugzx2xgOgIf9iu93M1nASVgTxbs0KVlWv4nR6FWxD2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkl63mjzxNZ for ; Wed, 19 Nov 2025 21:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33432 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Martin Matuska From: Colin Percival Subject: git: d10ce383bc19 - releng/15.0 - zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.4.0-rc4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: d10ce383bc195c11fc105d76f1dfaf4e1ed46f71 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:31 +0000 Message-Id: <691e3a3f.33432.6cc34927@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d10ce383bc195c11fc105d76f1dfaf4e1ed46f71 commit d10ce383bc195c11fc105d76f1dfaf4e1ed46f71 Author: Martin Matuska AuthorDate: 2025-11-18 11:58:55 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:36:59 +0000 zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.4.0-rc4 While here, fix compilation be unhiding zfs_tunables hidden in 5714090fb Approved by: re (cperciva) (cherry picked from commit 7128544353ac76cf0acfd02b327dec8e8f7faf1d) --- sys/contrib/openzfs/lib/libspl/include/sys/tunables.h | 3 ++- sys/modules/zfs/zfs_config.h | 4 ++-- sys/modules/zfs/zfs_gitrev.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h b/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h index c85400f6fd28..0ce348669bfe 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h @@ -25,7 +25,8 @@ */ #ifndef _SYS_TUNABLES_H -#define _SYS_TUNABLES_H extern __attribute__((visibility("hidden"))) +//#define _SYS_TUNABLES_H extern __attribute__((visibility("hidden"))) +#define _SYS_TUNABLES_H extern typedef enum { ZFS_TUNABLE_TYPE_INT, diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 339182042915..446c5c1a12cd 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -856,7 +856,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.4.0-rc3-FreeBSD_g814f9afba" +#define ZFS_META_ALIAS "zfs-2.4.0-rc4-FreeBSD_g099f69ff5" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -886,7 +886,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "rc3-FreeBSD_g814f9afba" +#define ZFS_META_RELEASE "rc4-FreeBSD_g099f69ff5" /* Define the project version. */ #define ZFS_META_VERSION "2.4.0" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index ba87aecc9751..cedd706372c4 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.4.0-rc3-0-g814f9afba" +#define ZFS_META_GITREV "zfs-2.4.0-rc4-0-g099f69ff5" From nobody Wed Nov 19 21:44:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkn400rz6JKCq for ; Wed, 19 Nov 2025 21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkn0RgTz3CPw for ; Wed, 19 Nov 2025 21: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=1763588673; 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=fiwndPfrlByFyyXk6+HqtjfNRBvh6FTRYh59jWwIzvo=; b=X9S4sYeu5Jh+TLdvZr0J58pH/AYbxQioeYtVCZf5W68fe/M/8dd+qSbctYz/QEqGc5blKo q01L5eWRJugLerklc/7SxKEsSvpw4gnEUye9nt/lytAsnIfWPo+PdGPiQLVD4FWTiOwEBN LZgcM0J7AV4njHWKMZdHFenZc6fV0LJ14mGBPe2Qzq4rlYLrHPEMF9xecgkt29FadXT6WR +lxj+bGpxfaOtdzP/dgrCEWm6DUIU6Etzr5Dcq2iee9H8ck9kq7fBTTsiLqXlvhr0addiu Nu3POnE3k0f1Dy4EVOCkBEfqmQ7mHDgAHXakstchEhcv3h8JuM/uZHLEYog7EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588673; 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=fiwndPfrlByFyyXk6+HqtjfNRBvh6FTRYh59jWwIzvo=; b=hTs97hyxavRFCzpjnjnCDcjqXGVX1vpkCJD0uVcMi62OkKOh4bpcs8iv8AF8zqVdWcDE1f mOiWt2LCukcsTHCT9kM6Sv6nUph6LluZLaZPz2vvb3+Pb4WfP8z5MInMwoFh7ruYb1q0tb oLGANDnnvA3of6cROxET49tcypW5WKRmIcFcDX6ZRH75lO7C9eGNmz5Z268aXxlT3qAZ3q VyOAM931GQ8HQB/Euce/d2nPnVCQNTdQfPbDw8FVUpKR0b8zgexpFDm6HE4b5k70LHD+nX BqyFwEnb07DlS2i+jWl4IMBXHobDHMnIau8pW7RwAePcM73MLKGjDuzSM0Gpzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588673; a=rsa-sha256; cv=none; b=qM18zBZ5g34Y7UAKv4yUmxXr3QyUlLFnFJU8SNXZQ+68aq/rDe3J9VtvTMU3FNGCGgw4iL oQsRfu6yXdOgj9if+/al2zBH2jI4Fji+z0q04aiCKo5vLECgu25GIGN+KKP5wu7U5xQygZ 6t2gyaDciTGBeT/9byLnnGUM9JGEKuYCPb0X38JUmNVK/j+4C+B9yOx1BG4ggMl3bwz8af PO4jap679SBNBdQT5HQB+DyBgg2ray+nsjxCdJhEmvD7JOPczvDa64nJ89U5r1rsqF3Y2i aHLr0RMRIwaZuRf62b/z5TJptBtSEmAxMnJcvw+P4BkyLJU7VoVXbU9VDaAmDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkm6Pbvzxm2 for ; Wed, 19 Nov 2025 21:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 328f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Martin Matuska From: Colin Percival Subject: git: c30f4ada165c - releng/15.0 - zfs: fix aarch64 build after zfs-2.4.0-rc4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c30f4ada165c85a25f782549b84efc3b3e655ecd Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:32 +0000 Message-Id: <691e3a40.328f5.60b8b933@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c30f4ada165c85a25f782549b84efc3b3e655ecd commit c30f4ada165c85a25f782549b84efc3b3e655ecd Author: Martin Matuska AuthorDate: 2025-11-17 19:15:33 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:03 +0000 zfs: fix aarch64 build after zfs-2.4.0-rc4 Approved by: re (cperciva) (cherry picked from commit fb709935d64d5fd4ad21cf8c69faf580760999e4) (cherry picked from commit 484fa40ca71bc9c00ee6d3729e5e27cc5d68e131) --- sys/modules/zfs/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index ec531ed646a7..7a4d0bb51376 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -475,8 +475,6 @@ CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICA CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} .if ${MACHINE_ARCH} == "aarch64" -__ZFS_ZSTD_AARCH64_FLAGS= -include ${SRCDIR}/zstd/include/aarch64_compat.h -CFLAGS.zstd.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.error_private.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.fse_compress.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} From nobody Wed Nov 19 21:44:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkp3G65z6JJtQ for ; Wed, 19 Nov 2025 21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkp0RWbz3CMZ for ; Wed, 19 Nov 2025 21: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=1763588674; 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=m5+tZv+eCEb2y61I3FFAdqRljNf+SVyb4rgjFSDM6ZM=; b=coaC04TZ3K8jlfmB7eMnAbXbQ9MA8BdSQ6OMbx1vHnl6Knw9iMwPqAU/OEh1bPpCMhGG1Q 9n9f5R7qPSYoW/5x8LMIr6ecUygufl8egdKC9aTNUK3CK2HNI0zNW8nQ0hhIie6rF03MT7 038upaT4JOlC473RQjhMSdi4lDJjPMDx/BKcq0QK+KwJrLQ/NzVmJ/aBT8bXo6b58PBJQx 236R4SpP+9KPPe7zCb/tRwlamoI6ZCfuPlhi3VLtsolJpnNDtR0e8v7QI/Jhd6CwSyJXtR I+CTSCXK5ZyVAOaqBmzjRwWPYvsgHl4CZjTiLRu7qhFmMDZq3XcIPTXuh8PV8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588674; 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=m5+tZv+eCEb2y61I3FFAdqRljNf+SVyb4rgjFSDM6ZM=; b=UKCW91J5sOdRO4fuVjLVCqPLXl+1wv4tGBl9ke3UOJZcrCFygR1on6teohQ1V+EK20rI6l cN7vSTbA6fPpPcKWRAAW7KF2+caGD4zE8oap2GCAjOaZpkMdLCMvt02aDeVcR5vx39XRWZ bng3IX83oxcTN9gA0+w/z/B6Mv4XHWnu1p1KX1w45Vncm19Hk43CoHfF5I6wnHa66LYTu7 7JmnhK1E4dBqEPjF6bXyCvJt0oBrQtiP/oCPKeyKzk1vLIUzQIteGACzIz3MiAlAdWqZcn ZnEMU6LrG6idVMbuHo5etdhGuYaSxzEdbE/UrcN/3xg8E93xZSKxHBA8geQB2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588674; a=rsa-sha256; cv=none; b=aQW7+xJupRPRWRvCq/es2Q9qSPX7sPEOdzhAnd+tqty5H/xi2mEpT9z+pUl4viWakLDKW0 fY/qjsc8j06rsMRhzaIRSF/bLigNO9iydIdROF3p8eZvugRjYX6+8cfcs6KyDnuGwJVpIJ ksmh5/MsPpeWx2QQQkhDg0gBwEsHZwgKFtbm+liEPYGrLowudbTfBC9Lgi4NIGzkqSghdt 9pfLtmteNaN2YZi4Fw0gQzvZ+Nemxjhlo8gqIvktaH26iBsTcEZxTDTVrTDIBzRYYZcT6b ejBRotU4ZJz6gCByujr5nJAr5LG17PHyQvqpOmJ2QRvdiKt4pHYluF5uf0tcvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkn6wpHzxfw for ; Wed, 19 Nov 2025 21:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 314f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Warner Losh From: Colin Percival Subject: git: 7b31e6a121c7 - releng/15.0 - nvme: Fix backwards sense of error condition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 7b31e6a121c788829d5546f6474a250770c1609e Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:33 +0000 Message-Id: <691e3a41.314f0.4db050ad@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7b31e6a121c788829d5546f6474a250770c1609e commit 7b31e6a121c788829d5546f6474a250770c1609e Author: Warner Losh AuthorDate: 2025-11-18 20:07:11 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:05 +0000 nvme: Fix backwards sense of error condition b21e67875bf0c tested for the good condition, not the error condition, so we'd never do anything else in this function. This was causing certain logging not to happen, and also prevented forthcoming namespace size change code from working as well. Approved by: re (cperciva) Fixes: b21e67875bf0c Sponsored by: Netflix (cherry picked from commit 27481c268916b0790c7ad16202a5b012625ce1a8) (cherry picked from commit fd737810a16329449d9ceb1e77e5429fdbb51953) --- sys/dev/nvme/nvme_ctrlr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 6ed9cb33f991..07c1bcdfbf08 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1153,7 +1153,7 @@ nvme_ctrlr_aer_task(void *arg, int pending) mtx_sleep(aer, &aer->mtx, PRIBIO, "nvme_pt", 0); mtx_unlock(&aer->mtx); - if (aer->log_page_size != (uint32_t)-1) { + if (aer->log_page_size == (uint32_t)-1) { /* * If the log page fetch for some reason completed with an * error, don't pass log page data to the consumers. In From nobody Wed Nov 19 21:44:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkq33dlz6JJwd for ; Wed, 19 Nov 2025 21: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkq0nYWz3CMt for ; Wed, 19 Nov 2025 21: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=1763588675; 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=28G6CgAWeYeqpl5NaOKQ9kGAVHNK7ftmXb5Nhk5+t8I=; b=IIGcXnLfGn9g64XHFuDS8lJhXtNWOOSPhC/C6Qwk0l6ZDr4imIk84tvKAuaepwpr9Zv4EO aX0TtJWWNim2l+8FV58vpBuqcM84M73W3Zq3d2Cfp2cFYJFqWZK2Fx6521jgzEghXE2MO0 VgNz0VY+0ct5mmdfj/24/l2qd5s1QbZ2BUBb69+BQ61sJT6dDe+H2J1ItiqUPZX75bduyf cS49DLpNKwHxTPThVXNkpz+8oXzvS85Fk+eF+5LOXDX8hymMnBQWRuqWM0UzsNHzXIv4eD RJqlO7yamijTqU0Fp1i6SbAo7Q1VH3R0ZoZaJlveAictNN1YIGjS7HobmhYS+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588675; 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=28G6CgAWeYeqpl5NaOKQ9kGAVHNK7ftmXb5Nhk5+t8I=; b=Fp2wUw8VO5r4v0dgC9j2YkckpPPN+A0HLmHBmXxl7V05gyL66qBCL+a6WPLtfSXeY4OCAD VxeYvs+TayX2PJ9ZnbSy8l+usTynwCZaAgf2sgKDl2Vy5m+f1cv6/AzZ0iyqptZ8Ucb48B R/kmGG/rLWkot1Gbx1o+rfqr3NiTWKLSMjjUwOviqjd2IYpUGh9JCvRmx7opVtqcaFkpsm kEGsudnHK1iWK/fJXQ7ZY1ZkcCYkYEAj8fOoR5nnGAw/8EMYZHtbG7fCpy/UazkWE7VG4N r5NHWF8b13p15Q5SbFQE00QCDB5f3EMTCjYsZ6EzR0GnnCFkjamtn/GXRk3q7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588675; a=rsa-sha256; cv=none; b=i1v9z1Av6Wg1z2zmAWEqthWQQvLPr6BQSOZg7Tc5nbhl0zRmh7gzi5uTavELIZvzKzaY9B 3DqhnYYW7cveNC76dnyLd5QAgGPFSGlxBhIAJf6+1IUYFtYILrGruAC5rnjQhUxhjjB7v3 2EAyXeQkacG5yNmnOBcUogBWkqZD4ErilXuCqViFIrW/EF7RbnV0XrMRP2++wS9L7gKX6o uifj/8P8rROgKiTMf6SKucvMSbV2vc83RWe3zS1/pRh7EA5LGwEWmMU09h7h8n3p6zhLcN 9NO4a/0NRc//beHdHnvr/BWdPMk0z605c6qbPMYXWgBuwu+E+5NnzORTZj0hkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkq0HY3zxNb for ; Wed, 19 Nov 2025 21:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33e5c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Colin Percival Subject: git: 2c5edd4860b2 - releng/15.0 - nvme: Notify namespace changes better List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 2c5edd4860b2a1912f987557dfa09bae3c322d36 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:35 +0000 Message-Id: <691e3a43.33e5c.30af149a@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2c5edd4860b2a1912f987557dfa09bae3c322d36 commit 2c5edd4860b2a1912f987557dfa09bae3c322d36 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:09 +0000 nvme: Notify namespace changes better When we get a namespace notification, we have to reconstrut the namespace to get the new identification data from the namespace. For each namespace in the AEN, we will reconstrict it before we call the notification. We also flag it as changed for the duration of the change callback (prior versions of the patch needed to keep track, but we no longer do, so this bit may be removed). Note when we've seen the namespace so we can notify when it goes away. Approved by: re (cperciva) Co-authored-by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit 20e94950c54e398049396647da36b9e2c3b639c1) (cherry picked from commit fe6ee00d174e0d7f4c7a38db9af7b94c56579054) --- sys/dev/nvme/nvme.h | 7 +++++-- sys/dev/nvme/nvme_ctrlr.c | 12 +++++++++++- sys/dev/nvme/nvme_ns.c | 9 ++++++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 17c5cdb4db87..8e69c0ffe339 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1930,8 +1930,11 @@ typedef void (*nvme_cons_async_fn_t)(void *, const struct nvme_completion *, typedef void (*nvme_cons_fail_fn_t)(void *); enum nvme_namespace_flags { - NVME_NS_DEALLOCATE_SUPPORTED = 0x1, - NVME_NS_FLUSH_SUPPORTED = 0x2, + NVME_NS_DEALLOCATE_SUPPORTED = 0x01, + NVME_NS_FLUSH_SUPPORTED = 0x02, + NVME_NS_ADDED = 0x04, + NVME_NS_CHANGED = 0x08, + NVME_NS_GONE = 0x10, }; int nvme_ctrlr_passthrough_cmd(struct nvme_controller *ctrlr, diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 07c1bcdfbf08..63b8643d97d7 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1216,10 +1216,20 @@ nvme_ctrlr_aer_task(void *arg, int pending) } else if (aer->log_page_id == NVME_LOG_CHANGED_NAMESPACE) { struct nvme_ns_list *nsl = (struct nvme_ns_list *)aer->log_page_buffer; + struct nvme_controller *ctrlr = aer->ctrlr; + for (int i = 0; i < nitems(nsl->ns) && nsl->ns[i] != 0; i++) { + struct nvme_namespace *ns; + uint32_t id = nsl->ns[i]; + if (nsl->ns[i] > NVME_MAX_NAMESPACES) break; - nvme_notify_ns(aer->ctrlr, nsl->ns[i]); + + ns = &ctrlr->ns[id - 1]; + ns->flags |= NVME_NS_CHANGED; + nvme_ns_construct(ns, id, ctrlr); + nvme_notify_ns(ctrlr, id); + ns->flags &= ~NVME_NS_CHANGED; } } diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index e84d2066930e..21d7965bf7a6 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -78,7 +78,7 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, break; case NVME_PASSTHROUGH_CMD: pt = (struct nvme_pt_command *)arg; - return (nvme_ctrlr_passthrough_cmd(ctrlr, pt, ns->id, + return (nvme_ctrlr_passthrough_cmd(ctrlr, pt, ns->id, 1 /* is_user_buffer */, 0 /* is_admin_cmd */)); case NVME_GET_NSID: { @@ -557,8 +557,10 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, * standard says the entire id will be zeros, so this is a * cheap way to test for that. */ - if (ns->data.nsze == 0) - return (ENXIO); + if (ns->data.nsze == 0) { + ns->flags |= NVME_NS_GONE; + return ((ns->flags & NVME_NS_ADDED) ? 0 : ENXIO); + } flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, ns->data.flbas); @@ -622,6 +624,7 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, ns->cdev->si_drv2 = make_dev_alias(ns->cdev, "%sns%d", device_get_nameunit(ctrlr->dev), ns->id); ns->cdev->si_flags |= SI_UNMAPPED; + ns->flags |= NVME_NS_ADDED; return (0); } From nobody Wed Nov 19 21:44:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkr5CrJz6JK38 for ; Wed, 19 Nov 2025 21:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkr1DGxz3CBY for ; Wed, 19 Nov 2025 21:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588676; 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=K7yLCrW6A87SbPTRseU75aJQ+H920CgNhL3UaTtL9hQ=; b=T838uh/0EsKeIOvJrnuZQ62fkk+0uo1HZhqE4PeAitXfKiu5YkwumCi1//JCxxi8YtO675 GZOH1N+TQCo+nMuasFZe+z+c9KKYBVkPJs3F0zqwYDEbjBpkJ4vd/0sbMeYbzy62KKnfKI COVqE+kVv38D4YcOCg/E0/1C5SnZyjemsO/mCQhInC8XfnDVdqUZfIE+pMe1E2pPBiBRQZ DHnZ6V5if+svvHEoQTh7/kjIsJ2/JlYC7ZTDIZDlvWvox/KpFG+Zj+6k1oZejfKbcCt6lS ixtA8B3HugeV3AWF2igxdZQOOUA3uB/EDqSqKiXlmgv8ONNcL8YG05QWlyOAig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588676; 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=K7yLCrW6A87SbPTRseU75aJQ+H920CgNhL3UaTtL9hQ=; b=vz75qanxuJFnw/HV8w9aid5WlAxYrqQhro8VpACCWap3K/jKjGgMCEwxH+17jVRvAhTjtf ssq22MtJ5WWehZ9PbRZE6I3VWfK15CBT0Shgo1Kvl2yC73OLqb2PqItY7GVrkfRDjMMW9J unL4DgRkEa1w0b3OpYb6LhmlswoRRnKFW7719+oiSaIqjsI0Zo8w9uFAihhhRtImXQUzI/ daFrMHjbqsxFnJpE8MU8Cn1jfs9T8KH8wT3NwY1lusvKsPCxe84hJrhr5FnnRkbThURop0 wB0Qr65pDZNSsKhCX5vuLlEPi5xu45p/Ph8nzBr2JP+wdFYCXJ7sDi3sazlAlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588676; a=rsa-sha256; cv=none; b=tOvIlQacdwthpuB2TE37TG4p7Sr+4p8SHpwZv+eVABhVHfiYHEbxl2m3KF0x2Op49LNPQa 3no5Zi7KtOWV4SGcf+wG1rzuCTzxHAQe8kaRRYuuk6XqFLFzf/Z+Q6fgrf/tFLJpoYF2W0 pcFzme+taM0MK7hqvDKYxdMO4ij+Ro3s5R7FMPi2PN7Dyklgr+850BYg11ng8/mOX3Y9qH aroxR35SMjhvEUkqCZxtFzLFT1g2kA9EE0hY0xgt+hzx6i8tK8UCrkkIZc5kbH3S3l0tV4 XsZZD1NDtx1WZBOOY8tS1ttyYOi181tGkbYazd2o4rBD0rcs6rnCChTIDd6cDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkr0jwPzyFG for ; Wed, 19 Nov 2025 21:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 338a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Colin Percival Subject: git: 0ccc71de6284 - releng/15.0 - nvme: Refactor geom setting to function. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 0ccc71de62848366446a86487d36983146609605 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:36 +0000 Message-Id: <691e3a44.338a1.32b68dfa@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0ccc71de62848366446a86487d36983146609605 commit 0ccc71de62848366446a86487d36983146609605 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:12 +0000 nvme: Refactor geom setting to function. Refactor setting of geometry for the disk to its own function. No functional changes. Approved by: re (cperciva) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit dffd882d12d2a71aca464f48209ec9ae6f393b15) (cherry picked from commit 31412fda9fa71d85a19604151d662ac65c301c2a) --- sys/cam/nvme/nvme_da.c | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 1c0d5e8381d8..330f4ca66e1e 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -643,6 +643,35 @@ ndacleanup(struct cam_periph *periph) cam_periph_lock(periph); } +static void +ndasetgeom(struct nda_softc *softc, struct cam_periph *periph) +{ + struct disk *disk = softc->disk; + struct ccb_pathinq cpi; + const struct nvme_namespace_data *nsd; + const struct nvme_controller_data *cd; + uint8_t flbas_fmt, lbads, vwc_present; + + nsd = nvme_get_identify_ns(periph); + cd = nvme_get_identify_cntrl(periph); + + flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas); + lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]); + disk->d_sectorsize = 1 << lbads; + disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); + disk->d_delmaxsize = disk->d_mediasize; + disk->d_flags = DISKFLAG_DIRECT_COMPLETION; + if (nvme_ctrlr_has_dataset_mgmt(cd)) + disk->d_flags |= DISKFLAG_CANDELETE; + vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc); + if (vwc_present) + disk->d_flags |= DISKFLAG_CANFLUSHCACHE; + if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { + disk->d_flags |= DISKFLAG_UNMAPPED_BIO; + softc->unmappedio = 1; + } +} + static void ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg) @@ -846,7 +875,6 @@ ndaregister(struct cam_periph *periph, void *arg) const struct nvme_namespace_data *nsd; const struct nvme_controller_data *cd; char announce_buf[80]; - uint8_t flbas_fmt, lbads, vwc_present; u_int maxio; int quirks; @@ -903,21 +931,8 @@ ndaregister(struct cam_periph *periph, void *arg) else if (maxio > maxphys) maxio = maxphys; /* for safety */ disk->d_maxsize = maxio; - flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas); - lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]); - disk->d_sectorsize = 1 << lbads; - disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); - disk->d_delmaxsize = disk->d_mediasize; - disk->d_flags = DISKFLAG_DIRECT_COMPLETION; - if (nvme_ctrlr_has_dataset_mgmt(cd)) - disk->d_flags |= DISKFLAG_CANDELETE; - vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc); - if (vwc_present) - disk->d_flags |= DISKFLAG_CANFLUSHCACHE; - if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { - disk->d_flags |= DISKFLAG_UNMAPPED_BIO; - softc->unmappedio = 1; - } + ndasetgeom(softc, periph); + /* * d_ident and d_descr are both far bigger than the length of either * the serial or model number strings. From nobody Wed Nov 19 21:44:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZks5sHmz6JJwm for ; Wed, 19 Nov 2025 21:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZks1ztFz3CW1 for ; Wed, 19 Nov 2025 21:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588677; 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=zH65J3yC0vTCgxFVLwqYm2fXKpPSod6HwbeVvz90KQU=; b=q1v/VVwogI5+pNGRhdTAd8YZ3lEecJpBLdTg8Nimj6O5TIy/zuepFpXKUyw6rcBlu2ifQf mYSE5RrvX7bxkraCAlSjUejMPp7gEMHjBU2WImKhej+xIWYpP05SF5hNn1bI6uMed9OWF1 tUWEXY73s2SUEVpFTdhVq+7kFeGJ56koCiS/AnUPVeGuDzeSLifDp8kIC5fr0KkJucqAq4 j1KNcC5Lrpt14OuauiymYiw2MMfaISyrRNWDpejKtw1O4oFpulD3G4OqkxBbFfjJOLtwd0 +dD60OblX8fUoGsZzzpjsCu+fdQSGDJ9p5fYNLwpgsGMbCID9euNG2KrYhmWgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588677; 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=zH65J3yC0vTCgxFVLwqYm2fXKpPSod6HwbeVvz90KQU=; b=PfNJ5d77vxIlv6zrbHOnUiGfy7o5nnpzBiOSYJs9IKl8lWFejiVngQI3cqdlGXsGQBAn+S lKWQXcFpP952rZXHcUSoI4kv4uUsGLqDONHEs+vKTwI9HHM4mStE6tZ6zavXgk9sivpv27 qppYqTRjYOyluelBZq1AsYwHRUxhE3Q495BGXlUbA441ZCZlOCbU9Z7+NgWshtsV6w0Z29 do8q66FRzHGSdCv6gvVdPJAmuRDz2f9OCr+HcdhsuxnJvWdocLF+EokBuUU6Y5YmTle8ud fi9huGPRohgaub3FHdPZL1L+Y+BpdTAlrlONBot5H7LO8qhj0uAAik799EBesQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588677; a=rsa-sha256; cv=none; b=uPwcoDuPb2us/pTflYKW0G4Uv4qGo5Iv85rwa+LDHNr1nCjqmlBzEuG64S+btn2EA42zrc cRKuknILZNmUZ/6oVZQfypmRpMJBevNAd/7uhStjesiutyHqUOJU0sMOy5JWBlY3AkyUGm HHcthLOSwVPfmQdTGu7N8O1v+dvgg6jQkEX3Zc+cqZ1nSXCJKqtH2yr4FmyM3/CMyHJ8OA qRjpg7Zva45hGSoMbfOcKZ15EuGAYHb498cCVVCj4fSXAOFhc+r0LRo1EHmQFR+eMRstmS e9o85PUBhAneX2datDfo9nQoAC295gUTXlNn3UKUtT3NDskcw2+PhdhEF3cL5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZks1FLbzxns for ; Wed, 19 Nov 2025 21:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33c7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Colin Percival Subject: git: ecfb0e51b212 - releng/15.0 - nda: React to namespace change events List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: ecfb0e51b21259a679519d666dbdb52e9b18c539 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:37 +0000 Message-Id: <691e3a45.33c7b.3ddda341@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ecfb0e51b21259a679519d666dbdb52e9b18c539 commit ecfb0e51b21259a679519d666dbdb52e9b18c539 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:15 +0000 nda: React to namespace change events Register for AC_GETDEV_CHANGED. When we receive a namespace notification, we only create a new device if it was unconfigured. If it was configured, generate this async event. Rely on the fact that we reconstruct namespace to just get the data from the identify data and call disk_resised. Approved by: re (cperciva) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit 86d3ec359a56d1b5d015718bd19ef4bda681a032) (cherry picked from commit 9a465b37ea17642d45597d4ee7d3283b02dfa6f0) --- sys/cam/nvme/nvme_da.c | 29 ++++++++++++++++++++--------- sys/cam/nvme/nvme_xpt.c | 2 ++ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 330f4ca66e1e..2eb43809f4b1 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -673,12 +673,11 @@ ndasetgeom(struct nda_softc *softc, struct cam_periph *periph) } static void -ndaasync(void *callback_arg, uint32_t code, - struct cam_path *path, void *arg) +ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg) { - struct cam_periph *periph; + struct cam_periph *periph = callback_arg; + struct nda_softc *softc; - periph = (struct cam_periph *)callback_arg; switch (code) { case AC_FOUND_DEVICE: { @@ -709,17 +708,29 @@ ndaasync(void *callback_arg, uint32_t code, "due to status 0x%x\n", status); break; } + case AC_GETDEV_CHANGED: + { + int error; + + softc = periph->softc; + ndasetgeom(softc, periph); + error = disk_resize(softc->disk, M_NOWAIT); + if (error != 0) { + xpt_print(periph->path, "disk_resize(9) failed, error = %d\n", error); + break; + } + break; + + } case AC_ADVINFO_CHANGED: { uintptr_t buftype; + softc = periph->softc; buftype = (uintptr_t)arg; if (buftype == CDAI_TYPE_PHYS_PATH) { - struct nda_softc *softc; - - softc = periph->softc; disk_attr_changed(softc->disk, "GEOM::physpath", - M_NOWAIT); + M_NOWAIT); } break; } @@ -997,7 +1008,7 @@ ndaregister(struct cam_periph *periph, void *arg) * Register for device going away and info about the drive * changing (though with NVMe, it can't) */ - xpt_register_async(AC_LOST_DEVICE | AC_ADVINFO_CHANGED, + xpt_register_async(AC_LOST_DEVICE | AC_ADVINFO_CHANGED | AC_GETDEV_CHANGED, ndaasync, periph, periph->path); softc->state = NDA_STATE_NORMAL; diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index f6667df07be0..c22d5fed350c 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -463,6 +463,8 @@ device_fail: if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0) done_ccb->ccb_h.func_code = XPT_GDEV_TYPE; xpt_action(done_ccb); xpt_async(AC_FOUND_DEVICE, path, done_ccb); + } else { + xpt_async(AC_GETDEV_CHANGED, path, NULL); } NVME_PROBE_SET_ACTION(softc, NVME_PROBE_DONE); break; From nobody Wed Nov 19 21:44:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkt4w7Qz6JK3G for ; Wed, 19 Nov 2025 21:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkt3BT9z3CBl for ; Wed, 19 Nov 2025 21:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588678; 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=z54zxsIVPhz7NJP4dvMlkL+4dBzV4tf3GzaXBlMrPLQ=; b=do4X4NT/n3Qth7z4W/T8DgezRfxIzdmhecaJUIanI/lcaOSQy2fysA/P0QrIvbLUGDI011 Ca99gnl8QgNCesD8a/Q54gXo8FYRHMcMlWComh2YYmbechlJI4vyI/Swry3rtBXbpB3fqf +BlF7VDZqyefU3kq+PW6W8ACRKVGUCP3xZBB41/ZRHh047Jg/4y0vSrPPrynC7PNAgB1HO kuEvhDL8lSqA91tfwF7eRu89LhmZjHlBRkJVLqxBQnSVO877ZZsH3vsyOeuRbMyX/SUjIE eVd3RiB398wopBd4EV9tRYc0628gOv8yx+P5QfSWaYHa1AVWCGz3WwjJodVYwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588678; 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=z54zxsIVPhz7NJP4dvMlkL+4dBzV4tf3GzaXBlMrPLQ=; b=ewpbDutCvFK5OZyqAyf2J2XaBmdAC//ryq+X8ZP5qC1ftPDStDcFPaj3Qh6bCKhTCnB5pc 1EV1DkIs7cYlWRhdfboP743IonYq8dBiSfC4BsyAGL2+61FHx4bPWr4JqmF+Mis9Ed6WuE NLqjbuQEGSOG1w4BLuxTOt/SgOuO5O1LW3syJfQjq0C8K0t/i9A9s2830rNU5Y8jgi8kQX gLCYuJnqrqenAuiWpzW+rJ9ZL4lcH4xpGVDqVPGdsEYeEU/fd+IvAG+VM6pfQffJkV+r3q YX1MdEV03XOOgTo2LX96FSt43pVChdC/IgmaVHAKNL9b/csDA3dRl73M3aJ3NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588678; a=rsa-sha256; cv=none; b=OmO5szBShxvzYqATFV6ZpIKvhZg+rfsi3cSnDP2xrtdJegYIgW2FWHYS4hE8X8vCd4Vlz9 OXgrbfjrEDGeBSgAsY5VsdgMWtnZfQV+qAK550JLlEA29FMo6R/G1eusnEJdXPdFYjIzHk /pPDBDXSfvnxGt19RVG1mB0+p+QZAyQQP8rMPAVbVw5reopK9UztAEXBtjulVyYYfZCN3k EFDrMOfxUqCtjCSAjkVtlPtGWGU5AY/CQjm7eCdSiBzFvMJlTKLEFaDbr77zDSCIaOKxlc 3VuKghKXJU7iccFJOI/0wsJus3uDap5KIuARFiAVFCku75TiN/ZzYZIaFnTXcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkt261Wzy3V for ; Wed, 19 Nov 2025 21:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 314f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Colin Percival Subject: git: da71efa95d34 - releng/15.0 - nvd: handle namespace changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: da71efa95d340ca6625a9b1cd9a8ceb6cd199daa Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:38 +0000 Message-Id: <691e3a46.314f5.5ffe55b9@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=da71efa95d340ca6625a9b1cd9a8ceb6cd199daa commit da71efa95d340ca6625a9b1cd9a8ceb6cd199daa Author: Wanpeng Qian AuthorDate: 2025-11-18 17:24:13 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:19 +0000 nvd: handle namespace changes Signal the new media size when the namespace changes size. Approved by: re (cperciva) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit bd769e73d8f1d5141b1c2eb2322b4c6caed5d9e0) (cherry picked from commit 96a7ed1e7fb41df17e783503371533cc8db98540) --- sys/dev/nvd/nvd.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvd/nvd.c b/sys/dev/nvd/nvd.c index 33b43efd24c1..4737b2b03ae9 100644 --- a/sys/dev/nvd/nvd.c +++ b/sys/dev/nvd/nvd.c @@ -61,6 +61,7 @@ static void nvd_done(void *arg, const struct nvme_completion *cpl); static void nvd_gone(struct nvd_disk *ndisk); static void *nvd_new_disk(struct nvme_namespace *ns, void *ctrlr); +static void *nvd_ns_changed(struct nvme_namespace *ns, void *ctrlr); static void *nvd_new_controller(struct nvme_controller *ctrlr); static void nvd_controller_fail(void *ctrlr); @@ -154,7 +155,7 @@ nvd_load(void) TAILQ_INIT(&ctrlr_head); TAILQ_INIT(&disk_head); - consumer_handle = nvme_register_consumer(nvd_new_disk, + consumer_handle = nvme_register_consumer(nvd_ns_changed, nvd_new_controller, NULL, nvd_controller_fail); return (consumer_handle != NULL ? 0 : -1); @@ -512,6 +513,48 @@ nvd_new_disk(struct nvme_namespace *ns, void *ctrlr_arg) return (ndisk); } +static void +nvd_resize(struct nvd_disk *ndisk) +{ + struct disk *disk = ndisk->disk; + struct nvme_namespace *ns = ndisk->ns; + + disk->d_sectorsize = nvme_ns_get_sector_size(ns); + disk->d_mediasize = (off_t)nvme_ns_get_size(ns); + disk->d_maxsize = nvme_ns_get_max_io_xfer_size(ns); + disk->d_delmaxsize = (off_t)nvme_ns_get_size(ns); + if (disk->d_delmaxsize > nvd_delete_max) + disk->d_delmaxsize = nvd_delete_max; + + disk_resize(disk, M_NOWAIT); + + printf(NVD_STR"%u: NVMe namespace resized\n", ndisk->unit); + printf(NVD_STR"%u: %juMB (%ju %u byte sectors)\n", disk->d_unit, + (uintmax_t)disk->d_mediasize / (1024*1024), + (uintmax_t)disk->d_mediasize / disk->d_sectorsize, + disk->d_sectorsize); +} + +static void * +nvd_ns_changed(struct nvme_namespace *ns, void *ctrlr_arg) +{ + struct nvd_disk *ndisk; + struct nvd_controller *ctrlr = ctrlr_arg; + + if ((ns->flags & NVME_NS_CHANGED) == 0) + return (nvd_new_disk(ns, ctrlr_arg)); + + mtx_lock(&nvd_lock); + TAILQ_FOREACH(ndisk, &ctrlr->disk_head, ctrlr_tailq) { + if (ndisk->ns->id != ns->id) + continue; + nvd_resize(ndisk); + break; + } + mtx_unlock(&nvd_lock); + return (ctrlr_arg); +} + static void nvd_controller_fail(void *ctrlr_arg) { From nobody Wed Nov 19 21:44:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkw5vMxz6JKP3 for ; Wed, 19 Nov 2025 21:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkw4Ftnz3CTh for ; Wed, 19 Nov 2025 21:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SioJb4825MdOu7OKnmKdN+S3TY91FGBtWlV2q72cdqw=; b=jVLdsI5k0bZqnqY0Co9k9I2vPy6vXwgRRIHfXY0rGWzjgH4RCQM7yXyQ+wu2aO2U3LQwhe IRLW4fCSSjG7LdnuFSkj/PWTQFbQeUX2XeXCbJl3n0cv7T+bjwRl4hKCMS5CGeCxOiBShs q4VCPUDwcaJjn71v+3gASDfUQ26WWOuJHNpal0ud8d5prlAjy9dDZmytjhf3fiUn7BV6HQ s9LwdGfBz6g8xMYY6TcpallgvC6Arlnj4xFNXzGbAM3t/8tXwYdKwvOWzHIDmFSwPD+W3w 6zHOCUNGCMBgc0oCwTmN+2OwpOvRiBDzQjR1CllhsM6abXgKB32saze4nCt3hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SioJb4825MdOu7OKnmKdN+S3TY91FGBtWlV2q72cdqw=; b=a747vDm6IIaopdDGM5YshVzbEQIZZ3oEWyqnyyrq7MRb1kFS6MFQQsGfxNXG1SixyxPSn6 PPKYwaBmA8oRHipoq4vHpzNdb51fO9x8yxULGftpYSYSwhjUKu6kLPaZAYXrZ2+vy/GY/9 PME4qfsqL8AmR/+pQRY3FeQQmwAQ6B1DIzkva/lPWKHu4mwxrHPPpor/3QnD6ThRDHx90G Z3IdZh8SD8HSjn2CbNS4ICjF9k6v4UDuv4XZQozeV8hezUzXgEDMz6Ydj9Bayus7L37KPN dr1CMtjtNoB49q90Urwn9eWwbK+9QXLBZMKHeGc1l1GbjtYEFxmA2TYT7WgryA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588680; a=rsa-sha256; cv=none; b=BMjlODTHCGVUnBcuKMF6aEPjGWUF01x0ESYhZ7/FCsnAeFTwzNeCztRxAILRPIlUcFpqX3 rOS84y7Aph8ooh2i2tER3kPwv+Y9HDkspBSY2WjWtIInYLZgnRXobEn650HoqUcGoMPok4 RTo7YAYEnLY0VipUmvub0o7QiUG4CVSOjqdDK1Q4sCgjln7wBJmwMkm0sy8gZQuwhnhait ISdrycxBZSZ+AmKxGnxYh4c/ZxC93K0uRMTEnKJWGkH0TkKfUQSEQUc523iVFKIPRSnIJ0 mfsw8JG/1sjKPUFLdYyeIKX6kCXR28jtIKsfv97JaW9TsZlbOwXbgz9qIJGh+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkw3n7Czy3X for ; Wed, 19 Nov 2025 21:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3185d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 07b7bd2311af - releng/15.0 - release: Remove KDE from dvd1.iso List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 07b7bd2311aff496b73f9552a5b3d8019685ef01 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:40 +0000 Message-Id: <691e3a48.3185d.3866c2a0@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=07b7bd2311aff496b73f9552a5b3d8019685ef01 commit 07b7bd2311aff496b73f9552a5b3d8019685ef01 Author: Colin Percival AuthorDate: 2025-11-18 05:41:47 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:24 +0000 release: Remove KDE from dvd1.iso Prior to this commit, we were shipping 2155 MB of packages (from the ports tree, not counting pkgbase) on dvd1.iso. Due to the amount of space required by shipping pkgbase packages *and* distribution sets on the DVD images, we only have 1696 MB available if we want to fit into the 4.7 GB limit for DVDs. Many users have indicated that this is indeed important. It is practically impossible to hit this target without removing KDE; while KDE and its dependencies narrowly fit (1550 MB), we exceed the limit as soon as we include either of freebsd-doc-all or gnome. While we would pick KDE over GNOME (surveys regularly indicate that KDE is the more widely used of the two), we believe that documentation is the most important thing to include. Since removing KDE leaves a bit of extra space, add editors/emacs and editors/vim. This takes the 15.0 amd64 dvd1.iso up to 4.689 GB. [1] Approved by: re (cperciva) Requested by: adamw [1] MFC after: immediately (for 15.0-RC3) Differential Revision: https://reviews.freebsd.org/D53800 (cherry picked from commit 6cc6beb4c889a049170d0aeaa9c88b9093776d6e) (cherry picked from commit 142df248ac06bd255f5aa63a5544626bb502c656) --- release/scripts/pkg-stage.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 6d460a83e1da..083b1baa3358 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -15,6 +15,8 @@ export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES=" devel/git@lite +editors/emacs +editors/vim misc/freebsd-doc-all net/mpd5 net/rsync @@ -29,7 +31,6 @@ sysutils/tmux www/firefox www/links x11/gnome -x11/kde x11/sddm x11/xorg x11-wm/sway From nobody Wed Nov 19 21:44:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkv6fztz6JKD7 for ; Wed, 19 Nov 2025 21:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkv3m3jz3CFW for ; Wed, 19 Nov 2025 21:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588679; 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=Ogsko3CcNGWqtaVWV+v0a5PmF+F4AYRZXYjGWH30KzM=; b=ogjgXkIr5ZnVrqTL8iHR4r5jgHSalmlbqNCtKolqwuNJ0DmMarSBMGvBc3zBLMsw8l9PAm BvlDXUcU+n3bUQYbrXllpAJswUeaRz5HDcWMAIDHVk+bDbmQR2v9lwZfCkxls7loZthWUc gzXDUxIPsO9/dUna2tofZYwfPVPXiEn9aJQh8X+giVovA26gSgbRk8MzphFemy1yqJknxG G2QgybFBRg2IVDhdbZIYRLWOQfzRHE8nRN4VHECB7VhNESz2QSi2YfdhiNF3R4VypP9KFp eARd0vI+Ml59HoLq7j83TXraNmuG07nSmBhoO6ZMPHAWdwJW9OyNeiHpmfS6LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588679; 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=Ogsko3CcNGWqtaVWV+v0a5PmF+F4AYRZXYjGWH30KzM=; b=PEyyjBjBVpqRif7wR+3LIpTQshqFuLaAiLmwX47Aw++99vloHkFswbiVH3xeRn8xtTlgMJ gw7faSMcRpvmQT8bgSM4h5f0g9exWGQovOmz3Es7QF27i22NXU4xsHccDynYEW3IIytkmd 4EMi2aS26owE4PxTAhGTa5x+stO/oZ9HALl6Qc+3AbaQG7zYMIIvWWdvpnI48d6abogU1f VaJ4PJGeV3Dgg4neoVdae8yCs9qCp0fsjSrj8G1MH5YXThp/xRWC+ooeUzVOKQlja9byWr scZtrmQt4tY6pW1ZcJ7d/hniEiEyZ7yQjQ9vjaPWm0TrRweVkvwfWoLpODRR6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588679; a=rsa-sha256; cv=none; b=grCtExOdnaFSdmCTNFk8YIuqJoDZEcDjAy8rrq952M+ngBI3BxitCsF3Dg8ikcPxw5DKqY h3tffbmjmh1WGseGqJjnoLC+JQTcl2rlSZJdjLBpFb6ilbvTB7KGgTaHwMw1U6U9taIWu7 OD58LxyJ/vcc/C9nHq/+UQq0S+OZEYeYUzgO8zdjtD94WgsEwurXflHwA2fF/PtUJ1ZyYz tnGc7jbEzbhTwW8QvsajyT/DUnKqG3JStviys2P67RL/xkT7UH49G7ZxtaUcn8fGX9s0B7 sTYBtY13ynH1rKThg7dwUxUkUBaOYn+BgvF75u5th4QcSP5EHaBtSguJtkUNww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkv31pvzxfy for ; Wed, 19 Nov 2025 21:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33542 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Colin Percival Subject: git: e4416d1e95c4 - releng/15.0 - nvme_sim: signal namespace depature List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: e4416d1e95c40b772dbb6889f468538f4ea9f711 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:39 +0000 Message-Id: <691e3a47.33542.8fca695@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e4416d1e95c40b772dbb6889f468538f4ea9f711 commit e4416d1e95c40b772dbb6889f468538f4ea9f711 Author: Wanpeng Qian AuthorDate: 2025-11-18 17:24:13 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:21 +0000 nvme_sim: signal namespace depature Signal when the namespace is gone so we can tear down the disk when a nvme drive is removed. Approved by: re (cperciva) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit 4640f5008922c5b189d2f7b63edf73300277e6df) (cherry picked from commit b7ffac04541f98d3d8c6078092d59f0fed88b1ef) --- sys/dev/nvme/nvme_sim.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index a06774a64761..f7fd0cee931b 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -352,25 +352,35 @@ static void * nvme_sim_ns_change(struct nvme_namespace *ns, void *sc_arg) { struct nvme_sim_softc *sc = sc_arg; + struct cam_path *tmppath; union ccb *ccb; + if (xpt_create_path(&tmppath, /*periph*/NULL, + cam_sim_path(sc->s_sim), 0, ns->id) != CAM_REQ_CMP) { + printf("unable to create path for rescan\n"); + return (NULL); + } + /* + * If it's gone, then signal that and leave. + */ + if (ns->flags & NVME_NS_GONE) { + xpt_async(AC_LOST_DEVICE, tmppath, NULL); + xpt_free_path(tmppath); + return (sc_arg); + } + ccb = xpt_alloc_ccb_nowait(); if (ccb == NULL) { printf("unable to alloc CCB for rescan\n"); return (NULL); } + ccb->ccb_h.path = tmppath; /* - * We map the NVMe namespace idea onto the CAM unit LUN. For - * each new namespace, we create a new CAM path for it. We then - * rescan the path to get it to enumerate. + * We map the NVMe namespace idea onto the CAM unit LUN. For each new + * namespace, scan or rescan the path to enumerate it. tmppath freed at + * end of scan. */ - if (xpt_create_path(&ccb->ccb_h.path, /*periph*/NULL, - cam_sim_path(sc->s_sim), 0, ns->id) != CAM_REQ_CMP) { - printf("unable to create path for rescan\n"); - xpt_free_ccb(ccb); - return (NULL); - } xpt_rescan(ccb); return (sc_arg); From nobody Wed Nov 19 22:24:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBbd909N1z6GPJD for ; Wed, 19 Nov 2025 22:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBbd81fsQz3Nt8 for ; Wed, 19 Nov 2025 22:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763591084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QnKxsQcqBiH9umLtHcwqTGY1IGAQ15nx1DgJxzqN3yg=; b=IG7R3vbgDUW2g1Dm8QnnqOvaf/BBz/ojLpSi9YnCRhZUvKxoV+vthb6/fz8bp4nlvpTvxs hadCQ+6g2DVinQgvMNS0uldeeQhXTt1mj619aOw9UQcpHyjRUdHFqF62/LOiasES/Q6Dzn g53cZ2VvgMGtiCfA0VHE7rYaw+nbI/c3J/g9GnTRzFont13s2Dj81yhzslzjGpiRurBNeT TRaHXQcEAo7wD3ogNdlQ9z6LscUGWtwqB8EM55eLAGblJQnlNyLIyjKP38V3vYWfee2oQK Nv9nb+pyWQlnMKpIMMo/7fm1Z7f0itAmOHKkZO6CG4WpkCpkr7YhM+K0vlMmOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763591084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QnKxsQcqBiH9umLtHcwqTGY1IGAQ15nx1DgJxzqN3yg=; b=jIznUfedogfABbHyXf0qLndiIE5qfa0VzRSSuhjQONEqVV5SSfjlChh+PcG2PDo0r9vcqj DIUwuYm46aSE1JFXJPat2mx444DWn/LIte6i9RoTiij8gQMCSga1um5GHEZKKo0cbS+jfx mucOYjALEezc35qn0BI5YkwOTRjBUJGXJOYDDYeDYNbQxpzFAfUC9Theq5lfexFu3kg1nb yycH8BlJF+L0RcS5Wb7kF8IN0hncfTnOpRqv+KhZ0nnVs/qhxRliPYuwiYYH/QlzURvXP0 ssrhNZ1TITEYkI6xAEUmNT0rrboFeKUk0J+XOj+ki9Tn2HxIdSDuGs+wUI+gcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763591084; a=rsa-sha256; cv=none; b=OPnv2BTH0yBIxF/jsU0qsfro5zqsE9wno7pIZNi5w54tMoJx1FM2Z+U/fkA1FD5TIzyiwc 3K3OOHWNoiMspaNKARKpTfnImvpIGPWPZ3puyJs17ofCXybQVGm+eWcSXGXki/nZtlVk6M oHQhMRZNeFFuu6U/r+KaQzL/SYDEEFI+ciTdE0ox6xytAg8DA6hRX7BsUWsPynaXOmPSp8 Tn++b22+DPtAmAN9CrHBx7SvvW9sph/iHzhnkqXM1OEFCNX2CAzSfbNdhRjcWPiyeAnVZe HnX9R4oIXGL6By9tCxaDcX5r1Y0EvIt5Yf6dejL9tZJUqNWzMbdNyW8+3dBJRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBbd817WQz107y for ; Wed, 19 Nov 2025 22:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 358da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 22:24:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Salychev Subject: git: a731cb93a662 - main - dpaa2: Setup interface caps on attach List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dsl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a731cb93a66271713d6ea197946e4a307e5b0837 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 22:24:44 +0000 Message-Id: <691e43ac.358da.4734848a@gitrepo.freebsd.org> The branch main has been updated by dsl: URL: https://cgit.FreeBSD.org/src/commit/?id=a731cb93a66271713d6ea197946e4a307e5b0837 commit a731cb93a66271713d6ea197946e4a307e5b0837 Author: Dmitry Salychev AuthorDate: 2025-10-28 22:30:05 +0000 Commit: Dmitry Salychev CommitDate: 2025-11-19 22:23:30 +0000 dpaa2: Setup interface caps on attach 39d4094173f9 ("epair: add support for checksum offloading") revealed that HW checksum offloading is not enabled when the dpaa2_ni driver is attached despite being declared and enabled on the dpni interface. I modified dpaa2_ni_setup_if_caps to take into account both IPv4 and IPv6 checksum offloading capabilities and added a call to re-configure interface capabilities on attach to fix it. Reviewed by: bz Fixes: 39d4094173f9 ("epair: add support for checksum offloading") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53436 --- sys/dev/dpaa2/dpaa2_ni.c | 52 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index 698b440376e3..98a6c6047188 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -559,7 +559,8 @@ dpaa2_ni_attach(device_t dev) if_settransmitfn(ifp, dpaa2_ni_transmit); if_setqflushfn(ifp, dpaa2_ni_qflush); - if_setcapabilities(ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM | IFCAP_JUMBO_MTU); + if_setcapabilities(ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM | + IFCAP_HWCSUM_IPV6 | IFCAP_JUMBO_MTU); if_setcapenable(ifp, if_getcapabilities(ifp)); DPAA2_CMD_INIT(&cmd); @@ -627,6 +628,12 @@ dpaa2_ni_attach(device_t dev) __func__, error); goto close_ni; } + error = dpaa2_ni_setup_if_caps(sc); + if (error) { + device_printf(dev, "%s: failed to setup interface capabilities: " + "error=%d\n", __func__, error); + goto close_ni; + } ether_ifattach(sc->ifp, sc->mac.addr); callout_init(&sc->mii_callout, 0); @@ -1569,8 +1576,7 @@ dpaa2_ni_setup_msi(struct dpaa2_ni_softc *sc) static int dpaa2_ni_setup_if_caps(struct dpaa2_ni_softc *sc) { - const bool en_rxcsum = if_getcapenable(sc->ifp) & IFCAP_RXCSUM; - const bool en_txcsum = if_getcapenable(sc->ifp) & IFCAP_TXCSUM; + bool en_rxcsum, en_txcsum; device_t pdev = device_get_parent(sc->dev); device_t dev = sc->dev; device_t child = dev; @@ -1582,6 +1588,17 @@ dpaa2_ni_setup_if_caps(struct dpaa2_ni_softc *sc) DPAA2_CMD_INIT(&cmd); + /* + * XXX-DSL: DPAA2 allows to validate L3/L4 checksums on reception and/or + * generate L3/L4 checksums on transmission without + * differentiating between IPv4/v6, i.e. enable for both + * protocols if requested. + */ + en_rxcsum = if_getcapenable(sc->ifp) & + (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); + en_txcsum = if_getcapenable(sc->ifp) & + (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6); + error = DPAA2_CMD_RC_OPEN(dev, child, &cmd, rcinfo->id, &rc_token); if (error) { device_printf(dev, "%s: failed to open resource container: " @@ -1627,6 +1644,13 @@ dpaa2_ni_setup_if_caps(struct dpaa2_ni_softc *sc) goto close_ni; } + if (bootverbose) { + device_printf(dev, "%s: L3/L4 checksum validation %s\n", + __func__, en_rxcsum ? "enabled" : "disabled"); + device_printf(dev, "%s: L3/L4 checksum generation %s\n", + __func__, en_txcsum ? "enabled" : "disabled"); + } + (void)DPAA2_CMD_NI_CLOSE(dev, child, &cmd); (void)DPAA2_CMD_RC_CLOSE(dev, child, DPAA2_CMD_TK(&cmd, rc_token)); return (0); @@ -2574,13 +2598,27 @@ dpaa2_ni_ioctl(if_t ifp, u_long c, caddr_t data) break; case SIOCSIFCAP: changed = if_getcapenable(ifp) ^ ifr->ifr_reqcap; - if (changed & IFCAP_HWCSUM) { - if ((ifr->ifr_reqcap & changed) & IFCAP_HWCSUM) { - if_setcapenablebit(ifp, IFCAP_HWCSUM, 0); + if (changed & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) { + if ((ifr->ifr_reqcap & changed) & + (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) { + if_setcapenablebit(ifp, + IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6, 0); } else { - if_setcapenablebit(ifp, 0, IFCAP_HWCSUM); + if_setcapenablebit(ifp, 0, + IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); } } + if (changed & (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) { + if ((ifr->ifr_reqcap & changed) & + (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) { + if_setcapenablebit(ifp, + IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6, 0); + } else { + if_setcapenablebit(ifp, 0, + IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6); + } + } + rc = dpaa2_ni_setup_if_caps(sc); if (rc) { printf("%s: failed to update iface capabilities: " From nobody Thu Nov 20 00:55:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBfyt2fsBz6GbFb for ; Thu, 20 Nov 2025 00:55: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBfyt271Vz3dTB for ; Thu, 20 Nov 2025 00:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763600118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WC9K/Wvi2hKYK/9CTiLUnNh+amUqX7xsew+PJPkCN60=; b=tAZ9dS0TSS2RzfQNSw+BTzmpTCEBHTTpgNh19FYnrBFufyfAAHyWqQbch2UVl/xXEH8rvu y/HwaUyv+ZCZ8ciS1JTBCwpdnVhdUrUXGuoMyZhJSCo1y4G2IRCU+ZERYePhh/z8cLvKJ/ SkSz09/oV99/45pPeFP+GARo7EP1hV87I52VdvUdgRfD1H/YMewqSEzud9/chmkyT8LE5L xCjDzG7RylsTuK5UQXaGu3SHHC3YeZ05fJXzIteAXg2z816T+iHLQvvT0yW3XDO1mc5kv/ yfgIH8MK3sG/LeKKspm9sW7lH3pR/9WMKM+1L0DNveWeuASYaQiTUOJPV/MGew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763600118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WC9K/Wvi2hKYK/9CTiLUnNh+amUqX7xsew+PJPkCN60=; b=B3c1K9iYkS4ocZ52I3o7hngtb3sU3LSAWw3GgomRxzfYaaYbs9o/4zka0dvw05v0JfAZDp t7qG8uMGBXHpmxlPI1IIw+uWmPd+sMiiEbn4psZtT9MVJg6Tln1281LGom4U5zaA0DeLPC IlONH649KTtTUo1j2MtTSQc0YfEsS+ofQKKXqNECyWyPiXmRRhjvWHe3aIGV5LPbtflWgR EdAaqVM/ljxp1IWbKi/PwYqK9gEwqXrHFG+EmjW6zagqdtMxj2b7QSUO3SwGXb93HT2eIE rSskn0/KdAwmMLbE+z0wnyZUei6bqWlePCSdh9qtupU7YSpWaX85yIuuE+g9Vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763600118; a=rsa-sha256; cv=none; b=QzPUeYbnDbSV+SB6oZ4rSQX5z0qI+zBcMmoaht57SbO8pjWSWUAwBT+aP0a8cHvQp6pEh+ nMijo/2I724am6uNxr29GGhMMIdVeNZjnZlEril6EOmdDckaFbcEPkL8bz3d6M9TG3ENts i7CcCb/rXjgFyl1D7YZRcofE84xQjFhlusgurEAEMMvrWrDvk+fyNzlVhZxVJ27dJO+ChN 84/JzWUWCyB5tbdE2rQSy+RGiZVuFiSp6a6s7wXRPrbZrtREYqSdl0sL4eY8zY+Y7dLwHm n2Gf4jY+aNgEPpZG2drSHoGhXwFopcSO1UwpSoyIfU7JHhRVvHdcx65Cw5TehQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBfyt0kHhz13bL for ; Thu, 20 Nov 2025 00:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26a3d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 00:55:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 896dc30bc9bc - main - iflib: fix iflib_simple_transmit() when interface is down List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 896dc30bc9bc2f7407b04ca4c08f88b1c7bf9d60 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 00:55:17 +0000 Message-Id: <691e66f5.26a3d.4434d57f@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=896dc30bc9bc2f7407b04ca4c08f88b1c7bf9d60 commit 896dc30bc9bc2f7407b04ca4c08f88b1c7bf9d60 Author: Andrew Gallatin AuthorDate: 2025-11-20 00:48:56 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-20 00:48:56 +0000 iflib: fix iflib_simple_transmit() when interface is down Use the same check as iflib_if_transmit() to detect when the interface is down and return the proper error code, and also free the mbuf. This fixes an mbuf leak when a member of a lagg is brought down (and probably many other scenarios). Sponsored by: Netflix --- sys/net/iflib.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index ad2be119da7c..3181bdbcb849 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -7188,9 +7188,13 @@ iflib_simple_transmit(if_t ifp, struct mbuf *m) ctx = if_getsoftc(ifp); - if ((if_getdrvflags(ifp) & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) != - IFF_DRV_RUNNING) - return (EBUSY); + if (__predict_false((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0 + || !LINK_ACTIVE(ctx))) { + DBG_COUNTER_INC(tx_frees); + m_freem(m); + return (ENETDOWN); + } + txq = iflib_simple_select_queue(ctx, m); mtx_lock(&txq->ift_mtx); error = iflib_encap(txq, &m); From nobody Thu Nov 20 02:48:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBjTf4NNvz6Gm57 for ; Thu, 20 Nov 2025 02:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBjTf3HZlz3sHV for ; Thu, 20 Nov 2025 02:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763606918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sq28osGepoy80fwYNl3/IlITO/gtnPvpCHogEAY1A40=; b=JrDXZJmaPxUS8TDCOSXoOq900MDSZOv9PVHINa1fIMY8iJSGED//dB5TFG3SDj2U0UO7S6 2dsEhZEfs48EjS9gZILGFzJ4pY0QK4k4BU7vIIJF/JAv/jYwyNhrZ3MUY+oghlKL6AkOi0 EFQFV226xNAP+D6aH+n/qSU5P5mLntcAOpjSoZFdmKSG8fbDAmOgnDLufgEVZx91+57LrW wbg/cGjLq0Atnnz+Drhe3NK3WXFHgJB+kXIQLxoYHh4ACHOW9VcgcdxhPSV0jUcjKlckyC EspQv/a3x3l1zJmcFDwMpDLdulantLJp29QTEMqvUv2QKZk+rmpnd2HDOgkl4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763606918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sq28osGepoy80fwYNl3/IlITO/gtnPvpCHogEAY1A40=; b=Mk7+2F79QbODuhNNJd+X2mWHST0HsgQgresbQc+2erymCa2c148mlkmFr8mY/tscW/Em5U i+oLFKSWLBr0ryYZ4lmjUfbffs4taXD0DO28N9qglqvlQ4KRPEoq7v0BZ2t9IxRNZRiXce hQmS7qEJqU+z6+b1iawarNQBn89PmC05IbXPjB1k+YdJCWKtcmi0W172Vpry+LhVYyJxFk xNKRo1GjSK8L4aMSOFQ5GoPBY3MMFjmfyFVncDUuECAw+mOuOjhnSVzmgECfL2PF9sK6BI kf8k5MwUgCtJeeeAJg8qhgbVwuUeWB0wrkrLlHik4LMDfaFoAXxIL6j/64gO7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763606918; a=rsa-sha256; cv=none; b=lI5XBLPJwLi2vHeSnMvQdnHYrTNZUMzoOITKLkld2FqE80wnLctTPBISH5iGGZ0RS3UQzK 95dL1YXw75gK4iRgkb6xW/JpH22waTFueEqc7PBtKUl1ArWUrf1uVyhHt4cogzPEHYHJVN 1BRQ0yMwGWoUwyaKAtfk40MQIFipi6VW3lNj9cl9yLkeCeU0vTpbtcrYxCdp537RRBfLgT 6w0ztGynJ+Wvwm7NWQrmpEhaijFSyjrhd2iItf9zIO8rmxxitEBYlTybz6MihHFSnqxE3+ VWZaEmmqp6x8a1uBZm+J2vPOaKN9WbrhPXU0jWGsEx+l0xz126hYffEjSIqjlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBjTf2pJfz16G1 for ; Thu, 20 Nov 2025 02:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 330a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 02:48:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d653eca0ef88 - stable/15 - freebsd-update: Add some diagnositic information for a failure case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d653eca0ef889a8e3fa1e370d2b3ce7b031441a2 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 02:48:38 +0000 Message-Id: <691e8186.330a1.3d50439a@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d653eca0ef889a8e3fa1e370d2b3ce7b031441a2 commit d653eca0ef889a8e3fa1e370d2b3ce7b031441a2 Author: Ed Maste AuthorDate: 2025-08-28 16:04:06 +0000 Commit: Ed Maste CommitDate: 2025-11-20 02:48:04 +0000 freebsd-update: Add some diagnositic information for a failure case Users report freebsd-update failing with "The update metadata index is correctly signed, but failed an integrity check." Add a hint at which of the cases is failing to help track down the issue. PR: 264205 Reviewed by: dch Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52222 (cherry picked from commit af4ba95daf75cf1b1624dd57038cfaa3ed2753e7) --- usr.sbin/freebsd-update/freebsd-update.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 23f1106e3bde..2f2afa38f553 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1402,7 +1402,7 @@ fetch_metadata_index () { fetch_metadata_bogus () { echo echo "The update metadata$1 is correctly signed, but" - echo "failed an integrity check." + echo "failed an integrity check ($2)." echo "Cowardly refusing to proceed any further." return 1 } @@ -1413,7 +1413,7 @@ fetch_metadata_index_merge () { for METAFILE in $@; do if [ `grep -E "^${METAFILE}\|" ${TINDEXHASH} | wc -l` \ -ne 1 ]; then - fetch_metadata_bogus " index" + fetch_metadata_bogus " index" "${METAFILE} count not 1" return 1 fi @@ -1436,7 +1436,7 @@ fetch_metadata_index_merge () { # specifically grepped out of ${TINDEXHASH}. fetch_metadata_index_sanity () { if grep -qvE '^[0-9A-Z.-]+\|[0-9a-f]{64}$' tINDEX.new; then - fetch_metadata_bogus " index" + fetch_metadata_bogus " index" "unexpected entry in tINDEX.new" return 1 fi } @@ -1453,7 +1453,7 @@ fetch_metadata_sanity () { # Check that the first four fields make sense. if gunzip -c < files/$1.gz | grep -qvE "^[a-z]+\|[0-9a-z-]+\|${P}+\|[fdL-]\|"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid initial fields" return 1 fi @@ -1464,28 +1464,28 @@ fetch_metadata_sanity () { # Sanity check entries with type 'f' if grep -E '^f' sanitycheck.tmp | grep -qvE "^f\|${M}\|${H}\|${P}*\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type f entry" return 1 fi # Sanity check entries with type 'd' if grep -E '^d' sanitycheck.tmp | grep -qvE "^d\|${M}\|\|\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type d entry" return 1 fi # Sanity check entries with type 'L' if grep -E '^L' sanitycheck.tmp | grep -qvE "^L\|${M}\|${P}*\|\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type L entry" return 1 fi # Sanity check entries with type '-' if grep -E '^-' sanitycheck.tmp | grep -qvE "^-\|\|\|\|\|\|"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type - entry" return 1 fi From nobody Thu Nov 20 11:23:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBwvG5l8yz6HDSF for ; Thu, 20 Nov 2025 11:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBwvG3zYhz3k38 for ; Thu, 20 Nov 2025 11:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3HuerrjsoZ/nrT1gSZUk9GU5KYnrr1+7pNFOYb+Zd4c=; b=jcJzP6kuT31EklbDYLlALorFwkTCRFF0nN4SQ2SW87J1byKF9oTKUjs7Tq84b/Jv7y1/k2 MJghg0LhSAjm9y+el1XWiFUoeCXBReHUfvRl5jjo8kpzhkrzNdSnMDJeG/3thzEz6Ta3ee xMK3BCAbYjtmab2vOa7FWlDNhZyLYhQ/VtoL+mtTgfV8BXf8lJm456iQuqOpf9hWgKT6OE w1SpKoPHcDDKISnG+V4zdEc5nRuJ3LWnp/Tgko3ufPPkELF8qn6YOs/C5DOLpbLFwfyosG Dcpd8g8p/Ozmd/QjV0sL+qaRU74Rf+ZB0zuZfGulWcZjBjnRMB6DIsV6fXJ6vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3HuerrjsoZ/nrT1gSZUk9GU5KYnrr1+7pNFOYb+Zd4c=; b=mET3EsDFWMSl3T0dXO3mzcSZh1RwtsERQ/WyMCieByoyiIqJpqDyodoZQmf4S560F+IPB2 80uGzbgy2mrCBgLs92g6gqIoFLSJpsI/COxUj2uRXeHj9jw1H1aOp3XkpdMScJ//Ou0BwE N5iODIuxVLQSR68wqXynOxT1xx7C6mYtFU+FL3X1IsW6PRqVWu/9Uvrvy58EpTwvOyDmQ/ uoHYqMgH1HnNSvqPGfZl+c44jteuj8Ry5RV86TX3KT9z4IjaKkX4Ba8iOGCo0sG1oUVOAG Zdg0s2WU6SHNWnmJSY7MKJ9VkPzvsFDaUsp0OlHft/ItJmizopWpdwwZp68syA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763637786; a=rsa-sha256; cv=none; b=dYhgFLwyxGVAMFWpyXagZvew5dDqUYdIVXNa5RStpsCHAOy9HO5K4egWy6xIpZfZcjJulu nOzKi4t7TiyXbmD+apVO11sabILymyQDcZNAKT1UpruZRSrSa/Gt27/pB4J7W5OwtgncPB M14vDF/8yP0/YPO1nW5ugoq1KGYcOsgwkZnCW520qhpEv1yXP4QjFK98iW2MsUGXkpXCdL 3Vl7CwCptT5/XnXnZLtHZ1VOxTM/t1Jh3eYeEDx5wQo57SHmU6xgIk4Hq5qeaw3KQa5O16 VQv+Uox0eUO6oWXrCfYwfVY00T5Z79Bx+3fXEgU8gQNvgmEfBQu8DRDABty9/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBwvG3Zhrz8hS for ; Thu, 20 Nov 2025 11:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id eb62 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 11:23:06 +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: ee3c5181995b - stable/15 - NOTES: Add iwm and iwx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ee3c5181995bfd155eb9ef7debcf855d96ca8e69 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 11:23:06 +0000 Message-Id: <691efa1a.eb62.ea3ec01@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ee3c5181995bfd155eb9ef7debcf855d96ca8e69 commit ee3c5181995bfd155eb9ef7debcf855d96ca8e69 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-15 03:18:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-20 11:22:34 +0000 NOTES: Add iwm and iwx Reviewed by: imp, jhb Differential Revision: https://reviews.freebsd.org/D53759 (cherry picked from commit b1039bbe185bbadea24207b600f4bea065a2dbee) --- sys/x86/conf/NOTES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/x86/conf/NOTES b/sys/x86/conf/NOTES index fadaf90d508f..643105096be2 100644 --- a/sys/x86/conf/NOTES +++ b/sys/x86/conf/NOTES @@ -444,7 +444,9 @@ device gve # Google Virtual NIC (gVNIC) device igc # Intel I225 2.5G Ethernet device ipw # Intel 2100 wireless NICs. device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs. +device iwm # Intel IEEE 802.11ac wireless NICs. device iwn # Intel 4965/1000/5000/6000 wireless NICs. +device iwx # Intel IEEE 802.11ax wireless NICs. device mthca # Mellanox HCA InfiniBand device mlx4 # Shared code module between IB and Ethernet device mlx4ib # Mellanox ConnectX HCA InfiniBand From nobody Thu Nov 20 11:23:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBwvF4vBdz6HD6s for ; Thu, 20 Nov 2025 11:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBwvF3GLSz3kKv for ; Thu, 20 Nov 2025 11:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZkqAbpMRcDAMyuik8n5bFDcI5n6RLDU41+hrq7pipJw=; b=F6r13w9GvRQV+sdfHIqv+7sKj0ZyG0+RIMNfxZvRI6UETFFzEGwT2Wy9YOmRQXDFDIGIGT HtY2Ha/gApbMNd0r/lApUqt1okkQVV+hrKkFBasR1018fdNi/RzBCHflTsahVsDqGMZQ0T 1X51PdFl5nIHG1aZAnVry5ntzAq3K4kcAG9yE4yT/JH2wurZOb4ffvhH1/RBmQ21jeKoQm eBQdH7cl1cEABSOhmbZH7Z/P1gbTIPIIrzs1KeYYIRGdqTjJ/TBkmUI+RufhR/XM4X4xee M4MFDZqCFhgcY2qI8p4TlLV/rRxNAfORFyuy8nC5JiT4wS7Y/lokORxnso/UWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZkqAbpMRcDAMyuik8n5bFDcI5n6RLDU41+hrq7pipJw=; b=JTCZCrz1yeFnDaJfHXIj3ZpcAwOuAb02PCSDZ2xSYhv1MK+GD3aGlRvSWyl2nTJt/8oSwt qUoobi0dP52EtIDdw7lJ+7WDmWFQJtkyLKs+j3/J8FRUyBXlxRjLVMzc0JUDmdyb3E+dvH 5jZNjkbKYTMEHSFg/8kEpccMPZwhh/gkF6HVPrk4f3PIXFq3ssTUYwCyDA/MMWZkGSkVNR TqQJurcvLe/YHkh5Q5sokOxsqMaMTOHIZ7YqgW2WtZ+p/0nS7KV/VPHmpaCxWwVOkQzFXc rk3JRU8MiQTBMdafjilQqV7omgcOD6k81l4AcUMoWu/cSWQxIsvCk/lN4wKvcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763637785; a=rsa-sha256; cv=none; b=Sz0EuZwUMQ94AyoSUcKOdrI/8VkEdtmZ6wxbo2cpZ6VEU835D+AZMcZQF7SkP/aNTn0cWI 4dv3uUdOdRlS/du7bStEVfC65bW962jVgH4PnPldhsh5ei0OQFfo9jZN+lxkQwe7a707Bs ntorbmBDGPecm3eYfw5ZSJYququ6ud35mVxEjK7HYM8MfRfVTfFGQ+YrU3KM/UFYfvAy7M UP3/1s1giOvVFpedK4v+j95lSMc2+mVe855Z8VY9F1zUctIa0/SO4nOrF2clwMXPufGxkn C2UmSc3F2X/gDZt/zpD6t0xJqoJDx3RstBeS51kXvCS5bRs9uUZn09UTopGS1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBwvF2l7lz8ST for ; Thu, 20 Nov 2025 11:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id eaae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 11:23:05 +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: 0f9ab6c5232b - stable/15 - sys/conf/files: Add iwx driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0f9ab6c5232b5f748a21d22849dcf84b4b0bbab5 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 11:23:05 +0000 Message-Id: <691efa19.eaae.4cbc9f09@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0f9ab6c5232b5f748a21d22849dcf84b4b0bbab5 commit 0f9ab6c5232b5f748a21d22849dcf84b4b0bbab5 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-15 03:18:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-20 11:22:33 +0000 sys/conf/files: Add iwx driver PR: 290812 Fixes: 2ad0f7e91582 ("Import iwx as ported from OpenBSD by Future Crew.") Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53758 (cherry picked from commit a615ded5bf2dd7f563eed6766d32fc063ae36f92) --- sys/conf/files | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/conf/files b/sys/conf/files index 8c9993d8f57a..da5e22e0669b 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2277,6 +2277,10 @@ iwn6050.fw optional iwn6050fw | iwnfw \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "iwn6050.fw" +dev/iwx/if_iwx.c optional iwx \ + compile-with "${NORMAL_C} -DIWX_DEBUG=1" +dev/iwx/if_iwx_debug.c optional iwx \ + compile-with "${NORMAL_C} -DIWX_DEBUG=1" dev/ixgbe/if_ix.c optional ix inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP" dev/ixgbe/if_ixv.c optional ixv inet \ From nobody Thu Nov 20 11:23:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBwvH6SdZz6HDSG for ; Thu, 20 Nov 2025 11:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBwvH4pjWz3kHx for ; Thu, 20 Nov 2025 11:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637787; 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=/s5PX05zVn5oh+sr2UObWdpkNrUO947iDnC2/uLyarc=; b=Yr7FvtK2EHHY0HXqeGZPYIHuyrE8vKrDCj89//cWLcyyakJ98GYcDEc0YaupsGW5AmE8sy lreIsGhlIU6BF56uS9YoiHiRpSNqpaiSaFXCI9p77AyIZ9J5HwwrXhuqoLt8wPEyvhwLK3 fuz0ZZV3jtmSxOY51JlHpWymst1wKenUcaa0GSnX4QYtO3GPneRFlEB2ilcnUB/OJSsW8z 0xAXGvNqVYzVQJpyxFSc3kGFek4RrQC0q4rXuLegMTaPtr+a8avMjWxEbmJ1nskV+WS0NQ KS3a8DzirsKf4rEHhVyzoqLXy6JO49uCM1AowLfXrHuowmsZ731RzULBgTcRuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637787; 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=/s5PX05zVn5oh+sr2UObWdpkNrUO947iDnC2/uLyarc=; b=AN58HNA9HKCC2W37SWhUHB321+j/KDYp0U42iOKc/YwyWwNID4M9/+Zk5TdiFhPhxoSNMH ksGlMFGmpvlzFowGBPwzwOo14jy0EKYk2UTxaVqIEVRZFm/48bj6O0eVH7Y8+4EjUydJ3M V360VOyrbvXtPFFr8BTmDPygaNv3Fyctw9DPROlSjquiZQR7GTYu2VA3nzIu0Xp98ePZNA 9KaErubzDGy0bIOIB9iE6x7LjDaff0EXyR8s/BYI928IlCiKXUNohboELP+Aeq+ZSsl9zZ mQjC54LrPpnwFJi0AqaXzdnVhZPeNzuTd/z4Ekx3COQb1UdmPK7rgC0NNHC9lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763637787; a=rsa-sha256; cv=none; b=IQs7Ib/REry4NuekexZhIkWWEgqJRnWRh0dk4KKG65RsWtUSJTGTMQDWfaN73mAYABoZLe cPeIEllHx2QZdj/3CaTIZH3uuBE0n6NBOCNXKSz+6SI8C/VyaHSzUAhNBILUdrSiyC6L7V bP/wfnvBb0vFuHQIxne1GTFa5l/49w3CS879ba5UhQNFXDyecMrPG7oCxGQKxJ+Z9/bxyR ErB9aQQNmO5jWKzZItn+1/+GtxCsTyLoBY96A32sE+QDqjpjuWyOqgXBZ8lFuYF4BT4wlc lFyMuQJUxXytp9DeQHvhHCpaCvwWP7YyDAvo5bzqW4AkN0z4hQXitbHnQrDJpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBwvH4MBrz8RP for ; Thu, 20 Nov 2025 11:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e79b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 11:23:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b94750f60552 - stable/15 - iwx.4: Fix SYNOPSIS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b94750f6055250d1e2a0a9406e8eae8f16883803 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 11:23:07 +0000 Message-Id: <691efa1b.e79b.2c704bab@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b94750f6055250d1e2a0a9406e8eae8f16883803 commit b94750f6055250d1e2a0a9406e8eae8f16883803 Author: Alexander Ziaee AuthorDate: 2025-11-14 15:04:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-20 11:22:34 +0000 iwx.4: Fix SYNOPSIS PR: 290812 MFC after: 3 days Fixes: 27c41b28b1d7 (iwx.4: Initial manual page) Reported by: Dimitry Lukhtionov (cherry picked from commit b0c1ead2b9be0f6aa5a715d849b9ca7af093b513) --- share/man/man4/iwx.4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/share/man/man4/iwx.4 b/share/man/man4/iwx.4 index 295a5f318afa..e57ddbc7c980 100644 --- a/share/man/man4/iwx.4 +++ b/share/man/man4/iwx.4 @@ -17,14 +17,13 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd May 2, 2025 +.Dd November 14, 2025 .Dt IWX 4 amd64 .Os .Sh NAME .Nm iwx .Nd Intel WiFi 6 IEEE 802.11ax wireless network driver .Sh SYNOPSIS -.Cd device iwx .Cd device wlan .Pp In From nobody Thu Nov 20 11:23:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBwvJ6q5Tz6HDSH for ; Thu, 20 Nov 2025 11:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBwvJ5Zc7z3kHy for ; Thu, 20 Nov 2025 11:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YX7X2Mwn75uQPI3DWtmWiluojgJtgg4tzD3K9QU6d3c=; b=YebER39hM9VX0qWd1XuOH9tTLARsZq5WVyj/T/gKAGmtz2qEU+tzILVPKI4W4M0Gby88EC eTX7U4FgfXv6wNr0Gy4ad0mn+o2iP3fc5jKi6OS3mPa0qu5x10IQ75XqBdS3h7pvwH2/bv 8tLJZeYk5+MtKgHZibXPZLaYdV1UNcEnTzelVr8yq94i9vWmjwDo2jGgUaDNOgU9ekGzg/ hoSCicD+fHblRtnuvy3z1T43Rj+5jv0sFkMtv74PTxnfF+kz5v5dTM7fXSOAe/Bml7VGjC Qvl98KmxJ98ZBKn6JyVd8sgPMSPs7XG8pn9C21P+bw1N1xV2sLpl15cfOTZtxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YX7X2Mwn75uQPI3DWtmWiluojgJtgg4tzD3K9QU6d3c=; b=S6LwyfwM19rX4a0qySBSPOLtM9VNUEy6bfff1t4Yp6j8aWnzUUdFdZHUZEHdIyJ+6x5+o1 ZEwxbcv8qWUfBhEH1VQzHJXlYW3IdycgYaQdVK10G+A7h5M4zanvbNtOpowXX2kqi0BqPn jR9y0GPWKXgnFcSNMuIojkZnlbcn2jSulsCAQmfy5klHe2fWTdzH94Z5XZEzTnK84T//qU jx3Z/rlOCAdS5j5XlOzdGhv00VmlEaC/3eJpmb8ZZSVZI1bezi47cHV7ZNNtSDc2PcbaQN XajG5SH2CzeBHajx2c4vlbjfCeskpvPgg5FkHK7GBV7HDHtXBZT2YO5ystYOcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763637788; a=rsa-sha256; cv=none; b=ZTkdP/Ez5d+B6HXAx4SQxNAQz4v0GaNJ15nHx5HGdKdwfq7g9xOenzGqSLYCboOR0CbVrI Na7CCaLi9jPMkxDaqoUHN383Cs9I1mTTN9utTCfHhqM6WXY/QAdqaqX+Os3mAiEuJbYW3y 5yCedd/GTI0zQDx5mLQMKYlWPr2Zo/2hTij/vNz8LfeIS5S+Qxzwn/4gjTrt87pxKFem2Z 0wPAD/oHT9TGz2p/LGNo9JyudrUgxbbj+LNLrxcwceF7smKisEk3xpDiMzJuJvQCaRnoWx KQImwmtdonexaTJa94hwTwOVDza4g4QSgsBdK+PQvKS4sr7A53HkYoAgGvOSWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBwvJ57ydz8hV for ; Thu, 20 Nov 2025 11:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id de57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 11:23:08 +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: 40a76b0fdc36 - stable/15 - iwx.4: Follow the established style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 40a76b0fdc367722fdfb8bf1aebe02cf862037c5 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 11:23:08 +0000 Message-Id: <691efa1c.de57.410ff88b@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=40a76b0fdc367722fdfb8bf1aebe02cf862037c5 commit 40a76b0fdc367722fdfb8bf1aebe02cf862037c5 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-16 19:10:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-20 11:22:34 +0000 iwx.4: Follow the established style Fixes: b0c1ead2b9be ("iwx.4: Fix SYNOPSIS") Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D53760 (cherry picked from commit ebb0b4822699eb614d5e9418c0a1bf6b30718699) --- share/man/man4/iwx.4 | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/share/man/man4/iwx.4 b/share/man/man4/iwx.4 index e57ddbc7c980..5f978b210f78 100644 --- a/share/man/man4/iwx.4 +++ b/share/man/man4/iwx.4 @@ -24,16 +24,20 @@ .Nm iwx .Nd Intel WiFi 6 IEEE 802.11ax wireless network driver .Sh SYNOPSIS -.Cd device wlan +To compile this driver into the kernel, +include the following lines in your kernel configuration file: +.Bd -ragged -offset indent +.Cd "device iwx" +.Cd "device pci" +.Cd "device wlan" +.Ed .Pp -In -.Xr rc.conf 5 : -.Cd devmatch_blocklist="if_iwlwifi" -.Cd kld_list="if_iwx" -.Pp -In -.Xr sysctl.conf 5 : -.Cd dev.iwx.?.debug=0xffffffff +Alternatively, to load the driver as a +module at boot time, place the following lines in +.Xr loader.conf 5 : +.Bd -literal -offset indent +if_iwx_load="YES" +.Ed .Sh DESCRIPTION The .Nm From nobody Thu Nov 20 11:25:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBwyM2PwYz6HDds for ; Thu, 20 Nov 2025 11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBwyM1hFJz3ltT for ; Thu, 20 Nov 2025 11: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=1763637947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xol62QX8ghf4PFf/VLOM7FDEi9su+P3EUaz12f04Znk=; b=KVSHRW4tOX+psksbrG6veUR+LdVOqCG8r69EMRnFb/HbIyBYkmhyWU3lHoQ6Gf0bQntr4H y+sWAbEKDnnh8t6FccrOAN4QZHp2ZK5EDa5exEdHgVzQ5SihvsCCknqgx/9/pkOtW3Gh3L 02EY3Ugg4tHSU6RM45NCSbLU4dsJI5X9YC6FtndJaC09dSU3Gnvflksb3onI8+8rmDNYwx CI+4pzaInSzypU7xYv2TNoawdJK6oQrMFubN+uJTxMntzNBN4v+rJX3wBTMvSJpqTqct+W TROQZULIrsMpnpzeWJjE92XFp9cjgMQycuiQxCGMTk0YdP5gl5vTLJxtf+5DqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xol62QX8ghf4PFf/VLOM7FDEi9su+P3EUaz12f04Znk=; b=LJDfUshSZJPTTSXT1xODNFGZbF+mCSzDitAoR0I1OzV/cNMm6GpIJKzrzKVVf6qSjxU8Iw HWs16R7IzrWUN0aRNdmO+hnq6TXNGyScs8h+QEtk7CGqkjCaxHGirDRB3zgDwfyBfQXaDO s31pwU9VrhlHPzDFVOB3VymndenkOkuaSS8HcpDL7OtU1oX9hYVhJBrBszWKMo/cWTVFpM /dwmPE6L0Yzoei4ly6blNt51OXFT/74NK85mU9UxPwETVFj2dAfUA2nA/K0M6B/DaLcVpx V0m2jiojCi2JevprhZVQKJsqpYpQqbzZNR9QqMPkIigvsg0Q6zzb4ZlKAA+1oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763637947; a=rsa-sha256; cv=none; b=ptw5vedX0fLLEVdyyWKuif9uDgcizamMJOMxz+s1BrObnW4wNJ1X/l66g6xtpzCRAQglKB eX4o+INRVCxGxJGuAQl0+kOGMlcvU1fR1EzK5cBCn46HcYhCuHGuRqwRVOEXUlhvOwSwR3 31VbX19MOwKEuFez6fy6LeeTO9qjLjEMxalSDeU5Pr3hymnvDl+Bng1piFGI6+h5pIAnVa FQ9Lchs9w9vd2Sjj8YPd0oyzLHCMR/uI+UdIjkVCNGCo4tIAcDzUXGeXWFBYob4/WZYfNw rkEwkKXwr4/npoPGgVKE6x3MqsYsEwdcwJZvQZ7XVr8VJmua9TsgIeu04tiabw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBwyM16GCz8Rb for ; Thu, 20 Nov 2025 11:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e693 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 11:25:47 +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: fcca6e11694d - stable/14 - Use install instead of cp to copy bootstrap tools List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fcca6e11694dbfc24abed7b484fe8cc8fc9affa1 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 11:25:47 +0000 Message-Id: <691efabb.e693.4858a0fa@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fcca6e11694dbfc24abed7b484fe8cc8fc9affa1 commit fcca6e11694dbfc24abed7b484fe8cc8fc9affa1 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-15 03:18:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-20 11:25:15 +0000 Use install instead of cp to copy bootstrap tools We need to preserve modification times on bootstrap tools, but `cp -p` also tries to preserve flags, which fails if OBJROOT is on NFS. A -N option was added to cp for this purpose, but trying to use that would break cross-building on hosts that don't have that option. The best remaining option is `install -p`, which we already assume is present. PR: 275030 Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D53751 (cherry picked from commit f3cf4c0af5af6ce95065a615f998117ec1cd63aa) --- Makefile.inc1 | 2 +- tools/build/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index e3a451b72b10..f4396b839e9a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2704,7 +2704,7 @@ ${_bt}-link-${_tool}: .PHONY if [ ! -e "$${source_path}" ] ; then \ echo "Cannot find host tool '${_tool}'"; false; \ fi; \ - cp -pf "$${source_path}" "${WORLDTMP}/legacy/bin/${_tool}" + install -p "$${source_path}" "${WORLDTMP}/legacy/bin/${_tool}" ${_bt}-links: ${_bt}-link-${_tool} .endfor diff --git a/tools/build/Makefile b/tools/build/Makefile index aff664f2a68b..cee54fb71403 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -331,7 +331,7 @@ _LINK_HOST_TOOL= ln -sfn # When building on FreeBSD we always copy the host tools instead of linking # into WORLDTMP to avoid issues with incompatible libraries (see r364030). # Note: we could create links if we don't intend to update the current machine. -_COPY_HOST_TOOL= cp -pf +_COPY_HOST_TOOL= install -p .else # However, this is not necessary on Linux/macOS. Additionally, copying the host # tools to another directory with cp -p results in freezes on macOS Big Sur for From nobody Thu Nov 20 11:25:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBwyN3f7rz6HDX2 for ; Thu, 20 Nov 2025 11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBwyN2Ffhz3lpF for ; Thu, 20 Nov 2025 11: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=1763637948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35v3OQiRT/wWkckuCzMUlp7Ism6Jo1XUlqO9SlrDuNc=; b=nI1HIpM14Fk4ao2Fo9YknB98/2q59ERLavmQdUFNXCwWVWEJ0KXETaZpoteOjgJCKl0X+K yAYCTBMz5wwN9fCphQT7gB0lKKvVNSSYfq3x4BmEUQbytO1BGg0kkklVGFIWNXsAhhX8DR q89VRwA5Wu6sI3+bmntFEKcRWey3Uc/qpdEdGcwKBqF2UJ3ERdhG4VLAEXR8a/qYVAFYhD uaN2UztvuXDCv4VN+5NsSYAhmz8DB2rxmVQDcDXFnaQDQzQjgQeKdR4L/3aUBwiLbPQnTu VHHRTZG+lycmMCwhIMqKN8vftUUhpWZVF/Ej3vRQAdzh+qFCxRHHd/Wb2cktuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35v3OQiRT/wWkckuCzMUlp7Ism6Jo1XUlqO9SlrDuNc=; b=AQgqaajE2Yw8q3RXimmf/ksqI6/kVKf8YzQmOqrjJ9YUsf6oJ2jp6Di3VuEwVfTDV1KoMY 6aydFafm9kwnqIneSyQbz4Az1lCclKuf2/Kw9HIenNpDWKhIGDXcBUafhUCmwMyFv6OM6S qD+DsIjwIgRN+Ky4pn0pQ+0SeNU3wG6FUCkeOF9UEPQL5Wf658huP5aCw9rzBBNpJuYzk/ ukCg4f5gqqBP7GyJb0Gj4WnubSuDw2AC9YCWPsP3CyhNX1jv+MbHd80EvqV2xc8z7Ij3tY ZSpz4K4AwX6WZDsu6M50glZrrUvkgf5tJLJfvA8LUIqV9WDYwrVY3xx0JhjwuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763637948; a=rsa-sha256; cv=none; b=TeypT9+GY5dyybglo0Hd92uYE8sCrNmKV6Rl6v2w7pyw/VkmrXes7MbsPzv6kaOs1NZfkh PwEgzoXKmDZmxCmtrQmeotspINInu/rDT2I46ogQCqdC745tgXzZJwDfNSHvTpx1BmoH8I ku0RPSFYj4IHr1NC7FBzAbaTd8cfkd/HYu3YQqnomIKM3gMlYb3/Z2SbzwgpWphgmSRxJW DHns1b3zuILo1ImBLdijESjKy81fpTrS54DGWal+/s5cWwAQBDMujDIBtTSGD/r6zHECYh 8qxWgACfi6TWN3MgUyczPlUDljQh6TDkNoEJtTnbiqTvHLNVQE8hVxFWs15FWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBwyN1plZz7wf for ; Thu, 20 Nov 2025 11:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e985 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 11:25:48 +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: b4a6b62e683b - stable/14 - NOTES: Add iwm List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b4a6b62e683b9f1d86525d921e4abc9c48d195e7 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 11:25:48 +0000 Message-Id: <691efabc.e985.31182de@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b4a6b62e683b9f1d86525d921e4abc9c48d195e7 commit b4a6b62e683b9f1d86525d921e4abc9c48d195e7 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-15 03:18:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-20 11:25:33 +0000 NOTES: Add iwm (cherry picked from commit b1039bbe185bbadea24207b600f4bea065a2dbee) --- sys/x86/conf/NOTES | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/x86/conf/NOTES b/sys/x86/conf/NOTES index 5042585da310..c329613378b9 100644 --- a/sys/x86/conf/NOTES +++ b/sys/x86/conf/NOTES @@ -441,6 +441,7 @@ device gve # Google Virtual NIC (gVNIC) device igc # Intel I225 2.5G Ethernet device ipw # Intel 2100 wireless NICs. device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs. +device iwm # Intel IEEE 802.11ac wireless NICs. device iwn # Intel 4965/1000/5000/6000 wireless NICs. device mthca # Mellanox HCA InfiniBand device mlx4 # Shared code module between IB and Ethernet From nobody Thu Nov 20 13:31:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlb3HkYz6HP8M for ; Thu, 20 Nov 2025 13:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzlb2CBcz44b4 for ; Thu, 20 Nov 2025 13:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FBVqRVbM25rwL9XWgxP0fg+Pwpy89G4Ro2NTXKhiDdA=; b=v8ZCkLOs7Wp52Q705Lf9NBt8C1behzpENiuZzdrfrcll2paKUMRIax0owNKB5Q0ziy6u+u lb4n7hbElD0r3AwqAQXCywpRSAH+j5Xd/yyHBGYpEjDmwKPTMJRe944Mxu0gtkjLjiFo17 0w93NhIbs5KvWQ1HnUWyuckFFwfY/Vd6h+k307YOgmo8B6AUmwpUPLpOzDGQydmrTKoFwm P0gGNR9psFsf95AtJa6iEwODXO3RU3VExboJC6cqUwARtLx77OgC4q5YU/SFh19nN0P0iO kFI7oJsfW15dweICDsv4XY2YKG3WY0pDmU60TOL9ZpTnLINl+fxPFNpS2bs16A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FBVqRVbM25rwL9XWgxP0fg+Pwpy89G4Ro2NTXKhiDdA=; b=umgAbA/O8Rn8CeYCLiazW8aN09iOlI16w9dLIQWZynhqt3OVmVBINgWNWMZyzPyt7Y/yyu zvZO8+K0zA/dBMjDv6wMGU1XDuK0isc1zKCjqDIgv+4+/oTLHOYDw/BuMQnxE4dTKrbTk3 miOmRjv80DipyEtqp8ABseQ3Nekr6NC5qYCwTINlT1dhjeiFnM/cv3Pqdy2KZOFACl6Oc1 APHosmQWtcDWl2JpfkbgMRZCi2j8EpmiwJnklIzVQvaodOzzm9oKtM70cVIPNUK1nTvxtp OBgoXbrJOROn/tCVZ6p27PimqAOqHg0uJO9n44vbnK/WCrBex/dvDX/ibcx+7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645499; a=rsa-sha256; cv=none; b=yzbTh3hA+YhN2uX+l3j/PdsLW9dGx3SklsBMrT4HaNkXJzcLBKapeBfu43wNTh1UxYmYLo kIMtodbdbh/bEvXBpSHmId7iOtlH7nPCWDimq2HZS0iJlSbicMMxfpkOHS63j30eGBRFOJ fIL/SkHpjot1avUsChBjITnXiOyOe9A/tpVoRH7+aWLxSvcg0usDgMWUY83uLw2TOW9MTd o//Dqz+jklaQn6IPqxf4r+kHaGQAjZJ3KmZ7XbZCeMkB+mnJ60H7T40PN26mU5GsFwpUFd 7W7EOx+yh4H9nyJ3lV/aL8HZFZYYi5aYXNGpIA+N+fmIXtD7xvw8ixL4LFHRCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlb1p4wzD0t for ; Thu, 20 Nov 2025 13:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2cd91 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: d26b3c9b3415 - stable/15 - cuse: Fix cdevpriv bugs in cuse_client_open() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d26b3c9b341522090885ec362aa5cd1f90eb57c9 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:39 +0000 Message-Id: <691f183b.2cd91.71b71dca@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d26b3c9b341522090885ec362aa5cd1f90eb57c9 commit d26b3c9b341522090885ec362aa5cd1f90eb57c9 Author: Christos Margiolis AuthorDate: 2025-11-13 12:11:06 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:14 +0000 cuse: Fix cdevpriv bugs in cuse_client_open() If devfs_set_cdevpriv() fails, we will panic when we enter the cuse_client_free() callback, for a number of reasons: - pcc->server is not yet assigned, so we'll use a NULL pointer. - pcc has not yet been added to the pcs->hcli TAILQ, but we'll try to remove it. - pccmd->sx and pccmd->cv are not yet initializated, but we'll try to destroy them. Even if we'd get past all these somehow, we'd still get two errors in the devfs_set_cdevpriv() failure block: - We'll unref the server twice, once in cuse_client_free(), and again in cuse_client_open(). - A double-free panic, since we'd be trying to free(pcc), which has already been freed in cuse_client_free(). Fix all those issues. While here, also get rid of some unnecessary devfs_clear_cdevpriv(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D53708 (cherry picked from commit 634e578ac7b0a03ae25427c723c0da27e894a340) --- sys/fs/cuse/cuse.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/sys/fs/cuse/cuse.c b/sys/fs/cuse/cuse.c index b2524324584a..b914b2d5017c 100644 --- a/sys/fs/cuse/cuse.c +++ b/sys/fs/cuse/cuse.c @@ -1516,13 +1516,6 @@ cuse_client_open(struct cdev *dev, int fflags, int devtype, struct thread *td) } pcc = malloc(sizeof(*pcc), M_CUSE, M_WAITOK | M_ZERO); - if (devfs_set_cdevpriv(pcc, &cuse_client_free)) { - printf("Cuse: Cannot set cdevpriv.\n"); - /* drop reference on server */ - cuse_server_unref(pcs); - free(pcc, M_CUSE); - return (ENOMEM); - } pcc->fflags = fflags; pcc->server_dev = pcsd; pcc->server = pcs; @@ -1553,10 +1546,12 @@ cuse_client_open(struct cdev *dev, int fflags, int devtype, struct thread *td) } cuse_server_unlock(pcs); - if (error) { - devfs_clear_cdevpriv(); /* XXX bugfix */ + if (error != 0) return (error); - } + + if ((error = devfs_set_cdevpriv(pcc, &cuse_client_free)) != 0) + return (error); + pccmd = &pcc->cmds[CUSE_CMD_OPEN]; cuse_cmd_lock(pccmd); @@ -1575,9 +1570,6 @@ cuse_client_open(struct cdev *dev, int fflags, int devtype, struct thread *td) cuse_cmd_unlock(pccmd); - if (error) - devfs_clear_cdevpriv(); /* XXX bugfix */ - return (error); } From nobody Thu Nov 20 13:31:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlc4Ydrz6HPQ3 for ; Thu, 20 Nov 2025 13:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzlc31CRz44M8 for ; Thu, 20 Nov 2025 13:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lcy0wad7lnD5i+sMSTZn95QO7OSe8opb/zqEvdzCQQk=; b=QAoYaD36tns56ih1GklIOstRPhKsWKbnMYiKAHzZY0Ws/u9fIKGhC48YzkTt0upQgWc/cH RIhG7KCv+uJmHc96G4Rukk9fD5/+mbwlAH6pNiQv9jJd/zKK92sjAAznfqOFEUUVyvT0TH SO52lVnfrTbmvv18WMyDPj+v8FzReJtU2xsnQ68Hd3Z/kGtdkRdNIkyISSEjgyhJdpIw9a FNmMhq801h18Yv9KGgsjNNAPAz/WTz3pkFlKNpI/pCa3GZFI94wW9zf/737EU/MMgTjPB5 M+hiUHp14iAvETkeX1YXH/xgMcw0jIYBA3sjPikUplkoJc/ZxXE7NjJ9r0BDUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lcy0wad7lnD5i+sMSTZn95QO7OSe8opb/zqEvdzCQQk=; b=wr9CoNZ3nJlQVQa4vY92+4XAT2teCwi6yWprCVXkPWlGyd1VnCDTBbdEctCJ3ISMchTt1m FyTmlxjL4V7kAts0iCOx3K0OkQ5RJ1VGaM/Wm60ggNIqqfOdrNzJ1WGZqNWJXbsj2VINv6 UjHrA+XcrtOIir1eqO+7PS9MXyU0Vz2o4AcUlVdAFhn+Md7XNPrBVKeIle4FETSftXUfEx 8dQKmFWrlhBQjr81rVxHWFqfrbio22M1uAGR6GyETquvBVjNP569ZRPagf6UjaHJDyyB05 BVXzpcBi9Ek0mADJFENRKMkkeo583B64dsO2GMSKufGTb20Nwuiwd0ibo5l2Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645500; a=rsa-sha256; cv=none; b=s5YAQrCxogdvsxlM+Gvt1l959cI1OvIYoPaUkQyq7SXyOjwSHNNOLM6xFxINxUsaNU0CPL 1VY/M1X/5NK9gXMTEqxLom6JAi9hADA21t25UatYktfrVPxjX8PV3VNEuM8xY+WpSkvRKl QMdox0vkH+4GfqUQlZ54G/akWBcytZikO7Sb2dadbnaBDfDEGfra9sGtz/9CR8SGhaEqLz 9XS/aIbf7XlTrMHL87lXqd7OwO+N9rdTVXiCFnrLDK1WhnX/NCRq1sAx8kkqmFxbBko5ch rm+BpSPbbGaoYl+geMp/58FEZbkAsegQsG7LqFra80+rr+9FcSQkVUqf2xXB/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlc2cfLzCcp for ; Thu, 20 Nov 2025 13:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2cd2b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: cc931f5bf6b2 - stable/15 - sound: Retire unused mixer functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cc931f5bf6b2a2aa2290980898bb7cb6b7805914 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:40 +0000 Message-Id: <691f183c.2cd2b.c380ff0@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=cc931f5bf6b2a2aa2290980898bb7cb6b7805914 commit cc931f5bf6b2a2aa2290980898bb7cb6b7805914 Author: Christos Margiolis AuthorDate: 2025-11-13 12:53:18 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:14 +0000 sound: Retire unused mixer functions No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit b55adf9b261b91ddd3c7293720bbbbfb4ffe7066) --- sys/dev/sound/pcm/mixer.c | 43 ------------------------------------------- sys/dev/sound/pcm/mixer.h | 4 ---- 2 files changed, 47 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index f281dff36248..5fa3ff5cc83c 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -608,14 +608,6 @@ mix_getparent(struct snd_mixer *m, u_int32_t dev) return m->parent[dev]; } -u_int32_t -mix_getchild(struct snd_mixer *m, u_int32_t dev) -{ - if (m == NULL || dev >= SOUND_MIXER_NRDEVICES) - return 0; - return m->child[dev]; -} - u_int32_t mix_getdevs(struct snd_mixer *m) { @@ -1024,14 +1016,6 @@ mix_getrecsrc(struct snd_mixer *m) return (ret); } -int -mix_get_type(struct snd_mixer *m) -{ - KASSERT(m != NULL, ("NULL snd_mixer")); - - return (m->type); -} - device_t mix_get_dev(struct snd_mixer *m) { @@ -1573,30 +1557,3 @@ mixer_get_lock(struct snd_mixer *m) } return (m->lock); } - -int -mix_get_locked(struct snd_mixer *m, u_int dev, int *pleft, int *pright) -{ - int level; - - level = mixer_get(m, dev); - if (level < 0) { - *pright = *pleft = -1; - return (-1); - } - - *pleft = level & 0xFF; - *pright = (level >> 8) & 0xFF; - - return (0); -} - -int -mix_set_locked(struct snd_mixer *m, u_int dev, int left, int right) -{ - int level; - - level = (left & 0xFF) | ((right & 0xFF) << 8); - - return (mixer_set(m, dev, m->mutedevs, level)); -} diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h index 7139a766b392..c47247ab570d 100644 --- a/sys/dev/sound/pcm/mixer.h +++ b/sys/dev/sound/pcm/mixer.h @@ -47,13 +47,10 @@ void mixer_hwvol_step(device_t dev, int left_step, int right_step); int mixer_busy(struct snd_mixer *m); -int mix_get_locked(struct snd_mixer *m, u_int dev, int *pleft, int *pright); -int mix_set_locked(struct snd_mixer *m, u_int dev, int left, int right); int mix_set(struct snd_mixer *m, u_int dev, u_int left, u_int right); int mix_get(struct snd_mixer *m, u_int dev); int mix_setrecsrc(struct snd_mixer *m, u_int32_t src); u_int32_t mix_getrecsrc(struct snd_mixer *m); -int mix_get_type(struct snd_mixer *m); device_t mix_get_dev(struct snd_mixer *m); void mix_setdevs(struct snd_mixer *m, u_int32_t v); @@ -65,7 +62,6 @@ u_int32_t mix_getmutedevs(struct snd_mixer *m); void mix_setparentchild(struct snd_mixer *m, u_int32_t parent, u_int32_t childs); void mix_setrealdev(struct snd_mixer *m, u_int32_t dev, u_int32_t realdev); u_int32_t mix_getparent(struct snd_mixer *m, u_int32_t dev); -u_int32_t mix_getchild(struct snd_mixer *m, u_int32_t dev); void *mix_getdevinfo(struct snd_mixer *m); struct mtx *mixer_get_lock(struct snd_mixer *m); From nobody Thu Nov 20 13:31:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlZ4wQfz6HP2x for ; Thu, 20 Nov 2025 13:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzlZ1Pp4z44XY for ; Thu, 20 Nov 2025 13:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H2GmjTeLx2EYOyernw0bYwlRZ58wq0UbqB2s0ejeyXQ=; b=Qft0/0XVtA1bVg6I799/U/Xepc2Ib/KjMZg93zr3Bu2Xn1nyWvv4ZPSFzQwFz/QYbmUyM5 Id8xy9ixUp5naqGLAO8BJj1RCGw4Q6Dl0599j7xM+2zUDJtF9kSWfBTyVG0VFjwGTz217I bEYzAn13QqaBmWRcE1Zc6EbOx3M9IjScrTtpaZPSGMD1uIo5DicpkDgfvuEAH3xdcBNwLR 1UhQIIjFxKnOJJiGS9lazGhMgbrujVHu/kDJFvF2g7FuCUVu05wpp1SdbHkVsRFLNVQFJo Uaa22NstczrggIExfLDoieFmDpNoxgb6EJBFfpPD5p/hyMzEkTr+NbJf4eZ3xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H2GmjTeLx2EYOyernw0bYwlRZ58wq0UbqB2s0ejeyXQ=; b=R4bdbKtuJAkqXA5lrEKAcA0dx+qbPv8fuRpQMHdQj1olBeNzAmGz87BppY4pEs+Pd+u4FA pXSIcyVK1Qgva8JvyzXOpE5VCkNzDsIa5If1DGcQBaOdmvwo0q43crMfXzVqy4AO96i0lY B44g4PVW/ui78muY9kxNGEia4MGyBreBV0m19F7kVSWZv0y7LmIVbxEok/msKGkdp4V6Je 8ZMRoe6ovCZFszMYgfb87n668k0LX6rTKTmjLJg2uYhkSYBFwKdfETVqFj/u0vvh7vvhNW u5EnvVmOCJekVLGDmZwTA7nRAFg5ftDlPd6ZNDd530/vgB4eww8JHTUJfPojUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645498; a=rsa-sha256; cv=none; b=p3dHYgFufkoo+2yPuz3/xHxnNF5MHo0rOwWM57VHW9ykmxWJmU1W5a4qeyaDvObzPs9W9/ 7toDDeOsC3nCdxsE5QGhUdamDClg8p2b4apmW1jydr1vCOp5N7c/ELuI8/CbN/Qba51nE6 a00VsD9zPxpSfrNoCsoIr6YTV1joT/xdAQccUAoAbfs26YtPhXnonJBNvj0ckpu/iC9ZbN SKWU9vGDkMz3sFGUTPKyzwbUp1dxievmIgAQDLzomgFsAiZcBHRJLV5vlqLt1tHbt6ycX5 /yLsEHkyVmXTXxe/73Boifx7kSZ+t+35bBe8mSuE4nBztD5wiPpo64225HtDTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlZ11SgzC8Y for ; Thu, 20 Nov 2025 13:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2d492 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 80873ecdc11a - stable/15 - sound: Remove dead midi code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 80873ecdc11ac673bf5a3e7d7120191f40ef97f0 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:38 +0000 Message-Id: <691f183a.2d492.79ccaacd@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=80873ecdc11ac673bf5a3e7d7120191f40ef97f0 commit 80873ecdc11ac673bf5a3e7d7120191f40ef97f0 Author: Christos Margiolis AuthorDate: 2025-11-13 12:10:04 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:14 +0000 sound: Remove dead midi code Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit e4b31985b54b626b2bbf486a82dd789f3dd381db) --- sys/dev/sound/midi/midi.c | 137 +++++----------------------------------------- 1 file changed, 14 insertions(+), 123 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index eed7ce89a919..b39288675ea6 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -62,12 +62,6 @@ #include MALLOC_DEFINE(M_MIDI, "midi buffers", "Midi data allocation area"); -#define MIDI_DEV_MIDICTL 12 - -enum midi_states { - MIDI_IN_START, MIDI_IN_SYSEX, MIDI_IN_DATA -}; - #define MIDI_NAMELEN 16 struct snd_midi { KOBJ_FIELDS; @@ -86,12 +80,6 @@ struct snd_midi { struct selinfo rsel, wsel; int hiwat; /* QLEN(outq)>High-water -> disable * writes from userland */ - enum midi_states inq_state; - int inq_status, inq_left; /* Variables for the state machine in - * Midi_in, this is to provide that - * signals only get issued only - * complete command packets. */ - struct proc *async; struct cdev *dev; TAILQ_ENTRY(snd_midi) link; }; @@ -326,10 +314,8 @@ static int midi_lengths[] = {2, 2, 2, 2, 1, 1, 2, 0}; int midi_in(struct snd_midi *m, uint8_t *buf, int size) { - /* int i, sig, enq; */ int used; - /* uint8_t data; */ MIDI_DEBUG(5, printf("midi_in: m=%p size=%d\n", m, size)); /* @@ -341,111 +327,22 @@ midi_in(struct snd_midi *m, uint8_t *buf, int size) used = 0; mtx_lock(&m->qlock); -#if 0 - /* - * Don't bother queuing if not in read mode. Discard everything and - * return size so the caller doesn't freak out. - */ - - if (!(m->flags & M_RX)) - return size; - - for (i = sig = 0; i < size; i++) { - data = buf[i]; - enq = 0; - if (data == MIDI_ACK) - continue; - - switch (m->inq_state) { - case MIDI_IN_START: - if (MIDI_IS_STATUS(data)) { - switch (data) { - case 0xf0: /* Sysex */ - m->inq_state = MIDI_IN_SYSEX; - break; - case 0xf1: /* MTC quarter frame */ - case 0xf3: /* Song select */ - m->inq_state = MIDI_IN_DATA; - enq = 1; - m->inq_left = 1; - break; - case 0xf2: /* Song position pointer */ - m->inq_state = MIDI_IN_DATA; - enq = 1; - m->inq_left = 2; - break; - default: - if (MIDI_IS_COMMON(data)) { - enq = 1; - sig = 1; - } else { - m->inq_state = MIDI_IN_DATA; - enq = 1; - m->inq_status = data; - m->inq_left = MIDI_LENGTH(data); - } - break; - } - } else if (MIDI_IS_STATUS(m->inq_status)) { - m->inq_state = MIDI_IN_DATA; - if (!MIDIQ_FULL(m->inq)) { - used++; - MIDIQ_ENQ(m->inq, &m->inq_status, 1); - } - enq = 1; - m->inq_left = MIDI_LENGTH(m->inq_status) - 1; - } - break; - /* - * End of case MIDI_IN_START: - */ - - case MIDI_IN_DATA: - enq = 1; - if (--m->inq_left <= 0) - sig = 1;/* deliver data */ - break; - case MIDI_IN_SYSEX: - if (data == MIDI_SYSEX_END) - m->inq_state = MIDI_IN_START; - break; - } - - if (enq) - if (!MIDIQ_FULL(m->inq)) { - MIDIQ_ENQ(m->inq, &data, 1); - used++; - } - /* - * End of the state machines main "for loop" - */ + MIDI_DEBUG(6, printf("midi_in: len %jd avail %jd\n", + (intmax_t)MIDIQ_LEN(m->inq), + (intmax_t)MIDIQ_AVAIL(m->inq))); + if (MIDIQ_AVAIL(m->inq) > size) { + used = size; + MIDIQ_ENQ(m->inq, buf, size); + } else { + MIDI_DEBUG(4, printf("midi_in: Discarding data qu\n")); + mtx_unlock(&m->qlock); + return 0; } - if (sig) { -#endif - MIDI_DEBUG(6, printf("midi_in: len %jd avail %jd\n", - (intmax_t)MIDIQ_LEN(m->inq), - (intmax_t)MIDIQ_AVAIL(m->inq))); - if (MIDIQ_AVAIL(m->inq) > size) { - used = size; - MIDIQ_ENQ(m->inq, buf, size); - } else { - MIDI_DEBUG(4, printf("midi_in: Discarding data qu\n")); - mtx_unlock(&m->qlock); - return 0; - } - if (m->rchan) { - wakeup(&m->rchan); - m->rchan = 0; - } - selwakeup(&m->rsel); - if (m->async) { - PROC_LOCK(m->async); - kern_psignal(m->async, SIGIO); - PROC_UNLOCK(m->async); - } -#if 0 + if (m->rchan) { + wakeup(&m->rchan); + m->rchan = 0; } -#endif + selwakeup(&m->rsel); mtx_unlock(&m->qlock); return used; } @@ -480,11 +377,6 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) m->wchan = 0; } selwakeup(&m->wsel); - if (m->async) { - PROC_LOCK(m->async); - kern_psignal(m->async, SIGIO); - PROC_UNLOCK(m->async); - } } mtx_unlock(&m->qlock); return used; @@ -526,7 +418,6 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) m->rchan = 0; m->wchan = 0; - m->async = 0; if (flags & FREAD) { m->flags |= M_RX | M_RXEN; From nobody Thu Nov 20 13:31:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlf6L3Sz6HP0X for ; Thu, 20 Nov 2025 13:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzlf4vQvz44GJ for ; Thu, 20 Nov 2025 13:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EZXlrRGnYhGx29RyCC1+JXGq6bikea5llOtAxRozB5k=; b=CK1hj+BNwph16vIRwzCSgTA/HKJqLdPub6F/4K7B7650Wi0C3emww5IvqD2X91q6f/s7Vw fRRz3Li/tDTTcuSqOPiOM0WqW1eze6YssOTHPw5+rhtbu+M7kKmIfoi9vjQ9liIb4FLQO2 VyomVazb9Azd4JkZzrkb6UPA9xFvNSNMhgtEa8dhzyzsR2WGruPbfzM/EabM2JbZAGch4m tqDsoGc4RIpyxALsY1akOvWZSX1ZwzCW0FRrGZ1RC5lCfW2wgc9OWMb4yMRB3lAOw3/s2G 1ds2PKNb7T45GdksmboNjyEdSWB/+FrLPpqiXD9cjUCC5Z9Se8d9o9X1dWHIVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EZXlrRGnYhGx29RyCC1+JXGq6bikea5llOtAxRozB5k=; b=vWiLC9Rwlwh26xfYFyVHVOdzzLy1zRoCZrYLOiYqnI/mvlVAw+EFY04h2iklCTIwEIGAmS S8tDzn+Npwop7U/1fmq08LSw/EwL/lHNTsvQVNNxWk5cHSUGnodas78/U25Oy8L3tQceM5 gxQd1gbRycswHohmUnzB6JqicIe5HhgCpBQShW3LDOHINPWUltFEhJc2gmOSYYD6yKmDfp 2ePFoJfv7IlMgxQDbOHFG7spuLaRGqi+uRIBXk58pw/Cda0dzs4NApxK1hZXbRAb8PesQN ZcVVuon5Zsxdo+CyuOxBeZq5CaX2xJn65ChFQcc2wrMdMuvDqiQE1GXW88ORzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645502; a=rsa-sha256; cv=none; b=bhHu8oBvEarW0WpMZhRsV7BkrjlhWjDtVf0Q2XvyGHOaPGW6PZcZmV29wGEn2GG/YnE8rN 5xyoRzyE7/UOwqY6vzGnX4XySrfHFpF9eC7wKXGv6Ml42muD/T9+KTXfH7jIUyHHEBq+vO xKQ1z6Wn4UIrNXol8Zig14q0h83xPJD6WKem3nIEDxB0VKDINERqCxWZwREzfr8JeTHGx2 xHxfTDCYB1bv0XhvF7GzKxKE5wddif3kwO8Qd4GU7GFQfJW+vpAvcq44MlIYcOs7yZ6ga6 a3HUpizNvmPXmNlVl5kiRSiprcNiiQeUZdsjcxm1C5IJx0zEsg3g2sdHte8zhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlf4BcrzCcs for ; Thu, 20 Nov 2025 13:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2af46 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 3c1061a33db7 - stable/15 - sound: Retire OLDPCM_IOCTL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3c1061a33db7c64365a2c31a8d37423ead4c0452 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:42 +0000 Message-Id: <691f183e.2af46.2ad4cb62@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3c1061a33db7c64365a2c31a8d37423ead4c0452 commit 3c1061a33db7c64365a2c31a8d37423ead4c0452 Author: Christos Margiolis AuthorDate: 2025-11-13 13:33:28 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:14 +0000 sound: Retire OLDPCM_IOCTL It is defined by default, and there is no reason to have a switch for it. While here, also get rid of some unnecessary comments and ioctl definitions. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 1fe7bfd6c70160c064237eac104e7d9c71390c4f) --- sys/dev/sound/pcm/dsp.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index d0ed405fb25b..429586e64aef 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -72,8 +72,6 @@ SYSCTL_INT(_hw_snd, OID_AUTO, basename_clone, CTLFLAG_RWTUN, #define DSP_F_READ(x) ((x) & FREAD) #define DSP_F_WRITE(x) ((x) & FWRITE) -#define OLDPCM_IOCTL - static d_open_t dsp_open; static d_read_t dsp_read; static d_write_t dsp_write; @@ -808,10 +806,6 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, } switch(cmd) { -#ifdef OLDPCM_IOCTL - /* - * we start with the new ioctl interface. - */ case AIONWRITE: /* how many bytes can write ? */ if (wrch) { CHN_LOCK(wrch); @@ -1028,10 +1022,6 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, printf("AIOSYNC chan 0x%03lx pos %lu unimplemented\n", ((snd_sync_parm *)arg)->chan, ((snd_sync_parm *)arg)->pos); break; -#endif - /* - * here follow the standard ioctls (filio.h etc.) - */ case FIONREAD: /* get # bytes to read */ if (rdch) { CHN_LOCK(rdch); @@ -1070,11 +1060,6 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, } break; - /* - * Finally, here is the linux-compatible ioctl interface - */ -#define THE_REAL_SNDCTL_DSP_GETBLKSIZE _IOWR('P', 4, int) - case THE_REAL_SNDCTL_DSP_GETBLKSIZE: case SNDCTL_DSP_GETBLKSIZE: chn = wrch ? wrch : rdch; if (chn) { From nobody Thu Nov 20 13:31:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzld5Bbkz6HPDp for ; Thu, 20 Nov 2025 13:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzld48C5z44Rc for ; Thu, 20 Nov 2025 13:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3flrxlU4DY6QEWnGci2iTfcLqjIqfVrhh8dZQvq3SAc=; b=xPRHPSkYPmjq93ocM+eaVxMwZ94jGQvuhL+wmmmshqBNYXQYDNg0nEiVgsqwr8Y1KgGhjh ZX0zJlfrkTH0SUvZwBQoiSds9LiYv8f4zJUDMAMAyGFNCsray4y6ON9AB5eRy9MRqObYcP d/FRbApEBID80ixH1e3pi2wqStrfRi/CqkpszT2vS1smrYt4q80jx2/Y0AEcI7zCzkCRod 4vIsZ6RwxOkd6uKlU3+G1p54HUGzEqP6GQ2Rmpgew5M56aJOpjM4oRs2z44FBNpZIdIPIC RWoouoot04X9FWlQozaH7ttwFvF3QUsAUbuE7XRX8V0b4yvbGb0NLxJYHwDRkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3flrxlU4DY6QEWnGci2iTfcLqjIqfVrhh8dZQvq3SAc=; b=VwUCCJbgE/i6dFqY5l1CeXRlWhUeWZPB1/Nu+5ull7a/jGPhj1OjaSLDM7UeXEAg+K4YAo aWeHm7Mdq2I9hLboGpwtVMxMN4h+fhzzfGyHVSxw8krfO3JNfyv/Dpk2aH1rvgzwnfukLB 04rWFWTyczJVUS+Hxg3r40jCGs+7rI2q3GID35IJY1NT9IcAmk4l7t7wJO64+RirCfjnqL 6kFYfPZpbnd52E9piqLCAJQhP4Cmf/8Fxh7bwDZjzphHLIfyAgetzKPVNkZoMHN57KLo8D Sl55AMtqcFVr7SATlRlVTTJcgc1bVoRKBgB7eHfL/zQdojKFFn8JPz/QHNt6KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645501; a=rsa-sha256; cv=none; b=YgmcjWpKA/vmZAs0qTIrgslG5qQwmXxY+cdKwGXv9Z4NHSp1L/zvpBbcXlXFojtnRmWa4g 8CsWa4tVD2r2DrnsfVdQKUDiFzcgTU5mPv/+0i+WyMvAXengLHEExtIv0y4JheUUp7ZJsA sVShLhoUP8W1zbXJFOIj9cbX0eN4nI4hnTxsj3/FDp2k7Vi+bzNktrg8g1TyJm9HWdnT7c xiPksn/bkeWkTqG2MztBA0exMMk0tf0kalgNKRuaH/EgviJPfHEEoHsvUoR3IPAwiXqCgh 2jhpohkqgBEbCwTFif4LorJ35h07Ywm/olVNvzHJsn3vwjoH4uGMWw/tnRWQQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzld3QGSzCN0 for ; Thu, 20 Nov 2025 13:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2cd2f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: a6601bb409d8 - stable/15 - sound: Move mixer->modify_counter to more appropriate place List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a6601bb409d86f6a2b73a708d7ef718d3ab0d923 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:41 +0000 Message-Id: <691f183d.2cd2f.1cdc5825@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a6601bb409d86f6a2b73a708d7ef718d3ab0d923 commit a6601bb409d86f6a2b73a708d7ef718d3ab0d923 Author: Christos Margiolis AuthorDate: 2025-11-13 13:33:24 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:14 +0000 sound: Move mixer->modify_counter to more appropriate place No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 15d77c1fdcb1c7f022a21892dcb78990986f1a3c) --- sys/dev/sound/pcm/mixer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 5fa3ff5cc83c..adbde195c34c 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -65,11 +65,6 @@ struct snd_mixer { char name[MIXER_NAMELEN]; struct mtx *lock; oss_mixer_enuminfo enuminfo; - /** - * Counter is incremented when applications change any of this - * mixer's controls. A change in value indicates that persistent - * mixer applications should update their displays. - */ int modify_counter; }; @@ -1474,6 +1469,11 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) mi->dev = i; snprintf(mi->id, sizeof(mi->id), "mixer%d", i); strlcpy(mi->name, m->name, sizeof(mi->name)); + /** + * Counter is incremented when applications change any of this + * mixer's controls. A change in value indicates that + * persistent mixer applications should update their displays. + */ mi->modify_counter = m->modify_counter; mi->card_number = i; /* From nobody Thu Nov 20 13:31:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlg6cqfz6HP34 for ; Thu, 20 Nov 2025 13:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzlg5R5Nz44GK for ; Thu, 20 Nov 2025 13:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nf/+Z2ZVAsC+wsfBCD+WQjt2I89BfRkMCqOv2/jnjs8=; b=hfr63bAqML83V+37kDo5ZNqxZhUw/eMHqGxX12NBW+j097a4waKorJYl1FxQSW4TaJEGGB YaB6drG1zhVsgfZXOQtn7apNNcOb/YgmwQa+3grqJntoVzZhYdyuunQPRAslu+An8IxHYn Xj0+XiwZX8cGbQjraJ7nkGWi7AKItWeZldIks3HHd1Krv76TghHt182qwbPCpSCerZnCr0 ei81ULEkHe2Vw/t9hCrkAJfBhe7pTFo6MDp1enFX3WPKKW5D2HPJJTGHmrTO0P584eqPTZ N5Ap8SoXLGU04SahjkEHwFco5K0e353/95K24ZVeGtj8VmkltMNtga71GqTgEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nf/+Z2ZVAsC+wsfBCD+WQjt2I89BfRkMCqOv2/jnjs8=; b=E1oCermo0AymFpVXcCvnUTvcbq/AIpDTE+ja8FfFhTFtV4Pag2rK1p342ddV+OjJeJne3e LsMqYsh8F461MN6pzyjPc3k/GI6w1l1j2laA5yGrHTn/KpkMHhv4MaGlICiWouJN7+u56J 8OvaNzD4QGUlSLt++TxaKs+508Tr4n3C69LToD40t/TsUV1PoOtforcfYrNBQ1/Hc6BGMO HV6vyc/WozWzplvlmwySUKKqr2DJC7AZAzneEj1j1U/Uvlb61/hldcYUXpCaJ+OTTHjy+d Fx1H4FRHpSdZHQrcmaSSsDAp6mZVaFn3PayKlWbO8xRG+SM6JC917ZyG+X4nHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645503; a=rsa-sha256; cv=none; b=vxsxe0tBgRDm3AY7y4fmHpQQV9oGQQLsWjkY3Hi4vF+lpAasTa9CVmewRbadGDwcll3d0y 0q5CBM2CbB0LSaVP0vt1bregYpMI40af3nydfDndc6aFTSVYz2MooIO2LbxLHvbbB7fP9K zK1kbD2BrDwktUhwdaCZ8ssI639tPHi2jTQopewNICUyOKch33i9KKHiJYZIurxRr/vunf jhRUpgSq3iXxByGAMaucny8seLQt0VrVixy+W7Y2uvNCCjoVz60XbwYJ5CcBcy6J0YEJNq ecHvzFhWPNpEGRGhmj3K3qFtCY7BxJnYfYCaVBMmmUJXQHX92nrujo52DSjy4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlg50JxzD37 for ; Thu, 20 Nov 2025 13:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2b17d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ccb095bd1c98 - stable/15 - sound: Remove unnecessary uio checks in dsp_io_ops() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ccb095bd1c98b5b053fe8065c013ec028e174dcc Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:43 +0000 Message-Id: <691f183f.2b17d.5c62d1da@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ccb095bd1c98b5b053fe8065c013ec028e174dcc commit ccb095bd1c98b5b053fe8065c013ec028e174dcc Author: Christos Margiolis AuthorDate: 2025-11-13 14:35:48 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:14 +0000 sound: Remove unnecessary uio checks in dsp_io_ops() uiomove_faultflag() takes care of that already. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D53733 (cherry picked from commit 6b5431941c10b6fdf164ad9d3dfa4b4f1b2edc22) --- sys/dev/sound/pcm/dsp.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 429586e64aef..f7188fd16356 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -467,10 +467,6 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) int prio, ret; pid_t runpid; - KASSERT(buf != NULL && - (buf->uio_rw == UIO_READ || buf->uio_rw == UIO_WRITE), - ("%s(): io train wreck!", __func__)); - d = priv->sc; if (!DSP_REGISTERED(d)) return (EBADF); @@ -488,9 +484,6 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) ch = &priv->wrch; chn_io = chn_write; break; - default: - panic("invalid/corrupted uio direction: %d", buf->uio_rw); - break; } runpid = buf->uio_td->td_proc->p_pid; From nobody Thu Nov 20 13:31:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlj1JQWz6HP5L for ; Thu, 20 Nov 2025 13:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzlh6GW7z44Xj for ; Thu, 20 Nov 2025 13:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A1NKu/ZiZe4LdKSGMVfDn43/mkmNBwlMGpj4hIrxrng=; b=DBCYhViS/oJCRmJIO6dWUNFaxoyKxmXzB7woIfeFu2ySnQD1KRfnAPGZSjn+HoOj5UQZtF NzZhdUDYIxmKaX8ktf15/R+EQ2TeWwN6G9y22TyeZzU48Ee40DCeeY5n1+d5BHWzMCDYmU OQ/cpWz1HB0V4SY9J+jOFNSkFm2yXRU+Sdh0OhDkS5m8mTOugjMctXZmwC6WS4bUbg2KDx +x4OBDA4q0nyWtJtFwnxzzb9S5X7RXWY2BRxo+CIYd1rYTYhR4sghYN3uGZSvsY3AeDxPh MM7iyWtOtBzNjXUBEpk3jZJTlgWLTyq70ns4fRNnyqt4pgNcD2tNPAFyNtYxhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A1NKu/ZiZe4LdKSGMVfDn43/mkmNBwlMGpj4hIrxrng=; b=cZ+zBLJeyGzsEbajnmzWiNofv6q0XmexzPuC4k+wNcXoxQTZCOBAHAKxz2mhY7ULeT73pa mcMvWBASqenJ5/keKtzLMBVM4cv2pSc+GBgcVmb45M1kH0mzfVYdybUpsH1VhWAP4GofPd Ol5zpeXriB/OiW5bBfJpreqpovJiZarf+MyZS7CSXnfbSZ9yrRaEdHy3KIr+p4JcgdP/YW 9MW0RO/IVPwdWDG1td1X05ZxLAj2kydWZFhBBmoGuvQ7UyZW9/7uxcMf0UFoup8OmPq2TP A5EzipHS7xnrxWl6PRwBEmLLpkwl/kkWKGKZbq+/7qrC+IpdqJUSzyPpdb8wAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645504; a=rsa-sha256; cv=none; b=HYXC8b0U+evNT3NcBo/qTBScvBYVtjckpJs/2CZNhI2A8dEwwLGWwFSZBKX/lpU3BgFpR+ 75vHq7wn5qYKiNMyfjD48I/m3TDZl2ycyiNpKZuxO+7fgINRKQyoVHnP8jjT3Y1kmrAMIL duT+CELd0nQgCcea20UHomk2r0vs3k1xI2vTGZu8+Y9EHSo4Hbun01FgJeDwsKPy8M9Hfn RiHZYKdXoocTKEQk/uegubwMdAfgT3Ju2Ey9VyWPb/CTRZJm3cAj7Ed0Par5b9jZjaT3gJ oq49pKzn/zjrP2HYJp9xEbqvdhIgtx/AnC2BEFE/n2pUiF1uXhaPQnP0In2cyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlh5q8QzCYb for ; Thu, 20 Nov 2025 13:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2d082 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 47bdb815f31d - stable/15 - sound: Do not use double pointer in dsp_io_ops() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 47bdb815f31dc9b584700ed988a729e3f239378a Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:44 +0000 Message-Id: <691f1840.2d082.2a20e63@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=47bdb815f31dc9b584700ed988a729e3f239378a commit 47bdb815f31dc9b584700ed988a729e3f239378a Author: Christos Margiolis AuthorDate: 2025-11-13 14:35:53 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:15 +0000 sound: Do not use double pointer in dsp_io_ops() No reason to do so. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D53734 (cherry picked from commit fa7bc983076661e85107970e39de66a1e54d87d1) --- sys/dev/sound/pcm/dsp.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index f7188fd16356..1ae090f252c2 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -462,7 +462,7 @@ static __inline int dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) { struct snddev_info *d; - struct pcm_channel **ch; + struct pcm_channel *ch; int (*chn_io)(struct pcm_channel *, struct uio *); int prio, ret; pid_t runpid; @@ -476,12 +476,12 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) switch (buf->uio_rw) { case UIO_READ: prio = FREAD; - ch = &priv->rdch; + ch = priv->rdch; chn_io = chn_read; break; case UIO_WRITE: prio = FWRITE; - ch = &priv->wrch; + ch = priv->wrch; chn_io = chn_write; break; } @@ -490,21 +490,21 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) dsp_lock_chans(priv, prio); - if (*ch == NULL || !((*ch)->flags & CHN_F_BUSY)) { + if (ch == NULL || !(ch->flags & CHN_F_BUSY)) { if (priv->rdch != NULL || priv->wrch != NULL) dsp_unlock_chans(priv, prio); PCM_GIANT_EXIT(d); return (EBADF); } - if (((*ch)->flags & (CHN_F_MMAP | CHN_F_DEAD)) || - (((*ch)->flags & CHN_F_RUNNING) && (*ch)->pid != runpid)) { + if (ch->flags & (CHN_F_MMAP | CHN_F_DEAD) || + (ch->flags & CHN_F_RUNNING && ch->pid != runpid)) { dsp_unlock_chans(priv, prio); PCM_GIANT_EXIT(d); return (EINVAL); - } else if (!((*ch)->flags & CHN_F_RUNNING)) { - (*ch)->flags |= CHN_F_RUNNING; - (*ch)->pid = runpid; + } else if (!(ch->flags & CHN_F_RUNNING)) { + ch->flags |= CHN_F_RUNNING; + ch->pid = runpid; } /* @@ -512,11 +512,11 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) * from/to userland, so up the "in progress" counter to make sure * someone else doesn't come along and muss up the buffer. */ - ++(*ch)->inprog; - ret = chn_io(*ch, buf); - --(*ch)->inprog; + ch->inprog++; + ret = chn_io(ch, buf); + ch->inprog--; - CHN_BROADCAST(&(*ch)->cv); + CHN_BROADCAST(&ch->cv); dsp_unlock_chans(priv, prio); From nobody Thu Nov 20 13:31:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlk2Xkyz6HPNL for ; Thu, 20 Nov 2025 13:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzlk07RZz44PT for ; Thu, 20 Nov 2025 13:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PA0acWEGUydKbgpwTqgR6Cst/EAYFJBNM2hAkkTqgbY=; b=i79QhF4v6uEgQkHmrPMSNhKU51VRz0HbLUcFrAdeE9U+d9d5xL8W8xmBxTcJ2NCpjpTmHu gvZy5ToiWbdCfePKIs1YfpU4hCpqAbv/+Uxn8wrC82sR26MphcqXuh99YfyPvctwyZyBIW a+46k3GUgTzHqFew5ZI3XjOWJjAcetBoZcLgq5ydJNqwxSMQOaI06tcjc7RxgIsv+cZ/XJ 26ogwdl3j8WC9tClxKyk/Rj0TOTuzt6gbqB0HMm2XU6zHE5kRAYlFLQObfEgcR2T9ZEZf0 Y6EUB0fXEZmuILEzEU/UdBd2fjswQKr+MxfFKKJYuAdr+NLGqtSSdiVDOc4/xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PA0acWEGUydKbgpwTqgR6Cst/EAYFJBNM2hAkkTqgbY=; b=ChBEaXgBx0KwyzXl1WwRODzssnQPh6iqNyt146wHqTR3N5sYSoFCTMOmc3i5/B2b3F3BXT i0Di/ZbVA0hJ08eXBOT+aC+LzXBBQoV8Nt1j6YpPcnb0OHuI/p2jzwy6o4h6UzWzBpNQjx K/MGApaXculV37yq4bQNha6jacrrOi4sONb7ReTWjxStBzX0n7niWbmJ09pjiZ81/dFFrw 9sD9YtLWUu8397kF8e2AnLwzBeEPDHFCuk5Wc06hHMUW894H6y8CnvwJsu52NArDVAhhEt jwgD3HttiTbTljwl/pNMqQ2ci6julA6c+BTeq+gT0WIk9LFkZCnqQbcImKKETw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645506; a=rsa-sha256; cv=none; b=kPjTbv4eF98BiW2VO5kewhZEFwiZU1Jl7eQOdQhAch8CHjLn2L3xgtp9OC5KGyW2y+ygbT FLpNFq5JTYgTwlomfSkt6wikiCbLjKT3JA0Hr9/Nw6AtCZDxKWxTXcQqTvrFhEZ96uf+xN Szq0c4XGhiCarTSRsQQgd/XKTSN7Q5BRSpLalegK7YY7jaxvtZ9/BeKGwYLsvvk1TmD+PM YVxgKx2FdNv2N+XTTjtxbUyOxmxCRdCRsNOlNTMHOZuxuR6BvBGiEuvdWkqenFweDSo+GF ykNpsmvjjZNsRyVAdyU6PkMEZYQnjYw5EanwX4T5c5URY5YTLP8M+l4cBn2t2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlj6lTMzD0w for ; Thu, 20 Nov 2025 13:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2bd45 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 538df10f545e - stable/15 - sound: Retire SND_DIAGNOSTIC PCM locking macros List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 538df10f545e8e658a7010f7ec6eb9834f1aaf1c Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:45 +0000 Message-Id: <691f1841.2bd45.47ed0749@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=538df10f545e8e658a7010f7ec6eb9834f1aaf1c commit 538df10f545e8e658a7010f7ec6eb9834f1aaf1c Author: Christos Margiolis AuthorDate: 2025-11-13 14:35:58 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:15 +0000 sound: Retire SND_DIAGNOSTIC PCM locking macros Disabled by default, but also redundant, since most of the errors they catch will be caught anyway by WITNESS and the locking subsystem. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D53735 (cherry picked from commit b19e61f223a1982cce103b9716568391a071892a) --- sys/dev/sound/pcm/sound.h | 103 ---------------------------------------------- 1 file changed, 103 deletions(-) diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index c5107d5fba1c..8542a96ccb14 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -251,108 +251,6 @@ int sound_oss_card_info(oss_card_info *); * For PCM_[WAIT | ACQUIRE | RELEASE], be sure to surround these * with PCM_LOCK/UNLOCK() sequence, or I'll come to gnaw upon you! */ -#ifdef SND_DIAGNOSTIC -#define PCM_WAIT(x) do { \ - if (!PCM_LOCKOWNED(x)) \ - panic("%s(%d): [PCM WAIT] Mutex not owned!", \ - __func__, __LINE__); \ - while ((x)->flags & SD_F_BUSY) { \ - if (snd_verbose > 3) \ - device_printf((x)->dev, \ - "%s(%d): [PCM WAIT] calling cv_wait().\n", \ - __func__, __LINE__); \ - cv_wait(&(x)->cv, (x)->lock); \ - } \ -} while (0) - -#define PCM_ACQUIRE(x) do { \ - if (!PCM_LOCKOWNED(x)) \ - panic("%s(%d): [PCM ACQUIRE] Mutex not owned!", \ - __func__, __LINE__); \ - if ((x)->flags & SD_F_BUSY) \ - panic("%s(%d): [PCM ACQUIRE] " \ - "Trying to acquire BUSY cv!", __func__, __LINE__); \ - (x)->flags |= SD_F_BUSY; \ -} while (0) - -#define PCM_RELEASE(x) do { \ - if (!PCM_LOCKOWNED(x)) \ - panic("%s(%d): [PCM RELEASE] Mutex not owned!", \ - __func__, __LINE__); \ - if ((x)->flags & SD_F_BUSY) { \ - (x)->flags &= ~SD_F_BUSY; \ - cv_broadcast(&(x)->cv); \ - } else \ - panic("%s(%d): [PCM RELEASE] Releasing non-BUSY cv!", \ - __func__, __LINE__); \ -} while (0) - -/* Quick version, for shorter path. */ -#define PCM_ACQUIRE_QUICK(x) do { \ - if (PCM_LOCKOWNED(x)) \ - panic("%s(%d): [PCM ACQUIRE QUICK] Mutex owned!", \ - __func__, __LINE__); \ - PCM_LOCK(x); \ - PCM_WAIT(x); \ - PCM_ACQUIRE(x); \ - PCM_UNLOCK(x); \ -} while (0) - -#define PCM_RELEASE_QUICK(x) do { \ - if (PCM_LOCKOWNED(x)) \ - panic("%s(%d): [PCM RELEASE QUICK] Mutex owned!", \ - __func__, __LINE__); \ - PCM_LOCK(x); \ - PCM_RELEASE(x); \ - PCM_UNLOCK(x); \ -} while (0) - -#define PCM_BUSYASSERT(x) do { \ - if (!((x) != NULL && ((x)->flags & SD_F_BUSY))) \ - panic("%s(%d): [PCM BUSYASSERT] " \ - "Failed, snddev_info=%p", __func__, __LINE__, x); \ -} while (0) - -#define PCM_GIANT_ENTER(x) do { \ - int _pcm_giant = 0; \ - if (PCM_LOCKOWNED(x)) \ - panic("%s(%d): [GIANT ENTER] PCM lock owned!", \ - __func__, __LINE__); \ - if (mtx_owned(&Giant) != 0 && snd_verbose > 3) \ - device_printf((x)->dev, \ - "%s(%d): [GIANT ENTER] Giant owned!\n", \ - __func__, __LINE__); \ - if (!((x)->flags & SD_F_MPSAFE) && mtx_owned(&Giant) == 0) \ - do { \ - mtx_lock(&Giant); \ - _pcm_giant = 1; \ - } while (0) - -#define PCM_GIANT_EXIT(x) do { \ - if (PCM_LOCKOWNED(x)) \ - panic("%s(%d): [GIANT EXIT] PCM lock owned!", \ - __func__, __LINE__); \ - if (!(_pcm_giant == 0 || _pcm_giant == 1)) \ - panic("%s(%d): [GIANT EXIT] _pcm_giant screwed!", \ - __func__, __LINE__); \ - if ((x)->flags & SD_F_MPSAFE) { \ - if (_pcm_giant == 1) \ - panic("%s(%d): [GIANT EXIT] MPSAFE Giant?", \ - __func__, __LINE__); \ - if (mtx_owned(&Giant) != 0 && snd_verbose > 3) \ - device_printf((x)->dev, \ - "%s(%d): [GIANT EXIT] Giant owned!\n", \ - __func__, __LINE__); \ - } \ - if (_pcm_giant != 0) { \ - if (mtx_owned(&Giant) == 0) \ - panic("%s(%d): [GIANT EXIT] Giant not owned!", \ - __func__, __LINE__); \ - _pcm_giant = 0; \ - mtx_unlock(&Giant); \ - } \ -} while (0) -#else /* !SND_DIAGNOSTIC */ #define PCM_WAIT(x) do { \ PCM_LOCKASSERT(x); \ while ((x)->flags & SD_F_BUSY) \ @@ -422,7 +320,6 @@ int sound_oss_card_info(oss_card_info *); mtx_unlock(&Giant); \ } \ } while (0) -#endif /* SND_DIAGNOSTIC */ #define PCM_GIANT_LEAVE(x) \ PCM_GIANT_EXIT(x); \ From nobody Thu Nov 20 13:54:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC0GD3hwnz6HQbr for ; Thu, 20 Nov 2025 13:54: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dC0GD0pmjz48Tp for ; Thu, 20 Nov 2025 13:54:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763646884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y29m93qpucwHGj3C/l5y0wlVb6Z1lGw1lR4MFgeYRis=; b=O72PPWgQsr4c88LfUpzueO3frcIPZdwMZgx2PfjmhYREavwJSeR46FHVtZnQxmTHKvovlP H6wXI2reVWQIRH4dkYeEBK6EyFxJL1pEMy7WXMxxfYO53sdkDYvQxIIefneEggQrUONMmj xFJPXOLPOILSTT3h3rsXnQc1RVMnun6zV8MbL6PQZlKUQkg1+zXfDvVmFKNbSdTHXfKadz 9osRgjfaJXp5Kgk41dLeVLxIen41jhn56yWYKSU2UW/lVrElmJ78zsIBjhjJUGRiyhycnh zkOlrInMvFMFC1Pw64s363FL0HDhrN0DB86eml1ggZBLGXrr3W0JXfrfQj1JAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763646884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y29m93qpucwHGj3C/l5y0wlVb6Z1lGw1lR4MFgeYRis=; b=MWu4K/hSFwyZOB68IN/D7XzLD7LzuLd6r16bhtGQmI8Cn2ve4tt+I1xiKBdu+ttRWVOm50 nYSMpYs+LaaGlaNb6tdiIwX8iSFu/xH+IB29UoNi36Vx9RaZh8Vhh/kmz6GCqzMIJ/uJ4G gePKWsm+Hr6iN2Jh9FHwrTGvEOsNmI+/VAbziLhervh9A6qiWSCd0WV+tqhZPmAmz6JKE0 iZ5w2+nq4Fohtf5VzBOLOCRau/i7q5pnwfB2bRZ2t8oaTZixSexafb8sEY6Oh+C0fYv2jd ExPt27BacteAMTdL2hNOVbCT4eIZ56gmnUclkHM4MrZmaj+wv980GPSqgkhPaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763646884; a=rsa-sha256; cv=none; b=r+N8ByCbtjR/Omes3w3jTl5jkdbj3Mx7aZEoPRvPSiYHDiPjzhu9gCyr5pvVmMRCc6/3CJ kzWQAYlcqOtILZohuzgURLlTjJ6uVxS4oVr/0xeCc4xFYOWGOzQioqxhf72rydeCAsChqZ k9mFFPgLDhk5G8P6mX7MYkiWgyDvcLWNRlYh4zremapMV/6P7ItOx+KB1WPE/zlu39u3ef gnW4yf3QJ9feGpfcwsVIEM2OGoPxQyTekYPfVhdXH/vVrkEfY6CpMaaIkiVuV52IWs2ugC RWYMorav5IPIB+4pHdmOFfBU/WkzRUJoUdHDz6xB8+RunAqLgdoNh+D5/aVU2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dC0GC70ljzDP8 for ; Thu, 20 Nov 2025 13:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2ebcb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:54:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9cafea4c44a7 - stable/15 - ObsoleteFiles.inc: Fix up incorrect merge List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9cafea4c44a7046ac2ac15b28471f9e09fceb6f9 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:54:43 +0000 Message-Id: <691f1da3.2ebcb.2448e8f6@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9cafea4c44a7046ac2ac15b28471f9e09fceb6f9 commit 9cafea4c44a7046ac2ac15b28471f9e09fceb6f9 Author: Mark Johnston AuthorDate: 2025-11-20 13:46:43 +0000 Commit: Mark Johnston CommitDate: 2025-11-20 13:47:44 +0000 ObsoleteFiles.inc: Fix up incorrect merge This is a direct commit to stable/15. Reported by: des Fixes: 838c8027f9d8 ("libexec/kgdb: Add new modules and install them together with debug info") --- ObsoleteFiles.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index d9ef4033911e..6a61bf537561 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -62,9 +62,6 @@ OLD_FILES+=usr/lib/libnss_tacplus.a OLD_FILES+=usr/libexec/kgdb/acttrace.py OLD_DIRS+=usr/libexec/kgdb -# 20251001: test helper sendto-IP_MULTICAST_IF renamed -OLD_FILES+=usr/tests/sys/netinet/sendto-IP_MULTICAST_IF - # 20250930: Rename wlanstats to wlanstat OLD_FILES+=usr/sbin/wlanstats OLD_FILES+=usr/share/man/man8/wlanstats.8.gz From nobody Thu Nov 20 14:37:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC1D22C8qz6HTX8 for ; Thu, 20 Nov 2025 14:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dC1D201j8z3GdY for ; Thu, 20 Nov 2025 14:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763649474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uqrj72DnZJis4ckexgdlT9TbapGqR9htBaGdkI7608s=; b=xJV5MSsSfDGBl6x1xKWBZcpkipetLTqUZc3yTpYNIe2bFJr6SuCQAnz/6PhwYky2+4Ls3x ZxYwrRMWfFgsZz/iuccJklHonymyEa8XbNDg/cSsSDC1p6su98SHPZIE9EfEVYGR362WJG Ci3/6zWnkN5FkwS8gWHP3mfidmR8w0KIFldjD0zuKZFyPDZXG+ohND7EfxGODCS6KrOR0Q 7u8PxSscENsu4hhhkAkBQVfXdvUsA8bjzIOUF1Ti75TR3rt7R8VNY6EzO6hsQCCEG5O5dz kWtKsnJTm9P76bmF3seaIqmYmtvjs+eDi64PmV4IFA2QfVN/sj9f6n63mgv9rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763649474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uqrj72DnZJis4ckexgdlT9TbapGqR9htBaGdkI7608s=; b=LitWyC/8pCgE77q5VDUTUMkEst1LhuWkvZZJV7G7m/W39gbZFaSQhvK+gt9Yr7+JInVOHk jqAEhQpMx6Po9Wzca0Fdb+XS0hXEpoTILaJayWFWL5P9lui+/e2oDjKnoXX20Gl9QQPsKi gnlQlulm4dMF3zLFiHJeBwmiqfeq1gyBxgl62DeaD/4i0+KfqEVHeSNWgBXCvA1G6tZ44F uotRjS7bLA5jwASDogDmD5UILNeAdPxwlKm/wScBA++iisnN268MYoUOAZsdGKxEdyrtOE hyItWDLtoSMKcjpvx4Y+CpQLxgZx1TRrIXJoquK3M+YNDa4inm2uZb3UXE5fTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763649474; a=rsa-sha256; cv=none; b=iVoIW74Qpt3HUr9Xgu2NRlJ6TkQncluOXaJeKENKDHBEXRx6pVt5zvQpoNpEdWbybwEv1S yembqSSKHmkLtTzqTW+ReGuM4ATAyIuItILv2pMrkJqvTn79VugE2q7WJeRQZxSLCrW8GS xRwUsNQpb5PPooNholzhXGuVZkx5qK8WCsgbGrC3nV1Yc1qs9sNOtr3b8rROefc646862s 2YfFYWqURaOUyI7rJGugCMWXE8wjYd069FkghSjeVmhj7ZnEFv73Icb2l+/MULKmGjxhjd 1O+pJcXp0GwZgSKFeQQRxkuGg8qk9M8qDknw6e0Wt6wOriC2VSRfTXFiczSB4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dC1D16NXRzVrj for ; Thu, 20 Nov 2025 14:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32d8e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 14:37:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 032fbda024d7 - main - nvme: Include explicitly for memmove List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 032fbda024d78a8e2f9479efcdda8604c62bcea0 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 14:37:53 +0000 Message-Id: <691f27c1.32d8e.5897810b@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=032fbda024d78a8e2f9479efcdda8604c62bcea0 commit 032fbda024d78a8e2f9479efcdda8604c62bcea0 Author: John Baldwin AuthorDate: 2025-11-20 14:36:50 +0000 Commit: John Baldwin CommitDate: 2025-11-20 14:36:50 +0000 nvme: Include explicitly for memmove Reported by: andrew, rpokala Fixes: 8d2a50bb3805 ("nvme: Abstract out function to obtain a disk ident string from cdata") Sponsored by: Chelsio Communications --- sys/dev/nvme/nvme.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 8f7a7fbda14c..c8eba3df9c2a 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1910,6 +1910,7 @@ void nvme_sc_sbuf(const struct nvme_completion *cpl, struct sbuf *sbuf); void nvme_strvis(uint8_t *dst, const uint8_t *src, int dstlen, int srclen); #ifdef _KERNEL +#include #include struct bio; From nobody Thu Nov 20 14:52:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC1YC3zC5z6HVg7; Thu, 20 Nov 2025 14:52:47 +0000 (UTC) (envelope-from kp@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dC1YC1S63z3JR1; Thu, 20 Nov 2025 14:52:47 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763650367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Lv2Eu1azOMqipCOQibZKVYitL/nXmGzRlWC+ezjsdrY=; b=q4RYztIY8RE0+tsoHt7bEGH9iSpuaDEdsDNiagHEGy8/XAMfg86dJURxaQo8vd9bNOz/Av HswM5ryHOpRYHbpXNMpXOREjs9DeXIdPHVLJFsMR76w1eJDmTC0sczcyEcLbrwJVa3cDqS Cx5UPazyJalHHMBYGUUCHNHoXj9EPuGH0ktCtDJTwS07QL2p/0ZerhwcYPDTlc0n863YkY vXMYtPUK9PKL6NtSZR63UyoItz6/4IPh/XJexDMICHaAIx6IvZTyHd9J/FkWk/ubmqI8GO nXB0qW+sZQzhqyvOf/0eqycmuwUvnfxFdZGBmoibBdrcyszxrnxZt/FrJRXMlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763650367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Lv2Eu1azOMqipCOQibZKVYitL/nXmGzRlWC+ezjsdrY=; b=EPmK1UgyKr1H2yV4YxdXpS/2EEyyhGcBbVs0X5HNFdVIl73xeAmZKtPGKqfCw7siQ9qHrv 9bCdero5Y+TqPHKJZscdym6iDNcMCtNtECHj8tr0/PEF0KW7EqCGJZNlTIDERRiujyTHjp uBIhvURuahLbQPFulZ4toNOCDlr2GHtLAgGe36FKV5PS60U5/oqFJEwAtcQqTDWnzljCtu hFpQkETuGdS2pWQpfnZQtAmE82N7Idm4V5F69KWiTpbtrjl7l/fWbJoKthAumSIPZ8r43o I/a55rA3Z8WqKc2Qs0Q39j4Lrjo5qphao3KrxZPQ/Z7JXw1BA8sGOA4SiP2kJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763650367; a=rsa-sha256; cv=none; b=lFli9aww+PrrmHTlbgJ2LdAETTbpqLGcjfK3uyCwy4EaQAs/OB8yJXO9Xpzbys5oGhh4zG 7pOQ+/ilTBIyr8PPepDxNOTzQ9veF2tEU/W1C6O+9++A4vDie74i94CLI0JeNAJEwKppgq 9HDMRk8Iovw03eUACnJlwBRzd9Ke/6CwqIXMlfbtgZl5LtGqhvWui25YuKrjYoETwZ8CyJ kDKWriLCdX6mir5Mao0sgLGt9QfBM3qNKU0LhszGEiKk8DNGuy5QCY+8JHC3265r/4OJkm kJ5CGHTB/y7aOPzfeMi/4x3ruq3BDH9LENcC5zpKe2tYOxezc/YbrWnhdrfVMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R12" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dC1YB6Ydkz11Bw; Thu, 20 Nov 2025 14:52:46 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 4F0E7284F6; Thu, 20 Nov 2025 15:52:44 +0100 (CET) From: Kristof Provost To: Navdeep Parhar Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 17b4a0acfaf5 - main - cxgbe(4): T7 related updates to shared code Date: Thu, 20 Nov 2025 15:52:43 +0100 X-Mailer: MailMate (2.0r6272) Message-ID: <0DA16B91-A32E-443D-8FF3-45183117ABB6@FreeBSD.org> In-Reply-To: <202511130041.5AD0fYXA077222@gitrepo.freebsd.org> References: <202511130041.5AD0fYXA077222@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_45391A03-D8BE-466C-AF9B-13E135D8554A_=" --=_MailMate_45391A03-D8BE-466C-AF9B-13E135D8554A_= Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable On 13 Nov 2025, at 1:41, Navdeep Parhar wrote: > The branch main has been updated by np: > > URL: = > https://cgit.FreeBSD.org/src/commit/?id=3D17b4a0acfaf5e58a04232c756a79d= 73649ead231 > > commit 17b4a0acfaf5e58a04232c756a79d73649ead231 > Author: Navdeep Parhar > AuthorDate: 2025-10-15 19:29:06 +0000 > Commit: Navdeep Parhar > CommitDate: 2025-11-13 00:32:38 +0000 > > cxgbe(4): T7 related updates to shared code > > - Avoid some more registers with read side-effects during regdump. > - mps_tcam_size is 3x the size of T6/T5. > - Update rss_rd_row to work with T7. > > Obtained from: Chelsio Communications > MFC after: 1 week > Sponsored by: Chelsio Communications > --- > sys/dev/cxgbe/common/t4_hw.c | 98 +++++-- > sys/dev/cxgbe/common/t4_msg.h | 566 = > +++++++++++++++++++++++++++++++++------ > sys/dev/cxgbe/common/t4_regs.h | 100 ++++++- > sys/dev/cxgbe/tom/t4_cpl_io.c | 2 +- > usr.sbin/cxgbetool/reg_defs_t7.c | 126 +++++---- > 5 files changed, 723 insertions(+), 169 deletions(-) > =E2=80=A6 > +struct cpl_rx_phys_addr { > + __be32 RSS[2]; > + __be32 op_to_tid; > + __be32 pci_rlx_order_to_len; > + __be64 phys_addr; > +}; This fails to build on =E2=80=98options RSS=E2=80=99 kernels (which does = `#define = RSS 1`): --- t4_main.o --- In file included from /usr/src/sys/dev/cxgbe/t4_main.c:79: In file included from /usr/src/sys/dev/cxgbe/common/common.h:525: In file included from /usr/src/sys/dev/cxgbe/adapter.h:62: /usr/src/sys/dev/cxgbe/common/t4_msg.h:2481:16: error: expected member = name or ';' after declaration specifiers 2481 | __be32 RSS[2]; | ~~~~~~ ^ ./opt_rss.h:1:13: note: expanded from macro 'RSS' 1 | #define RSS 1 | ^ In file included from /usr/src/sys/dev/cxgbe/t4_main.c:79: In file included from /usr/src/sys/dev/cxgbe/common/common.h:525: In file included from /usr/src/sys/dev/cxgbe/adapter.h:62: /usr/src/sys/dev/cxgbe/common/t4_msg.h:2481:15: error: expected ';' at = end of declaration list 2481 | __be32 RSS[2]; | ^ | ; 2 errors generated. *** [t4_main.o] Error code 1 Something simple like this appears to be enough to fix that: diff --git a/sys/dev/cxgbe/common/t4_msg.h = b/sys/dev/cxgbe/common/t4_msg.h index 214080964fbb..19a9af25ca5d 100644 --- a/sys/dev/cxgbe/common/t4_msg.h +++ b/sys/dev/cxgbe/common/t4_msg.h @@ -2478,7 +2478,7 @@ struct cpl_rx_data_ack_core { #define F_RX_DACK_CHANGE V_RX_DACK_CHANGE(1U) struct cpl_rx_phys_addr { - __be32 RSS[2]; + __be32 rssid[2]; __be32 op_to_tid; __be32 pci_rlx_order_to_len; __be64 phys_addr; Best regards, Kristof --=_MailMate_45391A03-D8BE-466C-AF9B-13E135D8554A_= Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On 13 Nov 2025, at 1:41, Navdeep Parhar wrote:

The branch main has been updated by= np:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3D17b4a0acfaf5e58a04232c756a79d73649ead231

commit 17b4a0acfaf5e58a04232c756a79d73649ead231
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2025-10-15 19:29:06 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2025-11-13 00:32:38 +0000

cxgbe(4): T7 related updates to shared code

- Avoid some more registers with read side-effects du= ring regdump.
- mps_tcam_size is 3x the size of T6/T5.
- Update rss_rd_row to work with T7.

Obtained from: Chelsio Communications
MFC after: 1 week
Sponsored by: Chelsio Communications
---
sys/dev/cxgbe/common/t4_hw.c | 98 +++++--
sys/dev/cxgbe/common/t4_msg.h | 566 +++++++++++++++++++++++++++++++++= ------
sys/dev/cxgbe/common/t4_regs.h | 100 ++++++-
sys/dev/cxgbe/tom/t4_cpl_io.c | 2 +-
usr.sbin/cxgbetool/reg_defs_t7.c | 126 +++++----
5 files changed, 723 insertions(+), 169 deletions(-)


=E2=80=A6

+struct cpl_rx_phys_addr {
+ __be32 RSS[2];
+ __be32 op_to_tid;
+ __be32 pci_rlx_order_to_len;
+ __be64 phys_addr;
+};

This fails to build on =E2=80=98options RSS=E2=80=99 kern= els (which does #define RSS 1):

--=
- t4_main.o ---
In file included from /usr/src/sys/dev/cxgbe/t4_main.c:79:
In file included from /usr/src/sys/dev/cxgbe/common/common.h:525:
In file included from /usr/src/sys/dev/cxgbe/adapter.h:62:
/usr/src/sys/dev/cxgbe/common/t4_msg.h:2481:16: error: expected member na=
me or ';' after declaration specifiers
 2481 |         __be32 RSS[2];
      |         ~~~~~~ ^
=2E/opt_rss.h:1:13: note: expanded from macro 'RSS'
    1 | #define RSS 1
      |             ^
In file included from /usr/src/sys/dev/cxgbe/t4_main.c:79:
In file included from /usr/src/sys/dev/cxgbe/common/common.h:525:
In file included from /usr/src/sys/dev/cxgbe/adapter.h:62:
/usr/src/sys/dev/cxgbe/common/t4_msg.h:2481:15: error: expected ';' at en=
d of declaration list
 2481 |         __be32 RSS[2];
      |               ^
      |               ;
2 errors generated.
*** [t4_main.o] Error code 1

Something simple like this appears to be enough to fix th= at:

di=
ff --git a/sys/dev/cxgbe/common/t4_msg.h b/sys/dev/cxgbe/common/t4_msg.h
index 214080964fbb..19a9af25ca5d 100644
--- a/sys/dev/cxgbe/common/t4_msg.h
+++ b/sys/dev/cxgbe/common/t4_msg.h
@@ -2478,7 +2478,7 @@ struct cpl_rx_data_ack_core {
 #define F_RX_DACK_CHANGE    V_RX_DACK_CHANGE(1U)

 struct cpl_rx_phys_addr {
-        __be32 RSS[2];
+        __be32 rssid[2];
         __be32 op_to_tid;
         __be32 pci_rlx_order_to_len;
         __be64 phys_addr;

Best regards,
Kristof

--=_MailMate_45391A03-D8BE-466C-AF9B-13E135D8554A_=-- From nobody Thu Nov 20 15:23:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC2Dn13pGz6HXhm for ; Thu, 20 Nov 2025 15:23: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dC2Dm6yx5z3PKG for ; Thu, 20 Nov 2025 15:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763652217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EeCOulP5kHoBuiRwNdDanaEWehKzqPZPOCrVQFeHdGs=; b=quE2iH1hV49Nl0UEn3NxubcUyg02UFSYMhEIYjM4tULvkbGrzHw3HF3I2U9SNCRql2r/+C ksj749JWpl139knwoSyz7SlQ7WTYirMouSlgD2fzNU1HF0twUwcfz4NAbCaXWaDu9xLL9f TuqE3V/rVasg7l4VAfgWNuscbchXXc2ZNNnRSZE4KHateZWq612UlpkTl1mGI602+NVCby XiGDVeUzUBtte9MOXviNuxRHQ6giYfGLGCvyFQE/a2QoDBqu3YRbaxq2rjzShW6KMUG5fy x49rHssbFGMTquaX7LFksqSdtFya5KdL9GuB4/lGYZH45SuZxQKAnuKTFtkZ0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763652217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EeCOulP5kHoBuiRwNdDanaEWehKzqPZPOCrVQFeHdGs=; b=qupZHJlP2jPcG9vnVY3vLVnC1lRtzNBPFvRQw8O9l6KF0sUBwYXg0G4xu81lFkSggufSMw gmsDUHh7yAz8LsjM9jHupeRDHh/1XThr269xcG96HGzLVEd3ZMrenlsx5UErX/NqKC95GD hf+usg8TC/ojQs/YWFWdatxukaGYWUn9QXl0Hi7kVbo7D8BBu7wQEnsWPOkcKdgxE6PZ9X IXZ5mfDz1735ssSYN8F9P9gQ53YEYQovPCm3jCJZ1Esv71dn95CEGhYGpuRpDY1C87VOnl bEY5iblFiWSF0Lzz9vDv+fRqab2QfeLKEW9Oj6gmv8XZT7qyoE4g1/Ztzcr3xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763652217; a=rsa-sha256; cv=none; b=SvsQdNGzN/KRdPcPpuVGGSorr/0GZW4608RuYijWiLL2sDkr9TEnzZUkHN3YLyxCzanB7/ aHvCcuZ+IbNYOv+ZILM+SO2UW7zmeQVa0dNuU7ho1tqYq4if94WsG5M1jCuXD+WQgNwnIi 5h6IJYBjkWlrJoLg8HGEZjX0LGtOr+lJZ2FsfdjJtydi5ilmrtKA69YooP8+CHZ5yhvYci d4IMimhm/AN0fsE6f7K7PPEsdfhEFrsmCdwtvSce8lPopKs1WRZNW2lZlhQokI66Maaarx K0AOqTDKOoevMmGqOkxhwTXzkvJgtKY8TAVqSsvSdPDVIFtBk5gfvm6wA8D63Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dC2Dm6RLRzYlr for ; Thu, 20 Nov 2025 15:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3693b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 15:23:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 253b98f749cf - main - sound: Fix KASSERT panics in chn_read() and chn_write() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 253b98f749cf93a9a682f46925c43cbbd04e1110 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 15:23:36 +0000 Message-Id: <691f3278.3693b.53fcd176@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=253b98f749cf93a9a682f46925c43cbbd04e1110 commit 253b98f749cf93a9a682f46925c43cbbd04e1110 Author: Christos Margiolis AuthorDate: 2025-11-20 15:23:09 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 15:23:09 +0000 sound: Fix KASSERT panics in chn_read() and chn_write() INVARIANTS kernels may trigger a KASSERT panic from sndbuf_acquire(), when fuzzing write(2) using stress2, because of a race in chn_write(). In the case of chn_write(), what sndbuf_acquire() does is extend the ready-to-read area of the buffer by a specified amount of bytes. The KASSERT in question makes sure the number of bytes we want to extend the ready area by, is less than or equal to the number of free bytes in the buffer. This makes sense, because we cannot extend the ready area to something larger than what is available (i.e., free) in the first place. What chn_write() currently does for every write is; calculate the appropriate write size, let's say X, unlock the channel, uiomove() X bytes to the channel's buffer, lock the channel, and call sndbuf_acquire() to extend the ready area by X bytes. The problem with this approach, however, is the following. Suppose an empty channel buffer with a length of 1024 bytes, and 2 threads, (A) and (B), where (B) is a higher-priority one. Suppose thread (A) wants to write 1024 bytes. It unlocks the channel and uiomove()s 1024 bytes to the channel buffer. At the same time, thread (B) picks up the lock, and because it is higher priority, it keeps dominating the lock for a few iterations. By the time thread (A) picks up the lock again, it tries to call sndbuf_acquire() with a size of 1024 bytes, which was calculated before it performed the uiomove(). In this case, there is a very high chance that the buffer will not be empty, that is, have a free area of 1024 bytes, as was the case when thread (A) started executing, and so the KASSERT will trigger a panic because the condition (bytes <= free) is not met. Another scenario that can trigger a panic is the following: suppose a buffer with a size of 4 bytes, and two threads: (A) and (B). In the first iteration, thread (A) wants to write 2 bytes, while the buffer is empty, BUT the pointer (sndbuf_getfreeptr()) is at the end (i.e., buf[3]). In the first iteration of the loop, because of the way we calculate t, we'll end up writing only 1 byte, so after sz -= t, sz will be 1, and so we'll need one more iteration in the inner loop, to write the remaining 1 byte. Now we're at the end of the first loop, thread (A) unlocks the channel, it has written 1 byte, it needs to write 1 more, and the buffer is left with 3 empty slots. Now thread (B) picks up the lock, and it wants to write 3 (or more) bytes. Eventually it writes the 3 bytes, and it leaves the buffer with 0 free slots. By the time thread (A) picks up the lock again, and continues with the second iteration of the inner loop, it will try to write the last byte, but sndbuf_acquire() will panic because there is no free space anymore. To fix this, get rid of the inner loop and calculate the write size on each iteration. Also, call sndbuf_acquire() before unlocking the channel. In the scenarios explained above, we'll end up entering the chn_sleep() case. Modify it as well, so that we do not kill the channel if we need to sleep more. Do the same for chn_read() to avoid possible similar panics from sndbuf_dispose(). Reported by: pho Tested by: christos, pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: pho, kib Differential Revision: https://reviews.freebsd.org/D53666 --- sys/dev/sound/pcm/channel.c | 70 ++++++++++++++------------------------------- 1 file changed, 22 insertions(+), 48 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index f29a819ce0ae..e92181d74e19 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -438,7 +438,7 @@ chn_write(struct pcm_channel *c, struct uio *buf) { struct snd_dbuf *bs = c->bufsoft; void *off; - int ret, timeout, sz, t, p; + int ret, timeout, sz, p; CHN_LOCKASSERT(c); @@ -446,24 +446,17 @@ chn_write(struct pcm_channel *c, struct uio *buf) timeout = chn_timeout * hz; while (ret == 0 && buf->uio_resid > 0) { + p = sndbuf_getfreeptr(bs); sz = min(buf->uio_resid, sndbuf_getfree(bs)); + sz = min(sz, bs->bufsize - p); if (sz > 0) { - /* - * The following assumes that the free space in - * the buffer can never be less around the - * unlock-uiomove-lock sequence. - */ - while (ret == 0 && sz > 0) { - p = sndbuf_getfreeptr(bs); - t = min(sz, bs->bufsize - p); - off = sndbuf_getbufofs(bs, p); - CHN_UNLOCK(c); - ret = uiomove(off, t, buf); - CHN_LOCK(c); - sz -= t; - sndbuf_acquire(bs, NULL, t); - } - ret = 0; + off = sndbuf_getbufofs(bs, p); + sndbuf_acquire(bs, NULL, sz); + CHN_UNLOCK(c); + ret = uiomove(off, sz, buf); + CHN_LOCK(c); + if (ret != 0) + break; if (CHN_STOPPED(c) && !(c->flags & CHN_F_NOTRIGGER)) { ret = chn_start(c, 0); if (ret != 0) @@ -483,13 +476,7 @@ chn_write(struct pcm_channel *c, struct uio *buf) ret = EAGAIN; } else { ret = chn_sleep(c, timeout); - if (ret == EAGAIN) { - ret = EINVAL; - c->flags |= CHN_F_DEAD; - device_printf(c->dev, "%s(): %s: " - "play interrupt timeout, channel dead\n", - __func__, c->name); - } else if (ret == ERESTART || ret == EINTR) + if (ret == ERESTART || ret == EINTR) c->flags |= CHN_F_ABORTING; } } @@ -552,7 +539,7 @@ chn_read(struct pcm_channel *c, struct uio *buf) { struct snd_dbuf *bs = c->bufsoft; void *off; - int ret, timeout, sz, t, p; + int ret, timeout, sz, p; CHN_LOCKASSERT(c); @@ -568,35 +555,22 @@ chn_read(struct pcm_channel *c, struct uio *buf) timeout = chn_timeout * hz; while (ret == 0 && buf->uio_resid > 0) { + p = sndbuf_getreadyptr(bs); sz = min(buf->uio_resid, sndbuf_getready(bs)); + sz = min(sz, bs->bufsize - p); if (sz > 0) { - /* - * The following assumes that the free space in - * the buffer can never be less around the - * unlock-uiomove-lock sequence. - */ - while (ret == 0 && sz > 0) { - p = sndbuf_getreadyptr(bs); - t = min(sz, bs->bufsize - p); - off = sndbuf_getbufofs(bs, p); - CHN_UNLOCK(c); - ret = uiomove(off, t, buf); - CHN_LOCK(c); - sz -= t; - sndbuf_dispose(bs, NULL, t); - } - ret = 0; + off = sndbuf_getbufofs(bs, p); + sndbuf_dispose(bs, NULL, sz); + CHN_UNLOCK(c); + ret = uiomove(off, sz, buf); + CHN_LOCK(c); + if (ret != 0) + break; } else if (c->flags & (CHN_F_NBIO | CHN_F_NOTRIGGER)) ret = EAGAIN; else { ret = chn_sleep(c, timeout); - if (ret == EAGAIN) { - ret = EINVAL; - c->flags |= CHN_F_DEAD; - device_printf(c->dev, "%s(): %s: " - "record interrupt timeout, channel dead\n", - __func__, c->name); - } else if (ret == ERESTART || ret == EINTR) + if (ret == ERESTART || ret == EINTR) c->flags |= CHN_F_ABORTING; } } From nobody Thu Nov 20 15:24:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC2GN2bYyz6HXfB for ; Thu, 20 Nov 2025 15:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dC2GN0Gx4z3Pjp for ; Thu, 20 Nov 2025 15:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763652300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DOysRr41rRse9qbL1SFYXHuCivMa7JNAfeIb3SsKREs=; b=cbLVQ7njXdB/iezTuBh4XxEOQtiPxlVve8l5jhYJoFRCj6jDXUqOsgLOi3McWvGtcZQ5DZ mD38PfH2GZbu+7JwjOM7TgUcZtWBrH9MEy1kgazJ++JM8HQ8ngYPjxlZPCfIVh8U/YFaif h4mUTdZnvBGiRo8X7RJFg+7ZXnamlBGBJVJJoGebcpNDMKUgbQGNPWS7HTCIRvspePdsG6 zBQxkymlsJ71DYzSho85m8ZczJWK8RmVviepzbpsCOS1HoMDdlk7mIHyusXInpda9oKPqg aFOBbg+oLp8QI2Fq+GpOWhxSlHxJzMNfHZ/0UYrNHKpNzhUNq5zYpPt9N67qtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763652300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DOysRr41rRse9qbL1SFYXHuCivMa7JNAfeIb3SsKREs=; b=RAcRsl6GQl4Kb+N9IJFAfjIIMOtozDmtfQTllHeo2i4TGh5acxflWpmgocn3TlXCUjz419 0i0zq5bEb07aGff4ci12pSvf3mxoz9mRRWZEL3xNtOSdqnosJPEHcdqPa+Bhj5vYW86xk2 gUYyJL5i60fTzRSs1XWDhe675ljt1evoeL+cwnLDMGRYE4PdRJ3bzADG5OezsGiNfZUqB+ /p+9XOJrM2ay/FTpd7bR8bnA07Lzm57t5ie4wGuADaZU3KW8pjI19DCpI5SdJQPoQ/xqU7 0RtyisobKFsQ2xzWubGOL5A/evEI0cefHqgh2t8frYeSX+6OmM6+IwFFpPCnuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763652300; a=rsa-sha256; cv=none; b=sA8OxvzG2qEE2vz7w9uOxLVrZwEHwCDKA6Sm1kCvDl0E4jhOopAhaoB0Ol1bSY5vXQg2nl QxDzwmH8gTzsJPJvqGob4xBqCidnyWXA9ZJu/+44zcxzfOt0rgQfrOVMa1YNEkPHmiJFsw V2KcIEoyaPng8StwHzYSUUaCQbXJz1K0uO+kuEuuDdgxl9SP04S+2tPJPYEdFSmoGbjxtH iwS3oQGssxnB8UCv5SripACLSOfcy3xlnIOjNfi2p8+6gG0PWmu3ydbsz542CczOEzAiQr 8i3FkwXbcjl2CLRKymPhcBfllC3R4TjNJQRY7yRqtAnOXgSlVgdaHq9LLyanRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dC2GM6vfbzY58 for ; Thu, 20 Nov 2025 15:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3693f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 15:24:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 3612ef642f51 - main - sound: Remove vchan_passthrough() and hw.snd.passthrough_verbose List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3612ef642f511a1bd9f759da87abeafe7d6ff110 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 15:24:59 +0000 Message-Id: <691f32cb.3693f.405f7cdc@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3612ef642f511a1bd9f759da87abeafe7d6ff110 commit 3612ef642f511a1bd9f759da87abeafe7d6ff110 Author: Christos Margiolis AuthorDate: 2025-11-20 15:24:49 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 15:24:49 +0000 sound: Remove vchan_passthrough() and hw.snd.passthrough_verbose Unused and confusing. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/pcm/vchan.c | 18 ------------------ sys/dev/sound/pcm/vchan.h | 5 ----- 2 files changed, 23 deletions(-) diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index b31e28d51453..dcb49e3003d0 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -47,13 +47,6 @@ #define FMTLIST_OFFSET 4 #define DIGFMTS_MAX 2 -#ifdef SND_DEBUG -static int snd_passthrough_verbose = 0; -SYSCTL_INT(_hw_snd, OID_AUTO, passthrough_verbose, CTLFLAG_RWTUN, - &snd_passthrough_verbose, 0, "passthrough verbosity"); - -#endif - struct vchan_info { struct pcm_channel *channel; struct pcmchan_caps caps; @@ -723,11 +716,7 @@ vchan_destroy(struct pcm_channel *c) } int -#ifdef SND_DEBUG -vchan_passthrough(struct pcm_channel *c, const char *caller) -#else vchan_sync(struct pcm_channel *c) -#endif { int ret; @@ -744,13 +733,6 @@ vchan_sync(struct pcm_channel *c) if (ret != 0) c->flags |= CHN_F_DIRTY; -#ifdef SND_DEBUG - if (snd_passthrough_verbose) { - device_printf(c->dev, "%s(%s/%s) %s() -> re-sync err=%d\n", - __func__, c->name, c->comm, caller, ret); - } -#endif - return (ret); } diff --git a/sys/dev/sound/pcm/vchan.h b/sys/dev/sound/pcm/vchan.h index 65b0218781fb..5d8057cd4b7f 100644 --- a/sys/dev/sound/pcm/vchan.h +++ b/sys/dev/sound/pcm/vchan.h @@ -39,12 +39,7 @@ extern bool snd_vchans_enable; int vchan_create(struct pcm_channel *, struct pcm_channel **); int vchan_destroy(struct pcm_channel *); -#ifdef SND_DEBUG -int vchan_passthrough(struct pcm_channel *, const char *); -#define vchan_sync(c) vchan_passthrough(c, __func__) -#else int vchan_sync(struct pcm_channel *); -#endif #define VCHAN_SYNC_REQUIRED(c) \ (((c)->flags & CHN_F_VIRTUAL) && (((c)->flags & CHN_F_DIRTY) || \ From nobody Thu Nov 20 15:37:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC2YJ03hpz6HXxn for ; Thu, 20 Nov 2025 15:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dC2YH2rNHz3Qk2 for ; Thu, 20 Nov 2025 15:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763653075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aewqi2VMTY8GrnQMFe3WXgZcRgshNg0Fiz3NqmM/fxU=; b=wPz2Dy73hN1aIa9s6iE58ZTBVaZSdc6vATFU55DGU8Rm8zNGkp/bnoEeY8v/EWWLcJpcGg axZIcPuCw+NY7j2V5LHFYyzR65huXFzKfg16kj6ODgPdXH9nlCFMfe+dpb8xllbNC8+O12 SIh2s8FmRAUTMzVu1snIOcAmF39oxQd4Rq9BP10t7VxxuXtQAGE4yJlOCGiIjOz1ZQJ4hy WV0UtTxMhxyJdQYfjUpqeqAsp4Mv1AFYsLj3x5e+ERloil1T/tJljCGAPSafOns5CU3NrJ S+2ZPAMsvINFFIZoFdijTtcW0p+1fdUexuJfopS9jeeXZCN6Vv3QV0A+nNhK0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763653075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aewqi2VMTY8GrnQMFe3WXgZcRgshNg0Fiz3NqmM/fxU=; b=JSA9l7NUoDCSXcW8cawpBuniIjK4XFkc+qan4cZpWwTG7zqtFNiWdf9IdVr1AB94xAWIYA 5PO+IaK6Y4qB1mKkxvVGvPu5vaRGUG3XUWH/UUF+8BDgYRsfBZEhX8mZJJU2CL4RvNNVBy hX2gi+Ok5AUL9wa9Ef8Un0y9nUO0/qxfDS7Ujt+Xvq96BKwJx2LONjqv30+iYCD84CXagx 1OdUFFtkCUd9cZJJ3KXXfjJPFKk42Uu90hyo3PowR7mkzymoQ8HiFaB1qJ/amfLSqzOd+T zKSjNmb0Mh5vRB0tXVB7O6g2nPE5d3wP3iZRtr0smJbc+UdaLm4+PeQskkh8UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763653075; a=rsa-sha256; cv=none; b=aFCl1Hm10ET8jVAdBD16RdZqQ60NCozPm4/NcG8joSn1C3B95GQhQvKclkYSdfBHKqYcIP lpI71j9L3ZgD4W15q1m99hGH6wm3krdiICPAfzEvRPH7z5bMM/ASzSAItfssFLZvVxg9ls 01Wsj7pjol1TTQAWVuVneD9z8EHlWxRIk30q2QodmqqvV7h79OfMi3taOycfHWmnlS/89q Dw+oV3+wGQxp3YVgWQMA0uwtjih6usRmZP97c5sQvxSuZQF6lD6/Qdv0Re6Wiv4BgjLavq 0bDT6mGy/ribEc9Iiu+XSFC2+Bi6i1Hkz1+prNn8ui2Z4mYbLNZOduL/ZfnAuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dC2YH20wRzXfS for ; Thu, 20 Nov 2025 15:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37c6f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 15:37:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: f67361967214 - stable/14 - fdisk: Bump removal to FreeBSD 16.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f6736196721420caff102724b461e3a5211cfa09 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 15:37:55 +0000 Message-Id: <691f35d3.37c6f.371127b0@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f6736196721420caff102724b461e3a5211cfa09 commit f6736196721420caff102724b461e3a5211cfa09 Author: Ed Maste AuthorDate: 2025-10-24 15:08:25 +0000 Commit: Ed Maste CommitDate: 2025-11-20 15:37:34 +0000 fdisk: Bump removal to FreeBSD 16.0 Removal did not happen prior to 15.0. Sponsored by: The FreeBSD Foundation (cherry picked from commit f817f6e7f4a8dc507f3e1b1603dfd2d81093e3bd) (cherry picked from commit 739750ae7c63c653025ad84cac6ba7cb6756dcf8) (cherry picked from commit 2be4c64a0d27a9136cc05c9bdf7a45162339aa69) --- sbin/fdisk/fdisk.8 | 4 ++-- sbin/fdisk/fdisk.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8 index ea54a51a43ae..aa3a4ef0b6d2 100644 --- a/sbin/fdisk/fdisk.8 +++ b/sbin/fdisk/fdisk.8 @@ -1,5 +1,5 @@ .\" -.Dd October 5, 2016 +.Dd October 24, 2025 .Dt FDISK 8 .Os .Sh NAME @@ -18,7 +18,7 @@ .Sh DEPRECATION NOTICE .Nm is deprecated and is not available in -.Fx 15.0 +.Fx 16.0 or later. Use .Xr gpart 8 diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c index a9295b0d1319..f65e3024d46f 100644 --- a/sbin/fdisk/fdisk.c +++ b/sbin/fdisk/fdisk.c @@ -266,7 +266,7 @@ main(int argc, char *argv[]) struct dos_partition *partp; fprintf(stderr, - "WARNING: fdisk is deprecated and is not available in FreeBSD 15 or later.\n" + "WARNING: fdisk is deprecated and is not available in FreeBSD 16 or later.\n" "Please use gpart instead.\n\n"); while ((c = getopt(argc, argv, "BIab:f:ipqstuv1234")) != -1) From nobody Thu Nov 20 15:38:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC2ZP0rzJz6HYWW for ; Thu, 20 Nov 2025 15:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dC2ZN5D51z3Qt6 for ; Thu, 20 Nov 2025 15:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763653132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=umEjtpkLy0cbOFJlJ8ItVSjQ36kKaXAM3RTSjDxmeXA=; b=ZkAzjz8ae7Hmc09cn7cl7KcfwqMHD4fiKYZTC2QiN8YAuU5c7FP0nLVZScGJ4BlEuojjoW k8gIFFZrJ05HUijoBrNT1RFKXETtuelMxcap3KZdE9FLHjtJn4wkyuNr1ZUTjv47otnfzg gkhW1vUnOdBWTp2Zp9ds2p9OTSLhmH7EEQtDJnIJ1Zyuj/j6pmAqQitbzeInfOMWFutoWm 34kQt7VEPUCzNLUzzdYSYHEFjzRv23I2sqUW2M3/rZKZjiqzwIrM3TdXfz+PmpfucEDOy2 NzIMVlKAZNf5mUYAN8Pq3oDYdzizb1pz8uWBlx42fvYk5gLrqUJ/1OOdptvhmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763653132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=umEjtpkLy0cbOFJlJ8ItVSjQ36kKaXAM3RTSjDxmeXA=; b=moDDvEn5pJc+jrNUVIu1NIFFhVDWSvKx0dLeSCuzpnU32v1NI1otmn82lUsIL0OJsi62EZ QmiILepuKKQ6gI5fdG1W9SSoL0SCBd18ZSvtan4ukKKAVUgrLMJtKLS+ZoPnxFZCkdHm17 G8YbgBemw2WBX5RZLWXMDiN9pF2GVG08rPoEgXRlMURlRALy+hINFIzJAM3t3H/2VaGs7C 1xoIu40BcJ+kIrmgmHn92i3e+WNviyMCi9cBDLekuZSpA5C8bASH0yGzDx5vLsRtuAZJtQ XMHLV1EwlJT0fsYQEvhbGyAt2cL10qkKHbHXlYkWMdXyM52RmghMlgT1Pm1jKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763653132; a=rsa-sha256; cv=none; b=jQ+34pklPVMSFG/utysiWHbnsKJcz24I5vRDLXXd99sFYUz8BROhEq4KDTFWGkP6JNX+nA WZ4sP+++AaeaIOZWnVHt/1diCnsDL90f7Sx1OTi7X5Ia1rcrr7/zEUhsm8WBoZyixkiBhF 3N6La6l2ifE5DrpPsMgtbRJVUATvA4XcGFOjkEWieZz6uY9cnYZMT3ZQk+1xvy6M0xo3Yy ip7cA6KCeVO9DLMvnx1CS68uqC5IqljYutaFmcNTJsE92/PRo+DSpO4N+7VA8dC3pKQvz+ 3zXfCoT2pGGZCV+mTxZZARslzQktq+g61XX8WjwBM8chUq+BAHUIjkdsZBiT1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dC2ZN4n9fzXfT for ; Thu, 20 Nov 2025 15:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 395a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 15:38:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 57865e505aef - stable/14 - ipfw: Retire obsolete compat code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 57865e505aef2dafb548039619de5d5322dd7157 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 15:38:52 +0000 Message-Id: <691f360c.395a7.72f96e1c@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=57865e505aef2dafb548039619de5d5322dd7157 commit 57865e505aef2dafb548039619de5d5322dd7157 Author: Ed Maste AuthorDate: 2025-10-24 20:15:01 +0000 Commit: Ed Maste CommitDate: 2025-11-20 15:37:34 +0000 ipfw: Retire obsolete compat code The current IPFW version 3 dates to 2010 (commit cc4d3c30ea28, "Bring in the most recent version of ipfw and dummynet, developed"). The compat code for FreeBSD 8 and earlier has a number of issues and is no longer needed, so remove it. Reported by: Ilja Van Sprundel Reviewed by: ae, glebius Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53343 (cherry picked from commit c59aab9a5b3970b3ccec744f759e6cb87e938dbe) (cherry picked from commit 9657c50cdd7741404d99881fdd9243175086ede1) --- sys/conf/files | 1 - sys/modules/dummynet/Makefile | 3 +- sys/netinet/raw_ip.c | 4 - sys/netpfil/ipfw/ip_dn_glue.c | 849 --------------------------------------- sys/netpfil/ipfw/ip_dn_private.h | 10 +- sys/netpfil/ipfw/ip_dummynet.c | 96 ++--- 6 files changed, 29 insertions(+), 934 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 427f6fdebf57..0ef8c0d3b062 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4481,7 +4481,6 @@ netpfil/ipfw/dn_sched_rr.c optional inet dummynet netpfil/ipfw/dn_sched_wf2q.c optional inet dummynet netpfil/ipfw/ip_dummynet.c optional inet dummynet netpfil/ipfw/ip_dn_io.c optional inet dummynet -netpfil/ipfw/ip_dn_glue.c optional inet dummynet netpfil/ipfw/ip_fw2.c optional inet ipfirewall netpfil/ipfw/ip_fw_bpf.c optional inet ipfirewall netpfil/ipfw/ip_fw_dynamic.c optional inet ipfirewall \ diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile index 6c7599eae45f..1c1eccbcaa91 100644 --- a/sys/modules/dummynet/Makefile +++ b/sys/modules/dummynet/Makefile @@ -1,8 +1,7 @@ .PATH: ${SRCTOP}/sys/netpfil/ipfw KMOD= dummynet -SRCS= ip_dummynet.c -SRCS+= ip_dn_glue.c ip_dn_io.c +SRCS= ip_dummynet.c ip_dn_io.c SRCS+= dn_aqm_codel.c dn_aqm_pie.c SRCS+= dn_heap.c dn_sched_fifo.c dn_sched_qfq.c dn_sched_rr.c dn_sched_wf2q.c SRCS+= dn_sched_prio.c dn_sched_fq_codel.c dn_sched_fq_pie.c diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 36258b3283d6..a0fcdd7d464c 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -682,7 +682,6 @@ rip_ctloutput(struct socket *so, struct sockopt *sopt) break; case IP_DUMMYNET3: /* generic dummynet v.3 functions */ - case IP_DUMMYNET_GET: if (ip_dn_ctl_ptr != NULL) error = ip_dn_ctl_ptr(sopt); else @@ -749,9 +748,6 @@ rip_ctloutput(struct socket *so, struct sockopt *sopt) break; case IP_DUMMYNET3: /* generic dummynet v.3 functions */ - case IP_DUMMYNET_CONFIGURE: - case IP_DUMMYNET_DEL: - case IP_DUMMYNET_FLUSH: if (ip_dn_ctl_ptr != NULL) error = ip_dn_ctl_ptr(sopt); else diff --git a/sys/netpfil/ipfw/ip_dn_glue.c b/sys/netpfil/ipfw/ip_dn_glue.c deleted file mode 100644 index 204b34091781..000000000000 --- a/sys/netpfil/ipfw/ip_dn_glue.c +++ /dev/null @@ -1,849 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa - * All rights reserved - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * - * Binary compatibility support for /sbin/ipfw RELENG_7 and RELENG_8 - */ - -#include "opt_inet6.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* IFNAMSIZ, struct ifaddr, ifq head, lock.h mutex.h */ -#include -#include /* ip_output(), IP_FORWARDING */ -#include -#include - -#include -#include -#include -#ifdef NEW_AQM -#include -#endif -#include - -/* FREEBSD7.2 ip_dummynet.h r191715*/ - -struct dn_heap_entry7 { - int64_t key; /* sorting key. Topmost element is smallest one */ - void *object; /* object pointer */ -}; - -struct dn_heap7 { - int size; - int elements; - int offset; /* XXX if > 0 this is the offset of direct ptr to obj */ - struct dn_heap_entry7 *p; /* really an array of "size" entries */ -}; - -/* Common to 7.2 and 8 */ -struct dn_flow_set { - SLIST_ENTRY(dn_flow_set) next; /* linked list in a hash slot */ - - u_short fs_nr ; /* flow_set number */ - u_short flags_fs; -#define DNOLD_HAVE_FLOW_MASK 0x0001 -#define DNOLD_IS_RED 0x0002 -#define DNOLD_IS_GENTLE_RED 0x0004 -#define DNOLD_QSIZE_IS_BYTES 0x0008 /* queue size is measured in bytes */ -#define DNOLD_NOERROR 0x0010 /* do not report ENOBUFS on drops */ -#define DNOLD_HAS_PROFILE 0x0020 /* the pipe has a delay profile. */ -#define DNOLD_IS_PIPE 0x4000 -#define DNOLD_IS_QUEUE 0x8000 - - struct dn_pipe7 *pipe ; /* pointer to parent pipe */ - u_short parent_nr ; /* parent pipe#, 0 if local to a pipe */ - - int weight ; /* WFQ queue weight */ - int qsize ; /* queue size in slots or bytes */ - int plr ; /* pkt loss rate (2^31-1 means 100%) */ - - struct ipfw_flow_id flow_mask ; - - /* hash table of queues onto this flow_set */ - int rq_size ; /* number of slots */ - int rq_elements ; /* active elements */ - struct dn_flow_queue7 **rq; /* array of rq_size entries */ - - u_int32_t last_expired ; /* do not expire too frequently */ - int backlogged ; /* #active queues for this flowset */ - - /* RED parameters */ -#define SCALE_RED 16 -#define SCALE(x) ( (x) << SCALE_RED ) -#define SCALE_VAL(x) ( (x) >> SCALE_RED ) -#define SCALE_MUL(x,y) ( ( (x) * (y) ) >> SCALE_RED ) - int w_q ; /* queue weight (scaled) */ - int max_th ; /* maximum threshold for queue (scaled) */ - int min_th ; /* minimum threshold for queue (scaled) */ - int max_p ; /* maximum value for p_b (scaled) */ - u_int c_1 ; /* max_p/(max_th-min_th) (scaled) */ - u_int c_2 ; /* max_p*min_th/(max_th-min_th) (scaled) */ - u_int c_3 ; /* for GRED, (1-max_p)/max_th (scaled) */ - u_int c_4 ; /* for GRED, 1 - 2*max_p (scaled) */ - u_int * w_q_lookup ; /* lookup table for computing (1-w_q)^t */ - u_int lookup_depth ; /* depth of lookup table */ - int lookup_step ; /* granularity inside the lookup table */ - int lookup_weight ; /* equal to (1-w_q)^t / (1-w_q)^(t+1) */ - int avg_pkt_size ; /* medium packet size */ - int max_pkt_size ; /* max packet size */ -}; -SLIST_HEAD(dn_flow_set_head, dn_flow_set); - -#define DN_IS_PIPE 0x4000 -#define DN_IS_QUEUE 0x8000 -struct dn_flow_queue7 { - struct dn_flow_queue7 *next ; - struct ipfw_flow_id id ; - - struct mbuf *head, *tail ; /* queue of packets */ - u_int len ; - u_int len_bytes ; - - u_long numbytes; - - u_int64_t tot_pkts ; /* statistics counters */ - u_int64_t tot_bytes ; - u_int32_t drops ; - - int hash_slot ; /* debugging/diagnostic */ - - /* RED parameters */ - int avg ; /* average queue length est. (scaled) */ - int count ; /* arrivals since last RED drop */ - int random ; /* random value (scaled) */ - u_int32_t q_time; /* start of queue idle time */ - - /* WF2Q+ support */ - struct dn_flow_set *fs ; /* parent flow set */ - int heap_pos ; /* position (index) of struct in heap */ - int64_t sched_time ; /* current time when queue enters ready_heap */ - - int64_t S,F ; /* start time, finish time */ -}; - -struct dn_pipe7 { /* a pipe */ - SLIST_ENTRY(dn_pipe7) next; /* linked list in a hash slot */ - - int pipe_nr ; /* number */ - uint32_t bandwidth; /* really, bytes/tick. */ - int delay ; /* really, ticks */ - - struct mbuf *head, *tail ; /* packets in delay line */ - - /* WF2Q+ */ - struct dn_heap7 scheduler_heap ; /* top extract - key Finish time*/ - struct dn_heap7 not_eligible_heap; /* top extract- key Start time */ - struct dn_heap7 idle_heap ; /* random extract - key Start=Finish time */ - - int64_t V ; /* virtual time */ - int sum; /* sum of weights of all active sessions */ - - int numbytes; - - int64_t sched_time ; /* time pipe was scheduled in ready_heap */ - - /* - * When the tx clock come from an interface (if_name[0] != '\0'), its name - * is stored below, whereas the ifp is filled when the rule is configured. - */ - char if_name[IFNAMSIZ]; - struct ifnet *ifp ; - int ready ; /* set if ifp != NULL and we got a signal from it */ - - struct dn_flow_set fs ; /* used with fixed-rate flows */ -}; -SLIST_HEAD(dn_pipe_head7, dn_pipe7); - -/* FREEBSD8 ip_dummynet.h r196045 */ -struct dn_flow_queue8 { - struct dn_flow_queue8 *next ; - struct ipfw_flow_id id ; - - struct mbuf *head, *tail ; /* queue of packets */ - u_int len ; - u_int len_bytes ; - - uint64_t numbytes ; /* credit for transmission (dynamic queues) */ - int64_t extra_bits; /* extra bits simulating unavailable channel */ - - u_int64_t tot_pkts ; /* statistics counters */ - u_int64_t tot_bytes ; - u_int32_t drops ; - - int hash_slot ; /* debugging/diagnostic */ - - /* RED parameters */ - int avg ; /* average queue length est. (scaled) */ - int count ; /* arrivals since last RED drop */ - int random ; /* random value (scaled) */ - int64_t idle_time; /* start of queue idle time */ - - /* WF2Q+ support */ - struct dn_flow_set *fs ; /* parent flow set */ - int heap_pos ; /* position (index) of struct in heap */ - int64_t sched_time ; /* current time when queue enters ready_heap */ - - int64_t S,F ; /* start time, finish time */ -}; - -struct dn_pipe8 { /* a pipe */ - SLIST_ENTRY(dn_pipe8) next; /* linked list in a hash slot */ - - int pipe_nr ; /* number */ - uint32_t bandwidth; /* really, bytes/tick. */ - int delay ; /* really, ticks */ - - struct mbuf *head, *tail ; /* packets in delay line */ - - /* WF2Q+ */ - struct dn_heap7 scheduler_heap ; /* top extract - key Finish time*/ - struct dn_heap7 not_eligible_heap; /* top extract- key Start time */ - struct dn_heap7 idle_heap ; /* random extract - key Start=Finish time */ - - int64_t V ; /* virtual time */ - int sum; /* sum of weights of all active sessions */ - - /* Same as in dn_flow_queue, numbytes can become large */ - int64_t numbytes; /* bits I can transmit (more or less). */ - uint64_t burst; /* burst size, scaled: bits * hz */ - - int64_t sched_time ; /* time pipe was scheduled in ready_heap */ - int64_t idle_time; /* start of pipe idle time */ - - char if_name[IFNAMSIZ]; - struct ifnet *ifp ; - int ready ; /* set if ifp != NULL and we got a signal from it */ - - struct dn_flow_set fs ; /* used with fixed-rate flows */ - - /* fields to simulate a delay profile */ -#define ED_MAX_NAME_LEN 32 - char name[ED_MAX_NAME_LEN]; - int loss_level; - int samples_no; - int *samples; -}; - -#define ED_MAX_SAMPLES_NO 1024 -struct dn_pipe_max8 { - struct dn_pipe8 pipe; - int samples[ED_MAX_SAMPLES_NO]; -}; -SLIST_HEAD(dn_pipe_head8, dn_pipe8); - -/* - * Changes from 7.2 to 8: - * dn_pipe: - * numbytes from int to int64_t - * add burst (int64_t) - * add idle_time (int64_t) - * add profile - * add struct dn_pipe_max - * add flag DN_HAS_PROFILE - * - * dn_flow_queue - * numbytes from u_long to int64_t - * add extra_bits (int64_t) - * q_time from u_int32_t to int64_t and name idle_time - * - * dn_flow_set unchanged - * - */ - -/* NOTE:XXX copied from dummynet.c */ -#define O_NEXT(p, len) ((void *)((char *)p + len)) -static void -oid_fill(struct dn_id *oid, int len, int type, uintptr_t id) -{ - oid->len = len; - oid->type = type; - oid->subtype = 0; - oid->id = id; -} -/* make room in the buffer and move the pointer forward */ -static void * -o_next(struct dn_id **o, int len, int type) -{ - struct dn_id *ret = *o; - oid_fill(ret, len, type, 0); - *o = O_NEXT(*o, len); - return ret; -} - -static size_t pipesize7 = sizeof(struct dn_pipe7); -static size_t pipesize8 = sizeof(struct dn_pipe8); -static size_t pipesizemax8 = sizeof(struct dn_pipe_max8); - -/* Indicate 'ipfw' version - * 1: from FreeBSD 7.2 - * 0: from FreeBSD 8 - * -1: unknown (for now is unused) - * - * It is update when a IP_DUMMYNET_DEL or IP_DUMMYNET_CONFIGURE request arrives - * NOTE: if a IP_DUMMYNET_GET arrives and the 'ipfw' version is unknown, - * it is suppose to be the FreeBSD 8 version. - */ -static int is7 = 0; - -static int -convertflags2new(int src) -{ - int dst = 0; - - if (src & DNOLD_HAVE_FLOW_MASK) - dst |= DN_HAVE_MASK; - if (src & DNOLD_QSIZE_IS_BYTES) - dst |= DN_QSIZE_BYTES; - if (src & DNOLD_NOERROR) - dst |= DN_NOERROR; - if (src & DNOLD_IS_RED) - dst |= DN_IS_RED; - if (src & DNOLD_IS_GENTLE_RED) - dst |= DN_IS_GENTLE_RED; - if (src & DNOLD_HAS_PROFILE) - dst |= DN_HAS_PROFILE; - - return dst; -} - -static int -convertflags2old(int src) -{ - int dst = 0; - - if (src & DN_HAVE_MASK) - dst |= DNOLD_HAVE_FLOW_MASK; - if (src & DN_IS_RED) - dst |= DNOLD_IS_RED; - if (src & DN_IS_GENTLE_RED) - dst |= DNOLD_IS_GENTLE_RED; - if (src & DN_NOERROR) - dst |= DNOLD_NOERROR; - if (src & DN_HAS_PROFILE) - dst |= DNOLD_HAS_PROFILE; - if (src & DN_QSIZE_BYTES) - dst |= DNOLD_QSIZE_IS_BYTES; - - return dst; -} - -static int -dn_compat_del(void *v) -{ - struct dn_pipe7 *p = (struct dn_pipe7 *) v; - struct dn_pipe8 *p8 = (struct dn_pipe8 *) v; - struct { - struct dn_id oid; - uintptr_t a[1]; /* add more if we want a list */ - } cmd; - - /* XXX DN_API_VERSION ??? */ - oid_fill((void *)&cmd, sizeof(cmd), DN_CMD_DELETE, DN_API_VERSION); - - if (is7) { - if (p->pipe_nr == 0 && p->fs.fs_nr == 0) - return EINVAL; - if (p->pipe_nr != 0 && p->fs.fs_nr != 0) - return EINVAL; - } else { - if (p8->pipe_nr == 0 && p8->fs.fs_nr == 0) - return EINVAL; - if (p8->pipe_nr != 0 && p8->fs.fs_nr != 0) - return EINVAL; - } - - if (p->pipe_nr != 0) { /* pipe x delete */ - cmd.a[0] = p->pipe_nr; - cmd.oid.subtype = DN_LINK; - } else { /* queue x delete */ - cmd.oid.subtype = DN_FS; - cmd.a[0] = (is7) ? p->fs.fs_nr : p8->fs.fs_nr; - } - - return do_config(&cmd, cmd.oid.len); -} - -static int -dn_compat_config_queue(struct dn_fs *fs, void* v) -{ - struct dn_pipe7 *p7 = (struct dn_pipe7 *)v; - struct dn_pipe8 *p8 = (struct dn_pipe8 *)v; - struct dn_flow_set *f; - - if (is7) - f = &p7->fs; - else - f = &p8->fs; - - fs->fs_nr = f->fs_nr; - fs->sched_nr = f->parent_nr; - fs->flow_mask = f->flow_mask; - fs->buckets = f->rq_size; - fs->qsize = f->qsize; - fs->plr = f->plr; - fs->par[0] = f->weight; - fs->flags = convertflags2new(f->flags_fs); - if (fs->flags & DN_IS_GENTLE_RED || fs->flags & DN_IS_RED) { - fs->w_q = f->w_q; - fs->max_th = f->max_th; - fs->min_th = f->min_th; - fs->max_p = f->max_p; - } - - return 0; -} - -static int -dn_compat_config_pipe(struct dn_sch *sch, struct dn_link *p, - struct dn_fs *fs, void* v) -{ - struct dn_pipe7 *p7 = (struct dn_pipe7 *)v; - struct dn_pipe8 *p8 = (struct dn_pipe8 *)v; - int i = p7->pipe_nr; - - sch->sched_nr = i; - sch->oid.subtype = 0; - p->link_nr = i; - fs->fs_nr = i + 2*DN_MAX_ID; - fs->sched_nr = i + DN_MAX_ID; - - /* Common to 7 and 8 */ - p->bandwidth = p7->bandwidth; - p->delay = p7->delay; - if (!is7) { - /* FreeBSD 8 has burst */ - p->burst = p8->burst; - } - - /* fill the fifo flowset */ - dn_compat_config_queue(fs, v); - fs->fs_nr = i + 2*DN_MAX_ID; - fs->sched_nr = i + DN_MAX_ID; - - /* Move scheduler related parameter from fs to sch */ - sch->buckets = fs->buckets; /*XXX*/ - fs->buckets = 0; - if (fs->flags & DN_HAVE_MASK) { - sch->flags |= DN_HAVE_MASK; - fs->flags &= ~DN_HAVE_MASK; - sch->sched_mask = fs->flow_mask; - bzero(&fs->flow_mask, sizeof(struct ipfw_flow_id)); - } - - return 0; -} - -static int -dn_compat_config_profile(struct dn_profile *pf, struct dn_link *p, - void *v) -{ - struct dn_pipe8 *p8 = (struct dn_pipe8 *)v; - - p8->samples = &(((struct dn_pipe_max8 *)p8)->samples[0]); - - pf->link_nr = p->link_nr; - pf->loss_level = p8->loss_level; -// pf->bandwidth = p->bandwidth; //XXX bandwidth redundant? - pf->samples_no = p8->samples_no; - strncpy(pf->name, p8->name,sizeof(pf->name)); - bcopy(p8->samples, pf->samples, sizeof(pf->samples)); - - return 0; -} - -/* - * If p->pipe_nr != 0 the command is 'pipe x config', so need to create - * the three main struct, else only a flowset is created - */ -static int -dn_compat_configure(void *v) -{ - struct dn_id *buf = NULL, *base; - struct dn_sch *sch = NULL; - struct dn_link *p = NULL; - struct dn_fs *fs = NULL; - struct dn_profile *pf = NULL; - int lmax; - int error; - - struct dn_pipe7 *p7 = (struct dn_pipe7 *)v; - struct dn_pipe8 *p8 = (struct dn_pipe8 *)v; - - int i; /* number of object to configure */ - - lmax = sizeof(struct dn_id); /* command header */ - lmax += sizeof(struct dn_sch) + sizeof(struct dn_link) + - sizeof(struct dn_fs) + sizeof(struct dn_profile); - - base = buf = malloc(lmax, M_DUMMYNET, M_WAITOK|M_ZERO); - o_next(&buf, sizeof(struct dn_id), DN_CMD_CONFIG); - base->id = DN_API_VERSION; - - /* pipe_nr is the same in p7 and p8 */ - i = p7->pipe_nr; - if (i != 0) { /* pipe config */ - sch = o_next(&buf, sizeof(*sch), DN_SCH); - p = o_next(&buf, sizeof(*p), DN_LINK); - fs = o_next(&buf, sizeof(*fs), DN_FS); - - error = dn_compat_config_pipe(sch, p, fs, v); - if (error) { - free(buf, M_DUMMYNET); - return error; - } - if (!is7 && p8->samples_no > 0) { - /* Add profiles*/ - pf = o_next(&buf, sizeof(*pf), DN_PROFILE); - error = dn_compat_config_profile(pf, p, v); - if (error) { - free(buf, M_DUMMYNET); - return error; - } - } - } else { /* queue config */ - fs = o_next(&buf, sizeof(*fs), DN_FS); - error = dn_compat_config_queue(fs, v); - if (error) { - free(buf, M_DUMMYNET); - return error; - } - } - error = do_config(base, (char *)buf - (char *)base); - - if (buf) - free(buf, M_DUMMYNET); - return error; -} - -int -dn_compat_calc_size(void) -{ - int need = 0; - /* XXX use FreeBSD 8 struct size */ - /* NOTE: - * - half scheduler: schk_count/2 - * - all flowset: fsk_count - * - all flowset queues: queue_count - * - all pipe queue: si_count - */ - need += V_dn_cfg.schk_count * sizeof(struct dn_pipe8) / 2; - need += V_dn_cfg.fsk_count * sizeof(struct dn_flow_set); - need += V_dn_cfg.si_count * sizeof(struct dn_flow_queue8); - need += V_dn_cfg.queue_count * sizeof(struct dn_flow_queue8); - - return need; -} - -int -dn_c_copy_q (void *_ni, void *arg) -{ - struct copy_args *a = arg; - struct dn_flow_queue7 *fq7 = (struct dn_flow_queue7 *)*a->start; - struct dn_flow_queue8 *fq8 = (struct dn_flow_queue8 *)*a->start; - struct dn_flow *ni = (struct dn_flow *)_ni; - int size = 0; - - /* XXX hash slot not set */ - /* No difference between 7.2/8 */ - fq7->len = ni->length; - fq7->len_bytes = ni->len_bytes; - fq7->id = ni->fid; - - if (is7) { - size = sizeof(struct dn_flow_queue7); - fq7->tot_pkts = ni->tot_pkts; - fq7->tot_bytes = ni->tot_bytes; - fq7->drops = ni->drops; - } else { - size = sizeof(struct dn_flow_queue8); - fq8->tot_pkts = ni->tot_pkts; - fq8->tot_bytes = ni->tot_bytes; - fq8->drops = ni->drops; - } - - *a->start += size; - return 0; -} - -int -dn_c_copy_pipe(struct dn_schk *s, struct copy_args *a, int nq) -{ - struct dn_link *l = &s->link; - struct dn_fsk *f = s->fs; - - struct dn_pipe7 *pipe7 = (struct dn_pipe7 *)*a->start; - struct dn_pipe8 *pipe8 = (struct dn_pipe8 *)*a->start; - struct dn_flow_set *fs; - int size = 0; - - if (is7) { - fs = &pipe7->fs; - size = sizeof(struct dn_pipe7); - } else { - fs = &pipe8->fs; - size = sizeof(struct dn_pipe8); - } - - /* These 4 field are the same in pipe7 and pipe8 */ - pipe7->next.sle_next = (struct dn_pipe7 *)DN_IS_PIPE; - pipe7->bandwidth = l->bandwidth; - pipe7->delay = l->delay * 1000 / hz; - pipe7->pipe_nr = l->link_nr - DN_MAX_ID; - - if (!is7) { - if (s->profile) { - struct dn_profile *pf = s->profile; - strncpy(pipe8->name, pf->name, sizeof(pf->name)); - pipe8->loss_level = pf->loss_level; - pipe8->samples_no = pf->samples_no; - } - pipe8->burst = div64(l->burst , 8 * hz); - } - - fs->flow_mask = s->sch.sched_mask; - fs->rq_size = s->sch.buckets ? s->sch.buckets : 1; - - fs->parent_nr = l->link_nr - DN_MAX_ID; - fs->qsize = f->fs.qsize; - fs->plr = f->fs.plr; - fs->w_q = f->fs.w_q; - fs->max_th = f->max_th; - fs->min_th = f->min_th; - fs->max_p = f->fs.max_p; - fs->rq_elements = nq; - - fs->flags_fs = convertflags2old(f->fs.flags); - - *a->start += size; - return 0; -} - -int -dn_compat_copy_pipe(struct copy_args *a, void *_o) -{ - int have = a->end - *a->start; - int need = 0; - int pipe_size = sizeof(struct dn_pipe8); - int queue_size = sizeof(struct dn_flow_queue8); - int n_queue = 0; /* number of queues */ - - struct dn_schk *s = (struct dn_schk *)_o; - /* calculate needed space: - * - struct dn_pipe - * - if there are instances, dn_queue * n_instances - */ - n_queue = (s->sch.flags & DN_HAVE_MASK ? dn_ht_entries(s->siht) : - (s->siht ? 1 : 0)); - need = pipe_size + queue_size * n_queue; - if (have < need) { - D("have %d < need %d", have, need); - return 1; - } - /* copy pipe */ - dn_c_copy_pipe(s, a, n_queue); - - /* copy queues */ - if (s->sch.flags & DN_HAVE_MASK) - dn_ht_scan(s->siht, dn_c_copy_q, a); - else if (s->siht) - dn_c_copy_q(s->siht, a); - return 0; -} - -int -dn_c_copy_fs(struct dn_fsk *f, struct copy_args *a, int nq) -{ - struct dn_flow_set *fs = (struct dn_flow_set *)*a->start; - - fs->next.sle_next = (struct dn_flow_set *)DN_IS_QUEUE; - fs->fs_nr = f->fs.fs_nr; - fs->qsize = f->fs.qsize; - fs->plr = f->fs.plr; - fs->w_q = f->fs.w_q; - fs->max_th = f->max_th; - fs->min_th = f->min_th; - fs->max_p = f->fs.max_p; - fs->flow_mask = f->fs.flow_mask; - fs->rq_elements = nq; - fs->rq_size = (f->fs.buckets ? f->fs.buckets : 1); - fs->parent_nr = f->fs.sched_nr; - fs->weight = f->fs.par[0]; - - fs->flags_fs = convertflags2old(f->fs.flags); - *a->start += sizeof(struct dn_flow_set); - return 0; -} - -int -dn_compat_copy_queue(struct copy_args *a, void *_o) -{ - int have = a->end - *a->start; - int need = 0; - int fs_size = sizeof(struct dn_flow_set); - int queue_size = sizeof(struct dn_flow_queue8); - - struct dn_fsk *fs = (struct dn_fsk *)_o; - int n_queue = 0; /* number of queues */ - - n_queue = (fs->fs.flags & DN_HAVE_MASK ? dn_ht_entries(fs->qht) : - (fs->qht ? 1 : 0)); - - need = fs_size + queue_size * n_queue; - if (have < need) { - D("have < need"); - return 1; - } - - /* copy flowset */ - dn_c_copy_fs(fs, a, n_queue); - - /* copy queues */ - if (fs->fs.flags & DN_HAVE_MASK) - dn_ht_scan(fs->qht, dn_c_copy_q, a); - else if (fs->qht) - dn_c_copy_q(fs->qht, a); - - return 0; -} - -int -copy_data_helper_compat(void *_o, void *_arg) -{ - struct copy_args *a = _arg; - - if (a->type == DN_COMPAT_PIPE) { - struct dn_schk *s = _o; - if (s->sch.oid.subtype != 1 || s->sch.sched_nr <= DN_MAX_ID) { - return 0; /* not old type */ - } - /* copy pipe parameters, and if instance exists, copy - * other parameters and eventually queues. - */ - if(dn_compat_copy_pipe(a, _o)) - return DNHT_SCAN_END; - } else if (a->type == DN_COMPAT_QUEUE) { - struct dn_fsk *fs = _o; - if (fs->fs.fs_nr >= DN_MAX_ID) - return 0; - if (dn_compat_copy_queue(a, _o)) - return DNHT_SCAN_END; - } - return 0; -} - -/* Main function to manage old requests */ -int -ip_dummynet_compat(struct sockopt *sopt) -{ - int error=0; - void *v = NULL; - struct dn_id oid; - - /* Length of data, used to found ipfw version... */ - int len = sopt->sopt_valsize; - - /* len can be 0 if command was dummynet_flush */ - if (len == pipesize7) { - D("setting compatibility with FreeBSD 7.2"); - is7 = 1; - } - else if (len == pipesize8 || len == pipesizemax8) { - D("setting compatibility with FreeBSD 8"); - is7 = 0; - } - - switch (sopt->sopt_name) { - default: - printf("dummynet: -- unknown option %d", sopt->sopt_name); - error = EINVAL; - break; - - case IP_DUMMYNET_FLUSH: - oid_fill(&oid, sizeof(oid), DN_CMD_FLUSH, DN_API_VERSION); - do_config(&oid, oid.len); - break; - - case IP_DUMMYNET_DEL: - v = malloc(len, M_TEMP, M_WAITOK); - error = sooptcopyin(sopt, v, len, len); - if (error) - break; - error = dn_compat_del(v); - free(v, M_TEMP); - break; - - case IP_DUMMYNET_CONFIGURE: - v = malloc(len, M_TEMP, M_NOWAIT); - if (v == NULL) { - error = ENOMEM; - break; - } - error = sooptcopyin(sopt, v, len, len); - if (error) - break; - error = dn_compat_configure(v); - free(v, M_TEMP); - break; - - case IP_DUMMYNET_GET: { - void *buf; - int ret; - int original_size = sopt->sopt_valsize; - int size; - - ret = dummynet_get(sopt, &buf); - if (ret) - return 0;//XXX ? - size = sopt->sopt_valsize; - sopt->sopt_valsize = original_size; - D("size=%d, buf=%p", size, buf); - ret = sooptcopyout(sopt, buf, size); - if (ret) - printf(" %s ERROR sooptcopyout\n", __FUNCTION__); - if (buf) - free(buf, M_DUMMYNET); - } - } - - return error; -} diff --git a/sys/netpfil/ipfw/ip_dn_private.h b/sys/netpfil/ipfw/ip_dn_private.h index ea5b809d8d28..bb5013df124e 100644 --- a/sys/netpfil/ipfw/ip_dn_private.h +++ b/sys/netpfil/ipfw/ip_dn_private.h @@ -428,15 +428,7 @@ struct copy_args { }; struct sockopt; -int ip_dummynet_compat(struct sockopt *sopt); -int dummynet_get(struct sockopt *sopt, void **compat); -int dn_c_copy_q (void *_ni, void *arg); -int dn_c_copy_pipe(struct dn_schk *s, struct copy_args *a, int nq); -int dn_c_copy_fs(struct dn_fsk *f, struct copy_args *a, int nq); -int dn_compat_copy_queue(struct copy_args *a, void *_o); -int dn_compat_copy_pipe(struct copy_args *a, void *_o); -int copy_data_helper_compat(void *_o, void *_arg); -int dn_compat_calc_size(void); +int dummynet_get(struct sockopt *sopt); int do_config(void *p, size_t l); /* function to drain idle object */ diff --git a/sys/netpfil/ipfw/ip_dummynet.c b/sys/netpfil/ipfw/ip_dummynet.c index b3f52322425f..9c7ae06db294 100644 --- a/sys/netpfil/ipfw/ip_dummynet.c +++ b/sys/netpfil/ipfw/ip_dummynet.c @@ -2198,9 +2198,6 @@ compute_space(struct dn_id *cmd, struct copy_args *a) case DN_FS: /* queue show */ x = DN_C_FS | DN_C_QUEUE; break; - case DN_GET_COMPAT: /* compatibility mode */ - need = dn_compat_calc_size(); - break; } a->flags = x; if (x & DN_C_SCH) { @@ -2226,11 +2223,9 @@ compute_space(struct dn_id *cmd, struct copy_args *a) } /* - * If compat != NULL dummynet_get is called in compatibility mode. - * *compat will be the pointer to the buffer to pass to ipfw */ int -dummynet_get(struct sockopt *sopt, void **compat) +dummynet_get(struct sockopt *sopt) { int have, i, need, error; char *start = NULL, *buf; @@ -2248,37 +2243,28 @@ dummynet_get(struct sockopt *sopt, void **compat) *** 130 LINES SKIPPED *** From nobody Thu Nov 20 16:52:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC4CK3bgwz6Hdqw for ; Thu, 20 Nov 2025 16:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dC4CK0R1jz3Ytw for ; Thu, 20 Nov 2025 16:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763657549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gmyoet+0Ej8TpUA9Qq60ZmW3Gj5ArLGV3TgYH5ZrTzc=; b=PrTL4vvdoNIsjCSulI8MPQHWtYXdgrMZ2RZOfFE058VAjF/N6l26G76VZlHPT/7iOlau4B CVgTK2r33Kc4MhGFjFP4g9nYyEu3Tt1A0YCK57ZLgAZSOuuUdumZRrsmuh7XGKJ7naDqoE gXfDTU+M7DukEG7Oq2miDE35LeYWOsJEavw17lVS1wGPHERXeWR4VGVgYgCOghW1e0W02+ Fh2iO/YMQNclnU0ouLYXTdZwUnzU6AFOeXcU5dg5TWaI8F+N6cYNaco/WGePsAN4wX/A78 gUEA1hLkGvz1QWsdU9u0diyBxOHYFbblUE8b0Vb2isjisxoMMeWbzIG7xo4MOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763657549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gmyoet+0Ej8TpUA9Qq60ZmW3Gj5ArLGV3TgYH5ZrTzc=; b=x27bt1j7DTPje6KomI5IdrRUvAD0CF2ySMvsExvXPw5vQmagwn2u0ZfOUHsscnB5D6eOpJ s5AuetUId/XVkJuzWxO7hubw0ITHlfzYPxpR0v5CZmVr+GLKi+SBu7jiCd3RfyoGQSaZtd q/o42KU4HUDkyQArd8Eh2ZT36fdQoX1kcsmOmlRMG6NwVtroUyZni3unq9Y/8W/g7pY6TO reh6RbHSOzP3dsqhNE+2jzsFFQRzIgsMTcCJbJAaaK3ptWzz7DeAVKhRx77CSqeWogQM20 cb8kSJQ2yzkyb28i0Hnmm/2GBjUSlTLoRfbMaybDcTTnSRjTwL6v+9kqw8PFJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763657549; a=rsa-sha256; cv=none; b=HRdo0EqAzQtDGTOFGf9xlR2LP/A6nKxSx9zMNOH/dpQKIN2P4pqxNoLt/OGTVYWW5n+1/y KEyXFLBMAYTv2npA4MHeNflbi2BrMWmn/e+zkJtVhWGdSt5WMZsKmKtZqgJzkzsE0iSy5h L3xaHoy2E+l7vaxssY83b73k+MY5UghRqgYCI8E2mfqEvngy1bCPGvgwKeyVJOOC8m9ZKq 7PhwztUN8To+Zq4zEVee3Fl9b8Ldnl7XINz9k2pG2wG1ApFg+7nKMnE6wuQEHrVRfjitbq LyNmBH1NeKqoNeEBzGqSQLR/k5EQ+Fwx74J9swm/Rg5uX3KXSxtq472YT4N32Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dC4CJ6bZqzbcl for ; Thu, 20 Nov 2025 16:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e474 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 16:52:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 39cad8402d19 - main - max_align_t: apply alignof to 'long double' for long double alignment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39cad8402d19f361cb8d489a3a69ff94b643c6df Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 16:52:28 +0000 Message-Id: <691f474c.3e474.14a87b7c@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=39cad8402d19f361cb8d489a3a69ff94b643c6df commit 39cad8402d19f361cb8d489a3a69ff94b643c6df Author: Konstantin Belousov AuthorDate: 2025-11-19 14:51:54 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-20 16:52:10 +0000 max_align_t: apply alignof to 'long double' for long double alignment Reviewed by; markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53826 --- sys/sys/_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/_types.h b/sys/sys/_types.h index fe345b43d5eb..6b70b8dc6e32 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -183,7 +183,7 @@ typedef struct { __attribute__((__aligned__(__alignof__(long long)))); #ifndef _STANDALONE long double __max_align2 - __attribute__((__aligned__(__alignof__(long long)))); + __attribute__((__aligned__(__alignof__(long double)))); #endif } __max_align_t; From nobody Thu Nov 20 17:08:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC4ZM07nHz6Hg28 for ; Thu, 20 Nov 2025 17:08: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dC4ZL6kPtz3cx4 for ; Thu, 20 Nov 2025 17:08:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763658539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CwmeSibVNBhBM9uNdZpBn89FK3/6GBF0pXWFhyH/KGs=; b=xhoA0119OIu6G2/IxxxbTyKayYCEO62jDf90ZVKBSzzYnagoSd1cRqJUnjqmA/1y1AvVeH CGA36gjZd1dF06LPSoZYBKfyie6kLt+XH5vRziGibj3pvfWm4UZbsTHdR1AV3QblMNxWhS DaubWq36g7Hq7TKLdtL05Plw5JjP9cGilPkoScAY9s2tOv9utItSLx5B7zBTt32AB/XGgU LN5rMbf2VNZSYnA0PYZvNscjHPlL/j9y+TLHG2zkPWv1SYKxuaHcKBBRLSr137IM2TFbP0 OVMcy7m/EvjttrMlEfD4w9N6KVryhaVDGiLSDB6VNbzwh2TpSoQrrAiUViVHQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763658538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CwmeSibVNBhBM9uNdZpBn89FK3/6GBF0pXWFhyH/KGs=; b=XSw+F1vSBKDj55UnbOAHZa6lgKojsL6aHNbffR8t3NFWxZ5ExqNIVwoIO3VvfX1RlYDJ9K Q/S8IlI8by4OglaKMpScokEwasxQUQh8v1m5sya8+taa8SsZWe9WWdV3+RWJtiPL2NgEfX TvKdvOADtBwYm/Vi1MrH6wndorEnd/c+5PvFXz6L7pBRLK7Ghl9AONFyz3nlAlr8fpDoin IZ8mpzdAGY88VbC+uXkNKV4sqRIyh7+bJTGCm9ciYA0Ax55WJWlu2eEuPZ6sr5aH7auoln 8T33OY413/aE/9AEX4N0lCJ8bcNYOzXtyMEUVqhz6grEpw5/M9sY2A14FG6A8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763658539; a=rsa-sha256; cv=none; b=gLf/Zer4QftTNW0dZzbT4tIc8eyx2LgQqM5Bw5cUC89ffc0uVX9tdRwHFNKp1lzSCWopBJ BrVaKtJnB/PRs267C10SqIhMAQnOu5yDnhRgCJ4Mgbued+eoAllXaXF8uwTShBqbvU7N/H IQOm/9ouRRJwXwCPB/PW0veRVLo3nxdaSPOfpvGqdRKEL91QV9sT0SwstpFQbJztH5X1zg 8v95h/M2RCaz0SZjTe3fG8B5Uf1nCflmxXv5RI9zLmhpvJQK9OEEMpSSmWr8lP5JRGuhzg 863x0DDsmabcXiAWN14vt0SnSMyrGINMF4JGRUl/nD+dM83u8F4xhBOQmCiBNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dC4ZL5XfSzbn9 for ; Thu, 20 Nov 2025 17:08:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 922a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 17:08:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a4aa7df767e0 - main - mgb.4, muge.4: Use standard HARDWARE introduction List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a4aa7df767e0df49ca3294d2b578be25812364d8 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 17:08:58 +0000 Message-Id: <691f4b2a.922a.792649f9@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a4aa7df767e0df49ca3294d2b578be25812364d8 commit a4aa7df767e0df49ca3294d2b578be25812364d8 Author: Ed Maste AuthorDate: 2025-11-20 16:41:38 +0000 Commit: Ed Maste CommitDate: 2025-11-20 17:08:22 +0000 mgb.4, muge.4: Use standard HARDWARE introduction Release notes are generated using this text. I used "interfaces" not "adapters" in these pages as the listed devices are the controller ICs, not end-user projects. Reviewed by: ziaee Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53846 --- share/man/man4/mgb.4 | 2 +- share/man/man4/muge.4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/mgb.4 b/share/man/man4/mgb.4 index cf0f7aaa688d..0d26951d1b1e 100644 --- a/share/man/man4/mgb.4 +++ b/share/man/man4/mgb.4 @@ -49,7 +49,7 @@ For more information on configuring this device, see .Sh HARDWARE The .Nm -driver supports: +driver supports Microchip PCIe Gigabit Ethernet interfaces, including: .Pp .Bl -bullet -compact .It diff --git a/share/man/man4/muge.4 b/share/man/man4/muge.4 index 598106bf1855..2a1b0f600955 100644 --- a/share/man/man4/muge.4 +++ b/share/man/man4/muge.4 @@ -44,7 +44,7 @@ For more information on configuring this device, see .Sh HARDWARE The .Nm -driver supports: +driver supports Microchip USB Gigabit Ethernet interfaces, including: .Pp .Bl -bullet -compact .It From nobody Fri Nov 21 00:00:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCFhh0bbsz6J7xb for ; Fri, 21 Nov 2025 00:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCFhg5Ngwz4Q65 for ; Fri, 21 Nov 2025 00:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763683203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0lv9UvFUfHKIslAlttbdSQJw19wk6g4ctI/ZcwkcoDI=; b=nc/70xI1/ANQRnzzqurm5N+17cs5Y1qZ9VFCrPhwKy5iG4xKi8ZKcaBANpDixPgeedDRxi M+t7HMUi17OPnCg15TXKSudomObsUPxJZKEm/AkxSQGFu/M1wUNwWrfi+HDl1id/cHlgky 3mpopsZRtjj01NBo5m5He+vOcP68E209vBoBz0xyn66Q5PQ4q5S8Kvd84d8kJW5Kwf50j4 RSjC5RVGjxO0Jz/ivt8XYuuaJiTVanQHDGUcq2K5VEljwZquhMv1y+MyIsl5TYLke4EBZz 76oL3XudfP8vDSpuMO1DPK/nk+1uG/dfM1cS/rwSd7hBGYeQOwAKzD6LZDWGkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763683203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0lv9UvFUfHKIslAlttbdSQJw19wk6g4ctI/ZcwkcoDI=; b=nBaXy6fp+kEUNbmY9hb5Ov3r9GC5tkZ+idY/UcJFMQGZLe2GkySTegvoeRUiCgJXZM2dof g31sXE/35IExM2T/98RWEINMGfHsSwvXtvzvrysSfbQdO88H+9rGImQ3SNo78o3X/pW7R8 3f0atzL+lQtjONrzP2wRKtOe8gAGRqWHUN/MT8SvP1gA0woey0rowunYZuXuT9578K8h3S fRRkgCzsFTKMcpi6XiK+uO5vcCly9YxYHuI2erCDlsu9GiQ2ONdA/G6ZqbJ2gli0hR+JTC DR4vxboRt79N61jDNOmJ7vN14l3Ex/rkcfIpGwzk+ycuZAV+b0LPet9hLL5cig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763683203; a=rsa-sha256; cv=none; b=MIPI68qu7E5LF2HJqnWTfJp89bD09F1W0UkZ+ms7jqNTU3jIGFu2GI/+u/6zfg20nT7D4u ZZuwJbxu+te7+r8wrL8MtLf6LBYzOhI8sMmfUHytXcTK+QmVoq04VxdjoU/4YvgwdfJbsM RzJ1At0rU3F0XiO5L5eg6WP8zNw7OGcB0LyU0pgvbSnPSxv2nJSU/EpNdWhxBMcxC/wikd qkMgAexIbfWuW7nzeilyLov0Og+IoI4V5cp4tXqZSKDcQYpIHxH9HiWkxsKUbBFTJFalXG G2dRtxZtRBh06q7ub9wJV508gAk1jtm1yzOUySWxLzD0SpB/gKqmNk1CA44zgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCFhg4dmVznwh for ; Fri, 21 Nov 2025 00:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9c61 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 00:00:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 4579378a950f - releng/15.0 - 15.0: Update to RC3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 4579378a950faa193f2607af55a2b5538e773cb4 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 00:00:03 +0000 Message-Id: <691fab83.9c61.57b989c5@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4579378a950faa193f2607af55a2b5538e773cb4 commit 4579378a950faa193f2607af55a2b5538e773cb4 Author: Colin Percival AuthorDate: 2025-11-21 00:00:00 +0000 Commit: Colin Percival CommitDate: 2025-11-21 00:00:00 +0000 15.0: Update to RC3 Approved by: re (implicit) --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index d04589d00eb3..e5095a8b04bc 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -51,7 +51,7 @@ TYPE="FreeBSD" REVISION="15.0" -BRANCH="RC2" +BRANCH="RC3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Nov 21 03:13:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCKzy0gXKz6GNqj for ; Fri, 21 Nov 2025 03:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCKzx6tRYz3RvK for ; Fri, 21 Nov 2025 03:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763694814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ipM3RakCuXwKVLhFtAQaBS4+Gdg+bHK5uMNW76DgVs8=; b=KHtjGfazdzt3K30RHN+2nDY4NYVs/LyCZtGpGbpPQqUxc55ED3xxxtE0uFpJcv2YUJUv3Y g1jmWvku5mDWbzDr82A8ThF4zsKn6O1+rUfRLgvHDTxfjpNKoi0ViLA0P+gd/Q2Qut3qjM hcB/YOLGz4NLoAQx4HAIhvT1FNkByAPpRDyF4SheSobD8wiGpY4ACVapVrZDVRaq0CFaWe +N0//IthroznEhJx8Ga7UZwWQfRYDxKKmpxhkk5dyuoXubM0KCEj0jBkDkJKuBK5uXKFuJ U2mjA64DjkIy2rbTz3G1BlDqdMsCbccS8kOz3oENQ869ZfP4iLjpG7btCG1T6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763694814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ipM3RakCuXwKVLhFtAQaBS4+Gdg+bHK5uMNW76DgVs8=; b=RSiOu+ed5Azg91yFpKYn9lecgxbEdAclShoEMvSOKHRknWWBQlMdNebNIasx9u2TaMRYzO e0C000rvb3/GSb6mCNYH+B8zeIhoNrN5PJqxPgQqjRAqeRxBZHYZpFOCCTZgNSqedgpq3e KoZUpkkwkubV7+Ix+C86y6Coom52CGiUJDOmoKvpc/tue3R/YDHq70gHvuXMzxwxqnKmvf 2F5M1Dp+pY163s6N3YVO/ssLxN8190hHhiwwVat0TAX2+JaXcoUekhVv0zlDU3MJDKXFy/ 7Bd5IoGgwFRgStKapGWZIh8tSSYZrkRd4H8GBrTJ1Wrd1HC0mVxXqCi2nSUEtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763694814; a=rsa-sha256; cv=none; b=Dm0NpKugVpY/luuFztlqtB0R5N4bXQuyhRoIvpqAWWlSYoqIRLZQjNMBEgk6MERmjRbMEt EvsazoeqElaLzfDsEGSbeP/4ysqOMAThXlVe1k4l1k8nsZhhn8/9yDq1Z7wj4N064bma9E m7509gsw4R40HzqmWLWbtjqCrdZSu6vJqvvtjQIG5d2psbjRHF7UifOmEyaZt40ILhiTgU mgELL1Di+knfhzEzRw3KoiSHmDaF4qLuYjM9GtwO6ACtqp/vTL8AkeDbg0iXC1qI7Twpxm LB4LqPkhnw81VHmQyjpOLxJ0L/8yzYoEwoQ/Y8fh/c/nQStbyonMKjtE4r06bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCKzx6Hhvzv40 for ; Fri, 21 Nov 2025 03:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f3cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 03:13:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: ac1f48b4a7be - main - ntpd: Fix segfault when same IP on multiple interfaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac1f48b4a7be104d222dea60f1da946fcb345fb1 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 03:13:33 +0000 Message-Id: <691fd8dd.2f3cc.57309b9d@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=ac1f48b4a7be104d222dea60f1da946fcb345fb1 commit ac1f48b4a7be104d222dea60f1da946fcb345fb1 Author: Cy Schubert AuthorDate: 2025-11-21 00:16:04 +0000 Commit: Cy Schubert CommitDate: 2025-11-21 00:28:25 +0000 ntpd: Fix segfault when same IP on multiple interfaces Use the protype socket to obtain the IP address for an error message. Using the resultant socket address, a NULL because create_interface() had failed, results in SIGSEGV. To reproduce this bug, ifconfig bridge100 create ifconfig bridge100 10.10.10.10/24 ifconfig bridge101 create ifconfig bridge101 10.10.10.10/24 ntpd -n PR: 291119 MFC after: 3 days --- contrib/ntp/ntpd/ntp_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ntp/ntpd/ntp_io.c b/contrib/ntp/ntpd/ntp_io.c index 9c4f6c1553e3..97b85ee83e36 100644 --- a/contrib/ntp/ntpd/ntp_io.c +++ b/contrib/ntp/ntpd/ntp_io.c @@ -1923,7 +1923,7 @@ update_interfaces( msyslog(LOG_ERR, "cannot bind address %s", - stoa(&ep->sin)); + stoa(&ep2->sin)); } free(ep2); } From nobody Fri Nov 21 06:28:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCQK72H3Zz6GfYS for ; Fri, 21 Nov 2025 06:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCQK674VBz3mj1 for ; Fri, 21 Nov 2025 06:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763706523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kjmcwT4yeWN1ESJsutqjxr+cwGgWX/zCVAbYCSFlQy0=; b=GxECn+KvqHU9befDP655SKXVEF1kk0R5E3XyUfMnk3cWeLP6nKpGhhgm7y2x10SxvRNo18 mVriVGh/VxyEFqA4xEDbzncfYV/AmB4JDQEsrP5JDuT6m+scd52A/sLjDhaA1q5FHbGLdS ijihdZQkr8dvUwwIE8mVaDiIr3vZN0m6bsm6sMQyludvhtYBrMregtcG8Gl9onrM1MimDJ QZtenxJYf6G9VhdKwUjGFAzGJZ7dHTuaeL/0buBMpnvTGHgS/FX9ZKlsZOO5rOn5l+L6wl 1uR5vD1c45dY66aqoqnKKaOwzI0din5qzv/Qu60Y0WVeG3pRqpsxRjAVxSAfrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763706523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kjmcwT4yeWN1ESJsutqjxr+cwGgWX/zCVAbYCSFlQy0=; b=i2fp5pUFsBfL2+/D/HAKRY/uVBJxkRFvGgEyGvtLNa0OksvbzxgrSj/1XarLLwJ1IoibiL P4IMc0vk9jAd7stva4NPKaxnhpcbB2kHmopHV5deHUp0gK+xKxFnJWvbGmiMBpX9EhgrTP l/P6jZ2OAUXCyP0iWE0QwagTMa2UVFjE5XZ+USU7AQ77Mf+9/3eHVzuz37mhP1mnwb7Q06 UJ+h6xcPfdTFF7+8/OZpbszuowLiY5tsIUop/raPUhjXQ5FtXMXeipKFw6VUnW5zZf4ZHH ixrD117Lh+O7kfdiG141tso1glELdYVRDr2CkC7/Gu7El0iXcnsPC9d51IzQYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763706523; a=rsa-sha256; cv=none; b=lBoY+J5k3kFbVakhU45v6RCv2JdsJi0VQ0MYbmRiBLKVPzb0DJx05bY5ebvRNuE4e5+f0i BoACB20M8HIAVhddWyqGXB6wx0A7JK7L3Z7A2ce77ULAUzAvJT1t9cR1Zp43xmC7hRp3NT RmTGoMg8c824cxRzsFv3i6LrQArn7QMOu5aZojnpWPJZ2rGpKqM79YlLOKu1AyxfoV6qmr fRX2gMrJDNPpu8YZNroS0T6Hbnu2fu0QFx/R7b4R2j80pOw4jDxpRGZZ9SnigpJiOVt74/ zgSuyPoZoz9oEbY/lZ4RyIGy4dHStNk3+ZbscZtHltFBNfTc6HJIyzHT866knw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCQK65lZ6z10t0 for ; Fri, 21 Nov 2025 06:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22677 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 06:28:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 5818b6ee552b - main - openssh: Don't attempt to connect to unsupported addresses List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5818b6ee552b302f5300934f9b8cb94881867a5f Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 06:28:42 +0000 Message-Id: <6920069a.22677.826922a@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5818b6ee552b302f5300934f9b8cb94881867a5f commit 5818b6ee552b302f5300934f9b8cb94881867a5f Author: Dag-Erling Smørgrav AuthorDate: 2025-11-21 06:28:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-21 06:28:24 +0000 openssh: Don't attempt to connect to unsupported addresses When iterating over known addresses for the requested target host name, skip those that are not supported by the running kernel. MFC after: 1 week PR: 195231 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53588 --- crypto/openssh/FREEBSD-upgrade | 7 +++++++ crypto/openssh/sshconnect.c | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 98503de12ddb..815c11a8f8ca 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -181,6 +181,13 @@ skip setting DISABLE_LASTLOG which we've applied for FreeBSD, but the autoconf machinery really ought to be reworked. Reported upstream at https://lists.mindrot.org/pipermail/openssh-unix-dev/2022-May/040242.html + +11) Protocol selection + + We use the non-portable feature_present(3) API to determine which + internet protocols are supported by the kernel before trying to + connect to the target host. This avoids confusing the user with + spurious error messages. This port was brought to you by (in no particular order) DARPA, NAI diff --git a/crypto/openssh/sshconnect.c b/crypto/openssh/sshconnect.c index c86182d13673..24da9aed0007 100644 --- a/crypto/openssh/sshconnect.c +++ b/crypto/openssh/sshconnect.c @@ -458,6 +458,8 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop, memset(ntop, 0, sizeof(ntop)); memset(strport, 0, sizeof(strport)); + int inet_supported = feature_present("inet"); + int inet6_supported = feature_present("inet6"); for (attempt = 0; attempt < connection_attempts; attempt++) { if (attempt > 0) { /* Sleep a moment before retrying. */ @@ -482,6 +484,13 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop, errno = oerrno; continue; } + if ((ai->ai_family == AF_INET && !inet_supported) || + (ai->ai_family == AF_INET6 && !inet6_supported)) { + debug2_f("skipping address [%s]:%s: " + "unsupported address family", ntop, strport); + errno = EAFNOSUPPORT; + continue; + } if (options.address_family != AF_UNSPEC && ai->ai_family != options.address_family) { debug2_f("skipping address [%s]:%s: " From nobody Fri Nov 21 06:44:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCQgM5XrRz6Ggjj for ; Fri, 21 Nov 2025 06:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCQgM46fJz3pl4 for ; Fri, 21 Nov 2025 06:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763707471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eufTyKEBXyi5qomNsL4WfYwxWhaS6zMc4BeVExwtvj8=; b=qgGrvZ1D9mJFc8ndoH2eee73MtBTS/IFiYdRdDN7MWb1uwxYUS7YOB2QGFvPn672zPvYAe etm1eBpxMt4nsZRNcAY7dhWMdhqa4SQVL9CbMchYR+BE9UmXiSNsPP9FGHSYy3rSMVwJ4R XT7bht9LQQ3MpG8/g9B1wQYUE1fAe9J1h0OaxyC4xcdTQKUgO0OnwRzU2IWad/kv0PaXDn 9UcEyUzFySqF8aUzmv9LT/B7Z6X2xEQOWc4VkTDC5Nc9LHj2jfD2bsTbGEUa1HRC0K0XoX S0ymnN2/rSkHW2FKC7cvmh7XWE2JoCE+htHFD7xuS7MUUPaqjj3uBYtNiv9s6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763707471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eufTyKEBXyi5qomNsL4WfYwxWhaS6zMc4BeVExwtvj8=; b=Z+KxVKZlbz/3/ixtJj4WEYD3wMhubVouODJTE/ML5LLfaZX/gAiqKaraMsoGVBSQL13ldY WIEnBphR06ZZTUtlc835AoU8mhESjDxSNMDDvsPLe36/f3CfpoE9xJtcTLeFWNnppAjzYr Zc4myZ1UbG5I9XzHu5Lywl9ZyIi4KIzyAyw4vSmTkP94Rp3B8RWLHg17ErPwuksh5OFqQz MZQIINn/BLHs+7MFEmdyMlIJymhshyWzIgxcu3qaOhh/d2FnXETjCzuHCTnGKWbh6SO8Ca Gj9b812XcYZ1b86ztSloneUE8R7zIiD9tZlq2g/cDhOaK7N/Q6U2+MYE5vUWcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763707471; a=rsa-sha256; cv=none; b=ccNCHvilu5a59q5EmiQFL1BXt2ao97wPsgPTdV8bzi4WqR9wywNgX76lxDtaJqialgprdh XA7hQFEpfSWkGy1vSK22BlNDa0CGp86zCTIHvnQUeZ1906p2gtjA/OmYkinBPdTBWRBVvK UdJ9mAW3ki9uLcZdxzUnjV3WrGLlLW+gLeWaOlM5nmOtzf1iiub9CQhV5g5p/cHZoIwcnE IFkus5BYmaMB4mR89hbgimNIw8zbK/IaMCg58aYKr9H/D6vmolapC3b0bJCTKjntuuBw9F VPGz7EXIGOlGD0/5at38Zhb+PjKUBjpz01TBkXgtFtaNDiBdE5CdrDITyLLLSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCQgM3gZyz11hs for ; Fri, 21 Nov 2025 06:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26e65 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 06:44:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: aa30bab9a92e - main - e1000: Bump 82574/82583 PBA to 32K List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: aa30bab9a92e1be230b9708bff9f33aae7d384e5 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 06:44:31 +0000 Message-Id: <69200a4f.26e65.2d94d0c5@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=aa30bab9a92e1be230b9708bff9f33aae7d384e5 commit aa30bab9a92e1be230b9708bff9f33aae7d384e5 Author: Kevin Bowling AuthorDate: 2025-11-21 05:02:00 +0000 Commit: Kevin Bowling CommitDate: 2025-11-21 06:44:25 +0000 e1000: Bump 82574/82583 PBA to 32K The reporter contacted me with packet loss and throughput fluctuations on a low power machine (Intel J1900) that got worse with the recent AIM algorithm in FreeBSD 14.2+. 32K RX PBA matches Linux default. Add a conditional path since we don't otherwise do a fixup for jumbo frames to retain space for two frames in Tx. With this change and an additional errata change, the throughput meets line rate for the reporter. Reported by: Codin Tested by: Codin MFC after: 2 weeks --- sys/dev/e1000/if_em.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index b8ea3168330b..02f4c431badd 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -3080,9 +3080,13 @@ em_reset(if_ctx_t ctx) case e1000_82573: pba = E1000_PBA_12K; /* 12K for Rx, 20K for Tx */ break; + /* 82574/82583: Total Packet Buffer is 40K */ case e1000_82574: case e1000_82583: - pba = E1000_PBA_20K; /* 20K for Rx, 20K for Tx */ + if (hw->mac.max_frame_size > 8192) + pba = E1000_PBA_22K; /* 22K for Rx, 18K for Tx */ + else + pba = E1000_PBA_32K; /* 32K for RX, 8K for Tx */ break; case e1000_ich8lan: pba = E1000_PBA_8K; From nobody Fri Nov 21 06:44:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCQgN66hmz6Gh0r for ; Fri, 21 Nov 2025 06: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCQgN4P2jz3pQQ for ; Fri, 21 Nov 2025 06: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=1763707472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h9tV81GOu9E5Spp+EgaW2Kc8TBXCylXpqBPdUYMSdFI=; b=Kci3YzTHI76s2N7VONC/zSvwdrUq6UjxhCPTyoe0i6JusjET4NlogNgW0zJHkxeeJXMaL2 iZVPuXlAnIXOjEfK8IMEvmtUUOAn7zljb+TluIGIffHVbYXEFC4D12aIE5eJ3FhRngARBS YbCO7YmQ5kxTo/2Yn/TSSi9WcOlOsD27E6hEUcd4fpxoz3IyJeGMD9080KQG7djavBRY1e kKh/kfU3rBxkUpxeqZMKU1RNZkaPEReAQYNlaeWQtAbJvxlHxlLozV0TBDbSuKS8eg6M75 iL2Y+tcJgbzJ5agckc6dUIZO5//Zqp4gGooFSRNlVpD5ibAVHJAlgf70iT1A0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763707472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h9tV81GOu9E5Spp+EgaW2Kc8TBXCylXpqBPdUYMSdFI=; b=JRRALj25qrwTJd/5OgsNwv2P2g85zmOKg6Rclc0kuzpP+hr/jTE9AfOL/pVcM7dVXTjV0G L+2xVPWosHcEB2jCNasqGXGWI0QJhrHVe85l8WpnMz5fVfh3VHM0/PYTuwIeelZ6TwWlvK WBU7wuLmwheNxe8WopetNPgRWLpXN7G1yAnnV3BGHVRcdaYzm5K7j1H/xL+B9uzcbHUocG blzuZD5MLIH37kNbSsDL9bDOplqrZB9GrjfMkLH7EzhBLHAri/K+aQtYCmLeJciUfFNg31 E7iUprw7eqjn7NSanV5+kgB2YWf8AvFUqhMsBlOGt7GIjOArhSOTlrpnsYGPBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763707472; a=rsa-sha256; cv=none; b=nhZFLdWH2eafYh/LikDn9tAXAdmDkfnn+uLRwLt1dfeGxLtC46F1VWm7CR1ewLqmEr2x7Q iuiPPq7lSXERZCskmxAmi4nDUwPkbttltRIjhIBOBa7mraiuUovXqNWfFXCPRYq8HPGRH5 eKsdwbmC0CjW1pW4Cpm9T/iWW9zshq+oet2bw+4IHiKgHDwH2QDYBMAx5yVRlSVX8AdJ02 KAx4aZLAFfH0wc8gslNs3Xxhze5oX3W+W0soLjMzdFQxxcZgTTs/V6KkxX+r+KD3E0S0jo u4C94YAPc1Mhi8ci1dSa0HdmSxtGLKd+zHRpl6OXg7i3ZEEIRl2y5xlP/SF2Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCQgN40LMz11hv for ; Fri, 21 Nov 2025 06:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 266ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 06:44:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 2ead091715de - main - e1000: Don't enable ASPM L1 without L0s List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 2ead091715dee327b3e00bc9840e1a95827b8e82 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 06:44:32 +0000 Message-Id: <69200a50.266ca.53cb7ac8@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=2ead091715dee327b3e00bc9840e1a95827b8e82 commit 2ead091715dee327b3e00bc9840e1a95827b8e82 Author: Kevin Bowling AuthorDate: 2025-11-21 05:47:03 +0000 Commit: Kevin Bowling CommitDate: 2025-11-21 06:44:25 +0000 e1000: Don't enable ASPM L1 without L0s Reporter noted packet loss with 82583. NVM is down level. The errata docs mention disabling this, which should be the firmware default, so I am not sure why we were enabling this bit. Linux and OpenBSD have the same issue, while NetBSD got it right. Reported by: Codin Tested by: Codin MFC after: 2 weeks --- sys/dev/e1000/e1000_82571.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/e1000/e1000_82571.c b/sys/dev/e1000/e1000_82571.c index e8970adf996f..650169663f56 100644 --- a/sys/dev/e1000/e1000_82571.c +++ b/sys/dev/e1000/e1000_82571.c @@ -1118,7 +1118,8 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw) case e1000_82574: case e1000_82583: reg_data = E1000_READ_REG(hw, E1000_GCR); - reg_data |= E1000_GCR_L1_ACT_WITHOUT_L0S_RX; + /* 82574 Errata 25, 82583 Errata 12 */ + reg_data &= ~E1000_GCR_L1_ACT_WITHOUT_L0S_RX; E1000_WRITE_REG(hw, E1000_GCR, reg_data); break; default: From nobody Fri Nov 21 07:11:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCRG11fWyz6GjY8 for ; Fri, 21 Nov 2025 07:11: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCRG10zy4z3rh9 for ; Fri, 21 Nov 2025 07:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763709065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g207pMdF8sAVtzbndqMJyoLpyTu0Cc3ITpAu5yhn8u8=; b=AEPYrr2vwiBQwXqfUt+mFL2O0QiFo6QPzHrM2sMeslnA4+N4YNwYiy+Yi42j23bnuDQE0a 28nvnbn1k+yXcWr7QB0HSd77tHCQduKnekdsJFICWXvq/jrBQYzmaNlnZU/wSYWTzszV8B +mwloIroJTa8DALhJEXz+9XRqfE66bGLTdoZf2+xV66GsnckJSTplRRHZSo9V8JUFyOCJy QH2a7m8bVnAHEDbnZM+EJJ1PwzUUjnZWalMo/2VhFVoTXEiLwI09g2tosjQs7MFFs39kr2 RzQZG2YvpRioyBG3ZklPBfdJvGtlaJEB5rG7+sSJUyo4gBkCe+1WB4lHLHe9Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763709065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g207pMdF8sAVtzbndqMJyoLpyTu0Cc3ITpAu5yhn8u8=; b=FcFlU7It3G7bui1gUwcuI9WNZCB3m309JEkpLDvg9Bay2h57+1bQ7TSYSkmZ2/7I6Byps6 Q+kxaltxKm/+BUjCKjoHC+SAcFXooCF90j/nX/vMQQukk6y91zQb2HHj5v2t/o+gxGb2ui 2f8u5ksI8AkPLbJG8hchxLEeLjBIWqCh26sQTFVc5Ojb5UV5/MXpNQYQlAypllXbQtiE4j puww80nUuv336l4PW2OZUNpCH8e+oMF9mTIFQS9JVYyvVGFq4QMKSkg/o7MQtMmnjb8KCL dQlp27jlSAZU4XcOOAtATs/QvOx3SSp6coKJ2QTniYV+TfzFFLhZjuGNGAGyMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763709065; a=rsa-sha256; cv=none; b=t8om1au+0PoSt6xUbw/9J8uQiGfmgfeT7ie4IdaoRILechIa0lNzGUJa0nW8wAHfa6Y+LX 8izMf3SDlFaNUKi0g58lPO9ZRrXRcf6filrjoApwZnaZcBDmYy4pUTSIOIrQ1yNjS7fpN9 Ag/gJVAsKyrCQWmDuh6Pl3uZ4nphat3tU+jEdncr0Mm84Qexg2F8JPYNYVDWvyjdbCNXWE y/XEttS+N94KreT+uCkzuf82FoG8PpFQXUY+LtHnC6ixqsBI/4NRMzbDxCgyuUnb1dsbuJ Z6QNmyG9WEVTJvvPGGxk3coSRwSLgdKtFPnPxyk4zpvKYc1JOH9uIyvd0XjACQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCRG10Stjz11yy for ; Fri, 21 Nov 2025 07:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 282fe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 07:11:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 4d29178e7154 - main - iwx: tag RX frames as A_MPDU RX; tag A-MSDU frames appropriately List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d29178e715449c25b94f115946dc4e021f41cdb Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 07:11:05 +0000 Message-Id: <69201089.282fe.733d52dc@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=4d29178e715449c25b94f115946dc4e021f41cdb commit 4d29178e715449c25b94f115946dc4e021f41cdb Author: Adrian Chadd AuthorDate: 2025-11-16 04:26:22 +0000 Commit: Adrian Chadd CommitDate: 2025-11-21 07:09:47 +0000 iwx: tag RX frames as A_MPDU RX; tag A-MSDU frames appropriately * tag packets for 11n/11ac associated nodes with A_MPDU so they get passed into the reordering logic * tag A-MSDU frames with AMSDU and AMSDU_MORE so they don't get dropped due to duplicate sequence numbers. Note: I haven't yet elicited A-MSDU in A-MPDU to fully test this, but I do see the net80211 reordering logic kick in (which you can see via wlanstats -i wlan0 -o ampdu 1). I've checked with Johannes Berg at Intel (who maintains the linux iwlwifi stuff); he replied saying none of the firmware versions are doing AMPDU reorder offloading. Differential Revision: https://reviews.freebsd.org/D53781 Locally tested: * AX210, STA mode, > 200mbit bidirectional traffic testing on 5GHz VHT/40. --- sys/dev/iwx/if_iwx.c | 62 +++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c index e317ff9e271c..3c953e522973 100644 --- a/sys/dev/iwx/if_iwx.c +++ b/sys/dev/iwx/if_iwx.c @@ -4607,37 +4607,39 @@ iwx_rx_mpdu_mq(struct iwx_softc *sc, struct mbuf *m, void *pktdata, pad = 1; } -// /* -// * Hardware de-aggregates A-MSDUs and copies the same MAC header -// * in place for each subframe. But it leaves the 'A-MSDU present' -// * bit set in the frame header. We need to clear this bit ourselves. -// * (XXX This workaround is not required on AX200/AX201 devices that -// * have been tested by me, but it's unclear when this problem was -// * fixed in the hardware. It definitely affects the 9k generation. -// * Leaving this in place for now since some 9k/AX200 hybrids seem -// * to exist that we may eventually add support for.) -// * -// * And we must allow the same CCMP PN for subframes following the -// * first subframe. Otherwise they would be discarded as replays. -// */ + /* If it's a HT node then perform re-order processing */ + if (ni->ni_flags & IEEE80211_NODE_HT) + m->m_flags |= M_AMPDU; + + /* + * Hardware de-aggregates A-MSDUs and copies the same MAC header + * in place for each subframe. But it leaves the 'A-MSDU present' + * bit set in the frame header. We need to clear this bit ourselves. + * (XXX This workaround is not required on AX200/AX201 devices that + * have been tested by me, but it's unclear when this problem was + * fixed in the hardware. It definitely affects the 9k generation. + * Leaving this in place for now since some 9k/AX200 hybrids seem + * to exist that we may eventually add support for.) + * + * And we must allow the same CCMP PN for subframes following the + * first subframe. Otherwise they would be discarded as replays. + */ if (desc->mac_flags2 & IWX_RX_MPDU_MFLG2_AMSDU) { - DPRINTF(("%s: === IWX_RX_MPDU_MFLG2_AMSDU\n", __func__)); -// struct ieee80211_frame *wh = mtod(m, struct ieee80211_frame *); -// uint8_t subframe_idx = (desc->amsdu_info & -// IWX_RX_MPDU_AMSDU_SUBFRAME_IDX_MASK); -// if (subframe_idx > 0) -// rxi.rxi_flags |= IEEE80211_RXI_HWDEC_SAME_PN; -// if (ieee80211_has_qos(wh) && ieee80211_has_addr4(wh) && -// m->m_len >= sizeof(struct ieee80211_qosframe_addr4)) { -// struct ieee80211_qosframe_addr4 *qwh4 = mtod(m, -// struct ieee80211_qosframe_addr4 *); -// qwh4->i_qos[0] &= htole16(~IEEE80211_QOS_AMSDU); -// } else if (ieee80211_has_qos(wh) && -// m->m_len >= sizeof(struct ieee80211_qosframe)) { -// struct ieee80211_qosframe *qwh = mtod(m, -// struct ieee80211_qosframe *); -// qwh->i_qos[0] &= htole16(~IEEE80211_QOS_AMSDU); -// } + struct ieee80211_frame *wh = mtod(m, struct ieee80211_frame *); + uint8_t subframe_idx = (desc->amsdu_info & + IWX_RX_MPDU_AMSDU_SUBFRAME_IDX_MASK); + uint8_t *qos; + + rxs.c_pktflags |= IEEE80211_RX_F_AMSDU; + if (subframe_idx > 0) + rxs.c_pktflags |= IEEE80211_RX_F_AMSDU_MORE; + + /* XXX should keep driver statistics about this */ + IWX_DPRINTF(sc, IWX_DEBUG_AMPDU_MGMT, + "%s: === IWX_RX_MPDU_MFLG2_AMSDU\n", __func__); + + qos = ieee80211_getqos(wh); + qos[0] &= ~IEEE80211_QOS_AMSDU; } /* From nobody Fri Nov 21 08:02:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCSNw0sYRz6GnR2 for ; Fri, 21 Nov 2025 08:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCSNv6rXrz3wcv for ; Fri, 21 Nov 2025 08:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763712128; 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=oHRL36SWCJ6SWc1rJIYnddz0V5dVJi2/NoPpCgU0sMk=; b=T8ckUtb1gFD7QUFR/3AUVW+O4gJOZjN9+8Yp+Y9PqpW6pYLfP2OMdjtTAdGQjP0FN7E6R5 t8Ggpl3B4M2M1b9pB3tDZkryJleD/ZowLw1JaJizKt1hvU0ySh8PVTGRM28ez6GOy8cDmn LDFc90faaXXIUPU6WKvUTUoHzCGqom+qVYzRZ7lL+LoRzaUw5g0csRctmB4OY+u6YSk9zy WSyr4bt6MOOsKFEesXEtcbfqHfMaINIEAgsKaGMKP6euKn5bPooFcGjLZUaY76U1HzlAPd urJnkMRLEJJODsjq/x1b9Go3TYLxn7repUY96PPq6/Ihki6G1Bkx4x+vjSsZDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763712128; 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=oHRL36SWCJ6SWc1rJIYnddz0V5dVJi2/NoPpCgU0sMk=; b=ZT55pI/JVlxMZza0l6sTL4wqLbDlyo16HePGwuD8Mrc/JqGs3To3CtLGV+0UUZ2TsRZO4T g563Q5gAcGTdBYZX6hDpVyK05HYs1if7fl4gOWEOJEuD+Wz1zpl4qRlpnecYYs8i+J+3N+ 40WvxNrIngY6eeu5AXV1VpPhBkP9npRZtNxCC+aMigJCWiu4vmhc5CqcCO/f4zX/6XIfUC bWlZPnAiZKnRnMT7yz5ILF8vO00n4vejsGKeP54N9ny7gU1V+GgGTS6NK2nwkYf3Kd2WbP lXtq57PmPyEZT2sPEyfZvYTheVJei7S3Uh/8iJwIjXByj1V5OnPH6pqB8156Zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763712128; a=rsa-sha256; cv=none; b=ecAoPL0CsP5ti1Nxl4oXZEGk79WxQG35iTARD61/SM4Z+tsPTRQvvU6p1iqeD7wsWvyaPl 1gzdTs85zeiF75jw0RcJFFuqSP/RAEayVr4gc19V4EvRZBOE2jru3pLjc3sn/BhfELhPGP G0nMK2083tm9DbzoWrHrI9o81/WXVLxQb29ZwJ4Hq/NYn+Y5z/0vo1rWfnDlir5qsYW/UO U+gFuhO3dR52yY87TgPglhR6fiL6lFwQjzyPUzOwi44ZvMeM0VNzY5nIit4bh5DTPU6TYm MPWlyzZC5YFgsrSZ4VRYDqNK/3YA1pcGc84Y31/4xtEZSsz1QKsaYeVvc1N9OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCSNv6C0Fz13hf for ; Fri, 21 Nov 2025 08:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2de95 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 08:02:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Seyed Pouria Mousavizadeh Tehrani From: Michael Tuexen Subject: git: f2582653a429 - main - ip: use standard C types for ECN helper functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2582653a429a7c8d55b023c6f5a006f5d51ea34 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 08:02:07 +0000 Message-Id: <69201c7f.2de95.45a0c9c6@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f2582653a429a7c8d55b023c6f5a006f5d51ea34 commit f2582653a429a7c8d55b023c6f5a006f5d51ea34 Author: Seyed Pouria Mousavizadeh Tehrani AuthorDate: 2025-11-21 07:58:12 +0000 Commit: Michael Tuexen CommitDate: 2025-11-21 07:58:12 +0000 ip: use standard C types for ECN helper functions No functional change intended, suggested by glebius. Reviewed by: rscheff, zlei, tuexen Differential Revision: https://reviews.freebsd.org/D53739 --- sys/netinet/ip_ecn.c | 16 ++++++++-------- sys/netinet/ip_ecn.h | 4 ++-- sys/netinet6/ip6_ecn.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/netinet/ip_ecn.c b/sys/netinet/ip_ecn.c index 30d2c95ddbd7..2f700c43bbfa 100644 --- a/sys/netinet/ip_ecn.c +++ b/sys/netinet/ip_ecn.c @@ -92,7 +92,7 @@ * modify outer ECN (TOS) field on ingress operation (tunnel encapsulation). */ void -ip_ecn_ingress(int mode, u_int8_t *outer, const u_int8_t *inner) +ip_ecn_ingress(int mode, uint8_t *outer, const uint8_t *inner) { if (!outer || !inner) @@ -124,7 +124,7 @@ ip_ecn_ingress(int mode, u_int8_t *outer, const u_int8_t *inner) * the caller should drop the packet if the return value is 0. */ int -ip_ecn_egress(int mode, const u_int8_t *outer, u_int8_t *inner) +ip_ecn_egress(int mode, const uint8_t *outer, uint8_t *inner) { if (!outer || !inner) @@ -158,9 +158,9 @@ ip_ecn_egress(int mode, const u_int8_t *outer, u_int8_t *inner) #ifdef INET6 void -ip6_ecn_ingress(int mode, u_int32_t *outer, const u_int32_t *inner) +ip6_ecn_ingress(int mode, uint32_t *outer, const uint32_t *inner) { - u_int8_t outer8, inner8; + uint8_t outer8, inner8; if (!outer || !inner) panic("NULL pointer passed to ip6_ecn_ingress"); @@ -168,13 +168,13 @@ ip6_ecn_ingress(int mode, u_int32_t *outer, const u_int32_t *inner) inner8 = (ntohl(*inner) >> 20) & 0xff; ip_ecn_ingress(mode, &outer8, &inner8); *outer &= ~htonl(0xff << 20); - *outer |= htonl((u_int32_t)outer8 << 20); + *outer |= htonl((uint32_t)outer8 << 20); } int -ip6_ecn_egress(int mode, const u_int32_t *outer, u_int32_t *inner) +ip6_ecn_egress(int mode, const uint32_t *outer, uint32_t *inner) { - u_int8_t outer8, inner8, oinner8; + uint8_t outer8, inner8, oinner8; if (!outer || !inner) panic("NULL pointer passed to ip6_ecn_egress"); @@ -185,7 +185,7 @@ ip6_ecn_egress(int mode, const u_int32_t *outer, u_int32_t *inner) return (0); if (inner8 != oinner8) { *inner &= ~htonl(0xff << 20); - *inner |= htonl((u_int32_t)inner8 << 20); + *inner |= htonl((uint32_t)inner8 << 20); } return (1); } diff --git a/sys/netinet/ip_ecn.h b/sys/netinet/ip_ecn.h index 7390d812606f..6632418fc9ca 100644 --- a/sys/netinet/ip_ecn.h +++ b/sys/netinet/ip_ecn.h @@ -44,7 +44,7 @@ #define ECN_NOCARE (-1) /* no consideration to ECN */ #ifdef _KERNEL -extern void ip_ecn_ingress(int, u_int8_t *, const u_int8_t *); -extern int ip_ecn_egress(int, const u_int8_t *, u_int8_t *); +extern void ip_ecn_ingress(int, uint8_t *, const uint8_t *); +extern int ip_ecn_egress(int, const uint8_t *, uint8_t *); #endif #endif diff --git a/sys/netinet6/ip6_ecn.h b/sys/netinet6/ip6_ecn.h index 45a28e9f419a..169e027dc265 100644 --- a/sys/netinet6/ip6_ecn.h +++ b/sys/netinet6/ip6_ecn.h @@ -37,6 +37,6 @@ */ #ifdef _KERNEL -extern void ip6_ecn_ingress(int, u_int32_t *, const u_int32_t *); -extern int ip6_ecn_egress(int, const u_int32_t *, u_int32_t *); +extern void ip6_ecn_ingress(int, uint32_t *, const uint32_t *); +extern int ip6_ecn_egress(int, const uint32_t *, uint32_t *); #endif From nobody Fri Nov 21 08:41:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCTGQ59GWz6GqVd for ; Fri, 21 Nov 2025 08:41: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCTGQ3J24z434b for ; Fri, 21 Nov 2025 08:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763714494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yZcOEsfF1zyxkiTDJdNUcLMHrE2ovZlYjkrN1FTNoh8=; b=vpJVyCme4up1h/M73BRqrAv7OfLcKvru3T+QKqPjUqoWQcHBN025pXxY1uNH+fD718cdTV yyaYyNh+VBp6e956c9H3qWX+oeTCoKEJu2awBs8CrhAkYT5PoBP4E0ZZ3pue2eLjMGinz4 I3dRJD9FMm6Z8kAZyqpTCDoCRxkmZY0szMmCV2tpLKXsQG+KMpuaEZj2XFyLT7bW67rds9 +FvSPVxilEgAdk6cC3a9lJPQPCbS6pJ1cjKOeHnjL61kpt1lQm68iwpbKirzMCmonU+ack Jj+Q4QRqKO1GG8HvRd6I6hJ13H+Cs8QpwpUFsW9HIuUMzdSo52D9Xxwa3Nnwhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763714494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yZcOEsfF1zyxkiTDJdNUcLMHrE2ovZlYjkrN1FTNoh8=; b=SZ1oBGkiKI8TAiu4mwMT1LmvDU0B1k+wgmpb9o9wPPGIh3PN1sfDb8kLfTlTsYb9jhA5cK QL0DKHFpo42XthJSbQX6JqP3cnGODC3IqLym02R+mseOPbZ5wvRdmF9qVBbAZxfzaCy4r6 +RjwhsfOYzwr+IvXEbdOWkmCU9eKJBpdRwiQ8p63Q8AgNGjcDIM5ic/xDUSNP9kOSFoU0c m8VBeO+zMqt8SYYyZ0bFCCxpdQo6bnjlIZV/eEz851vjbI/BHgC3aVP+aEF/U8zS5SBaCw 8kTrRmUc52xRXPpws/l4hSZ7AyxtRC6goaOO7W+jMX5SOirrJZTZ5wK3xVL2LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763714494; a=rsa-sha256; cv=none; b=HLCWeSS/H//+u99edQy1Cnh2Ihy0/MhOb4Kl9+QT4M9IfZOVI+JV52qUkwNEOyIHAkGIol MuvFpO6pnssCndPnxA8Yn3lI2XsY+YwbGn0zq1XgZWmGUfxVz4I6xebYDGouuL30hCdSD7 yu+bJTvEgug+jQYw6BNcU+fOZRa/WixhjySJxTUIxMop7sPQv3VDOi0ZSGE41SQihCTvFt hKs7Auw5VXKaCWTwtPUGRhxWnSP4aBcXqOzCXDgeOckXRgYRkStc6GW5NrvK7S4ipN3I18 +SvQkTPNWlWmtCTg8jX6yDOsSATjDTO/eHe+c8JTgEbMAFEIfThbcmmssz/hxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCTGQ2gWCz14Hh for ; Fri, 21 Nov 2025 08:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31b1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 08:41:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0d8535e7724a - stable/15 - exterror.9 man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0d8535e7724a5e7e9119b2c46a74b8d7fc7ae87d Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 08:41:34 +0000 Message-Id: <692025be.31b1e.341fc556@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0d8535e7724a5e7e9119b2c46a74b8d7fc7ae87d commit 0d8535e7724a5e7e9119b2c46a74b8d7fc7ae87d Author: Konstantin Belousov AuthorDate: 2025-11-04 21:45:55 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-21 08:41:11 +0000 exterror.9 man page (cherry picked from commit 0eca7fa1c96f779039dd70eeeb0585ac12d153da) --- share/man/man9/Makefile | 1 + share/man/man9/exterror.9 | 137 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 4cea099b6c07..bdf85363c8e1 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -150,6 +150,7 @@ MAN= accept_filter.9 \ EVENTHANDLER.9 \ eventtimers.9 \ extattr.9 \ + exterror.9 \ fail.9 \ fdt_pinctrl.9 \ fetch.9 \ diff --git a/share/man/man9/exterror.9 b/share/man/man9/exterror.9 new file mode 100644 index 000000000000..79197e4a187d --- /dev/null +++ b/share/man/man9/exterror.9 @@ -0,0 +1,137 @@ +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 The FreeBSD Foundation +.\" +.\" This documentation was written by +.\" Konstantin Belousov under sponsorship +.\" from the FreeBSD Foundation. +.\" +.Dd November 5, 2025 +.Dt EXTERROR 9 +.Os +.Sh NAME +.Nm exterror +.Nd provide extended error information to userspace +.Sh SYNOPSIS +.Bd -literal -offset left -compact +#define EXTERR_CATEGORY EXTERR_CAT_MYCATEGORY +.Ed +.In sys/exterrvar.h +.Ft int +.Fn EXTERROR "int error" "const char *msg" ... +.Sh DESCRIPTION +The +.Nm +framework allows the kernel to return additional information about an error +along with the standard +.Xr errno 3 +error code, which is terse and often lacking context. +.Pp +The terseness is especially visible with commonly overloaded error codes like +.Er EINVAL +or +.Er EIO , +which occur at many places for a given syscall, or even +outside the context of the current kernel call. +Identifying the specific cause for the returned error using only the +.Va errno +value requires searching for all instances that the error is returned +in the kernel and trying to guess which is the most likely code path +to have returned the error. +.Nm +attaches additional data to the error itself +and records the error category and +the kernel source code file line number. +The intent of +.Nm +is to make it easier for a user to identify the cause of the error. +.Sh USAGE +Before +.Nm +can be used in the given source .c file, the category of extended errors +should be allocated in the +.In sys/exterr_cat.h +file. +The category is the unique integer, that, together with the source +line number, uniquely identifies the extended error occurrence. +Then, the +.Va EXTERR_CATEGORY +symbol should be defined as an alias for the allocated category, as +shown in the summary. +.Pp +A typical code fragment to report an error is just +.D1 return (EINVAL); +An extended error can augment the error code with additional information: +.D1 return (EXTERROR(EINVAL, \[dq]Invalid length\[dq])); +The error data and metadata is saved in the current thread storage. +The metadata includes the category and the source file line number. +.Pp +Arguments to the +.Fn EXTERROR +macro: +.Bl -dash +.It +The first argument to +.Fn EXTERROR +is the errno error code. +.It +The second argument is a constant string with the unbound lifetime, +which should tersely provide enough human-readable details about +the error. +.It +The +.Fn EXTERROR +macro can take two optional 64-bit integer arguments, +whose meaning is specific to the subsystem. +.El +.Pp +The strings passed as the second argument are only retained +in the kernel text if the +.Cd option EXTERR_STRINGS +was enabled in the kernel config. +Otherwise they are stripped at compile time and are not available +to userspace at runtime. +.Pp +The +.Fn EXTERROR +macro can be used in any context where the current thread is defined. +Specifically, +.Fn EXTERROR +cannot be used in interrupt contexts and context switch code. +Additionally, use of +.Fn EXTERROR +in kernel threads is not sensible as there is no userspace to retrieve +the extended error data. +.Sh USERSPACE ACCESS TO EXTENDED ERROR DATA +There is no syscall overhead for using +.Nm +in the non-error case. +When an error occurs that has supplied extended information, +the kernel copies out that information into the userspace +per-thread area that was registered with the kernel, typically on +image activation, or later at thread startup. +The area is controlled by the +.Xr exterrctl 2 +internal syscall, normally done by the userspace C runtime. +.Pp +Userspace programs do not need to access the extended information +area directly. +There is no field that is stable for the specific error condition. +Instead, the base +.Lb c +functions +.Xr err 3 +and +.Xr warn 3 +were modified to print the extended information if it is available +in addition to the usual +.Va errno +decoding. +.Sh SEE ALSO +.Xr errno 3 , +.Xr err 3 +.Sh HISTORY +The +.Nm +facility was introduced in +.Fx 15.0 . From nobody Fri Nov 21 08:51:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCTTQ3qpgz6GrH0 for ; Fri, 21 Nov 2025 08:51:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCTTQ2Pcrz43PZ for ; Fri, 21 Nov 2025 08:51:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763715066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2YgKOAMkIr1NpSjEB0WQZJgOTmtsIRoI/gwrFT5h0cI=; b=SIom4cNY/mqyRiG5l9qICkgMX+lgfXvPPa4UOUsAFRjZV7PXByt1r8u4+s56Iy/fdeKw10 d8jlWHN5POpMoQOQE4Mf10zPWw69tfnJ4b1APwURmVrgNtacF7LHxq/y97TmkkGLQ80Fsq PJzcfIkxYhPLD0SwwUc/bX9+CvXRp1Q32Vd98kH5Sw6KGQq27fJDWCqhiyqyuzipd/qykG fvecIBE4vTegIJSugKJ4Rr/HDD4gXXUWmH/y8BdEGVMan41GV8ATAs5+ckcFn0jeH2aklo CJuu0i+76/rJvXeZozkxrsNCdwgu2er4ws+sbhFiiSl+BjgyVXfPIEQHk2+/ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763715066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2YgKOAMkIr1NpSjEB0WQZJgOTmtsIRoI/gwrFT5h0cI=; b=tjc0HGvrRKxO6cwlAXGPSI2gPjdbZOYEKODuIEmMulG1aDzJm1xL0clHsG0PaZO43z+dod QyFkZ2+UxdP1i2UM3g+LxMfCdw8fRzt1ZmbwDHYZsvt3L7wDg0J4VWpU6KpPKHiX/psC9C EdBE9vL/4pY7iDGS8cboUgxhrHuyfBIrkPQStG9JMhA1goNf6wmrIeT6ODArzlypl6S0BL twnNMyRqJofbGNvFdoPpW8xmmse+yoqKx6yCnAO5Li06pVfptAmzIjq4tJkQVP4nXuhwM1 jgrwKbH+xrl5kXCE8bMl+FsTtaLS3Cfeqs6dDmlXAtsXhFfBp564h+htEDvVNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763715066; a=rsa-sha256; cv=none; b=EHGk2C5u9+MBTF3S6TO9sVfEZ0MRcgr2PYeUkbfpfYl09uVsxZi8YU+DL0fSNzY/5u0z7B +64jBunK3CYoecLtQXuzGZ3iGJ97qeWaYAfGAtm0OjMyzujvNiIfBFq8gdCNHXbEio6iwn yNSHsH56hLH+Xz5Sg3zYs2c/MNQkcDt723M4LCPRpjEGIBjrjaAh5GYydPypQxer9qMkCr kLAIkMtv+iXrUWBJZtOqUY/+5gmgSnZUiacBImezf64ivXWGjcRueQszwEUy7J3+VPoi6d QcvCp+9NbhB3bi4JPMaA3mwkCqUuW8HdiBRefeHvjWgQth+wQTjcFi5ZzV89MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCTTQ1Rm6z14hb for ; Fri, 21 Nov 2025 08:51:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33406 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 08:51:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: c149db04aecc - main - stress2: No not rely on unset variables when using 'set -u' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c149db04aecc013cc98e921ee1b0deb54a5c34a6 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 08:51:06 +0000 Message-Id: <692027fa.33406.34de4ec7@gitrepo.freebsd.org> The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=c149db04aecc013cc98e921ee1b0deb54a5c34a6 commit c149db04aecc013cc98e921ee1b0deb54a5c34a6 Author: Peter Holm AuthorDate: 2025-11-21 08:49:47 +0000 Commit: Peter Holm CommitDate: 2025-11-21 08:49:47 +0000 stress2: No not rely on unset variables when using 'set -u' --- tools/test/stress2/misc/syzkaller82.sh | 4 ++-- tools/test/stress2/misc/syzkaller84.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/test/stress2/misc/syzkaller82.sh b/tools/test/stress2/misc/syzkaller82.sh index c810942eb060..557d52d269c0 100755 --- a/tools/test/stress2/misc/syzkaller82.sh +++ b/tools/test/stress2/misc/syzkaller82.sh @@ -114,9 +114,9 @@ work=/tmp/$prog.dir rm -rf $work mkdir $work cd /tmp/$prog.dir -kldstat | grep -q sctp || { kldload sctp.ko && loaded=1; } +kldstat | grep -q sctp && loaded=0 || { kldload sctp.ko && loaded=1; } timeout 3m /tmp/$prog > /dev/null 2>&1 rm -rf /tmp/$prog /tmp/$prog.c /tmp/$prog.core /tmp/$prog.?????? $work -[ $loaded ] && kldunload sctp.ko +[ $loaded -eq 1 ] && kldunload sctp.ko exit 0 diff --git a/tools/test/stress2/misc/syzkaller84.sh b/tools/test/stress2/misc/syzkaller84.sh index a7976be2eeb6..631dd6e2dd6f 100755 --- a/tools/test/stress2/misc/syzkaller84.sh +++ b/tools/test/stress2/misc/syzkaller84.sh @@ -398,5 +398,6 @@ kldstat | grep -q sctp || { kldload sctp.ko && loaded=1; } timeout 3m /tmp/$prog > /dev/null 2>&1 rm -rf /tmp/$prog /tmp/$prog.c /tmp/$prog.core $work +set +u [ $loaded ] && kldunload sctp.ko exit 0 From nobody Fri Nov 21 08:51:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCTTR5kBcz6GrKF for ; Fri, 21 Nov 2025 08:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCTTR2Cycz43X5 for ; Fri, 21 Nov 2025 08:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763715067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q8dQbfqE9MHLx4JslvXaovSI9JOGaunxkuMyrk0wtKE=; b=pNj2MjQI1wdU6B8XLNlr61LrCcq+Sb7Exphd4H4pqHEhtF3rw+nGufIL0G7v37pNzUyQSv NVWzqMhya/Rz1wTjrQtLQXUpGk3/KyZSHt4lDnlDgp+8F5MioIFgLWRDRLLoutHwTbbjlj iX4IhU/0wAtKkRcNwazEsTsxK3QgU9BB0R4RmSos7R1uDcei5AuYc1wv3YsLD55U6T7EKJ h84MfyqvUvkZIULfxBKGs+q/TwgyyjRIhURLfV309rQP/0XfQG9DKGApaXE2Z2LrSkZa1j rfgfhgrkH4FIOvMFFxA2MdjNPFh6UNci8ieasBA7AUk9PhoRJsiJ9rp6Bx50og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763715067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q8dQbfqE9MHLx4JslvXaovSI9JOGaunxkuMyrk0wtKE=; b=Ojj/vZgT2hEbTrxCiSjZT7NHf2hTg9K/p5y+QENeDpI608lNoVtUdwvgQiiv7U2mxQHjzd nqhB2lbfOdBb0+J/aZCLk4Juxa7JxkyCk9Rbdo3AAwd1Bm5qIxkVC3JIOKpuqW7NI48exs l3c3Ci4gJA3Sbnyvk4N38XybgVJw2kcZ+hKN/3jHBRB9V3E/xBntQGZRUjaTfSErXiseXp jDzLGkt1r10uIV2QjZXY/T5bqu6xfTS8FhWialrwuQkPdiNbg3OGV/vud8iNJYaA3CHVvn 3ajfeRhio4VFZwTGsLD23seohYnS3mOAb3QbjzuQY4yjV95WFimDwuTsoQ33ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763715067; a=rsa-sha256; cv=none; b=QBAtQuHVU3a7yIMCWemaUYk8eYNrnS+6rXlZixSCfnt5SUGxSTJOCY6PtHn5FmkQJw03cg Cha5XL4OCbr7uMyImVy1rKWo9PXBz7mQYO+rsKlqw6bI8xHeyubU8JsW3rXxzSt3YOe/AL AjgDXZt76kCIqG3/ReaBHVovwf7vWNZgfhRJpBh564RBT9HvjsqOQhoNDerv64WiRE8LDB 1aXVhRMPH+C22tyLoHey8CoP++aFRapr/wORm93p+FsQRXM4MFTWZfPaLN0xcR8kkZQnrn 2tPaVT7f+WqodV1nvdOpsy9fLezePI77vpy0Cevd/LO7a2+XcvlKo6YvXdViaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCTTR1mfFz14Kl for ; Fri, 21 Nov 2025 08:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33196 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 08:51:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: d941fde3508d - main - stress2: Update the exclude list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d941fde3508d7e63d0270649c0c61016f19e23ac Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 08:51:07 +0000 Message-Id: <692027fb.33196.39a6ca05@gitrepo.freebsd.org> The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=d941fde3508d7e63d0270649c0c61016f19e23ac commit d941fde3508d7e63d0270649c0c61016f19e23ac Author: Peter Holm AuthorDate: 2025-11-21 08:50:30 +0000 Commit: Peter Holm CommitDate: 2025-11-21 08:50:30 +0000 stress2: Update the exclude list --- tools/test/stress2/misc/all.exclude | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tools/test/stress2/misc/all.exclude b/tools/test/stress2/misc/all.exclude index 0658bfdc0c1b..eb84d174cd4e 100644 --- a/tools/test/stress2/misc/all.exclude +++ b/tools/test/stress2/misc/all.exclude @@ -66,19 +66,12 @@ systrace.sh WiP 20200227 systrace2.sh WiP 20200227 syzkaller16.sh zonelimit issue 20210722 syzkaller28.sh panic: About to free ctl:0x... so:0x... and its in 1 20201120 -syzkaller31.sh panic: Bad tailq NEXT(0xfffffe01a0899430->tqh_last) != NULL 20220420 syzkaller55.sh https://people.freebsd.org/~pho/stress/log/log0533.txt 20240702 syzkaller59.sh Page fault 20220625 -syzkaller65.sh panic: in_pcblookup_hash_locked: invalid local address 20230318 -syzkaller66.sh panic: in_pcbconnect: inp is already connected 20230621 -syzkaller67.sh panic: ASan: Invalid access, 8-byte read at ... 20230621 syzkaller80.sh panic 20250711 -syzkaller81.sh panic 20250711 syzkaller82.sh panic: m_apply, length > size of mbuf chain 20250724 -syzkaller84.sh panic: Assertion !(sb->sb_state & SBS_CANTRCVMORE) 20250810 syzkaller85.sh panic: Assertion uio->uio_resid < 0 failed 20250928 -syzkaller86.sh Fatal trap 12: page fault while in kernel mode 20251001 -write2.sh panic: sndbuf_acquire: count 255 > free 0 20251003 +syzkaller87.sh watchdogd fired 20251112 quota3.sh https://people.freebsd.org/~pho/stress/log/log0604.txt 20250728 quota6.sh https://people.freebsd.org/~pho/stress/log/log0456.txt 20240707 truss3.sh WiP 20200915 From nobody Fri Nov 21 08:51:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCTTW5R0Pz6Grqq for ; Fri, 21 Nov 2025 08:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCTTV1mTYz43gR for ; Fri, 21 Nov 2025 08:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763715070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AXiyXNqSHvX1sX3PwwYTRwiRE+GN6e5oUXhDdfLVtjw=; b=WMvPyQ+8HdC9vGtH78eqAKuLzOgpusucJKg/NkSFTGmznqkigzLbjTu9sRmWDqznXqB1b/ Q7ZnZne603nlmkLroAoqeUnWg9AuGsUvgDJv9la8rO/jQ7tYEWUVQwMFVd0otGEuVq8soV VK5CbFbteSoyl6SQpXzrI1XTLDpA8ZJHdVeBzxToUim6Ng9paS4rh8757xja8FFgAokiaX sJUeq2i5SU3nc/S8Kb8QFA7OE3eRvmhP7GqJKj9sXsKtVZEIrLHmKfWf/BnCOScI5p4eAJ uKtnmIxtTK2NOLDwgnSHSoTtHQHN8HuAxnHSREfzhyb//KVMgE/itOzVaZ9VAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763715070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AXiyXNqSHvX1sX3PwwYTRwiRE+GN6e5oUXhDdfLVtjw=; b=MkRVafh8oox/pntMpfuxL67W+DWCTQ3MyBURR+9pxf1mW/q1yzVUrze9VSdCvyTOsDpMIv 8j6r2cF7kStZ7sBI5aS9jGMwVw6/2soM6QN4zpz45sjEE1te1Rx6zJNmrbQ3JuhdbUYgv0 fplcxA3zkDrMMEjsBTowxZGkaF3gPLh0FFh5teEpnb8Xx7DaeNnHAj3dG/I/e3BnLF/OB/ lkw87OLcvHQQ8W8fWioJeFIPxvrMv0m9X7DLiBJJkUqjpbdNDZWG0pikzpToo5jsNGPL+j k73e3Qm6I6CEyhuGvNUqdtrgCMDWdJOG3nWbHGbIBDOEQKwNRP1JUZysUX/wFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763715070; a=rsa-sha256; cv=none; b=Orv3Gt3mxfWuiIFYBNTK3+cxxz9IJZVoQGLuBmcmjEt8UH7YihCHWCXsy00byYcEU/zzps Xxnw+oY2Mcy/028YXyx1aF1BCREySmNiiyO1DQXb+jEvXUg3lZkajOECYcvN3HGXXBELHB wL2ZGT2dufwErPFrlbbXdKH17gOmr+SAAIG/rev6chUpjQ80ZIctv/ACJQp32esezLTovp 5JABlLFC6awv4ICEERgnwZJ1HXvzt9a+IPERcIganmz+jc9SdVvKv+aaEvDpYruMn069q7 FDCQstSEsZYtcXdNVxGBNgsHMTQKQgu0mrLJj/rpz/UBuGKc+gEDwitRgKaADw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCTTV1BXcz152k for ; Fri, 21 Nov 2025 08:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30f54 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 08:51:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 51e0c428749c - main - stress2: Added more robust test termination List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51e0c428749c0bd6ed90191a6a9fbfed28a0f98e Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 08:51:05 +0000 Message-Id: <692027f9.30f54.757633f5@gitrepo.freebsd.org> The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=51e0c428749c0bd6ed90191a6a9fbfed28a0f98e commit 51e0c428749c0bd6ed90191a6a9fbfed28a0f98e Author: Peter Holm AuthorDate: 2025-11-21 08:48:02 +0000 Commit: Peter Holm CommitDate: 2025-11-21 08:48:02 +0000 stress2: Added more robust test termination --- tools/test/stress2/misc/syzkaller59.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/test/stress2/misc/syzkaller59.sh b/tools/test/stress2/misc/syzkaller59.sh index 1644ce627934..24cfbfd23278 100755 --- a/tools/test/stress2/misc/syzkaller59.sh +++ b/tools/test/stress2/misc/syzkaller59.sh @@ -147,7 +147,14 @@ int main(void) EOF mycc -o /tmp/syzkaller59 -Wall -Wextra -O0 /tmp/syzkaller59.c || exit 1 -(cd /tmp; timeout 3m ./syzkaller59) +(cd /tmp; ./syzkaller59) & +start=`date +%s` +while [ $((`date +%s` - start)) -lt 180 ]; do + sleep 10 + kill -0 $! > /dev/null 2>&1 || break +done +while pkill syzkaller59; do sleep .1; done +wait rm -rf /tmp/syzkaller59 /tmp/syzkaller59.c /tmp/syzkaller59.core \ /tmp/syzkaller.?????? From nobody Fri Nov 21 09:10:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCTwH4Vxlz6GsZD for ; Fri, 21 Nov 2025 09:10: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCTwH3qXPz46sX for ; Fri, 21 Nov 2025 09:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763716255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=95DQezS2o5BDOWfsKlFX+hz3nW3DWk9LDYE/iW10ij4=; b=cssDqEEzIxZcKAENm7CbBppyiZglK2LRd8jQOk91WG9BwPwFNGYOXvvYH/liMG9Qo8dHS4 c4IdHEltWPPP/WO/HLSG/wPg/F1d3MSSLt8l/NFcuyaHvZcl83tYOt8i5Subf6YYSZR+Rj ReLiGtxffS9TZpWaqt4A8RtGOELm8Neuy4fm+bqydnUPhEocqYfL4Kd1wyEyjoT+2+BEu+ IzuHOP3lqHx9R25dP+YT3dKxfy09LDwf/6/dLcdqJdWM73cff7FfqP31gObNz1icVG3UME Tj3nIkZQXLyHrJargAA1r2gdqNn0BvObbQ1GVCWT2tdhxIXA17o9YaLvgnQegw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763716255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=95DQezS2o5BDOWfsKlFX+hz3nW3DWk9LDYE/iW10ij4=; b=j6r66Alg61cxoKQGmpwzXrr1H5bkxJAZOR77HnalbqxSZsnqnZ0b6v0LBmfX3yFG+ovIyc SjblDKXRsdVvo21qpZ22KZuxLoTVmzi58PhqsKI2LNembagnlSVqtVeZDvQ0MlIsFigXjA Qw97QpvdOaKWdRGOAfmfWTnnajU4kGt/6C1qGA73NZ9btT+CYZI2XWaF3kDkHk4sL/k0mY Xco1BAz9pud5dzBa2nhbEjYaidBqJBSeYuX+/Vi9v9oSb9dD5432v1bF3fWPNYph5Kp8Ks ab6j4o5OFvHi23xYfzEpvZlwbMR5W3U7/MtykAjskcFKzb0rwNCaGtRfG0ESHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763716255; a=rsa-sha256; cv=none; b=fCBXdoiXMIW5HGCw5V+CF21NQoYsFzPBRKcuWAoyhAizaiesuYJG5QMEWPRl/RzZIYNfmE 2f0jCApnHlUZeWIoYXn1Tkqaxg597m2Tuc1hZ08pxb98VU0t/HPxIB575t4x74Lb5jeCEW ZcKGCBxwxDzaNDfrGqAKSKq/7Ptqh8juWIxNDBEDOWYr3Smfuxwkf0B81WID+lNFyfEzpy 9zPkxWg8i+fg43fOA3QA7gDcmyJ5C6X2rsF2Ierv3qPz17ziWKtRCCGuvbgmHKp1DUiCQu PM/vUALW5Mbu5sqLIfCjKP6cAdoXXCSlGJHwjYq1pXrqgc24bf3+bxgMcuZM6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCTwH39zyz153w for ; Fri, 21 Nov 2025 09:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35004 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 09:10:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 361492bfb22d - main - pfctl(8): Fix a typo in an error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 361492bfb22dc57ac311cda02bf3fc75ea5b52b2 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 09:10:55 +0000 Message-Id: <69202c9f.35004.47c65b9@gitrepo.freebsd.org> The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=361492bfb22dc57ac311cda02bf3fc75ea5b52b2 commit 361492bfb22dc57ac311cda02bf3fc75ea5b52b2 Author: Gordon Bergling AuthorDate: 2025-11-21 09:10:31 +0000 Commit: Gordon Bergling CommitDate: 2025-11-21 09:10:31 +0000 pfctl(8): Fix a typo in an error message - s/registeration/registration/ MFC after: 5 days --- sbin/pfctl/pfctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 02d6c9c84a32..ae3599b9e4e5 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -376,7 +376,7 @@ pfctl_enable(int dev, int opts) if (ret == EEXIST) errx(1, "pf already enabled"); else if (ret == ESRCH) - errx(1, "pfil registeration failed"); + errx(1, "pfil registration failed"); else errc(1, ret, "DIOCSTART"); } From nobody Fri Nov 21 09:13:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCTzp67lTz6Gsww for ; Fri, 21 Nov 2025 09:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCTzp5JJYz47fN for ; Fri, 21 Nov 2025 09:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763716438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c7753RP/vvcVUXBwU7Z6Xy1czNZtfmkh8hBrjWqHmrY=; b=L2F0pgKfwQrIF+6Pp+YCLf89Lc13nqzQCV64lQGMvjTDar/YW+OuuVBESBxTHF3AiXgoQn MI3jba9ScNDbu6+AptP3CIOjGXXi6Au0OcacMT6KZ7vPurFZ1bjHXpsC4k/0FvDpPi3hPr HzcH63njl3oavi6M9KPVzPBbvDzx1XARmPHQjlIPwZnaj88Rs/sp3kqdCNGFCozgAMhir6 SEai9G01vaxZjiyTJSV77SM+zHHNhCFr2DZ8ek7Dn9TrxrGoZctO1786u/ebQYfFsHguAo P2Mq4qCQauKL6r4xqbtU69yLE3dy7mtEbMtsMROGZ4Lh8AAog/BQZxbKIWzJEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763716438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c7753RP/vvcVUXBwU7Z6Xy1czNZtfmkh8hBrjWqHmrY=; b=oGjgomvEaC/ucRipKPmJIpl4rVRluZ5IqCG7opL5hnFJohyvmcserj+RvUVNiG2SVD8CmE ZzbQfh9VVgs/KieVN+laKtKAVM6aDLCt6JjXdkBrsU0Kpj6vliL8tgbBwZbACH8RARoYFs BKdpKKBuwqRrAc0UypwQJhlq7X9iP3tYG9PLrwRyNdmV/74uiVfcyTcm+Hm6VlUG30WbMV VH6XCw8lkPbso0Cfq52MVXnZVD+Vp1mCykhjWZK79L1mZH/uJNw7/5C6fD49iYxD1d4Ux2 doBNCKcPI5lW4TqF3U42zUpskUEzfgGxkKlKeoVlfWJQrsxmbal2tU5oYGh2Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763716438; a=rsa-sha256; cv=none; b=ReqXNEQ1Iv17s6oGusT04zekBwro8M3sspH0awdvLam2wRzVUawo8cd2os1Pm9aCqdRioy Oizk/2ZQBKW4H9PYRnG3ovvlht/hmqknofeF1i8lsHTD/83ClKt5k1fxvDdglsmaKyXoQV 1UUx3K7Bg9mX56rMp+lxfw/fj9F7XGH8E7xg87HAIsJH3PSCKH9gyJmSAt0iBVXor7QWWY RXQ5Bk6lujvZtgGVkR03MeQ9ddSOQTo9qRHlAkTDjr/KIOu0JC0J6UVesNQO2xonMrun23 FUdzJO7pkFkJJU+blEezrMzhxar0guoGlFr70t4Klkk5FzTb/D70Scepf/JX1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCTzp4pbFz154g for ; Fri, 21 Nov 2025 09:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34f03 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 09:13:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: bb3bfc7ca87e - main - snd_dummy.4: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb3bfc7ca87ef9b2309bfac38aa0083727b27dc6 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 09:13:58 +0000 Message-Id: <69202d56.34f03.821f253@gitrepo.freebsd.org> The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bb3bfc7ca87ef9b2309bfac38aa0083727b27dc6 commit bb3bfc7ca87ef9b2309bfac38aa0083727b27dc6 Author: Gordon Bergling AuthorDate: 2025-11-21 09:13:39 +0000 Commit: Gordon Bergling CommitDate: 2025-11-21 09:13:39 +0000 snd_dummy.4: Fix a typo in the manual page - s/devic/device/ MFC after: 3 days --- share/man/man4/snd_dummy.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/snd_dummy.4 b/share/man/man4/snd_dummy.4 index 172b8ed70729..5e9d8aa5dd89 100644 --- a/share/man/man4/snd_dummy.4 +++ b/share/man/man4/snd_dummy.4 @@ -60,7 +60,7 @@ Alias to the device's .Pa /dev/dsp%d file created by .Xr sound 4 . -This makes it easy for tests to open the dummy devic when there are more +This makes it easy for tests to open the dummy device when there are more devices present in the system. .El .Sh SEE ALSO From nobody Fri Nov 21 09:15:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCV1D17Bfz6GsjW for ; Fri, 21 Nov 2025 09:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCV1C69z5z47sY for ; Fri, 21 Nov 2025 09:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763716511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mr7c/W7XekmVPgTsv8MgUr81F9h+cWnPv9ioBSDkvi8=; b=d+WgFU068O8kHG+lY1WHpH3YGFzt9CPWTFYfdoH3+TZ6NMBoB091ntVKRK3LfUimUCWR2z /i5GFaF559imUW6LeF5w6F0DC8vkCJUH4suOKSa+dBQmU7REcIodwzaqToO9PkrsYiJMJJ lq/bTZNHblJRNAh4u8iAD5LY3h4jZ2a1QwhsSl9mG0plwsjYTRa8ofAjdMZ9IdNvTsnq0D gglH8SlO4QR8SebeNgt1mkNCHQMkshNzlbdkmPFgmKUlhX/Goev2mUMwzy+2KrjbAsoM1T 0HHT6DG2kA1t3fZqr0eeyimFh/EhyivXNqsDoH4Yjmzsp8HhMZzWdl7uI2x9Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763716511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mr7c/W7XekmVPgTsv8MgUr81F9h+cWnPv9ioBSDkvi8=; b=xVDeMwaCI9WCH+CXhs18ypAZCKx704yZj0uj8oEw3SArXodEbNxvvSO6+DueXCr6q7ewWU 7nMFto9wpL949psejaMbwNqbiQctJ7K/TmeyYRo4gqQvik3EADBta0GWCA4lVmuDXnRFq1 ffIQ+zzIsH5GnEQjk1TZjGZmnDRLg1TiOPqz3O/KSXOTYz/PD8gtZ4fDO4f6RhY7SlXNKt R+6nWwM/SYTsak1nKm6iTzZyHiG2DdC71vstz8fCrnZzbtD6PI+kVoaV88UssPZPwBxQ0Y fUIGtX1nzTVdJTZP5o+Gsv8YNby2f8Grw0KmZtT2Wlu7VChgyHcsQwcdUGMN0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763716511; a=rsa-sha256; cv=none; b=nP4nRRb1rehTEt7Q/Pbytrd7qFNgj42Fc3gEBJGarE+4I32KRMIWmWzvGzl1J5OrWEcfhb aG5809yqXr5xmPZ8zmZ0Gm7aEDl3w3vXqAlyTUPLjlDns9CkJDAJav0TkvKbvTKneqDuRs SQkJ56cvPsDVzjbTfrwH4ZCrTXJ5uNtI0szuJy64nM8f+KapwL/KboO54cZWbsonIFAw4s ZJ1cG11WfZME3PLaQgC0OskK75yq1a9rUvrJsqa9ypjIjSOG1j/8vpIkFK2YNZVMz2KxcU Ylk5mgcKbN7Gd7vtXjvbbDaO3HMK+dnOA8oS1Ncpl8KrahbWwegu5ZG4iK3QPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCV1C5jm4z15G3 for ; Fri, 21 Nov 2025 09:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33cad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 09:15:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 8158b813d90f - main - isp.4: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8158b813d90f01368b2045709feee1980a323198 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 09:15:11 +0000 Message-Id: <69202d9f.33cad.38f3ac78@gitrepo.freebsd.org> The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8158b813d90f01368b2045709feee1980a323198 commit 8158b813d90f01368b2045709feee1980a323198 Author: Gordon Bergling AuthorDate: 2025-11-21 09:14:35 +0000 Commit: Gordon Bergling CommitDate: 2025-11-21 09:14:35 +0000 isp.4: Fix a typo in the manual page - s/Chanel/Channel/ MFC after: 3 days --- share/man/man4/isp.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4 index 6fea63fdd5d5..a8f985a59d09 100644 --- a/share/man/man4/isp.4 +++ b/share/man/man4/isp.4 @@ -85,7 +85,7 @@ It may be disabled using configuration and hint options described below. .Sh HARDWARE The .Nm -driver supports the following optical Fibre Chanel adapters: +driver supports the following optical Fibre Channel adapters: .Bl -column "Qlogic 2690/2692/2694 (2684/2692)" "Speed" "PCI-X" .It Model: Ta Speed: Ta Bus: .It Qlogic QLE2874 (2814) Ta 64Gb Ta PCIe From nobody Fri Nov 21 12:13:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCYzN0JzYz6H6dP for ; Fri, 21 Nov 2025 12:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCYzM6sB2z3PK6 for ; Fri, 21 Nov 2025 12:13:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763727232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VCUsnt6KwuntD/RHBU+gk9EMgP5jAamkgHDJEalSIF0=; b=vfGSxDRnxnms14Y+2+wDvClef7LYJv30sFoOpvWTVceDrSW8UkzUT7s4dzJtyMfLwOdpV7 ZBoGYAUUBJtNdMxWP3C5M5YBfuqu53L0Ca1JE8kWMR3l8t6DHosyB5TsZzKslyR5R0Lm8E qUkfI5aBPkM6C8tnKYSrUZqWmKDXXmpJdTimUhhWxzYc+uTZ3htjFSayO6OhaDXUfh+i1P vo+zoxpx6poZgSIxPdUQGs+c5H5u3PZA/xQsfACkXBhVrL3PEMARtIlNBDRS8L4TffSX5F kQRwDjVQUbwABl+FawoZj5X24gcZa8lRKsGvT1hZ/H3Qy7VDK3YyWaAtgVV6/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763727232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VCUsnt6KwuntD/RHBU+gk9EMgP5jAamkgHDJEalSIF0=; b=X4Fsgd1hldZfGur5pzFIajxgURNRDyxIwfkH+9yB+QBkmr3tgdY00oAU7nivyFtC/4EpuS j7CKNUoama/EorcDkNKqyavF61iY1+4bK9VEyDxejMfLFFY+J+13VML1i+Jsev9t1zjq2R 3aS5ezrmdm2yF07IOJkaH/Uq9dtQm6nyzUiQeOXAprp2CYItRkFtfxGp+RlP1ayxlBkFsv 9JlnOW56iRKkDeY1JQTCSxXMR1TG5yCVIadBtGnLu3eSBKW17rwHQVigk2FcbH3qYe3wIA sL6i6mg/ISYo5YUa45PgNxnLNAU1TsU1gjgJvWBZGuIQfLmG/EAe6vGwbh25Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763727232; a=rsa-sha256; cv=none; b=SDauzS9WXMlqdlKXF8TzjE7b2hOK4j22dCA2oL6ozfMKlD50cq8YawdACHuvntKJUcyyvr PKlS7Kth2/mKbMMRg3sX1BKG1i6XIPPwxoYEY/ACokCwf64xBvK1+blMnDkc2PIuFTvo6D IpZ3ZT7ArSspYtrjGr+f75hu9pxphHp/t8DgNEnrS8HheXnsrfbRII7QagpazDS22v/spF ECsZgySjL2ijYKll07deXjrVkNFnsmVr6RIOKN6QpDLumGRK2TzuZx53/A/et2BfWGO/L0 NNnEW48K08QfG+WMESnroxASNOGG/jMa8Yf7xq6YYCteq2QjYlj/pg5x1y6qfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCYzM6N8Qz1B94 for ; Fri, 21 Nov 2025 12:13:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e25e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 12:13:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 5b3368322b0e - main - sys/extaddr.h: don't declare struct iovec List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b3368322b0e0f04dc0e5cc6154ddc5950b25d9b Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 12:13:51 +0000 Message-Id: <6920577f.e25e.180398f@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=5b3368322b0e0f04dc0e5cc6154ddc5950b25d9b commit 5b3368322b0e0f04dc0e5cc6154ddc5950b25d9b Author: Brooks Davis AuthorDate: 2025-11-21 12:13:00 +0000 Commit: Brooks Davis CommitDate: 2025-11-21 12:13:00 +0000 sys/extaddr.h: don't declare struct iovec The code never uses it so there's no need to forward declare it. Sponsored by: Innovate UK --- sys/sys/extattr.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/sys/extattr.h b/sys/sys/extattr.h index a16ef238656f..4aabb4af667b 100644 --- a/sys/sys/extattr.h +++ b/sys/sys/extattr.h @@ -71,8 +71,6 @@ int extattr_check_cred(struct vnode *vp, int attrnamespace, #else #include -struct iovec; - __BEGIN_DECLS int extattrctl(const char *_path, int _cmd, const char *_filename, int _attrnamespace, const char *_attrname); From nobody Fri Nov 21 12:13:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCYzP24Kwz6H6PB for ; Fri, 21 Nov 2025 12:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCYzN73Svz3PRv for ; Fri, 21 Nov 2025 12:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763727233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IXGQ3d1OOSxH1p+jYHOuQ1RM8PkOb5h8OztlZ0qwNbs=; b=Cu16oR53u7nE/nFYmUnheSelukN/dDp1mfb3I4ZKzWx2/9DeoPQHeoZtnArJt4eFtVXgF6 EywRfcsI8Eb02FlIXUPjYTibkNFxhq0v4oJk/iI4DRZvznNLj4nx+1JP6Jl+MXk9jpKZt2 6qK/sfTALvJYC7+fYUis8jwcykgCdMUGcl/HHYruh8WKwS4fPPPt09ZuXH55YQjYGX1abC 6JtASIWSzPQ1EcXxApLRqdYzZxgHu9sVWo1ZYL2CGgdBPqJOgGSvM8Cl6oTpVtvXLMVTXX J6bO9CBILaUX1qcqeO3op19HnOYqSvP1nq9tL/ipswXnWKf627qlVdJQo/h1ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763727233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IXGQ3d1OOSxH1p+jYHOuQ1RM8PkOb5h8OztlZ0qwNbs=; b=Vvwd8PugQ1DBiOpYHQyQh+sG7Hu79GDou+dbN4qrQL/khqY06OlJhgaKbO9SIvsrdBD9Fc eobgqVdGkGOk0Ueh1LdEl8GBdVomd40C0l1NSBghSQU3DsOQ/7fvC+KQqqGGrWFq+hE16T 2ZWwt0lfSEaBfXg3UYNtHiNYs7xnK6032byxUcFwSLceRwihFmIfWJC3CJybVCj0Nd57Uj 1JdjucyzgdSjDBDJ9DWtgCCVfMddeqXsipjMLax41kSQo2CP7cx+nGTQvh6BLQR0sotJbj c/NrgHip6zTRIWY4AqA8CR4u0Fn+EQr0XiyJlxBWKVk4WWLtkh//3dr/MUc25w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763727233; a=rsa-sha256; cv=none; b=SBi2OJtaazeb9w3zTTRCypzaUBarE36WYDx+4sFygm8c1aUdHm9FbeuIrEPa1sMaKPKi6m V8JeEncpOrDh9ZgzQuCMyq+GT+O9/gQSf9Q5Ad8UP52R6mqGRl2DwEJ80duatuk+gtCrNt PbKWMg4+73S2Nv8L30Gn++asCyo8Uy3JgzIyOARduJDeURRPAUBrvrUznhZYgIFDUGXCxg TvZPpYnL1mtIkJsnaiyWP48wgYiJcO8VegSKDdPXn81EHJhjMlDAbDnxyL9xJEG2H0jFUl auL9iQLyQEwIHeu17uttxGWEVhy5Rp1oYQkAgzAcLql3JQpMVIG+zF+4MKibAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCYzN6cvWz1BCH for ; Fri, 21 Nov 2025 12:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d953 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 12:13:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 747e8427e997 - main - sys/syscallsubr.h: fix some whitespace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 747e8427e997a569b91092efc0dcffb0510c1f92 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 12:13:52 +0000 Message-Id: <69205780.d953.4b7f2f9a@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=747e8427e997a569b91092efc0dcffb0510c1f92 commit 747e8427e997a569b91092efc0dcffb0510c1f92 Author: Brooks Davis AuthorDate: 2025-11-21 12:13:00 +0000 Commit: Brooks Davis CommitDate: 2025-11-21 12:13:00 +0000 sys/syscallsubr.h: fix some whitespace Sponsored by: DARPA, AFRL --- sys/sys/syscallsubr.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 8f106150e193..350e4073604e 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -219,13 +219,13 @@ int kern_kldstat(struct thread *td, int fileid, struct kld_file_stat *stat); int kern_kldunload(struct thread *td, int fileid, int flags); int kern_kmq_notify(struct thread *, int, struct sigevent *); int kern_kmq_open(struct thread *, const char *, int, mode_t, - const struct mq_attr *); + const struct mq_attr *); int kern_kmq_setattr(struct thread *, int, const struct mq_attr *, - struct mq_attr *); + struct mq_attr *); int kern_kmq_timedreceive(struct thread *, int, char *, - size_t, unsigned int *, const struct timespec *); + size_t, unsigned int *, const struct timespec *); int kern_kmq_timedsend(struct thread *td, int, const char *, - size_t, unsigned int, const struct timespec *); + size_t, unsigned int, const struct timespec *); int kern_linkat(struct thread *td, int fd1, int fd2, const char *path1, const char *path2, enum uio_seg segflg, int flag); int kern_listen(struct thread *td, int s, int backlog); @@ -411,7 +411,7 @@ int kern_kexec_load(struct thread *td, u_long entry, struct freebsd11_dirent; -int freebsd11_kern_getdirentries(struct thread *td, int fd, char *ubuf, u_int - count, long *basep, void (*func)(struct freebsd11_dirent *)); +int freebsd11_kern_getdirentries(struct thread *td, int fd, char *ubuf, + u_int count, long *basep, void (*func)(struct freebsd11_dirent *)); #endif /* !_SYS_SYSCALLSUBR_H_ */ From nobody Fri Nov 21 13:33:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCblq1w42z6HCVx for ; Fri, 21 Nov 2025 13:33: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCblq15pVz3X9s for ; Fri, 21 Nov 2025 13:33:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763732039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fmUqAbdvl3hWiEVaDkQcJzWLH5Fg+hzw3n9JvL7aTPY=; b=UNUln9KirkmN0W/Ysd0H3+Zs7JqVSKvOmig9nA+dm8+9KxDVx7zysqiTV8USinWNQ0GgyG 5SYUWYT0PM68GEVsVgkITBKpJ50iXfG6WDGBTVbTi0l4Q6rvr6KFrhzDOEsMiTUDcFvqtL xUq963cfWV3jfUnrRsjrQexggHhXwBznn9JN7QSAIA4XYapEMEzTGD0oIKLFmVP7uYxrem 1nqvAOBQgdkUyipikySnB4K7tjoqPziNO1E6sYMRmQQlnhutWTx0mww6w7+wqDmrCU0TyM oLr4YZ0Xr9l1L2gDXEZSsT0vVPm3XSinMwRRx/8X0ZAESGQRJkeIYZmYdeA2ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763732039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fmUqAbdvl3hWiEVaDkQcJzWLH5Fg+hzw3n9JvL7aTPY=; b=mv+uNL/+slByUOamB4zsTOmBywaRCuWFTscfnSEC766pg1rw9RJj9j3ebYC7/XgZPH2XGA hCRKgDz9Wm8NRrSUalaN0TaB/CPguFUOJpEW2TDl5SYA/AHWqDrDHa3wgzomRCh5hCCHnm H1TjSCk+XAiuDdUleThPiXN46YVlCIiRNc/uawlFj2OTN0x27pz5UObvubxMCVaRXn0VIn am+J0oEMey6QU9B+XDamHyXQPzLSNVVUc3ibqL1nYnOrUk3OGi/SM3549CtOXHmFTVcGa+ miEyAVhT6+XKK0PXki9d8EoeWJAeeAhRrn98rmQMez2P24qbbL40wZ8ytXvZRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763732039; a=rsa-sha256; cv=none; b=dS6OHDivzp+vKgOrr0lEypRwZUhT/lEgyibH9utF2vtvJPq6X08gl1qQhyYS7ZVPjw8J/h cvxY2ClD3aHmtZJASXEyfkTCfpeD1XZx5v5yjpVC8nb9KnzRiGufw00pujcr8+l6/xMCQ+ 2NZvpTXTc0zU3UuuLyTCgYJKawPg/MDB+a6dakJ6OQvp85kmRlTn1a5jbXhsyIAM6TYzRs A2msr6AtFQcwRwCcn4sDhJkXC86uztGHUb+708Qk9gjZJez+5zuDEd1C3JnuAfjUc1qpxj cFgoprdHTRhOhWeX9Sw78NEJJ/c6rIAZtTVqFLvT/eJMi7hDqJ3PcxAXTnLEYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCblq0fkVzGx for ; Fri, 21 Nov 2025 13:33:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27746 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 13:33:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b2b3d2a962eb - main - rtld-elf: move powerpc-specific auxv compat code into arch hook List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2b3d2a962eb00005641546fbe672b95e5d0672a Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 13:33:59 +0000 Message-Id: <69206a47.27746.245d9408@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b2b3d2a962eb00005641546fbe672b95e5d0672a commit b2b3d2a962eb00005641546fbe672b95e5d0672a Author: Konstantin Belousov AuthorDate: 2025-11-18 11:06:04 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-21 13:33:17 +0000 rtld-elf: move powerpc-specific auxv compat code into arch hook Tested by: Timothy Pearson (tpearson_raptorengineering.com) Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53801 --- libexec/rtld-elf/aarch64/rtld_machdep.h | 2 ++ libexec/rtld-elf/amd64/rtld_machdep.h | 2 ++ libexec/rtld-elf/arm/rtld_machdep.h | 2 ++ libexec/rtld-elf/i386/rtld_machdep.h | 2 ++ libexec/rtld-elf/powerpc/reloc.c | 26 ++++++++++++++++++++++++++ libexec/rtld-elf/powerpc/rtld_machdep.h | 2 ++ libexec/rtld-elf/powerpc64/reloc.c | 26 ++++++++++++++++++++++++++ libexec/rtld-elf/powerpc64/rtld_machdep.h | 2 ++ libexec/rtld-elf/riscv/rtld_machdep.h | 2 ++ libexec/rtld-elf/rtld.c | 25 +------------------------ 10 files changed, 67 insertions(+), 24 deletions(-) diff --git a/libexec/rtld-elf/aarch64/rtld_machdep.h b/libexec/rtld-elf/aarch64/rtld_machdep.h index 3cc1339fcad4..d689ae354c49 100644 --- a/libexec/rtld-elf/aarch64/rtld_machdep.h +++ b/libexec/rtld-elf/aarch64/rtld_machdep.h @@ -52,6 +52,8 @@ bool arch_digest_dynamic(struct Struct_Obj_Entry *obj, const Elf_Dyn *dynp); bool arch_digest_note(struct Struct_Obj_Entry *obj, const Elf_Note *note); +#define arch_fix_auxv(a, ai) do {} while (0) + Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const struct Struct_Obj_Entry *defobj, const struct Struct_Obj_Entry *obj, const Elf_Rel *rel); diff --git a/libexec/rtld-elf/amd64/rtld_machdep.h b/libexec/rtld-elf/amd64/rtld_machdep.h index 1797d13c847d..2ee63d566bed 100644 --- a/libexec/rtld-elf/amd64/rtld_machdep.h +++ b/libexec/rtld-elf/amd64/rtld_machdep.h @@ -47,6 +47,8 @@ Elf_Dyn *rtld_dynamic_addr(void); /* No architecture specific notes */ #define arch_digest_note(obj, note) false +#define arch_fix_auxv(a, ai) do {} while (0) + Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const struct Struct_Obj_Entry *obj, const struct Struct_Obj_Entry *refobj, const Elf_Rel *rel); diff --git a/libexec/rtld-elf/arm/rtld_machdep.h b/libexec/rtld-elf/arm/rtld_machdep.h index f59b30028a3b..88fa18a0c07a 100644 --- a/libexec/rtld-elf/arm/rtld_machdep.h +++ b/libexec/rtld-elf/arm/rtld_machdep.h @@ -47,6 +47,8 @@ struct Struct_Obj_Entry; /* No architecture specific notes */ #define arch_digest_note(obj, note) false +#define arch_fix_auxv(a, ai) do {} while (0) + Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const struct Struct_Obj_Entry *defobj, const struct Struct_Obj_Entry *obj, const Elf_Rel *rel); diff --git a/libexec/rtld-elf/i386/rtld_machdep.h b/libexec/rtld-elf/i386/rtld_machdep.h index 581f1dfb002d..079991f913d6 100644 --- a/libexec/rtld-elf/i386/rtld_machdep.h +++ b/libexec/rtld-elf/i386/rtld_machdep.h @@ -60,6 +60,8 @@ Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target, #define call_init_pointer(obj, target) \ (((InitArrFunc)(target))(main_argc, main_argv, environ)) +#define arch_fix_auxv(a, ai) do {} while (0) + extern uint32_t cpu_feature; extern uint32_t cpu_feature2; extern uint32_t cpu_stdext_feature; diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c index 8932c2c21278..a38cadfe76ba 100644 --- a/libexec/rtld-elf/powerpc/reloc.c +++ b/libexec/rtld-elf/powerpc/reloc.c @@ -840,3 +840,29 @@ __tls_get_addr(tls_index* ti) return (tls_get_addr_common(_tcb_get(), ti->ti_module, ti->ti_offset + TLS_DTV_OFFSET)); } + +void +arch_fix_auxv(Elf_Auxinfo *aux, Elf_Auxinfo *aux_info[]) +{ + Elf_Auxinfo *aux; + bool old_auxv_format; + + old_auxv_format = true; + for (auxp = aux; auxp->a_type != AT_NULL; auxp++) { + if (auxp->a_type == 23) /* AT_STACKPROT */ + return; + } + + /* Remap from old-style auxv numbers. */ + aux_info[23] = aux_info[21]; /* AT_STACKPROT */ + aux_info[21] = aux_info[19]; /* AT_PAGESIZESLEN */ + aux_info[19] = aux_info[17]; /* AT_NCPUS */ + aux_info[17] = aux_info[15]; /* AT_CANARYLEN */ + aux_info[15] = aux_info[13]; /* AT_EXECPATH */ + aux_info[13] = NULL; /* AT_GID */ + + aux_info[20] = aux_info[18]; /* AT_PAGESIZES */ + aux_info[18] = aux_info[16]; /* AT_OSRELDATE */ + aux_info[16] = aux_info[14]; /* AT_CANARY */ + aux_info[14] = NULL; /* AT_EGID */ +} diff --git a/libexec/rtld-elf/powerpc/rtld_machdep.h b/libexec/rtld-elf/powerpc/rtld_machdep.h index ec470f238991..de6a894ac1f5 100644 --- a/libexec/rtld-elf/powerpc/rtld_machdep.h +++ b/libexec/rtld-elf/powerpc/rtld_machdep.h @@ -46,6 +46,8 @@ bool arch_digest_dynamic(struct Struct_Obj_Entry *, const Elf_Dyn *); /* No architecture specific notes */ #define arch_digest_note(obj, note) false +void arch_fix_auxv(Elf_Auxinfo *aux, Elf_Auxinfo *aux_info[]); + Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const struct Struct_Obj_Entry *defobj, const struct Struct_Obj_Entry *obj, const Elf_Rel *rel); diff --git a/libexec/rtld-elf/powerpc64/reloc.c b/libexec/rtld-elf/powerpc64/reloc.c index 9ea14f63b5c7..29c52d8fc19f 100644 --- a/libexec/rtld-elf/powerpc64/reloc.c +++ b/libexec/rtld-elf/powerpc64/reloc.c @@ -737,3 +737,29 @@ __tls_get_addr(tls_index* ti) return (tls_get_addr_common(_tcb_get(), ti->ti_module, ti->ti_offset + TLS_DTV_OFFSET)); } + +void +arch_fix_auxv(Elf_Auxinfo *aux, Elf_Auxinfo *aux_info[]) +{ + Elf_Auxinfo *aux; + bool old_auxv_format; + + old_auxv_format = true; + for (auxp = aux; auxp->a_type != AT_NULL; auxp++) { + if (auxp->a_type == 23) /* AT_STACKPROT */ + return; + } + + /* Remap from old-style auxv numbers. */ + aux_info[23] = aux_info[21]; /* AT_STACKPROT */ + aux_info[21] = aux_info[19]; /* AT_PAGESIZESLEN */ + aux_info[19] = aux_info[17]; /* AT_NCPUS */ + aux_info[17] = aux_info[15]; /* AT_CANARYLEN */ + aux_info[15] = aux_info[13]; /* AT_EXECPATH */ + aux_info[13] = NULL; /* AT_GID */ + + aux_info[20] = aux_info[18]; /* AT_PAGESIZES */ + aux_info[18] = aux_info[16]; /* AT_OSRELDATE */ + aux_info[16] = aux_info[14]; /* AT_CANARY */ + aux_info[14] = NULL; /* AT_EGID */ +} diff --git a/libexec/rtld-elf/powerpc64/rtld_machdep.h b/libexec/rtld-elf/powerpc64/rtld_machdep.h index d628e776bae9..06eb6d884101 100644 --- a/libexec/rtld-elf/powerpc64/rtld_machdep.h +++ b/libexec/rtld-elf/powerpc64/rtld_machdep.h @@ -46,6 +46,8 @@ bool arch_digest_dynamic(struct Struct_Obj_Entry *, const Elf_Dyn *); /* No architecture specific notes */ #define arch_digest_note(obj, note) false +void arch_fix_auxv(Elf_Auxinfo *aux, Elf_Auxinfo *aux_info[]); + Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const struct Struct_Obj_Entry *defobj, const struct Struct_Obj_Entry *obj, const Elf_Rel *rel); diff --git a/libexec/rtld-elf/riscv/rtld_machdep.h b/libexec/rtld-elf/riscv/rtld_machdep.h index c6600b583612..1f4fe2e928fe 100644 --- a/libexec/rtld-elf/riscv/rtld_machdep.h +++ b/libexec/rtld-elf/riscv/rtld_machdep.h @@ -60,6 +60,8 @@ uint64_t set_gp(struct Struct_Obj_Entry *obj); /* No architecture specific notes */ #define arch_digest_note(obj, note) false +#define arch_fix_auxv(a, ai) do {} while (0) + Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const struct Struct_Obj_Entry *defobj, const struct Struct_Obj_Entry *obj, const Elf_Rel *rel); diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index d27af520c21d..bdfff7361e96 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -521,9 +521,6 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) char buf[MAXPATHLEN]; int argc, fd, i, mib[4], old_osrel, osrel, phnum, rtld_argc; size_t sz; -#ifdef __powerpc__ - int old_auxv_format = 1; -#endif bool dir_enable, dir_ignore, direct_exec, explicit_fd, search_in_path; /* @@ -549,28 +546,8 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) for (auxp = aux; auxp->a_type != AT_NULL; auxp++) { if (auxp->a_type < AT_COUNT) aux_info[auxp->a_type] = auxp; -#ifdef __powerpc__ - if (auxp->a_type == 23) /* AT_STACKPROT */ - old_auxv_format = 0; -#endif - } - -#ifdef __powerpc__ - if (old_auxv_format) { - /* Remap from old-style auxv numbers. */ - aux_info[23] = aux_info[21]; /* AT_STACKPROT */ - aux_info[21] = aux_info[19]; /* AT_PAGESIZESLEN */ - aux_info[19] = aux_info[17]; /* AT_NCPUS */ - aux_info[17] = aux_info[15]; /* AT_CANARYLEN */ - aux_info[15] = aux_info[13]; /* AT_EXECPATH */ - aux_info[13] = NULL; /* AT_GID */ - - aux_info[20] = aux_info[18]; /* AT_PAGESIZES */ - aux_info[18] = aux_info[16]; /* AT_OSRELDATE */ - aux_info[16] = aux_info[14]; /* AT_CANARY */ - aux_info[14] = NULL; /* AT_EGID */ } -#endif + arch_fix_auxv(aux, aux_info); /* Initialize and relocate ourselves. */ assert(aux_info[AT_BASE] != NULL); From nobody Fri Nov 21 14:25:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCcvM3K2Rz6HGwS for ; Fri, 21 Nov 2025 14:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCcvM0rwFz3fZH for ; Fri, 21 Nov 2025 14:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763735135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/RnxGjX/eCyyPq54RJo4H93OOeRDVVpPRK0zIRFOQ/c=; b=BHpoSoV6nxNsAxMm0wYX+NESCuHhuFFLx6F6XO+tOI+TfTONWh1xj8okAICoqqUlgfbWhr hR1CNVtzzd6S/X8wvgXGzxH3xWD0D0c5GgHpAqH8SCSrR4CQzUntMbW69KGG4HKklyVdA9 kWvOldzk9OC/CHzl16TWekEoLd34rFLoMSnJ+lBE8V16qQcHSkNypv/6/lnffHyg4E9N0l gg+0ZwWMrloARDymlYu0w+l91FVYNrDTG52W7vh6EOUAra+KSwJD6LFlJYelhHcJm8Wklp LtaetAVver3p+j/TA12P4t/+ZtD9NM60zoQ7cjBXRcaICT+vb133ZbIDeMtCTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763735135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/RnxGjX/eCyyPq54RJo4H93OOeRDVVpPRK0zIRFOQ/c=; b=jLvYU1LeDNyNDMnJbIlde9F8z8BK6Of11eSOhSuMlh/6DP20jQywEQJc0YtInBIjQ9p9X8 u4mT0GW3fsP4Xne5qtbhIw0fFiLw5Oora7ZD8A6RxmE9RYNIeWQd+xWJ0J9APi+XwqVqef 3ZFXssR+HlDUbHZH/Odfth+buIWXXMFw1SJ7i835UzEbKrPgIcTfTJBGO/O3N14PBAo9XV oLOliYA7jSuaKpp9avVN6T89XItZUSJ8oJ46MJh8rg/IhnW6ogIgXaKswTd32pTH4GccSq HRfTXwtrpGfaN6B/4V6HM9F3H1eROkhkj2BkH9ykJ+uVVMZdOeuYktME4NX+iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763735135; a=rsa-sha256; cv=none; b=Vh0P4Ts7X3pQlsyZ8Q0H5iRsQHXVCtVDGuEBZhE+t83qxeKWkfN65CCjW5iJZ+J9FiPisW FsSjiQ+MgKNDbSJzqrtAlmEY663kk7UjXva8VZhPsoxIkpHGt/7R10dT6SVQpohxt8ks/U Pw32V0YviGbtOJ+qVbKPgwaAncoIJ9oguKZfEwRjIfJ/F7+Jw5NfI7G5tNxeXf6H+mmS/Q ttX4e2MD/zjcrXgV/Oaavx95IQvVTGEG4Ha2LBJW9c9qYxZnWLLI9RoykzqKmylqWvDMga sOvdrfXR0uw2dX6VTYi/L5/CtrscXgBfi3/yqI/rthotwQDipXfKER0HwN+WAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCcvM0SVFz1LQ for ; Fri, 21 Nov 2025 14:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c8ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 14:25:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a7d052994e87 - stable/15 - queue.3: Add MLINKs for *_EMPTY_ATOMIC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a7d052994e87969c0242d9f9e7fedef859be2ef3 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 14:25:35 +0000 Message-Id: <6920765f.2c8ae.2b5c80e7@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a7d052994e87969c0242d9f9e7fedef859be2ef3 commit a7d052994e87969c0242d9f9e7fedef859be2ef3 Author: Mark Johnston AuthorDate: 2025-11-10 15:30:50 +0000 Commit: Mark Johnston CommitDate: 2025-11-21 14:15:46 +0000 queue.3: Add MLINKs for *_EMPTY_ATOMIC MFC after: 1 week Fixes: d2870b8666f2 ("queue: Add atomic variants for *_EMPTY") (cherry picked from commit 1563da200d4d3d56799267f1bbc58933a6c21331) --- share/man/man3/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 18e439491793..bce57291f073 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -203,6 +203,7 @@ MLINKS+= Q_SIGNSHFT.3 Q_SSIGN.3 \ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 LIST_CLASS_HEAD.3 \ queue.3 LIST_EMPTY.3 \ + queue.3 LIST_EMPTY_ATOMIC.3 \ queue.3 LIST_ENTRY.3 \ queue.3 LIST_FIRST.3 \ queue.3 LIST_FOREACH.3 \ @@ -224,6 +225,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 SLIST_CLASS_ENTRY.3 \ queue.3 SLIST_CLASS_HEAD.3 \ queue.3 SLIST_EMPTY.3 \ + queue.3 SLIST_EMPTY_ATOMIC.3 \ queue.3 SLIST_ENTRY.3 \ queue.3 SLIST_FIRST.3 \ queue.3 SLIST_FOREACH.3 \ @@ -246,6 +248,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 STAILQ_CLASS_HEAD.3 \ queue.3 STAILQ_CONCAT.3 \ queue.3 STAILQ_EMPTY.3 \ + queue.3 STAILQ_EMPTY_ATOMIC.3 \ queue.3 STAILQ_ENTRY.3 \ queue.3 STAILQ_FIRST.3 \ queue.3 STAILQ_FOREACH.3 \ @@ -270,6 +273,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 TAILQ_CLASS_HEAD.3 \ queue.3 TAILQ_CONCAT.3 \ queue.3 TAILQ_EMPTY.3 \ + queue.3 TAILQ_EMPTY_ATOMIC.3 \ queue.3 TAILQ_ENTRY.3 \ queue.3 TAILQ_FIRST.3 \ queue.3 TAILQ_FOREACH.3 \ From nobody Fri Nov 21 14:25:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCcvN3n9jz6HH3m for ; Fri, 21 Nov 2025 14:25: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCcvN21j6z3frB for ; Fri, 21 Nov 2025 14:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763735136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6kBMtHBtxGtC8vBo4bcA8vSMhpMcFlZwEHsE5w/WsUQ=; b=BBSlnddKgcgTfRluBJlyIXavOberWgdKRvChjEiA8MZeB8ykQ2ahFQ8twmukrDnDkcUBFY gM03xIO+rVnI+2EzkeLclLs487ODn36nRqtUDDn4X+RJTdR3E+uNlTDbMCjbWMX07rodW8 yXaf6BDfUC3m4pN7pmJaA19Sacm/h7gjgz/w3hTpSXp+BtimhdtmcaUSOhMLxuojFCSH50 4X5+hgFJrdLN9cU6mR+JeBXnxshHla8atxbfVZhSv1LUUyjURggBfYTSuRVKsYAbv+E+UX QVtP/36NEmj1Xf4v/elLcUKl/bnsBg9UdI+vXoCDMisRZHFEcKmy366LjYarww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763735136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6kBMtHBtxGtC8vBo4bcA8vSMhpMcFlZwEHsE5w/WsUQ=; b=c74CdsKqvpquyjl8iuz3PHpHYVDv/NkpGyMAiAosjg5DOVfXgalyOerPSb+SiSQk62KYoc PusaO42mly49I0jbt5/mHDNHAC2yOL6GMTPqm+9kjbLlUNeyS16HDwpTl/7sArX0WLwZD0 epFnRJdHqqthgkYv1vc6jP1dnFtct1DlBBVLO7ujUOdlDOoELij05NFV4BW7TczdcAcHm6 pGDxfLcsXxevqDyfESOuVa8UFk2BoBlJj08rQRAUYEHT0p3HWLzVTwtZ/pVXxSgdPHKJ2a u5TS0mJBtGs7RixlEG4+8aTmUiPUNJTc8qSp1Jyc6UGULwAO7i7u0Ntd3u/mkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763735136; a=rsa-sha256; cv=none; b=M6WBGL/OSGerQ9mkH6MDbO3/AIllPEvnHWqf9W8tF0QiH4egtigu/Lh9v30xXiWKgA9bWn 85DkA1kIClq5JVvBewzZLOJ5PDZLmvfSHy8dHxMg+Pl7sfSuu2T3yZxRK3iZP6dLp0xbGI I2sQoW3q5K2797qNAX/ChEnb5mlHOsiqORfZ/tkMne/Zkt4YHakilZbi1Qxc/gXZhzRKRq K0F29p6rjXSAQZxlezluRTmkwhCZqIyDdOA4pyM7mvUOnRJi9Dm8Rgxl3KQp7XyagFjbTh IytQ6E5e16VjRYUKQ9vdQEAOpKvd42uJAwjaV5ANQ93oYZc7x4VM3sEGicW+tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCcvN1b5XzvT for ; Fri, 21 Nov 2025 14:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c863 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 14:25:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7c1579142208 - stable/15 - unix: Remove an always-false null pointer check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7c15791422080eea051a9a2ae47f7923a972922d Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 14:25:36 +0000 Message-Id: <69207660.2c863.bdc9e5c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7c15791422080eea051a9a2ae47f7923a972922d commit 7c15791422080eea051a9a2ae47f7923a972922d Author: Mark Johnston AuthorDate: 2025-11-13 22:57:35 +0000 Commit: Mark Johnston CommitDate: 2025-11-21 14:15:53 +0000 unix: Remove an always-false null pointer check No functional change intended. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53453 (cherry picked from commit ce5692bf009ed5607d3b880eec4055697479c13d) --- sys/kern/uipc_usrreq.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 21c0b388a9ac..1d0e1c4f8db6 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -3212,11 +3212,9 @@ unp_disconnect(struct unpcb *unp, struct unpcb *unp2) #endif LIST_REMOVE(unp, unp_reflink); UNP_REF_LIST_UNLOCK(); - if (so) { - SOCK_LOCK(so); - so->so_state &= ~SS_ISCONNECTED; - SOCK_UNLOCK(so); - } + SOCK_LOCK(so); + so->so_state &= ~SS_ISCONNECTED; + SOCK_UNLOCK(so); break; case SOCK_STREAM: From nobody Fri Nov 21 14:25:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCcvP4QxQz6HH1R for ; Fri, 21 Nov 2025 14:25: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCcvP2Xjqz3fZL for ; Fri, 21 Nov 2025 14:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763735137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BjPVH4rU0dCMlso/daGPIL9y9FZ2IGc3/PTYzr9nI+Q=; b=fYKel2fp8f/AK7N/2+xpi/IHigCm4ltvhlhhjKc6b7D4MzA6NmYopIWiiY4V1cqPPu9IhY LRWZZdL6HPi2AXtIZMMNBSb27Joc4a6VR4OA8aYABSQb9R73YooP45eaFGPPrruZuHibi8 490ECVjS2Ay3qFEGLNmPOgAvJLWMnhsjWJlQovKJDusfDfajMiZjecR7gLXcZb4zuyA6gQ G14b9ZS8meZrJuhic69MUjwoDOrGqNMDRf6mooHbG4XmDCbId61qxidjyxAy4SPICiDghl H5acBL83PiLJdqOEDvd0c75FQpZx8RsKs16bI9qDNZkSQe/qNyxvYcsLxLt9qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763735137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BjPVH4rU0dCMlso/daGPIL9y9FZ2IGc3/PTYzr9nI+Q=; b=SEWFy1sfFherqZ94sIUonLgatubYdazKq/luEiLv82zXz5CySrn5I9gZyMilo/I1EuL4Ea WVSlfixcmBQbZyqx/XyKKkA5ifEnGdeVLK4S0nkVHEbZ1v4qYT9uEwWmy6C7HwPWiu0zYT 230ZH6GwHjGVCKZz4CDwGHQ31EVJCXBdIoDAS4EAO9bQB12AkLhzMJJgIW2LyO3vi0j3Nn ZD3qmpshJLeZeYtiC/BDz3lI0z47N3WvRR7m1CVNqMhHdNkL61jSddOEp8dDVWyIPQPdMp /bf0Ma5hla/Q53ZkVqrQr0b5bO4SoWsSfESyP222BpaHazJmjydJItmzj8JRTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763735137; a=rsa-sha256; cv=none; b=BH09p/7s4VEOKo+qzw4dquVb4p++VTlkCn97pDS+FNRxqTCQaFoYGuSC50BPXevrKcWone efgbFAvC5ZOGdN3EcTG1efzazdDo49FTDAy6q31zbB86xEsU3tNJlz+x5RbLWha4q3iY/y 5K6QiTM8IIRuRwdZppBqE8OYEen9yX6dkf92UN2bViWfUCiTVNtyyiqEH0+hBysjlIU5cY 3fKpYv6X+im0rtroyy5ZNqwjLkM83M31zpSwZpF6Dt5ZOcrWaBsLxz572BgFAC9vOD7z32 s2HjJiO7D14jx8yNbQABQ5whMPdGJydpYuh6biLraxhK7yXGkjZqU3Xe7dbMiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCcvP23rkz1Zy for ; Fri, 21 Nov 2025 14:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c12f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 14:25:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f7c3aa281504 - stable/15 - unix: Fix handling of listening sockets during garbage collection List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f7c3aa2815043c6ac22bcbbec970343ab38025c3 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 14:25:37 +0000 Message-Id: <69207661.2c12f.600ec01e@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f7c3aa2815043c6ac22bcbbec970343ab38025c3 commit f7c3aa2815043c6ac22bcbbec970343ab38025c3 Author: Mark Johnston AuthorDate: 2025-11-13 22:56:15 +0000 Commit: Mark Johnston CommitDate: 2025-11-21 14:16:00 +0000 unix: Fix handling of listening sockets during garbage collection socantrcvmore() and unp_dispose() assume that the socket's socket buffers are initialized, which isn't the case for listening sockets. Reported by: syzbot+a62883292a5c257703be@syzkaller.appspotmail.com MFC after: 1 week Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D53743 (cherry picked from commit 9d9fa9a2c22f67d5f8afec18106c9f0072d6b3d4) --- sys/kern/uipc_usrreq.c | 10 ++++++---- tests/sys/kern/unix_passfd_test.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 1d0e1c4f8db6..05e267b8ae2b 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -4202,10 +4202,12 @@ unp_gc(__unused void *arg, int pending) struct socket *so; so = unref[i]->f_data; - CURVNET_SET(so->so_vnet); - socantrcvmore(so); - unp_dispose(so); - CURVNET_RESTORE(); + if (!SOLISTENING(so)) { + CURVNET_SET(so->so_vnet); + socantrcvmore(so); + unp_dispose(so); + CURVNET_RESTORE(); + } } /* diff --git a/tests/sys/kern/unix_passfd_test.c b/tests/sys/kern/unix_passfd_test.c index 7dc4541ad402..66bb406ea14e 100644 --- a/tests/sys/kern/unix_passfd_test.c +++ b/tests/sys/kern/unix_passfd_test.c @@ -1189,6 +1189,34 @@ ATF_TC_CLEANUP(cross_jail_dirfd, tc) err(1, "jail_remove"); } +ATF_TC_WITHOUT_HEAD(listening_socket); +ATF_TC_BODY(listening_socket, tc) +{ + struct sockaddr_un sun; + int error, ls, s[2]; + + ls = socket(AF_UNIX, SOCK_STREAM, 0); + ATF_REQUIRE(ls != -1); + + memset(&sun, 0, sizeof(sun)); + sun.sun_len = sizeof(sun); + sun.sun_family = AF_UNIX; + snprintf(sun.sun_path, sizeof(sun.sun_path), "listen.sock"); + error = bind(ls, (struct sockaddr *)&sun, sizeof(sun)); + ATF_REQUIRE_MSG(error == 0, "bind failed: %s", strerror(errno)); + error = listen(ls, 0); + + error = socketpair(AF_UNIX, SOCK_STREAM, 0, s); + ATF_REQUIRE_MSG(error == 0, "socketpair failed: %s", strerror(errno)); + + sendfd(s[0], ls); + sendfd(s[0], s[0]); + sendfd(s[0], s[1]); + close(ls); + close(s[0]); + close(s[1]); +} + ATF_TP_ADD_TCS(tp) { @@ -1211,6 +1239,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, empty_rights_message); ATF_TP_ADD_TC(tp, control_creates_records); ATF_TP_ADD_TC(tp, cross_jail_dirfd); + ATF_TP_ADD_TC(tp, listening_socket); return (atf_no_error()); } From nobody Fri Nov 21 15:03:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCdkY1wTZz6HKZ8 for ; Fri, 21 Nov 2025 15:03: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCdkY0xr1z3lVK for ; Fri, 21 Nov 2025 15:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763737381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YvydlxhihUNsj49gEanuZlWQQLunMiBDGAIif1akmEI=; b=tK3hRVon8Wcd/1EsMMFVQB7w3169MKrgbwvwHsvxg7UMuDtwFL4jmsVFZ3vuMMEyVgv0bs 0+retQ6MOL5vO5qkFFblGsm5tAu1zyM8afm/zy6zHwVnYmCzpfxNodjxa8oGXcb7w9kgey RlhqKvmKvhIsgCb1dO9Zlwr6skqjpUCsui67oVyo+cu2TzHMJtsFu14o0jboB8+BXErLsp Z7ddw6/3K0Gp29IRJQ8tc63/OuKJatfwnvOkdlmuMVUT9x8tK3uXjMRTx/GoGyMJl2Lj3m R89L2jigCXWeR91B+2alS81aZ0EPRASMF7DyITJoU599AtpQMqtO8gIVGtTkyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763737381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YvydlxhihUNsj49gEanuZlWQQLunMiBDGAIif1akmEI=; b=iLy/mkVdujnVSGhDmgzhiiBhHV2HUg2Q03vq0b4gtzzuBhjhDrdM3UDRgmSa7zfa/Qmlwq zourOC6Y4udPf3hSaUZjTaL1McT2EjMWrhN0eIzO5YDL9TLx1TkzCyG80Saa9/bKofiR8a 9jE2FNX35UuXfYLXY5wpBVmm/Gm2BCePV5YOUymVH75jYtMqtxKP/N76kqp+n2/ipvjDaV TLb2V9VAlD9UrnYKz9Ldiza0msE+gCFVOxDO4xFD1mtjULP0y7BSsg30CNCcqoD5QHJy44 Qa1mVqpTt0ZH6EesEgfKXQU7sG69S/gvxmphKyTKU05ZBmAEYz1HQo5hTZgkJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763737381; a=rsa-sha256; cv=none; b=k7IBjvuCfqYzO7HUbjJsyFfSszir2BkGHgwz50dlapK/4pNSpNoxFeFrvW6l56EuHq7Hvq z3nMO52+Vh1bOOp4VWBK7fxQC2Ed3EhGhEjPfPSkkNXBSrP+oRXnBsH8q3U7USOEEK0cN+ E5QiVwYm6x45YjkgAcQoO0IZGZL3kRKuglnZuepNayCh6aqIflNTh71nlae/kLtNKTXili ZXw4+RmgczHPgsoV5ktfcut5f86FeOpuxfQqw3O/8hdHxTo1SV+htsr0wb06B1y9FxDfa4 acJlECTTl3UQ8ae8It1Ju90+ti47BRMCCeGRt3jf8kJgJbwozOCMRRxW4xKbrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCdkY0TS0z2f7 for ; Fri, 21 Nov 2025 15:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31208 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:03:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b9fc7628dbb2 - main - vm_page_free_prep(): convert PG_ZERO zeroed page check to use sf_buf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9fc7628dbb24b55cbb8791c83bd69f73cfadf23 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:03:01 +0000 Message-Id: <69207f25.31208.26d1a968@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b9fc7628dbb24b55cbb8791c83bd69f73cfadf23 commit b9fc7628dbb24b55cbb8791c83bd69f73cfadf23 Author: Konstantin Belousov AuthorDate: 2025-11-21 08:57:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-21 15:02:21 +0000 vm_page_free_prep(): convert PG_ZERO zeroed page check to use sf_buf Make the check MI by allocating sf_buf in non-blockable manner. For DMAP arches, this should be nop since sf_buf allocation cannot fail trivially. For non-DMAP arches, we get the checks activated unless there is serious sf_buf pressure, which typically should be not. The context for vm_page_free_prep() should be ready to block on some VM mutexes, which should make it reasonable to block on sf_buf list lock. Move the code to INVARIANTS build from DIAGNOSTIC, and control its activation with the sysctl debug.vm_check_pg_zero. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53850 --- sys/vm/vm_extern.h | 3 +++ sys/vm/vm_page.c | 32 +++++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index 1fd6518cf4ed..d0e005088745 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -164,5 +164,8 @@ vm_addr_ok(vm_paddr_t pa, vm_paddr_t size, u_long alignment, return (vm_addr_align_ok(pa, alignment) && vm_addr_bound_ok(pa, size, boundary)); } + +extern bool vm_check_pg_zero; + #endif /* _KERNEL */ #endif /* !_VM_EXTERN_H_ */ diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 16878604fa11..b39d665f9e0f 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -84,6 +84,7 @@ #include #include #include +#include #include #include #include @@ -145,6 +146,13 @@ SYSCTL_ULONG(_vm_stats_page, OID_AUTO, nofreeq_size, CTLFLAG_RD, &nofreeq_size, 0, "Size of the nofree queue"); +#ifdef INVARIANTS +bool vm_check_pg_zero = false; +SYSCTL_BOOL(_debug, OID_AUTO, vm_check_pg_zero, CTLFLAG_RWTUN, + &vm_check_pg_zero, 0, + "verify content of freed zero-filled pages"); +#endif + /* * bogus page -- for I/O to/from partially complete buffers, * or for paging into sparsely invalid regions. @@ -4050,14 +4058,24 @@ vm_page_free_prep(vm_page_t m) */ atomic_thread_fence_acq(); -#if defined(DIAGNOSTIC) && defined(PHYS_TO_DMAP) - if (PMAP_HAS_DMAP && (m->flags & PG_ZERO) != 0) { - uint64_t *p; +#ifdef INVARIANTS + if (vm_check_pg_zero && (m->flags & PG_ZERO) != 0) { + struct sf_buf *sf; + unsigned long *p; int i; - p = (uint64_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m)); - for (i = 0; i < PAGE_SIZE / sizeof(uint64_t); i++, p++) - KASSERT(*p == 0, ("vm_page_free_prep %p PG_ZERO %d %jx", - m, i, (uintmax_t)*p)); + + sched_pin(); + sf = sf_buf_alloc(m, SFB_CPUPRIVATE | SFB_NOWAIT); + if (sf != NULL) { + p = (unsigned long *)sf_buf_kva(sf); + for (i = 0; i < PAGE_SIZE / sizeof(*p); i++, p++) { + KASSERT(*p == 0, + ("zerocheck failed page %p PG_ZERO %d %jx", + m, i, (uintmax_t)*p)); + } + sf_buf_free(sf); + } + sched_unpin(); } #endif if ((m->oflags & VPO_UNMANAGED) == 0) { From nobody Fri Nov 21 15:03:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCdkZ4fQqz6HK72 for ; Fri, 21 Nov 2025 15:03: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCdkZ1kmnz3lxC for ; Fri, 21 Nov 2025 15:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763737382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZqdOmhRvYZWI+vDo4YHtgaP67+1zKSqpoK7ha04/vTI=; b=Y8AxkcE5VJi6/Ghkn4hBvqZNnC9hvQUYToy3yzNE5x23hqs+Q/OB3bCUGjkrpmkl9BhUi2 1q5/ciXW9spPqe0HL9oinGZTgmCUKEU5EKiHcxSsA/yYkAgCAEAxVwYIlUhZK6MKsiHOos hX5Q6eyPEOTTM5eweDEk7qDxPxhcWmzvw4vNHC8M54fKwov9yi2x72RXI7iepy4m7ypWGS TkVnzA5zw+nXJbnRznhkGAMB+zyKtQ44YUJikZQ1x9kLU6r23W/zgOj1neKeel2bfBRK5Q /Mi64mZMhMXp1m3T5nfpJCj0jGk/o+K9eHqwVAvJGqG0u03sRWylLYtSFa4B5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763737382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZqdOmhRvYZWI+vDo4YHtgaP67+1zKSqpoK7ha04/vTI=; b=u3fosXpAdQRCduBMTXu/TaB22h18QTmLtEiQt/eFbRkPRDz5hmly1K8iWk/1eJNSh1MGV9 F2CaaKI15oXeMH1L1gujioWLFDRaZRvHkAkbqEpcXdOikE2zdDYB/N8M40ueZy69/sTqtu YsvhdUmJ+E+HXETII9LZbHYwZjfoPSrXVpKyYxo85gFWthjNRRPMHsX5qlyeJgz4RGRfpj nZUEy2smnu4i+FUEk+beUOMg9rYtfzoR65e1nCgqbezBSu3kI0IxBXl8xdOP5JK6Rv75o6 fJFKKIoT3bMK7xPsgDED2XhrQPPPr5B1GXzORuxZ4Z1SCZO6ot/e/XVTvwCX0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763737382; a=rsa-sha256; cv=none; b=V9u01y6GhK0FbZ1poO10a8x38ykQdQstZOXaVLZeCol5/mt5gb4pyz2gLfyEm87AD8hffX mIMVp9LAg5huH3HvAmJvJLD9t1uXQsawK8tDUAeHQn9u5+OWtuoYG0xX1hAaraVV4hLJ6N JN1GBEb0HwlPU+Go3o0LeJ6vQydDkjrfo0FchMU534dmBxHZB0EdIZee3ADNsK6a4gJjuN kdAw+d1hIIiwKGXTct0zdBdeDKU9pdO4x3q9jKMO1hZKe2mJCze5atamxhHaNq8QlHVU3B NR9vqnCgMh5ZE2Em4yy7VfaRJJn/LCXxSApPKijo4PC7dv4LghD4Nr+WpQEkPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCdkZ1K4Mz2Yg for ; Fri, 21 Nov 2025 15:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e57f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:03:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d8bfcacd12ab - main - vm_fault: add a verifier that the PG_ZERO page is indeed zeroed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8bfcacd12aba73188c44a157c707908e275825d Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:03:02 +0000 Message-Id: <69207f26.2e57f.6fa41ca0@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d8bfcacd12aba73188c44a157c707908e275825d commit d8bfcacd12aba73188c44a157c707908e275825d Author: Konstantin Belousov AuthorDate: 2025-11-21 08:34:51 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-21 15:02:21 +0000 vm_fault: add a verifier that the PG_ZERO page is indeed zeroed Compiled under INVARIANTS, activated by the same sysctl debug.vm_check_pg_zero. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53850 --- sys/vm/vm_fault.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 2e150b368d71..3bf16778d987 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -85,6 +85,8 @@ #include #include #include +#include +#include #include #include #include @@ -1220,6 +1222,24 @@ vm_fault_zerofill(struct faultstate *fs) if ((fs->m->flags & PG_ZERO) == 0) { pmap_zero_page(fs->m); } else { +#ifdef INVARIANTS + if (vm_check_pg_zero) { + struct sf_buf *sf; + unsigned long *p; + int i; + + sched_pin(); + sf = sf_buf_alloc(fs->m, SFB_CPUPRIVATE); + p = (unsigned long *)sf_buf_kva(sf); + for (i = 0; i < PAGE_SIZE / sizeof(*p); i++, p++) { + KASSERT(*p == 0, + ("zerocheck failed page %p PG_ZERO %d %jx", + fs->m, i, (uintmax_t)*p)); + } + sf_buf_free(sf); + sched_unpin(); + } +#endif VM_CNT_INC(v_ozfod); } VM_CNT_INC(v_zfod); From nobody Fri Nov 21 15:19:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5P24RWz6HLnR for ; Fri, 21 Nov 2025 15:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5P1B8Pz3nyD for ; Fri, 21 Nov 2025 15:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rrJ0KOkCiTnqEOzH48mF3STxjMmNeqa62TeKQFbknzc=; b=NvmySVhWI/lWXlR10kEwrXCxvS27xNDZuvEAwqvqCflQ0V0ejI/GnXsEoM74Mo/5l0uy2w kxvIzvjdptURBSR1r2Ugs75aCqSCJljQqNA+QlxygGyxDh6RGmrUTCvtIIDusAW6F52e2J WR7UvRDJAYQ6Nblp/KHrt4/deRP1VZIIUriunQ6Efsi4ia5EBpmIK/ThMs2RZBQ1ghbTt7 PUA7HhpfyJqvWdokPtpQDwIrCcHtbbY7MnwnZVEnPntIxh8jy3s2mh9oVoJGDtNTh8NMIK chKdOTFMlNMfXYesMmroxFOKGYRMtrZW+uxngDRlGbsBTesKrm07sFi4pP9arw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rrJ0KOkCiTnqEOzH48mF3STxjMmNeqa62TeKQFbknzc=; b=SkWHp0F2rqtTo28FJpE4BqIqctgOXcxW7+kM5gkj4Ro9iNp6vOnbXmHGwI4iDVF0TjQ4rB SBOOhBjhKr+2ogbWqs0I5NlIUrxIQqfaahRwfokZMMJp6r0EI/4GVYiZksLhiIeWBOO7s4 awYXFJCXPC90E9njo+YYMOlwUvfSVPttKKOn7kvEPW351fh2IOOf4HnF8UxjucAYqK1iI7 TE3Rnu/msvvwKzghSHu099bpWAzJfW8seVRDQXt6uB+4wY54eRVblGSXLjOUfO3KBIsQgv iIImbXaHWcMtqxXzGYJakjm82XEDMQXspah+vp+04R/Lab4Cnr5ckOcs4hKmFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738361; a=rsa-sha256; cv=none; b=DhR/HtxaF9UhR3brjJH5sStuGBsnx0DBwCza/y9+x89mvgrkgXqltrPOfq3YmwVxAAWLxQ K7IW4+ZywMaH+nf2IrcKdvqGZUTYoxTT+VtEMc7fjhoPJZW8OqGg0UvNBCMxv+iwfl4MzA 7Nm9/+dVKV0iSPC8R7jQpse5p10/Sn3oFKtsoi3Z+q+XaBkUjRa3pzjvZe4w2SvdD6+f8i Oajr0ezaikVgnmHakDebFIg+4EubikMSUeuYl3bGQLbv7Vawob/pY/+tWyh2ul/SamRmYU e++tyR5ZAOtXYnbo6m3Xh5yo2Os8HIA/Hcgmv2+3jegKAD0+fcbCpS20RLRpcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5P0j3Yz2g4 for ; Fri, 21 Nov 2025 15:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3053c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 90118a35a3ae - stable/13 - src.conf: Add a MK_ZFS_TESTS knob List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 90118a35a3ae469ca91a4c52b3623bf4d0c5212e Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:21 +0000 Message-Id: <692082f9.3053c.536f8829@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=90118a35a3ae469ca91a4c52b3623bf4d0c5212e commit 90118a35a3ae469ca91a4c52b3623bf4d0c5212e Author: Mark Johnston AuthorDate: 2024-09-07 14:36:28 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 src.conf: Add a MK_ZFS_TESTS knob The in-tree ZFS test suite is somewhat outdated and I see a number of failures there. I tend to think that we want to integrate the OpenZFS test suite somehow, replacing the legacy one, though it's also possible to run that as a separate test suite. In any case, if one wants to run the OpenZFS test suite separately, it's useful to be able to disable installation of the legacy ZFS test suite, so let's provide a src.conf option to do that. Reviewed by: asomers MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46476 (cherry picked from commit 24affded3d4ec5fafb6b22f773ec1e20d73b9b03) --- share/mk/src.opts.mk | 6 ++++++ tests/sys/cddl/Makefile | 2 +- tools/build/options/WITHOUT_ZFS_TESTS | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 811b0a493d50..d8872f93bfcd 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -192,6 +192,7 @@ __DEFAULT_YES_OPTIONS = \ WIRELESS \ WPA_SUPPLICANT_EAPOL \ ZFS \ + ZFS_TESTS \ LOADER_ZFS \ ZONEINFO @@ -459,6 +460,11 @@ MK_OFED_EXTRA:= no .if ${MK_TESTS} == "no" MK_DTRACE_TESTS:= no +MK_ZFS_TESTS:= no +.endif + +.if ${MK_ZFS} == "no" +MK_ZFS_TESTS:= no .endif .if ${MK_TESTS_SUPPORT} == "no" diff --git a/tests/sys/cddl/Makefile b/tests/sys/cddl/Makefile index 80c72ea5ec42..377faae73522 100644 --- a/tests/sys/cddl/Makefile +++ b/tests/sys/cddl/Makefile @@ -5,7 +5,7 @@ TESTSDIR= ${TESTSBASE}/sys/cddl TESTS_SUBDIRS+= ${_zfs} -.if ${MK_ZFS} != "no" +.if ${MK_ZFS_TESTS} != "no" _zfs= zfs .endif diff --git a/tools/build/options/WITHOUT_ZFS_TESTS b/tools/build/options/WITHOUT_ZFS_TESTS new file mode 100644 index 000000000000..ae2ac45ca0f3 --- /dev/null +++ b/tools/build/options/WITHOUT_ZFS_TESTS @@ -0,0 +1 @@ +Do not build and install the legacy ZFS test suite. From nobody Fri Nov 21 15:19:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5Q4wxZz6HLZq for ; Fri, 21 Nov 2025 15:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5Q2D6xz3nsB for ; Fri, 21 Nov 2025 15:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738362; 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=iKXSAXU9qGZTVJqSicaJD61Pg0fad8WAAlzsNt6Dsnk=; b=d4giRkGLNnkitQB5StTwN9EJqVBlROD3dqMQTjBk6KJdphl6ujhjsejSKU4qhsU9iaQVuF lKjGqCEHrgVYhfNM9T3Uy3d6JjlhQMAEgNs6wEby07oB8aAnYYDPA6Lay/hY1/JYDYjClI xSkoO6/Ajb4s7VoBeCvQLjkiRnQH8/mVf8eSY0YCHL7IaxUAkYT5hhkWvh5tvDreHCGc/A 5Nxbaz4PDCxmkyuUAGQsY3zNusCPCMaTSptCqsbCM0Z9bEGtiam/VP057ohGzoweYzt6mH j2J6f0bKXy2KiH47cTHDvUDe2285YufIlNOjJHVxRt6oWUEVsMwBJKOC6eRPYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738362; 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=iKXSAXU9qGZTVJqSicaJD61Pg0fad8WAAlzsNt6Dsnk=; b=P0vDT3oUIFbjqpa60lQJCJE+aVfP9AP+BjY8C7zH1aMkSQwgsNc6MdH6opsTLIKZRj3jO+ sGMjN/LG6QGggA8TF4cZGL3LGruV1LZFRBehqFZP7PI9eQD52YfTvQcifAPWLBUhxmqblF 7BE566qySEmH9RkBEiG4B5H3SqHh0/h/FjbE1Tv/4dQ66qmfCqbPB9J0AEEBRIjLtPLNX0 qRQzLAvCsYK1PKtfD9GdU/1PrBCd4LicX5rgR+1oUbG29DFKo89v8tWrwQCIuNp4XXaiYT w1AV6IX8HuTBUHHu/P1s0kDh80vlfpR6TEJ4b3sXN+H9rqiKSsgwlYAvOSBsbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738362; a=rsa-sha256; cv=none; b=KireFO+Bp53pdpv00oJCWFnnj62Pb4xQOpjWThcrSDOklhXm256clrKrZcy9EzsZJyi1uL Di/j9eCk2JnMI+3kHi1OeAU8Nan7Uw/mg70lq+LrwECn+i+nOt0rsTfUi/p2Y8R5KJIK9M UbseJqV3qhkQgQHn0r4L+Gde6qYx+UbxnLMtEqRagmcd8GlZHr/+fZ1/YhNfVQV9Q4usOU QeDQA1PlMaV49KmXfg/x8bNlJZjucTC02NSO6rYVVJoz88cv9Cuj1mcpVMcZcWBpkSRAWk yB36jKGG+048rtZqSXWTgoFM2gnL3pNKLKsDsJr5Q4auFLMy03+WUQq3chB4UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5Q1RYhz28G for ; Fri, 21 Nov 2025 15:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3142a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Mark Johnston Subject: git: 19b91b15530d - stable/13 - nullfs lookup: cn_flags is 64bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 19b91b15530d1ed0453ce073fb15d1f790ff85e4 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:22 +0000 Message-Id: <692082fa.3142a.48f26238@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=19b91b15530d1ed0453ce073fb15d1f790ff85e4 commit 19b91b15530d1ed0453ce073fb15d1f790ff85e4 Author: Konstantin Belousov AuthorDate: 2025-05-17 05:37:48 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 nullfs lookup: cn_flags is 64bit Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50390 (cherry picked from commit 89549c2348170921cc4270ac95bfabfd78d42739) --- sys/fs/nullfs/null_vnops.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 5daa302bedd1..f2c426d41f61 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -389,7 +389,7 @@ null_lookup(struct vop_lookup_args *ap) { struct componentname *cnp = ap->a_cnp; struct vnode *dvp = ap->a_dvp; - int flags = cnp->cn_flags; + uint64_t flags = cnp->cn_flags; struct vnode *vp, *ldvp, *lvp; struct mount *mp; int error; @@ -415,8 +415,8 @@ null_lookup(struct vop_lookup_args *ap) */ if ((ldvp->v_vflag & VV_ROOT) != 0 && (flags & ISDOTDOT) != 0) { KASSERT((dvp->v_vflag & VV_ROOT) == 0, - ("ldvp %p fl %#x dvp %p fl %#x flags %#x", - ldvp, ldvp->v_vflag, dvp, dvp->v_vflag, flags)); + ("ldvp %p fl %#x dvp %p fl %#x flags %#jx", + ldvp, ldvp->v_vflag, dvp, dvp->v_vflag, (uintmax_t)flags)); return (ENOENT); } From nobody Fri Nov 21 15:19:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5R48knz6HLRG for ; Fri, 21 Nov 2025 15:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5R2phZz3nn6 for ; Fri, 21 Nov 2025 15:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pvcrkeGgUykL95KZHXJf9Cl+iUCuP4Rk6loSk1jDiO4=; b=fPcTIyYeEvMPEwtMJR7luB4gi9rMmpaHeyFdVRjm6eJ5LmUEd4n3CkkZ5Q2m0JkARba4Ty gEKMTasjWtql1wL5rYVD97UcVhVAqZG9KIc4AE1w0JJZm0hdykz17ODPSJP1Xco4ey68Cf 4TzdelxMrg4YUf+wRDxcL3UyXAbwjIea8in7miR028o5w3+OaYylB3NPVTvqjGlE/U8EwT M5Nyh1CaDjcGExoUORbawloz9P9Cjqd7R1h8KY6mMF9/OS5YJlh1NuLkIcwfkk0FgSXu0u EVM5zUKdqr4NUr0cLu6WAFeAmRjz8BihaQLFKWUcaGBcMBMVRxrNOIzTCLsWWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pvcrkeGgUykL95KZHXJf9Cl+iUCuP4Rk6loSk1jDiO4=; b=wQ/i9cmVMyc2cS+Lk+yZvvuecBQ7ms4e3pwTJSm2jWJn1DibXLFIcLgR9uD0Lhg95uUSme 32k4hKWNc/f9RAO2LM7n5fnLOuac/0VtsXPt6e4nliVkgXuYeXK5+VHFkO5hDhaaUN/uR+ W14qiWgX0VMj4fUCTkDHfn7h2X/6FVSeJ05tphZVxQLGduqD5tp9XT67p0APGL1W5ebQCA awx4BYAQJi6wktTDuMSH1lvOrRZ8dDbcxqJzWpv+zdoZhmjZd1F//vRAmcpDyLWYIkLgVN Nwf0WZ69hdJr968fkrSrOgMVw0EmKl9UXiWDL5Tn2mF2N15oFkvvg5bfB/ipNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738363; a=rsa-sha256; cv=none; b=pEZmva/YXZUUXBVXsaUiOxA2LMDfL5dmbBAcTyIuOeFF4oJvQVfRLN9A3sXE9kbxVwEntR ng9s8drYeXJr6oaw23U5yD3abf9l0sRNvn152xCNkoOXxfFH5Ye5BRLR5DbzNX6ltkdSDr fV97ryAQJ10YE9BEXtd3DyZaM+iFX1oh2hN0Tn8BF4/WsgxRMlX8+wpSTwrFH9Omt8I092 Fy/VcVt3yODcHvxelY2YOIqpZ+22iiERO6W+TLM+FOWWQiGPtgXqUskqnS1nStS96YDLYu 5OhBnztBTPRpiAqAizKUl59G1/YWcedASF5MfoVQgJ7W2pfQslASYKNHAqmszw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5R2Jhkz2tP for ; Fri, 21 Nov 2025 15:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31c89 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 592de68e328b - stable/13 - namei: Make stackable filesystems check harder for jail roots List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 592de68e328b4edf8acdb2a0b0b66a813747b440 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:23 +0000 Message-Id: <692082fb.31c89.36c90828@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=592de68e328b4edf8acdb2a0b0b66a813747b440 commit 592de68e328b4edf8acdb2a0b0b66a813747b440 Author: Mark Johnston AuthorDate: 2025-05-23 12:52:24 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 namei: Make stackable filesystems check harder for jail roots Suppose a process has its cwd pointing to a nullfs directory, where the lower directory is also visible in the jail's filesystem namespace. Suppose that the lower directory vnode is moved out from under the nullfs mount. The nullfs vnode still shadows the lower vnode, and dotdot lookups relative to that directory will instantiate new nullfs vnodes outside of the nullfs mountpoint, effectively shadowing the lower filesystem. This phenomenon can be abused to escape a chroot, since the nullfs vnodes instantiated by these dotdot lookups defeat the root vnode check in vfs_lookup(), which uses vnode pointer equality to test for the process root. Fix this by extending nullfs and unionfs to perform the same check, exploiting the fact that the passed componentname is embedded in a nameidata structure to avoid changing the VOP_LOOKUP interface. That is, add a flag to indicate that containerof can be used to get the full nameidata structure, and perform the root vnode check on the lower vnode when performing a dotdot lookup. PR: 262180 Reviewed by: olce, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50418 (cherry picked from commit 7587f6d4840f8d363e457cddc14c184cf1fe7cc1) --- sys/fs/nullfs/null_vnops.c | 28 +++++++++++++++++---------- sys/fs/unionfs/union_vnops.c | 19 ++++++++++++++++++ sys/kern/vfs_cache.c | 11 +---------- sys/kern/vfs_lookup.c | 46 +++++++++++++++++++++++++++++++------------- sys/sys/namei.h | 5 ++++- 5 files changed, 75 insertions(+), 34 deletions(-) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index f2c426d41f61..90fe043f8b33 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -407,17 +407,25 @@ null_lookup(struct vop_lookup_args *ap) /* * Renames in the lower mounts might create an inconsistent - * configuration where lower vnode is moved out of the - * directory tree remounted by our null mount. Do not try to - * handle it fancy, just avoid VOP_LOOKUP() with DOTDOT name - * which cannot be handled by VOP, at least passing over lower - * root. + * configuration where lower vnode is moved out of the directory tree + * remounted by our null mount. + * + * Do not try to handle it fancy, just avoid VOP_LOOKUP() with DOTDOT + * name which cannot be handled by the VOP. */ - if ((ldvp->v_vflag & VV_ROOT) != 0 && (flags & ISDOTDOT) != 0) { - KASSERT((dvp->v_vflag & VV_ROOT) == 0, - ("ldvp %p fl %#x dvp %p fl %#x flags %#jx", - ldvp, ldvp->v_vflag, dvp, dvp->v_vflag, (uintmax_t)flags)); - return (ENOENT); + if ((flags & ISDOTDOT) != 0) { + struct nameidata *ndp; + + if ((ldvp->v_vflag & VV_ROOT) != 0) { + KASSERT((dvp->v_vflag & VV_ROOT) == 0, + ("ldvp %p fl %#x dvp %p fl %#x flags %#jx", + ldvp, ldvp->v_vflag, dvp, dvp->v_vflag, + (uintmax_t)flags)); + return (ENOENT); + } + ndp = lookup_nameidata(cnp); + if (ndp != NULL && lookup_isroot(ndp, ldvp)) + return (ENOENT); } /* diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index cd57a5cae459..153a5db323d9 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -76,6 +76,21 @@ KASSERT(((vp)->v_op == &unionfs_vnodeops), \ ("unionfs: it is not unionfs-vnode")) +static bool +unionfs_lookup_isroot(struct componentname *cnp, struct vnode *dvp) +{ + struct nameidata *ndp; + + if (dvp == NULL) + return (false); + if ((dvp->v_vflag & VV_ROOT) != 0) + return (true); + ndp = lookup_nameidata(cnp); + if (ndp == NULL) + return (false); + return (lookup_isroot(ndp, dvp)); +} + static int unionfs_lookup(struct vop_cachedlookup_args *ap) { @@ -124,6 +139,10 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) if (LOOKUP != nameiop && udvp == NULLVP) return (EROFS); + if (unionfs_lookup_isroot(cnp, udvp) || + unionfs_lookup_isroot(cnp, ldvp)) + return (ENOENT); + if (udvp != NULLVP) { dtmpvp = udvp; if (ldvp != NULLVP) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index aacbd43403e1..7f3a3c9532f1 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5129,7 +5129,6 @@ cache_fplookup_dotdot(struct cache_fpl *fpl) struct componentname *cnp; struct namecache *ncp; struct vnode *dvp; - struct prison *pr; u_char nc_flag; ndp = fpl->ndp; @@ -5141,15 +5140,7 @@ cache_fplookup_dotdot(struct cache_fpl *fpl) /* * XXX this is racy the same way regular lookup is */ - for (pr = cnp->cn_cred->cr_prison; pr != NULL; - pr = pr->pr_parent) - if (dvp == pr->pr_root) - break; - - if (dvp == ndp->ni_rootdir || - dvp == ndp->ni_topdir || - dvp == rootvnode || - pr != NULL) { + if (lookup_isroot(ndp, dvp)) { fpl->tvp = dvp; fpl->tvp_seqc = vn_seqc_read_any(dvp); if (seqc_in_modify(fpl->tvp_seqc)) { diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index cb013eb7ff83..dc8b7b92ccd4 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -530,12 +530,12 @@ namei(struct nameidata *ndp) cnp->cn_origflags = cnp->cn_flags; #endif ndp->ni_cnd.cn_cred = ndp->ni_cnd.cn_thread->td_ucred; - KASSERT(ndp->ni_resflags == 0, ("%s: garbage in ni_resflags: %x\n", + KASSERT(ndp->ni_resflags == 0, ("%s: garbage in ni_resflags: %x", __func__, ndp->ni_resflags)); KASSERT(cnp->cn_cred && td->td_proc, ("namei: bad cred/proc")); KASSERT((cnp->cn_flags & NAMEI_INTERNAL_FLAGS) == 0, - ("namei: unexpected flags: %" PRIx64 "\n", - cnp->cn_flags & NAMEI_INTERNAL_FLAGS)); + ("namei: unexpected flags: %#jx", + (uintmax_t)(cnp->cn_flags & NAMEI_INTERNAL_FLAGS))); if (cnp->cn_flags & NOCACHE) KASSERT(cnp->cn_nameiop != LOOKUP, ("%s: NOCACHE passed with LOOKUP", __func__)); @@ -761,6 +761,31 @@ needs_exclusive_leaf(struct mount *mp, int flags) _Static_assert(MAXNAMLEN == NAME_MAX, "MAXNAMLEN and NAME_MAX have different values"); + +struct nameidata * +lookup_nameidata(struct componentname *cnp) +{ + if ((cnp->cn_flags & NAMEILOOKUP) == 0) + return (NULL); + return (__containerof(cnp, struct nameidata, ni_cnd)); +} + +/* + * Would a dotdot lookup relative to dvp cause this lookup to cross a jail or + * chroot boundary? + */ +bool +lookup_isroot(struct nameidata *ndp, struct vnode *dvp) +{ + for (struct prison *pr = ndp->ni_cnd.cn_cred->cr_prison; pr != NULL; + pr = pr->pr_parent) { + if (dvp == pr->pr_root) + return (true); + } + return (dvp == ndp->ni_rootdir || dvp == ndp->ni_topdir || + dvp == rootvnode); +} + /* * Search a pathname. * This is a very central and rather complicated routine. @@ -808,7 +833,6 @@ lookup(struct nameidata *ndp) struct vnode *dp = NULL; /* the directory we are searching */ struct vnode *tdp; /* saved dp */ struct mount *mp; /* mount table entry */ - struct prison *pr; size_t prev_ni_pathlen; /* saved ndp->ni_pathlen */ int docache; /* == 0 do not cache last component */ int wantparent; /* 1 => wantparent or lockparent flag */ @@ -1008,15 +1032,11 @@ dirloop: goto bad; } for (;;) { - for (pr = cnp->cn_cred->cr_prison; pr != NULL; - pr = pr->pr_parent) - if (dp == pr->pr_root) - break; - bool isroot = dp == ndp->ni_rootdir || - dp == ndp->ni_topdir || dp == rootvnode || - pr != NULL; - if (isroot && (ndp->ni_lcf & - NI_LCF_STRICTRELATIVE) != 0) { + bool isroot; + + isroot = lookup_isroot(ndp, dp); + if (__predict_false(isroot && (ndp->ni_lcf & + NI_LCF_STRICTRELATIVE) != 0)) { error = ENOTCAPABLE; goto capdotdot; } diff --git a/sys/sys/namei.h b/sys/sys/namei.h index 1d0fd1c96449..053a64367ff9 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -154,6 +154,7 @@ int cache_fplookup(struct nameidata *ndp, enum cache_fpl_status *status, #define LOCKSHARED 0x0100 /* Shared lock leaf */ #define NOFOLLOW 0x0000 /* do not follow symbolic links (pseudo) */ #define RBENEATH 0x100000000ULL /* No escape, even tmp, from start dir */ +#define NAMEILOOKUP 0x200000000ULL /* cnp is embedded in nameidata */ #define MODMASK 0xf000001ffULL /* mask of operational modifiers */ /* @@ -254,7 +255,7 @@ do { \ NDINIT_PREFILL(_ndp); \ NDINIT_DBG(_ndp); \ _ndp->ni_cnd.cn_nameiop = op; \ - _ndp->ni_cnd.cn_flags = flags; \ + _ndp->ni_cnd.cn_flags = (flags) | NAMEILOOKUP; \ _ndp->ni_segflg = segflg; \ _ndp->ni_dirp = namep; \ _ndp->ni_dirfd = dirfd; \ @@ -312,6 +313,8 @@ void NDVALIDATE(struct nameidata *); int namei(struct nameidata *ndp); int lookup(struct nameidata *ndp); +bool lookup_isroot(struct nameidata *ndp, struct vnode *dvp); +struct nameidata *lookup_nameidata(struct componentname *cnp); int relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp); #endif From nobody Fri Nov 21 15:19:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5T0tn6z6HLRM for ; Fri, 21 Nov 2025 15:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5S3M97z3nnL for ; Fri, 21 Nov 2025 15:19:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ar0lbrlctygXlGJv7lfXH8MJrT19mCNHFyeB5L7aYxc=; b=qhGFjaaeSMnUuhFwIQ78HU/FJ/XGARzdw7Jic4rA4rEwsblsdRLaiy8dLqGsMIQnMDG8rk /nHYAwYTus9kV5m808CHU4sM+lcmlHOSZHXD7yxH0InkYcSlb15nD/Gmc6hOcaPgeUBM/x Yeb6VM9vzBTgoVwj8QDH/taE8XI+ktY+XuJbRwS1lG9Ej1u0N1tzyzO7GyM58/IUAyr4/N KvgfqEUb1btWCneP6MIVdjV5unxqjJ6YYBbCFn4k1Z2dmAyxpVPRMeB0TxJHc7o8opW1Ml QUhzpf1t1aSQsSv3ZaXfQ440osTJG8QdfalhZnMCNHSNYW4yypk9p8Xh0V8Mtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ar0lbrlctygXlGJv7lfXH8MJrT19mCNHFyeB5L7aYxc=; b=Y6kORoWitIXJMFUzrIiTYS3USlQ65Luql2uR86prWy6KQw5JFI97+7svxSK2AvKlrsysNW PZLac0u3XZ7mhAZgZCf9/4Uz2VYu/32p53eL8btO5rD0Ro8D3O3FUdC2j29fwBO5se0n3t vVW+YSiIvnrz041N0YpjAV38tueFxixFRF5bIFXpSpDAFB9z0ncgwKffq8oLXy8myoRAaJ dAd0bRmTOnBAk8LSZ1L8Ega6nDVELvPrMSMVUoZRT6UssK7y6KZ6WI6wnEZtfATiRPHpJs DqnAuQqe7QKTq8ruwIbsv/CMJ1cfhbDS57Hhri0TEm10rIKTjtrankmOEHuLhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738364; a=rsa-sha256; cv=none; b=Z0so8o1Mv2g/PE/U7G3OpRbjN44VBBJeD0PnIImWb6MwqosBsfDRTVmhxI8DZAfDV+3uGH kuDplb1013Fl5eh5JPblxeDHTEgGxFxvk1sS6JtbQv8etPMFl4kjRGHH0Xe1Dxl5p4GlMT ZxpqV816ac86koqTKGzgCURqMAwIZcQvn322p8uq/Y+aLTem5c+qP+6h4qZzgvK2jZ1CuH S/MJLc3JpgCirK5JYffSTcYuxopUm3eNo35iOKVcPH+BzIJDWuYlNSMMMZP236JD0iu6M/ N26CY2TzdmvDN503u6hLRRi0Zw0ZiPCqMV01MhGrV2AAYfYvFukrqDHg8o1Ydg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5S2vH8z28J for ; Fri, 21 Nov 2025 15:19:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2fe5c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8c63056ea8a3 - stable/13 - vfs: Don't clobber namei flags in vn_open_cred() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8c63056ea8a34f7ac9cbbfcf6d37c303e1e00a76 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:24 +0000 Message-Id: <692082fc.2fe5c.5d8afaaf@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8c63056ea8a34f7ac9cbbfcf6d37c303e1e00a76 commit 8c63056ea8a34f7ac9cbbfcf6d37c303e1e00a76 Author: Mark Johnston AuthorDate: 2025-05-28 13:35:24 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 vfs: Don't clobber namei flags in vn_open_cred() Otherwise NAMEILOOKUP is cleared. More generally it seems quite surprising that the flags set by vn_open_cred() callers are not automatically preserved. Modify open2nameif() such that it takes already-set namei flags into account. Reviewed by: olce, kib Fixes: 7587f6d4840f ("namei: Make stackable filesystems check harder for jail roots") Differential Revision: https://reviews.freebsd.org/D50531 (cherry picked from commit e05e33041c252dc236939683c01ca4b7b083562c) --- sys/kern/vfs_vnops.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 6591b543ddea..e685d581733b 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -195,21 +195,26 @@ vn_open(struct nameidata *ndp, int *flagp, int cmode, struct file *fp) } static uint64_t -open2nameif(int fmode, u_int vn_open_flags) +open2nameif(int fmode, u_int vn_open_flags, uint64_t cn_flags) { uint64_t res; - res = ISOPEN | LOCKLEAF; + res = ISOPEN | LOCKLEAF | cn_flags; if ((fmode & O_RESOLVE_BENEATH) != 0) res |= RBENEATH; if ((fmode & O_EMPTY_PATH) != 0) res |= EMPTYPATH; + if ((fmode & O_NOFOLLOW) != 0) + res &= ~FOLLOW; if ((vn_open_flags & VN_OPEN_NOAUDIT) == 0) res |= AUDITVNODE1; + else + res &= ~AUDITVNODE1; if ((vn_open_flags & VN_OPEN_NOCAPCHECK) != 0) res |= NOCAPCHECK; if ((vn_open_flags & VN_OPEN_WANTIOCTLCAPS) != 0) res |= WANTIOCTLCAPS; + return (res); } @@ -242,7 +247,9 @@ restart: return (EINVAL); else if ((fmode & (O_CREAT | O_DIRECTORY)) == O_CREAT) { ndp->ni_cnd.cn_nameiop = CREATE; - ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags); + ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags, + ndp->ni_cnd.cn_flags); + /* * Set NOCACHE to avoid flushing the cache when * rolling in many files at once. @@ -251,8 +258,8 @@ restart: * exist despite NOCACHE. */ ndp->ni_cnd.cn_flags |= LOCKPARENT | NOCACHE | NC_KEEPPOSENTRY; - if ((fmode & O_EXCL) == 0 && (fmode & O_NOFOLLOW) == 0) - ndp->ni_cnd.cn_flags |= FOLLOW; + if ((fmode & O_EXCL) != 0) + ndp->ni_cnd.cn_flags &= ~FOLLOW; if ((vn_open_flags & VN_OPEN_INVFS) == 0) bwillwrite(); if ((error = namei(ndp)) != 0) @@ -320,9 +327,8 @@ restart: } } else { ndp->ni_cnd.cn_nameiop = LOOKUP; - ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags); - ndp->ni_cnd.cn_flags |= (fmode & O_NOFOLLOW) != 0 ? NOFOLLOW : - FOLLOW; + ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags, + ndp->ni_cnd.cn_flags); if ((fmode & FWRITE) == 0) ndp->ni_cnd.cn_flags |= LOCKSHARED; if ((error = namei(ndp)) != 0) From nobody Fri Nov 21 15:19:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5T6Ptnz6HLb3 for ; Fri, 21 Nov 2025 15:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5T4887z3nnY for ; Fri, 21 Nov 2025 15:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+yNfA41xPw+RvnMX9IC1To+6iKfSRP4m55aXNATs4kQ=; b=kTNu0H6sRaHnktkfxxIUsm2uTiLGbcO9xrbPcXwLAhioGfV0FGo15vTXYy9KwPxTYI5yHI ItuMdKsoLH8wdOwF+HwNJEer3K8tJFpCG9ftnZoZ/HuJWVySXTlBU3bBKZsdpTvDYOPC80 Fyve5mGfbUqSedwyBhV7L4v9Vg5F5HBQ7+CoM/flPa7yXdpkk4l7LTVojvxG2EZnnR9RLU dcpLo8/MBsO89S1yImxtO/dtBn++vZ7Kfz/IlRMik6wihYZH1Qqzo8q6lp/5WH7wUk/nx2 vkb51JPVuSuTpH7eeasxHOTgDDMunCw8WfGQK3cL28PtMjsdgNw9V5eD+2ioRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+yNfA41xPw+RvnMX9IC1To+6iKfSRP4m55aXNATs4kQ=; b=sR6qkv2vIN4K5CgGljzmc6wYryVO8FC97B51SNyi9/UDvnEk8JVq1H6hcJwUHfRjR3BwKd OI59OEetlJaljvwB9+UkGORMYjegx32QhrxS5lG7WMuZIpsSg8I1amuq0iU4IVYpcLOAkY ukXPR+TNzIPDwwm1Odky8lI4l73wIyk26m9cG4n1LoBM0NiQL0u49WrtLmJOaKKErHAbe1 W3K8z7C2JVulR+4GgB7oxIlkRAwjQWxi3LgyZAr6fSStY8a9/A2bKxBelePSXG+2zAFSyz oG1lDr3Qs6NHmhw25xdmXWrxCXFXxtm+o2INYSBzY5xoVNWHjfrgZO0dYpr8Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738365; a=rsa-sha256; cv=none; b=YNVrOACme9Gbqj/Ua4MdQInExO/6Kd3x5FpQHTA2iIGyKJw927ZuQaX5tCtEWbzvk2lwpq LO+KITJwClYOvtEh9DBR5373e5ZdDN1mxWEWVl8fL0zPYfzSLCZvLuQN1boPegE79Tm9hb aQ8cRBTij5VeDhyQ0+bOZuQlhORGlBfai09+zYdeZwKnNWGjDdbqaqScVyPCg/iXIOERY/ TUkNHAFQrWkhljYwRt8all19cL6PxTNi+26u/BsJ6B7fTLci516q3kpLeKb6wAQL1euBoV 7jhdTyEAG1wuA/XJ+cs+DB73dqpvrRU8rJv5ar4LPzmFdqP0/WRx/cplTY9vPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5T3hLlz2tQ for ; Fri, 21 Nov 2025 15:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 322de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b55b92729641 - stable/13 - tests: Add a regression test for commit 7587f6d4840f8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b55b92729641e05a05cc8526b08bd7ac3dfcb4fc Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:25 +0000 Message-Id: <692082fd.322de.408d2020@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b55b92729641e05a05cc8526b08bd7ac3dfcb4fc commit b55b92729641e05a05cc8526b08bd7ac3dfcb4fc Author: Mark Johnston AuthorDate: 2025-05-28 15:28:36 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 tests: Add a regression test for commit 7587f6d4840f8 Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50533 (cherry picked from commit a5dac34f6e98c47bd7cb1946e39cc45432e167a8) --- tests/sys/kern/Makefile | 5 ++ tests/sys/kern/jail_lookup_root.c | 133 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 74c987e55734..f862e41d1d72 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -13,6 +13,7 @@ ATF_TESTS_C+= basic_signal ATF_TESTS_C+= kern_copyin ATF_TESTS_C+= kern_descrip_test ATF_TESTS_C+= fdgrowtable_test +ATF_TESTS_C+= jail_lookup_root ATF_TESTS_C+= kill_zombie .if ${MK_OPENSSL} != "no" ATF_TESTS_C+= ktls_test @@ -58,6 +59,10 @@ PROGS+= coredump_phnum_helper PROGS+= pdeathsig_helper PROGS+= sendfile_helper +.PATH: ${SRCTOP}/sbin/mount +SRCS.jail_lookup_root+= jail_lookup_root.c getmntopts.c +CFLAGS.jail_lookup_root+= -I${SRCTOP}/sbin/mount +LIBADD.jail_lookup_root+= jail util CFLAGS.sys_getrandom+= -I${SRCTOP}/sys/contrib/zstd/lib LIBADD.sys_getrandom+= zstd LIBADD.sys_getrandom+= c diff --git a/tests/sys/kern/jail_lookup_root.c b/tests/sys/kern/jail_lookup_root.c new file mode 100644 index 000000000000..34e89f4aea2b --- /dev/null +++ b/tests/sys/kern/jail_lookup_root.c @@ -0,0 +1,133 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Mark Johnston + */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +static void +mkdir_checked(const char *dir, mode_t mode) +{ + int error; + + error = mkdir(dir, mode); + ATF_REQUIRE_MSG(error == 0 || errno == EEXIST, + "mkdir %s: %s", dir, strerror(errno)); +} + +static void __unused +mount_nullfs(const char *dir, const char *target) +{ + struct iovec *iov; + char errmsg[1024]; + int error, iovlen; + + iov = NULL; + iovlen = 0; + + build_iovec(&iov, &iovlen, __DECONST(char *, "fstype"), + __DECONST(char *, "nullfs"), (size_t)-1); + build_iovec(&iov, &iovlen, __DECONST(char *, "fspath"), + __DECONST(char *, target), (size_t)-1); + build_iovec(&iov, &iovlen, __DECONST(char *, "from"), + __DECONST(char *, dir), (size_t)-1); + build_iovec(&iov, &iovlen, __DECONST(char *, "errmsg"), + errmsg, sizeof(errmsg)); + + errmsg[0] = '\0'; + error = nmount(iov, iovlen, 0); + ATF_REQUIRE_MSG(error == 0, "nmount: %s", + errmsg[0] != '\0' ? errmsg : strerror(errno)); + + free_iovec(&iov, &iovlen); +} + +ATF_TC_WITH_CLEANUP(jail_root); +ATF_TC_HEAD(jail_root, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(jail_root, tc) +{ + int error, fd, jid; + + mkdir_checked("./root", 0755); + mkdir_checked("./root/a", 0755); + mkdir_checked("./root/b", 0755); + mkdir_checked("./root/a/c", 0755); + + jid = jail_setv(JAIL_CREATE | JAIL_ATTACH, + "name", "nullfs_jail_root_test", + "allow.mount", "true", + "allow.mount.nullfs", "true", + "enforce_statfs", "1", + "path", "./root", + "persist", NULL, + NULL); + ATF_REQUIRE_MSG(jid >= 0, "jail_setv: %s", jail_errmsg); + + mount_nullfs("/a", "/b"); + + error = chdir("/b/c"); + ATF_REQUIRE(error == 0); + + error = rename("/a/c", "/c"); + ATF_REQUIRE(error == 0); + + /* Descending to the jail root should be ok. */ + error = chdir(".."); + ATF_REQUIRE(error == 0); + + /* Going beyond the root will trigger an error. */ + error = chdir(".."); + ATF_REQUIRE_ERRNO(ENOENT, error != 0); + fd = open("..", O_RDONLY | O_DIRECTORY); + ATF_REQUIRE_ERRNO(ENOENT, fd < 0); +} +ATF_TC_CLEANUP(jail_root, tc) +{ + struct statfs fs; + fsid_t fsid; + int error, jid; + + error = statfs("./root/b", &fs); + if (error != 0) + err(1, "statfs ./b"); + fsid = fs.f_fsid; + error = statfs("./root", &fs); + if (error != 0) + err(1, "statfs ./root"); + if (fsid.val[0] != fs.f_fsid.val[0] || + fsid.val[1] != fs.f_fsid.val[1]) { + error = unmount("./root/b", 0); + if (error != 0) + err(1, "unmount ./root/b"); + } + + jid = jail_getid("nullfs_jail_root_test"); + if (jid >= 0) { + error = jail_remove(jid); + if (error != 0) + err(1, "jail_remove"); + } +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, jail_root); + return (atf_no_error()); +} From nobody Fri Nov 21 15:19:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5V6Nnzz6HLcg for ; Fri, 21 Nov 2025 15:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5V4rL7z3nkw for ; Fri, 21 Nov 2025 15:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nPODVS1Bj2JovnLnFOGLs2i9zys1GGJl1aMh/HNaBiw=; b=aHQfjd2dFOImhHedNINi9VDNF9J+6sZ/E59To04nGbpK4XseO949Bt+rHgpJclMhwnG+S+ 8+l3nVwAKFhWNH0/rEfntspIxCAXCswjIF3IC/ufkEgS6DDF9o26+Zj31NVt7JffMBGq6Q tIATOFoOUbc3L89HCRhsg5NX6+myA8VzLpgiBe+0HMhR8m+0vRmWTDPckja/IGY7Pb1wVD LaR+tDvcZgJJcNsGZUEja97VMwLffp2009ixiNqwPvekwwgpq2mRQJ1nQlLQjTWbun+GrO XRneiur4NRWyTpEkuJ4NLbFzGMc6hzs18TbrcJ8OBUJpa+ckc7Yz3uTkLXl/Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nPODVS1Bj2JovnLnFOGLs2i9zys1GGJl1aMh/HNaBiw=; b=TWK+xgqvwP3er0aaMmY8YbiCALctPixMdxQzC/3cTDEytSZujrgRsgL9sCZh6jeuNEjx63 hxTGJ+qglMb/MMDLZLnJBE7G0BBRogp7M5HbYvJRTEkmwCPOAorGPbluDGEXXQBNMrVcZs ihxBa6grPl65a7Lr7pbaQlt6wuP1GtvWCYVZmIM5pn7v/jkH662EeUEjqRoA6NwFxUONEZ AXh8buMBwRlwLVWxm8pX1V/9IRDqXKg5P2iNCkUa8fWZUcxEFLZiKweKvuYOk8TG8izsKx s6/CgqV/4uD18z6S7tOW2tj9WW+tELDzVPljpyEVhxvYM+uiOa9s1WuYbZoouQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738366; a=rsa-sha256; cv=none; b=yutOLijsoHRG8/rApMY+5qv05wdBtshCPyYVJNBQKYXtDw5snYP8bcLAgJwenW9KaCDU4x pvQpSXkcdVYmdiJyb51tPybI+7ZOUk8dcnlFqyAnIj8ELWR64QdApcKCOy8C0LoAkUoCQ5 3i4u4rVaWc0lO1Y7U/1Zbe6YR4IC+CAjghjdbvksKZe3VHa/SjcKf84xWYepfTHczPZ65U JXVuRoZHmRs2KWFP3Fo/4lc4z3sYJWLEqDS+TBoqoq21OtnJTDVNvAKdPAsCep/q0kMCZv XkK7oT48voSli7T0kcXZ1lODZTJfXlzZdBXmB3aCpIgmDZrlcNMBke4DmSxIfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5V4681z2F6 for ; Fri, 21 Nov 2025 15:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 322e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4e31059f80d1 - stable/13 - namei: Remove a now-unused variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4e31059f80d162a1f496f25ef297268d47614dd2 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:26 +0000 Message-Id: <692082fe.322e2.163035c0@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4e31059f80d162a1f496f25ef297268d47614dd2 commit 4e31059f80d162a1f496f25ef297268d47614dd2 Author: Mark Johnston AuthorDate: 2025-05-23 15:35:05 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 namei: Remove a now-unused variable Reported by: bapt Fixes: 7587f6d4840f ("namei: Make stackable filesystems check harder for jail roots") (cherry picked from commit 14ec281a09d7818def2083ef0c3e28f8101f4268) --- sys/kern/vfs_cache.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 7f3a3c9532f1..211363bbc43b 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5126,16 +5126,14 @@ static int __noinline cache_fplookup_dotdot(struct cache_fpl *fpl) { struct nameidata *ndp; - struct componentname *cnp; struct namecache *ncp; struct vnode *dvp; u_char nc_flag; ndp = fpl->ndp; - cnp = fpl->cnp; dvp = fpl->dvp; - MPASS(cache_fpl_isdotdot(cnp)); + MPASS(cache_fpl_isdotdot(fpl->cnp)); /* * XXX this is racy the same way regular lookup is From nobody Fri Nov 21 15:19:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5X11SPz6HLRg for ; Fri, 21 Nov 2025 15:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5W5PKjz3p0K for ; Fri, 21 Nov 2025 15:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MqNA2L+bFK6j3cHgqhXZYJqlmeN1Q1MPbEx/oHlxGog=; b=gW+qAkUvFaIlIjukofElsDDOISR5nfgnF22n/JqO/hlmpBPlAlgi7l8HV1G1aRgvsjB3/J 0gPG76Fw1d0j0nDmhp/xX+C8Cf9x/DwtJZSK8cvIz10bJD8gFSU12TzXNrQWffxOFeV+d+ yX0XyeQCd3hJv4RO4aGJPvDac8eZrRc7UI+07ngQdyDEE2njBHfhx1B9now0z82Lhn/Zaf JtmnBKQZOqIQeMLwOoSEmE48ndqnsimLWesoQUWW6HGdtgNumHJ/L4NXY+CgnUcFdYBkzW XvaRpOvMffm3H1cviUzPIRZi784FLMVuhTOGzssCkhNmCWGB93aw3Ysu01knvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MqNA2L+bFK6j3cHgqhXZYJqlmeN1Q1MPbEx/oHlxGog=; b=FV06Pl0NJmlIc3wFif724vjqyvrnnwuIm7Xu9Qs1eVGwoPBEoWpDVhYwlPNB43v7RTl5Gr e8QlUl9gMLSzq0SlqyBb5VNUaY/0uIbFhaaqPEl9qrVDWp3hfUzYqADRygwzTAWs3JFmHI vNtZtKAH7dhtO7NlVM/rzgGPc1ADy0IVYGZ8H1EIL8Wm7sRQhAVc4x80s1uvjEHaRTk4FZ /dSvsHdny4b3m+lOMaAJUUPHT3m1rZ6q3fkXn4yoJQIT6PIB8WImSBEVrYhnw6z6LtCPBj lK7DKcyWlPuGlEMNNF693vjFuvNBr/XHfNeE7rtvL0Uaq4Plr6n052rCN/W0FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738367; a=rsa-sha256; cv=none; b=QUmlvQtIJFUzzOXfX8YjYceId15ST/CDGoWP0L5aSYgU1fvJxijU8welheNlLPk5Ookq8E e95bK/RYkb28Pg9No1ZH2ETs4dp5l7QuQSkN7eFrmgFznnzzwp+N0qQLIYaQeMBsasLK3I ALAEOFEyMLvAFBWZ9snqSktK32+D55kAOTCzICZBu3Wh8wpqwEggLVch0ThHz/Bo0HV5tq DrjsGtdjJOydg61FPxadFM9SYy+wEaPj7A68VUZluhYcRZ00OoX+PzzsX9gEAoYNeEg2ZH dGe9aTwz2NAoinPN6auuhLzUC/6XAbfiV5PNhuRAGClSgEgZgIvutCpvf99h2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5W4yDfz28K for ; Fri, 21 Nov 2025 15:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31c54 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: adb8c1a9d09d - stable/13 - vfs cache: Add NAMEILOOKUP to the whitelist of fastpath lookup flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: adb8c1a9d09d5a29167b845f423e989bfdba46ab Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:27 +0000 Message-Id: <692082ff.31c54.211dce24@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=adb8c1a9d09d5a29167b845f423e989bfdba46ab commit adb8c1a9d09d5a29167b845f423e989bfdba46ab Author: Mark Johnston AuthorDate: 2025-05-27 13:27:49 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 vfs cache: Add NAMEILOOKUP to the whitelist of fastpath lookup flags Otherwise the lockless name lookup path is inadvertently disabled since NAMEILOOKUP isn't recognized. Reviewed by: olce, kib Fixes: 7587f6d4840f ("namei: Make stackable filesystems check harder for jail roots") Differential Revision: https://reviews.freebsd.org/D50532 (cherry picked from commit f4158953007f557061d91f99d2374d48d8376cc6) --- sys/kern/vfs_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 211363bbc43b..cdd882e09075 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -4292,7 +4292,7 @@ cache_fpl_terminated(struct cache_fpl *fpl) (NC_NOMAKEENTRY | NC_KEEPPOSENTRY | LOCKLEAF | LOCKPARENT | WANTPARENT | \ FAILIFEXISTS | FOLLOW | EMPTYPATH | LOCKSHARED | SAVENAME | SAVESTART | \ WILLBEDIR | ISOPEN | NOMACCHECK | AUDITVNODE1 | AUDITVNODE2 | NOCAPCHECK | \ - WANTIOCTLCAPS) + WANTIOCTLCAPS | NAMEILOOKUP) #define CACHE_FPL_INTERNAL_CN_FLAGS \ (ISDOTDOT | MAKEENTRY | ISLASTCN) From nobody Fri Nov 21 15:19:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5Y0ypyz6HLmB for ; Fri, 21 Nov 2025 15:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5X6DXZz3nwX for ; Fri, 21 Nov 2025 15:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oTcm4UNTsV7qNDgHDWYqTLWUp45gthHj1YGC1u4zia4=; b=nxSxzjk6B048Ed43p8l7XOKrbc0IZXsZnLbO8emf30O2P4QhzH8+FEe0Wmycr2YhmmOXTg xCEaDz1JRgQ+jgFdWtvC2MM8EOSCCks15kCOhx0xRG1MIZSpA++hp20r3zbDub+7NeOYqo WE9/bHGZRXMYHJqISlVJQF0MkRAZszdjSpNXdcicgb64KPgrw4ZdYAim33pfSWPFOd/4Hw l25fC2esyM8MTqxlRfmqXdqpDdwlGDE2qnO2I8Qnuq0L085fbENsbDfWSVLFB9iiQ/wV3z 3aOPhfHUFYpOKMPxUh31PF/NvTUx7Vd3A6n0mRCZqSp3mUvdtLks9c9hDTyxUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oTcm4UNTsV7qNDgHDWYqTLWUp45gthHj1YGC1u4zia4=; b=rYU1TSuB1eJtokKNUEcJ6OG+7s3/Gqocqmr39eJdIELTLUORUA6zFhao71Jt14UR0VIwNw lQztWXgDIsPcjcUx7suGeM/a+AVCTFJQX6d0RE5GLqAfvls6PVDzu9+OM6V1ipNLXVrq6q wgph6S2HG7Iueb+SR1+WHlJvGc9rMhkdB52hhTdYRSbYR3qujaAU+UZ7d5BZ1poU1sg6xn bSeZN67cNaZgaKkDNWEifUzL1R7VVvkVxbYh9bZnsj1rI/FZpELS0jXwYq/ylk1qBW1Fmf Fez3kxrezviL67S+J3nl1NqrF8zCfNqQvOq/2KnVOKIhLvhWJgOfol46u+nzSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738368; a=rsa-sha256; cv=none; b=n9fJFLo6Y37aQ/q7UdmAMep2vqLzpsnKMq5KtgunFzBy/4Q+bNyAQZzEDgif0aXn8ydXrj /3hVGBlownc29f6z7sRtVKmwQWFBnxO/EBUeb4EtdkTEw5XMCaQeHeF7g+I7KHCkvzN1sC hEfqXhOnoVn+dbqGifYSEESEfr9L/RwAkuHCx7xNq5RfBYlCZAuS7uXlUBvR5Mx/ZXRPyu 0BicaeYdl8++kEfaSbX/VK4F8qITLedjhRBweqLta2ly7HpxA6stPH45ihyGZv49sOoUHp tdI9kxFeinJ85yTZkbzdwc8+WOgSxdy9tDjYGfyTkWf/W9VWBlzE9rEJJx2mIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5X5q4rz2pB for ; Fri, 21 Nov 2025 15:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31dc0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 503ab844cece - stable/13 - namei: Fix cn_flags width in various places List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 503ab844ceced16c7e8736c0caa586ff0bab5f0e Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:28 +0000 Message-Id: <69208300.31dc0.5c4b1fc4@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=503ab844ceced16c7e8736c0caa586ff0bab5f0e commit 503ab844ceced16c7e8736c0caa586ff0bab5f0e Author: Mark Johnston AuthorDate: 2025-05-27 13:29:14 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 namei: Fix cn_flags width in various places This truncation is mostly harmless today, but fix it anyway to avoid pain later down the road. Reviewed by: olce, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50417 (cherry picked from commit 0d224af399a66f00a5b33e5512fc018062cabf1d) --- sys/fs/cd9660/cd9660_lookup.c | 2 +- sys/fs/fuse/fuse_vnops.c | 11 +++++------ sys/fs/smbfs/smbfs_vnops.c | 2 +- sys/fs/unionfs/union_vnops.c | 3 ++- sys/kern/uipc_mqueue.c | 3 ++- sys/kern/vfs_cache.c | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c index 961745f45afc..be594d46cf40 100644 --- a/sys/fs/cd9660/cd9660_lookup.c +++ b/sys/fs/cd9660/cd9660_lookup.c @@ -134,7 +134,7 @@ cd9660_lookup(ap) char *name; struct vnode **vpp = ap->a_vpp; struct componentname *cnp = ap->a_cnp; - int flags = cnp->cn_flags; + uint64_t flags = cnp->cn_flags; int nameiop = cnp->cn_nameiop; ep2 = ep = NULL; diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 79317e4e4cd2..d5166559fbdc 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -1433,9 +1433,9 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) struct timespec now; int nameiop = cnp->cn_nameiop; - int flags = cnp->cn_flags; - int wantparent = flags & (LOCKPARENT | WANTPARENT); - int islastcn = flags & ISLASTCN; + bool wantparent = cnp->cn_flags & (LOCKPARENT | WANTPARENT); + bool isdotdot = cnp->cn_flags & ISDOTDOT; + bool islastcn = cnp->cn_flags & ISLASTCN; struct mount *mp = vnode_mount(dvp); struct fuse_data *data = fuse_get_mpdata(mp); int default_permissions = data->dataflags & FSESS_DEFAULT_PERMISSIONS; @@ -1468,8 +1468,7 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) return err; is_dot = cnp->cn_namelen == 1 && *(cnp->cn_nameptr) == '.'; - if ((flags & ISDOTDOT) && !(data->dataflags & FSESS_EXPORT_SUPPORT)) - { + if (isdotdot && !(data->dataflags & FSESS_EXPORT_SUPPORT)) { if (!(VTOFUD(dvp)->flag & FN_PARENT_NID)) { /* * Since the file system doesn't support ".." lookups, @@ -1590,7 +1589,7 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) } } else { /* Entry was found */ - if (flags & ISDOTDOT) { + if (isdotdot) { struct fuse_lookup_alloc_arg flaa; flaa.nid = nid; diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c index b03d39a65191..3c86b5a6e3f1 100644 --- a/sys/fs/smbfs/smbfs_vnops.c +++ b/sys/fs/smbfs/smbfs_vnops.c @@ -1044,7 +1044,7 @@ smbfs_lookup(struct vop_lookup_args *ap) struct smbfattr fattr, *fap; struct smb_cred *scred; char *name = cnp->cn_nameptr; - int flags = cnp->cn_flags; + uint64_t flags = cnp->cn_flags; int nameiop = cnp->cn_nameiop; int nmlen = cnp->cn_namelen; int error, islastcn, isdot; diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 153a5db323d9..aaff77dcb13d 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -97,8 +97,9 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) int iswhiteout; int lockflag; int error , uerror, lerror; + uint64_t cnflags; u_long nameiop; - u_long cnflags, cnflagsbk; + u_long cnflagsbk; struct unionfs_node *dunp; struct vnode *dvp, *udvp, *ldvp, *vp, *uvp, *lvp, *dtmpvp; struct vattr va; diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 14fbe9a7f281..926a9d311b67 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -846,7 +846,8 @@ mqfs_lookupx(struct vop_cachedlookup_args *ap) struct mqfs_node *pd; struct mqfs_node *pn; struct mqfs_info *mqfs; - int nameiop, flags, error, namelen; + uint64_t flags; + int nameiop, error, namelen; char *pname; struct thread *td; diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index cdd882e09075..e6cf39c09f19 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -4006,7 +4006,7 @@ SYSCTL_PROC(_vfs_cache_param, OID_AUTO, fast_lookup, CTLTYPE_INT|CTLFLAG_RW|CTLF */ struct nameidata_outer { size_t ni_pathlen; - int cn_flags; + uint64_t cn_flags; }; struct nameidata_saved { From nobody Fri Nov 21 15:39:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCfY1086Jz6HMyv for ; Fri, 21 Nov 2025 15:39: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCfY06KZgz3svS for ; Fri, 21 Nov 2025 15:39:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763739588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HaS0TqQdmTGF9jeDsq/EfcvsB9CR4btfdpwN2uzr5zo=; b=KXQtKoV4OpHMjugcfYhryPDxVx1vWx2Npb2tjK6AxCkWx8/I2D3pWM9EyJT+hmPNtrRZpn uexKnvJmHpCWKVIH76VN/dEYRUJtJ9JBWu0nyqahf7XMsd0ro9FezvyUBtkhXi6HKXlcmC w0YxX6Fsn7OKJaRJ7FzP0TDc8NT3Vwpg4K2zjIisqgc7Wxb1230cEhXd34EAhUQTysJ8dr 7JNKygvbZf7VsudGXZ4kOyGoRygTv4qcZ2TSY285MQO7+XrBbiyO5NEwVKjpPtmH4ShJUh KLoM6yIhhkObEvCxcZNEmEwdYyD3pO5TLVSJ35dY2CI2eY8tscMwQ68V/IVMQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763739588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HaS0TqQdmTGF9jeDsq/EfcvsB9CR4btfdpwN2uzr5zo=; b=TFCcjUOlFdlsY7YA8s179WkGP+1OKnAFj6gCocUO124spCOUIhOAFhRKBCZZwcOaa7wSl6 gpYIewQlinE5978CUnNQjd9fWd9y0abI2xA2z7hLdctwNt90SGKdQHu1t3JaN8YCV5M3Te N8Shb79lu5zKeHMRgFSzQYm6Sjd9/9JtgLXwyVgahe1V8Rmtgsb+8w+2NnGaUmx75Gt0C6 FkA2pX5rIFhhfzWv2eC2Xj9UGvwgZRiGm2bnjOCXmlNyQ+ibY5y1C2/6yMtFxx/4h1SHJW GJxXkF/ngsJ0NHKubzp/fXMgTKXHln3xTFBTAi+1FNBaDChe76MxWx8LfEbLcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763739588; a=rsa-sha256; cv=none; b=oZxsmzf/2qOh/3lMxpTOhkBjjrhf+lpZEM8qAThRhfRBwRi3/FDPI4RAD2JZb/PLqHN1Dz yBk21UCdbPe2AQ1t+SjU9cnLZo+yXBBwoG1uMk8RzN8MKAO/cz9PdUGbU6BlZb+WrYCqEJ RNLZkdwSsXE5Fou8v4fllqkW9wsSkOeiJC1KZTAT2+i4RfpUO9crCJ3L9eQQ4n70vpzvZk rqZCXP7mPeJshJW9KLsT3P1qUUxKudoQN8Ic3/5sg0UzyWrbs0CNpitVEdz/jEihyU+2dL b500vanTSJpzUJbBfPsBiAbbzulXhUG6DWosxaTr5dZ29uT9JLJcKSdCrWi4bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCfY04x80z3F5 for ; Fri, 21 Nov 2025 15:39:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 334a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:39:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 7dedc3c21436 - main - pf: fix another endpoint-independent crash List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7dedc3c21436bb5a1220f8901992d2772a163f78 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:39:48 +0000 Message-Id: <692087c4.334a7.4ddf433f@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7dedc3c21436bb5a1220f8901992d2772a163f78 commit 7dedc3c21436bb5a1220f8901992d2772a163f78 Author: Kristof Provost AuthorDate: 2025-11-21 09:03:36 +0000 Commit: Kristof Provost CommitDate: 2025-11-21 15:23:46 +0000 pf: fix another endpoint-independent crash In c12013f5bb38 we fixed udp_mapping cleanup issues in pf_get_sport(), but missed the static-port case (i.e. low == 0 && high == 0). We could still exit pf_get_sport() without either inserting the udp_mapping or freeing it. Address this and add a test case to provoke the problem. Reviewed by: thj MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D53856 --- sys/netpfil/pf/pf_lb.c | 16 ++++++++++++---- tests/sys/netpfil/pf/nat.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index 3227d2906fb5..3510de3c6b3d 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -407,10 +407,18 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, */ key.port[sidx] = pd->nsport; if (!pf_find_state_all_exists(&key, dir)) { - MPASS(udp_mapping == NULL || - *udp_mapping == NULL); - *nport = pd->nsport; - return (0); + if (udp_mapping && *udp_mapping != NULL) { + (*udp_mapping)->endpoints[1].port = pd->nsport; + if (pf_udp_mapping_insert(*udp_mapping) == 0) { + *nport = pd->nsport; + return (0); + } + } else { + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); + *nport = pd->nsport; + return (0); + } } } else if (low == high) { key.port[sidx] = htons(low); diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh index 788eacdc3369..3d953b495953 100644 --- a/tests/sys/netpfil/pf/nat.sh +++ b/tests/sys/netpfil/pf/nat.sh @@ -289,6 +289,35 @@ endpoint_independent_exhaust_cleanup() rm -f server2.out } +atf_test_case "endpoint_independent_static_port" "cleanup" +endpoint_independent_static_port_head() +{ + atf_set descr 'Test that a client behind NAT gets the same external IP:port for different servers, with static-port' + atf_set require.user root +} + +endpoint_independent_static_port_body() +{ + endpoint_independent_setup # Sets ${epair_…} variables + + endpoint_independent_common \ + "nat on ${epair_nat}a inet from ! (${epair_nat}a) to any -> (${epair_nat}a)" \ + "nat on ${epair_nat}a inet from ! (${epair_nat}a) to any -> (${epair_nat}a) static-port sticky-address endpoint-independent" + + # Exhaust the available nat ports + for i in $(seq 1 10); do + echo "ping" | jexec client nc -u 198.51.100.32 1234 -w 0 + echo "ping" | jexec client nc -u 198.51.100.22 1234 -w 0 + done +} + +endpoint_independent_static_port_cleanup() +{ + pft_cleanup + rm -f server1.out + rm -f server2.out +} + atf_test_case "endpoint_independent_pass" "cleanup" endpoint_independent_pass_head() { @@ -930,6 +959,7 @@ atf_init_test_cases() atf_add_test_case "nested_anchor" atf_add_test_case "endpoint_independent_compat" atf_add_test_case "endpoint_independent_exhaust" + atf_add_test_case "endpoint_independent_static_port" atf_add_test_case "endpoint_independent_pass" atf_add_test_case "nat6_nolinklocal" atf_add_test_case "empty_table_source_hash" From nobody Fri Nov 21 16:06:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCg7z3Yyhz6HPWF for ; Fri, 21 Nov 2025 16:06: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCg7z1G7Mz3w10 for ; Fri, 21 Nov 2025 16:06:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LuFzK+R3j0BGYy90HO7Jp0RrNHV9X3GrSPnNarRqEco=; b=HMMsRmhKDWP5n+Al51fc9inYABXtKJz2qfcuGl/8fPO31QhwEPCndKar7ruyXkUlGXOnfa 0BpzD1bKYnTdPjr47Zdt+MoBq7sCYbbegQzqjak+cOadLIegFa3BTQTWL7IW35x9lv6HO4 4DsFzNpyrwSNIaGc4WgRcquQ5pwVXhd9tWjDcjAiTBI/cYHLNG72x7M3hPacyh2EKdRjSb hiC1xDTszJ4jaGtyiXeiW3FxPqcFUwJDkf09jzdH6boI7JdsHvEqTSa2X+IlaK/EMjMFcp Rw1Bu+UthMbTL5Wm/UdCeHM25GUyYBywo21nmC3v7bS6ady/1iGiq4J8Pw6IMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LuFzK+R3j0BGYy90HO7Jp0RrNHV9X3GrSPnNarRqEco=; b=bz3hoK5Owl197KMt3sEKFp2/wdUuDVLv7z6HSmTyz4Q3GsW79AzfC/UzYoiYCsj5PzpgN+ dpL87zBn9UdB6lOMpPITMcn6Iqt3Amk7YmJQvmYXgDp22zjh+B6DGyFuRic6QgVjTXt8IX raxr0F6WeJ4dExVGjOAs1JGzhDKcTiAya82Yweuhqu4kXyog+XY645ozupw5RsqRV+ReLo mlmDn1gFDMGlZfsvS1WLgFgO3NvOmPra1BJ42YlIkbyW9dAYiG6tKRvYF0MylqIPgXeiTb iMdAqr8tnAC6U7cVbg66A/Q7Ak+iHv4o8fCcILEKX8SMrWW0AX+RweOddHNSqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741199; a=rsa-sha256; cv=none; b=EAHXG9D71bKYNPiCeFZgnnr7Q9cFJ5GN2VvIx4UsEOdfE10JKWCUdeLi4Lw8vrzzBP2P1X QeoYAz9m0LB4dkNrbeliO4bJIWz4pC98KVpHLMFuuMvDhoJElJik4PoUeDsOcMg5ujuXax SFB431X22D2+oauOmIcTAB1H1nRhWXNeu2pbYZNL+sjed/thxAEBOA7eoHzzWnhJqTH8d+ hPWN1pp1GdNDWh3sIyCp8HcMEUVnZFEzSIV1wpApeskQIe+YH21tvFSH5x1lob878mqcmf XKHdHjPg9LqI+udCOa++Qn9RXTfBadoD+WZd9iYvC4ZnkGNhjb5f6MN+PfoihA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCg7z0GB1z3l6 for ; Fri, 21 Nov 2025 16:06:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 367f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:06:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: e13664f6a44b - main - dmesg.8: Index kern.msgbuf_show_timestamp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e13664f6a44b4970ea5e8378b8e1a4879fa5d5a0 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:06:39 +0000 Message-Id: <69208e0f.367f5.2183fbad@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=e13664f6a44b4970ea5e8378b8e1a4879fa5d5a0 commit e13664f6a44b4970ea5e8378b8e1a4879fa5d5a0 Author: Alexander Ziaee AuthorDate: 2025-11-21 15:59:28 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-21 16:04:09 +0000 dmesg.8: Index kern.msgbuf_show_timestamp This is the only place this important debugging tunable is documented. Mark it up with the Va macro according to style.mdoc(5) so that people can find it via `apropos Va=kern.msg`, the standard syntax to search the FreeBSD manual for sysctls and tunables. Fixes: 6910fee62e77 (dmesg: Document kern.msgbuf_show_timestamp) --- sbin/dmesg/dmesg.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8 index 0dca0ff5da89..f9b9fce82ffc 100644 --- a/sbin/dmesg/dmesg.8 +++ b/sbin/dmesg/dmesg.8 @@ -73,7 +73,7 @@ The following variables control how the kernel timestamps entries in the message buffer: The default value is shown next to each variable. .Bl -tag -width indent -.It kern.msgbuf_show_timestamp : No 0 +.It Va kern.msgbuf_show_timestamp : No 0 If set to 0, no timestamps are added. If set to 1, then a 1-second granularity timestamp will be added to most lines in the message buffer. From nobody Fri Nov 21 16:08:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCg9r6rD2z6HPhT for ; Fri, 21 Nov 2025 16:08: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCg9r63JLz3wKr for ; Fri, 21 Nov 2025 16:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0IaEygiWevzdWqEkE0+iSYb70f64PU2ArDTWGFuurXw=; b=JcVu59BCvmVEc/+QqKGSNxUld+CyoKvuRMr2U0k6mRrfUbgQyJSZKN6K5wxLSLBWWPoO94 XhIDuWNc81K2E0pJorsC50cyYV7yyzhE+xrvx8/CGZwYjiNxU9S+1T7y0QK12zyJ3XpFat o/mEQDETIHwUhlhILLw3auPrUMlMkiUHr5/8vkrmVaSEuX8WLhhrJ8NQvf0hqxspdGk8jW /or1vY310wJLymTFeFpr4dZ4BGhAV5Y3snk5PrYmXjX462387vdEEAcW05Ucty0vxvF6uO hrim35gR76vMH0xuDmr2nzk/3lf/4FmZqjak1HoE29HOuEylt+w/LCS+p7GvpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0IaEygiWevzdWqEkE0+iSYb70f64PU2ArDTWGFuurXw=; b=Ps3dq+W0okS8Zl/EMAEWJuYLrthbc73oWn99GLPKdbsGGLRnFkt3XauZe7a1rrSr6iGsBJ nf0K5zkCQ/uM/60QbfEZnBhudNmqA3cSwwzmB4Q4WEH0Jbh7C2w2Ej6YmmQvOi89VcVz7M uPl1RqmtPgddiJGTrp+EJ8XO6q1bL3hnAFC5RBXTdNPEO63CS9WU8BcmmoA+1a1CCUD6Lz DvGqlagfcN7tAYIhHiiTlTmboaUutqTmeUAegaXtObf5QFqYiI/dW1MYrvgTLbZrzXf+oa qqkVRx3U+1/rBwekhtSMaqBW0QLU3XJYETUyK3xTe5DXjL0kTnjUzEr5J7YMBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741296; a=rsa-sha256; cv=none; b=wULQg9hkXH9Y5hjJm2NdAPIZq596Ahi3Jqbtb6VN/KAgxubtlJmAno4g8M6LUSBHVMpFYl 9JE4fSb9zONzdYJvgeEtRHaxaoxXjgPihzjJ1sR+LZDG6iPrKHYq0WE6++F/etgIR3a6PP nszEHROPQ1E319sjhZbWos7ray2wm3BwlwHBI/7qEHm76D7tlbTmwaPgXwZhrriEdr8aKT SnqhaMSFbNIb/TBF3SU4CH3vndAhJvThdALTE3BviCVXpYuL5Ze/HxYisWInvS9/avrkeF kRdSbbK0QHiI2YBpjqS+yR7SCxn8LQxLSAVFXEXk+u2/Qhb0OR7C6QLcLhdrMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCg9r5cgHz4DZ for ; Fri, 21 Nov 2025 16:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34648 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:08:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 1c0668c5b33d - stable/15 - dmesg.8: Index kern.msgbuf_show_timestamp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 1c0668c5b33d32724c6596b42bc08d22c63c0ee0 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:08:16 +0000 Message-Id: <69208e70.34648.6077f619@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=1c0668c5b33d32724c6596b42bc08d22c63c0ee0 commit 1c0668c5b33d32724c6596b42bc08d22c63c0ee0 Author: Alexander Ziaee AuthorDate: 2025-11-21 15:59:28 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-21 16:08:14 +0000 dmesg.8: Index kern.msgbuf_show_timestamp This is the only place this important debugging tunable is documented. Mark it up with the Va macro according to style.mdoc(5) so that people can find it via `apropos Va=kern.msg`, the standard syntax to search the FreeBSD manual for sysctls and tunables. Fixes: 6910fee62e77 (dmesg: Document kern.msgbuf_show_timestamp) (cherry picked from commit e13664f6a44b4970ea5e8378b8e1a4879fa5d5a0) --- sbin/dmesg/dmesg.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8 index 0dca0ff5da89..f9b9fce82ffc 100644 --- a/sbin/dmesg/dmesg.8 +++ b/sbin/dmesg/dmesg.8 @@ -73,7 +73,7 @@ The following variables control how the kernel timestamps entries in the message buffer: The default value is shown next to each variable. .Bl -tag -width indent -.It kern.msgbuf_show_timestamp : No 0 +.It Va kern.msgbuf_show_timestamp : No 0 If set to 0, no timestamps are added. If set to 1, then a 1-second granularity timestamp will be added to most lines in the message buffer. From nobody Fri Nov 21 16:12:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCgH43ld4z6HQ77 for ; Fri, 21 Nov 2025 16:12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCgH41ZYkz3x6w for ; Fri, 21 Nov 2025 16:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3dqJQ+ugC2el4HzsZEg7gG9svi+izuIU9TpwJupkyjk=; b=LP6h/raidbw4X7DJJgGNneMgmEJk/Wc2x1I+SLwBsTHwvzRau6hs6brpCSEGHlbU42NOlV 3ImvAdWxB4AZ+yildUln1tDuxnGzYvBs/Cxn/JcKibBz4MqTh9yGLtI97gqya1i4aS9bbN E6k6XW2TmIvC+jdWlLIBZ6RuMDF3siT+JY8gsmxpdJXSlqaJRI3bFFB0ARr8P27Jw2/3Tt hXAF9Okv/9sWvwdguZWi38PO9apBaivEhg8L1XJXPqHMX6o2KIhzqgtleC6CeaS82LLiso S1NyeOsub6Ie8YwwqeEoSKtnr6dsATKU/MBQG+Y+Mb9L7f2sc0dNojvg+FDKqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3dqJQ+ugC2el4HzsZEg7gG9svi+izuIU9TpwJupkyjk=; b=JgxByJjAHLOWCnSMJ/TTpkvCAUZN9JdUW0JqcBxHGdxvsekYkTx1DQpbe1zjUr/xXrWSHw lwL2OVnPMzhrxJHgayIP/H/t4oNnJRD25FS76foNw6j1k07lKAQ8KI+Gofh5VudgXUFdFL PIegV1P5doYfcFPCIxDFUgrlrE9iQ74rj0kf1sIk2J97wxXCeeerHScw1flPAvoe1gOfS6 G23scYLduLPqcrJqQHURVukSX6sNFR/bX53RKog7wSgX+z86PmZGv8KrvHETr++iWDz00p b27cevnL/gQF36Q3QIwhYth0HC7recItnVm7uAcb7w3hxqjxe6n7L3jUFVniPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741568; a=rsa-sha256; cv=none; b=GehxzpkKsETUOMpB3OvdY1JmahzeynPnAUvs3FtXW+RXNMMIGs9TVKMuBrIJAhHzyYEQ4v MWxL0wxQha3dndJp1Z0bPeESi1BqNWEzE7r3ICIhWvtCOw5U1UJIar58gvD/TnZbjJ+OmC VSJT/RAZEgvXhcdq3Iav+YSta0Ejk+TX/8H+EbC+3CpBzgmQ5pifE5BOODj0VWIUDMme0w KWkGM7T9N2eDf7pAaJiMdH/CcJ8G6TITH5nDm6HFIIIkJ0IZIgGUIAh8QwVqqQLU2O6Nww snQUnaX1S36mGweNCb7Q3td7nR3pe5t3hLJLyYWj873M1+ymF5mEW4sVw6SP0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCgH417vsz4Dv for ; Fri, 21 Nov 2025 16:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35954 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:12:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 6ceab1c42853 - stable/14 - dmesg.8: Index kern.msgbuf_show_timestamp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 6ceab1c42853c42d7a1aca018ffbd58b65c94081 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:12:48 +0000 Message-Id: <69208f80.35954.232e4f88@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=6ceab1c42853c42d7a1aca018ffbd58b65c94081 commit 6ceab1c42853c42d7a1aca018ffbd58b65c94081 Author: Alexander Ziaee AuthorDate: 2025-11-21 15:59:28 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-21 16:12:35 +0000 dmesg.8: Index kern.msgbuf_show_timestamp This is the only place this important debugging tunable is documented. Mark it up with the Va macro according to style.mdoc(5) so that people can find it via `apropos Va=kern.msg`, the standard syntax to search the FreeBSD manual for sysctls and tunables. Fixes: 6910fee62e77 (dmesg: Document kern.msgbuf_show_timestamp) (cherry picked from commit e13664f6a44b4970ea5e8378b8e1a4879fa5d5a0) --- sbin/dmesg/dmesg.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8 index cbd7d66f9e98..e4c1fbee1e37 100644 --- a/sbin/dmesg/dmesg.8 +++ b/sbin/dmesg/dmesg.8 @@ -75,8 +75,8 @@ The following variables control how the kernel timestamps entries in the message buffer: The default value is shown next to each variable. .Bl -tag -width indent -.It kern.msgbuf_show_timestamp : No 0 -If set to 0, no timetamps are added. +.It Va kern.msgbuf_show_timestamp : No 0 +If set to 0, no timestamps are added. If set to 1, then a 1-second granularity timestamp will be added to most lines in the message buffer. If set to 2, then a microsecond granularity timestamp will be added. From nobody Fri Nov 21 16:14:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKZ6WpRz6HPn4 for ; Fri, 21 Nov 2025 16:14: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCgKZ5NPdz3xjb for ; Fri, 21 Nov 2025 16:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kv+Zm7OeW0vDfDo3J2NXp4NVIUja/oNefstysuDlFz8=; b=SH59ByBNcSkeo7wFrT/s4olzHllQC31+OwLmzpdXcWtawrgqHeSG4kLL/aKcZqdobb+Cgr IKj7rg+WX6PVtQAFHIu2BD6qYCT1mTq43FaCS0LQtzMIjCkZej72m6dI6gpxVUUDNxqO+j Ue5DWEZi3WzBh7YJVvPbzR5PaKqVh2PqczZWiulHyr6Db7b/rsfCiPL+LbYU2/77xKrVIX ndP4cs+oNQtuV19LIXXFFrAPvj0qxpRfUH/IdMSagOnOzy8ff6KEtBl87wtkuuH8oj/ICn WufFdbdJyUgt5wWIYxlEGSo+po5obgbEm+oBjYfOEwYqi/YWG9S8Ny3zox9gwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kv+Zm7OeW0vDfDo3J2NXp4NVIUja/oNefstysuDlFz8=; b=GkPr1cOe8M4XmjHbDHwA1w5Z7UYKPcXqIUvm6rBnGmjachHJlUI4ZudrN6Y5ckjMUvOHEW 2gr1WDu5bGfviB2GH9KUWdqdjkrP6noGfiBi/9uV9i3vkNbqAS2CgC9qRIyK0ZtYcBXp+K bZBfSKd4DePdeFEogaQfgavXH5oKMDAoFRIPGuYzib1iYidNzsPfXrxCsklGcco6Q7ZEs6 xZBz0T+UugDohNH0dJke/P4YevDKoLrsGkSSf8yIJJg1b7S9h4kjMp79dN/cjovx3Gnw73 4NeyLMOzpcPCnLqJo0FqcmKHaXmaZtBRy8PtrLavhUDS79P5MgDWEqWCjZRejA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741698; a=rsa-sha256; cv=none; b=CDl/Q3k6Y3yqQo7d4Fenn6zTGdKFurLwrp3uMfy4IH6XCgxUrqWOVMO5AU3wZKjw1LYY6F opBfZ/a8Ztp0zZXZmmuxjhiVe+eTT9rE+yujDEVNDaiSfqatU2w0r16zTVFrR3e9PNvky9 Wt31bVJJP8HeKFKhj7CrHulmQo4p+tJquRLKRSHU1y0A7cSbb9EaDKTLTtSO/NT+X8Wyv3 hHGyun/DRSglajfBoIMpSjKG5MWue5VbLUYbJw0N4SWnCXezGrOFINQ0mK2DtioBytZb9k +QAIIHsmRj06lRusHUfGIqjLZz73EZEHwGQ3m7AgKc8M1kpjsXXC6enSrGjVNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKZ4ZVsz3j5 for ; Fri, 21 Nov 2025 16:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3750e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:14:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: b4c32d67d40a - main - sound: Simplify logic in dsp_io_ops() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4c32d67d40a862620aa3e565ed0cb9ad59f1e60 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:14:58 +0000 Message-Id: <69209002.3750e.6a18edee@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b4c32d67d40a862620aa3e565ed0cb9ad59f1e60 commit b4c32d67d40a862620aa3e565ed0cb9ad59f1e60 Author: Christos Margiolis AuthorDate: 2025-11-21 16:14:13 +0000 Commit: Christos Margiolis CommitDate: 2025-11-21 16:14:13 +0000 sound: Simplify logic in dsp_io_ops() Use CHN_LOCK()/CHN_UNLOCK() directly, instead of dsp_lock_chans()/dsp_unlock_chans(). These functions are useful when we want to potentially lock both channels. Here we know which channel we are locking, so we can just lock it directly. This way we get rid of the prio variable as well. Related to runpid again, there is no reason to assign it when CHN_F_RUNNING is not set. channel->pid (as well as channel->comm) is always assigned in dsp_chn_alloc(). Get rid of runpid. I do not see how we can end up with channel->pid (td->td_proc->p_pid) not matching buf->uio_td->td_proc->p_pid. Also improve errno values. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53736 --- sys/dev/sound/pcm/dsp.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 1ae090f252c2..cb8b5414973c 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -464,8 +464,7 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) struct snddev_info *d; struct pcm_channel *ch; int (*chn_io)(struct pcm_channel *, struct uio *); - int prio, ret; - pid_t runpid; + int ret; d = priv->sc; if (!DSP_REGISTERED(d)) @@ -475,37 +474,27 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) switch (buf->uio_rw) { case UIO_READ: - prio = FREAD; ch = priv->rdch; chn_io = chn_read; break; case UIO_WRITE: - prio = FWRITE; ch = priv->wrch; chn_io = chn_write; break; } - - runpid = buf->uio_td->td_proc->p_pid; - - dsp_lock_chans(priv, prio); - - if (ch == NULL || !(ch->flags & CHN_F_BUSY)) { - if (priv->rdch != NULL || priv->wrch != NULL) - dsp_unlock_chans(priv, prio); + if (ch == NULL) { PCM_GIANT_EXIT(d); - return (EBADF); + return (ENXIO); } + CHN_LOCK(ch); - if (ch->flags & (CHN_F_MMAP | CHN_F_DEAD) || - (ch->flags & CHN_F_RUNNING && ch->pid != runpid)) { - dsp_unlock_chans(priv, prio); + if (!(ch->flags & CHN_F_BUSY) || + (ch->flags & (CHN_F_MMAP | CHN_F_DEAD))) { + CHN_UNLOCK(ch); PCM_GIANT_EXIT(d); - return (EINVAL); - } else if (!(ch->flags & CHN_F_RUNNING)) { + return (ENXIO); + } else if (!(ch->flags & CHN_F_RUNNING)) ch->flags |= CHN_F_RUNNING; - ch->pid = runpid; - } /* * chn_read/write must give up channel lock in order to copy bytes @@ -517,8 +506,7 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) ch->inprog--; CHN_BROADCAST(&ch->cv); - - dsp_unlock_chans(priv, prio); + CHN_UNLOCK(ch); PCM_GIANT_LEAVE(d); From nobody Fri Nov 21 16:14:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKb6XJbz6HQ81 for ; Fri, 21 Nov 2025 16:14: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCgKb5jlvz3xtb for ; Fri, 21 Nov 2025 16:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ljn+fLdoIflnp6sZWNDiWcPx4QaMlWjCOE3uO+nA/5w=; b=QRnkeBn9ajVzy9wG/YlkFWJkQ2wkxKyLc/Jjl/4f8kA+GA0GjCgK368hJfg4dkJPi31ZAU BbiOOe8q6udL/w9veYuv4UPLBD/oEv63jcJ+wEnxMBQLoMA2czyo6MGyFWPiBLX8HUBWrq ZluKFAaKjv2ZqkNZ9EdxPPM2dYy4A4ZN84FVxF9K8lNczQHBMbipoh1B4MDDXo8CnZwH4z l+BVUPKWiXVQvBH5/2umZhAcsbjXVww7oUSwpZ4xLIcfHhY79lP9iVIOODXh3w0RHz71QP KTjiRtuSDPIbr/v8l+oJCuMSwmUQ6tE7dDvFBV1JW6CkcZkDBljfdx2dNmekNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ljn+fLdoIflnp6sZWNDiWcPx4QaMlWjCOE3uO+nA/5w=; b=cjZaMvorJFJfQ2KgxyaAGkE+HQMmlBGGWGUZNI0JJyiNI51yeAebbQMJoXjhRYkzAJJjra bTYe0M3tVsSmcMyV77xB7pRg7w+1VCzY+ILQpNeoyPe/LJo1jf9LydmQ2oRAdxnI9urtGz MjIioJ2PfB1YOMP3CL2qDeOgV27VFXxfaLrMa4Gh5TEjkZwl0K1vJ7h+0zinhGL+k/olyj +OI0S/e34b3D8524Q9/2Ox4MkS1nLZKVf5txUp9JNFMeaNwQjPw4lTSVThx9543JFPQcyt iumeVMiOQc4pZVMLdRiLLar1zO6QYQjKrSgXIBtDCLIm8aL3ekeEbvimhg35JA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741699; a=rsa-sha256; cv=none; b=Tr/4I+58QxDFHhP/S6oE6fQpWT/l+3eGhjyQFBxcjTKmRjsk6RK5PwCOL5WjUBVjcBNTdT PaJPfgvj2bLlnyma2WsL0tcHK8Gu5Qa878DxEpgT5wtqjhvDrJ+J8UiwQP96Wsyy4IF/Ka FPUcws5bbkrzm85aykVfv2VWjOrKvAFMwbG2z2V0V7kDDx4W5cca2SmBdDOU/iMeJ/4teZ 0i1SmpuFiZ9xyoeaJCMGlfux4xsEpCTNiEjUdL4POY6HAS5hJUnUB9G2Az4KoZzIEA22eV YDD9D6U8Lz3a7/wJX0BFe8ChIeoGcUY/u3mnx1f44E+HfKtVtIQIkkCkJlhi/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKb5HjXz42l for ; Fri, 21 Nov 2025 16:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3768d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:14:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 4e8eb778803a - main - sound: Clean up midi/ includes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e8eb778803a8bffd0faa507ae2662725363cae5 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:14:59 +0000 Message-Id: <69209003.3768d.11e9f75e@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4e8eb778803a8bffd0faa507ae2662725363cae5 commit 4e8eb778803a8bffd0faa507ae2662725363cae5 Author: Christos Margiolis AuthorDate: 2025-11-21 16:14:18 +0000 Commit: Christos Margiolis CommitDate: 2025-11-21 16:14:41 +0000 sound: Clean up midi/ includes Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53841 --- sys/dev/sound/midi/midi.c | 23 +++++++++-------------- sys/dev/sound/midi/mpu401.c | 11 ++--------- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index b39288675ea6..e14a28557406 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -32,34 +32,29 @@ #include #include -#include +#include +#include #include +#include #include +#include #include -#include -#include -#include +#include +#include #include -#include -#include #include -#include -#include -#include +#include #include -#include -#include -#include -#include #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_snd.h" #endif #include +#include + #include "mpu_if.h" -#include MALLOC_DEFINE(M_MIDI, "midi buffers", "Midi data allocation area"); #define MIDI_NAMELEN 16 diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index af3149ec8180..7d3edb6323ef 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -27,17 +27,10 @@ */ #include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include #include -#include -#include /* to get driver_intr_t */ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_snd.h" From nobody Fri Nov 21 16:15:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKd3HPsz6HQBW for ; Fri, 21 Nov 2025 16:15: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCgKc6Vpyz3xpL for ; Fri, 21 Nov 2025 16:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p1+dAHBV3ceK5RMaSy82nUJy5a8CN2++veaFaoq829I=; b=KMFdhaUPcZEdd0sDR4Zm0JHHtYbfeSBFXzJg+E9UZX9KQFlJOUCPcQ2ufvH3hftmVGpEYf i57JmqmHpQJnrMRrxA3tt7DWh2StXgaFtiqSN8gJMKPa/Do9aoeSdHXbEt/b0K76rU4m3f lCK7UbkmPvqZFL39VgHdjMI0Ui4wc46Ta0b3hJR1V8uVvx3otowoY/jaIrRyn8kepQ5HMf 4jK/F3PuKmDp12tYRV0ghdXX78wZPlbygmEN2Anu9ec+Mu+jGlhLY14W0rEd+nevnpAUKU v5LBrrHZRDuIf5aZpDkGkFwP1ofo4SV0Obj5QA//5txPTnYI5lUPgiWFQzYcRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p1+dAHBV3ceK5RMaSy82nUJy5a8CN2++veaFaoq829I=; b=HJB/8EAIwIOGJzYoKw/QZ196xDxUj0g1zcBIrQXUX0emLXDd4E/iGgpyyIpuAYEy2rVhEB OdQQH13BmMVKzKiHg2soldQqsPjO5g8lv7sJMBOxdpNxbBUF4ixZd1oX+HdDq98rLFRNEP bAPITbK+rUMLDDftiD+Rn3E/f5cE7szHbzu9xT+yXtImdVX1fiIwVlXY3i+hnDoI+HF549 Tew8XGCb9iDMSsrCUcBnPrTtwHZ0XflDyC7TdfdxLHtWQEXxlx4bLlm4cy3a6viYhtvjDM Wor1EBxE+siJoho60ollSXlAud7X6riCh5qBqqDnFH7lTVvApfWnlJCghFO0Zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741700; a=rsa-sha256; cv=none; b=h1CJwjlHa61k6q3vvbIACB5tcxA34eED/ux3f3TbThkQcfzbMLL+qb7ti/rumAS7MhjW0+ OtizaTfX9PBDX+Rj+jHboyZvLJw7alHsyrPVpOwSPXDF0Dx6S4ylAansuhBRg+SdcdpIy4 b9Y8vEkWHxpYVdGpby7wBi4avvv1ZiAfwijWX50S2a3tapy8fSkkkjv+yEj1NCiismNhQh EIZ9n4NxDG0fbLTEcKH5nInWKCIQdMqliQU7koYxDEIHMDG+9pH8G40He14yCat17FKVd8 s1xmTwoj8EKmtZRNsETiGXMayC8aEggcIFtTsM+n/zfVrrOnD8FFjzWsxBUoVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKc66Tcz3x9 for ; Fri, 21 Nov 2025 16:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37290 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:15:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 3107b952f534 - main - sound: Merge PCM_ALIVE() with PCM_REGISTERED() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3107b952f534813846e4f58afdb57624a81618d8 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:15:00 +0000 Message-Id: <69209004.37290.13d7af8d@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3107b952f534813846e4f58afdb57624a81618d8 commit 3107b952f534813846e4f58afdb57624a81618d8 Author: Christos Margiolis AuthorDate: 2025-11-21 16:14:24 +0000 Commit: Christos Margiolis CommitDate: 2025-11-21 16:14:47 +0000 sound: Merge PCM_ALIVE() with PCM_REGISTERED() PCM_ALIVE() is used only in pcm_unregister(), but it does not hurt to use PCM_REGISTERED(), which uses PCM_ALIVE() internally. In fact, it's more robust this way. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/pcm/sound.c | 2 +- sys/dev/sound/pcm/sound.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index cb510d526fa8..60236eb4c69c 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -467,7 +467,7 @@ pcm_unregister(device_t dev) d = device_get_softc(dev); - if (!PCM_ALIVE(d)) { + if (!PCM_REGISTERED(d)) { device_printf(dev, "unregister: device not configured\n"); return (0); } diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 8542a96ccb14..c03ac2c8ee58 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -133,8 +133,8 @@ struct snd_mixer; "\015PVCHANS" \ "\016RVCHANS" -#define PCM_ALIVE(x) ((x) != NULL && (x)->lock != NULL) -#define PCM_REGISTERED(x) (PCM_ALIVE(x) && ((x)->flags & SD_F_REGISTERED)) +#define PCM_REGISTERED(x) \ + ((x) != NULL && (x)->lock != NULL && ((x)->flags & SD_F_REGISTERED)) #define PCM_MAXCHANS 10000 #define PCM_CHANCOUNT(d) \ From nobody Fri Nov 21 16:15:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKf4Gtyz6HQKr for ; Fri, 21 Nov 2025 16:15: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCgKf1C2nz3xv1 for ; Fri, 21 Nov 2025 16:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SU5NKDGlfdWJdFkF3XFdyBOTD6teMEJ0q+DDwDRS3ss=; b=X945j+1R0vzTX0YNqrFP38GYV0tq2k/GJ/jaGutSfQQA4xQ9vLD/EI8Ds/IG/glFwxZiAJ HvNn7UG+fyhLt0/EH3wMZLB6beRw7Om98LtJR2sfFZZeBzUQ2TuxQJPeMXxgh1frHNpUyR RZAzLgdA3KYP7AR7TNiIFevZFpDI57umBGQ1nXzo7aTt53X3Hx93pxfqc+3g2ap98qaI9d Zhtj/Jx70Pj4bT+2ydvl9ejjuHJBumCO1ofXJZJyDXGu8IKaWHWbIYjsyIsR0UPF3Bgqhu A3E4AasP2hZtRqM1MJr9NxJtq/VQ8gfx41vJN0UylCkPt2a7JD6qpbLElunZHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SU5NKDGlfdWJdFkF3XFdyBOTD6teMEJ0q+DDwDRS3ss=; b=IM2ZeMOKRKwpkCM2wjFki2gz0kHFCMs2V5bQfGAmIk9peKQUA+n7OofLq2E6o28RAplmwp 7A+NpO/jROOPnxzr2pd6E+koV00oa7d8RMD8KErmGqeMoPa+BXuczRVv2bcgnd4KKyjUF+ T82jhRB9TB/NxCJwg1NbH7bV2HdbyNnyennknkEWEA8Mb6VQ+6O5TbnU5qx0z6Y99zWrkt herbEWWFLeO4ChrEdx+KDELDbLwJaRoEQgcP4KAcKc+HNBROLnNQLxfrl1sFkEFqYFYFku nhN3ce0MHt9G6oqVqHJdDv8JQmMcgw2JBuWsfq8kULt/vshyLvYiLNM131SEyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741702; a=rsa-sha256; cv=none; b=s9PYfNYruOiwu3WwjTwpAl3qkOm1sZiyozSBQbl8JAFX1C4hS2p7tRukU4a9Q31y33B59l bZLgg72fTcuSNaGMXZPhe27v18KpMvR2qZouQoc26SCeHohOOirI8KH2Gdonzqb/5JeVFG O37M54uSk4OK3fVb+ky7Re4P9JPs5P2UWikpEelswergUXGz+6DBB0xy9NqG2CLmxvaR3z lbXV05MKP0kpsTDOLz2AgUJDT7MSZyXWFC3Kcp6UFsZJg0277Ebn7P/qsW/tTou+ODgDXh 5YW5/f33TwSVQy/80AwAwsB76SBJKyOJw5hqRNBzi0S33h4lNfpZk61VRq5GCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKd6xM4z3xB for ; Fri, 21 Nov 2025 16:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3652b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:15:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: e254ef87a30b - main - sound: Merge chn_intr() with chn_intr_locked() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:15:01 +0000 Message-Id: <69209005.3652b.58fc1f99@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06 commit e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06 Author: Christos Margiolis AuthorDate: 2025-11-21 16:14:28 +0000 Commit: Christos Margiolis CommitDate: 2025-11-21 16:14:47 +0000 sound: Merge chn_intr() with chn_intr_locked() There is no scenario where chn_intr() is called with the channel lock already held. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D53854 --- sys/dev/sound/pcm/channel.c | 20 ++------------------ sys/dev/sound/pcm/channel.h | 1 - 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index e92181d74e19..736dbec0eff2 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -579,30 +579,14 @@ chn_read(struct pcm_channel *c, struct uio *buf) } void -chn_intr_locked(struct pcm_channel *c) +chn_intr(struct pcm_channel *c) { - - CHN_LOCKASSERT(c); - + CHN_LOCK(c); c->interrupts++; - if (c->direction == PCMDIR_PLAY) chn_wrintr(c); else chn_rdintr(c); -} - -void -chn_intr(struct pcm_channel *c) -{ - - if (CHN_LOCKOWNED(c)) { - chn_intr_locked(c); - return; - } - - CHN_LOCK(c); - chn_intr_locked(c); CHN_UNLOCK(c); } diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 15180bc8f0b6..40b82f2caff3 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -298,7 +298,6 @@ int chn_oss_setorder(struct pcm_channel *, unsigned long long *); int chn_oss_getmask(struct pcm_channel *, uint32_t *); void chn_resetbuf(struct pcm_channel *c); -void chn_intr_locked(struct pcm_channel *c); void chn_intr(struct pcm_channel *c); int chn_abort(struct pcm_channel *c); From nobody Fri Nov 21 16:15:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKh0Tb5z6HPqQ for ; Fri, 21 Nov 2025 16:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCgKg1VBtz3xm1 for ; Fri, 21 Nov 2025 16:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e2AvDcq2GkdDGBThfX2jLR+F0qJuJ8UbZ4K8nPuFXZM=; b=xKbU4jA6u+wI5Dnrnj8Zf145bPLxhR19QuqKvD4S9WQ9UG3xxRUfF/1GL8KZEMYl8CMcMH WJ7voERe3NHgP+/cozOVRuvZTDqRtMw/vJ1q1rm/ffIelhogLnMGnFySNpnFxjBJ8Na77/ 352Nekad9Ke2EdqdfU6+gw7nKbFXdv64PSEWYdzYpHQ8JMXI/0Rw+Zjl1m86Vi5Mjt+9gP zDHrehCp/wbxquU4W1wRMBa+NNtzmTxWlMgIWAB4h7d+i1C56ZBN0/0VRoxlHhx72CIUw4 pbzFfZ7mDIT1wF+xzTRlSvcLpkxRa4bSaAtt/4azTezuROW3W6zRIDBN4zbnFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e2AvDcq2GkdDGBThfX2jLR+F0qJuJ8UbZ4K8nPuFXZM=; b=dtoLUcQjPsdsI3fgcTYu7hm75nSli3c5vDBzoCej47KIw0WTV3zIQuhURQgOCPXsa4CZbH I4Z2Y10oLNQc0+Y+aUa5pjXbkF/UPIMERy2V6NpXJfcwPwLANdtgaqTzGzAnjyz4UgtvsJ fiVpQPQwOMBe0e8k7IufAbxGcq2aX9EfZA+7bA6qsHQLW1W1PeZHH+xaAvwInhWaC/kwXp jEP6dNtCMVi4es+Kk4/Ms4NB/7z/vGZBUztj7upGkSKxGJ8eNcFSftGLqbeldcxh9XBM1w lvAr4oZUCY1KhAT31gIr9rQ4vzk48H24eN3tIuMHckB6S40Xd7J13Ua1C93b7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741703; a=rsa-sha256; cv=none; b=qpTe/WemfapFqhMXxJVoR16CNuDkhmsTgOREp/SgAjm/cd6BeI9jol2eS5bYroqia60iW6 imhkmOdh0m2ptgpEmI3QK4wMSH13p7oL5VedqWm44oYASDRR9oUI5LMkjttKp/EeK6/Z+U 5xJzPTH88w49rlYOcIkGlGtpIAnfP1etNjWhAZjhqUtO7dhM0KesmaBcBU3QGgo9wGcNRr qblY5xtikblyHycA+tcCtKVoAf393P0L+5Uq2IUy25WVWiZeVmRERrE8H7J5LfCf0uZ0Zr 2A4p/OmmtrmU2woxErrHI3EjGZK/uu+m8TnvvNHsNAqboqAWry8+uGqA0CYWrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKg10W1z3j7 for ; Fri, 21 Nov 2025 16:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 369f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:15:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 9d18115ca0ab - main - sound: Retire snd_mtx* wrappers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d18115ca0ab0ef3f34173d4e2bdabec916d0b60 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:15:03 +0000 Message-Id: <69209007.369f8.65e30118@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9d18115ca0ab0ef3f34173d4e2bdabec916d0b60 commit 9d18115ca0ab0ef3f34173d4e2bdabec916d0b60 Author: Christos Margiolis AuthorDate: 2025-11-21 16:14:33 +0000 Commit: Christos Margiolis CommitDate: 2025-11-21 16:14:47 +0000 sound: Retire snd_mtx* wrappers Do not create mutexes with snd_mtxcreate(). It doesn't provide any value, plus it first allocates the mutex with malloc(9). Allocate mutexes in the stack and use mtx_* functions directly instead of the snd_mtx* wrappers. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D53855 --- sys/arm/allwinner/a10_codec.c | 10 ++-- sys/arm/freescale/imx/imx6_ssi.c | 20 +++---- sys/arm/freescale/vybrid/vf_sai.c | 20 +++---- sys/dev/sound/dummy.c | 29 +++++----- sys/dev/sound/pci/als4000.c | 50 ++++++++--------- sys/dev/sound/pci/atiixp.c | 18 +++--- sys/dev/sound/pci/cmi.c | 54 +++++++++--------- sys/dev/sound/pci/emu10k1.c | 57 +++++++++---------- sys/dev/sound/pci/emu10kx-pcm.c | 47 ++++++++-------- sys/dev/sound/pci/envy24.c | 68 +++++++++++------------ sys/dev/sound/pci/envy24ht.c | 69 ++++++++++++----------- sys/dev/sound/pci/es137x.c | 16 +++--- sys/dev/sound/pci/hda/hdaa.c | 6 +- sys/dev/sound/pci/hda/hdac.c | 15 ++--- sys/dev/sound/pci/hda/hdac_private.h | 2 +- sys/dev/sound/pci/hda/hdacc.c | 6 +- sys/dev/sound/pci/hdsp-pcm.c | 28 +++++----- sys/dev/sound/pci/hdsp.c | 35 ++++++------ sys/dev/sound/pci/hdsp.h | 2 +- sys/dev/sound/pci/hdspe-pcm.c | 28 +++++----- sys/dev/sound/pci/hdspe.c | 35 ++++++------ sys/dev/sound/pci/hdspe.h | 2 +- sys/dev/sound/pci/ich.c | 16 +++--- sys/dev/sound/pci/maestro3.c | 17 +++--- sys/dev/sound/pci/solo.c | 18 +++--- sys/dev/sound/pci/spicds.c | 34 ++++++------ sys/dev/sound/pci/t4dwave.c | 29 +++++----- sys/dev/sound/pci/via8233.c | 101 +++++++++++++++++---------------- sys/dev/sound/pci/via82c686.c | 36 ++++++------ sys/dev/sound/pcm/ac97.c | 52 ++++++++--------- sys/dev/sound/pcm/channel.c | 16 +++--- sys/dev/sound/pcm/channel.h | 14 ++--- sys/dev/sound/pcm/dsp.c | 4 +- sys/dev/sound/pcm/mixer.c | 105 +++++++++++++++++------------------ sys/dev/sound/pcm/sound.c | 33 +---------- sys/dev/sound/pcm/sound.h | 24 +++----- sys/dev/sound/usb/uaudio.c | 2 +- 37 files changed, 537 insertions(+), 581 deletions(-) diff --git a/sys/arm/allwinner/a10_codec.c b/sys/arm/allwinner/a10_codec.c index 0a4ba7aa31b2..d3920eddc1f1 100644 --- a/sys/arm/allwinner/a10_codec.c +++ b/sys/arm/allwinner/a10_codec.c @@ -159,7 +159,7 @@ struct a10codec_chinfo { struct a10codec_info { device_t dev; struct resource *res[2]; - struct mtx *lock; + struct mtx lock; bus_dma_tag_t dmat; unsigned dmasize; void *ih; @@ -949,7 +949,7 @@ a10codec_chan_trigger(kobj_t obj, void *data, int go) if (!PCMTRIG_COMMON(go)) return (0); - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); switch (go) { case PCMTRIG_START: ch->run = 1; @@ -964,7 +964,7 @@ a10codec_chan_trigger(kobj_t obj, void *data, int go) default: break; } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return (0); } @@ -1075,7 +1075,7 @@ a10codec_attach(device_t dev) sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); sc->cfg = (void *)ofw_bus_search_compatible(dev, compat_data)->ocd_data; sc->dev = dev; - sc->lock = snd_mtxcreate(device_get_nameunit(dev), "a10codec softc"); + mtx_init(&sc->lock, device_get_nameunit(dev), "a10codec_softc", MTX_DEF); if (bus_alloc_resources(dev, a10codec_spec, sc->res)) { device_printf(dev, "cannot allocate resources for device\n"); @@ -1180,7 +1180,7 @@ a10codec_attach(device_t dev) fail: bus_release_resources(dev, a10codec_spec, sc->res); - snd_mtxfree(sc->lock); + mtx_destroy(&sc->lock); free(sc, M_DEVBUF); return (ENXIO); diff --git a/sys/arm/freescale/imx/imx6_ssi.c b/sys/arm/freescale/imx/imx6_ssi.c index 5a0e671f15a2..76870cfb29c9 100644 --- a/sys/arm/freescale/imx/imx6_ssi.c +++ b/sys/arm/freescale/imx/imx6_ssi.c @@ -173,7 +173,7 @@ struct sc_info { bus_space_tag_t bst; bus_space_handle_t bsh; device_t dev; - struct mtx *lock; + struct mtx lock; void *ih; int pos; int dma_size; @@ -242,10 +242,10 @@ ssimixer_init(struct snd_mixer *m) mask = SOUND_MASK_PCM; mask |= SOUND_MASK_VOLUME; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); pcm_setflags(scp->dev, pcm_getflags(scp->dev) | SD_F_SOFTPCMVOL); mix_setdevs(m, mask); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return (0); } @@ -290,14 +290,14 @@ ssichan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, scp = (struct sc_pcminfo *)devinfo; sc = scp->sc; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); ch = &scp->chan[0]; ch->dir = dir; ch->run = 0; ch->buffer = b; ch->channel = c; ch->parent = scp; - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); if (sndbuf_setup(ch->buffer, sc->buf_base, sc->dma_size) != 0) { device_printf(scp->dev, "Can't setup sndbuf.\n"); @@ -318,9 +318,9 @@ ssichan_free(kobj_t obj, void *data) device_printf(scp->dev, "ssichan_free()\n"); #endif - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); /* TODO: free channel buffer */ - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return (0); } @@ -565,7 +565,7 @@ ssichan_trigger(kobj_t obj, void *data, int go) scp = ch->parent; sc = scp->sc; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); switch (go) { case PCMTRIG_START: @@ -590,7 +590,7 @@ ssichan_trigger(kobj_t obj, void *data, int go) break; } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return (0); } @@ -736,7 +736,7 @@ ssi_attach(device_t dev) sc->pos = 0; sc->conf = malloc(sizeof(struct sdma_conf), M_DEVBUF, M_WAITOK | M_ZERO); - sc->lock = snd_mtxcreate(device_get_nameunit(dev), "ssi softc"); + mtx_init(&sc->lock, device_get_nameunit(dev), "ssi softc"); if (sc->lock == NULL) { device_printf(dev, "Can't create mtx\n"); return (ENXIO); diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c index 9c0125768fee..6ccfcae2bc2e 100644 --- a/sys/arm/freescale/vybrid/vf_sai.c +++ b/sys/arm/freescale/vybrid/vf_sai.c @@ -138,7 +138,7 @@ struct sc_info { bus_space_tag_t bst; bus_space_handle_t bsh; device_t dev; - struct mtx *lock; + struct mtx lock; uint32_t speed; uint32_t period; void *ih; @@ -206,10 +206,10 @@ saimixer_init(struct snd_mixer *m) mask = SOUND_MASK_PCM; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); pcm_setflags(scp->dev, pcm_getflags(scp->dev) | SD_F_SOFTPCMVOL); mix_setdevs(m, mask); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return (0); } @@ -252,14 +252,14 @@ saichan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, scp = (struct sc_pcminfo *)devinfo; sc = scp->sc; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); ch = &scp->chan[0]; ch->dir = dir; ch->run = 0; ch->buffer = b; ch->channel = c; ch->parent = scp; - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); if (sndbuf_setup(ch->buffer, sc->buf_base, sc->dma_size) != 0) { device_printf(scp->dev, "Can't setup sndbuf.\n"); @@ -280,9 +280,9 @@ saichan_free(kobj_t obj, void *data) device_printf(scp->dev, "saichan_free()\n"); #endif - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); /* TODO: free channel buffer */ - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return (0); } @@ -513,7 +513,7 @@ saichan_trigger(kobj_t obj, void *data, int go) struct sc_pcminfo *scp = ch->parent; struct sc_info *sc = scp->sc; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); switch (go) { case PCMTRIG_START: @@ -532,7 +532,7 @@ saichan_trigger(kobj_t obj, void *data, int go) break; } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return (0); } @@ -691,7 +691,7 @@ sai_attach(device_t dev) sc->sr = &rate_map[0]; sc->pos = 0; - sc->lock = snd_mtxcreate(device_get_nameunit(dev), "sai softc"); + mtx_init(&sc->lock, device_get_nameunit(dev), "sai softc"); if (sc->lock == NULL) { device_printf(dev, "Cant create mtx\n"); return (ENXIO); diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 0a2717ec418c..74ca1d0c924c 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -64,7 +64,7 @@ struct dummy_softc { int chnum; struct dummy_chan chans[DUMMY_NCHAN]; struct callout callout; - struct mtx *lock; + struct mtx lock; bool stopped; }; @@ -74,7 +74,7 @@ dummy_active(struct dummy_softc *sc) struct dummy_chan *ch; int i; - snd_mtxassert(sc->lock); + mtx_assert(&sc->lock, MA_OWNED); for (i = 0; i < sc->chnum; i++) { ch = &sc->chans[i]; @@ -109,9 +109,9 @@ dummy_chan_io(void *arg) ch->ptr %= ch->buf->bufsize; } else sndbuf_fillsilence(ch->buf); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); chn_intr(ch->chan); - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); } if (!sc->stopped) callout_schedule(&sc->callout, 1); @@ -141,7 +141,7 @@ dummy_chan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, sc = devinfo; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); ch = &sc->chans[sc->chnum++]; ch->sc = sc; @@ -150,7 +150,7 @@ dummy_chan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, ch->buf = b; ch->caps = &sc->caps; - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); bufsz = pcm_getbuffersize(sc->dev, 2048, 2048, 65536); buf = malloc(bufsz, M_DEVBUF, M_WAITOK | M_ZERO); @@ -199,10 +199,10 @@ dummy_chan_trigger(kobj_t obj, void *data, int go) struct dummy_chan *ch = data; struct dummy_softc *sc = ch->sc; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); if (sc->stopped) { - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return (0); } @@ -222,7 +222,7 @@ dummy_chan_trigger(kobj_t obj, void *data, int go) break; } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return (0); } @@ -320,8 +320,9 @@ dummy_attach(device_t dev) sc = device_get_softc(dev); sc->dev = dev; - sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_dummy softc"); - callout_init_mtx(&sc->callout, sc->lock, 0); + mtx_init(&sc->lock, device_get_nameunit(dev), "snd_dummy softc", + MTX_DEF); + callout_init_mtx(&sc->callout, &sc->lock, 0); sc->cap_fmts[0] = SND_FORMAT(AFMT_S32_LE, 2, 0); sc->cap_fmts[1] = SND_FORMAT(AFMT_S24_LE, 2, 0); @@ -362,12 +363,12 @@ dummy_detach(device_t dev) struct dummy_softc *sc = device_get_softc(dev); int err; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); sc->stopped = true; - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); callout_drain(&sc->callout); err = pcm_unregister(dev); - snd_mtxfree(sc->lock); + mtx_destroy(&sc->lock); return (err); } diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index a8c3303af74f..aea7cc6d3a64 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -79,7 +79,7 @@ struct sc_info { struct resource *reg, *irq; int regid, irqid; void *ih; - struct mtx *lock; + struct mtx lock; unsigned int bufsz; struct sc_chinfo pch, rch; @@ -208,7 +208,7 @@ alschan_init(kobj_t obj, void *devinfo, struct sc_info *sc = devinfo; struct sc_chinfo *ch; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); if (dir == PCMDIR_PLAY) { ch = &sc->pch; ch->gcr_fifo_status = ALS_GCR_FIFO0_STATUS; @@ -223,7 +223,7 @@ alschan_init(kobj_t obj, void *devinfo, ch->format = SND_FORMAT(AFMT_U8, 1, 0); ch->speed = 8000; ch->buffer = b; - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) return NULL; @@ -278,9 +278,9 @@ alschan_getptr(kobj_t obj, void *data) struct sc_info *sc = ch->parent; int32_t pos, sz; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); pos = als_gcr_rd(ch->parent, ch->gcr_fifo_status) & 0xffff; - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); sz = ch->buffer->bufsize; return (2 * sz - pos - 1) % sz; } @@ -397,7 +397,7 @@ alspchan_trigger(kobj_t obj, void *data, int go) if (!PCMTRIG_COMMON(go)) return 0; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); switch(go) { case PCMTRIG_START: als_playback_start(ch); @@ -409,7 +409,7 @@ alspchan_trigger(kobj_t obj, void *data, int go) default: break; } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return 0; } @@ -493,7 +493,7 @@ alsrchan_trigger(kobj_t obj, void *data, int go) struct sc_chinfo *ch = data; struct sc_info *sc = ch->parent; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); switch(go) { case PCMTRIG_START: als_capture_start(ch); @@ -503,7 +503,7 @@ alsrchan_trigger(kobj_t obj, void *data, int go) als_capture_stop(ch); break; } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return 0; } @@ -637,19 +637,19 @@ als_intr(void *p) struct sc_info *sc = (struct sc_info *)p; u_int8_t intr, sb_status; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); intr = als_intr_rd(sc); if (intr & 0x80) { - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); chn_intr(sc->pch.channel); - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); } if (intr & 0x40) { - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); chn_intr(sc->rch.channel); - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); } /* ACK interrupt in PCI core */ @@ -667,7 +667,7 @@ als_intr(void *p) if (sb_status & ALS_IRQ_CR1E) als_ack_read(sc, ALS_CR1E_ACK_PORT); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return; } @@ -749,10 +749,7 @@ als_resource_free(device_t dev, struct sc_info *sc) bus_dma_tag_destroy(sc->parent_dmat); sc->parent_dmat = 0; } - if (sc->lock) { - snd_mtxfree(sc->lock); - sc->lock = NULL; - } + mtx_destroy(&sc->lock); } static int @@ -808,7 +805,8 @@ als_pci_attach(device_t dev) char status[SND_STATUSLEN]; sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); - sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_als4000 softc"); + mtx_init(&sc->lock, device_get_nameunit(dev), "snd_als4000 softc", + MTX_DEF); sc->dev = dev; pci_enable_busmaster(dev); @@ -882,11 +880,11 @@ als_pci_suspend(device_t dev) { struct sc_info *sc = pcm_getdevinfo(dev); - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); sc->pch.dma_was_active = als_playback_stop(&sc->pch); sc->rch.dma_was_active = als_capture_stop(&sc->rch); als_uninit(sc); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return 0; } @@ -895,16 +893,16 @@ als_pci_resume(device_t dev) { struct sc_info *sc = pcm_getdevinfo(dev); - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); if (als_init(sc) != 0) { device_printf(dev, "unable to reinitialize the card\n"); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return ENXIO; } if (mixer_reinit(dev) != 0) { device_printf(dev, "unable to reinitialize the mixer\n"); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return ENXIO; } @@ -915,7 +913,7 @@ als_pci_resume(device_t dev) if (sc->rch.dma_was_active) { als_capture_start(&sc->rch); } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return 0; } diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index 30f061fd9388..12906ecc6253 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -129,7 +129,7 @@ struct atiixp_info { uint32_t blkcnt; int registered_channels; - struct mtx *lock; + struct mtx lock; struct callout poll_timer; int poll_ticks, polling; }; @@ -139,9 +139,9 @@ struct atiixp_info { #define atiixp_wr(_sc, _reg, _val) \ bus_space_write_4((_sc)->st, (_sc)->sh, _reg, _val) -#define atiixp_lock(_sc) snd_mtxlock((_sc)->lock) -#define atiixp_unlock(_sc) snd_mtxunlock((_sc)->lock) -#define atiixp_assert(_sc) snd_mtxassert((_sc)->lock) +#define atiixp_lock(_sc) mtx_lock(&(_sc)->lock) +#define atiixp_unlock(_sc) mtx_unlock(&(_sc)->lock) +#define atiixp_assert(_sc) mtx_assert(&(_sc)->lock, MA_OWNED) static uint32_t atiixp_fmt_32bit[] = { SND_FORMAT(AFMT_S16_LE, 2, 0), @@ -1019,7 +1019,7 @@ atiixp_chip_post_init(void *arg) if (sc->codec_not_ready_bits == 0) { /* wait for the interrupts to happen */ do { - msleep(sc, sc->lock, PWAIT, "ixpslp", max(hz / 10, 1)); + msleep(sc, &sc->lock, PWAIT, "ixpslp", max(hz / 10, 1)); if (sc->codec_not_ready_bits != 0) break; } while (--timeout); @@ -1157,10 +1157,7 @@ atiixp_release_resource(struct atiixp_info *sc) bus_dma_tag_destroy(sc->sgd_dmat); sc->sgd_dmat = NULL; } - if (sc->lock) { - snd_mtxfree(sc->lock); - sc->lock = NULL; - } + mtx_destroy(&sc->lock); free(sc, M_DEVBUF); } @@ -1190,7 +1187,8 @@ atiixp_pci_attach(device_t dev) int i; sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); - sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_atiixp softc"); + mtx_init(&sc->lock, device_get_nameunit(dev), "snd_atiixp softc", + MTX_DEF); sc->dev = dev; callout_init(&sc->poll_timer, 1); diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 28427d449c8d..99925d236c08 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -116,7 +116,7 @@ struct sc_info { struct resource *reg, *irq; int regid, irqid; void *ih; - struct mtx *lock; + struct mtx lock; int spdif_enabled; unsigned int bufsz; @@ -361,13 +361,13 @@ cmichan_init(kobj_t obj, void *devinfo, } ch->dir = dir; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); if (ch->dir == PCMDIR_PLAY) { cmi_dma_prog(sc, ch, CMPCI_REG_DMA0_BASE); } else { cmi_dma_prog(sc, ch, CMPCI_REG_DMA1_BASE); } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return ch; } @@ -394,7 +394,7 @@ cmichan_setformat(kobj_t obj, void *data, u_int32_t format) f |= CMPCI_REG_FORMAT_MONO; } - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); if (ch->dir == PCMDIR_PLAY) { cmi_partial_wr4(ch->parent, CMPCI_REG_CHANNEL_FORMAT, @@ -408,7 +408,7 @@ cmichan_setformat(kobj_t obj, void *data, u_int32_t format) CMPCI_REG_CH1_FORMAT_MASK, f); } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); ch->fmt = format; return 0; @@ -422,7 +422,7 @@ cmichan_setspeed(kobj_t obj, void *data, u_int32_t speed) u_int32_t r, rsp __unused; r = cmpci_rate_to_regvalue(speed); - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); if (ch->dir == PCMDIR_PLAY) { if (speed < 44100) { /* disable if req before rate change */ @@ -450,7 +450,7 @@ cmichan_setspeed(kobj_t obj, void *data, u_int32_t speed) rsp >>= CMPCI_REG_ADC_FS_SHIFT; rsp &= CMPCI_REG_ADC_FS_MASK; } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); ch->spd = cmpci_regvalue_to_rate(r); DEB(printf("cmichan_setspeed (%s) %d -> %d (%d)\n", @@ -484,7 +484,7 @@ cmichan_trigger(kobj_t obj, void *data, int go) if (!PCMTRIG_COMMON(go)) return 0; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); if (ch->dir == PCMDIR_PLAY) { switch(go) { case PCMTRIG_START: @@ -506,7 +506,7 @@ cmichan_trigger(kobj_t obj, void *data, int go) break; } } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return 0; } @@ -517,13 +517,13 @@ cmichan_getptr(kobj_t obj, void *data) struct sc_info *sc = ch->parent; u_int32_t physptr, bufptr, sz; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); if (ch->dir == PCMDIR_PLAY) { physptr = cmi_rd(sc, CMPCI_REG_DMA0_BASE, 4); } else { physptr = cmi_rd(sc, CMPCI_REG_DMA1_BASE, 4); } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); sz = ch->buffer->bufsize; bufptr = (physptr - ch->phys_buf + sz - ch->bps) % sz; @@ -538,7 +538,7 @@ cmi_intr(void *data) u_int32_t intrstat; u_int32_t toclear; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); intrstat = cmi_rd(sc, CMPCI_REG_INTR_STATUS, 4); if ((intrstat & CMPCI_REG_ANY_INTR) != 0) { toclear = 0; @@ -554,7 +554,7 @@ cmi_intr(void *data) if (toclear) { cmi_clr4(sc, CMPCI_REG_INTR_CTRL, toclear); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); /* Signal interrupts to channel */ if (intrstat & CMPCI_REG_CH0_INTR) { @@ -565,14 +565,14 @@ cmi_intr(void *data) chn_intr(sc->rch.channel); } - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); cmi_set4(sc, CMPCI_REG_INTR_CTRL, toclear); } } if(sc->mpu_intr) { (sc->mpu_intr)(sc->mpu); } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return; } @@ -799,10 +799,10 @@ cmi_muninit(struct mpu401 *arg, void *cookie) { struct sc_info *sc = cookie; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); sc->mpu_intr = NULL; sc->mpu = NULL; - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return 0; } @@ -933,7 +933,8 @@ cmi_attach(device_t dev) char status[SND_STATUSLEN]; sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); - sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_cmi softc"); + mtx_init(&sc->lock, device_get_nameunit(dev), "snd_cmi softc", + MTX_DEF); pci_enable_busmaster(dev); sc->dev = dev; @@ -1007,8 +1008,7 @@ cmi_attach(device_t dev) bus_release_resource(dev, SYS_RES_IRQ, sc->irqid, sc->irq); if (sc->reg) bus_release_resource(dev, SYS_RES_IOPORT, sc->regid, sc->reg); - if (sc->lock) - snd_mtxfree(sc->lock); + mtx_destroy(&sc->lock); if (sc) free(sc, M_DEVBUF); @@ -1037,7 +1037,7 @@ cmi_detach(device_t dev) if (sc->mpu_reg) bus_release_resource(dev, SYS_RES_IOPORT, sc->mpu_regid, sc->mpu_reg); - snd_mtxfree(sc->lock); + mtx_destroy(&sc->lock); free(sc, M_DEVBUF); return 0; @@ -1048,11 +1048,11 @@ cmi_suspend(device_t dev) { struct sc_info *sc = pcm_getdevinfo(dev); - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); sc->pch.dma_was_active = cmi_ch0_stop(sc, &sc->pch); sc->rch.dma_was_active = cmi_ch1_stop(sc, &sc->rch); cmi_power(sc, 3); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return 0; } @@ -1061,17 +1061,17 @@ cmi_resume(device_t dev) { struct sc_info *sc = pcm_getdevinfo(dev); - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); cmi_power(sc, 0); if (cmi_init(sc) != 0) { device_printf(dev, "unable to reinitialize the card\n"); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return ENXIO; } if (mixer_reinit(dev) == -1) { device_printf(dev, "unable to reinitialize the mixer\n"); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return ENXIO; } @@ -1086,7 +1086,7 @@ cmi_resume(device_t dev) cmichan_setformat(NULL, &sc->rch, sc->rch.fmt); cmi_ch1_start(sc, &sc->rch); } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return 0; } diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index a85031977f4b..da2ddc99f5a1 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -218,7 +218,7 @@ struct sc_info { struct resource *reg, *irq; void *ih; - struct mtx *lock; + struct mtx lock; unsigned int bufsz; int timer, timerinterval; @@ -820,10 +820,10 @@ emupchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, ch->blksz = sc->bufsz / 2; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); ch->spd = 8000; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); ch->master = emu_valloc(sc); ch->slave = emu_valloc(sc); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); r = (emu_vinit(sc, ch->master, ch->slave, sc->bufsz, ch->buffer)) ? NULL : ch; @@ -837,9 +837,9 @@ emupchan_free(kobj_t obj, void *data) struct sc_info *sc = ch->parent; int r; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); r = emu_memfree(sc, ch->buffer->buf); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return r; } @@ -869,9 +869,9 @@ emupchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize) struct sc_info *sc = ch->parent; ch->blksz = blocksize; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); emu_settimer(sc); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return blocksize; } @@ -884,7 +884,7 @@ emupchan_trigger(kobj_t obj, void *data, int go) if (!PCMTRIG_COMMON(go)) return 0; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); if (go == PCMTRIG_START) { emu_vsetup(ch); emu_vwrite(sc, ch->master); @@ -901,7 +901,7 @@ emupchan_trigger(kobj_t obj, void *data, int go) } ch->run = (go == PCMTRIG_START) ? 1 : 0; emu_vtrigger(sc, ch->master, ch->run); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return 0; } @@ -912,9 +912,9 @@ emupchan_getptr(kobj_t obj, void *data) struct sc_info *sc = ch->parent; int r; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); r = emu_vpos(sc, ch->master); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return r; } @@ -984,10 +984,10 @@ emurchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) return NULL; else { - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); emu_wrptr(sc, 0, ch->basereg, ch->buffer->buf_addr); emu_wrptr(sc, 0, ch->sizereg, 0); /* off */ - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return ch; } } @@ -1027,9 +1027,9 @@ emurchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize) struct sc_info *sc = ch->parent; ch->blksz = blocksize; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); emu_settimer(sc); - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return blocksize; } @@ -1069,7 +1069,7 @@ emurchan_trigger(kobj_t obj, void *data, int go) sz = EMU_RECBS_BUFSIZE_4096; } - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); switch(go) { case PCMTRIG_START: ch->run = 1; @@ -1111,7 +1111,7 @@ emurchan_trigger(kobj_t obj, void *data, int go) default: break; } - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return 0; } @@ -1123,9 +1123,9 @@ emurchan_getptr(kobj_t obj, void *data) struct sc_info *sc = ch->parent; int r; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); r = emu_rdptr(sc, 0, ch->idxreg) & 0x0000ffff; - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return r; } @@ -1171,9 +1171,9 @@ emu_muninit(struct mpu401 *arg, void *cookie) { struct sc_info *sc = cookie; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); sc->mpu_intr = NULL; - snd_mtxunlock(sc->lock); + mtx_unlock(&sc->lock); return 0; } @@ -1216,7 +1216,7 @@ emu_intr(void *data) struct sc_info *sc = data; u_int32_t stat, ack, i, x; - snd_mtxlock(sc->lock); + mtx_lock(&sc->lock); while (1) { stat = emu_rd(sc, EMU_IPR, 4); if (stat == 0) *** 3073 LINES SKIPPED *** From nobody Fri Nov 21 16:52:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCh8X5dGrz6HSKb for ; Fri, 21 Nov 2025 16:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCh8X4h9nz483J for ; Fri, 21 Nov 2025 16:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763743932; 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=PCcRxuXWlYhIIZ+7qHyosSAcsUo7q6zgs402wySrjfg=; b=LovgXmo/MEXGCAvVd4ULP+osXgrWpRvh5wnRmaf66Lu7cfzpwpS8RtfsuSoZ850ckrquQA 1ofBPgrHjIeiZEEcjIZoIRZ6/RFr+JOzgWwn4GEEFtqLmdbf2XG6n4WEU91OIIa0RmvB2d gI2Er463LQZtOIifYcOUWC9KICUPKxTjmgA9lW7zsr8/pt8+FyrDpVcGWf8s3oGXncfJAP k/270MCX7QJO5pHl/KYB4PYh6Aka5oL9/pRDvNXpeZ0X+Xhm5OjznLbVJxP082K/P/RbJE FlwYmJjW045q1DjJ2BKz08BexaFkBc6I7qV5pRM01BG+HdnkAojtYfwHpDEogg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763743932; 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=PCcRxuXWlYhIIZ+7qHyosSAcsUo7q6zgs402wySrjfg=; b=yEbsJbmDRX1bLr55t1u01dUSmqPYQ1i4MZXf/F+IM5gHuGLduPXEUCVK1cTJbtMYntFGT6 YsHRI8v94daKlNTZ9jmaZ41RnWUmBOPRlp/PrdRW3Y72ei/0DHxeZgD1j+DT8y82ep8MnC l8L4AtVJ0iRM3aj2po7ldGqb1T+/D6kFrD8UVbQMIEjM+gatoPLWHk5FCUYmk/yFvBeHX8 vm3P57dHT5T2+kckF0DSEHSvrfD1JJURd2kbJlHFYUnoIAqYqYEOz7FP1FeYUir6TSexqQ kVYB0usnT/rxuK0fFfkZqKmE/HJdJOsjJQPRdNop9nmD+7R37eXzLfhWq3PA9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763743932; a=rsa-sha256; cv=none; b=T0COXXoGWHOVBHH7J336j2tNguwOWdEPKxKvyYOBQRkNI2of9Ba6GQdEU/vJr8PaK12BpF jCkB7M8HibEHJrcv/bWrOH4FtZcvZYR1HVbOM3ip8fvmxPvCyaD+2aLm3gKyOKb4xaZJNE B1Qf5bSHzOFnIbg6hrLHJK8bQr3WIMR357Q5cW9VuBvWzyKWeYKOaQ/xWhsmQRJmpm+OoE uDF7gC2sye0OJ6FG4dqP+kWMoyD1oX4a4YVF0/y5NCU/ap6fIn0m0VhcyYyHH/c56Nan/L NfhahYM9cbfkJVuAz5xvmwZh4DLeF6RsxP57k5T6bKMs+DlqiQpvbcVRlUJaOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCh8X457qz5Vy for ; Fri, 21 Nov 2025 16:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 996f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:52:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Bruno Silvestre From: Gleb Smirnoff Subject: git: cf95eabb5572 - stable/14 - netlink: in snl_init_writer() don't overwrite error in case of failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cf95eabb5572368c80d72c151ebebca8cf6b2dbc Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:52:12 +0000 Message-Id: <692098bc.996f.212beb76@gitrepo.freebsd.org> The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=cf95eabb5572368c80d72c151ebebca8cf6b2dbc commit cf95eabb5572368c80d72c151ebebca8cf6b2dbc Author: Bruno Silvestre AuthorDate: 2025-10-07 05:48:28 +0000 Commit: Gleb Smirnoff CommitDate: 2025-11-21 16:52:01 +0000 netlink: in snl_init_writer() don't overwrite error in case of failure PR: 290050 (cherry picked from commit 488718ff42346888243496c00cbeb42ba004171e) --- sys/netlink/netlink_snl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 03f2b7dc5c38..1a33a814c611 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -1025,14 +1025,14 @@ snl_init_writer(struct snl_state *ss, struct snl_writer *nw) { nw->size = SNL_WRITER_BUFFER_SIZE; nw->base = (char *)snl_allocz(ss, nw->size); - if (nw->base == NULL) { + if (__predict_false(nw->base == NULL)) { nw->error = true; nw->size = 0; - } + } else + nw->error = false; nw->offset = 0; nw->hdr = NULL; - nw->error = false; nw->ss = ss; } From nobody Fri Nov 21 17:41:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCjFz1l8mz6HWMv for ; Fri, 21 Nov 2025 17:41: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCjFz1692z3J1y for ; Fri, 21 Nov 2025 17:41:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763746919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/hknSya+W1NrGRdbE//7lA/bzPC4LDq1aphnyj8cFc=; b=gpF3YwyvM/LV8lQT5pzpLuTPCSM6MPP1ePr2QzetM0Vkad3zeuVEap+XbWcR1NDHqhVj7X RM81a4KwO/HWL0uNasLy76rwjtvC7uHJHQJpUpSMvRLEz/+opQR9szIxYzqY/zqkRWVFAG n9htjE7JknXAJvoBJ5r+jHRAzisKAJ+YNH3EOd5VlwUrnZiSOD3MKwVdjc92t4T2wZm5v2 mjxg0u7A8KzEE7obGIb0y2wLEGWBL2ynbsSonp8lHUkPuG+KiawAy2ZsTAD0vCrSNdaRoP U6IWZwIUkbRZgZNxEoKZXzkpxbUWlAKCe1/3Q0WmKrnpzLZzbE3NqVNZs14dgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763746919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/hknSya+W1NrGRdbE//7lA/bzPC4LDq1aphnyj8cFc=; b=WKCWqfllK1fhiaSckDsSEUXpBIAbNuCKshZYKZV9wqQNKK4Q4me2BEJrrHbjRIzE6UDh1j s6QqvYQzsG8vhlwwKY1sPBowPpQbhrcFjjiyi8zNlsbMC0Ml3xQR9qK6PsTJprFY7630ha E/ahEFn/4ciKN+XSIw/7NnrGS3wghCmxz9mWz3867rtXLDpVYwxCIpFBiq7P6LsMBxHZzN Y+xWabdziGLwYZYfX3DHC1VDdg/ERv2uRXgmK+4QZ6KNgMTBrayOyA1vwT5MVIP/T3/mbJ 3b81WvaPL9koTZhqN7kKLRpULyIg/HOHQb1Zns+YoMSrfDenVtlT8HQCApyjsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763746919; a=rsa-sha256; cv=none; b=V9hr3aqjUj/O89WWFJ5X4f5lX6nvNBYkL8IwFSD2t+AHVc+55MzaUGdNUyg9/ZZsYnGXSZ CgTW7F3l+B6RRnYv/zrDpZyAweUf0GKaeBWDMRMQNbGncxbXxpqjYFZNIBtF7foe+KDsZ+ Bn0LocIxeQjDSF47ljshyMXgeSz5sOp9/s5IfEPsQ9Lc2RuOl+y3xxrU79GDqVYyvKZoFj DIeuJRgloxUjlRj4SzPaz1ZKynJEFhMWcsEUWl5rDMMmAYHBtI08GPWSLrm+Sqq+img9ef M7bhRuahvtdUXn7wsJ9td6a1iQh9pvqyoOIfk1/H570UiFDg3OqQyv6TmBiSuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCjFz0Wh9z74n for ; Fri, 21 Nov 2025 17:41:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21e34 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 17:41:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: a8740ba860bf - main - vt.4: Document increasing scrollback size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: a8740ba860bfc35879f886b80b30327d0d3b16bd Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 17:41:59 +0000 Message-Id: <6920a467.21e34.3cc30784@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=a8740ba860bfc35879f886b80b30327d0d3b16bd commit a8740ba860bfc35879f886b80b30327d0d3b16bd Author: Alexander Ziaee AuthorDate: 2025-11-21 17:40:56 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-21 17:41:02 +0000 vt.4: Document increasing scrollback size MFC: immediately as 2 llms say this is impossible Reviewed by: adrian, emaste Differential Revision: https://reviews.freebsd.org/D53860 --- share/man/man4/vt.4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 21d69bf9d495..6176c8c3093e 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 7, 2024 +.Dd November 21, 2025 .Dt VT 4 .Os .Sh NAME @@ -352,6 +352,12 @@ Notification that the console bell has rung. .It Li hz Ta Tone that was requested in Hz. .El .Sh EXAMPLES +To increase the scrollback buffer size to 22500 lines, +add the following line to +.Pa /etc/rc.conf : +.Pp +.Dl allscreens_flags="-h 22500" +.Pp This example changes the default color of normal text to green on a black background, or black on a green background when reversed. Note that white space cannot be used inside the attribute string @@ -414,6 +420,7 @@ at boot: .Xr getty 8 , .Xr kldload 8 , .Xr moused 8 , +.Xr vidcontrol 8 , .Xr vtfontcvt 8 .Sh HISTORY The From nobody Fri Nov 21 17:43:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCjHX57Spz6HWNW for ; Fri, 21 Nov 2025 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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCjHX4Nk5z3KG9 for ; Fri, 21 Nov 2025 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=1763747000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lFaeqg10ApLkSYx3Jh6sRZxbs1fUlNPml0JkyZsV/iY=; b=jAqOQQCG/OejeIGvOUrKLweANyz80D2XFMk5vOimhQsvijve49/n3nuJRimU2aYO2e8rX9 FLh8+N4Mvt5dQyBAO8kXf19MAte0K8DSGQR3I2qsrjCzCWzPsNzFtqt6gU1bauq8YNOFay 4DKv541t3HIt02arsMcyRHYoxfIhfU/hDbt6/F/R+CrpC1E5EJx0zoznSC7s5Zjf3RHo1I tnrZZyOyapmIYVz9A0+Cqi6Q9poZo0Seudlm7wq/6BtXoXTp9FysYByedeKGXgvE5PYGSd R5rqTivdN2HUGEccE5ZjiOgV26CO4RYuvQ5sOX1FHsOc+e7Bt8e4m1n9jP3MKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lFaeqg10ApLkSYx3Jh6sRZxbs1fUlNPml0JkyZsV/iY=; b=ugM0a1M+hwekXg6u7EgUX8CVCbj8HgKg2+lfzMIlI5zcD+Y/35HU+BWGie0Eb/32oMqjpX O9+Ow5WqecrSVCfOanwAGRGn6Rssk0C8W6u2EfbtD+8CgeFfQakGnoeQBOd2oguKZG3KXf 5oqzKjzJdD7hIVSJxd2pCx9KKU2rhHbZFzVrfn+CzgL5Cq/ukvvTWhMzKh2n5UHIzL0SZE WYXKwYBC0RWTdaWcy32A3bGYtGEJIsZUfXZEhEvqLD/laDhEvYzAXBVgpG/6jrGF5T+hfe TFDO1T+VxxU5LHs4aeG/0iql7R/+8gn7bpYeKsI+3S77jWOu/EzPqK9YjfockA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763747000; a=rsa-sha256; cv=none; b=uGEneJ/gVS13UAfBcJHrQ7GQA5FmF5829xEMil7ObS55GI1b14QncbKhZK9cj9qP1NFm34 2u9ekh4NTjKjLgkydTDdK1o8OTOuJvX1iWa1lyX1DEJ/dDik4o4nF9/NscYv+h+hzQCIkH CLFQAved9LKoydjq4vaBj0mIW5Ow8y4Vbg046Kei0MebwmULVz466PwP88zaVnS838aMzD QFMulJn9X0xKmJU9oyFpFCB8CCTHMDLL0fge42K5my8kiOpFmX3Oj3wErBKU2f0GbXymhn 86XiNp6vFxKBma22jXk3qBQDqryQPbmio4CdhaolZ8PvjuoBO1FmAfLSpCPH2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCjHX3xFRz69X for ; Fri, 21 Nov 2025 17:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id dd74 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 17:43:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 2da71ee296ad - stable/15 - vt.4: Document increasing scrollback size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 2da71ee296add6c39e26e8b103dd24a12e8ce320 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 17:43:20 +0000 Message-Id: <6920a4b8.dd74.734857b0@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=2da71ee296add6c39e26e8b103dd24a12e8ce320 commit 2da71ee296add6c39e26e8b103dd24a12e8ce320 Author: Alexander Ziaee AuthorDate: 2025-11-21 17:40:56 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-21 17:43:10 +0000 vt.4: Document increasing scrollback size MFC: immediately as 2 llms say this is impossible Reviewed by: adrian, emaste Differential Revision: https://reviews.freebsd.org/D53860 (cherry picked from commit a8740ba860bfc35879f886b80b30327d0d3b16bd) --- share/man/man4/vt.4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 21d69bf9d495..6176c8c3093e 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 7, 2024 +.Dd November 21, 2025 .Dt VT 4 .Os .Sh NAME @@ -352,6 +352,12 @@ Notification that the console bell has rung. .It Li hz Ta Tone that was requested in Hz. .El .Sh EXAMPLES +To increase the scrollback buffer size to 22500 lines, +add the following line to +.Pa /etc/rc.conf : +.Pp +.Dl allscreens_flags="-h 22500" +.Pp This example changes the default color of normal text to green on a black background, or black on a green background when reversed. Note that white space cannot be used inside the attribute string @@ -414,6 +420,7 @@ at boot: .Xr getty 8 , .Xr kldload 8 , .Xr moused 8 , +.Xr vidcontrol 8 , .Xr vtfontcvt 8 .Sh HISTORY The From nobody Fri Nov 21 17:57:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCjbk6Tr2z6HXdK for ; Fri, 21 Nov 2025 17:57: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCjbk5k0mz3MH4 for ; Fri, 21 Nov 2025 17:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rbpvk2ywyVNse/TfQOorMrczL8woOGcNXAXp3+EBSYU=; b=E+EO1OIXVGjOe8IpwzH3bK4dalW3r3kQXLzQymFwtSrILECgxRkua3Y83sjIV9vNo88LQ0 X06ZVofYS7O8DGHcjv62hv/R5ZdVfQkQVING/9Dm5BUguQTiYmQ09jSix+3m+zdmMEcWdW pgoPmJ53EpHqPxvKvzLVl3lqLa33bcnu0PZQa65U3dnAy7ua3pWcQn/hCEu61TXMQ6MPpm 59Yd4HxKvCd7YcWmgiD1m7cPac7IvyUzJ41aM3s1gAJlk2T+dQq0DTKmsTyJbn8C9Es1Cb pOSEuN4aYNDjJtnGqD/Ns0imTC0emOt4pXgu2liCxTWPiAOgvyQqg66R3ecSPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rbpvk2ywyVNse/TfQOorMrczL8woOGcNXAXp3+EBSYU=; b=RhPGxsyZ2eYx0m6PPdJbaL/WQNHB2MftuknxM9BhgWMJZn7OW5QldGn8nOSYkjBTz23qO8 CKiCjaRPlxU+vGY7idEEJWD+eJP5Ne4FAH2wXmpLuSwqwgnkdf1GQV6ukEXwiTS2o3pD/T aiQXKipb8uOlrDf2XP5Zwo+0gIXblSQ9vSxgk9/BDI7QBGv3L7sG7PRT81UvZ1ujLKe7oR 7bBh1dObzJBnXhBTq27LsliR0ZhMd38GgMwQs91LSTentIb+JBVCA+4inug7RIzeruQtO+ D5Kv+nzNuhZjT6Kbsy0gqV1zdxZ6RbxZqNb86WkK1pSJ5Hs3TGfgad6hYg19MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763747842; a=rsa-sha256; cv=none; b=g9CRuOXQ3LKAxSQep8EtnI6xs+BKSitNBq9cO7A1ZlmBa5KJlP7W6jTh+nrxowjIqPfgyM MVdrl29ZY+mXgMqd9ADCcnN0+AoTXqdM8rpVa6WsuroIc3M2mo8974sXOWXJS1Z1gx/XP6 2Nz6WBPn7mdgQrfxkIBvIINaj9VqnsOUdGMDPN5+gnh/3kqqZG5ijODa2TMnIzb5hh5R4x mNAzLGvLK0b+yNLRCaSXvh+EI7Klm8s3ZzPEiIhlE6ryihCH9ltcYzFtTVc5jzavW4W5vF 4U2TooWn8MO1oiXOAQLlm0RUnEBN+T7UNFOTruUkO4YRJ5s1nmBOwjdkK1rJsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCjbk58nnz75v for ; Fri, 21 Nov 2025 17:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21e70 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 17:57:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: f0bb9d28eb3c - stable/15 - freebsd-tips: Add a shell function for laptops List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: f0bb9d28eb3cb29b6e8f2ecd7de4e743dfbebc98 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 17:57:22 +0000 Message-Id: <6920a802.21e70.241caeba@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=f0bb9d28eb3cb29b6e8f2ecd7de4e743dfbebc98 commit f0bb9d28eb3cb29b6e8f2ecd7de4e743dfbebc98 Author: Alexander Ziaee AuthorDate: 2025-11-14 14:40:44 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-21 17:56:44 +0000 freebsd-tips: Add a shell function for laptops MFC after: 3 days Reviewed by: pauamma_gundo.com Differential Revision: https://reviews.freebsd.org/D53748 (cherry picked from commit 42d9ae4945f281d12f3ef96cdbd7356e067f8b18) --- usr.bin/fortune/datfiles/freebsd-tips | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips index 6a2b59ff5fa7..379f772fea88 100644 --- a/usr.bin/fortune/datfiles/freebsd-tips +++ b/usr.bin/fortune/datfiles/freebsd-tips @@ -860,3 +860,11 @@ When netstat reports every 8 seconds, it tells traffic in bits per second: $ netstat -I bge0 8 % +Using vt(4) on a laptop? Try this sh(1) function. It provides an "h" +command that prints the last 22 commands executed, the time, remaining +battery life, and current working directory: + +h() { fc -l -22; printf "%s\n" "`date +%H:%M` -- `apm -l`% -- `pwd`"; } + + -- Alexander Ziaee +% From nobody Fri Nov 21 17:57:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCjbm1GJ2z6HXQP for ; Fri, 21 Nov 2025 17:57: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCjbl6c0gz3MH6 for ; Fri, 21 Nov 2025 17:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R2Z1KW7Ms2hK5LO9dERplIbXsYMvpvsFIL/WGZAoFrs=; b=BukQHIX8mmVyNDphawZCq3w3ts8AH8pb9foXAG0w2vcUy7Y59VEw1F+W6Zq11bS1/UJwHm ecwjXkyLUDPfW/z2gXihs37Os7XEeADG0gk6lNaAoLtGfycoBwx02PhwXCodnkSGugzTUE wCswQMv0iVqXidC7TlQNhjrCI1l9bMHVnSw+WfBoCeFz+ML55iJdl0QTZwyqJvkV+HMSe7 L9A94f8n95HveODyVo2URxyJHcJK0CHbrSvEWZyhsfX8dCNxPhmbfghdqN84Kq4dlIRbP6 FPLlkQBIoMFSB2f+NSy6uTVmpiE/tf44N6pOVsiCZYSR1fRUO1/5BwVpdem5yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R2Z1KW7Ms2hK5LO9dERplIbXsYMvpvsFIL/WGZAoFrs=; b=BkVa4ar6AHis2Ci4ZqmDJzEWkjb8PtFYXh6yzPuBUfbPqnceMLIwf1AlYkX0A5b1MP1rkf KEegKqY+O234cBHog/toYI4/L6CUKEb0Us7k53kG4VoaEmNB0sBj3KAvEDzcrXPWzQDfck i4VFgBuD1GHxBcn+S3mSky4MH4XbMelDznRJ5kv0/qkh/qbD4gX4xH4U96PVuOuVoZ0YHK o0bFrBRY1h6YOUOch9ctMmS6b10ELT91lbgR4qwRHpSGQ7iz4N3Kvv7RdIxqf5wn9hppHn UPjDSa3uiqxjBmT/i1YlCHp3XJXDFa3hPY7wi+7UdZ907kuPuq06Xk9ILEMPXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763747844; a=rsa-sha256; cv=none; b=Ir9fzJAmOMFaM7UZfpwYarPPGfZAVmqGi6CHcITSrPh0kCowNRRUmVBRWM8L5/K/yQ5PFU evNINCiSl2Mq1hyBnD0e1hwobPaTBI1qecINjt5cxtdCr/OkrkhPd4JenAIOpZ4OT3lXTL KjLLDZAH+X0xnJUSmPHFT05aPd6wCMKXuCzolvmTxynCvLawRg7+HK9TdxYnJjGjDj4ROi HmopqeR82WmFEOwM9zoR7Z554pDwX8czjbt0l8rq6u0ywcDLtUVkQwlWBJ18WnTEBiV/9M 0gwvR869pOEaN9yRd7bUQ34yJ8ep4CAamJ5wdnk33HEufP7jYjuwRUa9LGwW3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCjbl5t0Dz73b for ; Fri, 21 Nov 2025 17:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ee54 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 17:57:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 3035855815c2 - stable/15 - loader manuals: Clarify console and boot_serial List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 3035855815c2fdbe27b65b9ec0374f4583ceb3f5 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 17:57:23 +0000 Message-Id: <6920a803.ee54.7fa85734@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=3035855815c2fdbe27b65b9ec0374f4583ceb3f5 commit 3035855815c2fdbe27b65b9ec0374f4583ceb3f5 Author: Alexander Ziaee AuthorDate: 2025-11-14 14:41:57 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-21 17:56:56 +0000 loader manuals: Clarify console and boot_serial console=comconsole is for the loader and boot_serial is for the kernel. I think we should centralize documentation on the loader settings in one manual, such a loader.8. The current proliferation is not obvious where to find the documentation. To the user, these are all set in loader.conf or at the loader prompt. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53695 (cherry picked from commit 09ffaa4e07d749c83cc1db13829505f21b025f29) --- stand/defaults/loader.conf.5 | 3 +++ stand/man/loader_simp.8 | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index b1661e8c1101..8c43bb62a135 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -343,6 +343,9 @@ selects the video console which prevents any input and hides all output replacing it with .Dq spinning character (useful for embedded products and such). +This setting is for the +.Xr loader 8 +only and does not set the kernel output. .It Va screen.font Set font size for framebuffer mode. The default font size is selected based on screen resolution. diff --git a/stand/man/loader_simp.8 b/stand/man/loader_simp.8 index 683ca8b2da5d..52cb598fdd89 100644 --- a/stand/man/loader_simp.8 +++ b/stand/man/loader_simp.8 @@ -358,8 +358,8 @@ in .Xr kenv 1 , not for any particular value. .It Va boot_serial -Force the use of a serial console even when an internal console -is present. +Force the use of a serial console for the kernel +even when an internal console is present. .It Va boot_single Prevents the kernel from initiating a multi-user startup; instead, a single-user mode will be entered when the kernel has finished From nobody Fri Nov 21 17:57:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCjbn21R7z6HXQS for ; Fri, 21 Nov 2025 17:57: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCjbm70Njz3M61 for ; Fri, 21 Nov 2025 17:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GJaVvXHHQ001l1S1MIorQDKRvYg1xwr1XfdGg57TH2c=; b=Tc28w1DQP8Z6ukn/CNAM8k87FzfZq0upysKf0HEf8nK7vNXiDVyLRppHescu3yVIdkIPmI xfVxgcrYCN1k+5Ubs8Z+9mTbrHSqbigEWlNGTeuPijXl9n+T5Or/QZdF9oGaKoYZrOC2Cw wZb7sYKcNN3mriLOBR9aXmDGbas+k1NAsB0kkYl8SDRfQGz0eapSw7T5btX0N0CXsm0TZv I/ql2Jifmuw1YPfGvW4R5aNkk38ZzLCGRv3/81nTnpoVty7hyo4WUDMwySpO/om9MKLwf/ twwFfn3UyDJ2DiKfD9pCX0TftMTqEzGLj5hs3ocSPMQ1fL6DNgcOxSm2k7Q50A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GJaVvXHHQ001l1S1MIorQDKRvYg1xwr1XfdGg57TH2c=; b=aneKXIul/zkyIdGfWEkBo6Ef4LrxEf6irVYx4egncLU4UQCFzZMADxmIZCQNIK8LCcn/37 SqgdaLlhkmB3+XmZ+ul73OPeXDEF8iYZ9Nwb/GU2N3sE8aIvbze1szK7JawzzSVT099W/6 xrq9/tjjbvT8YGO5TUA+lK2UkDTdNByiY56fCZDU7usWXBFLnefA+0QFDqM6gPhcZr8GIK UbjxgZPgH60rBHfIDVPB/2CctR2aue7bDHsYdqjoral914AfcZeCquqyix3t9rPm7YGum3 V5v/csK9qbBDqwWXoJzDD+omYksA5FfwBcEQHdEahbzlbqnNDexx6zNxr/aY9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763747845; a=rsa-sha256; cv=none; b=O7fGIs5Ya9H692VJS2d8z42ulg+bopc7h8bZPVC+W5Ud55ycYkYXeuHSAEDQ34HJ03mCsw xL9YMZrWEFYGkNxn954E5qDnowiNeFPm8gnJLdq5UJImmplgA2ZeUIhHye33QMMrChwj2F usSskL+nfZQlnsDpHaHbgcpRgUl6DgnaQaabcif+1qyw3wZWTbUiYs8FU7DKrleK8bdmNt fLbRfBU4QQfn9e7HyMvN4mVfR48DfQ/22TbTI4zHujgzzTLj+SmEo4jpZ316e5ofGyaFmn ycwACFd92stEyER1PcMFoFPe3MKkNyo5v8LkIJILLo7ija0FY+QubpOIQxYcKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCjbm6Trzz6B2 for ; Fri, 21 Nov 2025 17:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d4a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 17:57:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 513b9db1a829 - stable/15 - loader.8: Document module commands List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 513b9db1a829b4efba91c86f280ba97b26c82c1f Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 17:57:24 +0000 Message-Id: <6920a804.22d4a.5641d076@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=513b9db1a829b4efba91c86f280ba97b26c82c1f commit 513b9db1a829b4efba91c86f280ba97b26c82c1f Author: Alexander Ziaee AuthorDate: 2025-11-14 14:59:09 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-21 17:57:22 +0000 loader.8: Document module commands Begin documenting module loader commands in loader(8), where the reader would look for them. Segregate them by their availability in individual loader implementations, like build(7) targets. These details were graciously donated by kevans. MFC after: 3 days Reviewed by: kevans Co-authored-by: Kyle Evans Differential Revision: https://reviews.freebsd.org/D50727 (cherry picked from commit 6fb0d67819f730e8def56e139f780eff3c0cab0f) --- stand/man/loader.8 | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/stand/man/loader.8 b/stand/man/loader.8 index 234eabd571e0..484e0a7b300c 100644 --- a/stand/man/loader.8 +++ b/stand/man/loader.8 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 29, 2021 +.Dd November 14, 2025 .Dt LOADER 8 .Os .Sh NAME @@ -89,6 +89,52 @@ The commands common to all interpreters are described in the .Xr loader_simp 8 .Dq BUILTIN COMMANDS section. +.Pp +The following commands are only available in +.Xr loader_lua 8 +and +.Xr loader_4th 8 : +.Pp +.Bl -tag -width indent -compact +.\" sort the following entries according to the second field +.It Ic boot-conf +Load the +.Nm +config and commence the autoboot sequence. +.Pp +.It Ic read-conf Ar file +Load the specified configuration file. +.Pp +.It Ic reload-conf +Revert any previously applied settings, and reload the configuration. +Set comands that were executed at the command line to override variables +previously +.Cm set +by +.Xr loader.conf 5 +configuration will also be reverted, +along with any module options that were toggled. +.Pp +.It Ic enable-module Ar kmod-name +.It Ic disable-module Ar kmod-name +.It Ic toggle-module Ar kmod-name +Enable, disable, or toggle loading of the kernel module named +.Dq Ar kmod-name . +.Pp +.It Ic show-module-options +Describe all modules the +.Nm +is aware of, and show if they are enabled or not. +.El +.Pp +The following command is only available in +.Xr loader_lua 8 : +.Pp +.Bl -tag -width indent -compact +.It Ic disable-device Ar device +Set a newbus hint to disable the +.Ar device . +.El .Ss BUILTIN ENVIRONMENT VARIABLES The environment variables common to all interpreters are described in the .Xr loader_simp 8 From nobody Fri Nov 21 20:45:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCnKm1Ndrz6HkMx for ; Fri, 21 Nov 2025 20:45:32 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCnKl5sjgz3sBp for ; Fri, 21 Nov 2025 20:45:31 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-io1-xd2c.google.com with SMTP id ca18e2360f4ac-94861514a5cso92306539f.1 for ; Fri, 21 Nov 2025 12:45:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1763757929; x=1764362729; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=7JgDoej/tCxpYVslowomV5KKfP4jyd+dgZqrE2L1vZ8=; b=WTDBsIEFBsl4Ip/HYAPE7e/Pmb0iYJGD/39RK6UQ66H10sedR4BG8ykJ1RrNDAyFeM K9pEH4K7ZwtGnCzShDlWovueHr/+plzpmHgBS6bLsDHcO8izbAaNy6B5gUjH3iIysw2O 0jdMEafKOG+6nt5tTEWTOk9AU+7xIZi6NIdlRdnAeGpg9WvvzV/YWfTgJTSiCpUAdJHC EvKxaor5Nb9v0ve2tnHDUKcca2BZFpJbOlYmzVde070QPNw8UqRjKWJ2G1tPC5+3eXoC /21gP93Z4ToT6PdmQ94WtkuHFIW232Ug21HNPBXBN7wRYeIq5l6bliCwjrsmj/WCpark PzYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763757929; x=1764362729; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7JgDoej/tCxpYVslowomV5KKfP4jyd+dgZqrE2L1vZ8=; b=wCK58llxMs8IjUTI5uWBWQyL0r+31cNh/XPB9p9pXQvtZcvXLgbackm1fyvwRvZF6l MhnknrIB28M4XwfKuYkK730rvIorcnlJRkKbcbIXupell/3OPOWkclcLn8ph6amYmNs5 enJ1C5RUxGytkIzDCaCpQrEcYRF+89l/HJmyYJVDmHvmEuKzHn1MJ71SOlOpvlu5J1j5 M45i3XCCuDaht5NXmKZCzO2PvOUlDdhjZnNDmLVTYIWYPSDEZpfEpq6ZQhUYF83NY0Yh c+5hTJXt5dR6bT+LPIPCmME3HtPnrPCqZrPCYE0uZI1uHoYcVadP6GzWCIdA6Qrdk5vy Av0g== X-Forwarded-Encrypted: i=1; AJvYcCUXvc63P4eB9NBiFTBon9DseS1ZGQc9XgNq/UDj+olwKq00TJtJocAab1pLdMNBI4l7JLgHUh/23s5KTIirNqGmDSuC@freebsd.org X-Gm-Message-State: AOJu0YyDaeCkBL/PLS1BvcJnHePtrhhUMgw1dss3BGwuguttY1eJwu6Z afaD1PKqxJc7ByM39TFm7kbrzluzeeOlbz1BCqpHgZtWR2xqpuedpCh9zM4uNJqxbhk= X-Gm-Gg: ASbGnctLRheTZq+QSZ4y0mEQsNwcYK84n5K8FOmM9aTlNkosv5IFZ5RCQWIXCOSNaLB 1iHjLqO/hSGzQpi2u0Bql/6ItgUi2s6fLSx1lLVJz5wfBeBVnfIwC4gI0IcncEWoCRBj1cerC0E fo/M+elWgHOZOjLf+E9nAaLjaf4WLTqXQyITQSWfLbVJ7zR7B4biNLULYs9ErB2GhfnYq/xl2dN 395KdK24vEB7z8hBjM8e7F6mz0NKhu9MHSvPq0ZSjJnXxrYJGXn9uM0IzrlrshGyrkV/nV81qSV 39cS11lY3cu2wENnoiiAL6wmX2L2vyBPPO/kciaO3UkF1cfm5h/zSxvMVJ2JnLOglNXHHxoKEvU ZM4nWSP1Mz24VpGichyS67PKXVLA1pJzJNyYTLM/c5Qqh5fd3SAKBZ+EjJnMsOUWhP2qU X-Google-Smtp-Source: AGHT+IEaHmezyCRSayPAYNbrn2X95W9ksCTLcJlO/RBe5Y0bfrQW8YVTyAXE1fg4DD0/NTiv1Lc+hQ== X-Received: by 2002:a02:c995:0:b0:5b7:be8e:154f with SMTP id 8926c6da1cb9f-5b967acfc61mr2356926173.19.1763757929215; Fri, 21 Nov 2025 12:45:29 -0800 (PST) Received: from mutt-hbsd ([2001:470:4001:1::95]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-5b954b2122bsm2511397173.29.2025.11.21.12.45.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Nov 2025 12:45:28 -0800 (PST) Date: Fri, 21 Nov 2025 20:45:27 +0000 From: Shawn Webb To: Christos Margiolis Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 9d18115ca0ab - main - sound: Retire snd_mtx* wrappers Message-ID: X-Operating-System: FreeBSD mutt-hbsd 14.3-STABLE-HBSD FreeBSD 14.3-STABLE-HBSD HARDENEDBSD-14-STABLE amd64 X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <69209007.369f8.65e30118@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="yomcxtfjbtluxwi5" Content-Disposition: inline In-Reply-To: <69209007.369f8.65e30118@gitrepo.freebsd.org> X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dCnKl5sjgz3sBp --yomcxtfjbtluxwi5 Content-Type: text/plain; protected-headers=v1; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: Re: git: 9d18115ca0ab - main - sound: Retire snd_mtx* wrappers MIME-Version: 1.0 On Fri, Nov 21, 2025 at 04:15:03PM +0000, Christos Margiolis wrote: > The branch main has been updated by christos: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D9d18115ca0ab0ef3f34173d4e2= bdabec916d0b60 >=20 > commit 9d18115ca0ab0ef3f34173d4e2bdabec916d0b60 > Author: Christos Margiolis > AuthorDate: 2025-11-21 16:14:33 +0000 > Commit: Christos Margiolis > CommitDate: 2025-11-21 16:14:47 +0000 >=20 > sound: Retire snd_mtx* wrappers > =20 > Do not create mutexes with snd_mtxcreate(). It doesn't provide any > value, plus it first allocates the mutex with malloc(9). Allocate > mutexes in the stack and use mtx_* functions directly instead of the > snd_mtx* wrappers. > =20 > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Reviewed by: kib, markj > Differential Revision: https://reviews.freebsd.org/D53855 Hey Christos, I'm getting the following error on buildkernel: =3D=3D=3D=3D BEGIN LOG =3D=3D=3D=3D /usr/src/sys/dev/sound/pci/hdspe-pcm.c:726:3: error: call to undeclared fun= ction 'snd_mtxunlock'; ISO C99 and later do not support implicit function d= eclarations [-Werror,-Wimplicit-function-declaration] 726 | snd_mtxunlock(sc->lock); | ^ 1 error generated. --- hdspe-pcm.o --- =3D=3D=3D=3D END LOG =3D=3D=3D=3D Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Signal Username: shawn_webb.74 Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50 https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --yomcxtfjbtluxwi5 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmkgz2AACgkQ/y5nonf4 4frpgg/9ENCUZj7tDCOqelOZK49s9gLmU4fOCEuj2eLLZDgCmoTNp41RfixXAd/I M57SI2ZmwGM7R5x45N4rMfhwtV906DQwsQHNh3Ezb5jlhvNPiqTHYmKMnXCcDBuI +z44RZKbjJeZGzcRp72Mo+1w3AF+JOxY7bb7ui7n9TDVScrYlN5BKU8rsX/77BO5 WV8IeNapDHTg1368hEipwptlIST1a9eaH+QSP4VR90qqlEC0+cxMx1xpbRpYKzF/ zgc7w5MbFgpO6y/iAm6kiwgszuD3UjslvRiDfL2HUzJtwM30Tm++poMi45/52qLE 4k0ew9R67XPLfGXFYl1st5hSobTpn9WDjrEc4CuU4TKT5iFeA55PP2RQzXnlvb0k kXiuOx2h35c5/QOVQ01mLo0ywaLFw4fH+DELq0rgrLBBmjc2sgczmljYyoBjo9UB YY6xcEWhQxoTP0o8iTDNHZXrbh3WO20Q5/LeInL64yOPVIujktz/nyCeu8x6wQaK nk4vZnZa1GOGWKWe4oViVK1+ezqTCtBMdALcVvMnv/NRfT1SrI4h2x7OE0y+fIru dJLQGGkBCb05ati6VA58s/dBBP4baZIFosZfRTagnB9FWjlbnMYAT5HnRffL7taA BlBE7FFratiwAxiD9SOHjj1T4Mug4UtHQw4YTXvrJuVI70rqlj8= =OViC -----END PGP SIGNATURE----- --yomcxtfjbtluxwi5-- From nobody Fri Nov 21 20:46:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCnLl269cz6Hkk7 for ; Fri, 21 Nov 2025 20:46:23 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCnLk1WTJz3sb1 for ; Fri, 21 Nov 2025 20:46:22 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hardenedbsd.org header.s=google header.b=QxeoLVwe; dmarc=pass (policy=none) header.from=hardenedbsd.org; spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::d30 as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-94880628ffaso82558939f.0 for ; Fri, 21 Nov 2025 12:46:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1763757980; x=1764362780; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=oPa4Hhnwj/zKWdUiLlDCtPxtxBihWcy92oJxD3ELs7g=; b=QxeoLVwe4X0GAWiRZelD9i8osiJMJVYKiNxkfb++aqmV+jmMcLSjbbhKccCvnez+f2 nZNgfX1LhjWbktZ4vSzhkM+hIttbSyjwtB4BJXEBdTsXENJ1F3PAHVMEqlMHmjMTTIpw eoftPZiU3fz41sMZYsxf3Pf6TbGdURR8pe3ZxqTth9baWaNMMIbx1nQGZVEMZpH+3x+f 20bndZuxvGYjBfWfGcN4OK0bnKPDBaEKF/AkcJDh5odlpqQ8PbGZu7YXREmB4ODYc2Tw 48TNhZtoIdO72GGuQ+uQynu9hVrRJYOEWqo1h40oygdy4EqUAGmfPdCW5ribydGd5PSG iD2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763757980; x=1764362780; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oPa4Hhnwj/zKWdUiLlDCtPxtxBihWcy92oJxD3ELs7g=; b=fwkL6DZZ4F4op0M9cYoUQdrlThDqCIZYb6ZqGwimg046EJsudMpJ7BiDrQRT9MIOWQ 0yTFGXW2W7CMxviHEBYVjgB5Gk8a4emLp4sdl6Yo/dbqhBZq5NGzRY+MNnxzVjJc7R7g bIwaACdz9CFNK+oFxDJ57LiIq9Xwjbik2a8FSZgjbKyxViLOrrEN04wY+HBI+GcS4SGL 6vR2kBl2gMDva+kwQHXivEKV83VoeL3mRkzVwU9l9iwzqUN0wMzn9TErprlP+lzOazLn 2OI6PUwvhKUjfE+G7EMyLXdLe7FFuiwHQ7HNwGAG61hKyRv90wJz9kf1/O0+GMAkVkG7 2m8Q== X-Forwarded-Encrypted: i=1; AJvYcCWueNCFfr1bYste83f1J38b9JrCHLOpv0AzX76vPPMcBVCpUHmXzaUgpzTk3oxxTbsTKkaD8kq7pKWca3R3i0q5YFI7@freebsd.org X-Gm-Message-State: AOJu0Yzj4Mpw1l/whBf8YzyKU7g8a4WXNhhAdjGYSmPCo7xChjNkw1fW 392yXNwjox98sbnNv8DQ2kd4lLKcJFItJOxiqIzhZN20tXDFGBQmlSQbswHemFEvkU8= X-Gm-Gg: ASbGncvjoKnn/LuTN6uQnbPIs3m/HhGYiTkIdwdxHsL/kHOUBb5p5ZCft5lDtAca+YG PuW8doLYi9hUdTzeRddzYsoLZsn0j+bVoS+wMIdk3HtvQtfLKbx8+EUBC9pvoHVdaVJan57sbSe l/JU5JOj2zpLXHQpMcyi2FR/IefgtRtEz5tytjLyAL4nMB5qY/jc4OyNpvpRMWYPEdXd04Bmu4i EoNAkJGiM+hZYyJId/NDW/QJGfuahfqvTLUGkDBfMkwgNzjQTN9AdZRX0cRp4HgBYxFXZ7ZWvEY AeWQVi4F90Ob8eX6h/H455gupG3h0ut2RleXb5QLLZs+OQhVrQFXAJohix8XHXFBWT7RK3NNDNh 8ebojXjRoUM6UwzIlkyupXp6i32I2x5y05V6ucNmreCDRKx/Pc7yLCpAr2TGVXvkTDDuM X-Google-Smtp-Source: AGHT+IH4HTdsoF/ujSDWYURs0IQV3nBv3wNNilRNFetNGU4sBnWcTGyspBPmTADlrCnAJybOrWqwxg== X-Received: by 2002:a05:6638:8721:b0:5b7:10ea:e2a7 with SMTP id 8926c6da1cb9f-5b965b1af7bmr3177228173.8.1763757979916; Fri, 21 Nov 2025 12:46:19 -0800 (PST) Received: from mutt-hbsd ([2001:470:4001:1::95]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-5b954a501d1sm2492523173.16.2025.11.21.12.46.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Nov 2025 12:46:19 -0800 (PST) Date: Fri, 21 Nov 2025 20:46:18 +0000 From: Shawn Webb To: Christos Margiolis Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 9d18115ca0ab - main - sound: Retire snd_mtx* wrappers Message-ID: X-Operating-System: FreeBSD mutt-hbsd 14.3-STABLE-HBSD FreeBSD 14.3-STABLE-HBSD HARDENEDBSD-14-STABLE amd64 X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <69209007.369f8.65e30118@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="g6rt7fkzi6mxchvd" Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ----- X-Spamd-Result: default: False [-5.60 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[hardenedbsd.org,none]; MID_RHS_NOT_FQDN(0.50)[]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::d30:from]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_THREE(0.00)[4]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; DKIM_TRACE(0.00)[hardenedbsd.org:+] X-Rspamd-Queue-Id: 4dCnLk1WTJz3sb1 --g6rt7fkzi6mxchvd Content-Type: text/plain; protected-headers=v1; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: Re: git: 9d18115ca0ab - main - sound: Retire snd_mtx* wrappers MIME-Version: 1.0 On Fri, Nov 21, 2025 at 08:45:27PM +0000, Shawn Webb wrote: > On Fri, Nov 21, 2025 at 04:15:03PM +0000, Christos Margiolis wrote: > > The branch main has been updated by christos: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D9d18115ca0ab0ef3f34173d4= e2bdabec916d0b60 > >=20 > > commit 9d18115ca0ab0ef3f34173d4e2bdabec916d0b60 > > Author: Christos Margiolis > > AuthorDate: 2025-11-21 16:14:33 +0000 > > Commit: Christos Margiolis > > CommitDate: 2025-11-21 16:14:47 +0000 > >=20 > > sound: Retire snd_mtx* wrappers > > =20 > > Do not create mutexes with snd_mtxcreate(). It doesn't provide any > > value, plus it first allocates the mutex with malloc(9). Allocate > > mutexes in the stack and use mtx_* functions directly instead of the > > snd_mtx* wrappers. > > =20 > > Sponsored by: The FreeBSD Foundation > > MFC after: 1 week > > Reviewed by: kib, markj > > Differential Revision: https://reviews.freebsd.org/D53855 >=20 > Hey Christos, >=20 > I'm getting the following error on buildkernel: >=20 > =3D=3D=3D=3D BEGIN LOG =3D=3D=3D=3D > /usr/src/sys/dev/sound/pci/hdspe-pcm.c:726:3: error: call to undeclared f= unction 'snd_mtxunlock'; ISO C99 and later do not support implicit function= declarations [-Werror,-Wimplicit-function-declaration] > 726 | snd_mtxunlock(sc->lock); > | ^ > 1 error generated. > --- hdspe-pcm.o --- > =3D=3D=3D=3D END LOG =3D=3D=3D=3D Never mind. I didn't realize HardenedBSD had a change to that file. Sorry for the noise! --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Signal Username: shawn_webb.74 Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50 https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --g6rt7fkzi6mxchvd Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmkgz5oACgkQ/y5nonf4 4fq0PQ/9Gy5dzYOscqplx0tQKfutUcCFv0bSuKigaSMMl9Y8ToyK+oZgKMFJc62F 6AA4n2vaEK5GBxe9vr/jDyjVKM43oAHuXaK8nMYdZUZW2N/xRN+sesqBB+WfCO1y Xsuz4tKBQ7F4y21TX0eegjK6rixPNhPr2r29KhQz9Cg7O3H7Hc/RhifXIl6vKYN5 HYpbIgYuNcoS/kg2/HU8BhrksofQwLB1Ha2LBN57R3FLhFjva+Btlwb0Ic5P6JHQ bpG+pOdxhV90eJBbRpgZRwE1wlnjdEtHuGcDRidFlEXeb/J2mekMpLyiLmjZ82WK kT2zVO+AGGrHs+nPAoZLURGrvGOLo7MXCDbsuw1F4R5r982XByJVW9oqYKHMoUyd E/o1qBa5vylnUQtYfvWKlM7qj90ny5VfrPXfmXzmSp2S5sJ9GJu1dJRmeHEyow44 zyepW5lzoqB5gOvf1CojpTAXD3bFZWd4qBSOuvoRv74/5LY+kGkzm9vOtUOpoGbX 7aB7h3nqu7iub762hJQFdt3EoqBRmlRr/X0EMszqT0DDnUke/kj1DTrT6nET/23M X6Oi8YHxfjBvE/Tmq1tTPfh22eDxz8PAVJ3XpJS8fC9syj5fhisOr0qBzS/xblWd yUOzq5unzcIkFQ5pXG8L+bbcV+GLqSmeRjiUTMGDb6iLV5iBy80= =1t/x -----END PGP SIGNATURE----- --g6rt7fkzi6mxchvd-- From nobody Fri Nov 21 22:44:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCqz76TF0z6Hsx5 for ; Fri, 21 Nov 2025 22: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCqz74fRdz45vc for ; Fri, 21 Nov 2025 22: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=1763765075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AalLcLbz82ahgocolHIfDownVanz+jeA0b4zbPlyG5Q=; b=W1nomrFabj7/mYCMU9aKkUdRGKAtWr08iBH8bXLtT0NXR2tUL2NXvfB/GGf6Zo1prRKwX5 viRkbpuwIlIoP/v6eAnFQF/wjigCywXQG7hE+wL7+0/kbmzefhpATMiV1QDJ0iMekc5/9s uC+glMl7WQW244LRTGPMU9f6T8sBokxPD2G6WJ6W6XAKCCDLpZ8iAcNcV2wjZsOYzCQM9I G6dOxODDoXP/+Rz7HXf8jN5m9x/dM9Os2lzUJcKfYLwu5kNeTqAjYegeoLHxUC3fgYBIRM YYAvJ4ECqI3kWz7ApVRGWnyxCtYszhs93qsUzWFBNpGaLiZKg3KdNy/Wd7r7Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763765075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AalLcLbz82ahgocolHIfDownVanz+jeA0b4zbPlyG5Q=; b=wHdjbUjdVbpnLOuNNeh2Xq/xikNkhBKDZ/XoBzwATBo+DIymYtH/TfMzulnLpqenmpHCXq VVkcvrBUVWHiPBKUrP8lPncVDbuDP1hkZJvfybNtfnp1ctasBjIxQJJQlwmLGakvu4y0YE VRGmkrDk2wVwNyaZPeDhuUA3yDvpXn7LTsgIAp+4gZd6Y56KYsmvhxiGhqeUnwYqTo1mXF Jkp5soHBXDfH3PiCPDb/7VaCs/qNmWb5oGUO/cFN9aJZ4XTV3/Ml/3IWZmoqwK5kJhjwSF oveXjLJVc+nw/gDK8WVfvU10hxn8eOt0bD52CUrdAw4FwL7fPvT32RioGjc6LA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763765075; a=rsa-sha256; cv=none; b=YtSzP4DybWMpDKh+JbB0ceCOoh/KDsbiV6kWx1VHTkXQ12E9bFmjHPZwqSXTNL/YH2UpKj tvxIWVxWdpW+2Es5ig4l+ODIVu1A9d7ZubQKyGVnlVF2I/PMJhWhpDtmkWbEedPDa+aA58 VksknNbtylPWHScjK2hvMi77+6CJv5irD3RfXmLvoTnlws3W4i3ltFDwMo+YCwnnt1bbcq t7VcMS1h4wtprhSPVxhOdOnqZOHyxKh1HZpu55H9b06N85T0EhUKDHbF4WmiUg8d+0068P 51zyCuD6hYBX/9+mTT6e8ZdhXFqDm3BCl2lUh7MiBimXcHZtzSL1LSMQ/6TifA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCqz74FKgzXP1 for ; Fri, 21 Nov 2025 22:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eb16 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 22:44:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: fd0296154d47 - main - mbuf: allow const pointer for m_rcvif() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd0296154d471daeaf113672cb989d5abea9a610 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 22:44:35 +0000 Message-Id: <6920eb53.3eb16.788781a2@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=fd0296154d471daeaf113672cb989d5abea9a610 commit fd0296154d471daeaf113672cb989d5abea9a610 Author: Gleb Smirnoff AuthorDate: 2025-11-21 22:43:47 +0000 Commit: Gleb Smirnoff CommitDate: 2025-11-21 22:43:47 +0000 mbuf: allow const pointer for m_rcvif() --- sys/sys/mbuf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index f9141bf70742..1f1b05857ebf 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1289,7 +1289,7 @@ m_align(struct mbuf *m, int len) /* Return the rcvif of a packet header. */ static __inline struct ifnet * -m_rcvif(struct mbuf *m) +m_rcvif(const struct mbuf *m) { M_ASSERTPKTHDR(m); From nobody Fri Nov 21 22:44:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCqz91Skyz6HtVP for ; Fri, 21 Nov 2025 22:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCqz863bvz46KW for ; Fri, 21 Nov 2025 22:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763765076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tWVkSy2pzLQpRjEnHJifiy9YHxjf78Bs8p6mVSzC63g=; b=Lk1jQaToa2JSwquque3Q/PMXQjTRpVv1JeFMwCeceaYTMUKUk0/rLkX7iWkvufmgrsoowu UN7X06FG6OY1VUvjLAvUhOgpdzWnygoK5oFX6KTFywwADDSaQMwbWLVW4rh7ixc4i5LFcF fAHZeHN5OgB+zo/QcAIoK6ibvzNUWoBKZXOcGPqFtT4SaVsH17pmkw0LI/fFOGk+Txl4Df hgwDTiyfUZNtsAP/q7vFV1MHmNBa2atxABpDnoEHvla7MQ2TZWP4rwVaGK97H+ewjBYGe7 GaU6DYG2bTfibbrNe1c4PlRuCKo0VNChu3ouWwoTpdv7ZJrsA5rLMdxoIbD5ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763765076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tWVkSy2pzLQpRjEnHJifiy9YHxjf78Bs8p6mVSzC63g=; b=BSnkhcqQ4hftE9+XYIxh5Ae0iKLuh+cr8+jO1loVzq4ALBZKBOQiIOgpbBJx32m/l6D3X3 Iq6Jq3/zcw+A5kYugSCYnmKoohgSM0802Ugp73h8i0JvNXnJVH0qCNRU26YeV3sDHUDSKj QM0hZmwHg1g/uSHMJJlsf9qrxrgSNYdSTJgmbzALtuL6Ax7UuxpBQSp5lxgPrNeKsUkkoh 0vEpMMBwju2lJ9/4R42CI3w6YyFWKgCJ9XrMBbN3AwoCnvYHRy97+FTLrCnPco5Y205iLC kxml5DOk2vby5qps5AXTbjmaqOoJxpxL17tXT/zvB88r5wcOR/GyPlxW7ULPaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763765076; a=rsa-sha256; cv=none; b=xQohuHXwnUQJ6SZjLVwCxUpfiDtzBS056pnNclr3lxxUla1x0T7V9ro0y/KNdcCJ9PjOl/ iJG+LxC7vIph7WsG/bCuBKU/rKrjkRh61CplIWyB9bsSDrBeJBNPf/zO9+yAV5hhUvMb7G etTGtHkro6xdjeHvli7378TSa6v8fXRTlLmXveqvhLAI6QYsuSl+j5ONlOpUH8NefPaJ/l kbGG6DTwxidhncw61TRr3IdZU2WwqcmI/Js9NeXI8RtQRRPTBkjqZf01TgopYTjHowlLxs RevBlTi+lcn1IC4x9kX9tZNJUw3viK7caR9YvcM88oRFZgMciibQaczYP5Gjkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCqz8537SzXP2 for ; Fri, 21 Nov 2025 22:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e97c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 22:44:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 88b38d43f557 - main - ipfw: add extra parenthesis around ACTION_PTR() macro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88b38d43f557f59649c7c690cbd5f6ad61f2565a Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 22:44:36 +0000 Message-Id: <6920eb54.3e97c.7b3c4706@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=88b38d43f557f59649c7c690cbd5f6ad61f2565a commit 88b38d43f557f59649c7c690cbd5f6ad61f2565a Author: Gleb Smirnoff AuthorDate: 2025-11-21 22:43:47 +0000 Commit: Gleb Smirnoff CommitDate: 2025-11-21 22:43:47 +0000 ipfw: add extra parenthesis around ACTION_PTR() macro This allows to immediately dereference ipfw_insn member. --- sys/netinet/ip_fw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h index 51e68c310915..f3b2dc051c7d 100644 --- a/sys/netinet/ip_fw.h +++ b/sys/netinet/ip_fw.h @@ -752,7 +752,7 @@ struct ip_fw { #endif #define ACTION_PTR(rule) \ - (ipfw_insn *)( (u_int32_t *)((rule)->cmd) + ((rule)->act_ofs) ) + ((ipfw_insn *)( (uint32_t *)((rule)->cmd) + ((rule)->act_ofs) )) #define RULESIZE(rule) (sizeof(*(rule)) + (rule)->cmd_len * 4 - 4) From nobody Fri Nov 21 22:44:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCqzB1nKJz6Hsx9 for ; Fri, 21 Nov 2025 22:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCqz96Jkkz46CZ for ; Fri, 21 Nov 2025 22:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763765077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A15pRocztHab6yZIZpK+cydFwp30OlWa/Y1NzQbtvoU=; b=DE+735y2EHcIyhgJyFuImnMIrQWsryl7m9KFQ8C1ltoTwbuGUIuJxdu5IBT+OvbJ2U0SDb f8POeDMF9UqhkKa1o85Sf+fyN+9wUVzVfy9LGi09R1qB1OsGCoOFs/n8L5IbsZM3bJKlKS QugGyQx+n1fFgz/KJOJ84hd3tPzYFEMFGkLPXAT9k5xfbfdafLKUSOJ9Y6bYwvyNvCo1H5 t5k+ujKg8mOoNXrKAhnXFFCMRerkcB9xDvUWL4adUPIb+FYgYqJ4zzYxhmMp0jwSsCkpey 6FoyQsmXfIN3qQcWXpXPDaXeBlFyPXgObKuuYYkuvdCVxnPubtO0rx6qsr/ejA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763765077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A15pRocztHab6yZIZpK+cydFwp30OlWa/Y1NzQbtvoU=; b=vPKN9y/VZrkIpI/TXkN88P7/47v8ed6Eo3F6mpuDqVLzizQLPGkNalF/lg6ciA/TOczrls 9nspwyXSovhslpof/RTRdreEJ/LgJqbHIAU0SWtjQdX9670fCH0QHzv9syR9lfHBE/buEh mAWouTbplyjsypn5cl+m/fulBDnPJthEFa6X/WANJNmfEXQfk5fw0uzdwCazEEg2fItu7M 8k845YDiV3I9AXVTdc1x26lxZXTnStp/4yFKfDHY12VveagnUqphmOmt+PYy3ubmcKp5a4 KLQKzAQq/BDaeO9K5sy1/aZauq7c8qDSj2AZnQa1vxvHLg7AP2W8HPaNBLgKWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763765077; a=rsa-sha256; cv=none; b=NAb8mGG35D9goNf++9XvfqbrUNp4B6ptdN16khUqdP36kBimK0DSHLN4o2wmTa0a06D4s0 eACA0SSOlR2sZeRkZEZ+PgWRu5VEqtjLEYlsY55B35eZGZod6+VUKYvoBl5a1jIQHY+UHr pP6wx+9eNeYODz2ccWprf2sGqsTjSD435iy4kyXtIsbny2/tl504+cWurqvWIcJAW56dww m0KFnS+bJnEkifITQlj/ceCvQmiSakneGPEnRjI8DsVIekA7p6Ug9YNb1VymNpE8yuPee0 FVXPUuvLQwS8R+KsT4/e3uTkOgrOU8Z0+vdXZyZanJzZaueuDrwfQ82V3NmIEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCqz95q6mzWgn for ; Fri, 21 Nov 2025 22:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ccee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 22:44:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 5469a3493b17 - main - bpf: remove dead code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5469a3493b17021a5272c4eb2e9d8024e424cd3b Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 22:44:37 +0000 Message-Id: <6920eb55.3ccee.1f581eac@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=5469a3493b17021a5272c4eb2e9d8024e424cd3b commit 5469a3493b17021a5272c4eb2e9d8024e424cd3b Author: Gleb Smirnoff AuthorDate: 2025-11-21 22:43:47 +0000 Commit: Gleb Smirnoff CommitDate: 2025-11-21 22:43:47 +0000 bpf: remove dead code Should have gone together with 9738277b5c66. --- sys/net/bpf.c | 24 ------------------------ sys/net/bpf.h | 1 - 2 files changed, 25 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index f598733773d0..d80eb8b80016 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -2828,30 +2828,6 @@ bpfattach2(struct ifnet *ifp, u_int dlt, u_int hdrlen, } #ifdef VIMAGE -/* - * When moving interfaces between vnet instances we need a way to - * query the dlt and hdrlen before detach so we can re-attch the if_bpf - * after the vmove. We unfortunately have no device driver infrastructure - * to query the interface for these values after creation/attach, thus - * add this as a workaround. - */ -int -bpf_get_bp_params(struct bpf_if *bp, u_int *bif_dlt, u_int *bif_hdrlen) -{ - - if (bp == NULL) - return (ENXIO); - if (bif_dlt == NULL && bif_hdrlen == NULL) - return (0); - - if (bif_dlt != NULL) - *bif_dlt = bp->bif_dlt; - if (bif_hdrlen != NULL) - *bif_hdrlen = bp->bif_hdrlen; - - return (0); -} - /* * Detach descriptors on interface's vmove event. */ diff --git a/sys/net/bpf.h b/sys/net/bpf.h index 486e3f59f7d5..dfb8373bb329 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -428,7 +428,6 @@ void bpfattach2(struct ifnet *, u_int, u_int, struct bpf_if **); void bpfdetach(struct ifnet *); bool bpf_peers_present_if(struct ifnet *); #ifdef VIMAGE -int bpf_get_bp_params(struct bpf_if *, u_int *, u_int *); void bpf_ifdetach(struct ifnet *); #endif From nobody Fri Nov 21 22:44:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCqzC2bgHz6HsxB for ; Fri, 21 Nov 2025 22:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCqzB6swTz46NQ for ; Fri, 21 Nov 2025 22:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763765079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QcbMtXMpv+XbBCyC3DQoJ+/gvBw1itJjiABGdT9u1f8=; b=w6M4C6ile9lrs/c6ygV5qeBK3xnsPFIe8ZZJG2cfyoVGN3ZP2DDsufZOKFAJ//W7tro+Wb BbMFb7zeRf+8KFj4Wo7fWz14675bSyn57ccTYn7yshNo9Qyv5t+EX62NZKj/Ndf127U21P w0PEDmsV4bGR/4v03UvtjtLTZjbq2wODemyUV0UY5DwqjUbqasolP1ZyiUZPFVc3C9rgYb 63hGV4IphOWzb8mlEEOAPhMwXS6L3Ad0LsyYQfU6AZQ3jIh2ZMMsMlTY8pTsiD/UKyYMur teZIt3GpynRN9XUnLL7coFolWdgwju+Kbs2bVKlN4tCu+J3GYjWqPc0W+fnjEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763765079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QcbMtXMpv+XbBCyC3DQoJ+/gvBw1itJjiABGdT9u1f8=; b=ugxZjdDomkfvj5fii0maXt9FcZ6SmGQBcKXoo2Y5r41GH5+njtopVLJPTXplzUBgzyJLr7 /Xbp3lfnqDrtFO3N6FiyTYNMlzH6OiMsgLaNvzYWt6FFchjJTrhiGUsI248CfXhzOGGMiA T1kdxLwvz6xSEwLmbWJCNBap+4NV2SmfQQ/W+ki56K2HUU5ZC0fJQts8dHACznwTpKHBhF 38+5r4Ty5MMVNaRtZEV1ef2HQHIwklJRlzkuv0YQsaFDWtwKuiuyIlCGWR7kWF8UwdaHxF sdgWAkJFFMbHdW5l6ELK9vELd7uODG32YCQd47HiN8KaIlLbVDAFOEpYYLG03Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763765079; a=rsa-sha256; cv=none; b=it76t4Mm3/JiGOc7cfFv7VkAQgaQLPhQ9qtRjqpA3SdRa1lgf5hUrdoOvZVE3PtUpfRJcx 4WC1FPFm6R1fNVRFnFCt19pVy5JsQtDjuxYw/Hn/Dnlcmu72yryBZMTJ+ls6tnLtGFqEcB g3pIlyvDZJ9GnpLkIezZaArBqInLN1QREj3QQFCsW3eOm+daVlQ9TC5M01t0a9QFwGzm2/ 2LkANSEVMPMHCPPi+uNMcI2e+CAO/abp8hZDALKOhamFBVkkcm+3ok53SKocWxoFMQkEI5 GLf4ifCiY7MKXKB1txDUJvzD25aZUx9UQkkQzlov3bDx2lR2vmzu31qH0H4k2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCqzB6DXNzXbW for ; Fri, 21 Nov 2025 22:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dbe0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 22:44:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: ff3ccf6f1a02 - main - bpf: refactor buffer pre-allocation for BIOCSETIF List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff3ccf6f1a020800605bca1bec66985eb7be56d3 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 22:44:38 +0000 Message-Id: <6920eb56.3dbe0.595b3eac@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ff3ccf6f1a020800605bca1bec66985eb7be56d3 commit ff3ccf6f1a020800605bca1bec66985eb7be56d3 Author: Gleb Smirnoff AuthorDate: 2025-11-21 22:43:47 +0000 Commit: Gleb Smirnoff CommitDate: 2025-11-21 22:43:47 +0000 bpf: refactor buffer pre-allocation for BIOCSETIF This basically refactors 4f42daa4a326f to use less indentation and variables. The code is still not race proof. --- sys/net/bpf.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index d80eb8b80016..0ce823412b91 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1609,33 +1609,28 @@ bpfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, * Set interface. */ case BIOCSETIF: - { - int alloc_buf, size; + /* + * Behavior here depends on the buffering model. If we're + * using kernel memory buffers, then we can allocate them here. + * If we're using zero-copy, then the user process must have + * registered buffers by the time we get here. + */ + BPFD_LOCK(d); + if (d->bd_bufmode == BPF_BUFMODE_BUFFER && + d->bd_sbuf == NULL) { + u_int size; - /* - * Behavior here depends on the buffering model. If - * we're using kernel memory buffers, then we can - * allocate them here. If we're using zero-copy, - * then the user process must have registered buffers - * by the time we get here. - */ - alloc_buf = 0; - BPFD_LOCK(d); - if (d->bd_bufmode == BPF_BUFMODE_BUFFER && - d->bd_sbuf == NULL) - alloc_buf = 1; + size = d->bd_bufsize; BPFD_UNLOCK(d); - if (alloc_buf) { - size = d->bd_bufsize; - error = bpf_buffer_ioctl_sblen(d, &size); - if (error != 0) - break; - } - BPF_LOCK(); - error = bpf_setif(d, (struct ifreq *)addr); - BPF_UNLOCK(); - break; - } + error = bpf_buffer_ioctl_sblen(d, &size); + if (error != 0) + break; + } else + BPFD_UNLOCK(d); + BPF_LOCK(); + error = bpf_setif(d, (struct ifreq *)addr); + BPF_UNLOCK(); + break; /* * Set read timeout. From nobody Fri Nov 21 22:52:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCr8M5zqNz6Htym for ; Fri, 21 Nov 2025 22:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCr8M4zRLz49fq for ; Fri, 21 Nov 2025 22:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763765555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gNHran4DOTtYPMI+LQ/Dp7Gf+2f1MakjSKxRJk7w3T4=; b=ALmB/WFJxQ/s2yaZulhF0pLsOOLf4VO+KN+Wrs+xrNaPPPhzktegH12/MN/DPdXHp63go0 7DClaja48DBXXfmj/dMkHnZgFfV0Erq9yfiK7fnOXbsf1oxuaiRwQmaeOf7b91JqtYBGBr lmvPblY8h+kUYZSnnl9yG2dJ65gHQpcml7IIXso9gWvOilzvztvezhz9w/V2eKjEZ0cgKZ OahuQTpyCt9RUufktFl6FYuqLqNQ2vlWcpodPQ28hg3ILUZwk9lGpuk/44x+oAXZKy32D/ BuQblXR4GVq5J1zbmpwTFizdVGJ9q0crWUkGOz3tMOlEfeBsdoRwVIqg+fyBEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763765555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gNHran4DOTtYPMI+LQ/Dp7Gf+2f1MakjSKxRJk7w3T4=; b=YWBpG0QW/S2mmM42HT0GpjnAfhDi4o+Y9CYrPDS+Tj+KwUZNJ2XyybkXTCnI5Yd6Rw8Zb6 KwARKp7AWZf45FeR3zbZIaKoT7QYSGxKIstvuZw9EcJG83vPVl8+O43GVm+5HsM6aOo4al ja/LmyqdwVwjXOK4xmFW3AFhvwCTfwSMW38qGglLcl1IZq67bisES8Rfbu9eeoe+lma/Q8 ldc5iBqUbFtDtU6BsrZtbWEoP0mZWFG4EhNL5iOuBu9ERI8Owcd+vt2zg2/sxnEZwoCqg8 EGGQQUfWtUF8TCdqbaL78mCmKovpyMO5wuc48Vnobr4QHLwnZuyTVaFTDhbKcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763765555; a=rsa-sha256; cv=none; b=N0XpbeI2EHO8KGGO9ofv35H40vWGdANtDvZbDzoB6JVSvonZLHu2DB/lgmL1if+qFhLOau i6kNH50LzqtxM/2LrXgNm2i1kEz8FvN84gaf1fZa2BQ6b1EhXmXSIS/QppSh8iAaZh6kMz C2+2jtXFs83rOrBUKsjpOuRmHEzOAp/5eLHhADIBh2OJycRSoaB9ER0eVEurIUwgIOTC4j mDTDaKw6SrQNiBm3jssyNRrxIlVHedcs4nLSiXs8Gpw1ZIS7P8PdViXUIs449zj5QP0UZp 97mkuWXQgdqkfzgz9WtD7YIzgvqQhxPCGkODoTGMGVPCgt01e7chAQRIGSwEZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCr8M4HrFzXqK for ; Fri, 21 Nov 2025 22:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f935 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 22:52:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: fd91012ebff2 - main - bpf: leave only locked version of bpf_detachd() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd91012ebff2b2ff66e8b6faaa3a934a67069a6a Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 22:52:35 +0000 Message-Id: <6920ed33.3f935.6fec3741@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=fd91012ebff2b2ff66e8b6faaa3a934a67069a6a commit fd91012ebff2b2ff66e8b6faaa3a934a67069a6a Author: Gleb Smirnoff AuthorDate: 2025-11-21 22:49:04 +0000 Commit: Gleb Smirnoff CommitDate: 2025-11-21 22:50:44 +0000 bpf: leave only locked version of bpf_detachd() The unlocked one is used only once. No functional change. --- sys/net/bpf.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 0ce823412b91..f2deeda8e1ee 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -192,8 +192,7 @@ static void bpfif_rele(struct bpf_if *); static void bpfd_ref(struct bpf_d *); static void bpfd_rele(struct bpf_d *); static void bpf_attachd(struct bpf_d *, struct bpf_if *); -static void bpf_detachd(struct bpf_d *); -static void bpf_detachd_locked(struct bpf_d *, bool); +static void bpf_detachd(struct bpf_d *, bool); static void bpfd_free(epoch_context_t); static int bpf_movein(struct uio *, int, struct ifnet *, struct mbuf **, struct sockaddr *, int *, struct bpf_d *); @@ -733,7 +732,7 @@ bpf_attachd(struct bpf_d *d, struct bpf_if *bp) op_w = V_bpf_optimize_writers || d->bd_writer; if (d->bd_bif != NULL) - bpf_detachd_locked(d, false); + bpf_detachd(d, false); /* * Point d at bp, and add d to the interface's list. * Since there are many applications using BPF for @@ -843,15 +842,7 @@ bpf_check_upgrade(u_long cmd, struct bpf_d *d, struct bpf_insn *fcode, * Detach a file from its interface. */ static void -bpf_detachd(struct bpf_d *d) -{ - BPF_LOCK(); - bpf_detachd_locked(d, false); - BPF_UNLOCK(); -} - -static void -bpf_detachd_locked(struct bpf_d *d, bool detached_ifp) +bpf_detachd(struct bpf_d *d, bool detached_ifp) { struct bpf_if *bp; struct ifnet *ifp; @@ -923,7 +914,9 @@ bpf_dtor(void *data) d->bd_state = BPF_IDLE; BPFD_UNLOCK(d); funsetown(&d->bd_sigio); - bpf_detachd(d); + BPF_LOCK(); + bpf_detachd(d, false); + BPF_UNLOCK(); #ifdef MAC mac_bpfdesc_destroy(d); #endif /* MAC */ @@ -2839,12 +2832,12 @@ bpf_ifdetach(struct ifnet *ifp) /* Detach common descriptors */ while ((d = CK_LIST_FIRST(&bp->bif_dlist)) != NULL) { - bpf_detachd_locked(d, true); + bpf_detachd(d, true); } /* Detach writer-only descriptors */ while ((d = CK_LIST_FIRST(&bp->bif_wlist)) != NULL) { - bpf_detachd_locked(d, true); + bpf_detachd(d, true); } } BPF_UNLOCK(); @@ -2877,12 +2870,12 @@ bpfdetach(struct ifnet *ifp) /* Detach common descriptors */ while ((d = CK_LIST_FIRST(&bp->bif_dlist)) != NULL) { - bpf_detachd_locked(d, true); + bpf_detachd(d, true); } /* Detach writer-only descriptors */ while ((d = CK_LIST_FIRST(&bp->bif_wlist)) != NULL) { - bpf_detachd_locked(d, true); + bpf_detachd(d, true); } bpfif_rele(bp); } From nobody Fri Nov 21 23:50:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCsR84THCz6HyPD; Fri, 21 Nov 2025 23:50:28 +0000 (UTC) (envelope-from christos@freebsd.org) Received: from margiolis.net (mail.margiolis.net [95.179.159.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCsR772y8z4HN8; Fri, 21 Nov 2025 23:50:27 +0000 (UTC) (envelope-from christos@freebsd.org) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=default; bh=Y33aI1sHAhX7 U1xtO131Ss/vHgS4sXw35vCNYb1XWw0=; h=in-reply-to:references:to:from: subject:cc:date; d=margiolis.net; b=iTuwck7TxudH7lpfpbKrZ20zgaJIeRKbdM xTqWuzo0RsSTshHNTn+ClCoEUc641XnPts3o1PfzD2gQghxl9CYPjray+X+3kWgYS04qgf YWqoJKuWARghZJy/XUfgC2qFzYHpL94TXdRsUyo0CYaAXkmzlG0C0EVfHWkfnFS/Kt8= Received: from localhost (178.43.235.11.ipv4.supernova.orange.pl [178.43.235.11]) by margiolis.net (OpenSMTPD) with ESMTPSA id 166d6afb (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 21 Nov 2025 16:50:19 -0700 (MST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sat, 22 Nov 2025 00:50:19 +0100 Message-Id: Cc: , , Subject: Re: git: 9d18115ca0ab - main - sound: Retire snd_mtx* wrappers From: "Christos Margiolis" To: "Shawn Webb" X-Mailer: aerc 0.21.0 References: <69209007.369f8.65e30118@gitrepo.freebsd.org> In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:20473, ipnet:95.179.144.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dCsR772y8z4HN8 On Fri Nov 21, 2025 at 9:46 PM CET, Shawn Webb wrote: > On Fri, Nov 21, 2025 at 08:45:27PM +0000, Shawn Webb wrote: >> On Fri, Nov 21, 2025 at 04:15:03PM +0000, Christos Margiolis wrote: >> > The branch main has been updated by christos: >> >=20 >> > URL: https://cgit.FreeBSD.org/src/commit/?id=3D9d18115ca0ab0ef3f34173d= 4e2bdabec916d0b60 >> >=20 >> > commit 9d18115ca0ab0ef3f34173d4e2bdabec916d0b60 >> > Author: Christos Margiolis >> > AuthorDate: 2025-11-21 16:14:33 +0000 >> > Commit: Christos Margiolis >> > CommitDate: 2025-11-21 16:14:47 +0000 >> >=20 >> > sound: Retire snd_mtx* wrappers >> > =20 >> > Do not create mutexes with snd_mtxcreate(). It doesn't provide any >> > value, plus it first allocates the mutex with malloc(9). Allocate >> > mutexes in the stack and use mtx_* functions directly instead of t= he >> > snd_mtx* wrappers. >> > =20 >> > Sponsored by: The FreeBSD Foundation >> > MFC after: 1 week >> > Reviewed by: kib, markj >> > Differential Revision: https://reviews.freebsd.org/D53855 >>=20 >> Hey Christos, >>=20 >> I'm getting the following error on buildkernel: >>=20 >> =3D=3D=3D=3D BEGIN LOG =3D=3D=3D=3D >> /usr/src/sys/dev/sound/pci/hdspe-pcm.c:726:3: error: call to undeclared = function 'snd_mtxunlock'; ISO C99 and later do not support implicit functio= n declarations [-Werror,-Wimplicit-function-declaration] >> 726 | snd_mtxunlock(sc->lock); >> | ^ >> 1 error generated. >> --- hdspe-pcm.o --- >> =3D=3D=3D=3D END LOG =3D=3D=3D=3D > > Never mind. I didn't realize HardenedBSD had a change to that file. > Sorry for the noise! So all good? Out of curiousity, what change is there on HardenedBSD? Christos From nobody Fri Nov 21 23:54:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCsWZ0Mrdz6Hyhk for ; Fri, 21 Nov 2025 23:54:18 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCsWY2cG5z4J56 for ; Fri, 21 Nov 2025 23:54:17 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-il1-x130.google.com with SMTP id e9e14a558f8ab-433791d45f5so11610905ab.0 for ; Fri, 21 Nov 2025 15:54:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1763769251; x=1764374051; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=bxz/UwrtmYXxX1KqAskEQ9AEcqlp7szLd/IhLsn3mMg=; b=cIneKRzMhpggEOxnRYW3tRaBJ2qfDrEiy00y9CC3p8M7HqHoUEKyPl18luMJKD9775 oGGZgR4tcjGM9aHPkn7UKhIP3sK9hzVt/xiRjSVR0yGQ5hSkwhDQ4s5YIfegJcSfQe6J Cgn4MPmVgvwChYdrCU3VOp+0jnoxC0RUj+4uMn+b8WQIWFSG5sBPVvsP8kStDbEAqyMM PU07P26hgO91yDh1fuwV+vL+0TyV59HOF0kx1rVNQCnLL7LmteVAxxhhNFe1AoOkiF9j UgVHzB4AbG3be4TCXRzMpubNR7iTWVU5+nwh1uIX1ACvSY5DNr6PHnfxnHgoMoOOCJCn a+YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763769251; x=1764374051; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bxz/UwrtmYXxX1KqAskEQ9AEcqlp7szLd/IhLsn3mMg=; b=kL3J8Y1XiWraeO/cBiMhFBluRpbGg4/5swfAPu9JAAppCBZPACtB1BhGXXXQja4pDn XTjfx2/IvNY6UmyZBBv5jVbqHoj24gS/Wp+S2R/4Kz2zmbI3tjqMEDSMT6/cek9PjjQD bNh5kAOVi2L86/VW0TCdpAMNWrNx8k4c9I9uEmNe6k5v8tkiIsnAQljw/HOMCBEfcVLD JgDlGVR+f0dH5Cm92mn4RL2EFWrFOxi9F1i//6FxSsZYKkKdmLni1ZwMezSe8N/AcbHh kfRDMJI8SGUjFwIr+lRHysGHtTckgDrXa4cZo6nDo3oGC0QUeTWM5Wse2+zPaIkYRLHe MeqQ== X-Forwarded-Encrypted: i=1; AJvYcCWy7tzWGDustgkn+5BPmZ8YQkKWSH38NsP7TY1mBo5Ej9ZhQZ4aXJ1jgiAYKcDVYXXv88pJU4beQdhh/Tqpi+vnGFXW@freebsd.org X-Gm-Message-State: AOJu0YwysEZW9rhi/AN6VQ6nRogfyvXLQ7rtXVuIkxaAmaA/CRXFs16Y NMgyhVZ+qR8P9qiYJ5xjQd1aaa4/B/c35I6aPuL/WXKzk70MtCYjTCuuHgRNL72p3O9ss/ghZyv ilZ+C X-Gm-Gg: ASbGncvb1d95kQ/DigHQjDDoH+N92IPW9KfT7YgINBONPhEl3HJEabVDhPbQwzZPToT zwrlKw1PWvY7Ic2KXP4xqnDNkhHQsbVcjBlPqTExprxyZ9239i3a/Z12Sjzshn25Z5BrnX2C6T0 Apl/RV2NSHxysdvSS4BBUsc/ICobj/JZIkJospIzq1TBz9d6Ox9ayL9tjlEYTaGlhwfEcpsaI1V fkI+yC6an709wjZXq6ss8JiI5QboLopF7j3zZTl+kl1CutJDavu/f15VzuiWw9ORUplfRlMyiuF qvDswmtiQeBACjU4Jvni4KoI+ILADhVivClxHa0n8uT7hkRYakXZEW3LFdSCrs8QKHg4siy+bgO aghNpGdnjbjovo/ilhI5omy/ehGy22OeIxvICFttLebfmCpTS2ug3j9N1ikqpTlAn6fzDsaWdyM aqSWw= X-Google-Smtp-Source: AGHT+IHew+P5cOUAE8/Igxdi+lvQ56TWGXlwzvAohRaGDT0h1pUpOFujncUT9mk7Bl89aMZkyv4Zyw== X-Received: by 2002:a05:6e02:16c8:b0:433:7900:f1c5 with SMTP id e9e14a558f8ab-435b9845f4cmr35654135ab.7.1763769251333; Fri, 21 Nov 2025 15:54:11 -0800 (PST) Received: from mutt-hbsd ([2001:470:4001:1::95]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-435a90e8989sm27814095ab.33.2025.11.21.15.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Nov 2025 15:54:10 -0800 (PST) Date: Fri, 21 Nov 2025 23:54:09 +0000 From: Shawn Webb To: Christos Margiolis Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 9d18115ca0ab - main - sound: Retire snd_mtx* wrappers Message-ID: X-Operating-System: FreeBSD mutt-hbsd 14.3-STABLE-HBSD FreeBSD 14.3-STABLE-HBSD HARDENEDBSD-14-STABLE amd64 X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <69209007.369f8.65e30118@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="7puhdlcpwo2btcjb" Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dCsWY2cG5z4J56 --7puhdlcpwo2btcjb Content-Type: text/plain; protected-headers=v1; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: Re: git: 9d18115ca0ab - main - sound: Retire snd_mtx* wrappers MIME-Version: 1.0 On Sat, Nov 22, 2025 at 12:50:19AM +0100, Christos Margiolis wrote: > On Fri Nov 21, 2025 at 9:46 PM CET, Shawn Webb wrote: > > On Fri, Nov 21, 2025 at 08:45:27PM +0000, Shawn Webb wrote: > >> On Fri, Nov 21, 2025 at 04:15:03PM +0000, Christos Margiolis wrote: > >> > The branch main has been updated by christos: > >> >=20 > >> > URL: https://cgit.FreeBSD.org/src/commit/?id=3D9d18115ca0ab0ef3f3417= 3d4e2bdabec916d0b60 > >> >=20 > >> > commit 9d18115ca0ab0ef3f34173d4e2bdabec916d0b60 > >> > Author: Christos Margiolis > >> > AuthorDate: 2025-11-21 16:14:33 +0000 > >> > Commit: Christos Margiolis > >> > CommitDate: 2025-11-21 16:14:47 +0000 > >> >=20 > >> > sound: Retire snd_mtx* wrappers > >> > =20 > >> > Do not create mutexes with snd_mtxcreate(). It doesn't provide a= ny > >> > value, plus it first allocates the mutex with malloc(9). Allocate > >> > mutexes in the stack and use mtx_* functions directly instead of= the > >> > snd_mtx* wrappers. > >> > =20 > >> > Sponsored by: The FreeBSD Foundation > >> > MFC after: 1 week > >> > Reviewed by: kib, markj > >> > Differential Revision: https://reviews.freebsd.org/D53855 > >>=20 > >> Hey Christos, > >>=20 > >> I'm getting the following error on buildkernel: > >>=20 > >> =3D=3D=3D=3D BEGIN LOG =3D=3D=3D=3D > >> /usr/src/sys/dev/sound/pci/hdspe-pcm.c:726:3: error: call to undeclare= d function 'snd_mtxunlock'; ISO C99 and later do not support implicit funct= ion declarations [-Werror,-Wimplicit-function-declaration] > >> 726 | snd_mtxunlock(sc->lock); > >> | ^ > >> 1 error generated. > >> --- hdspe-pcm.o --- > >> =3D=3D=3D=3D END LOG =3D=3D=3D=3D > > > > Never mind. I didn't realize HardenedBSD had a change to that file. > > Sorry for the noise! >=20 > So all good? Out of curiousity, what change is there on HardenedBSD? Yeah, all good. There's a potential NULL pointer dereference due to a lack of a return value check from malloc(..., M_NOWAIT). I haven't done any determination as to whether the bug is triggerable, but it exists nonetheless. Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Signal Username: shawn_webb.74 Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50 https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --7puhdlcpwo2btcjb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmkg+5oACgkQ/y5nonf4 4fpNRxAAoO03A0rx+VjBwHr/DzOoWVg9es2taCmqBzRSctOXGdOQhY2lgFNyiHCq gLfI5cRNlAff6kL6w9enDOeKDthkyry1k5nnQDJSkgbuZ1Yg73TnW2EivLm3xYaP qXVGW5nQvltQyRnR14q9kAg1osFEoQUKYqHGBacu+vePv43x8NRW5MY03LTX7cfd ISSbuRsmkfT/Pmsl/DZjXdg7m5GAy7FVEd48owzBYiEoYZp9BzUtwpXWFMNLm31t IsyVDMgJoJfKaeonK6fCmaU2nR59l6/00HC7gyJLnC+s72muKBcKLM5pAwuKgcCr pwLCH8FnOU9b02q5STW7EZ4ng7QYz2IWVhFreIhEf9O+9ipezId9SvuunKDIIAfY 0lG82ol4zP8KLQ7BV0eR+A/7o5itQ1dX8uxiZRrUe5wBhwbTaX0FULOsU8U++xxa Pav7DXYDA435II1A25+7lJmmFUetdIW9e48pQGyDDE1+3wwqIAiCWeNZy4pMpn51 zTvgIQzvwhMmO6HKDvQZnInMG2eQQjvIXFqJob2tQV3M3BlFv4ytr+pkortBXnEg BebndJENtWwAgIAHgaNCqcUPhE6QMbpsNhS+4f1F8IHgwvU/OzdmU71f+yJThS82 jrYvyzZ9ovDYh6sjSbsjW2LfLfSiVw1sM+JvYSo6HXcYUsUWwBs= =P0vQ -----END PGP SIGNATURE----- --7puhdlcpwo2btcjb-- From nobody Fri Nov 21 23:56:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCsZj5WVsz6HywN; Fri, 21 Nov 2025 23:57:01 +0000 (UTC) (envelope-from christos@freebsd.org) Received: from margiolis.net (mail.margiolis.net [95.179.159.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCsZj2Yrnz4Jhw; Fri, 21 Nov 2025 23:57:01 +0000 (UTC) (envelope-from christos@freebsd.org) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=default; bh=bmdFzhPN6RfC 6GW/xgHREf6fgrFJAgxfwoAPF/pjMpM=; h=in-reply-to:references:to:from: subject:cc:date; d=margiolis.net; b=PJQ/KWmbLoHbDA1uAaitH39n+T2cTk3e1E PlYoKZp9U0HMQzYMoS6i7y4mlJQbSUH+x8/LJkk8pFhm648hmiGD+gSJ8QPnZ9Gdwoy6JU 1WBtD83x2kyhlTo0PnbBkSuzXkH3G+n23F1hA+3L6EyFJ36g651VEz5Ex4hgUfxRWD4= Received: from localhost (178.43.235.11.ipv4.supernova.orange.pl [178.43.235.11]) by margiolis.net (OpenSMTPD) with ESMTPSA id 6fcaf2ea (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 21 Nov 2025 16:56:59 -0700 (MST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sat, 22 Nov 2025 00:56:58 +0100 Message-Id: Cc: , , Subject: Re: git: 9d18115ca0ab - main - sound: Retire snd_mtx* wrappers From: "Christos Margiolis" To: "Shawn Webb" X-Mailer: aerc 0.21.0 References: <69209007.369f8.65e30118@gitrepo.freebsd.org> In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:20473, ipnet:95.179.144.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dCsZj2Yrnz4Jhw On Sat Nov 22, 2025 at 12:54 AM CET, Shawn Webb wrote: > On Sat, Nov 22, 2025 at 12:50:19AM +0100, Christos Margiolis wrote: >> On Fri Nov 21, 2025 at 9:46 PM CET, Shawn Webb wrote: >> > On Fri, Nov 21, 2025 at 08:45:27PM +0000, Shawn Webb wrote: >> >> On Fri, Nov 21, 2025 at 04:15:03PM +0000, Christos Margiolis wrote: >> >> > The branch main has been updated by christos: >> >> >=20 >> >> > URL: https://cgit.FreeBSD.org/src/commit/?id=3D9d18115ca0ab0ef3f341= 73d4e2bdabec916d0b60 >> >> >=20 >> >> > commit 9d18115ca0ab0ef3f34173d4e2bdabec916d0b60 >> >> > Author: Christos Margiolis >> >> > AuthorDate: 2025-11-21 16:14:33 +0000 >> >> > Commit: Christos Margiolis >> >> > CommitDate: 2025-11-21 16:14:47 +0000 >> >> >=20 >> >> > sound: Retire snd_mtx* wrappers >> >> > =20 >> >> > Do not create mutexes with snd_mtxcreate(). It doesn't provide = any >> >> > value, plus it first allocates the mutex with malloc(9). Alloca= te >> >> > mutexes in the stack and use mtx_* functions directly instead o= f the >> >> > snd_mtx* wrappers. >> >> > =20 >> >> > Sponsored by: The FreeBSD Foundation >> >> > MFC after: 1 week >> >> > Reviewed by: kib, markj >> >> > Differential Revision: https://reviews.freebsd.org/D53855 >> >>=20 >> >> Hey Christos, >> >>=20 >> >> I'm getting the following error on buildkernel: >> >>=20 >> >> =3D=3D=3D=3D BEGIN LOG =3D=3D=3D=3D >> >> /usr/src/sys/dev/sound/pci/hdspe-pcm.c:726:3: error: call to undeclar= ed function 'snd_mtxunlock'; ISO C99 and later do not support implicit func= tion declarations [-Werror,-Wimplicit-function-declaration] >> >> 726 | snd_mtxunlock(sc->lock); >> >> | ^ >> >> 1 error generated. >> >> --- hdspe-pcm.o --- >> >> =3D=3D=3D=3D END LOG =3D=3D=3D=3D >> > >> > Never mind. I didn't realize HardenedBSD had a change to that file. >> > Sorry for the noise! >>=20 >> So all good? Out of curiousity, what change is there on HardenedBSD? > > Yeah, all good. There's a potential NULL pointer dereference due to a > lack of a return value check from malloc(..., M_NOWAIT). I haven't > done any determination as to whether the bug is triggerable, but it > exists nonetheless. > > Thanks, I'll look into it. Thanks. Christos From nobody Sat Nov 22 00:07:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCsq4642zz6J0WN for ; Sat, 22 Nov 2025 00:07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCsq44yNVz4Khr for ; Sat, 22 Nov 2025 00:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763770064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ftmCEczCWc7+4AnXZeP8T68QDdns3p1E8WNONJteBrg=; b=B9xVAKQmB7gKQ2tAXQQG8JsuHARuOxU37dAaLF4grHNU+SgUM+Kbt/VlWMT2FSjNC2iAak eUV/ThQ7mPdrlX33HX92ZLZsr0LuERialpTlc7mjSo4zYhU80nKizrX0GkbPkHc7KmNstX IxwvXLpsLvQYY0x0LXzIteCKqMHHlz88KGaFtT55nNaHt+ZcrBP9lK8KCZnV8qQwWgDc8z U1gIGKHSaLm/ZtMRtnH6UrcoTRlitiCGV8rg0shjVQq1Ed40YHXiiGFTzSh+HY14SS2jtW Bs2mVOXE7iz/qXrlEHgkBGybW2iUV7NKmtQCD2q3GURx7cB3QebqenSKEqjT4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763770064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ftmCEczCWc7+4AnXZeP8T68QDdns3p1E8WNONJteBrg=; b=fe6T5n0sY+otI/j0lwCTm7o1Ki59GzlsEpzLAouQv8/ORE1DmlA7RV0I7KQLJAMP7i8uEf ZzApPjVBeoe2NbwykBBEDUxPe0eCCjTXNJkC/+ecsHbepJFji/NEzdC9Dd4J5/POQNBiDG hNFQn8m193enCOLQJJRaqLW7PNkCLxwOXKn4u6lNBnbDSE7ssuj/AzkUVquQSHk1EdQpy4 V6r0gT+TZLHWBknNU2NJ/LNF5bTE3AOWTcKMrqbHV7s/UemB2VWRedArEv7U2i30vHir1Z QG3mr5tPpeb9vHFP4lsgQWPaipQS7pKaVi5X5risC7Rxw8cgXPZfvMZ6uot4ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763770064; a=rsa-sha256; cv=none; b=HFu2YtFLHhPs89fPEyDWWvIaEjguV4Kg5889XalwFzN2orbkgHkX/mNA/sWrIJixE1jm+0 d+C1Oeb7WkW8A2c/j05PvvHLjmxz9UgrnRMkzksF/tw8/nW2kRZLuUR28OYlUCqKBlsEMf sXlYqfU8eUfFOR7RkHxhFjUe3LnFHRpGdHFCtjl25KFQJdsggJxbN9KaBeaaIM8aTVvDtq GbQjHUIqq2svtgwU9Z6jIEle4edQ50IbVpY7ykpCIe7w9+0aOxj4nKXn4EvrSG0Ljk2tqU 32N1FMisPkkAnDBY40QYxOoQ3Zv0D0Rk/zIiGs+WC3eR3T8LhGx5mpa+ld0dTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCsq43fYFzb67 for ; Sat, 22 Nov 2025 00:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id dcec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 00:07:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e20e5724e614 - main - bpf: remove DDB code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e20e5724e6145fd2cd922f11d745b10a048443af Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 00:07:44 +0000 Message-Id: <6920fed0.dcec.199f95ba@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e20e5724e6145fd2cd922f11d745b10a048443af commit e20e5724e6145fd2cd922f11d745b10a048443af Author: Gleb Smirnoff AuthorDate: 2025-11-22 00:04:52 +0000 Commit: Gleb Smirnoff CommitDate: 2025-11-22 00:04:52 +0000 bpf: remove DDB code With modern debugging tools it isn't useful at all and is just a maintenance burden. --- sys/net/bpf.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index f2deeda8e1ee..23a23fbfe22e 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -37,7 +37,6 @@ #include #include "opt_bpf.h" -#include "opt_ddb.h" #include "opt_netgraph.h" #include @@ -68,10 +67,6 @@ #include -#ifdef DDB -#include -#endif - #include #include #include @@ -3188,35 +3183,3 @@ bpf_validate(const struct bpf_insn *f, int len) } #endif /* !DEV_BPF && !NETGRAPH_BPF */ - -#ifdef DDB -static void -bpf_show_bpf_if(struct bpf_if *bpf_if) -{ - - if (bpf_if == NULL) - return; - db_printf("%p:\n", bpf_if); -#define BPF_DB_PRINTF(f, e) db_printf(" %s = " f "\n", #e, bpf_if->e); -#define BPF_DB_PRINTF_RAW(f, e) db_printf(" %s = " f "\n", #e, e); - /* bif_ext.bif_next */ - /* bif_ext.bif_dlist */ - BPF_DB_PRINTF("%#x", bif_dlt); - BPF_DB_PRINTF("%u", bif_hdrlen); - /* bif_wlist */ - BPF_DB_PRINTF("%p", bif_ifp); - BPF_DB_PRINTF("%p", bif_bpf); - BPF_DB_PRINTF_RAW("%u", refcount_load(&bpf_if->bif_refcnt)); -} - -DB_SHOW_COMMAND(bpf_if, db_show_bpf_if) -{ - - if (!have_addr) { - db_printf("usage: show bpf_if \n"); - return; - } - - bpf_show_bpf_if((struct bpf_if *)addr); -} -#endif From nobody Sat Nov 22 09:19:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD63g4CRWz6Gjqt for ; Sat, 22 Nov 2025 09:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD63g2JGqz45gV for ; Sat, 22 Nov 2025 09:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KFU3MDf2Jz40zhoNID1cadliiHeYSIv7jDmZv2an3qA=; b=al0aXON9SFcgbYp9nH1xeg7KHcPZQgVHEiFjMDtq6EC+5nLWSPsvicHgIq2zSbfX8jV2Bc AjmR4sQaAMwq0/djFz7V94KwwrtYCnX6wXQ1W/Wre334A+H8VCK6S6m0r45qPG0d8vCgvF qVcND0rekeYBavZ+kJ0cxfAFw6VkZfKcAdklje74lQI8m7KughZhcpaPYLacP65437X7VR cm9K5DZoYjVOF3TBtRxMrKEmbVXeQPiz1H/e4ByFfypJ3W5QRj2r7ae5E5JZ5gbZ6raHHp i+UAZplcQ743nq9aZOZx5+BVdP+ViGrze2Z/OBXluT05/9L056RvmqvSTgssvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KFU3MDf2Jz40zhoNID1cadliiHeYSIv7jDmZv2an3qA=; b=LXdZ3QNDyELEwk43Z2jItSZpuCS3JmTwlXdW3cD4G104HIzK1mkDKSX05l4+QtMRiI6rps v77k8/anId07L5di57CthaUBm9EXf7LAY5u72zo5Vk0GpMz9TW7w8LJXTW+AjRAOEJW70U z+rFwT24Ix4F29/1s44BmucJT4wdhn9NMfw3t9MSv6knyanxkoC9lciYBarZ+4zci4l3Rx e0NyV4+3U0PnIoBEQTILac5xWqnReO92pCDpRnIPwYh8H0Zd186T0+BqjngYmT0gox4uzx skhMK6V37+AIwFoYSeJNrK1XL8XomBLfSFRiM9EjhCbLUTrayK6uqp6JHXVTzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803167; a=rsa-sha256; cv=none; b=Xjwjm2U5Ynoj0zHX52wb2Gezad9rOq3uPDG3nydty8/BftCvuFWgxM+mXSx3c/o2lDkb2+ lezvfnynG+IHNHVevw8xqiuwmUTy98fXbCR8D2OKGxLAGc0w0Dx9409wJ9vqHaV+e8w/IF S7q9Q6fDipTDu9fIwjxjbCTkBXGgTDQiv6XXf09tG0AuIMdTnItSGWUdh/tfXn0SzxK/o4 QAhw2fp7Dq87dsKzhywEB/OEhNo+p8rXQf7UQPoVl5xDEMsiVAUgxlLz/x7dDwVQLpgG+S 8u/Jmqa5r1Mxrn6IAY3E7s/wM0Hhmz8hoLWw+5t51RzE3Vd7R3qVI2e9DyWK4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD63g0nX0zsDD for ; Sat, 22 Nov 2025 09:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37de0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:19:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 59f13e4da451 - stable/15 - stand/lua: Fix two typos in the manual pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 59f13e4da451d168041c9f04bfcdd0610ff12a87 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:19:27 +0000 Message-Id: <6921801f.37de0.6fda684@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=59f13e4da451d168041c9f04bfcdd0610ff12a87 commit 59f13e4da451d168041c9f04bfcdd0610ff12a87 Author: Gordon Bergling AuthorDate: 2025-11-19 14:23:07 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:17:34 +0000 stand/lua: Fix two typos in the manual pages - s/Additionnaly/Additionally/ - s/commmand/command/ (cherry picked from commit 6f14b6025a6f6475522697362aaf6c84514b85bf) --- stand/lua/config.lua.8 | 2 +- stand/lua/loader.lua.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/lua/config.lua.8 b/stand/lua/config.lua.8 index 7e8863203446..f918ab7ffbeb 100644 --- a/stand/lua/config.lua.8 +++ b/stand/lua/config.lua.8 @@ -66,7 +66,7 @@ as a configuration file .Pc and then process files listed in the .Ev loader_conf_files -variable. Additionnaly, the top-level call to readConf will process files listed in the +variable. Additionally, the top-level call to readConf will process files listed in the .Ev loader_conf_dirs and .Ev local_loader_conf_files diff --git a/stand/lua/loader.lua.8 b/stand/lua/loader.lua.8 index ffee46526c9f..b750d42e2158 100644 --- a/stand/lua/loader.lua.8 +++ b/stand/lua/loader.lua.8 @@ -90,7 +90,7 @@ Obtains the value of the environment variable returns .Va true if -.Va commmand +.Va command is present in the interpreter as a builtin. Otherwise it returns .Va nil From nobody Sat Nov 22 09:19:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD63h3HJtz6Gjxr for ; Sat, 22 Nov 2025 09:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD63h1PPwz45Gw for ; Sat, 22 Nov 2025 09:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T2BaAnPjEbm6ZfEsD424Ik2OFCD0nZ4pwlE/8gbGCPU=; b=U94hWrKZuLxfrKMwzcIRY6NVduCaKWY55EF1Pt0dSCz0iGr2K5DrgaZzJ92/bayIfGeZnK L6zZQfo0WmY83cwYMbDKAOP543YLL2nGbQLLc6mSTJZ379nO+frmR1WHrtuZPKyWvV0msW 9pRhx7YreUMwZpaQ7HFYFd8pES4L9ZG37MenOIEZGLyCSV/q87ZPe5AHalWPd9zQj98Jmw uH1opV6uVhgE8Ti5nAAIrlLW4hOX7WN7ApiO8zIpZKs2MNU3wHtj5XYpFmFjUGznHWrX/4 JdmcktJ2k0cGCfeYeK5/HGDnUYeGa0BFx08JA1uRSpQF5Tb0vjqa6UfWBiMx/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T2BaAnPjEbm6ZfEsD424Ik2OFCD0nZ4pwlE/8gbGCPU=; b=SOMEH2CRU0RPEq1PfM3xzhAWFcf0QuILRxaPPq7sx40N9L2DpqteFNjsa8aG77J2OIGycw mxJnebbWRVmnldMcQ+CmcKLcJh+czfTxHmttp1z8JpguYTakH8O2TZohso9kQ3Z1+SkFcJ 9u1h23r2JWRdO+8yIqLTPmlAbMRyMYH+uqWsiEpWMX8G6l6cGQtrVd1BNUkFTMsgzU62GZ ZoE2Xqbo1a7bOgsoL3S+iQggh5mA00QETThKd/RSVoDddL4TN5H4r8yM49qEVZpydFjpCK PpPuCJQfcAunYMxwYxpDOV+xJ4y+deHlG5vlofUGcGFGttcYnTmaYNBo4Xn69g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803168; a=rsa-sha256; cv=none; b=du/aVtdHIgITXnpuCbdhG/1U2PgLzQ4vRKAc+wfUKCBIDMj/Z1uaZwi61cILKsVZjySn65 Gr5jUmUkEKlNsN9o+9rTmbt52wIyVa9VxQjGo1OIbv0CKSd1hZCVFzCmC1m7zwRSXt44uQ 5oHt/SfUEu9IcJ9jdP1yqACVG43KMvK1MgbIh6aQG5qfQLz7GjJP/2MlQ69D9wl9ZjSmA9 170XKGsHlrs4HLCHcaapoTH6P6ByyiwFVh69bNk6tlEGD1HAMRd4MbV4eS36NPozP674un E0JjDclsQ11P41urtS/CtwxE/yD4A/YEJ4XbcHkPa28Jyph3RvH5kgpSGk+1Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD63h0hMCzrfb for ; Sat, 22 Nov 2025 09:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37a97 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:19:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: bfb3d518ff8d - stable/15 - exit.3: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bfb3d518ff8dbc95f68d5eaa84200fda1707ffa2 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:19:28 +0000 Message-Id: <69218020.37a97.68a54305@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bfb3d518ff8dbc95f68d5eaa84200fda1707ffa2 commit bfb3d518ff8dbc95f68d5eaa84200fda1707ffa2 Author: Gordon Bergling AuthorDate: 2025-11-19 14:17:40 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:18:19 +0000 exit.3: Fix a typo in the manual page - s/avaliable/available/ (cherry picked from commit 9334fa3ef5e19de7d3dcdbefdaa3f6b6b653475a) --- lib/libc/stdlib/exit.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/stdlib/exit.3 b/lib/libc/stdlib/exit.3 index bfb14c5c9f83..40010e678e5f 100644 --- a/lib/libc/stdlib/exit.3 +++ b/lib/libc/stdlib/exit.3 @@ -104,7 +104,7 @@ may be used to provide more information to the parent process. .Pp The complete .Fa status -value is avaliable as +value is available as .Va si_status member of the .Vt siginfo_t From nobody Sat Nov 22 09:19:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD63j4kh5z6Gjkx for ; Sat, 22 Nov 2025 09:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD63j1zR4z45P9 for ; Sat, 22 Nov 2025 09:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=krfCFVIi3FR2N5/h7w8h3DEnxSrLHm4jlGQf8TA/eyo=; b=fm0eluLioqHL1SX5MnCfAvhdSMajuecUWLr4cy8hldwYO7/8kwgi4mURQOmAYnYJ4Y6e/+ PqeDt8td/5gZJ4kUjFhE+IlKtdkfpPnQB5UznzXGT/35mjqed9dfrnbh787DcJZKrBcm/B MVvm1tJA/EJQNNczrb6WBc19Ct4uTWRqRxpM8ZFRjuxbFucTmoMOp2p+H1TO/uoWg3xL+9 RVSquJfpXOCnEwxaTT5Le68lBHj+ldP4F0IZS4SKUmBPVym2JL8JGGAANZBQ+iUNDwbZ4c OrYvKnm1kh/dkhi+gb5lAKW3rDraZaLkHp72m731IealzjDJ1xUqeKHF0J8CjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=krfCFVIi3FR2N5/h7w8h3DEnxSrLHm4jlGQf8TA/eyo=; b=KM3nc6MrhQJ4CGGmsoExRqcptDkrKYeB6RkdiGNZcEJ4atR8U9rMR+hn1+zphZ+T8zzTwj A9+4YoE/uVxdyT7FDatgUxrSJaQcEFrfrq/JH9XwFizfjgVkJ9DchhzoMT24EriixitnLt lPGF0BoqMVcLtFJotgJyl4jDwH3bWdmJvfh4CjplI5I7+YApVhA5F8VJm7eWikosutB/AD j7QUB0P9Yforpqb1fmSKDD1SOhd2TLtb48RxIhhojcVhV3pbDbLPepY9ypXJeFyLL4pptI kbeAiXvtMvu4sW/F3nU6aPBKMF+O1Y5xzLkiYXypylgvQLG8Zx7fT9n0wwobBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803169; a=rsa-sha256; cv=none; b=fNnz0oKkJ21tkcyNHhF/Pw/d5CfIjh3AfUlKdyb7kyXNXgokIUp+j7s1+qkZRdCDIJd9ZI wEl32Xev/N84fosM5ccNr0wg411Op9zksUyzGBT6CXqqrkZy5+AvzEAyJ1OQFZeJPpaigv eQbqCbi1wBPSrLDHspO7xm821ti5m7lSwOd2KkaubFfOqFNPC+9OYWjhPMl+K7dTvY24+A 9jHwCDr5U4L3cb2s94Cd7v831HpDba/LTysOJJoC07ZkTXe1qJDkyX63uEG8syj9C04gtK TIgUh23LvPHQMv23DoUQGIQVBlnYLSLxDCkNknteE9vzq/CUzpv9YpA9e1FwGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD63j1RMfzrfc for ; Sat, 22 Nov 2025 09:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36e65 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:19:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 734142d4a208 - stable/15 - nuageinit: Fix a typo in an error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 734142d4a208d215b3d31781bc0a8292b226fe79 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:19:29 +0000 Message-Id: <69218021.36e65.37096c7a@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=734142d4a208d215b3d31781bc0a8292b226fe79 commit 734142d4a208d215b3d31781bc0a8292b226fe79 Author: Gordon Bergling AuthorDate: 2025-11-19 14:28:54 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:18:35 +0000 nuageinit: Fix a typo in an error message - s/outout/output/ (cherry picked from commit 73a026d5e9778ac182be4a5876771eefa2cd6f41) --- libexec/nuageinit/nuageinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 29340a3d91ea..f68e45701b6c 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -63,7 +63,7 @@ local function get_ifaces_by_mac() ns:close() local res, err = parser:parse_string(netres) if not res then - nuage.warn("Error parsing netstat -i --libxo json outout: " .. err) + nuage.warn("Error parsing netstat -i --libxo json output: " .. err) return nil end local ifaces = parser:get_object() From nobody Sat Nov 22 09:19:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD63l0812z6GjnR for ; Sat, 22 Nov 2025 09:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD63k4D1rz459k for ; Sat, 22 Nov 2025 09:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tsL7bjCd657VBxi+JqhfDS9MVvqgAdc1nv2nxAbRqDQ=; b=uW29pqtwD0pzGvFZPmhFQBDheXsd/xISBQo3bh0fm20fLPjp2EwZBo635vq6v+rwDjyPvn Mxw0/xyBawG0by3Agia/kzAsaXz2qk2ABfXBuEIZzr+p2B4BcixYHV5jUgwTMubaoRrBPy hUS8QMj26qZT6IvwjCzdYJzvOHTtu49L4QgTrK3lcr7nromsxdn1aYyYfnsZqYB+ZoY3CD xSk68JfxC1M5SfInl9IP3ZFZ/ksUwnUZ8kHPyXrp1SEIKipV5Jt7KKMhXpYwxDBm6x71NS PiL9eAyiY1xQKhsbieCBeybanGDs35eDgbRgMzRxDMNs397C+BxfWmQi9XLZFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tsL7bjCd657VBxi+JqhfDS9MVvqgAdc1nv2nxAbRqDQ=; b=hk1Eu1pJKHuHMFJcsH9K9vt46aSo1XhPdFvCMeVTJwBKFmUueLTKcDHNaBn/N19a8UKStj /Nl1CmHs2hYmlDHYeqmdQQbT1iOvUgySjxXYfU5l++VOoBhenPbqY6ti4fZ+UDlzhUx6K/ sqdhbaXFMnZ3Ki2DFTn08XhjwxfefjKimX9n0qwaa6rdUvTKtB1ekB72qVd7nEodwd65Ga 4lBQO83Pw73fFJQ1+bqf3b+4hTKiuvTX7BBLKyzj5sDzyHvxC0Kq5CenVe8+5yOe4fzgkx +PCQnUApHIBkv3dZxG0g3Pz2pu6g0Z7lyKcum7zvg/hwj8bJ08ZfaVKiRmo7/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803170; a=rsa-sha256; cv=none; b=o6CZjBlOZMguaX+SrOhzNNmvwULtAXppA5xr6a5sDQu0fl5G0qjFvhT5DJhXIHU/xbw4Pe VGKuN31l7vtE1puLFxg17AVdToC6dZ8F9mWYqQ88qgnpjf98614Cs5QayIpjvgEE24oX9U 6SsEEBw7sekJ8L2Ts/VflbSv6pd2PkHRPYWnhSSO4n0ZzsjhsWCh50oySgb3x7v9qkrr+f UzdgIiQ+TAd4AlrsUdxa2mhhT/kAZDWkkmP+L4mNc00ZVBgN7jZgxrOnmi8LOMnjQALZS5 gXIt46BgBHqwLPVjydrjPZVFh4P7dhZAzHYJvq98HrbMoEsSbN02LYILEYJWog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD63k2DpszrnN for ; Sat, 22 Nov 2025 09:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37c0e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:19:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d48dc8c0c731 - stable/15 - moused(8): Fix a couple of typos in the manual pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d48dc8c0c7319b927f9d1ca44e83e5a232ad7642 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:19:30 +0000 Message-Id: <69218022.37c0e.312faaf7@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d48dc8c0c7319b927f9d1ca44e83e5a232ad7642 commit d48dc8c0c7319b927f9d1ca44e83e5a232ad7642 Author: Gordon Bergling AuthorDate: 2025-11-19 14:21:09 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:18:53 +0000 moused(8): Fix a couple of typos in the manual pages - s/compatibiliy/compatibility/ - s/rewriten/rewritten/ - s/derrived/derived/ - s/suppported/supported/ - s/Horisontal/Horizontal/ - s/thesholds/thresholds/ (cherry picked from commit 64bbcff94459153ae6e118d7776e379271bdc0b9) --- usr.sbin/moused/moused/moused.8 | 4 ++-- usr.sbin/moused/moused/moused.conf.5 | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/moused/moused/moused.8 b/usr.sbin/moused/moused/moused.8 index 2483f8a04b2a..b414b2ff787e 100644 --- a/usr.sbin/moused/moused/moused.8 +++ b/usr.sbin/moused/moused/moused.8 @@ -299,7 +299,7 @@ or .Dq Li generic . .It Fl l Ar level Ignored. -Used for compatibiliy with legacy +Used for compatibility with legacy .Nm . .It Fl m Ar N=M Assign the physical button @@ -529,7 +529,7 @@ The .Nm utility first appeared in .Fx 2.2 . -It was rewriten to support multiple input event devices in +It was rewritten to support multiple input event devices in .Fx 15.0 . .Sh AUTHORS .An -nosplit diff --git a/usr.sbin/moused/moused/moused.conf.5 b/usr.sbin/moused/moused/moused.conf.5 index bc62b5d00995..4b3955c8c7d1 100644 --- a/usr.sbin/moused/moused/moused.conf.5 +++ b/usr.sbin/moused/moused/moused.conf.5 @@ -37,7 +37,7 @@ file specifies how the (mouse daemon) should operate. It provides ability to adjust certain mice parameters on per-device basis. .Pp -Configuration file format is derrived from +Configuration file format is derived from .Xr libinput 1 device quirk files. A file may contain multiple section headers ([some identifier]) @@ -72,7 +72,7 @@ glob for the DMI modalias or the DeviceTree compatible string. .It MatchDevType One of touchpad, mouse, pointingstick, keyboard, joystick, tablet, tablet-pad. -Only touchpad and mouse types are suppported. +Only touchpad and mouse types are supported. .El .Ss List of currently available Moused tags. .Bl -tag -width indent @@ -296,10 +296,10 @@ Enable natural scrolling. .It MousedThreeFingerDrag Enable dragging with three fingers. .It MousedSoftButton2X -Horisontal position of 2-nd softbutton left edge in percents. +Horizontal position of 2-nd softbutton left edge in percents. (0-disable) .It MousedSoftButton3X -Horisontal position of 3-rd softbutton left edge in percents. +Horizontal position of 3-rd softbutton left edge in percents. (0-disable) .It MousedSoftButtonsY Vertical size of softbuttons area in percents. @@ -392,7 +392,7 @@ Predefined quirks processed before .Nm . .El .Sh EXAMPLES -Set touch pressure and palm detection thesholds for PS/2 Synaptics +Set touch pressure and palm detection thresholds for PS/2 Synaptics touchpad: .Bd -literal -offset indent [SynPS/2 Synaptics TouchPad] From nobody Sat Nov 22 09:19:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD63l6Y5pz6Gjl2 for ; Sat, 22 Nov 2025 09:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD63l3V7bz45f3 for ; Sat, 22 Nov 2025 09:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HBIDCFEPDIc4rLwr1d59lNR/3nlflNBTqIHOWRABYfE=; b=MBFHURH6tezbfE93gpUv12MiAUmHHFsi4m8e9ByYIGFg96oMVMtiO2ZP9vqc+S6HBMfA8w LoLpVCRxzhiMjpqKLpm+rU0HAncAHSWyu/WTj86aMfoBtieOTfJA7Ud33XNQ2dGmmeuTep KWUtIwX/q7ibb1ObsvJrnCBCalupLbEhOEPFYUhje2lxQ/PMbG8d5vXJgkDhZ8aIs1ZlLJ vjQfrYLGHsLxjn93kxrxU1hpI2uqN4qggr5Y3NJOb0ihkaE7DOPFzSKTSAZBQ07A2GXtLb rUCZR6Z9z1TMDNm6cWQ1drQbZ+3GGzZZanp+oqWOeW70GkvzLxcC/nlhiFBLEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HBIDCFEPDIc4rLwr1d59lNR/3nlflNBTqIHOWRABYfE=; b=ht7vbmRmFXTReRsVl+MXBKKQIxLe865Xj52vNiaPJ+M4PXbiGzQAPvKnduoCoK5VXuDLpN YaLl0ST1wvCkUt/GS+/rOgLY99wtQUiUYR8TyriVJzgbq3ftFOdlCfNhFW0JWH45TFsEmC sJ9B2766nLkefW16z2fE0ejnLEO2OiL9p8liV7mP9auc+SMm89Ug78RBngc6f4D+ZcMcuc 7dynzo4rGnltmkNLwcsqYrXtKG/N9qlWX0OslGRjR+Gfny1gdFVb04UwgXR3gb3aU6D2Cg 3mTGmTbTBrgTmjcxxh1ZIBU+xV7OahaYaz+wk/2pJhC1BqJd2UU24+LEaQ/gOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803171; a=rsa-sha256; cv=none; b=VOTnkF+V7VYtQSfagGCiscM8FJSFn5+D5L6URz86JpmYbmUT3Ku6gRSJkEki2M8Ebmc/TP 2CF9xIfUdCtPWsLaoUlUs9Z4uwTkS+48vusvkmFzDpo1fq/du2K+PQBxxr6Gla0gQkWJaW brOacRB1SgdoYcM23UXbQnN9PznqP1U1o2i6opFZ/aoEpPSnl9prlOrQKW7DAPkbCrbRF4 huswu1zV+h6LmTyM4tE/UK39WPtpK9gyHwQXK/L7W4nPG7ntfUL80omJ/5e0gP51kVBRk6 MpWGkmlDm+pzUNJ3wiOFxzKo08nSMONA62TLc3TO8GcMIc7LL/EnMft9bawS4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD63l31GlzrnP for ; Sat, 22 Nov 2025 09:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 368ce by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:19:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d14a007afb16 - stable/15 - libexec/lua: Fix two typos in the manual pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d14a007afb166ddd035b0ec8cbd534a2ffbb9bca Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:19:31 +0000 Message-Id: <69218023.368ce.ef45165@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d14a007afb166ddd035b0ec8cbd534a2ffbb9bca commit d14a007afb166ddd035b0ec8cbd534a2ffbb9bca Author: Gordon Bergling AuthorDate: 2025-11-19 14:24:30 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:19:11 +0000 libexec/lua: Fix two typos in the manual pages - s/environnement/environment/ - s/interger/integer/ (cherry picked from commit 58b86e40ce76de649db19d9d1f8571d5c942d44b) --- libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua | 2 +- libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua b/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua index d254dd22c91c..242bdb4400fd 100644 --- a/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua +++ b/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua @@ -30,7 +30,7 @@ function. List of functions: .Bl -tag -width XXXX .It Dv table = freebsd.kenv.get() -Dump the kernel environnement into a key/value +Dump the kernel environment into a key/value .Fa table . .It Dv value = freebsd.kenv.get(key) Return the diff --git a/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua b/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua index 34198d20463e..fe189225b239 100644 --- a/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua +++ b/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua @@ -33,7 +33,7 @@ Load the kernel module named .Fa name and return the identifier .Pq fileid -as an interger. +as an integer. .It Dv ok, err, errno = freebsd.sys.linker.kldunload(fileid|name) Unload the kernel module identifier either by .Fa name From nobody Sat Nov 22 09:20:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD65C4jlpz6GkBr for ; Sat, 22 Nov 2025 09:20: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD65C2Mrhz474J for ; Sat, 22 Nov 2025 09:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1URkjXNvTCEX1ododwTHrotgTKlrxZNOSz/jxOiJeYM=; b=E4iRifXKOEQ9sqXPPCQ2YIK08LpxaAmEkSrXJfmYNuc52dBFJn6jS52tBL1kWcLC1cvQl0 On6kn5fjSiQVMULagnfPVxKSkjnYhcYiGnrkCVGwqT4g3ucGrlGlAklCxMlzsr5FwY2w0y MV8ouIWDqM9tvBC6es+Q5Uyovr5cbuMoM7aA5P+AOIsrp2ALMBTL9oey0OI9jWeLNtCc6+ xiVUWEx7WiLZFDs9ffDMv2T7B7XtN/6uKgid+T0VIdXawhrXC9TrZDRtWfQ5UPgMtW/L30 daSwIijV/LLOBjzw+mruyhCCMwI+xae8tyRgg6UpJeZRzUw+ZZsVbdpc6WFzYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1URkjXNvTCEX1ododwTHrotgTKlrxZNOSz/jxOiJeYM=; b=pPovm3zV8udkVs5fBckox45F7HpxvJ1yBs9YqspJBVXkazA7NgLIvtXoLe7NJvYeyq3G7u 7geiGVVqdA0qqvR9+VpotksNTm1pls8Uai/6i0h7vN6Pb0bTbCTVRgI8F5/izr5ShcYRZC 4S3LtCFnKQX+UL+Wtr8FE+EUcNn6Jw2onKN6aXV45DGJuJ1gsHEytKNfOc0uGnvjsTcNfB KHnH9n7v9v5/Dg0SbS42MJQu8XjDj2zDK8oy7gYy4FPQdLEMwOb5IOr6+hnfPxTdp64F41 9sr5pvjgtFg5dd6nq9VxsrDfKAdxwO1eExE0PTe3JP1vDayEXjEu3c50sO5eLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803247; a=rsa-sha256; cv=none; b=ee0RE9m+FEf0DDUuRt6oeDerwsoQy1NI6DJzTSLEHN1sw5lsYlo57L21WkxYxtNjDOXimZ KV1Vr54iIXZCTD5+ScYKZiCv44lI4VbwwzJ+7FeaHB7k8bn0V1C0vSRAaPSvl7OBf3f0hE f47s0EECfcwAnAilTRWz8R1HvxvMP1iWJm3cmsBS3AeZkMv2hbB/oI8OMZ3lxR6XfmmQ9S pCZOGDQMaQsWBCrjIUUbFiSOpTnyMHtTEWGFO49i/fq3/yJIIKpp9f14QXcqvmrOnuW2ul fNM2qmVJYKIPWATl/FkdJyJiwjbY01Hxs5UkCW6zTaw+OD4CCWFg9McPODNXEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD65C1xS9zs9h for ; Sat, 22 Nov 2025 09:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 379c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:20:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 5705569f3c00 - stable/14 - stand/lua: Fix two typos in the manual pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5705569f3c00fdaedfa7c0ced2d1c51c8d3d2370 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:20:47 +0000 Message-Id: <6921806f.379c7.fa0508b@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5705569f3c00fdaedfa7c0ced2d1c51c8d3d2370 commit 5705569f3c00fdaedfa7c0ced2d1c51c8d3d2370 Author: Gordon Bergling AuthorDate: 2025-11-19 14:23:07 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:19:46 +0000 stand/lua: Fix two typos in the manual pages - s/Additionnaly/Additionally/ - s/commmand/command/ (cherry picked from commit 6f14b6025a6f6475522697362aaf6c84514b85bf) --- stand/lua/config.lua.8 | 2 +- stand/lua/loader.lua.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/lua/config.lua.8 b/stand/lua/config.lua.8 index 7e8863203446..f918ab7ffbeb 100644 --- a/stand/lua/config.lua.8 +++ b/stand/lua/config.lua.8 @@ -66,7 +66,7 @@ as a configuration file .Pc and then process files listed in the .Ev loader_conf_files -variable. Additionnaly, the top-level call to readConf will process files listed in the +variable. Additionally, the top-level call to readConf will process files listed in the .Ev loader_conf_dirs and .Ev local_loader_conf_files diff --git a/stand/lua/loader.lua.8 b/stand/lua/loader.lua.8 index ffee46526c9f..b750d42e2158 100644 --- a/stand/lua/loader.lua.8 +++ b/stand/lua/loader.lua.8 @@ -90,7 +90,7 @@ Obtains the value of the environment variable returns .Va true if -.Va commmand +.Va command is present in the interpreter as a builtin. Otherwise it returns .Va nil From nobody Sat Nov 22 09:20:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD65D5hFyz6Gk39 for ; Sat, 22 Nov 2025 09:20: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD65D36yJz478h for ; Sat, 22 Nov 2025 09:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iS7lOjpN5UZxkAeDrnsol9q0UbaSIaaHJ4o3LZnaSKI=; b=HbMgZS0W4OH6NSjOoRGKvfXtA+97KyaSoMuGZCl93zqXgHXHTKiFTmW2K3JwJ+i4lDHidq 2s9Q+MMKXnUBFo2WmtwYsSBL4tOC01yMrTTfsKZfJWFmqWlxwPEyNy8OFeV6AujVQQNoS2 66TNDL6+zFdjtZjeeH/kDmxq+i6EsuGiOKoEGErKeSdv9s+HdS5i+HiG9Tv9z3Fu+GjJWD T7M69pEl+a9A+0cJU3aJoc6jBI9evo7tsrce0MVvxjr+8Jwiin+EF7+VyNUMeUDtWoXDnN +xNAZbDBdQehQ9/kyN/U7gvIc12VPQo5uY5E1Jk01hEkeCIoPrDNGRf6pnczZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iS7lOjpN5UZxkAeDrnsol9q0UbaSIaaHJ4o3LZnaSKI=; b=IAkNl9rXq6bX4/KSjzC8LO8k20rx4Dni3UwueSLtsWpwgjP2Sxs2k26QlibwPL0mT5YZBx 8Hexo0NgFGCy4r/Ekka4KjMqElUkuprLhFhB26B67jKvN1/cXIkQLHZICwlcjH5wlD1cRg DM9pZPcrCrQLqGmyHZy2eTgTyH8hzFxuFUrEDsv+rx4LZQHDyy+SehKdLbZqfUqUomksOW y258h5yw8Idsgg3COqw65080ufykrl5NTKEMguMXvCPA5p62pLte0ZbTIEsEWJeTmX0SeC xv6icAfDrLabstuardS+CSyjgKyF4qoqHW7/zgHPbeUaQf7jkZRq8HrhZJLnDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803248; a=rsa-sha256; cv=none; b=Kv/xzsNPzjksrxlvgwqEvxbT8BGQiulwZ/eLoRRNUNIP0PuTI+IgNDBYj9XYVwDHCg/u6d zbfLX5kyBXsObvsKxQlI6uP6SmO6XroIm7h/pAesZqGq81HKjkwBuDn3BrqCnuA8kkiyvc kjX0XPXlbtopfBJx1DYYEIe8/w3RvMs3/LtSndHYCeKSmV9f7Q1j2K3dg+U99NCdY9WFAc E1XqNLmT3ic8btK7Z7NzzvXlcXsrX6P32c+onN56n9eBPTrPniDeW9zpy5Rwexn3VoX4L1 Iu7lZtm8zo2rDrd0EYOUodhLcn99wyTN3pZgbxaAWLMbaxXZorOY1t9j2r8ccA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD65D2gLGzrhW for ; Sat, 22 Nov 2025 09:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38bf3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:20:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9437a4d37e57 - stable/14 - exit.3: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9437a4d37e57b3d986af25379b2e171c25564b0e Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:20:48 +0000 Message-Id: <69218070.38bf3.3d272d58@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9437a4d37e57b3d986af25379b2e171c25564b0e commit 9437a4d37e57b3d986af25379b2e171c25564b0e Author: Gordon Bergling AuthorDate: 2025-11-19 14:17:40 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:19:59 +0000 exit.3: Fix a typo in the manual page - s/avaliable/available/ (cherry picked from commit 9334fa3ef5e19de7d3dcdbefdaa3f6b6b653475a) --- lib/libc/stdlib/exit.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/stdlib/exit.3 b/lib/libc/stdlib/exit.3 index 2fb3ab165dae..ed144a6d909c 100644 --- a/lib/libc/stdlib/exit.3 +++ b/lib/libc/stdlib/exit.3 @@ -105,7 +105,7 @@ may be used to provide more information to the parent process. .Pp The complete .Fa status -value is avaliable as +value is available as .Va si_status member of the .Vt siginfo_t From nobody Sat Nov 22 09:20:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD65F66THz6GkB5 for ; Sat, 22 Nov 2025 09:20: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD65F3xhcz478k for ; Sat, 22 Nov 2025 09:20:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JxMRIHDY51Se5R9oZtozJqtIwG/G9cM3u3M2Iiu1MAE=; b=pEh8NSdSyRJTfYCQWliC3crtGed0/5WEPoJQAsLeSoX96p4xjRoOEUrzQmJLk8bkD9t5Sn xJbAH4tQrx5x4rXRYTCaN/TqnKf6DzhtScvuErB1aA08bXyjMS+Fizf8/+tbN8pGEmly7P NULwD4aRZ/AhcA3lNyinn531iObrjv0B8dynWU0rd5ojAM3Vt1BMqlj78IQNx5ZfQCLgEo ZVBNVA7hxlnUcrU+Jw6eTfJaLBZHzUfx9gD90QavwkYjcaH6+Hld8/nYl3kLgtrU97PFQH drPxq13pxox7/BTU8lqH5vc3lrVKRpOL6Z2gYBOmajvS0NeAFmD5sKYjBNC+NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JxMRIHDY51Se5R9oZtozJqtIwG/G9cM3u3M2Iiu1MAE=; b=rYAoFxMThh6DvPPDVpsXc7SwyUHdYfz2YZmUkfu+lPk7hfPzFxrvFI31RNlYhlIHsMA+5j WJbuSRdSXEA+Pz9plJY40kQp9o7JUmQE9NLgStRva9ZePBHfwSnIRebhOyVmg++/H5zxns MnZG1+buEP0b7qTYkHk0wzFTrFtgj0ieL6Aho7RG5Xe1EJCTZPTyfNELnly7G4Z1Gg+E29 ULaWRcYbFmADsUgcgf18jANd5EZ2O5jezRpQV6QMgmCLCPjkWPJg1/+b5Rg+letfC4U5an zLUQTx9e1VAF1CXd22ZHZoRopQqoqLVWLEAcDaeoJlw4t2CX8UeJ5jtp3IXQfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803249; a=rsa-sha256; cv=none; b=SSCBA0+XuSD39gyO1zbQmEMIyd56D11Thc+cWfbTDbzhOLRQYCL1nwbO9Tvt3Bv38ZEUgk fYideIho286o7w1mkMqvG5Ejy6GdOe9wBkX7tKmWkWY5bs9YDcPAsfqKEm+5gMCG3YR2TI 9WLvfYywvTzfxNHAHIIXAc8xjvjqQHWa/Q1CHYwstBtXWjEKBSmC2RcLKSWz8R5pim0PJF 2ejWjekAGnsQos296iK6mTSpZtb1R72TM2oF56w/UQ+7cONWrAB4dg7aGhTNhZSeKhjoOs wY5VxO/K5cMJ3bz/WlK/Em3WyjiNJqm4fwlCP1KvjZPz//sCyhK2Nv4YUNsG/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD65F3RyjzsDN for ; Sat, 22 Nov 2025 09:20:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 375d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:20:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: bc97e62961e6 - stable/14 - nuageinit: Fix a typo in an error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bc97e62961e6f204582951051fa643e4cb1caddd Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:20:49 +0000 Message-Id: <69218071.375d2.7d39250b@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bc97e62961e6f204582951051fa643e4cb1caddd commit bc97e62961e6f204582951051fa643e4cb1caddd Author: Gordon Bergling AuthorDate: 2025-11-19 14:28:54 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:20:11 +0000 nuageinit: Fix a typo in an error message - s/outout/output/ (cherry picked from commit 73a026d5e9778ac182be4a5876771eefa2cd6f41) --- libexec/nuageinit/nuageinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 29340a3d91ea..f68e45701b6c 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -63,7 +63,7 @@ local function get_ifaces_by_mac() ns:close() local res, err = parser:parse_string(netres) if not res then - nuage.warn("Error parsing netstat -i --libxo json outout: " .. err) + nuage.warn("Error parsing netstat -i --libxo json output: " .. err) return nil end local ifaces = parser:get_object() From nobody Sat Nov 22 09:20:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD65G6pd1z6GkBx for ; Sat, 22 Nov 2025 09:20: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD65G4T7Zz4730 for ; Sat, 22 Nov 2025 09:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HmrSPIHZPXedM6hTKgP550BZkYCbyxngV/kdU4wGRq0=; b=XNNbSHWTYMzCvMh0KC0WDLfgLKQfM2mkywXoQxptUL+C6fEynrfkco6QEnZqft9VrO3V08 TlnnzlI1q44iN4r5KQZJ3LTNjcRI/jlZnZEc/zY0fJEdIa4iW2CbO1eAKsE0kcOhR4niJL 49nKyRs828GzgfKb7YvNoIoMY95l4rzySyTpFqBuHZV4J1ThXxCnLZd52zsuLXCZzA2WUW +6bVr4KCq3XZP8HY6eDDYTNG5jofONxnwRxRPrD2nAFJ0DRaDdOREhtZgDMIB81Cyym/p8 GjMtZMdN6yIkdmIkxTfqoaIFLxD01626LQSagEEilp687Kx4EDE3dBzF/5rC7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HmrSPIHZPXedM6hTKgP550BZkYCbyxngV/kdU4wGRq0=; b=TCICnTOZOV5gPNEx62UyCFYXouBxtdZVGi2psiySh+z7WU27HXfUClCwa09rZoTE0oFI1W N1AMv3ENcOeuBo/Mm3F8EAlj10BPywRIEVm0WnikhmRh3Uja3Xt/J/fxDwPk6RpeaTWAxx mzsMyu2HzRHwZBbgEXMzr7i6JYKpkYbCmzEN2FYlkZyHJMfKmoymQ2TIbM/yNXtDO3Vrua vl34yjv2/RPn7txaqydzoqAYauw/oQtmq94Ddv3trSuKEUnxBlMRVPK17EyN8yl4FE6EJI CKeUPaT17lMHfFkQBzmzf3CWvIB9genqsNgi4CTM9Ovbx3Yo7A/nemxNPKMfcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803250; a=rsa-sha256; cv=none; b=Y374M8WeocqszWCL7yAXFd+vuUzTjONypnb8X7QsozN67afam7M0670cAqEqjxassN/Y7j btKXM/hTxv4koF0uT40LKJHABjTm7aTk57yqka8zRfWqjqf7WKJAVMuvDX/ywSMuQHqIz5 cGowKuueGn7ronSazY/1pB0PmFzKw1trOpLazq1g04YrXu3WGHvWUIPSQmn+KrzkUwdPUu 0+GdtQlaDprLEEdV8tWOntLZbty5AVC1ex2DS+X7K5m6kIi3erevyiWsGDwNOQBOQtj/2d k2/ikK2LZ54DKM/TLnzzWxv4yHadLc0b/pOyVLP04AySj+bTFksbZv5liNfrvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD65G3xvhzs9r for ; Sat, 22 Nov 2025 09:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38ca1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:20:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 09e1d6fc41ab - stable/14 - libexec/lua: Fix two typos in the manual pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 09e1d6fc41ab1e9c820e9d62dda416785bf1bb71 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:20:50 +0000 Message-Id: <69218072.38ca1.e67239c@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=09e1d6fc41ab1e9c820e9d62dda416785bf1bb71 commit 09e1d6fc41ab1e9c820e9d62dda416785bf1bb71 Author: Gordon Bergling AuthorDate: 2025-11-19 14:24:30 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:20:37 +0000 libexec/lua: Fix two typos in the manual pages - s/environnement/environment/ - s/interger/integer/ (cherry picked from commit 58b86e40ce76de649db19d9d1f8571d5c942d44b) --- libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua | 2 +- libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua b/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua index d254dd22c91c..242bdb4400fd 100644 --- a/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua +++ b/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua @@ -30,7 +30,7 @@ function. List of functions: .Bl -tag -width XXXX .It Dv table = freebsd.kenv.get() -Dump the kernel environnement into a key/value +Dump the kernel environment into a key/value .Fa table . .It Dv value = freebsd.kenv.get(key) Return the diff --git a/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua b/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua index 34198d20463e..fe189225b239 100644 --- a/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua +++ b/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua @@ -33,7 +33,7 @@ Load the kernel module named .Fa name and return the identifier .Pq fileid -as an interger. +as an integer. .It Dv ok, err, errno = freebsd.sys.linker.kldunload(fileid|name) Unload the kernel module identifier either by .Fa name From nobody Sat Nov 22 09:22:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD6755hMpz6Gk82 for ; Sat, 22 Nov 2025 09:22: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD6743WqRz49NR for ; Sat, 22 Nov 2025 09:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NEM131y7aCE9VHR4+HCmtNRJhDWmi8zItqRueDCuL2c=; b=iKjV6KOkvtAmnN0cjqzWwAT+u3GhUPIM1XyAfTyTQ1X9OISqYWkJM79EPBr8btsr6j6N1J bhS98wylFescF6yrPN0ReaRPHYV7Kz2SG85esy4oG1VykfP+JWP5RUHZhNrq51ooY3Jac+ gn4D9bbHU1fNEjYvsUXucvzNEUk/i0gK5qHbTtHUAMVkNZFCAXOBjwUPVNZueomEkX5BEw yGXEQC5gxi2QfbY7se1h/PBgfB32B3NHipibVk3VaasB6Lc/bdAP1KNdpb2X7YsVe+9MRo 5vz94NFAxPvtL0qjPqqqbfaHO75XbXb9/KGYBHlICV3amVsFWKJEmy9rIPnfKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NEM131y7aCE9VHR4+HCmtNRJhDWmi8zItqRueDCuL2c=; b=nLCyOJS2qXXXv8OQyNW3lrNtm37ThSXNhjq45IBehS0zvI3bRGqB8tj/iz4eFoI4tytfiN WOL3+BJTwJApmSrl7LPJhjBfDr9hQ6JrgrXBFFZ+LjCnXhReH7w9pGSP0zpn7VdaDzkxJc Ob2aWJlUNvNS2RKWwexG3F6K5wD83FnAANnWJWkcRjVui2+g0h2xvSL98Ewo3AeOEMYPIH Hp+HaHULCMPGXGNneD1Ublp8wggF83Z/xVIrJEVZ1d4+6kT3zuBije3aH4KcxxGwtynils 7qDOb8sEAITqetIbRz3zxgAuQU91SbgiTmIbrYSZzOL0l7j8D5dr1ZEys6z88w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803344; a=rsa-sha256; cv=none; b=o9CxJtgzHMOLEYGUS1LDry1PFHGsYeNXnEPCSmSjxbcySLII1x+ytVMAwrg6knD64hrX0P 9dWV83YS4R3/A773JvssT0Jm/1vxwKnj7ckFrOMrxKr4F6M6Yd7pU5V6mS4td/dJrbUbsh MEqgNGddzbe4pDyTxaG3APNIUcx0oQZBADhN1a1nhs+K4x+XRJ+K5V88kTeo82lB8k3kF5 2629gxekGfPrx7JPX4KHKpDOpLi0+aHWaKn631KL3uD1P34QDEzzs2P8UKYp1vKmnk/Lxf SmsVRVNhZEjuPwzQDSV+on/ta2HrRAiENcX3ie9rKPeyArTq6zTp2PRfGG0hXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD67434RMzsc0 for ; Sat, 22 Nov 2025 09:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37ada by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:22:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: c75ce77a26d4 - main - stress2: Added a regression test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c75ce77a26d4e7febc7abcf2623e9ca4c914de7c Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:22:24 +0000 Message-Id: <692180d0.37ada.682a8759@gitrepo.freebsd.org> The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=c75ce77a26d4e7febc7abcf2623e9ca4c914de7c commit c75ce77a26d4e7febc7abcf2623e9ca4c914de7c Author: Peter Holm AuthorDate: 2025-11-22 09:19:28 +0000 Commit: Peter Holm CommitDate: 2025-11-22 09:19:28 +0000 stress2: Added a regression test --- tools/test/stress2/misc/killpg5.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tools/test/stress2/misc/killpg5.sh b/tools/test/stress2/misc/killpg5.sh new file mode 100755 index 000000000000..4b98d30487d4 --- /dev/null +++ b/tools/test/stress2/misc/killpg5.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +# Test scenario from: +# Bug 290843 - killpg deadlock against a stopped interrupted fork +# By : Bryan Drewery + +# Seen: +# 0 70877 3650 7 0 0 14856 3680 sigsusp I+ 0 0:00.00 sh -x ./killpg5.sh +# 0 70881 70877 10 0 0 14856 3688 killpg r D+ 0 0:00.07 sh -c trap "kill -9 %1; exit" INT; foo() { unset cmd; cmd=$(/sbin/sysctl -n vm.loadavg|/u + +sh -c 'trap "kill -9 %1; exit" INT; foo() { unset cmd; cmd=$(/sbin/sysctl -n vm.loadavg|/usr/bin/awk "{print \$2,\$3,\$4}"); case "${cmd:+set}" in set) ;; *) exit 99 ;; esac }; runner() { while foo; do :; done }; launch() { local -; set -m; PS4="child+ " runner & }; set -x; while :; do launch; sleep 0.1; kill -STOP %1; kill -TERM %1; kill -CONT %1; ret=0; wait; if [ $ret -eq 99 ]; then exit 99; fi; done;' > /dev/null 2>&1 & +sleep 60 +kill -9 $! +sleep .2 +killpgpid=`ps -lUroot | grep -v grep | grep ' killpg ' | awk '{print $2}'` +[ -n "$killpgpid" ] && { ps -lp$killpgpid; exit 1; } # The bug +pgrep -f 'foo()' | xargs kill > /dev/null 2>&1 # Cleanup +wait +exit 0 From nobody Sat Nov 22 09:22:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD67608M0z6GkJF for ; Sat, 22 Nov 2025 09:22:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD6754ZP3z49NT for ; Sat, 22 Nov 2025 09:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BLEo0OEf+JCx5tCApCIMTXQ9CWB5+OeVJ9nz+n6/h+M=; b=mfXW4pIxeKxnv/HYZQW/XSSsHmUwaVmO5U46jZFpVCxkJwkshgMZlTSVDz7ubIeyw9G4Qu GUv/CdbcYlBHZwyb2X+fU8bg9oCN9WOOaOkXOSk5ZgdCi3wLsTR6Eyz4yZJCOG0kNzqRBa Vwdj4bBTVLuOQWVVMwoO8L9Q02aAL2c0YQteFB/QZgRHczvbpM1QCjgN/0e5GxagM1JjhH Vv4SYkvKvuqCp3lWzEXYInqCRQ+GLxPC+fRFehJSlgF5o5ryuj94mS2NQ7aHU1MvcAD5UM YfheaTyl5SKUekb9ltl+6vF1SDUyINBdsg0EMo4KyRCS4RagriWcvTxj82Armw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BLEo0OEf+JCx5tCApCIMTXQ9CWB5+OeVJ9nz+n6/h+M=; b=ZGyBQyutUHMBgJCNqUiAxsrKKNqLW4EDomby8FKI+f2126GgNCKZluf+8+GRdGp7vapwvR /OTdBl4hCZ8yTOXvtburPjaxai83/U0zvbp1nVIZDZ7D1jxyrLGdM46D/tir4Tze7nStaY DH2DmX1qvtKREecvkpVKXZf5NU7+QmLonzzEKltv+5DZNyY7G2nBGFm0jXH6u3mApI+SVU PRDvyEonqxusy1JbbZioUyBF+Hs0JjnazMv9+s23auoxJP9qvSQT4rjCf82Wlm/WUT4j4J XSl0wKxMPUxMd0XQEvUsWU+0Vw4nwnh1Tm0ih9DmK9PPSfPEVbOUIa6jWwYbQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803345; a=rsa-sha256; cv=none; b=FuNQw/769fLTY4MnJMYuHkIy/cSAlG03tuW4JnczB4vMQuzhK/vQXOGSCQw4DR8wcLEcve RMPTZ/6Xl/7chZmjfCOSbLDdHVpHQUitF+Oq5hLMo5DQJANIGTMFNwYFAWpf+g6nDqZg8n i13idAXDbDBHJe+ZNyrjd4BNG7wZWHKgdpSjK7qSxZzGUGuIXBalH5qauBAak3KERHLLBG sqM8Rn27+NiB4mdskpTN8SL5S2p9JvdQjE0FBsRwYD5rpOQJAcpuqQCM/LWXQb587LAeN9 boIj9hZNSh7FHwOSlmO52syNcvXtHmWo8Ss4oC5L6xJ3xaED5/4pA3EgkTtILg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD6753tHTzsNd for ; Sat, 22 Nov 2025 09:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39186 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:22:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: aa2468493e35 - main - stress2: syzkaller87 fixed by ebc17879f0885ca87644980f6275b9759b311eb3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa2468493e359ff72c6fb73b1ab6ba9ea4005e01 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:22:25 +0000 Message-Id: <692180d1.39186.6ef17f30@gitrepo.freebsd.org> The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=aa2468493e359ff72c6fb73b1ab6ba9ea4005e01 commit aa2468493e359ff72c6fb73b1ab6ba9ea4005e01 Author: Peter Holm AuthorDate: 2025-11-22 09:20:05 +0000 Commit: Peter Holm CommitDate: 2025-11-22 09:20:05 +0000 stress2: syzkaller87 fixed by ebc17879f0885ca87644980f6275b9759b311eb3 --- tools/test/stress2/misc/all.exclude | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/test/stress2/misc/all.exclude b/tools/test/stress2/misc/all.exclude index eb84d174cd4e..9851496f8839 100644 --- a/tools/test/stress2/misc/all.exclude +++ b/tools/test/stress2/misc/all.exclude @@ -71,7 +71,6 @@ syzkaller59.sh Page fault 20220625 syzkaller80.sh panic 20250711 syzkaller82.sh panic: m_apply, length > size of mbuf chain 20250724 syzkaller85.sh panic: Assertion uio->uio_resid < 0 failed 20250928 -syzkaller87.sh watchdogd fired 20251112 quota3.sh https://people.freebsd.org/~pho/stress/log/log0604.txt 20250728 quota6.sh https://people.freebsd.org/~pho/stress/log/log0456.txt 20240707 truss3.sh WiP 20200915 From nobody Sat Nov 22 09:29:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD6Jf2VGKz6GlFD; Sat, 22 Nov 2025 09:30:42 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [IPv6:2001:67c:2050:0:465::201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD6Jd12rRz3C4J; Sat, 22 Nov 2025 09:30:41 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=MBO0001 header.b=MjKm9H47; dmarc=none; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 2001:67c:2050:0:465::201 as permitted sender) smtp.mailfrom=herbert@gojira.at Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4dD6JM2RhWz9t5Y; Sat, 22 Nov 2025 10:30:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gojira.at; s=MBO0001; t=1763803827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=71KtD0mlLT0B9UwLqKCPefXBdnmrB1SS1DBJ7p8GTtQ=; b=MjKm9H47e1SY0sxeoaKCmbm4viK/WX3pvUJWVfkAqayEscaHVSHJ5NUMHUth73IMrslIWp 8c1Eo3jQAPKSgN6M3QayiS6cFTlT9oePXu318fu87q+zQDaAhOJ5dRN0r1QGKagfOSNyhj mmW2/De2VRUfSf1/AQLjp03F3CIPbC4WzFPknhIRdHjM9OUUcmYWcxuFRNWoRXDZRVjWt1 2KtIRVMRQyeq53fCyBpay/bUSjTbH5bELUZjylV8K9imiRIQds1RC8YiWnUeCzqksogNnx xI5W3f+deaksizoul1vDMvPJkMYRsc5zBTU/OzidYiteMJSTCLpZWhi8I99Bxw== Date: Sat, 22 Nov 2025 10:29:06 +0100 Message-ID: <87see62z6l.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Andrew Turner Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: a695ac2ce8bc - main - arm64: Move intr_pic_init_secondary earlier In-Reply-To: <691cb4c1.220bb.22f9ecf6@gitrepo.freebsd.org> References: <691cb4c1.220bb.22f9ecf6@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.70 / 15.00]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; R_SPF_ALLOW(-0.20)[+ip6:2001:67c:2050::/48]; R_DKIM_ALLOW(-0.20)[gojira.at:s=MBO0001]; RCVD_IN_DNSWL_LOW(-0.20)[2001:67c:2050:0:465::201:from,2001:67c:2050:b231:465::2:received]; MIME_GOOD(-0.10)[text/plain]; MISSING_XM_UA(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; RCVD_TLS_ALL(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DMARC_NA(0.00)[gojira.at]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[gojira.at:+] X-Rspamd-Queue-Id: 4dD6Jd12rRz3C4J Hi, On Tue, 18 Nov 2025 19:02:41 +0100, Andrew Turner wrote: > > The branch main has been updated by andrew: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a695ac2ce8bc8e8b989359002659063f2e056dcf > > commit a695ac2ce8bc8e8b989359002659063f2e056dcf > Author: Andrew Turner > AuthorDate: 2025-11-18 18:00:32 +0000 > Commit: Andrew Turner > CommitDate: 2025-11-18 18:00:32 +0000 > > arm64: Move intr_pic_init_secondary earlier > > This may have been called after intr_irq_shuffle. For most interrupt > controllers this appears to be safe, however for the GICv5 we need to > read a per-CPU ID register before we can assign interrupts to a given > CPU. > > Fix the race by moving intr_pic_init_secondary earlier in the boot, > after devices have been enumerated and before the interrupts are moved > to their assigned CPUs. > > Sponsored by: Arm Ltd > Differential Revision: https://reviews.freebsd.org/D53685 > --- > sys/arm64/arm64/mp_machdep.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c > index 0bdd2ecfd8a7..ba673ce9d6ee 100644 > --- a/sys/arm64/arm64/mp_machdep.c > +++ b/sys/arm64/arm64/mp_machdep.c > @@ -270,6 +270,8 @@ init_secondary(uint64_t cpu) > install_cpu_errata(); > enable_cpu_feat(CPU_FEAT_AFTER_DEV); > > + intr_pic_init_secondary(); > + > /* Signal we are done */ > atomic_add_int(&aps_started, 1); > > @@ -288,8 +290,6 @@ init_secondary(uint64_t cpu) > ("pmap0 doesn't match cpu %ld's ttbr0", cpu)); > pcpup->pc_curpmap = pmap0; > > - intr_pic_init_secondary(); > - > /* Start per-CPU event timers. */ > cpu_initclocks_ap(); My ARM64 VPS (KVM/QEMU) only boots if I revert this change. From nobody Sat Nov 22 11:15:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8dr2mrcz6GvYM for ; Sat, 22 Nov 2025 11:15: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8dr1wlfz3NHC for ; Sat, 22 Nov 2025 11:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XotoWQF6biKhjR5wMsDRlZt6aKFhMSueOcrJAF3t724=; b=cK03SYDvVgbcX0Hity9nQqZzUq0Hq83vkIvGSTQ0euWWqbo+Y6RkGtLSuNEjmo2qdbJcDb cplUlsXZFhrSmWFOio5tPOPrXWWOY6atXK29eyhkQmBkVb+DBuA+kmcowA6wpF28X457BQ MEbCZrUmWKSONNDxHvdmx1X026b6NcuZ5ag3E2VAazwMlIP+etBszSaBzO3hLy4TXkKTh4 VLFKAMmHecjOGNPvnxkWZo70QDaes0ndZTKOrN7kzsYlyHhi6KtnthRB/7695l4HYeejct 7xYI0Ji0h0oGwvsjpiq0VcgIS7opZDCdAPIP4WaCvkHdHq2MqEKAyFVXuL/ALQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XotoWQF6biKhjR5wMsDRlZt6aKFhMSueOcrJAF3t724=; b=UYckLK/sfBZUj5tUGpuSWTtYCnjBOQApPOun4KDi4JZpipy2QLWTW9sRMDtVWev2YOLRUF ivF7zBqVll/0BTfbO2rQ0AFKDG0vckg5xHDN6MgBEnibgGBF/ggWVqJm/M8WEl0m4hnY74 JpJFY38RNzwBu6kAy3sPSHsh1u+54SR7tGN/svdth05tzV6iBxq1dUl4SGYalHUI3arrAG g49MnXtpLVYclifnQh+uzlymgeqP2CzUQsiXJrMFEOysaF1MEVL3zq/9gK2psuPz57haoR KuXELQMy2DyuZ+scqbUjbBhpms+vqxYZAN2Hzmxr8XU8FEoODSGta5BQ4+0s8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810144; a=rsa-sha256; cv=none; b=jXvY5erfYcRrLERIOjrBOVW1mSDEJb/nkQqcSMEK9LyaPXNf3fK2tLiOC7KfrvkD4ywzf8 e4y+6kBycKn2RkvE0/g4mXgr9iC7wBUwqAhdiyof1DTb92oeOizHtPk3l/Ft6e2un8CNQK ebKzoM9g4rNb/UhfQuEo/aHhbylSwe26scdzMZz5cX7yVfi8+03iUAL6SHZJdezvCZqQ9o lWhiDkhXdCswiUr1zsZwNzzphAGkgiFVzok9yyopQO9+LxqjFmQIBLNIbo9zA4b7NrgPhl ACzfBK2O5yO20WN/tZMBmBVU9HCFLoQ0Gc7jH3JtdYXb+MK52iVu9IhWzw9tOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8dr0yL1zvlL for ; Sat, 22 Nov 2025 11:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a12d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:15:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: cd989bfc73f7..2aa9fc59ab11 - vendor/device-tree - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/vendor/device-tree X-Git-Reftype: branch X-Git-Commit: 2aa9fc59ab11a7295f95a134638447e2c952b380 X-Git-Oldrev: cd989bfc73f7dff3085b7004c7d4f06396382e6d X-Git-Newrev: 2aa9fc59ab11a7295f95a134638447e2c952b380 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 11:15:39 +0000 Message-Id: <69219b5b.a12d.378d2ada@gitrepo.freebsd.org> The branch vendor/device-tree has been updated by manu: URL: https://cgit.FreeBSD.org/src/log/?id=cd989bfc73f7..2aa9fc59ab11 2aa9fc59ab11 Import device-tree files from Linux 6.13 From nobody Sat Nov 22 11:16:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8g816dZz6GvXM for ; Sat, 22 Nov 2025 11:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8g76fknz3NV9 for ; Sat, 22 Nov 2025 11:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=dn4ymgrhVnzcR5QHvJ0oof6SsQaLOssSzyIFZkZ/lmI=; b=iR1SbVrXE6G+uscFOr3PGcstz/xttxzbCFsIhs0ioqirQrYu1cMBdj9Zufiu8W8EM5vCjl WJtLMieDatNPYqVNa9f/999wq1elPprqC+hMdwp3LNjoLT18U8XozB3LV9q+cp/tz0K13D ZAwPhlEdgblrDB/npSVFjO5GsIgSsgtmpndVp38C0EzXQj7jjCDW9kiXgKDl9kpmyBDgL5 mvYFaQ846nQUtSazCimgGiluFYrIPzWkWDKO9aZbn4bQTiQu4b1aBsqnHX0GovgvYH0LEp +UeoyDHhnJOtbtK8bBUrS8x4m2tekSLm+mqnadVRiUsvP7u85STZ64/hTArlAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=dn4ymgrhVnzcR5QHvJ0oof6SsQaLOssSzyIFZkZ/lmI=; b=rzQ8apoeZ6dZYhJjYAiOgUKqkfZ2pfaFbsUnS32Y9KjjU93360mp116cv/vCGgcZLcYwsA 9DOSERp5vaIwpwXnGcivqIE/oupK2t6oXCiptbyoKLuafjUaVnyKrc701cOZUzdKwP2b2c bLA5e2lKD9WUzB0rgImYMjtpBv9V0Z8kXtVY9ir78O3q94DI8xxEyizGhFrVCogsgihmjB pKfiqeiBC/F+5DCKqdkjmZX+3YPU/8VRjf72w/bI1Yz+LP8mqVgXbspB6qW+RV886W+oD8 /PU28bvq4LnjZx4xSOL3orzTbhUppiKrhicy19jAj0Jy7KlksrVdHrWIzoC0AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810212; a=rsa-sha256; cv=none; b=CWYektItoT1Qzjfy94vkDVqxKyg5/f7GK1R/uPNwA0Y1AcgtMxHDCxgjCA5Z9F6Ysw8bcd 7ld3Djs/mN8QZwwq6YHIKKNUCsb3MpZZVmTVY0RUl+32aN4jEflzJF4LQGSxkinXEAp5xJ ntlIoRhGNRJo3sJfA2ZIabzmroQuCwInwRL6ZD4neNGsQ7GTnCJTtt2Vdct9PmL1yK5aeF TXdrhSt7MLI6WRVFwpl1c5stVnwded6QA2pZONUj4PKDzHqDQ7Upkv3TLakU0+c70bQ/Dp /sD+0OkCnDA9PkcYl/fi6bwoDNxybRjMp+56va9DG9ZV8NEqB2teGS67QQkdEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8g75jlpzwGY for ; Sat, 22 Nov 2025 11:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a130 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:16:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: tag vendor/device-tree/6.13 Tagger: Emmanuel Vadot Date: Sat, 22 Nov 2025 11:16:51 +0000 Message-Id: <69219ba3.a130.47c072b8@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Import device-tree files from Linux 6.13 2aa9fc59ab11 - MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/tags/vendor/device-tree/6.13 X-Git-Reftype: annotated tag X-Git-Commit: 071951bf21fd8ee4823ee5ff8003248616c24b19 Auto-Submitted: auto-generated The annotated tag vendor/device-tree/6.13 has been created by manu: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/device-tree/6.13 tag vendor/device-tree/6.13 Tagger: Emmanuel Vadot TaggerDate: 2025-11-22 11:15:02 +0000 Import device-tree files from Linux 6.13 commit 2aa9fc59ab11a7295f95a134638447e2c952b380 Author: Emmanuel Vadot AuthorDate: 2025-11-22 11:14:46 +0000 Commit: Emmanuel Vadot CommitDate: 2025-11-22 11:14:46 +0000 Import device-tree files from Linux 6.13 From nobody Sat Nov 22 11:20:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8kn0Xn3z6GvfC for ; Sat, 22 Nov 2025 11:20: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8kn0Cq7z3NnT for ; Sat, 22 Nov 2025 11:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JUMgsJgdEH5e2hcpwhJ8ftZMFhUdLSM0r9cocAzM1kA=; b=mEM5TL9X8VbRlRM56Ep1MqiGsicXxBeWwHBQYemYKGCSmO4tZ8kBNSvG29/zVP317F20RI PtYyl3HgkrUajsIyqlXRabXjBdPIRJ+25+Cm0/gSH5P6PL5CzXl9opuQT4sA6VVkGRnMgf wneboo+HOLW+Vg1KEvacuONB5dFO7jDl25KqSI1qvRH4r4F2Li3zd8SaX45lY5pJ4YX70r X6Ql8CrAL8+QxC2sa0hefrFOKZ3QibPAM6TO96TjIXQTgdSz8cZiWcE1GdzenRszO+jvt5 FcaXpNIJGZqe0PMGmiyBDHCAwCl5qBhhdIEV3bbXCUcrjCi6JQpltzdCoIVhxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JUMgsJgdEH5e2hcpwhJ8ftZMFhUdLSM0r9cocAzM1kA=; b=fBJnfB5QhRxj7QHcsSR+L7VZhw2JrKdtFNzc2r9wxqR7bGG96nU7Ehzs8wgHPO3HLxMhzy laOxlUSDPIeezdGjY3PivfZ4H5FnWnqmzDyhk3LDWGyP2SX+D0or6mHU87qetcMXiD8qNg hjmrvjNWntAvVFW9T/naoRfS9u5veP1OaQ1R0IToQDsF+gKYmEpYzALkDuASAB9oKdy6FC 33+AqRubril2JI9LMe5M5QXZ5H5qX0/vEaDDVOrqJXQETcEOKZzD5qyCY7vafK1FvIXZPU XZjPM6A+xEtscT63TtSZt6AaVFlbgmb6gd12JJgSLwrwxtVaOwGxAZhFcwI5bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810401; a=rsa-sha256; cv=none; b=q5Cb9cJMlxTI/gU/ElwD6I+PLeQKZvHXGwERmkI5xw/5JzeXlAcLh8brmYn2/FuH0i6/8c PGSb+tqJF9HJjIFWZS1rMyfnnnyf+RyCOsw8VtPUS6cY2vRdCUcFK+x4+NVhLDXSegPWCV L23qK+JGh+PlUt/AL0QD/K0Ddnwr1sPapoKqV7HHoj11zdyQdnFnTsTgZtlyC85dJcmJ0c mI1DCILHr9GMhV/+EBXbbs+6WaMSsISny9fHQdvhv0rTEXV6hInzQZsIb2FuN2xBoTbmAd nMBowXGJ9t1KiDOIwxWJntx5OSNnB6bC+x49BWBBfMoi30u1NwICEAI8IkTa/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8km6PDyzwVf for ; Sat, 22 Nov 2025 11:20:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b2ce by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:20:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 5f62a964e9f8 - main - Import device-tree files from Linux 6.13 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f62a964e9f8abc6a05d8338273fadd154f0a206 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 11:20:00 +0000 Message-Id: <69219c60.b2ce.4f72573b@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=5f62a964e9f8abc6a05d8338273fadd154f0a206 commit 5f62a964e9f8abc6a05d8338273fadd154f0a206 Merge: aa2468493e35 2aa9fc59ab11 Author: Emmanuel Vadot AuthorDate: 2025-11-22 11:19:36 +0000 Commit: Emmanuel Vadot CommitDate: 2025-11-22 11:19:36 +0000 Import device-tree files from Linux 6.13 sys/contrib/device-tree/Bindings/Makefile | 1 - .../Bindings/arm/airoha,en7581-chip-scu.yaml | 42 + sys/contrib/device-tree/Bindings/arm/apple.yaml | 160 +- .../device-tree/Bindings/arm/atmel-at91.yaml | 6 + sys/contrib/device-tree/Bindings/arm/cpus.yaml | 12 +- sys/contrib/device-tree/Bindings/arm/fsl.yaml | 45 +- .../Bindings/arm/mediatek/mediatek,mmsys.yaml | 28 + sys/contrib/device-tree/Bindings/arm/pmu.yaml | 1 + sys/contrib/device-tree/Bindings/arm/qcom.yaml | 16 + sys/contrib/device-tree/Bindings/arm/rockchip.yaml | 47 +- .../Bindings/arm/samsung/samsung-boards.yaml | 18 + sys/contrib/device-tree/Bindings/arm/sunxi.yaml | 6 + sys/contrib/device-tree/Bindings/arm/tegra.yaml | 5 + sys/contrib/device-tree/Bindings/arm/ti/k3.yaml | 8 + .../device-tree/Bindings/ata/ahci-platform.yaml | 3 + sys/contrib/device-tree/Bindings/cache/l2c2x0.yaml | 5 +- .../device-tree/Bindings/cache/qcom,llcc.yaml | 68 +- .../Bindings/clock/actions,owl-cmu.yaml | 60 + .../device-tree/Bindings/clock/adi,axi-clkgen.yaml | 22 +- .../Bindings/clock/airoha,en7523-scu.yaml | 23 +- .../Bindings/clock/amlogic,meson8-clkc.yaml | 45 + .../Bindings/clock/gated-fixed-clock.yaml | 49 + .../device-tree/Bindings/clock/imx93-clock.yaml | 1 + .../Bindings/clock/marvell,pxa1908.yaml | 48 + .../Bindings/clock/mediatek,apmixedsys.yaml | 4 +- .../Bindings/clock/mediatek,infracfg.yaml | 8 +- .../Bindings/clock/mediatek,pericfg.yaml | 1 + .../Bindings/clock/mediatek,syscon.yaml | 4 + .../Bindings/clock/mediatek,topckgen.yaml | 4 +- .../Bindings/clock/microchip,lan966x-gck.yaml | 13 +- .../Bindings/clock/nxp,imx95-blk-ctl.yaml | 5 +- .../Bindings/clock/qcom,gcc-sm8450.yaml | 4 +- .../Bindings/clock/qcom,ipq5332-gcc.yaml | 41 +- .../Bindings/clock/qcom,qcs8300-gcc.yaml | 66 + .../device-tree/Bindings/clock/qcom,rpmhcc.yaml | 1 + .../Bindings/clock/qcom,sa8775p-camcc.yaml | 62 + .../Bindings/clock/qcom,sa8775p-dispcc.yaml | 79 + .../Bindings/clock/qcom,sa8775p-videocc.yaml | 62 + .../Bindings/clock/qcom,sar2130p-gcc.yaml | 65 + .../Bindings/clock/qcom,sm8450-camcc.yaml | 1 + .../Bindings/clock/qcom,sm8450-dispcc.yaml | 1 + .../Bindings/clock/qcom,sm8450-gpucc.yaml | 3 + .../Bindings/clock/qcom,sm8450-videocc.yaml | 1 + .../Bindings/clock/qcom,sm8550-dispcc.yaml | 1 + .../Bindings/clock/qcom,sm8550-tcsr.yaml | 1 + .../Bindings/clock/renesas,r9a08g045-vbattb.yaml | 84 + .../Bindings/clock/rockchip,rk3328-cru.yaml | 74 + .../Bindings/clock/samsung,exynos8895-clock.yaml | 239 + .../device-tree/Bindings/clock/ti/composite.txt | 4 +- .../Bindings/clock/ti/ti,divider-clock.yaml | 193 + .../Bindings/clock/ti/ti,interface-clock.yaml | 71 + .../Bindings/clock/ti/ti,mux-clock.yaml | 125 + .../Bindings/clock/xlnx,clocking-wizard.yaml | 6 + .../Bindings/connector/usb-connector.yaml | 46 +- .../Bindings/cpufreq/cpufreq-qcom-hw.yaml | 6 + .../Bindings/cpufreq/qemu,virtual-cpufreq.yaml | 48 + .../device-tree/Bindings/crypto/fsl,sec-v4.0.yaml | 10 +- .../device-tree/Bindings/crypto/qcom-qce.yaml | 1 + .../Bindings/display/bridge/adi,adv7533.yaml | 2 +- .../Bindings/display/bridge/ite,it6263.yaml | 250 + .../Bindings/display/bridge/sil,sii9022.yaml | 15 +- .../Bindings/display/bridge/ti,tdp158.yaml | 57 + .../Bindings/display/bridge/toshiba,tc358768.yaml | 4 + .../Bindings/display/imx/fsl-imx-drm.txt | 2 - .../device-tree/Bindings/display/imx/ldb.txt | 1 - .../Bindings/display/lvds-data-mapping.yaml | 31 + .../Bindings/display/lvds-dual-ports.yaml | 63 + .../Bindings/display/mediatek/mediatek,aal.yaml | 40 + .../Bindings/display/mediatek/mediatek,ccorr.yaml | 21 + .../Bindings/display/mediatek/mediatek,color.yaml | 22 + .../Bindings/display/mediatek/mediatek,dither.yaml | 22 + .../Bindings/display/mediatek/mediatek,dp.yaml | 19 +- .../Bindings/display/mediatek/mediatek,dpi.yaml | 25 +- .../Bindings/display/mediatek/mediatek,dsc.yaml | 24 + .../Bindings/display/mediatek/mediatek,dsi.yaml | 27 +- .../Bindings/display/mediatek/mediatek,ethdr.yaml | 22 + .../Bindings/display/mediatek/mediatek,gamma.yaml | 19 + .../Bindings/display/mediatek/mediatek,merge.yaml | 23 + .../Bindings/display/mediatek/mediatek,od.yaml | 22 + .../Bindings/display/mediatek/mediatek,ovl-2l.yaml | 22 + .../Bindings/display/mediatek/mediatek,ovl.yaml | 22 + .../display/mediatek/mediatek,postmask.yaml | 21 + .../Bindings/display/mediatek/mediatek,rdma.yaml | 22 + .../Bindings/display/mediatek/mediatek,ufoe.yaml | 21 + .../Bindings/display/msm/dp-controller.yaml | 1 + .../device-tree/Bindings/display/msm/gmu.yaml | 1 + .../Bindings/display/msm/qcom,sa8775p-mdss.yaml | 241 + .../Bindings/display/msm/qcom,sc7280-dpu.yaml | 10 +- .../Bindings/display/msm/qcom,sm8150-dpu.yaml | 4 +- .../Bindings/display/msm/qcom,sm8650-dpu.yaml | 1 + .../display/panel/advantech,idk-2121wr.yaml | 14 +- .../Bindings/display/panel/panel-common.yaml | 8 + .../Bindings/display/panel/panel-lvds.yaml | 2 + .../panel/panel-simple-lvds-dual-ports.yaml | 20 +- .../Bindings/display/panel/panel-simple.yaml | 2 + .../Bindings/display/panel/samsung,ams581vf01.yaml | 79 + .../Bindings/display/panel/samsung,ams639rq08.yaml | 80 + .../Bindings/display/panel/samsung,s6e3ha8.yaml | 75 + .../display/panel/samsung,s6e88a0-ams427ap24.yaml | 65 + .../Bindings/display/panel/samsung,s6e8aa0.yaml | 10 +- .../rockchip/rockchip,rk3588-dw-hdmi-qp.yaml | 188 + .../display/samsung/samsung,exynos7-decon.yaml | 4 +- .../Bindings/display/sharp,ls010b7dh04.yaml | 92 + .../device-tree/Bindings/dma/dma-common.yaml | 7 +- sys/contrib/device-tree/Bindings/dma/qcom,gpi.yaml | 1 + .../device-tree/Bindings/dma/renesas,rz-dmac.yaml | 29 +- .../Bindings/dma/sifive,fu540-c000-pdma.yaml | 15 +- .../Bindings/dma/stm32/st,stm32-dma3.yaml | 6 + sys/contrib/device-tree/Bindings/dsp/fsl,dsp.yaml | 31 +- sys/contrib/device-tree/Bindings/eeprom/at24.yaml | 2 + .../device-tree/Bindings/example-schema.yaml | 1 + .../device-tree/Bindings/firmware/arm,scmi.yaml | 15 + .../device-tree/Bindings/firmware/qcom,scm.yaml | 6 + .../Bindings/fpga/altr,fpga-passive-serial.yaml | 74 + .../Bindings/gpio/aspeed,ast2400-gpio.yaml | 19 +- .../device-tree/Bindings/gpio/gpio-mmio.yaml | 13 +- .../device-tree/Bindings/gpio/st,nomadik-gpio.yaml | 1 + .../device-tree/Bindings/gpu/arm,mali-bifrost.yaml | 1 + .../Bindings/hwinfo/samsung,exynos-chipid.yaml | 3 + .../device-tree/Bindings/hwmon/lltc,ltc2978.yaml | 2 + .../Bindings/hwmon/nuvoton,nct7363.yaml | 66 + .../Bindings/hwmon/pmbus/isil,isl68137.yaml | 148 + .../Bindings/hwmon/pmbus/mps,mp2975.yaml | 75 + .../Bindings/hwmon/pmbus/ti,tps25990.yaml | 83 + .../Bindings/hwmon/pmbus/vicor,pli1209bc.yaml | 62 + .../device-tree/Bindings/hwmon/pwm-fan.yaml | 10 + .../Bindings/hwmon/renesas,isl28022.yaml | 64 + .../device-tree/Bindings/hwmon/ti,amc6821.yaml | 86 + .../device-tree/Bindings/hwmon/ti,ina2xx.yaml | 1 + .../device-tree/Bindings/hwmon/ti,tmp108.yaml | 8 +- sys/contrib/device-tree/Bindings/i2c/i2c-imx.yaml | 4 + .../Bindings/i2c/marvell,mv64xxx-i2c.yaml | 1 + .../Bindings/i2c/microchip,corei2c.yaml | 4 +- .../device-tree/Bindings/i2c/qcom,i2c-cci.yaml | 19 + .../Bindings/i2c/realtek,rtl9301-i2c.yaml | 69 + .../Bindings/i2c/snps,designware-i2c.yaml | 18 + .../device-tree/Bindings/i2c/st,nomadik-i2c.yaml | 13 +- sys/contrib/device-tree/Bindings/iio/adc/adc.yaml | 4 + .../device-tree/Bindings/iio/adc/adi,ad7173.yaml | 3 + .../device-tree/Bindings/iio/adc/adi,ad7380.yaml | 120 + .../device-tree/Bindings/iio/adc/adi,ad7606.yaml | 199 +- .../device-tree/Bindings/iio/adc/adi,ad7625.yaml | 176 + .../device-tree/Bindings/iio/adc/adi,ad7779.yaml | 110 + .../Bindings/iio/adc/amlogic,meson-saradc.yaml | 1 + .../device-tree/Bindings/iio/adc/gehc,pmc-adc.yaml | 86 + .../Bindings/iio/adc/sprd,sc2720-adc.yaml | 17 - .../device-tree/Bindings/iio/dac/adi,ad3552r.yaml | 9 +- .../device-tree/Bindings/iio/dac/adi,ad5791.yaml | 39 + .../device-tree/Bindings/iio/dac/adi,ad8460.yaml | 164 + .../device-tree/Bindings/iio/dac/adi,axi-dac.yaml | 69 +- .../device-tree/Bindings/iio/imu/bosch,bmi270.yaml | 79 + .../device-tree/Bindings/iio/imu/bosch,smi240.yaml | 51 + .../Bindings/iio/imu/invensense,icm42600.yaml | 2 +- .../Bindings/iio/imu/invensense,mpu6050.yaml | 7 +- .../device-tree/Bindings/iio/light/ti,opt3001.yaml | 4 +- .../Bindings/iio/light/vishay,veml6030.yaml | 107 + .../Bindings/iio/light/vishay,veml6075.yaml | 21 +- .../iio/magnetometer/allegromicro,als31300.yaml | 46 + .../device-tree/Bindings/iio/pressure/bmp085.yaml | 22 +- .../device-tree/Bindings/iio/st,st-sensors.yaml | 1 + .../Bindings/iio/temperature/ti,tmp006.yaml | 6 + .../Bindings/input/goodix,gt7986u-spifw.yaml | 69 + .../Bindings/input/mediatek,pmic-keys.yaml | 3 +- .../device-tree/Bindings/input/rotary-encoder.yaml | 2 +- .../Bindings/input/touchscreen/novatek,nvt-ts.yaml | 62 + .../Bindings/input/zii,rave-sp-pwrbutton.yaml | 36 + .../Bindings/interconnect/qcom,msm8998-bwmon.yaml | 2 + .../Bindings/interconnect/qcom,qcs615-rpmh.yaml | 73 + .../Bindings/interconnect/qcom,qcs8300-rpmh.yaml | 72 + .../Bindings/interconnect/qcom,sar2130p-rpmh.yaml | 117 + .../Bindings/interrupt-controller/arm,gic-v3.yaml | 12 +- .../interrupt-controller/aspeed,ast2700-intc.yaml | 86 + .../Bindings/interrupt-controller/atmel,aic.yaml | 1 + .../Bindings/interrupt-controller/fsl,mu-msi.yaml | 4 - .../Bindings/interrupt-controller/qcom,pdc.yaml | 1 + .../interrupt-controller/renesas,rzv2h-icu.yaml | 278 + .../thead,c900-aclint-sswi.yaml | 58 + .../Bindings/interrupt-controller/ti,sci-inta.yaml | 1 + .../device-tree/Bindings/iommu/arm,smmu.yaml | 5 + .../device-tree/Bindings/iommu/riscv,iommu.yaml | 147 + .../leds/backlight/zii,rave-sp-backlight.yaml | 36 + sys/contrib/device-tree/Bindings/leds/common.yaml | 16 + .../device-tree/Bindings/leds/leds-bcm63138.yaml | 11 + .../device-tree/Bindings/leds/leds-pwm.yaml | 6 + .../device-tree/Bindings/leds/nxp,pca955x.yaml | 158 + .../Bindings/leds/sprd,sc2731-bltc.yaml | 31 - .../device-tree/Bindings/mailbox/arm,mhuv2.yaml | 2 +- .../Bindings/mailbox/microchip,mpfs-mailbox.yaml | 13 +- .../Bindings/mailbox/qcom,apcs-kpss-global.yaml | 13 +- .../device-tree/Bindings/mailbox/qcom-ipcc.yaml | 2 + .../Bindings/mailbox/thead,th1520-mbox.yaml | 89 + .../device-tree/Bindings/media/i2c/adv7180.yaml | 6 + .../Bindings/media/i2c/hynix,hi846.yaml | 10 - .../Bindings/media/i2c/maxim,max96712.yaml | 5 +- .../Bindings/media/i2c/ovti,ov08x40.yaml | 120 + .../Bindings/media/i2c/ovti,ov5648.yaml | 11 - .../Bindings/media/i2c/ovti,ov8865.yaml | 10 - .../Bindings/media/i2c/ovti,ov9282.yaml | 8 - .../Bindings/media/i2c/sony,imx258.yaml | 7 - .../Bindings/media/i2c/sony,imx334.yaml | 8 - .../Bindings/media/i2c/sony,imx335.yaml | 8 - .../Bindings/media/i2c/sony,imx412.yaml | 8 - .../Bindings/media/i2c/thine,thp7312.yaml | 3 +- .../Bindings/media/qcom,msm8953-camss.yaml | 322 ++ .../Bindings/media/raspberrypi,rp1-cfe.yaml | 93 + .../device-tree/Bindings/media/renesas,csi2.yaml | 1 + .../device-tree/Bindings/media/renesas,isp.yaml | 4 +- .../Bindings/media/ti,j721e-csi2rx-shim.yaml | 2 +- .../Bindings/memory-controllers/exynos-srom.yaml | 5 +- .../Bindings/memory-controllers/fsl/fsl,ddr.yaml | 31 +- .../Bindings/memory-controllers/fsl/fsl,ifc.yaml | 32 +- .../Bindings/mfd/airoha,en7581-gpio-sysctl.yaml | 90 + .../Bindings/mfd/aspeed,ast2x00-scu.yaml | 8 +- .../device-tree/Bindings/mfd/mediatek,mt6397.yaml | 598 ++ .../device-tree/Bindings/mfd/qcom,spmi-pmic.yaml | 2 + .../device-tree/Bindings/mfd/qcom,tcsr.yaml | 4 + .../Bindings/mfd/realtek,rtl9301-switch.yaml | 114 + .../Bindings/mfd/rohm,bd71828-pmic.yaml | 13 +- .../device-tree/Bindings/mfd/samsung,s2dos05.yaml | 99 + .../device-tree/Bindings/mfd/sprd,sc2731.yaml | 252 + sys/contrib/device-tree/Bindings/mfd/syscon.yaml | 2 + sys/contrib/device-tree/Bindings/mfd/ti,twl.yaml | 32 +- .../device-tree/Bindings/mfd/x-powers,axp152.yaml | 3 + .../device-tree/Bindings/mfd/zii,rave-sp.yaml | 63 + .../device-tree/Bindings/mmc/cdns,sdhci.yaml | 3 +- sys/contrib/device-tree/Bindings/mmc/mmc-card.yaml | 52 + sys/contrib/device-tree/Bindings/mmc/mtk-sd.yaml | 24 + .../device-tree/Bindings/mmc/sdhci-msm.yaml | 4 + .../Bindings/mtd/partitions/fixed-partitions.yaml | 2 +- .../Bindings/net/bluetooth/nxp,88w8987-bt.yaml | 8 + .../Bindings/net/dsa/microchip,ksz.yaml | 22 +- .../device-tree/Bindings/net/dsa/realtek.yaml | 46 +- .../device-tree/Bindings/net/ethernet-phy.yaml | 21 + .../device-tree/Bindings/net/fsl,enetc-mdio.yaml | 11 +- .../device-tree/Bindings/net/fsl,enetc.yaml | 28 +- sys/contrib/device-tree/Bindings/net/fsl,fec.yaml | 7 + .../device-tree/Bindings/net/marvell,aquantia.yaml | 6 + .../device-tree/Bindings/net/mdio-mux-gpio.yaml | 32 - .../Bindings/net/microchip,sparx5-switch.yaml | 20 +- .../device-tree/Bindings/net/nfc/nxp,nci.yaml | 1 + .../Bindings/net/nxp,netc-blk-ctrl.yaml | 104 + .../device-tree/Bindings/net/nxp,tja11xx.yaml | 16 + .../Bindings/net/pse-pd/pse-controller.yaml | 2 +- .../device-tree/Bindings/net/qcom,ethqos.yaml | 19 +- .../device-tree/Bindings/net/renesas,ether.yaml | 4 +- sys/contrib/device-tree/Bindings/net/sff,sfp.yaml | 2 +- .../device-tree/Bindings/net/snps,dwmac.yaml | 5 +- .../Bindings/net/thead,th1520-gmac.yaml | 110 + .../Bindings/net/wireless/brcm,bcm4329-fmac.yaml | 9 + .../Bindings/net/wireless/microchip,wilc1000.yaml | 6 +- .../Bindings/net/wireless/qcom,ath11k-pci.yaml | 29 + .../device-tree/Bindings/net/xlnx,emaclite.yaml | 5 + .../Bindings/nvmem/renesas,rcar-efuse.yaml | 68 + .../Bindings/nvmem/renesas,rcar-otp.yaml | 43 + .../Bindings/nvmem/sprd,sc2731-efuse.yaml | 68 + .../Bindings/nvmem/sprd,ums312-efuse.yaml | 61 + .../Bindings/nvmem/zii,rave-sp-eeprom.yaml | 54 + .../Bindings/opp/operating-points-v2-ti-cpu.yaml | 20 +- .../device-tree/Bindings/pci/brcm,stb-pcie.yaml | 5 +- .../Bindings/pci/mediatek-pcie-gen3.yaml | 5 +- .../Bindings/pci/microchip,pcie-host.yaml | 11 +- .../Bindings/pci/plda,xpressrich3-axi-common.yaml | 14 +- .../device-tree/Bindings/pci/qcom,pcie-common.yaml | 4 + .../device-tree/Bindings/pci/qcom,pcie-sm8450.yaml | 4 - .../device-tree/Bindings/pci/qcom,pcie-sm8550.yaml | 4 +- .../Bindings/pci/qcom,pcie-x1e80100.yaml | 9 +- .../device-tree/Bindings/pci/qcom,pcie.yaml | 50 + .../device-tree/Bindings/pci/snps,dw-pcie.yaml | 1 - .../Bindings/pci/starfive,jh7110-pcie.yaml | 7 + .../device-tree/Bindings/perf/fsl-imx-ddr.yaml | 4 +- .../Bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 10 +- .../device-tree/Bindings/phy/bcm-ns-usb2-phy.yaml | 19 +- .../Bindings/phy/fsl,imx8mq-usb-phy.yaml | 39 +- .../device-tree/Bindings/phy/fsl,mxs-usbphy.yaml | 1 + .../device-tree/Bindings/phy/mediatek,tphy.yaml | 10 + .../Bindings/phy/microchip,sparx5-serdes.yaml | 17 +- .../device-tree/Bindings/phy/nxp,ptn3222.yaml | 55 + .../Bindings/phy/phy-cadence-sierra.yaml | 2 +- .../Bindings/phy/phy-rockchip-usbdp.yaml | 1 + .../device-tree/Bindings/phy/qcom,edp-phy.yaml | 1 + .../Bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml | 2 + .../device-tree/Bindings/phy/qcom,qusb2-phy.yaml | 1 + .../Bindings/phy/qcom,sa8775p-dwmac-sgmii-phy.yaml | 7 +- .../Bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 3 + .../Bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 49 +- .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 2 + .../Bindings/phy/qcom,snps-eusb2-phy.yaml | 1 + .../Bindings/phy/qcom,usb-snps-femto-v2.yaml | 1 + .../Bindings/phy/rockchip,inno-usb2phy.yaml | 45 +- .../Bindings/phy/rockchip,rk3228-hdmi-phy.yaml | 97 + .../Bindings/phy/st,stm32mp25-combophy.yaml | 119 + .../device-tree/Bindings/phy/ti,tcan104x-can.yaml | 13 +- .../Bindings/pinctrl/airoha,en7581-pinctrl.yaml | 400 ++ .../pinctrl/amlogic,meson8-pinctrl-cbus.yaml | 2 +- .../Bindings/pinctrl/apple,pinctrl.yaml | 5 + .../Bindings/pinctrl/canaan,k230-pinctrl.yaml | 127 + .../Bindings/pinctrl/fsl,imx35-pinctrl.yaml | 184 + .../Bindings/pinctrl/microchip,mcp23s08.yaml | 161 + .../Bindings/pinctrl/mscc,ocelot-pinctrl.yaml | 27 +- .../Bindings/pinctrl/pinctrl-single.yaml | 4 + .../Bindings/pinctrl/qcom,ipq5424-tlmm.yaml | 114 + .../Bindings/pinctrl/qcom,pmic-gpio.yaml | 3 + .../Bindings/pinctrl/qcom,pmic-mpp.yaml | 2 + .../Bindings/pinctrl/qcom,qcs615-tlmm.yaml | 124 + .../Bindings/pinctrl/qcom,qcs8300-tlmm.yaml | 118 + .../Bindings/pinctrl/qcom,sa8775p-tlmm.yaml | 8 +- .../Bindings/pinctrl/qcom,sar2130p-tlmm.yaml | 138 + .../pinctrl/qcom,sm8650-lpass-lpi-pinctrl.yaml | 6 +- .../Bindings/pinctrl/qcom,sm8750-tlmm.yaml | 138 + .../Bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 4 + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 23 +- .../Bindings/pinctrl/samsung,pinctrl.yaml | 3 + .../Bindings/pinctrl/semtech,sx1501q.yaml | 43 + .../Bindings/pinctrl/sophgo,cv1800-pinctrl.yaml | 2 +- .../Bindings/pinctrl/spacemit,k1-pinctrl.yaml | 124 + .../Bindings/pinctrl/thead,th1520-pinctrl.yaml | 176 + .../Bindings/pinctrl/xlnx,versal-pinctrl.yaml | 278 + .../device-tree/Bindings/power/fsl,imx-gpc.yaml | 1 + .../Bindings/power/mediatek,power-controller.yaml | 5 + .../device-tree/Bindings/power/qcom,rpmpd.yaml | 4 + .../Bindings/power/reset/nvmem-reboot-mode.yaml | 4 + .../device-tree/Bindings/power/reset/qcom,pon.yaml | 7 + .../Bindings/power/reset/reboot-mode.yaml | 4 +- .../Bindings/power/reset/syscon-reboot-mode.yaml | 4 + .../Bindings/power/reset/syscon-reboot.yaml | 11 +- .../power/supply/qcom,pmi8998-charger.yaml | 1 - .../Bindings/power/supply/sc2731-charger.yaml | 21 +- .../Bindings/power/supply/sc27xx-fg.yaml | 43 +- .../Bindings/power/supply/ti,twl6030-charger.yaml | 48 + .../device-tree/Bindings/pwm/adi,axi-pwmgen.yaml | 4 +- .../Bindings/pwm/airoha,en7581-pwm.yaml | 34 + .../device-tree/Bindings/pwm/pwm-amlogic.yaml | 1 + .../Bindings/regulator/lltc,ltc3676.yaml | 167 + .../Bindings/regulator/qcom,qca6390-pmu.yaml | 39 + .../Bindings/regulator/qcom,rpmh-regulator.yaml | 2 +- .../Bindings/regulator/qcom-labibb-regulator.yaml | 7 +- .../Bindings/regulator/sprd,sc2731-regulator.yaml | 21 - .../Bindings/regulator/vctrl-regulator.yaml | 80 + .../Bindings/remoteproc/qcom,sm8350-pas.yaml | 3 + .../Bindings/remoteproc/qcom,sm8550-pas.yaml | 48 +- .../Bindings/reset/nuvoton,npcm750-reset.yaml | 18 + .../device-tree/Bindings/riscv/extensions.yaml | 58 + .../device-tree/Bindings/riscv/starfive.yaml | 1 + .../Bindings/rng/airoha,en7581-trng.yaml | 38 + .../Bindings/rng/brcm,bcm74110-rng.yaml | 35 + sys/contrib/device-tree/Bindings/rng/imx-rng.yaml | 2 +- .../Bindings/rng/inside-secure,safexcel-eip76.yaml | 86 + .../device-tree/Bindings/rng/st,stm32-rng.yaml | 28 +- .../Bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 4 +- .../device-tree/Bindings/rtc/amlogic,a4-rtc.yaml | 63 + .../Bindings/rtc/microchip,mpfs-rtc.yaml | 69 + .../device-tree/Bindings/rtc/renesas,rz-rtca3.yaml | 84 + .../device-tree/Bindings/rtc/sprd,sc2731-rtc.yaml | 16 - sys/contrib/device-tree/Bindings/serial/rs485.yaml | 19 +- .../device-tree/Bindings/serial/samsung_uart.yaml | 14 +- .../Bindings/serial/snps-dw-apb-uart.yaml | 13 +- .../device-tree/Bindings/serial/sprd-uart.yaml | 1 + .../Bindings/soc/fsl/fsl,qman-portal.yaml | 2 + .../Bindings/soc/imx/fsl,imx-anatop.yaml | 20 +- .../soc/mediatek/mediatek,mt8183-dvfsrc.yaml | 83 + .../device-tree/Bindings/soc/mediatek/scpsys.txt | 1 + .../soc/microchip/atmel,at91rm9200-tcb.yaml | 20 +- .../Bindings/soc/mobileye/mobileye,eyeq5-olb.yaml | 24 +- .../Bindings/soc/qcom/qcom,aoss-qmp.yaml | 4 + .../device-tree/Bindings/soc/qcom/qcom,smp2p.yaml | 3 +- .../device-tree/Bindings/soc/rockchip/grf.yaml | 5 + .../Bindings/soc/samsung/exynos-pmu.yaml | 2 + .../device-tree/Bindings/sound/adi,adau1373.yaml | 111 + .../Bindings/sound/allwinner,sun4i-a10-codec.yaml | 53 +- .../device-tree/Bindings/sound/audio-graph.yaml | 6 + .../device-tree/Bindings/sound/awinic,aw88395.yaml | 4 +- .../device-tree/Bindings/sound/cirrus,cs42l84.yaml | 56 + .../device-tree/Bindings/sound/everest,es8316.yaml | 4 +- .../device-tree/Bindings/sound/everest,es8326.yaml | 4 + .../device-tree/Bindings/sound/everest,es8328.yaml | 4 + .../device-tree/Bindings/sound/fsl,esai.yaml | 28 +- .../device-tree/Bindings/sound/fsl,spdif.yaml | 27 +- .../Bindings/sound/irondevice,sma1307.yaml | 53 + .../Bindings/sound/loongson,ls2k1000-i2s.yaml | 68 + .../device-tree/Bindings/sound/maxim,max98390.yaml | 8 +- .../Bindings/sound/mediatek,mt8188-mt6359.yaml | 7 + sys/contrib/device-tree/Bindings/sound/mt6359.yaml | 10 +- .../Bindings/sound/neofidelity,ntp8835.yaml | 73 + .../Bindings/sound/neofidelity,ntp8918.yaml | 70 + .../device-tree/Bindings/sound/nxp,uda1342.yaml | 42 + .../Bindings/sound/qcom,lpass-rx-macro.yaml | 1 + .../Bindings/sound/qcom,lpass-tx-macro.yaml | 1 + .../Bindings/sound/qcom,lpass-va-macro.yaml | 1 + .../Bindings/sound/qcom,lpass-wsa-macro.yaml | 1 + .../device-tree/Bindings/sound/qcom,sm8250.yaml | 1 + .../device-tree/Bindings/sound/realtek,rt5640.yaml | 146 + .../device-tree/Bindings/sound/realtek,rt5645.yaml | 2 +- .../device-tree/Bindings/sound/renesas,rsnd.txt | 2 +- .../Bindings/sound/rockchip,rk3036-codec.yaml | 58 + .../Bindings/sound/simple-audio-mux.yaml | 5 + .../device-tree/Bindings/sound/simple-card.yaml | 12 + .../Bindings/sound/sprd,pcm-platform.yaml | 56 + .../Bindings/sound/sprd,sc9860-mcdt.yaml | 47 + .../device-tree/Bindings/sound/st,stm32-i2s.yaml | 36 +- .../device-tree/Bindings/sound/st,stm32-sai.yaml | 26 +- .../Bindings/sound/st,stm32-spdifrx.yaml | 4 + .../device-tree/Bindings/spi/apple,spi.yaml | 62 + .../Bindings/spi/brcm,bcm2835-aux-spi.yaml | 53 + .../Bindings/spi/realtek,rtl9301-snand.yaml | 62 + .../device-tree/Bindings/spi/samsung,spi.yaml | 4 + .../device-tree/Bindings/spi/spi-zynqmp-qspi.yaml | 22 +- .../device-tree/Bindings/spi/sprd,sc9860-spi.yaml | 72 + .../Bindings/spmi/mtk,spmi-mtk-pmif.yaml | 1 + .../Bindings/spmi/qcom,x1e80100-spmi-pmic-arb.yaml | 6 +- .../device-tree/Bindings/sram/qcom,imem.yaml | 1 + sys/contrib/device-tree/Bindings/sram/sram.yaml | 6 + .../device-tree/Bindings/thermal/qcom-tsens.yaml | 2 + .../Bindings/timer/actions,owl-timer.yaml | 107 + .../Bindings/timer/samsung,exynos4210-mct.yaml | 2 + .../device-tree/Bindings/trivial-devices.yaml | 18 +- sys/contrib/device-tree/Bindings/ufs/qcom,ufs.yaml | 2 + .../Bindings/usb/allwinner,sun4i-a10-musb.yaml | 2 + .../device-tree/Bindings/usb/cypress,cypd4226.yaml | 5 +- .../device-tree/Bindings/usb/fsl,imx8mp-dwc3.yaml | 6 +- .../device-tree/Bindings/usb/generic-ehci.yaml | 2 + .../device-tree/Bindings/usb/generic-ohci.yaml | 2 + .../device-tree/Bindings/usb/genesys,gl850g.yaml | 9 +- .../device-tree/Bindings/usb/maxim,max33359.yaml | 1 + .../Bindings/usb/microchip,mpfs-musb.yaml | 7 +- .../device-tree/Bindings/usb/qcom,dwc3.yaml | 6 + .../device-tree/Bindings/usb/renesas,usbhs.yaml | 4 + .../device-tree/Bindings/usb/rockchip,dwc3.yaml | 6 +- .../device-tree/Bindings/usb/ti,tusb1046.yaml | 49 + .../device-tree/Bindings/usb/ti,tusb73x0-pci.yaml | 55 + .../device-tree/Bindings/vendor-prefixes.yaml | 18 + .../Bindings/watchdog/airoha,en7581-wdt.yaml | 47 + .../device-tree/Bindings/watchdog/apple,wdt.yaml | 5 + .../device-tree/Bindings/watchdog/fsl-imx-wdt.yaml | 14 + .../device-tree/Bindings/watchdog/qcom-wdt.yaml | 2 + .../device-tree/Bindings/watchdog/samsung-wdt.yaml | 3 + .../device-tree/Bindings/watchdog/snps,dw-wdt.yaml | 1 + .../Bindings/watchdog/zii,rave-sp-wdt.yaml | 47 + .../device-tree/Bindings/writing-schema.rst | 30 + .../device-tree/include/dt-bindings/arm/qcom,ids.h | 7 + .../include/dt-bindings/clock/aspeed,ast2700-scu.h | 163 + .../include/dt-bindings/clock/fsd-clk.h | 7 - .../include/dt-bindings/clock/imx93-clock.h | 6 +- .../include/dt-bindings/clock/marvell,pxa1908.h | 88 + .../dt-bindings/clock/mediatek,mt6735-apmixedsys.h | 16 + .../dt-bindings/clock/mediatek,mt6735-imgsys.h | 15 + .../dt-bindings/clock/mediatek,mt6735-infracfg.h | 25 + .../dt-bindings/clock/mediatek,mt6735-mfgcfg.h | 8 + .../dt-bindings/clock/mediatek,mt6735-pericfg.h | 37 + .../dt-bindings/clock/mediatek,mt6735-topckgen.h | 79 + .../dt-bindings/clock/mediatek,mt6735-vdecsys.h | 9 + .../dt-bindings/clock/mediatek,mt6735-vencsys.h | 11 + .../include/dt-bindings/clock/mobileye,eyeq5-clk.h | 67 +- .../include/dt-bindings/clock/qcom,gcc-sm8450.h | 3 + .../include/dt-bindings/clock/qcom,ipq5332-gcc.h | 20 - .../include/dt-bindings/clock/qcom,ipq5424-gcc.h | 156 + .../include/dt-bindings/clock/qcom,ipq9574-gcc.h | 18 - .../include/dt-bindings/clock/qcom,qcs8300-gcc.h | 234 + .../include/dt-bindings/clock/qcom,sa8775p-camcc.h | 108 + .../dt-bindings/clock/qcom,sa8775p-dispcc.h | 87 + .../dt-bindings/clock/qcom,sa8775p-videocc.h | 47 + .../include/dt-bindings/clock/qcom,sar2130p-gcc.h | 185 + .../dt-bindings/clock/qcom,sar2130p-gpucc.h | 33 + .../include/dt-bindings/clock/r9a08g045-cpg.h | 1 + .../dt-bindings/clock/renesas,r9a08g045-vbattb.h | 13 + .../include/dt-bindings/clock/samsung,exynos8895.h | 453 ++ .../dt-bindings/clock/samsung,exynosautov920.h | 47 + .../include/dt-bindings/iio/adc/gehc,pmc-adc.h | 10 + .../dt-bindings/interconnect/qcom,qcs615-rpmh.h | 136 + .../dt-bindings/interconnect/qcom,qcs8300-rpmh.h | 189 + .../dt-bindings/interconnect/qcom,sar2130p-rpmh.h | 137 + .../power/mediatek,mt6735-power-controller.h | 14 + .../include/dt-bindings/power/qcom-rpmpd.h | 2 + .../include/dt-bindings/reset/aspeed,ast2700-scu.h | 124 + .../dt-bindings/reset/mediatek,mt6735-infracfg.h | 27 + .../dt-bindings/reset/mediatek,mt6735-mfgcfg.h | 9 + .../dt-bindings/reset/mediatek,mt6735-pericfg.h | 31 + .../dt-bindings/reset/mediatek,mt6735-vdecsys.h | 9 + .../include/dt-bindings/reset/qcom,ipq5424-gcc.h | 310 ++ .../dt-bindings/reset/qcom,sar2130p-gpucc.h | 14 + sys/contrib/device-tree/src/arc/axc001.dtsi | 2 +- sys/contrib/device-tree/src/arc/axc003.dtsi | 2 +- sys/contrib/device-tree/src/arc/axc003_idu.dtsi | 2 +- sys/contrib/device-tree/src/arc/axs10x_mb.dtsi | 12 +- sys/contrib/device-tree/src/arc/hsdk.dts | 2 +- .../src/arm/allwinner/sun8i-a33-vstar-core1.dtsi | 96 + .../src/arm/allwinner/sun8i-a33-vstar.dts | 205 + .../src/arm/allwinner/sun9i-a80-cubieboard4.dts | 4 +- .../src/arm/amlogic/meson8-minix-neo-x8.dts | 5 +- .../device-tree/src/arm/amlogic/meson8.dtsi | 32 +- .../device-tree/src/arm/amlogic/meson8b-ec100.dts | 8 +- .../device-tree/src/arm/amlogic/meson8b-mxq.dts | 2 +- .../src/arm/amlogic/meson8b-odroidc1.dts | 4 +- .../device-tree/src/arm/amlogic/meson8b.dtsi | 32 +- .../src/arm/amlogic/meson8m2-mxiii-plus.dts | 2 +- .../intel/socfpga/socfpga_cyclone5_vining_fpga.dts | 4 +- .../src/arm/marvell/armada-385-turris-omnia.dts | 1 + .../src/arm/marvell/kirkwood-openblocks_a7.dts | 2 +- .../device-tree/src/arm/microchip/aks-cdu.dts | 12 +- .../device-tree/src/arm/microchip/animeo_ip.dts | 8 +- .../src/arm/microchip/at91-kizbox2-common.dtsi | 2 +- .../src/arm/microchip/at91-sam9x60ek.dts | 37 +- .../src/arm/microchip/at91-sam9x75_curiosity.dts | 324 ++ .../src/arm/microchip/at91-sama5d27_som1.dtsi | 2 +- .../src/arm/microchip/at91-sama5d27_wlsom1.dtsi | 2 +- .../src/arm/microchip/at91-sama5d29_curiosity.dts | 2 +- .../src/arm/microchip/at91-sama5d2_icp.dts | 33 +- .../src/arm/microchip/at91-sama5d2_ptc_ek.dts | 2 +- .../src/arm/microchip/at91-sama5d2_xplained.dts | 2 +- .../src/arm/microchip/at91-sama5d3_xplained.dts | 2 +- .../src/arm/microchip/at91-sama7g54_curiosity.dts | 31 + .../src/arm/microchip/at91-sama7g5ek.dts | 33 +- .../device-tree/src/arm/microchip/at91rm9200ek.dts | 6 +- .../src/arm/microchip/at91sam9260ek.dts | 6 +- .../src/arm/microchip/at91sam9261ek.dts | 6 +- .../src/arm/microchip/at91sam9263ek.dts | 6 +- .../src/arm/microchip/at91sam9g20ek.dts | 4 +- .../src/arm/microchip/at91sam9g20ek_common.dtsi | 2 +- .../device-tree/src/arm/microchip/at91sam9g45.dtsi | 2 +- .../device-tree/src/arm/microchip/sam9x60.dtsi | 14 +- .../device-tree/src/arm/microchip/sam9x7.dtsi | 1220 +++++ .../device-tree/src/arm/microchip/sama5d2.dtsi | 2 +- .../device-tree/src/arm/microchip/sama5d3.dtsi | 2 +- .../device-tree/src/arm/microchip/sama5d34ek.dts | 2 +- .../src/arm/microchip/sama5d3xcm_cmp.dtsi | 2 +- .../device-tree/src/arm/microchip/sama5d4.dtsi | 2 +- .../src/arm/nxp/imx/imx35-eukrea-cpuimx35.dtsi | 62 +- .../nxp/imx/imx35-eukrea-mbimxsd35-baseboard.dts | 88 +- .../device-tree/src/arm/nxp/imx/imx35-pdk.dts | 38 +- sys/contrib/device-tree/src/arm/nxp/imx/imx35.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx50-evk.dts | 62 +- sys/contrib/device-tree/src/arm/nxp/imx/imx50.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx51-apf51.dts | 56 +- .../device-tree/src/arm/nxp/imx/imx51-apf51dev.dts | 176 +- .../device-tree/src/arm/nxp/imx/imx51-babbage.dts | 438 +- .../src/arm/nxp/imx/imx51-digi-connectcore-jsk.dts | 78 +- .../arm/nxp/imx/imx51-digi-connectcore-som.dtsi | 292 +- .../src/arm/nxp/imx/imx51-eukrea-cpuimx51.dtsi | 68 +- .../nxp/imx/imx51-eukrea-mbimxsd51-baseboard.dts | 192 +- sys/contrib/device-tree/src/arm/nxp/imx/imx51.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx53-ard.dts | 116 +- .../device-tree/src/arm/nxp/imx/imx53-kp-ddc.dts | 62 +- .../device-tree/src/arm/nxp/imx/imx53-kp.dtsi | 90 +- .../device-tree/src/arm/nxp/imx/imx53-m53.dtsi | 64 +- .../device-tree/src/arm/nxp/imx/imx53-m53evk.dts | 268 +- .../device-tree/src/arm/nxp/imx/imx53-m53menlo.dts | 320 +- .../device-tree/src/arm/nxp/imx/imx53-mba53.dts | 114 +- .../src/arm/nxp/imx/imx53-qsb-common.dtsi | 274 +- .../device-tree/src/arm/nxp/imx/imx53-qsrb.dts | 10 +- .../device-tree/src/arm/nxp/imx/imx53-smd.dts | 242 +- .../device-tree/src/arm/nxp/imx/imx53-tqma53.dtsi | 274 +- .../src/arm/nxp/imx/imx53-tx53-x03x.dts | 112 +- .../src/arm/nxp/imx/imx53-tx53-x13x.dts | 62 +- .../device-tree/src/arm/nxp/imx/imx53-tx53.dtsi | 460 +- .../src/arm/nxp/imx/imx53-voipac-bsb.dts | 110 +- .../src/arm/nxp/imx/imx53-voipac-dmm-668.dtsi | 124 +- sys/contrib/device-tree/src/arm/nxp/imx/imx53.dtsi | 2 +- .../src/arm/nxp/imx/imx6-logicpd-baseboard.dtsi | 4 +- .../src/arm/nxp/imx/imx6dl-colibri-aster.dts | 2 +- .../src/arm/nxp/imx/imx6dl-dhcom-pdk2.dts | 20 + .../src/arm/nxp/imx/imx6dl-dhcom-picoitx.dts | 2 +- .../src/arm/nxp/imx/imx6dl-eckelmann-ci4x10.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx6dl-mamoj.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx6dl-prtmvt.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx6dl-prtrvt.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx6dl-prtvt7.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx6dl-qmx6.dtsi | 446 +- .../src/arm/nxp/imx/imx6dl-riotboard.dts | 360 +- .../src/arm/nxp/imx/imx6dl-tx6dl-comtft.dts | 1 - .../src/arm/nxp/imx/imx6dl-yapp4-common.dtsi | 4 +- .../src/arm/nxp/imx/imx6dl-yapp43-common.dtsi | 4 +- .../device-tree/src/arm/nxp/imx/imx6q-arm2.dts | 198 +- .../device-tree/src/arm/nxp/imx/imx6q-ba16.dtsi | 2 +- .../src/arm/nxp/imx/imx6q-dhcom-pdk2.dts | 2 +- .../src/arm/nxp/imx/imx6q-dmo-edmqmx6.dts | 232 +- .../device-tree/src/arm/nxp/imx/imx6q-gk802.dts | 92 +- .../device-tree/src/arm/nxp/imx/imx6q-h100.dts | 200 +- .../device-tree/src/arm/nxp/imx/imx6q-logicpd.dts | 4 +- .../device-tree/src/arm/nxp/imx/imx6q-lxr.dts | 87 + .../device-tree/src/arm/nxp/imx/imx6q-mba6.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx6q-novena.dts | 48 +- .../device-tree/src/arm/nxp/imx/imx6q-prti6q.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx6q-prtwd2.dts | 4 +- .../device-tree/src/arm/nxp/imx/imx6q-sbc6x.dts | 82 +- .../src/arm/nxp/imx/imx6q-tx6q-1010-comtft.dts | 1 - .../src/arm/nxp/imx/imx6q-tx6q-1020-comtft.dts | 1 - .../src/arm/nxp/imx/imx6q-utilite-pro.dts | 4 +- .../src/arm/nxp/imx/imx6qdl-apalis.dtsi | 2 +- .../src/arm/nxp/imx/imx6qdl-aristainetos.dtsi | 428 +- .../src/arm/nxp/imx/imx6qdl-aristainetos2.dtsi | 6 +- .../src/arm/nxp/imx/imx6qdl-colibri.dtsi | 2 +- .../src/arm/nxp/imx/imx6qdl-cubox-i.dtsi | 136 +- .../src/arm/nxp/imx/imx6qdl-dfi-fs700-m60.dtsi | 192 +- .../src/arm/nxp/imx/imx6qdl-dhcom-pdk2.dtsi | 21 +- .../src/arm/nxp/imx/imx6qdl-dhcom-som.dtsi | 2 - .../device-tree/src/arm/nxp/imx/imx6qdl-ds.dtsi | 6 +- .../device-tree/src/arm/nxp/imx/imx6qdl-emcon.dtsi | 39 +- .../src/arm/nxp/imx/imx6qdl-gw54xx.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-hummingboard.dtsi | 160 +- .../arm/nxp/imx/imx6qdl-hummingboard2-emmc.dtsi | 30 +- .../src/arm/nxp/imx/imx6qdl-hummingboard2.dtsi | 456 +- .../src/arm/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx6qdl-mba6.dtsi | 14 + .../src/arm/nxp/imx/imx6qdl-nit6xlite.dtsi | 354 +- .../src/arm/nxp/imx/imx6qdl-nitrogen6_max.dtsi | 506 +- .../src/arm/nxp/imx/imx6qdl-nitrogen6x.dtsi | 406 +- .../nxp/imx/imx6qdl-phytec-mira-peb-wlbt-05.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-phytec-pfla02.dtsi | 292 +- .../device-tree/src/arm/nxp/imx/imx6qdl-rex.dtsi | 274 +- .../src/arm/nxp/imx/imx6qdl-sabreauto.dtsi | 554 +- .../src/arm/nxp/imx/imx6qdl-sabrelite.dtsi | 428 +- .../src/arm/nxp/imx/imx6qdl-sabresd.dtsi | 430 +- .../src/arm/nxp/imx/imx6qdl-solidsense.dtsi | 78 +- .../src/arm/nxp/imx/imx6qdl-sr-som-brcm.dtsi | 86 +- .../src/arm/nxp/imx/imx6qdl-sr-som-emmc.dtsi | 30 +- .../src/arm/nxp/imx/imx6qdl-sr-som-ti.dtsi | 88 +- .../src/arm/nxp/imx/imx6qdl-sr-som.dtsi | 96 +- .../src/arm/nxp/imx/imx6qdl-ts7970.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-tx6-lcd.dtsi | 1 - .../src/arm/nxp/imx/imx6qdl-tx6-mb7.dtsi | 2 - .../device-tree/src/arm/nxp/imx/imx6qdl-tx6.dtsi | 3 +- .../device-tree/src/arm/nxp/imx/imx6qdl-udoo.dtsi | 224 +- .../src/arm/nxp/imx/imx6qdl-var-dart.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-var-som.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-wandboard-revb1.dtsi | 30 +- .../src/arm/nxp/imx/imx6qdl-wandboard-revc1.dtsi | 32 +- .../src/arm/nxp/imx/imx6qdl-wandboard-revd1.dtsi | 78 +- .../src/arm/nxp/imx/imx6qdl-wandboard.dtsi | 247 +- .../device-tree/src/arm/nxp/imx/imx6qp-prtwd3.dts | 2 +- .../src/arm/nxp/imx/imx6qp-sabreauto.dts | 40 +- .../device-tree/src/arm/nxp/imx/imx6qp-sabresd.dts | 58 +- .../src/arm/nxp/imx/imx6s-dhcom-drc02.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx6sl-evk.dts | 480 +- .../src/arm/nxp/imx/imx6sl-tolino-shine2hd.dts | 16 +- .../src/arm/nxp/imx/imx6sl-tolino-shine3.dts | 16 +- .../src/arm/nxp/imx/imx6sl-tolino-vision5.dts | 4 +- .../device-tree/src/arm/nxp/imx/imx6sl-warp.dts | 208 +- .../device-tree/src/arm/nxp/imx/imx6sl.dtsi | 11 +- .../device-tree/src/arm/nxp/imx/imx6sll-evk.dts | 12 +- .../src/arm/nxp/imx/imx6sll-kobo-clara2e-a.dts | 23 + .../src/arm/nxp/imx/imx6sll-kobo-clara2e-b.dts | 23 + .../arm/nxp/imx/imx6sll-kobo-clara2e-common.dtsi | 511 ++ .../src/arm/nxp/imx/imx6sll-kobo-clarahd.dts | 16 +- .../src/arm/nxp/imx/imx6sll-kobo-librah2o.dts | 4 +- .../device-tree/src/arm/nxp/imx/imx6sll.dtsi | 24 +- .../src/arm/nxp/imx/imx6sx-sabreauto.dts | 4 +- .../device-tree/src/arm/nxp/imx/imx6sx-sdb.dtsi | 572 +- .../src/arm/nxp/imx/imx6sx-softing-vining-2000.dts | 18 +- .../device-tree/src/arm/nxp/imx/imx6sx.dtsi | 11 +- .../device-tree/src/arm/nxp/imx/imx6ul-isiot.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx6ul.dtsi | 16 + .../device-tree/src/arm/nxp/imx/imx6ull.dtsi | 2 + .../device-tree/src/arm/nxp/imx/imx7-colibri.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx7ulp.dtsi | 5 +- .../device-tree/src/arm/nxp/imx/imxrt1050.dtsi | 2 +- .../src/arm/nxp/mxs/imx28-apx4devkit.dts | 2 +- .../device-tree/src/arm/qcom/qcom-apq8064.dtsi | 38 +- .../device-tree/src/arm/qcom/qcom-apq8084.dtsi | 78 +- .../src/arm/qcom/qcom-ipq4018-ap120c-ac.dtsi | 19 +- .../src/arm/qcom/qcom-ipq4018-jalapeno.dts | 2 +- .../device-tree/src/arm/qcom/qcom-ipq4019.dtsi | 10 +- .../device-tree/src/arm/qcom/qcom-ipq8064.dtsi | 8 +- .../device-tree/src/arm/qcom/qcom-mdm9615.dtsi | 4 +- .../device-tree/src/arm/qcom/qcom-msm8226.dtsi | 34 +- .../device-tree/src/arm/qcom/qcom-msm8660.dtsi | 6 +- .../device-tree/src/arm/qcom/qcom-msm8916-smp.dtsi | 2 +- .../device-tree/src/arm/qcom/qcom-msm8960.dtsi | 6 +- .../qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 2 +- .../device-tree/src/arm/qcom/qcom-msm8974.dtsi | 92 +- .../device-tree/src/arm/qcom/qcom-sdx55.dtsi | 1 + .../device-tree/src/arm/qcom/qcom-sdx65.dtsi | 67 +- .../device-tree/src/arm/renesas/emev2-kzm9d.dts | 11 +- .../src/arm/renesas/iwg20d-q7-common.dtsi | 3 +- .../src/arm/renesas/iwg20d-q7-dbcm-ca.dtsi | 3 +- .../src/arm/renesas/r7s72100-genmai.dts | 199 +- .../src/arm/renesas/r7s72100-rskrza1.dts | 14 +- .../device-tree/src/arm/renesas/r7s72100.dtsi | 37 +- .../src/arm/renesas/r7s9210-rza2mevb.dts | 3 +- .../src/arm/renesas/r8a73a4-ape6evm.dts | 3 +- .../device-tree/src/arm/renesas/r8a73a4.dtsi | 2 - .../src/arm/renesas/r8a7740-armadillo800eva.dts | 3 +- .../src/arm/renesas/r8a7742-iwg21d-q7.dts | 3 +- .../src/arm/renesas/r8a7742-iwg21m.dtsi | 3 +- .../device-tree/src/arm/renesas/r8a7742.dtsi | 2 - .../src/arm/renesas/r8a7743-sk-rzg1m.dts | 3 +- .../device-tree/src/arm/renesas/r8a7743.dtsi | 1 - .../device-tree/src/arm/renesas/r8a7744.dtsi | 1 - .../arm/renesas/r8a7745-iwg22d-sodimm-dbhd-ca.dts | 3 +- .../src/arm/renesas/r8a7745-iwg22d-sodimm.dts | 3 +- .../src/arm/renesas/r8a7745-sk-rzg1e.dts | 3 +- .../device-tree/src/arm/renesas/r8a7745.dtsi | 1 - .../src/arm/renesas/r8a77470-iwg23s-sbc.dts | 6 +- .../device-tree/src/arm/renesas/r8a7778-bockw.dts | 5 +- .../device-tree/src/arm/renesas/r8a7778.dtsi | 2 +- .../device-tree/src/arm/renesas/r8a7779-marzen.dts | 9 +- .../device-tree/src/arm/renesas/r8a7779.dtsi | 2 +- .../device-tree/src/arm/renesas/r8a7790-lager.dts | 25 +- .../device-tree/src/arm/renesas/r8a7790-stout.dts | 15 +- .../device-tree/src/arm/renesas/r8a7790.dtsi | 2 - .../src/arm/renesas/r8a7791-koelsch.dts | 17 +- .../device-tree/src/arm/renesas/r8a7791-porter.dts | 12 +- .../device-tree/src/arm/renesas/r8a7791.dtsi | 1 - .../src/arm/renesas/r8a7792-blanche.dts | 9 +- .../device-tree/src/arm/renesas/r8a7792-wheat.dts | 3 +- .../device-tree/src/arm/renesas/r8a7792.dtsi | 2 +- .../device-tree/src/arm/renesas/r8a7793-gose.dts | 15 +- .../device-tree/src/arm/renesas/r8a7793.dtsi | 1 - .../device-tree/src/arm/renesas/r8a7794-alt.dts | 14 +- .../device-tree/src/arm/renesas/r8a7794-silk.dts | 9 +- .../device-tree/src/arm/renesas/r8a7794.dtsi | 1 - .../device-tree/src/arm/renesas/sh73a0-kzm9g.dts | 17 +- .../device-tree/src/arm/renesas/sh73a0.dtsi | 1 - .../device-tree/src/arm/rockchip/rk3036-kylin.dts | 2 +- .../src/arm/rockchip/rk3066a-bqcurie2.dts | 4 +- .../src/arm/rockchip/rk3066a-marsboard.dts | 6 +- .../device-tree/src/arm/rockchip/rk3066a-mk808.dts | 12 +- .../src/arm/rockchip/rk3066a-rayeager.dts | 16 +- .../device-tree/src/arm/rockchip/rk3128-evb.dts | 4 +- .../src/arm/rockchip/rk3128-xpi-3128.dts | 28 +- .../src/arm/rockchip/rk3188-bqedison2qc.dts | 14 +- .../src/arm/rockchip/rk3188-px3-evb.dts | 2 +- .../src/arm/rockchip/rk3188-radxarock.dts | 8 +- .../device-tree/src/arm/rockchip/rk3228-evb.dts | 2 +- .../device-tree/src/arm/rockchip/rk3229-evb.dts | 16 +- .../device-tree/src/arm/rockchip/rk3229-xms6.dts | 16 +- .../src/arm/rockchip/rk3288-evb-act8846.dts | 4 +- .../device-tree/src/arm/rockchip/rk3288-evb.dtsi | 8 +- .../arm/rockchip/rk3288-firefly-reload-core.dtsi | 2 +- .../src/arm/rockchip/rk3288-firefly-reload.dts | 18 +- .../src/arm/rockchip/rk3288-firefly.dtsi | 16 +- .../device-tree/src/arm/rockchip/rk3288-miqi.dts | 8 +- .../src/arm/rockchip/rk3288-phycore-rdk.dts | 6 +- .../src/arm/rockchip/rk3288-phycore-som.dtsi | 6 +- .../src/arm/rockchip/rk3288-popmetal.dts | 10 +- .../device-tree/src/arm/rockchip/rk3288-r89.dts | 8 +- .../src/arm/rockchip/rk3288-rock2-som.dtsi | 4 +- .../src/arm/rockchip/rk3288-rock2-square.dts | 6 +- .../src/arm/rockchip/rk3288-tinker.dtsi | 4 +- .../src/arm/rockchip/rk3288-veyron-brain.dts | 6 +- .../src/arm/rockchip/rk3288-veyron-chromebook.dtsi | 10 +- .../src/arm/rockchip/rk3288-veyron-edp.dtsi | 4 +- .../src/arm/rockchip/rk3288-veyron-fievel.dts | 10 +- .../src/arm/rockchip/rk3288-veyron-mickey.dts | 4 +- .../src/arm/rockchip/rk3288-veyron-pinky.dts | 4 +- .../src/arm/rockchip/rk3288-veyron.dtsi | 8 +- .../src/arm/rockchip/rk3288-vmarc-som.dtsi | 2 +- .../device-tree/src/arm/rockchip/rk3288-vyasa.dts | 18 +- .../rockchip/rockchip-radxa-dalang-carrier.dtsi | 8 +- .../src/arm/rockchip/rv1108-elgin-r1.dts | 2 +- .../device-tree/src/arm/rockchip/rv1108-evb.dts | 2 +- .../src/arm/rockchip/rv1109-relfor-saib.dts | 422 ++ .../src/arm/rockchip/rv1126-edgeble-neu2-io.dts | 6 +- .../src/arm/rockchip/rv1126-edgeble-neu2.dtsi | 2 +- .../device-tree/src/arm/rockchip/rv1126.dtsi | 8 + .../device-tree/src/arm/st/spear1310-evb.dts | 2 - .../device-tree/src/arm/st/spear1340-evb.dts | 2 - .../device-tree/src/arm/st/ste-dbx5x0-pinctrl.dtsi | 49 + .../src/arm/st/ste-ux500-samsung-codina-tmo.dts | 1 + .../src/arm/st/ste-ux500-samsung-codina.dts | 27 +- .../device-tree/src/arm/st/stm32mp13-pinctrl.dtsi | 7 + .../device-tree/src/arm/st/stm32mp135f-dk.dts | 52 + .../src/arm/st/stm32mp13xx-dhcor-som.dtsi | 6 + .../device-tree/src/arm/st/stm32mp15-pinctrl.dtsi | 7 + sys/contrib/device-tree/src/arm/st/stm32mp151.dtsi | 2 + .../device-tree/src/arm/st/stm32mp157c-dk2.dts | 51 +- .../device-tree/src/arm/ti/omap/am335x-baltos.dtsi | 3 +- .../src/arm/ti/omap/am335x-bone-common.dtsi | 12 +- .../src/arm/ti/omap/am335x-boneblue.dts | 2 +- .../device-tree/src/arm/ti/omap/am335x-pdu001.dts | 6 +- .../device-tree/src/arm/ti/omap/am335x-shc.dts | 2 +- .../device-tree/src/arm/ti/omap/am3517-som.dtsi | 1 - .../src/arm/ti/omap/am3874-iceboard.dts | 8 +- .../device-tree/src/arm/ti/omap/am437x-cm-t43.dts | 2 +- .../device-tree/src/arm/ti/omap/am437x-idk-evm.dts | 2 +- .../device-tree/src/arm/ti/omap/am437x-sbc-t43.dts | 2 +- .../device-tree/src/arm/ti/omap/am437x-sk-evm.dts | 2 +- .../device-tree/src/arm/ti/omap/am43x-epos-evm.dts | 2 +- .../src/arm/ti/omap/am57xx-cl-som-am57x.dts | 2 +- .../src/arm/ti/omap/am57xx-sbc-am57x.dts | 2 +- .../device-tree/src/arm/ti/omap/dm8148-evm.dts | 1 - .../device-tree/src/arm/ti/omap/dm8168-evm.dts | 1 - .../src/arm/ti/omap/dra62x-j5eco-evm.dts | 1 - sys/contrib/device-tree/src/arm/ti/omap/dra7.dtsi | 1 - .../device-tree/src/arm/ti/omap/dra7xx-clocks.dtsi | 1 - .../src/arm/ti/omap/logicpd-som-lv.dtsi | 1 - .../src/arm/ti/omap/logicpd-torpedo-som.dtsi | 3 +- .../device-tree/src/arm/ti/omap/omap3-cm-t3x.dtsi | 2 +- .../device-tree/src/arm/ti/omap/omap3-evm-37xx.dts | 1 - .../device-tree/src/arm/ti/omap/omap3-evm.dts | 1 - .../device-tree/src/arm/ti/omap/omap3-gta04.dtsi | 2 +- .../device-tree/src/arm/ti/omap/omap3-gta04a5.dts | 10 + .../device-tree/src/arm/ti/omap/omap3-igep.dtsi | 1 - .../device-tree/src/arm/ti/omap/omap3-ldp.dts | 1 - .../src/arm/ti/omap/omap3-overo-base.dtsi | 1 - .../device-tree/src/arm/ti/omap/omap3-sb-t35.dtsi | 2 +- .../device-tree/src/arm/ti/omap/omap3430-sdp.dts | 2 - .../device-tree/src/arm/ti/omap/omap36xx.dtsi | 1 + .../src/arm/ti/omap/omap4-epson-embt2ws.dts | 211 +- .../device-tree/src/arm/ti/omap/omap4-kc1.dts | 6 +- .../device-tree/src/arm/ti/omap/omap5-cm-t54.dts | 2 +- .../device-tree/src/arm/ti/omap/omap5-sbc-t54.dts | 2 +- .../device-tree/src/arm/ti/omap/twl4030.dtsi | 2 +- .../allwinner/sun50i-a100-allwinner-perf1.dts | 18 + .../src/arm64/allwinner/sun50i-a100.dtsi | 185 +- .../src/arm64/allwinner/sun50i-a64-pinephone.dtsi | 21 + .../src/arm64/allwinner/sun50i-h313-tanix-tx1.dts | 5 + .../arm64/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 1 + .../src/arm64/allwinner/sun50i-h5-nanopi-neo2.dts | 1 + .../arm64/allwinner/sun50i-h5-nanopi-r1s-h5.dts | 1 + .../src/arm64/allwinner/sun50i-h5-orangepi-pc2.dts | 1 + .../arm64/allwinner/sun50i-h5-orangepi-prime.dts | 1 + .../allwinner/sun50i-h5-orangepi-zero-plus.dts | 1 + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 1 + .../src/arm64/allwinner/sun50i-h6-beelink-gs1.dts | 1 + .../src/arm64/allwinner/sun50i-h6-orangepi-3.dts | 1 + .../src/arm64/allwinner/sun50i-h6-orangepi.dtsi | 1 + .../src/arm64/allwinner/sun50i-h6-pine-h64.dts | 1 + .../src/arm64/allwinner/sun50i-h6-tanix.dtsi | 1 + .../arm64/allwinner/sun50i-h616-orangepi-zero.dtsi | 6 + .../src/arm64/allwinner/sun50i-h616-x96-mate.dts | 6 + .../src/arm64/allwinner/sun50i-h616.dtsi | 44 +- .../arm64/allwinner/sun50i-h618-longanpi-3h.dts | 1 + .../allwinner/sun50i-h618-orangepi-zero2w.dts | 5 + .../allwinner/sun50i-h618-transpeed-8k618-t.dts | 6 + .../allwinner/sun50i-h700-anbernic-rg35xx-2024.dts | 13 +- .../src/arm64/amd/amd-overdrive-rev-b0.dts | 1 - .../src/arm64/amd/amd-overdrive-rev-b1.dts | 1 - .../device-tree/src/arm64/amd/amd-seattle-soc.dtsi | 8 +- .../device-tree/src/arm64/amlogic/amlogic-c3.dtsi | 364 ++ .../device-tree/src/arm64/amlogic/meson-a1.dtsi | 216 + .../src/arm64/amlogic/meson-g12-common.dtsi | 2 +- .../device-tree/src/arm64/apm/apm-shadowcat.dtsi | 2 - .../device-tree/src/arm64/apm/apm-storm.dtsi | 1 - .../device-tree/src/arm64/apple/s5l8960x-5s.dtsi | 51 + .../device-tree/src/arm64/apple/s5l8960x-air1.dtsi | 51 + .../src/arm64/apple/s5l8960x-common.dtsi | 48 + .../device-tree/src/arm64/apple/s5l8960x-j71.dts | 14 + .../device-tree/src/arm64/apple/s5l8960x-j72.dts | 14 + .../device-tree/src/arm64/apple/s5l8960x-j73.dts | 14 + .../device-tree/src/arm64/apple/s5l8960x-j85.dts | 14 + .../device-tree/src/arm64/apple/s5l8960x-j85m.dts | 14 + .../device-tree/src/arm64/apple/s5l8960x-j86.dts | 14 + .../device-tree/src/arm64/apple/s5l8960x-j86m.dts | 14 + .../device-tree/src/arm64/apple/s5l8960x-j87.dts | 14 + .../device-tree/src/arm64/apple/s5l8960x-j87m.dts | 14 + .../src/arm64/apple/s5l8960x-mini2.dtsi | 51 + .../src/arm64/apple/s5l8960x-mini3.dtsi | 14 + .../device-tree/src/arm64/apple/s5l8960x-n51.dts | 14 + .../device-tree/src/arm64/apple/s5l8960x-n53.dts | 14 + .../device-tree/src/arm64/apple/s5l8960x.dtsi | 113 + .../src/arm64/apple/s800-0-3-common.dtsi | 48 + .../device-tree/src/arm64/apple/s8000-j71s.dts | 15 + .../device-tree/src/arm64/apple/s8000-j72s.dts | 15 + .../device-tree/src/arm64/apple/s8000-n66.dts | 15 + .../device-tree/src/arm64/apple/s8000-n69u.dts | 15 + .../device-tree/src/arm64/apple/s8000-n71.dts | 15 + sys/contrib/device-tree/src/arm64/apple/s8000.dtsi | 144 + .../device-tree/src/arm64/apple/s8001-common.dtsi | 48 + .../device-tree/src/arm64/apple/s8001-j127.dts | 14 + .../device-tree/src/arm64/apple/s8001-j128.dts | 14 + .../device-tree/src/arm64/apple/s8001-j98a.dts | 14 + .../device-tree/src/arm64/apple/s8001-j99a.dts | 14 + .../device-tree/src/arm64/apple/s8001-pro.dtsi | 44 + sys/contrib/device-tree/src/arm64/apple/s8001.dtsi | 133 + .../device-tree/src/arm64/apple/s8003-j71t.dts | 15 + .../device-tree/src/arm64/apple/s8003-j72t.dts | 15 + .../device-tree/src/arm64/apple/s8003-n66m.dts | 15 + .../device-tree/src/arm64/apple/s8003-n69.dts | 15 + .../device-tree/src/arm64/apple/s8003-n71m.dts | 15 + sys/contrib/device-tree/src/arm64/apple/s8003.dtsi | 21 + .../device-tree/src/arm64/apple/s800x-6s.dtsi | 49 + .../device-tree/src/arm64/apple/s800x-ipad5.dtsi | 43 + .../device-tree/src/arm64/apple/s800x-se.dtsi | 49 + .../device-tree/src/arm64/apple/t7000-6.dtsi | 50 + .../device-tree/src/arm64/apple/t7000-common.dtsi | 36 + .../src/arm64/apple/t7000-handheld.dtsi | 27 + .../device-tree/src/arm64/apple/t7000-j42d.dts | 31 + .../device-tree/src/arm64/apple/t7000-j96.dts | 14 + .../device-tree/src/arm64/apple/t7000-j97.dts | 14 + .../device-tree/src/arm64/apple/t7000-mini4.dtsi | 51 + .../device-tree/src/arm64/apple/t7000-n102.dts | 48 + .../device-tree/src/arm64/apple/t7000-n56.dts | 14 + .../device-tree/src/arm64/apple/t7000-n61.dts | 14 + sys/contrib/device-tree/src/arm64/apple/t7000.dtsi | 125 + .../device-tree/src/arm64/apple/t7001-air2.dtsi | 74 + .../device-tree/src/arm64/apple/t7001-j81.dts | 14 + .../device-tree/src/arm64/apple/t7001-j82.dts | 14 + sys/contrib/device-tree/src/arm64/apple/t7001.dtsi | 123 + .../device-tree/src/arm64/apple/t8010-7.dtsi | 43 + .../device-tree/src/arm64/apple/t8010-common.dtsi | 48 + .../device-tree/src/arm64/apple/t8010-d10.dts | 14 + .../device-tree/src/arm64/apple/t8010-d101.dts | 14 + .../device-tree/src/arm64/apple/t8010-d11.dts | 14 + .../device-tree/src/arm64/apple/t8010-d111.dts | 14 + .../device-tree/src/arm64/apple/t8010-ipad6.dtsi | 44 + .../device-tree/src/arm64/apple/t8010-ipad7.dtsi | 14 + .../device-tree/src/arm64/apple/t8010-j171.dts | 14 + .../device-tree/src/arm64/apple/t8010-j172.dts | 14 + .../device-tree/src/arm64/apple/t8010-j71b.dts | 14 + .../device-tree/src/arm64/apple/t8010-j72b.dts | 14 + .../device-tree/src/arm64/apple/t8010-n112.dts | 47 + sys/contrib/device-tree/src/arm64/apple/t8010.dtsi | 133 + .../device-tree/src/arm64/apple/t8011-common.dtsi | 46 + .../device-tree/src/arm64/apple/t8011-j105a.dts | 16 + .../device-tree/src/arm64/apple/t8011-j120.dts | 16 + .../device-tree/src/arm64/apple/t8011-j121.dts | 16 + .../device-tree/src/arm64/apple/t8011-j207.dts | 16 + .../device-tree/src/arm64/apple/t8011-j208.dts | 16 + .../device-tree/src/arm64/apple/t8011-pro2.dtsi | 42 + sys/contrib/device-tree/src/arm64/apple/t8011.dtsi | 141 + .../device-tree/src/arm64/apple/t8015-8.dtsi | 13 + .../device-tree/src/arm64/apple/t8015-8plus.dtsi | 9 + .../device-tree/src/arm64/apple/t8015-common.dtsi | 48 + .../device-tree/src/arm64/apple/t8015-d20.dts | 14 + .../device-tree/src/arm64/apple/t8015-d201.dts | 14 + .../device-tree/src/arm64/apple/t8015-d21.dts | 14 + .../device-tree/src/arm64/apple/t8015-d211.dts | 14 + .../device-tree/src/arm64/apple/t8015-d22.dts | 14 + .../device-tree/src/arm64/apple/t8015-d221.dts | 14 + .../device-tree/src/arm64/apple/t8015-x.dtsi | 13 + sys/contrib/device-tree/src/arm64/apple/t8015.dtsi | 234 + .../device-tree/src/arm64/arm/fvp-base-revc.dts | 2 +- .../device-tree/src/arm64/broadcom/bcm2712.dtsi | 8 +- .../src/arm64/exynos/exynos8895-dreamlte.dts | 126 + .../src/arm64/exynos/exynos8895-pinctrl.dtsi | 1094 ++++ .../device-tree/src/arm64/exynos/exynos8895.dtsi | 386 ++ .../device-tree/src/arm64/exynos/exynos990-c1s.dts | 115 + .../src/arm64/exynos/exynos990-pinctrl.dtsi | 2195 ++++++++ .../device-tree/src/arm64/exynos/exynos990.dtsi | 251 + .../src/arm64/exynos/exynosautov920.dtsi | 50 + .../src/arm64/freescale/fsl-ls1012a-qds.dts | 2 +- .../fsl-ls1028a-kontron-sl28-var3-ads2.dts | 2 - .../src/arm64/freescale/fsl-ls1046a-qds.dts | 2 +- .../src/arm64/freescale/fsl-lx2160a-cex7.dtsi | 3 - .../src/arm64/freescale/fsl-lx2160a-rev2.dtsi | 169 + .../src/arm64/freescale/fsl-lx2160a.dtsi | 2 +- .../src/arm64/freescale/imx8-apalis-eval-v1.2.dtsi | 69 + .../src/arm64/freescale/imx8-apalis-eval.dtsi | 31 +- .../arm64/freescale/imx8-apalis-ixora-v1.1.dtsi | 31 +- .../arm64/freescale/imx8-apalis-ixora-v1.2.dtsi | 31 +- .../src/arm64/freescale/imx8-apalis-v1.1.dtsi | 135 +- .../src/arm64/freescale/imx8-ss-audio.dtsi | 21 +- .../src/arm64/freescale/imx8-ss-conn.dtsi | 2 +- .../src/arm64/freescale/imx8-ss-hsio.dtsi | 123 + .../src/arm64/freescale/imx8dxl-evk.dts | 33 + .../src/arm64/freescale/imx8dxl-ss-conn.dtsi | 4 + .../src/arm64/freescale/imx8dxl-ss-hsio.dtsi | 51 + .../device-tree/src/arm64/freescale/imx8dxl.dtsi | 6 + .../src/arm64/freescale/imx8mm-emtop-baseboard.dts | 335 ++ .../src/arm64/freescale/imx8mm-kontron-bl.dts | 131 + .../src/arm64/freescale/imx8mm-kontron-dl.dtso | 189 + .../arm64/freescale/imx8mm-tqma8mqml-mba8mx.dts | 5 + .../src/arm64/freescale/imx8mm-venice-gw700x.dtsi | 7 +- .../imx8mm-venice-gw73xx-0x-rs232-rts.dtso | 4 - .../freescale/imx8mm-venice-gw73xx-0x-rs422.dtso | 4 - .../freescale/imx8mm-venice-gw73xx-0x-rs485.dtso | 4 - .../src/arm64/freescale/imx8mm-venice-gw75xx.dtsi | 16 + .../src/arm64/freescale/imx8mm-venice-gw7901.dts | 4 +- .../src/arm64/freescale/imx8mm-venice-gw7902.dts | 4 +- .../src/arm64/freescale/imx8mm-venice-gw7903.dts | 4 +- .../src/arm64/freescale/imx8mm-venice-gw7904.dts | 7 +- .../src/arm64/freescale/imx8mm-verdin-ivy.dtsi | 471 ++ .../arm64/freescale/imx8mm-verdin-nonwifi-ivy.dts | 18 + .../src/arm64/freescale/imx8mm-verdin-wifi-ivy.dts | 18 + .../src/arm64/freescale/imx8mm-verdin.dtsi | 9 +- .../device-tree/src/arm64/freescale/imx8mm.dtsi | 8 +- .../freescale/imx8mn-tqma8mqnl-mba8mx-usbotg.dtso | 29 +- .../arm64/freescale/imx8mn-tqma8mqnl-mba8mx.dts | 5 + .../src/arm64/freescale/imx8mn-venice-gw7902.dts | 4 +- .../src/arm64/freescale/imx8mp-dhcom-drc02.dts | 255 + .../src/arm64/freescale/imx8mp-dhcom-picoitx.dts | 176 + .../src/arm64/freescale/imx8mp-evk-pcie-ep.dtso | 17 + .../src/arm64/freescale/imx8mp-iota2-lumpy.dts | 423 ++ .../arm64/freescale/imx8mp-kontron-bl-osm-s.dts | 305 ++ .../src/arm64/freescale/imx8mp-kontron-dl.dtso | 111 + *** 2152 LINES SKIPPED *** From nobody Sat Nov 22 11:20:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8lk4JKqz6Gw18 for ; Sat, 22 Nov 2025 11:20: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8lk3kcHz3PQ4 for ; Sat, 22 Nov 2025 11:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fbZI6MnFRgcKjSRKvLjg+Y8y/5K+WUvwCFYB5HxaQYY=; b=MOFir6zFbRE7lJRchP1qb9gKJbemZDqzY1duXo/nvCYmf1ryIAlzzVulnzIml+Bx7vX7Aa BuSmu72gZUsBgvEHS8OBrEN5w4eEOXp8stdPDsX2dvbYAsriLb8Tm46nj6R4DrOpPF+eK7 hl7Lew1mI1aBO90nd+GW/ecUgwfNEbaEkeCC50yYq8xYGPo+ndPoafhhpBbzFrR3+7A++W 5DMXqfxINtZ/CWKWN0ZMJZDIrxVlzcR32r+4RlbpTKOfLWTIAExu2jqFwDF+amV8NEvWAs SXSemwyc4YZBHvOjRF8pJwzSDfpYtj3ovqlIoJPBBU3yCHO7W2x04ieh62RPkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fbZI6MnFRgcKjSRKvLjg+Y8y/5K+WUvwCFYB5HxaQYY=; b=uIdiTAUzFFD1iR3cYEJGeuuIB3BzntOKK5BFjJLZPhikaClO/QuHM60iUjna26jQBQEbzX aapfwGAMX8r+3y8VotooOscIyE35oID7olYKCYGkHOOuCalqN6AkmuJ6BgKsWLYJRQ+m3M MR9CMUV53ARd6BYRLdfnCi/q91Tjge/1KvmI/9wpNwYRQSxRbG+eLfouvdieFB7lhiqrr8 RpzTZrThndgAjAKCLILaAAnihA2glcgPZlxmJJfJJt+4WTF3a6l3ziEsAPeG13IJ/xZnB6 8IWCJlPD9fsLMV6UboInEDzzLuezdRlcsIyOogc5B9Zu2JMbcFSKnHal6tmznQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810450; a=rsa-sha256; cv=none; b=sz20wCi9OF27zUBSR/Bcyih+J5tGnCpCZfSZuY0CerSqcQcT2UJpFgEW1RjxPdA38YbGqg 6D8DTpi4u2hBYhPU662VN5vs5eTI10NHJp1jK02peGrMSvBN70MspkfgcgRz+1ZboLyMlO CXiS/XppqW35Hf7itUf7mAP7hCjX6ZVD+iNAX+NF2sekAAhYE74KFv/1O/tgCKC00LLsL0 5oQGzQcuzxcv6dJ9/zJ8iLVb5SootrHK5ElDvgqcl1DDTEEviWZeSm35kOxhRFzhofltQI L3P9UwKEcIv2M36oUlH+uQljf00p4kevVbIoqwRDQNXxRSIYohl8iihBlZc0TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8lk2wLSzw5g for ; Sat, 22 Nov 2025 11:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a862 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:20:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: 2aa9fc59ab11..08b3ef957d69 - vendor/device-tree - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/vendor/device-tree X-Git-Reftype: branch X-Git-Commit: 08b3ef957d695abfaec3aac3603842d1eac9bda4 X-Git-Oldrev: 2aa9fc59ab11a7295f95a134638447e2c952b380 X-Git-Newrev: 08b3ef957d695abfaec3aac3603842d1eac9bda4 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 11:20:50 +0000 Message-Id: <69219c92.a862.175624df@gitrepo.freebsd.org> The branch vendor/device-tree has been updated by manu: URL: https://cgit.FreeBSD.org/src/log/?id=2aa9fc59ab11..08b3ef957d69 08b3ef957d69 Import device-tree files from Linux 6.14 From nobody Sat Nov 22 11:20:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8lk71Cbz6Gw2v for ; Sat, 22 Nov 2025 11:20: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8lk4WWZz3PDw for ; Sat, 22 Nov 2025 11:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=nBsGQtvU3/o6lVGb5nmOrnClee/tor4uhRDthIXxWbw=; b=Vi5mHwIGUctKPTUaek7Vs9jrgGayY6b4W6O3Rdsbrr0o6eF4hutQ6xAhbo9P2LMRrLyYZI KdhiKMFL0DFBe1XwCFVTGE3h/NzuS3YRPQfmvA5529Ih8fxhZaAvhYTd7nTiDFBrpMOeGV /ch9fdhDpgKIqYLcRWND8+Gwv5bqeDJG7jNwruZ9FW6Tsj0x2CcNBx8i9g76bhKeykmTUX EKTGOKsdpkl2RfB+t8QUV8SVcRIvDbu2C6khccM8xPf0h6zoyFnLiJIUXqtrIiL50LQ6wI rdOX+outMcKNZ3HxuzpMiWTIaVJLpYjQq5eUxUlBzrMHW6M8RiItLcYye/HqBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=nBsGQtvU3/o6lVGb5nmOrnClee/tor4uhRDthIXxWbw=; b=x3uVgO5c0vbrwwrq8pld1AN/e27zXILJXrQhPbOsPCQcliDfF8AROhF2YxkiX/SiHRjYds Y1+vuu16zkrBiU0TTNgF4UvfxiqUZhrhoIK0quTBnHwv4PYmHQ+Vp4SZmbKRRnQ+ZesUl5 zice3PlvhJ/nQh11he46yRFduZMbAl9sxT9fux6BhSwtrpNQTQBA4qOPHTWxDYd95h/GKw ZeO89XzDX4y5FAXvBefpmGSiLvqo8G+o1WgQm24GLWfoNROqPWzvYztu30mLnIpjlbQ2Ov 8Blzt4vaiSP2+G/wklgefmW08D0LTKVwTLtCXKT5wtcrbLLKTwS3ThU8jJBjCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810450; a=rsa-sha256; cv=none; b=BRv2Sk2//SaCuvE50X1NEHZQQD8K/0lJaClbK5EPphF1GHQto5m/rWASrTaokLaoNf4/zH ZEtkrkdiPXjXjFx6eSXp/sqEFpguAul9JHWunz5ocjAgnk/l969zs0ByiMlVz4c7zIJHrG 5uXZDWI3167e2pHVPRK5I6bR+jNxMu3joBs3CojX8m7GR2AQ0nkFDDiIZszrTIxcY04bYF LGlDYlwWZYeQcdHEjHVFyOMnvYN8i6BcEKMi3y3W2a4wPs5jpa3TJhXeqXV4f7WRJ7z90/ DIIXraDGgq65nZz3sMdM7Jj+dGIE2ClFkNhxqu53TVpzBlR+VvJrM+9G/gEnqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8lk3kdfzwVr for ; Sat, 22 Nov 2025 11:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b131 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:20:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: tag vendor/device-tree/6.14 Tagger: Emmanuel Vadot Date: Sat, 22 Nov 2025 11:20:50 +0000 Message-Id: <69219c92.b131.2f7c960e@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Tag device-tree files from Linux 6.14 08b3ef957d69 - MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/tags/vendor/device-tree/6.14 X-Git-Reftype: annotated tag X-Git-Commit: 24321c4f66e18d7d9ffaf448fbcea0a0ccb2a5ad Auto-Submitted: auto-generated The annotated tag vendor/device-tree/6.14 has been created by manu: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/device-tree/6.14 tag vendor/device-tree/6.14 Tagger: Emmanuel Vadot TaggerDate: 2025-11-22 11:20:24 +0000 Tag device-tree files from Linux 6.14 commit 08b3ef957d695abfaec3aac3603842d1eac9bda4 Author: Emmanuel Vadot AuthorDate: 2025-11-22 11:20:20 +0000 Commit: Emmanuel Vadot CommitDate: 2025-11-22 11:20:20 +0000 Import device-tree files from Linux 6.14 From nobody Sat Nov 22 11:26:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8tF3S3zz6GvyT for ; Sat, 22 Nov 2025 11:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8tF2pRtz3QP9 for ; Sat, 22 Nov 2025 11:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ft9PApOZ6614Px1upVQNaXRYU+4+xIMoeGc9oosaeiU=; b=gGOItu5fWADI3Ens/q94MLeBhin63nDXWPUVjtOKo033K10+ySfVKy5xCjTrtXfCcPzys4 +Khrr4qSAUh1ACtesW+tIIUQf3zh/xdMP/teyVf4Aa/5OgTkoG952R9QMCqqd7+jRzgVft LH2G+zuSKfZo4MLf5OocGk5ir8zwxGr2L+Qbwx7NEAogdKQBxozof68JTl7/YavUfq7Uf9 aAv7VqKfGmFgkE7OSQbrA633ot+qNbTYSR7Q4jB6XrPKzPZrhKRPIpgSuLCXpQ82BC9sXA mqEHSKxvbpjMdHnzF0DDhqbDnlLtoy6C1dkTp2ZIOrC47NZVqM+9vk9+63ddEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ft9PApOZ6614Px1upVQNaXRYU+4+xIMoeGc9oosaeiU=; b=tO1l9GQzLQ/UzjC6P13G6wlW1c5DBi0hgXvBRz8zq/lYUuDW69YfoUvpzPMdZdycqJA522 FaUMbeBGg2ynXcsv5Ymrt+ycbqwvoqGymDlRQa3kbm2cAXflwPWtvEy6jX7tgUKdBERoIc g4rjCcNNPAkTPFSZ7rBrt82xKIxxpZKq+3BsMU1v30LUFpULx4jxz+nxQQkKgz6OkJcmJn LRDpMSQWvzgqMDIR7rb8ds8W08pfzhi8TUaO5eYbJNjE9vAk9UTqAcYo9i7qI5dgh9ysPV G0KjsFIJpwqOsUMuyjE30g25VIiBYeUraEORZZ8MaMsYdMzb+RMNPkVWSTKHqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810789; a=rsa-sha256; cv=none; b=HzhcdDEYyBJyxSdaLule0zIskNebQf/v1LAuE/yfTKWMvsCXuJln0UbBzqr9E8HA13ogll QC6ZL1kEd6YhYCO70NQzzZjLqzHHM2eW88fXyrRHjoqn+VlS5FlGUm29Fr0H7MqoO1UmGy m1wfjbb61qCvUfjzC42vHQN6kXUbAt//7NqWdWbF8CxOkwYXw3EHyeq8/yDHcWhvPybhon AOxcql5Z2F/vXCuCTUV+Lj+Ka3fXLx4PczUsl40dhUgge/HhQwG+sY8pETVWoBfzYUE3L3 BQIOTURKFPToPa6eOg+Jbr86PI8dPGm8fvHOxLBSPYmOISsz6tEwu2NPTCTbOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8tF1vxwzwYX for ; Sat, 22 Nov 2025 11:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ae7f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:26:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 2846c90520eb - main - Import device-tree files from Linux 6.14 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2846c90520eb4cc74e24d586a0ea0f4a0006bc73 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 11:26:28 +0000 Message-Id: <69219de4.ae7f.c259cb@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=2846c90520eb4cc74e24d586a0ea0f4a0006bc73 commit 2846c90520eb4cc74e24d586a0ea0f4a0006bc73 Merge: 5f62a964e9f8 08b3ef957d69 Author: Emmanuel Vadot AuthorDate: 2025-11-22 11:21:01 +0000 Commit: Emmanuel Vadot CommitDate: 2025-11-22 11:21:01 +0000 Import device-tree files from Linux 6.14 .../Bindings/arm/arm,coresight-dummy-source.yaml | 6 + .../arm/arm,coresight-static-replicator.yaml | 19 +- .../Bindings/arm/arm,embedded-trace-extension.yaml | 6 +- .../device-tree/Bindings/arm/aspeed/aspeed.yaml | 2 + .../device-tree/Bindings/arm/atmel-at91.yaml | 7 + .../device-tree/Bindings/arm/atmel-sysregs.txt | 14 +- .../device-tree/Bindings/arm/bcm/brcm,bcmbca.yaml | 2 + sys/contrib/device-tree/Bindings/arm/blaize.yaml | 40 + sys/contrib/device-tree/Bindings/arm/fsl.yaml | 12 + sys/contrib/device-tree/Bindings/arm/mediatek.yaml | 65 +- sys/contrib/device-tree/Bindings/arm/qcom-soc.yaml | 9 +- sys/contrib/device-tree/Bindings/arm/qcom.yaml | 64 + sys/contrib/device-tree/Bindings/arm/rockchip.yaml | 94 +- .../device-tree/Bindings/arm/rockchip/pmu.yaml | 8 +- .../Bindings/arm/samsung/samsung-boards.yaml | 3 + .../device-tree/Bindings/arm/stm32/stm32.yaml | 7 + .../device-tree/Bindings/cache/qcom,llcc.yaml | 20 +- .../Bindings/clock/atmel,at91rm9200-pmc.yaml | 2 + .../Bindings/clock/atmel,at91sam9x5-sckc.yaml | 1 + .../device-tree/Bindings/clock/qcom,gpucc.yaml | 3 + .../Bindings/clock/qcom,ipq9574-cmn-pll.yaml | 77 + .../device-tree/Bindings/clock/qcom,mmcc.yaml | 4 + .../Bindings/clock/qcom,qcs615-gcc.yaml | 59 + .../device-tree/Bindings/clock/qcom,rpmcc.yaml | 4 + .../device-tree/Bindings/clock/qcom,rpmhcc.yaml | 2 + .../Bindings/clock/qcom,sa8775p-camcc.yaml | 6 +- .../Bindings/clock/qcom,sa8775p-videocc.yaml | 1 + .../Bindings/clock/qcom,sc7280-lpasscorecc.yaml | 27 +- .../Bindings/clock/qcom,sdm845-camcc.yaml | 6 +- .../Bindings/clock/qcom,sm6115-lpasscc.yaml | 46 + .../Bindings/clock/qcom,sm8450-camcc.yaml | 2 - .../Bindings/clock/qcom,sm8450-gpucc.yaml | 1 + .../Bindings/clock/qcom,sm8550-dispcc.yaml | 4 +- .../Bindings/clock/qcom,sm8550-tcsr.yaml | 2 + .../Bindings/clock/qcom,sm8750-gcc.yaml | 62 + .../Bindings/clock/qcom,x1e80100-camcc.yaml | 74 + .../Bindings/clock/qcom,x1e80100-gcc.yaml | 6 +- .../Bindings/clock/renesas,5p35023.yaml | 1 + .../Bindings/clock/renesas,rzv2h-cpg.yaml | 15 +- .../Bindings/clock/samsung,exynos990-clock.yaml | 121 + .../device-tree/Bindings/clock/st,stm32-rcc.yaml | 144 + .../Bindings/clock/st,stm32mp1-rcc.yaml | 6 +- .../Bindings/clock/ti/ti,composite-clock.yaml | 82 + .../Bindings/clock/ti/ti,gate-clock.yaml | 125 + .../device-tree/Bindings/clock/xlnx,vcu.yaml | 59 + .../Bindings/connector/usb-connector.yaml | 7 + .../Bindings/cpufreq/airoha,en7581-cpufreq.yaml | 55 + .../Bindings/cpufreq/apple,cluster-cpufreq.yaml | 10 +- .../Bindings/crypto/qcom,inline-crypto-engine.yaml | 2 + .../device-tree/Bindings/crypto/qcom,prng.yaml | 5 + .../device-tree/Bindings/crypto/qcom-qce.yaml | 5 +- .../Bindings/display/amlogic,meson-dw-hdmi.yaml | 8 +- .../Bindings/display/brcm,bcm2711-hdmi.yaml | 2 + .../Bindings/display/brcm,bcm2835-hvs.yaml | 5 +- .../Bindings/display/brcm,bcm2835-pixelvalve0.yaml | 3 + .../Bindings/display/brcm,bcm2835-txp.yaml | 5 +- .../Bindings/display/brcm,bcm2835-vc4.yaml | 1 + .../display/bridge/fsl,imx8mp-hdmi-tx.yaml | 32 +- .../display/bridge/renesas,dsi-csi2-tx.yaml | 1 + .../Bindings/display/bridge/samsung,mipi-dsim.yaml | 76 +- .../Bindings/display/bridge/ti,sn65dsi83.yaml | 34 +- .../Bindings/display/mediatek/mediatek,aal.yaml | 52 +- .../Bindings/display/mediatek/mediatek,ovl.yaml | 12 +- .../Bindings/display/msm/dp-controller.yaml | 1 + .../Bindings/display/msm/dsi-controller-main.yaml | 120 +- .../Bindings/display/msm/dsi-phy-10nm.yaml | 48 +- .../Bindings/display/msm/dsi-phy-14nm.yaml | 35 +- .../Bindings/display/msm/dsi-phy-20nm.yaml | 36 +- .../Bindings/display/msm/dsi-phy-28nm.yaml | 34 +- .../Bindings/display/msm/dsi-phy-7nm.yaml | 34 +- .../Bindings/display/msm/qcom,sa8775p-mdss.yaml | 10 +- .../Bindings/display/msm/qcom,sm6150-dpu.yaml | 108 + .../Bindings/display/msm/qcom,sm6150-mdss.yaml | 245 + .../Bindings/display/panel/panel-lvds.yaml | 2 + .../Bindings/display/panel/panel-simple.yaml | 8 + .../Bindings/display/panel/powertip,hx8238a.yaml | 29 + .../Bindings/display/panel/powertip,st7272.yaml | 29 + .../Bindings/display/panel/samsung,atna33xc20.yaml | 2 + .../device-tree/Bindings/display/renesas,cmm.yaml | 12 +- .../device-tree/Bindings/display/renesas,du.yaml | 67 +- .../rockchip/rockchip,rk3588-mipi-dsi2.yaml | 120 + .../Bindings/display/ti/ti,am65x-dss.yaml | 2 +- .../Bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml | 10 +- .../device-tree/Bindings/dma/adi,axi-dmac.yaml | 129 + .../Bindings/dma/allwinner,sun4i-a10-dma.yaml | 4 +- .../Bindings/dma/atmel,sama5d4-dma.yaml | 79 + sys/contrib/device-tree/Bindings/dma/fsl,edma.yaml | 34 + .../Bindings/dma/nvidia,tegra210-adma.yaml | 60 +- sys/contrib/device-tree/Bindings/dma/qcom,gpi.yaml | 4 + .../Bindings/dma/stm32/st,stm32-dmamux.yaml | 10 + .../device-tree/Bindings/dma/ti/k3-bcdma.yaml | 5 +- .../device-tree/Bindings/dts-coding-style.rst | 16 +- sys/contrib/device-tree/Bindings/eeprom/at24.yaml | 5 + .../device-tree/Bindings/firmware/qcom,scm.yaml | 2 + .../Bindings/gpio/brcm,brcmstb-gpio.yaml | 4 + .../Bindings/gpio/fairchild,74hc595.yaml | 17 + .../device-tree/Bindings/gpio/fsl,qoriq-gpio.yaml | 1 + .../device-tree/Bindings/gpu/arm,mali-utgard.yaml | 1 + .../device-tree/Bindings/hwmon/adi,adm1275.yaml | 2 + sys/contrib/device-tree/Bindings/hwmon/lm75.yaml | 1 + .../device-tree/Bindings/i2c/i2c-exynos5.yaml | 1 + .../device-tree/Bindings/i2c/qcom,i2c-cci.yaml | 2 + .../device-tree/Bindings/i2c/renesas,riic.yaml | 5 +- .../Bindings/iio/accel/adi,adxl345.yaml | 11 +- .../Bindings/iio/accel/kionix,kx022a.yaml | 11 +- .../Bindings/iio/accel/nxp,fxls8962af.yaml | 20 +- .../device-tree/Bindings/iio/adc/adi,ad4000.yaml | 75 +- .../device-tree/Bindings/iio/adc/adi,ad4695.yaml | 7 +- .../device-tree/Bindings/iio/adc/adi,ad7124.yaml | 13 + .../device-tree/Bindings/iio/adc/adi,ad7173.yaml | 12 + .../device-tree/Bindings/iio/adc/adi,ad7192.yaml | 15 + .../device-tree/Bindings/iio/adc/adi,ad7606.yaml | 1 + .../device-tree/Bindings/iio/adc/adi,ad7780.yaml | 11 + .../Bindings/iio/adc/renesas,rzg2l-adc.yaml | 37 +- .../Bindings/iio/chemical/bosch,bme680.yaml | 62 + .../device-tree/Bindings/iio/dac/adi,ad5791.yaml | 2 +- .../device-tree/Bindings/iio/dac/rohm,bd79703.yaml | 62 + .../Bindings/iio/imu/adi,adis16480.yaml | 42 +- .../device-tree/Bindings/iio/imu/bosch,bmi160.yaml | 1 + .../device-tree/Bindings/iio/imu/bosch,bmi270.yaml | 1 + .../device-tree/Bindings/iio/imu/bosch,bmi323.yaml | 1 + .../Bindings/iio/imu/invensense,mpu6050.yaml | 1 + .../device-tree/Bindings/iio/light/ti,opt4060.yaml | 51 + .../device-tree/Bindings/iio/pressure/bmp085.yaml | 29 + .../Bindings/input/mediatek,mt6779-keypad.yaml | 3 + .../Bindings/input/mediatek,pmic-keys.yaml | 1 + .../input/touchscreen/imagis,ist3038c.yaml | 1 + .../Bindings/interconnect/qcom,msm8998-bwmon.yaml | 3 + .../Bindings/interconnect/qcom,osm-l3.yaml | 1 + .../Bindings/interconnect/qcom,sm8750-rpmh.yaml | 136 + .../Bindings/interrupt-controller/arm,gic.yaml | 4 +- .../interrupt-controller/aspeed,ast2400-vic.yaml | 10 +- .../interrupt-controller/brcm,bcm7120-l2-intc.yaml | 30 +- .../microchip,lan966x-oic.yaml | 5 +- .../Bindings/interrupt-controller/qcom,pdc.yaml | 3 + .../interrupt-controller/riscv,imsics.yaml | 2 +- .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + .../interrupt-controller/ti,omap4-wugen-mpu.txt | 31 + .../device-tree/Bindings/iommu/arm,smmu.yaml | 23 +- .../device-tree/Bindings/iommu/qcom,iommu.yaml | 1 + .../device-tree/Bindings/iommu/rockchip,iommu.yaml | 1 + .../Bindings/leds/cznic,turris-omnia-leds.yaml | 8 + .../Bindings/leds/leds-class-multicolor.yaml | 2 +- .../Bindings/leds/qcom,spmi-flash-led.yaml | 1 + .../device-tree/Bindings/leds/st,led1202.yaml | 132 + .../device-tree/Bindings/leds/ti,lp8860.yaml | 90 + .../Bindings/mailbox/google,gs101-mbox.yaml | 69 + .../Bindings/mailbox/microchip,sbi-ipc.yaml | 123 + .../Bindings/mailbox/qcom,apcs-kpss-global.yaml | 2 + .../Bindings/media/allwinner,sun50i-h6-vpu-g2.yaml | 1 - .../Bindings/media/amlogic,meson-ir-tx.yaml | 1 - .../device-tree/Bindings/media/amphion,vpu.yaml | 1 - .../Bindings/media/fsl,imx6ull-pxp.yaml | 1 - .../Bindings/media/i2c/sony,imx290.yaml | 2 + .../Bindings/media/mediatek,vcodec-decoder.yaml | 1 - .../Bindings/media/mediatek,vcodec-encoder.yaml | 1 - .../media/mediatek,vcodec-subdev-decoder.yaml | 1 - .../Bindings/media/microchip,sama5d4-vdec.yaml | 19 +- .../device-tree/Bindings/media/nxp,imx8-isi.yaml | 2 + .../device-tree/Bindings/media/nxp,imx8mq-vpu.yaml | 41 +- .../Bindings/media/qcom,msm8916-camss.yaml | 1 - .../Bindings/media/qcom,msm8916-venus.yaml | 12 +- .../Bindings/media/qcom,msm8996-camss.yaml | 1 - .../Bindings/media/qcom,sc7180-venus.yaml | 12 +- .../Bindings/media/qcom,sc7280-camss.yaml | 425 ++ .../Bindings/media/qcom,sc7280-venus.yaml | 12 +- .../Bindings/media/qcom,sc8280xp-camss.yaml | 40 +- .../Bindings/media/qcom,sdm660-camss.yaml | 1 - .../Bindings/media/qcom,sdm845-camss.yaml | 21 +- .../Bindings/media/qcom,sdm845-venus-v2.yaml | 12 +- .../Bindings/media/qcom,sm8250-camss.yaml | 29 +- .../Bindings/media/qcom,sm8250-venus.yaml | 12 +- .../Bindings/media/rockchip,rk3568-vepu.yaml | 1 - .../device-tree/Bindings/media/rockchip-vpu.yaml | 31 +- .../Bindings/media/st,stm32-dcmipp.yaml | 53 +- .../Bindings/media/st,stm32mp25-csi.yaml | 125 + .../Bindings/media/video-interfaces.yaml | 21 + .../qca,ath79-ddr-controller.yaml | 7 - .../Bindings/mfd/atmel,at91sam9260-gpbr.yaml | 44 + .../Bindings/mfd/atmel,at91sam9260-matrix.yaml | 52 + .../device-tree/Bindings/mfd/google,cros-ec.yaml | 3 - .../device-tree/Bindings/mfd/mediatek,mt6397.yaml | 2 + .../device-tree/Bindings/mfd/qcom,tcsr.yaml | 1 + .../device-tree/Bindings/mfd/qnap,ts433-mcu.yaml | 42 + .../Bindings/mfd/rohm,bd71815-pmic.yaml | 20 +- .../device-tree/Bindings/mfd/sprd,sc2731.yaml | 12 +- sys/contrib/device-tree/Bindings/mfd/syscon.yaml | 5 +- .../device-tree/Bindings/misc/lwn,bk4-spi.yaml | 54 + .../Bindings/mmc/amlogic,meson-mx-sdio.yaml | 94 + .../Bindings/mmc/atmel,sama5d2-sdhci.yaml | 1 + .../Bindings/mmc/marvell,xenon-sdhci.yaml | 48 +- .../Bindings/mmc/mmc-controller-common.yaml | 357 ++ .../device-tree/Bindings/mmc/mmc-controller.yaml | 346 +- sys/contrib/device-tree/Bindings/mmc/mmc-slot.yaml | 49 + sys/contrib/device-tree/Bindings/mmc/mtk-sd.yaml | 10 +- .../Bindings/mmc/samsung,exynos-dw-mshc.yaml | 1 + .../device-tree/Bindings/mmc/sdhci-msm.yaml | 3 +- .../device-tree/Bindings/mtd/cdns,hp-nfc.yaml | 81 + .../device-tree/Bindings/mtd/jedec,spi-nor.yaml | 4 + .../Bindings/mtd/microchip,mchp48l640.yaml | 5 +- .../Bindings/mtd/nuvoton,ma35d1-nand.yaml | 95 + .../device-tree/Bindings/mtd/ti,davinci-nand.yaml | 124 + .../Bindings/net/amlogic,meson-dwmac.yaml | 14 +- .../device-tree/Bindings/net/asix,ax88178.yaml | 4 +- .../Bindings/net/bluetooth/qualcomm-bluetooth.yaml | 10 +- .../device-tree/Bindings/net/brcm,bcmgenet.yaml | 32 +- .../Bindings/net/brcm,mdio-mux-iproc.yaml | 50 +- .../Bindings/net/can/atmel,at91sam9263-can.yaml | 58 + .../device-tree/Bindings/net/can/bosch,c_can.yaml | 10 +- .../Bindings/net/can/microchip,mcp2510.yaml | 18 +- .../Bindings/net/can/microchip,mpfs-can.yaml | 6 +- .../Bindings/net/can/renesas,rcar-canfd.yaml | 2 +- .../Bindings/net/can/st,stm32-bxcan.yaml | 2 +- .../device-tree/Bindings/net/can/ti,tcan4x5x.yaml | 199 + .../Bindings/net/microchip,sparx5-switch.yaml | 18 + .../device-tree/Bindings/net/nxp,s32-dwmac.yaml | 105 + .../device-tree/Bindings/net/qcom,ethqos.yaml | 11 +- sys/contrib/device-tree/Bindings/net/qcom,ipa.yaml | 2 +- .../device-tree/Bindings/net/snps,dwmac.yaml | 1 + .../device-tree/Bindings/net/stm32-dwmac.yaml | 94 +- .../device-tree/Bindings/net/ti,davinci-mdio.yaml | 10 +- .../device-tree/Bindings/net/ti,dp83822.yaml | 27 + .../Bindings/net/ti,k3-am654-cpsw-nuss.yaml | 20 +- .../device-tree/Bindings/net/ti,k3-am654-cpts.yaml | 38 +- .../Bindings/net/wireless/marvell,sd8787.yaml | 19 +- .../Bindings/net/wireless/qcom,ath10k.yaml | 1 - .../Bindings/net/wireless/qcom,ath11k-pci.yaml | 1 - .../Bindings/net/wireless/qcom,ath11k.yaml | 1 - .../Bindings/net/wireless/qcom,ath12k-wsi.yaml | 203 + .../Bindings/net/wireless/qcom,ath12k.yaml | 1 - .../device-tree/Bindings/nvmem/qcom,qfprom.yaml | 5 + sys/contrib/device-tree/Bindings/nvmem/rmem.yaml | 1 + .../Bindings/nvmem/sprd,sc2731-efuse.yaml | 29 - .../opp/allwinner,sun50i-h6-operating-points.yaml | 1 + .../Bindings/pci/fsl,imx6q-pcie-common.yaml | 4 +- .../Bindings/pci/fsl,imx6q-pcie-ep.yaml | 39 +- .../device-tree/Bindings/pci/fsl,imx6q-pcie.yaml | 25 +- .../device-tree/Bindings/pci/mbvl,gpex40-pcie.yaml | 173 + .../Bindings/pci/microchip,pcie-host.yaml | 2 + .../device-tree/Bindings/pci/qcom,pcie-sm8550.yaml | 9 +- .../device-tree/Bindings/pci/qcom,pcie.yaml | 4 + .../Bindings/pci/xilinx-versal-cpm.yaml | 1 + .../Bindings/phy/phy-rockchip-naneng-combphy.yaml | 1 + .../Bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml | 21 +- .../device-tree/Bindings/phy/qcom,qusb2-phy.yaml | 1 + .../Bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 6 + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 2 + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 2 + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 13 + .../Bindings/pinctrl/atmel,at91rm9200-pinctrl.yaml | 72 +- .../Bindings/pinctrl/mediatek,mt7988-pinctrl.yaml | 575 ++ .../Bindings/pinctrl/qcom,ipq5424-tlmm.yaml | 4 +- .../Bindings/pinctrl/qcom,msm8917-pinctrl.yaml | 160 + .../Bindings/pinctrl/realtek,rtd1315e-pinctrl.yaml | 54 +- .../Bindings/pinctrl/realtek,rtd1319d-pinctrl.yaml | 54 +- .../Bindings/pinctrl/realtek,rtd1619b-pinctrl.yaml | 54 +- .../Bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 7 +- .../Bindings/pinctrl/rockchip,pinctrl.yaml | 1 + .../Bindings/pinctrl/xlnx,pinctrl-zynq.yaml | 61 +- .../Bindings/power/domain-idle-state.yaml | 5 + .../Bindings/power/raspberrypi,bcm2835-power.yaml | 42 + .../Bindings/power/reset/atmel,sama5d2-shdwc.yaml | 3 + .../device-tree/Bindings/power/supply/bq24190.yaml | 1 + .../Bindings/power/supply/gpio-charger.yaml | 6 + .../Bindings/power/supply/ltc4162-l.yaml | 6 + .../Bindings/power/supply/maxim,max17042.yaml | 1 + .../Bindings/power/supply/st,stc3117.yaml | 74 + .../device-tree/Bindings/pwm/adi,axi-pwmgen.yaml | 8 +- .../device-tree/Bindings/pwm/brcm,bcm7038-pwm.yaml | 8 +- .../device-tree/Bindings/pwm/brcm,kona-pwm.yaml | 8 +- .../Bindings/pwm/marvell,berlin-pwm.yaml | 44 + .../device-tree/Bindings/pwm/sprd,ums512-pwm.yaml | 66 + .../Bindings/regulator/mt6315-regulator.yaml | 6 - .../Bindings/regulator/nxp,pca9450-regulator.yaml | 1 + .../Bindings/regulator/qcom,smd-rpm-regulator.yaml | 2 +- .../device-tree/Bindings/regulator/regulator.yaml | 3 + .../Bindings/remoteproc/qcom,sa8775p-pas.yaml | 44 +- .../Bindings/remoteproc/qcom,sm6115-pas.yaml | 3 +- .../device-tree/Bindings/reset/st,stm32-rcc.txt | 2 +- sys/contrib/device-tree/Bindings/riscv/cpus.yaml | 20 + .../device-tree/Bindings/riscv/extensions.yaml | 10 + .../device-tree/Bindings/riscv/spacemit.yaml | 28 + sys/contrib/device-tree/Bindings/rtc/rtc-mxc.yaml | 10 +- sys/contrib/device-tree/Bindings/serial/8250.yaml | 4 +- .../device-tree/Bindings/serial/nxp,sc16is7xx.yaml | 3 +- .../device-tree/Bindings/serial/renesas,scif.yaml | 5 + .../Bindings/soc/altera/altr,sys-mgr.yaml | 51 + .../soc/amlogic/amlogic,meson-gx-hhi-sysctrl.yaml | 14 + .../Bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + .../device-tree/Bindings/soc/renesas/renesas.yaml | 33 +- .../device-tree/Bindings/soc/rockchip/grf.yaml | 1 + .../Bindings/soc/samsung/exynos-pmu.yaml | 1 + .../Bindings/soc/samsung/exynos-usi.yaml | 1 + .../soc/samsung/samsung,exynos-sysreg.yaml | 8 + .../device-tree/Bindings/soc/ti/ti,pruss.yaml | 10 + .../device-tree/Bindings/sound/adi,ssm2518.yaml | 20 +- .../Bindings/sound/allwinner,sun4i-a10-codec.yaml | 31 + .../device-tree/Bindings/sound/awinic,aw88395.yaml | 2 + .../device-tree/Bindings/sound/everest,es71x4.yaml | 10 +- .../device-tree/Bindings/sound/everest,es7241.yaml | 19 +- .../device-tree/Bindings/sound/fsl,easrc.yaml | 32 +- .../device-tree/Bindings/sound/fsl,micfil.yaml | 1 + .../device-tree/Bindings/sound/fsl,mqs.yaml | 2 + .../device-tree/Bindings/sound/fsl,xcvr.yaml | 34 +- .../Bindings/sound/intel,keembay-i2s.yaml | 32 +- .../Bindings/sound/mediatek,mt8188-mt6359.yaml | 16 +- .../Bindings/sound/neofidelity,ntp8918.yaml | 26 +- .../device-tree/Bindings/sound/realtek,rt5682.yaml | 156 + .../device-tree/Bindings/sound/renesas,rsnd.yaml | 6 - .../device-tree/Bindings/sound/renesas,rz-ssi.yaml | 19 +- .../device-tree/Bindings/sound/ti,pcm1681.yaml | 2 +- .../device-tree/Bindings/sound/ti,pcm6240.yaml | 32 +- .../device-tree/Bindings/sound/ti,tas2562.yaml | 30 +- .../device-tree/Bindings/sound/ti,tas2770.yaml | 34 +- .../device-tree/Bindings/sound/ti,tas2781.yaml | 38 +- .../device-tree/Bindings/sound/ti,tas27xx.yaml | 34 +- .../device-tree/Bindings/sound/ti,tas57xx.yaml | 36 +- .../device-tree/Bindings/spi/cdns,qspi-nor.yaml | 1 + .../device-tree/Bindings/spi/spi-controller.yaml | 25 + .../sram/allwinner,sun4i-a10-system-control.yaml | 4 +- .../device-tree/Bindings/sram/qcom,imem.yaml | 1 + .../device-tree/Bindings/thermal/qcom-tsens.yaml | 1 + .../device-tree/Bindings/timer/fsl,imxgpt.yaml | 3 +- .../device-tree/Bindings/timer/sifive,clint.yaml | 1 + .../device-tree/Bindings/trivial-devices.yaml | 6 +- sys/contrib/device-tree/Bindings/ufs/qcom,ufs.yaml | 2 + .../device-tree/Bindings/ufs/renesas,ufs.yaml | 16 +- .../Bindings/ufs/samsung,exynos-ufs.yaml | 28 +- .../device-tree/Bindings/usb/aspeed,usb-vhub.yaml | 44 +- sys/contrib/device-tree/Bindings/usb/brcm,bdc.yaml | 14 +- .../device-tree/Bindings/usb/cypress,hx3.yaml | 24 +- sys/contrib/device-tree/Bindings/usb/dwc2.yaml | 4 +- .../device-tree/Bindings/usb/fcs,fsa4480.yaml | 20 +- .../device-tree/Bindings/usb/gpio-sbu-mux.yaml | 1 + .../Bindings/usb/intel,keembay-dwc3.yaml | 32 +- .../device-tree/Bindings/usb/ite,it5205.yaml | 18 +- .../device-tree/Bindings/usb/maxim,max33359.yaml | 9 +- .../Bindings/usb/maxim,max3420-udc.yaml | 28 +- .../Bindings/usb/nvidia,tegra210-xusb.yaml | 4 +- .../device-tree/Bindings/usb/qcom,dwc3.yaml | 6 + .../Bindings/usb/renesas,rzv2m-usb3drd.yaml | 36 +- .../Bindings/usb/renesas,usb3-peri.yaml | 24 +- .../device-tree/Bindings/usb/renesas,usbhs.yaml | 2 + .../device-tree/Bindings/usb/snps,dwc3-common.yaml | 415 ++ .../device-tree/Bindings/usb/snps,dwc3.yaml | 391 +- .../device-tree/Bindings/usb/ti,hd3ss3220.yaml | 38 +- .../device-tree/Bindings/usb/ti,tusb73x0-pci.yaml | 6 +- .../device-tree/Bindings/usb/ti,usb8020b.yaml | 20 +- .../device-tree/Bindings/usb/ti,usb8041.yaml | 16 +- .../device-tree/Bindings/vendor-prefixes.yaml | 10 + .../device-tree/Bindings/w1/maxim,ds2482.yaml | 2 + .../device-tree/Bindings/watchdog/qcom-wdt.yaml | 1 + .../device-tree/include/dt-bindings/arm/qcom,ids.h | 1 + .../device-tree/include/dt-bindings/clock/at91.h | 8 + .../include/dt-bindings/clock/en7523-clk.h | 2 +- .../include/dt-bindings/clock/imx93-clock.h | 1 + .../include/dt-bindings/clock/qcom,ipq-cmn-pll.h | 22 + .../include/dt-bindings/clock/qcom,ipq5424-gcc.h | 2 +- .../include/dt-bindings/clock/qcom,mmcc-msm8960.h | 2 + .../include/dt-bindings/clock/qcom,qcs615-gcc.h | 211 + .../include/dt-bindings/clock/qcom,qcs8300-camcc.h | 16 + .../include/dt-bindings/clock/qcom,qcs8300-gpucc.h | 17 + .../dt-bindings/clock/qcom,sm6115-lpasscc.h | 15 + .../include/dt-bindings/clock/qcom,sm8750-dispcc.h | 112 + .../include/dt-bindings/clock/qcom,sm8750-gcc.h | 226 + .../include/dt-bindings/clock/qcom,sm8750-tcsr.h | 15 + .../dt-bindings/clock/qcom,x1e80100-gpucc.h | 13 + .../dt-bindings/clock/renesas,r9a08g045-vbattb.h | 6 +- .../dt-bindings/clock/renesas,r9a09g047-cpg.h | 21 + .../include/dt-bindings/clock/samsung,exynos990.h | 236 + .../include/dt-bindings/clock/stm32fx-clock.h | 2 +- .../include/dt-bindings/clock/sun50i-a64-ccu.h | 2 + .../include/dt-bindings/iio/adc/adi,ad4695.h | 9 + .../include/dt-bindings/input/linux-event-codes.h | 1 + .../dt-bindings/interconnect/qcom,ipq5424.h | 24 + .../dt-bindings/interconnect/qcom,sm8750-rpmh.h | 143 + .../include/dt-bindings/media/video-interfaces.h | 7 + .../pinctrl/renesas,r9a09g047-pinctrl.h | 41 + .../pinctrl/renesas,r9a09g057-pinctrl.h | 31 + .../reset/amlogic,meson-a1-audio-reset.h | 36 + .../include/dt-bindings/sound/qcom,wcd9335.h | 1 - .../arm/allwinner/suniv-f1c100s-licheepi-nano.dts | 8 + .../src/arm/allwinner/suniv-f1c100s.dtsi | 24 + sys/contrib/device-tree/src/arm/amlogic/meson.dtsi | 4 - .../arm/aspeed/aspeed-bmc-ampere-mtjefferson.dts | 622 ++ .../arm/aspeed/aspeed-bmc-ampere-mtmitchell.dts | 18 +- .../arm/aspeed/aspeed-bmc-facebook-catalina.dts | 191 +- .../src/arm/aspeed/aspeed-bmc-facebook-harma.dts | 45 +- .../src/arm/aspeed/aspeed-bmc-facebook-minerva.dts | 998 +++- .../arm/aspeed/aspeed-bmc-facebook-yosemite4.dts | 1011 +++- .../src/arm/aspeed/aspeed-bmc-ibm-blueridge.dts | 46 +- .../src/arm/aspeed/aspeed-bmc-ibm-everest.dts | 27 + .../src/arm/aspeed/aspeed-bmc-ibm-fuji.dts | 111 +- .../src/arm/aspeed/aspeed-bmc-ibm-rainier.dts | 17 +- .../src/arm/aspeed/aspeed-bmc-ibm-sbp1.dts | 6086 ++++++++++++++++++++ .../src/arm/aspeed/aspeed-bmc-ibm-system1.dts | 31 +- .../src/arm/aspeed/aspeed-bmc-quanta-s6q.dts | 8 +- .../src/arm/aspeed/aspeed-bmc-vegman-rx20.dts | 6 +- .../src/arm/aspeed/aspeed-bmc-vegman.dtsi | 2 +- .../device-tree/src/arm/broadcom/bcm2711-rpi.dtsi | 5 - .../device-tree/src/arm/broadcom/bcm2711.dtsi | 12 +- .../src/arm/broadcom/bcm4709-asus-rt-ac3200.dts | 8 +- .../src/arm/broadcom/bcm47094-asus-rt-ac5300.dts | 8 +- .../src/arm/broadcom/bcm53015-meraki-mr26.dts | 20 + .../arm/broadcom/bcm53340-ubnt-unifi-switch8.dts | 1 - .../src/arm/broadcom/bcm6846-genexis-xg6846b.dts | 244 + .../device-tree/src/arm/broadcom/bcm6846.dtsi | 120 + .../device-tree/src/arm/broadcom/bcm953012hr.dts | 1 - .../device-tree/src/arm/broadcom/bcm953012k.dts | 1 - .../device-tree/src/arm/broadcom/bcm958522er.dts | 1 - .../device-tree/src/arm/broadcom/bcm958525er.dts | 1 - .../device-tree/src/arm/broadcom/bcm958525xmc.dts | 1 - .../device-tree/src/arm/broadcom/bcm958622hr.dts | 1 - .../device-tree/src/arm/broadcom/bcm958623hr.dts | 1 - .../device-tree/src/arm/broadcom/bcm958625hr.dts | 1 - .../device-tree/src/arm/broadcom/bcm958625k.dts | 1 - .../device-tree/src/arm/broadcom/bcm988312hr.dts | 1 - .../src/arm/intel/socfpga/socfpga_arria10.dtsi | 6 +- .../arm/intel/socfpga/socfpga_cyclone5_mcvevk.dts | 2 - .../arm/intel/socfpga/socfpga_cyclone5_socdk.dts | 6 - .../src/arm/marvell/mmp2-olpc-xo-1-75.dts | 4 +- .../device-tree/src/arm/mediatek/mt7623.dtsi | 2 +- .../src/arm/microchip/at91-sam9x75_curiosity.dts | 54 +- .../src/arm/microchip/at91-sama5d27_wlsom1_ek.dts | 1 + .../src/arm/microchip/at91-sama5d29_curiosity.dts | 1 + .../src/arm/microchip/at91-sama7d65_curiosity.dts | 89 + .../device-tree/src/arm/microchip/sam9x60.dtsi | 12 + .../device-tree/src/arm/microchip/sam9x7.dtsi | 38 + .../src/arm/microchip/sama7d65-pinfunc.h | 947 +++ .../device-tree/src/arm/microchip/sama7d65.dtsi | 144 + .../src/arm/nuvoton/nuvoton-npcm730-gbs.dts | 6 +- .../arm/nuvoton/nuvoton-npcm750-runbmc-olympus.dts | 2 +- .../device-tree/src/arm/nvidia/tegra124-nyan.dtsi | 2 + .../device-tree/src/arm/nxp/imx/imx51-zii-rdu1.dts | 2 +- .../src/arm/nxp/imx/imx51-zii-scu2-mezz.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx6q-bx50v3.dtsi | 2 +- .../src/arm/nxp/imx/imx6qdl-apalis.dtsi | 12 +- .../src/arm/nxp/imx/imx6qdl-sabresd.dtsi | 5 +- .../device-tree/src/arm/nxp/imx/imx6qdl.dtsi | 6 +- .../device-tree/src/arm/nxp/imx/imx6sl-evk.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx6sl.dtsi | 6 +- .../device-tree/src/arm/nxp/imx/imx6sll-evk.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx6sx-sdb.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx6sx.dtsi | 6 +- .../src/arm/nxp/imx/imx6ul-14x14-evk.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx7-mba7.dtsi | 61 +- .../device-tree/src/arm/nxp/imx/imx7-tqma7.dtsi | 3 +- .../device-tree/src/arm/nxp/imx/imx7d-mba7.dts | 3 +- .../device-tree/src/arm/nxp/imx/imx7d-sdb.dts | 2 +- .../device-tree/src/arm/qcom/qcom-sdx55.dtsi | 7 +- .../device-tree/src/arm/qcom/qcom-sdx65.dtsi | 6 + .../device-tree/src/arm/renesas/r7s72100.dtsi | 10 + .../src/arm/samsung/exynos4212-tab3.dtsi | 31 +- .../device-tree/src/arm/st/stih410-b2260.dts | 4 + sys/contrib/device-tree/src/arm/st/stih410.dtsi | 34 + sys/contrib/device-tree/src/arm/st/stm32mp131.dtsi | 40 + .../device-tree/src/arm/st/stm32mp135f-dk.dts | 12 + .../src/arm/st/stm32mp13xx-dhcor-som.dtsi | 16 +- sys/contrib/device-tree/src/arm/st/stm32mp151.dtsi | 43 +- .../src/arm/st/stm32mp153c-lxa-tac-gen3.dts | 267 + .../device-tree/src/arm/st/stm32mp157c-ev1.dts | 9 + .../src/arm/st/stm32mp157c-lxa-tac-gen1.dts | 84 + .../src/arm/st/stm32mp157c-lxa-tac-gen2.dts | 84 + .../src/arm/st/stm32mp15xc-lxa-tac.dtsi | 100 +- .../src/arm/st/stm32mp15xx-dhcom-drc02.dtsi | 12 - .../src/arm/st/stm32mp15xx-dhcom-pdk2.dtsi | 10 - .../src/arm/st/stm32mp15xx-dhcom-picoitx.dtsi | 10 - .../src/arm/st/stm32mp15xx-dhcom-som.dtsi | 7 + .../device-tree/src/arm/st/stm32mp15xx-dkx.dtsi | 18 + .../device-tree/src/arm/ti/omap/am437x-l4.dtsi | 18 +- .../device-tree/src/arm/ti/omap/dra7-l4.dtsi | 2 + .../device-tree/src/arm/ti/omap/omap3-gta04.dtsi | 16 +- .../src/arm64/allwinner/sun50i-a100.dtsi | 33 + .../src/arm64/allwinner/sun50i-a64-pinebook.dts | 2 + .../src/arm64/allwinner/sun50i-a64-teres-i.dts | 2 + .../src/arm64/allwinner/sun50i-a64.dtsi | 2 + .../src/arm64/allwinner/sun50i-h313-tanix-tx1.dts | 1 + .../src/arm64/altera/socfpga_stratix10_swvp.dts | 1 - .../src/arm64/amlogic/meson-gxbb-p20x.dtsi | 3 +- .../src/arm64/amlogic/meson-gxl-s905d-p230.dts | 3 +- .../src/arm64/amlogic/meson-gxl-s905d-p231.dts | 3 +- .../src/arm64/amlogic/meson-gxl-s905x-p212.dtsi | 3 +- .../src/arm64/amlogic/meson-gxm-q200.dts | 3 +- .../src/arm64/amlogic/meson-gxm-q201.dts | 3 +- .../src/arm64/blaize/blaize-blzp1600-cb2.dts | 83 + .../src/arm64/blaize/blaize-blzp1600-som.dtsi | 23 + .../src/arm64/blaize/blaize-blzp1600.dtsi | 205 + .../src/arm64/broadcom/bcm2712-d-rpi-5-b.dts | 37 + .../src/arm64/broadcom/bcm2712-rpi-5-b.dts | 42 + .../device-tree/src/arm64/broadcom/bcm2712.dtsi | 195 +- .../broadcom/bcmbca/bcm4906-netgear-r8000p.dts | 12 +- .../broadcom/bcmbca/bcm4906-zyxel-ex3510b.dts | 196 + .../src/arm64/broadcom/bcmbca/bcm4908.dtsi | 18 +- .../src/arm64/broadcom/northstar2/ns2-svk.dts | 2 - .../src/arm64/broadcom/northstar2/ns2-xmc.dts | 1 - .../src/arm64/broadcom/northstar2/ns2.dtsi | 2 - .../src/arm64/exynos/exynos850-e850-96.dts | 15 +- .../device-tree/src/arm64/exynos/exynos8895.dtsi | 82 +- .../src/arm64/exynos/exynos9810-pinctrl.dtsi | 503 ++ .../src/arm64/exynos/exynos9810-starlte.dts | 119 + .../device-tree/src/arm64/exynos/exynos9810.dtsi | 273 + .../device-tree/src/arm64/exynos/exynos990-r8s.dts | 115 + .../src/arm64/exynos/exynos990-x1s-common.dtsi | 98 + .../device-tree/src/arm64/exynos/exynos990-x1s.dts | 28 + .../src/arm64/exynos/exynos990-x1slte.dts | 28 + .../device-tree/src/arm64/exynos/exynos990.dtsi | 50 +- .../src/arm64/exynos/exynosautov920.dtsi | 83 + .../src/arm64/exynos/google/gs101-oriole.dts | 104 + .../device-tree/src/arm64/exynos/google/gs101.dtsi | 5 +- .../device-tree/src/arm64/freescale/imx8mm-phg.dts | 2 +- .../src/arm64/freescale/imx8mm-verdin-dahlia.dtsi | 6 +- .../arm64/freescale/imx8mn-bsh-smm-s2-display.dtsi | 28 + .../freescale/imx8mp-aristainetos3-adpismarc.dts | 37 + .../imx8mp-aristainetos3-helios-lvds.dtso | 113 + .../freescale/imx8mp-aristainetos3-helios.dts | 98 + .../freescale/imx8mp-aristainetos3-proton2s.dts | 161 + .../freescale/imx8mp-aristainetos3a-som-v1.dtsi | 1107 ++++ .../freescale/imx8mp-evk-imx-lvds-hdmi-common.dtsi | 29 + .../imx8mp-evk-lvds0-imx-dlvds-hdmi-channel0.dtso | 44 + .../imx8mp-evk-lvds0-imx-lvds-hdmi-common.dtsi | 43 + .../freescale/imx8mp-evk-lvds0-imx-lvds-hdmi.dtso | 28 + .../imx8mp-evk-lvds1-imx-dlvds-hdmi-channel0.dtso | 44 + .../imx8mp-evk-lvds1-imx-lvds-hdmi-common.dtsi | 43 + .../freescale/imx8mp-evk-lvds1-imx-lvds-hdmi.dtso | 28 + .../device-tree/src/arm64/freescale/imx8mp-evk.dts | 6 + .../freescale/imx8mp-skov-revb-mi1010ait-1cp1.dts | 8 +- .../src/arm64/freescale/imx8mp-tqma8mpql.dtsi | 16 +- .../src/arm64/freescale/imx8mp-verdin-dahlia.dtsi | 6 +- .../src/arm64/freescale/imx8mq-librem5-devkit.dts | 2 +- .../src/arm64/freescale/imx8mq-librem5.dtsi | 2 +- .../src/arm64/freescale/imx8mq-zii-ultra.dtsi | 2 - .../src/arm64/freescale/imx93-11x11-evk.dts | 8 + .../src/arm64/freescale/imx93-14x14-evk.dts | 92 + .../src/arm64/freescale/imx93-9x9-qsb.dts | 14 + .../arm64/freescale/imx93-tqma9352-mba93xxca.dts | 8 +- .../arm64/freescale/imx93-tqma9352-mba93xxla.dts | 8 +- .../device-tree/src/arm64/freescale/imx93.dtsi | 2 +- .../src/arm64/freescale/imx95-19x19-evk.dts | 52 + .../device-tree/src/arm64/freescale/imx95.dtsi | 93 + .../device-tree/src/arm64/hisilicon/hi6220.dtsi | 2 - .../src/arm64/intel/socfpga_agilex.dtsi | 3 + .../src/arm64/intel/socfpga_agilex5.dtsi | 24 +- .../src/arm64/marvell/armada-7040-db.dts | 1 + .../src/arm64/marvell/armada-7040-mochabin.dts | 2 + .../arm64/marvell/armada-8040-clearfog-gt-8k.dts | 1 + .../src/arm64/marvell/armada-8040-db.dts | 5 +- .../src/arm64/marvell/armada-8040-mcbin.dtsi | 3 +- .../src/arm64/marvell/armada-8040-puzzle-m801.dts | 2 + .../src/arm64/marvell/armada-cp11x.dtsi | 2 + .../device-tree/src/arm64/marvell/cn9130-crb-B.dts | 1 + .../src/arm64/marvell/cn9131-cf-solidwan.dts | 4 +- .../device-tree/src/arm64/marvell/cn9131-db.dtsi | 1 + .../device-tree/src/arm64/marvell/cn9132-db.dtsi | 1 + .../device-tree/src/arm64/mediatek/mt2712-evb.dts | 1 + .../device-tree/src/arm64/mediatek/mt6359.dtsi | 1 + .../mediatek/mt7986a-bananapi-bpi-r3-sata.dtso | 34 + .../mediatek/mt7988a-bananapi-bpi-r4-emmc.dtso | 33 + .../arm64/mediatek/mt7988a-bananapi-bpi-r4-sd.dtso | 31 + .../src/arm64/mediatek/mt7988a-bananapi-bpi-r4.dts | 398 ++ .../device-tree/src/arm64/mediatek/mt7988a.dtsi | 365 +- .../device-tree/src/arm64/mediatek/mt8173-elm.dtsi | 29 +- .../device-tree/src/arm64/mediatek/mt8173-evb.dts | 25 +- .../arm64/mediatek/mt8183-kukui-jacuzzi-damu.dts | 4 + .../arm64/mediatek/mt8183-kukui-jacuzzi-kenzo.dts | 15 + .../mediatek/mt8183-kukui-jacuzzi-willow.dtsi | 15 + .../src/arm64/mediatek/mt8183-kukui-jacuzzi.dtsi | 2 - .../src/arm64/mediatek/mt8183-kukui.dtsi | 9 +- .../src/arm64/mediatek/mt8183-pumpkin.dts | 4 - .../device-tree/src/arm64/mediatek/mt8183.dtsi | 5 +- .../mediatek/mt8186-corsola-chinchou-sku0.dts | 18 + .../mediatek/mt8186-corsola-chinchou-sku1.dts | 35 + .../mediatek/mt8186-corsola-chinchou-sku16.dts | 29 + .../arm64/mediatek/mt8186-corsola-chinchou.dtsi | 321 ++ .../arm64/mediatek/mt8186-corsola-starmie-sku0.dts | 31 + .../arm64/mediatek/mt8186-corsola-starmie-sku1.dts | 31 + .../src/arm64/mediatek/mt8186-corsola-starmie.dtsi | 472 ++ .../src/arm64/mediatek/mt8186-corsola.dtsi | 8 +- .../device-tree/src/arm64/mediatek/mt8186.dtsi | 8 +- .../src/arm64/mediatek/mt8188-geralt-ciri-sku0.dts | 32 + .../src/arm64/mediatek/mt8188-geralt-ciri-sku1.dts | 59 + .../src/arm64/mediatek/mt8188-geralt-ciri-sku2.dts | 59 + .../src/arm64/mediatek/mt8188-geralt-ciri-sku3.dts | 32 + .../src/arm64/mediatek/mt8188-geralt-ciri-sku4.dts | 48 + .../src/arm64/mediatek/mt8188-geralt-ciri-sku5.dts | 72 + .../src/arm64/mediatek/mt8188-geralt-ciri-sku6.dts | 72 + .../src/arm64/mediatek/mt8188-geralt-ciri-sku7.dts | 48 + .../src/arm64/mediatek/mt8188-geralt-ciri.dtsi | 316 + .../src/arm64/mediatek/mt8188-geralt.dtsi | 1156 ++++ .../device-tree/src/arm64/mediatek/mt8188.dtsi | 9 +- .../src/arm64/mediatek/mt8192-asurada.dtsi | 3 - .../src/arm64/mediatek/mt8195-cherry.dtsi | 2 - .../device-tree/src/arm64/mediatek/mt8195-demo.dts | 10 +- .../device-tree/src/arm64/mediatek/mt8195.dtsi | 5 +- .../device-tree/src/arm64/mediatek/mt8365-evk.dts | 1 + .../device-tree/src/arm64/mediatek/mt8365.dtsi | 3 +- .../src/arm64/mediatek/mt8390-genio-700-evk.dts | 48 + .../src/arm64/mediatek/mt8395-genio-1200-evk.dts | 2 - .../mediatek/mt8395-kontron-3-5-sbc-i1200.dts | 1 + .../src/arm64/mediatek/mt8395-radxa-nio-12l.dts | 2 - .../device-tree/src/arm64/mediatek/mt8516.dtsi | 22 +- .../src/arm64/mediatek/pumpkin-common.dtsi | 2 - .../device-tree/src/arm64/nvidia/tegra234.dtsi | 8 +- .../device-tree/src/arm64/qcom/ipq5332.dtsi | 2 +- .../device-tree/src/arm64/qcom/ipq5424-rdp466.dts | 169 + .../device-tree/src/arm64/qcom/ipq5424.dtsi | 519 ++ .../src/arm64/qcom/ipq9574-rdp-common.dtsi | 24 +- .../device-tree/src/arm64/qcom/ipq9574-rdp433.dts | 113 + .../device-tree/src/arm64/qcom/ipq9574.dtsi | 449 +- .../src/arm64/qcom/msm8916-samsung-serranove.dts | 58 + .../device-tree/src/arm64/qcom/msm8916.dtsi | 2 +- .../src/arm64/qcom/msm8917-xiaomi-riva.dts | 333 ++ .../device-tree/src/arm64/qcom/msm8917.dtsi | 1954 +++++++ .../device-tree/src/arm64/qcom/msm8939.dtsi | 2 +- .../arm64/qcom/msm8994-huawei-angler-rev-101.dts | 21 +- .../src/arm64/qcom/msm8994-msft-lumia-octagon.dtsi | 5 - .../device-tree/src/arm64/qcom/msm8994.dtsi | 11 +- .../src/arm64/qcom/msm8996-xiaomi-gemini.dts | 2 +- .../device-tree/src/arm64/qcom/msm8996.dtsi | 9 +- sys/contrib/device-tree/src/arm64/qcom/pm660l.dtsi | 6 + sys/contrib/device-tree/src/arm64/qcom/pm8150.dtsi | 2 - sys/contrib/device-tree/src/arm64/qcom/pm8937.dtsi | 150 + .../device-tree/src/arm64/qcom/pmd8028.dtsi | 62 + .../device-tree/src/arm64/qcom/pmi8950.dtsi | 17 + .../device-tree/src/arm64/qcom/pmih0108.dtsi | 68 + .../device-tree/src/arm64/qcom/pmk8350.dtsi | 72 + .../src/arm64/qcom/qcm6490-fairphone-fp5.dts | 101 +- .../device-tree/src/arm64/qcom/qcm6490-idp.dts | 8 + .../src/arm64/qcom/qcm6490-shift-otter.dts | 2 - sys/contrib/device-tree/src/arm64/qcom/qcs404.dtsi | 6 +- .../device-tree/src/arm64/qcom/qcs615-ride.dts | 343 ++ sys/contrib/device-tree/src/arm64/qcom/qcs615.dtsi | 3670 ++++++++++++ .../device-tree/src/arm64/qcom/qcs6490-rb3gen2.dts | 41 + .../device-tree/src/arm64/qcom/qcs8300-ride.dts | 370 ++ .../device-tree/src/arm64/qcom/qcs8300.dtsi | 3548 ++++++++++++ .../device-tree/src/arm64/qcom/qcs8550-aim300.dtsi | 2 +- .../device-tree/src/arm64/qcom/qdu1000-idp.dts | 19 +- .../device-tree/src/arm64/qcom/qdu1000.dtsi | 16 + .../device-tree/src/arm64/qcom/qrb4210-rb2.dts | 61 +- .../device-tree/src/arm64/qcom/qrb5165-rb5.dts | 5 + .../device-tree/src/arm64/qcom/qru1000-idp.dts | 19 +- .../device-tree/src/arm64/qcom/sa8775p-ride.dtsi | 82 +- .../device-tree/src/arm64/qcom/sa8775p.dtsi | 402 +- .../src/arm64/qcom/sar2130p-qar2130p.dts | 558 ++ .../device-tree/src/arm64/qcom/sar2130p.dtsi | 3123 ++++++++++ .../src/arm64/qcom/sc7180-trogdor-pompom.dtsi | 4 +- .../arm64/qcom/sc7180-trogdor-quackingstick.dtsi | 1 + sys/contrib/device-tree/src/arm64/qcom/sc7180.dtsi | 20 +- sys/contrib/device-tree/src/arm64/qcom/sc7280.dtsi | 6 +- .../src/arm64/qcom/sc8180x-lenovo-flex-5g.dts | 4 - .../device-tree/src/arm64/qcom/sc8180x-primus.dts | 4 - .../device-tree/src/arm64/qcom/sc8180x.dtsi | 6 + .../src/arm64/qcom/sc8280xp-huawei-gaokun3.dts | 1318 +++++ .../arm64/qcom/sc8280xp-microsoft-blackrock.dts | 1325 +++++ .../device-tree/src/arm64/qcom/sc8280xp.dtsi | 52 +- .../src/arm64/qcom/sdm450-lenovo-tbx605f.dts | 97 + sys/contrib/device-tree/src/arm64/qcom/sdm630.dtsi | 4 + .../src/arm64/qcom/sdm670-google-sargo.dts | 37 +- sys/contrib/device-tree/src/arm64/qcom/sdm670.dtsi | 204 + .../qcom/sdm845-db845c-navigation-mezzanine.dtso | 42 - .../src/arm64/qcom/sdm845-shift-axolotl.dts | 1 - sys/contrib/device-tree/src/arm64/qcom/sdm845.dtsi | 25 +- sys/contrib/device-tree/src/arm64/qcom/sdx75.dtsi | 6 +- sys/contrib/device-tree/src/arm64/qcom/sm4250.dtsi | 39 + sys/contrib/device-tree/src/arm64/qcom/sm4450.dtsi | 2 +- sys/contrib/device-tree/src/arm64/qcom/sm6115.dtsi | 95 +- sys/contrib/device-tree/src/arm64/qcom/sm6125.dtsi | 4 +- sys/contrib/device-tree/src/arm64/qcom/sm6350.dtsi | 8 +- sys/contrib/device-tree/src/arm64/qcom/sm6375.dtsi | 12 +- .../src/arm64/qcom/sm7225-fairphone-fp4.dts | 2 +- .../device-tree/src/arm64/qcom/sm8150-hdk.dts | 5 + .../arm64/qcom/sm8150-microsoft-surface-duo.dts | 9 +- .../device-tree/src/arm64/qcom/sm8150-mtp.dts | 5 + .../src/arm64/qcom/sm8150-sony-xperia-kumano.dtsi | 5 + sys/contrib/device-tree/src/arm64/qcom/sm8150.dtsi | 4 + .../device-tree/src/arm64/qcom/sm8250-hdk.dts | 5 + .../device-tree/src/arm64/qcom/sm8250-mtp.dts | 5 + .../src/arm64/qcom/sm8250-sony-xperia-edo.dtsi | 5 + .../src/arm64/qcom/sm8250-xiaomi-elish-common.dtsi | 120 + .../src/arm64/qcom/sm8250-xiaomi-pipa.dts | 5 + sys/contrib/device-tree/src/arm64/qcom/sm8250.dtsi | 34 +- .../device-tree/src/arm64/qcom/sm8350-hdk.dts | 7 + sys/contrib/device-tree/src/arm64/qcom/sm8350.dtsi | 498 +- sys/contrib/device-tree/src/arm64/qcom/sm8450.dtsi | 1000 +++- .../device-tree/src/arm64/qcom/sm8550-hdk.dts | 2 +- .../device-tree/src/arm64/qcom/sm8550-mtp.dts | 2 +- .../device-tree/src/arm64/qcom/sm8550-qrd.dts | 2 +- .../src/arm64/qcom/sm8550-samsung-q5q.dts | 2 +- .../arm64/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 2 +- sys/contrib/device-tree/src/arm64/qcom/sm8550.dtsi | 296 +- .../device-tree/src/arm64/qcom/sm8650-hdk.dts | 2 +- .../device-tree/src/arm64/qcom/sm8650-mtp.dts | 2 +- .../device-tree/src/arm64/qcom/sm8650-qrd.dts | 2 +- sys/contrib/device-tree/src/arm64/qcom/sm8650.dtsi | 504 +- .../device-tree/src/arm64/qcom/sm8750-mtp.dts | 794 +++ .../device-tree/src/arm64/qcom/sm8750-pmics.dtsi | 188 + .../device-tree/src/arm64/qcom/sm8750-qrd.dts | 792 +++ sys/contrib/device-tree/src/arm64/qcom/sm8750.dtsi | 2907 ++++++++++ .../device-tree/src/arm64/qcom/x1e001de-devkit.dts | 1371 +++++ .../arm64/qcom/x1e78100-lenovo-thinkpad-t14s.dts | 320 +- .../src/arm64/qcom/x1e80100-asus-vivobook-s15.dts | 60 +- .../device-tree/src/arm64/qcom/x1e80100-crd.dts | 14 +- .../src/arm64/qcom/x1e80100-dell-xps13-9345.dts | 305 +- .../src/arm64/qcom/x1e80100-hp-omnibook-x14.dts | 1693 ++++++ .../src/arm64/qcom/x1e80100-lenovo-yoga-slim7x.dts | 52 +- .../src/arm64/qcom/x1e80100-microsoft-romulus.dtsi | 527 +- .../device-tree/src/arm64/qcom/x1e80100-pmics.dtsi | 4 + .../device-tree/src/arm64/qcom/x1e80100-qcp.dts | 298 +- .../device-tree/src/arm64/qcom/x1e80100.dtsi | 2450 +++++++- .../arm64/renesas/r8a779a0-falcon-ethernet.dtsi | 242 + .../device-tree/src/arm64/renesas/r8a779a0.dtsi | 10 - .../device-tree/src/arm64/renesas/r8a779g0.dtsi | 40 + .../arm64/renesas/r8a779g2-white-hawk-single.dts | 62 +- .../arm64/renesas/r8a779g3-white-hawk-single.dts | 16 + .../device-tree/src/arm64/renesas/r8a779g3.dtsi | 12 + .../arm64/renesas/r8a779h0-gray-hawk-single.dts | 298 +- .../device-tree/src/arm64/renesas/r8a779h0.dtsi | 73 + .../device-tree/src/arm64/renesas/r9a08g045.dtsi | 237 + .../device-tree/src/arm64/renesas/r9a09g047.dtsi | 387 ++ .../src/arm64/renesas/r9a09g047e37.dtsi | 18 + .../src/arm64/renesas/r9a09g047e57-smarc.dts | 31 + .../src/arm64/renesas/r9a09g047e57.dtsi | 13 + .../src/arm64/renesas/r9a09g057h44-rzv2h-evk.dts | 36 +- .../src/arm64/renesas/renesas-smarc2.dtsi | 24 + .../src/arm64/renesas/rzg3e-smarc-som.dtsi | 28 + .../src/arm64/renesas/rzg3s-smarc-som.dtsi | 56 +- .../device-tree/src/arm64/renesas/rzg3s-smarc.dtsi | 83 +- .../device-tree/src/arm64/renesas/ulcb-kf.dtsi | 18 +- .../device-tree/src/arm64/renesas/ulcb.dtsi | 5 + .../arm64/renesas/white-hawk-ard-audio-da7212.dtso | 183 + .../src/arm64/renesas/white-hawk-csi-dsi.dtsi | 2 + .../src/arm64/renesas/white-hawk-single.dtsi | 73 + .../src/arm64/rockchip/px30-ringneck-haikou.dts | 13 +- .../src/arm64/rockchip/px30-ringneck.dtsi | 6 + .../src/arm64/rockchip/rk3308-rock-s0.dts | 25 +- .../device-tree/src/arm64/rockchip/rk3328-a1.dts | 1 - .../src/arm64/rockchip/rk3328-nanopi-r2.dtsi | 1 - .../arm64/rockchip/rk3328-orangepi-r1-plus-lts.dts | 3 +- .../src/arm64/rockchip/rk3328-orangepi-r1-plus.dts | 1 + .../arm64/rockchip/rk3328-orangepi-r1-plus.dtsi | 2 - .../src/arm64/rockchip/rk3328-rock-pi-e.dts | 3 - .../src/arm64/rockchip/rk3328-rock64.dts | 1 - .../src/arm64/rockchip/rk3399-gru-chromebook.dtsi | 8 +- .../src/arm64/rockchip/rk3399-gru-scarlet.dtsi | 6 +- .../device-tree/src/arm64/rockchip/rk3399-gru.dtsi | 22 +- .../src/arm64/rockchip/rk3399-nanopi-r4s.dtsi | 2 +- .../src/arm64/rockchip/rk3399-puma.dtsi | 2 +- .../src/arm64/rockchip/rk3399-rockpro64.dtsi | 14 + .../rockchip/rk3566-bigtreetech-cb2-manta.dts | 10 + .../src/arm64/rockchip/rk3566-bigtreetech-cb2.dtsi | 904 +++ .../src/arm64/rockchip/rk3566-bigtreetech-pi2.dts | 10 + .../src/arm64/rockchip/rk3566-lubancat-1.dts | 1 - .../src/arm64/rockchip/rk3568-mecsbc.dts | 19 +- .../src/arm64/rockchip/rk3568-qnap-ts433.dts | 61 + .../src/arm64/rockchip/rk3568-wolfvision-pf5.dts | 10 +- .../src/arm64/rockchip/rk3576-evb1-v10.dts | 731 +++ .../device-tree/src/arm64/rockchip/rk3576.dtsi | 169 + .../src/arm64/rockchip/rk3582-radxa-e52c.dts | 743 +++ .../src/arm64/rockchip/rk3588-base.dtsi | 25 +- .../arm64/rockchip/rk3588-coolpi-cm5-genbook.dts | 4 +- .../arm64/rockchip/rk3588-edgeble-neu6a-io.dtsi | 81 +- .../src/arm64/rockchip/rk3588-evb1-v10.dts | 82 + .../src/arm64/rockchip/rk3588-extra.dtsi | 3 + .../arm64/rockchip/rk3588-firefly-core-3588j.dtsi | 443 ++ .../arm64/rockchip/rk3588-firefly-itx-3588j.dts | 702 +++ .../src/arm64/rockchip/rk3588-h96-max-v58.dts | 802 +++ .../src/arm64/rockchip/rk3588-jaguar.dts | 1 - .../arm64/rockchip/rk3588-orangepi-5-compact.dtsi | 151 + .../src/arm64/rockchip/rk3588-orangepi-5-max.dts | 60 + .../src/arm64/rockchip/rk3588-orangepi-5-plus.dts | 894 +-- .../src/arm64/rockchip/rk3588-orangepi-5.dtsi | 805 +++ .../src/arm64/rockchip/rk3588-rock-5-itx.dts | 3 +- .../src/arm64/rockchip/rk3588-rock-5b-pcie-ep.dtso | 4 + .../src/arm64/rockchip/rk3588-tiger.dtsi | 1 - .../src/arm64/rockchip/rk3588s-nanopi-r6.dtsi | 18 + .../src/arm64/socionext/uniphier-ld11-global.dts | 2 +- .../src/arm64/socionext/uniphier-ld20-global.dts | 2 +- sys/contrib/device-tree/src/arm64/sprd/sc2731.dtsi | 6 +- .../device-tree/src/arm64/sprd/sc9863a.dtsi | 14 +- .../device-tree/src/arm64/sprd/sp9860g-1h10.dts | 9 +- .../device-tree/src/arm64/st/stm32mp251.dtsi | 234 + .../device-tree/src/arm64/st/stm32mp257f-ev1.dts | 97 + .../device-tree/src/arm64/ti/k3-am62-main.dtsi | 1 - .../src/arm64/ti/k3-am62-phycore-som.dtsi | 11 + .../src/arm64/ti/k3-am625-beagleplay.dts | 2 +- .../device-tree/src/arm64/ti/k3-am625-sk.dts | 7 - .../device-tree/src/arm64/ti/k3-am62a-main.dtsi | 1 - .../device-tree/src/arm64/ti/k3-am62a-wakeup.dtsi | 36 +- .../src/arm64/ti/k3-am62p-j722s-common-main.dtsi | 5 + .../device-tree/src/arm64/ti/k3-am62p5-sk.dts | 4 + .../src/arm64/ti/k3-am62x-phyboard-lyra.dtsi | 24 + .../src/arm64/ti/k3-am62x-sk-common.dtsi | 6 +- .../device-tree/src/arm64/ti/k3-am64-main.dtsi | 22 +- .../src/arm64/ti/k3-am642-hummingboard-t-pcie.dts | 47 + .../src/arm64/ti/k3-am642-hummingboard-t-usb3.dts | 47 + .../src/arm64/ti/k3-am642-tqma64xxl-mbax4xxl.dts | 6 - .../src/arm64/ti/k3-am67a-beagley-ai.dts | 158 + .../arm64/ti/k3-am68-sk-base-board-pcie1-ep.dtso | 53 + .../src/arm64/ti/k3-am69-sk-pcie0-ep.dtso | 53 + .../device-tree/src/arm64/ti/k3-am69-sk.dts | 41 + .../src/arm64/ti/k3-j7200-common-proc-board.dts | 4 + .../src/arm64/ti/k3-j7200-mcu-wakeup.dtsi | 7 + .../src/arm64/ti/k3-j721e-evm-pcie1-ep.dtso | 53 + .../device-tree/src/arm64/ti/k3-j722s-evm.dts | 102 + .../src/arm64/ti/k3-j784s4-j742s2-evm-common.dtsi | 8 + .../src/arm64/ti/k3-j784s4-j742s2-main-common.dtsi | 22 +- .../ti/k3-j784s4-j742s2-mcu-wakeup-common.dtsi | 12 +- sys/contrib/device-tree/src/arm64/ti/k3-pinctrl.h | 19 + .../device-tree/src/arm64/xilinx/zynqmp.dtsi | 7 +- .../device-tree/src/mips/mobileye/eyeq5.dtsi | 22 + .../src/riscv/allwinner/sun20i-d1s.dtsi | 3 +- .../src/riscv/spacemit/k1-bananapi-f3.dts | 26 + .../device-tree/src/riscv/spacemit/k1-pinctrl.dtsi | 20 + sys/contrib/device-tree/src/riscv/spacemit/k1.dtsi | 452 ++ .../src/riscv/starfive/jh7110-milkv-mars.dts | 18 +- .../src/riscv/starfive/jh7110-pine64-star64.dts | 18 +- .../src/riscv/starfive/jh7110-pinfunc.h | 2 +- .../device-tree/src/riscv/thead/th1520.dtsi | 16 + 817 files changed, 72113 insertions(+), 5291 deletions(-) diff --cc sys/contrib/device-tree/Bindings/arm/blaize.yaml index 000000000000,af39e2756407..af39e2756407 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/arm/blaize.yaml +++ b/sys/contrib/device-tree/Bindings/arm/blaize.yaml diff --cc sys/contrib/device-tree/Bindings/clock/qcom,ipq9574-cmn-pll.yaml index 000000000000,f869b3739be8..f869b3739be8 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/clock/qcom,ipq9574-cmn-pll.yaml +++ b/sys/contrib/device-tree/Bindings/clock/qcom,ipq9574-cmn-pll.yaml diff --cc sys/contrib/device-tree/Bindings/clock/qcom,qcs615-gcc.yaml index 000000000000,4a828e102d25..4a828e102d25 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/clock/qcom,qcs615-gcc.yaml +++ b/sys/contrib/device-tree/Bindings/clock/qcom,qcs615-gcc.yaml diff --cc sys/contrib/device-tree/Bindings/clock/qcom,sm6115-lpasscc.yaml index 000000000000,8cbab3fbb660..8cbab3fbb660 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/clock/qcom,sm6115-lpasscc.yaml +++ b/sys/contrib/device-tree/Bindings/clock/qcom,sm6115-lpasscc.yaml diff --cc sys/contrib/device-tree/Bindings/clock/qcom,sm8750-gcc.yaml index 000000000000,aab7039fd28d..aab7039fd28d mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/clock/qcom,sm8750-gcc.yaml +++ b/sys/contrib/device-tree/Bindings/clock/qcom,sm8750-gcc.yaml diff --cc sys/contrib/device-tree/Bindings/clock/qcom,x1e80100-camcc.yaml index 000000000000,5bbbaa15a260..5bbbaa15a260 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/clock/qcom,x1e80100-camcc.yaml +++ b/sys/contrib/device-tree/Bindings/clock/qcom,x1e80100-camcc.yaml diff --cc sys/contrib/device-tree/Bindings/clock/samsung,exynos990-clock.yaml index 000000000000,9e7944b5f13b..9e7944b5f13b mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/clock/samsung,exynos990-clock.yaml +++ b/sys/contrib/device-tree/Bindings/clock/samsung,exynos990-clock.yaml diff --cc sys/contrib/device-tree/Bindings/clock/st,stm32-rcc.yaml index 000000000000,f83a6120d65a..f83a6120d65a mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/clock/st,stm32-rcc.yaml +++ b/sys/contrib/device-tree/Bindings/clock/st,stm32-rcc.yaml diff --cc sys/contrib/device-tree/Bindings/clock/ti/ti,composite-clock.yaml index 000000000000,31a6794852c7..31a6794852c7 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/clock/ti/ti,composite-clock.yaml +++ b/sys/contrib/device-tree/Bindings/clock/ti/ti,composite-clock.yaml diff --cc sys/contrib/device-tree/Bindings/clock/ti/ti,gate-clock.yaml index 000000000000,eaa727ab0d7f..eaa727ab0d7f mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/clock/ti/ti,gate-clock.yaml +++ b/sys/contrib/device-tree/Bindings/clock/ti/ti,gate-clock.yaml diff --cc sys/contrib/device-tree/Bindings/clock/xlnx,vcu.yaml index 000000000000,19dc923e2ee9..19dc923e2ee9 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/clock/xlnx,vcu.yaml +++ b/sys/contrib/device-tree/Bindings/clock/xlnx,vcu.yaml diff --cc sys/contrib/device-tree/Bindings/cpufreq/airoha,en7581-cpufreq.yaml index 000000000000,7d4510b3219c..7d4510b3219c mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/cpufreq/airoha,en7581-cpufreq.yaml +++ b/sys/contrib/device-tree/Bindings/cpufreq/airoha,en7581-cpufreq.yaml diff --cc sys/contrib/device-tree/Bindings/display/msm/qcom,sm6150-dpu.yaml index 000000000000,b4f437172218..b4f437172218 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/display/msm/qcom,sm6150-dpu.yaml +++ b/sys/contrib/device-tree/Bindings/display/msm/qcom,sm6150-dpu.yaml diff --cc sys/contrib/device-tree/Bindings/display/msm/qcom,sm6150-mdss.yaml index 000000000000,9ac24f99d3ad..9ac24f99d3ad mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/display/msm/qcom,sm6150-mdss.yaml +++ b/sys/contrib/device-tree/Bindings/display/msm/qcom,sm6150-mdss.yaml diff --cc sys/contrib/device-tree/Bindings/display/panel/powertip,hx8238a.yaml index 000000000000,b7d74faeb5d5..b7d74faeb5d5 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/display/panel/powertip,hx8238a.yaml +++ b/sys/contrib/device-tree/Bindings/display/panel/powertip,hx8238a.yaml diff --cc sys/contrib/device-tree/Bindings/display/panel/powertip,st7272.yaml index 000000000000,f3622800f13f..f3622800f13f mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/display/panel/powertip,st7272.yaml +++ b/sys/contrib/device-tree/Bindings/display/panel/powertip,st7272.yaml diff --cc sys/contrib/device-tree/Bindings/display/rockchip/rockchip,rk3588-mipi-dsi2.yaml index 000000000000,53384e47b507..53384e47b507 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/display/rockchip/rockchip,rk3588-mipi-dsi2.yaml +++ b/sys/contrib/device-tree/Bindings/display/rockchip/rockchip,rk3588-mipi-dsi2.yaml diff --cc sys/contrib/device-tree/Bindings/dma/adi,axi-dmac.yaml index 000000000000,63b6fb0423c2..63b6fb0423c2 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/dma/adi,axi-dmac.yaml +++ b/sys/contrib/device-tree/Bindings/dma/adi,axi-dmac.yaml diff --cc sys/contrib/device-tree/Bindings/dma/atmel,sama5d4-dma.yaml index 000000000000,9ca1c5d1f00f..9ca1c5d1f00f mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/dma/atmel,sama5d4-dma.yaml +++ b/sys/contrib/device-tree/Bindings/dma/atmel,sama5d4-dma.yaml diff --cc sys/contrib/device-tree/Bindings/iio/chemical/bosch,bme680.yaml index 000000000000,fe98ec44f081..fe98ec44f081 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/iio/chemical/bosch,bme680.yaml +++ b/sys/contrib/device-tree/Bindings/iio/chemical/bosch,bme680.yaml diff --cc sys/contrib/device-tree/Bindings/iio/dac/rohm,bd79703.yaml index 000000000000,941a49c93943..941a49c93943 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/iio/dac/rohm,bd79703.yaml +++ b/sys/contrib/device-tree/Bindings/iio/dac/rohm,bd79703.yaml diff --cc sys/contrib/device-tree/Bindings/iio/light/ti,opt4060.yaml index 000000000000,568fb2a9b7a3..568fb2a9b7a3 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/iio/light/ti,opt4060.yaml +++ b/sys/contrib/device-tree/Bindings/iio/light/ti,opt4060.yaml diff --cc sys/contrib/device-tree/Bindings/interconnect/qcom,sm8750-rpmh.yaml index 000000000000,a816acc301e1..a816acc301e1 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/interconnect/qcom,sm8750-rpmh.yaml +++ b/sys/contrib/device-tree/Bindings/interconnect/qcom,sm8750-rpmh.yaml diff --cc sys/contrib/device-tree/Bindings/interrupt-controller/ti,omap4-wugen-mpu.txt index 000000000000,422d6908f8b2..422d6908f8b2 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/interrupt-controller/ti,omap4-wugen-mpu.txt +++ b/sys/contrib/device-tree/Bindings/interrupt-controller/ti,omap4-wugen-mpu.txt diff --cc sys/contrib/device-tree/Bindings/leds/st,led1202.yaml index 000000000000,f1e5e4efaa3a..f1e5e4efaa3a mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/leds/st,led1202.yaml +++ b/sys/contrib/device-tree/Bindings/leds/st,led1202.yaml diff --cc sys/contrib/device-tree/Bindings/leds/ti,lp8860.yaml index 000000000000,0ee357b02661..0ee357b02661 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/leds/ti,lp8860.yaml +++ b/sys/contrib/device-tree/Bindings/leds/ti,lp8860.yaml diff --cc sys/contrib/device-tree/Bindings/mailbox/google,gs101-mbox.yaml index 000000000000,e249db4c1fbc..e249db4c1fbc mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/mailbox/google,gs101-mbox.yaml +++ b/sys/contrib/device-tree/Bindings/mailbox/google,gs101-mbox.yaml diff --cc sys/contrib/device-tree/Bindings/mailbox/microchip,sbi-ipc.yaml index 000000000000,8ed67ea7c883..8ed67ea7c883 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/mailbox/microchip,sbi-ipc.yaml +++ b/sys/contrib/device-tree/Bindings/mailbox/microchip,sbi-ipc.yaml diff --cc sys/contrib/device-tree/Bindings/media/qcom,sc7280-camss.yaml index 000000000000,e11141b812a0..e11141b812a0 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/media/qcom,sc7280-camss.yaml +++ b/sys/contrib/device-tree/Bindings/media/qcom,sc7280-camss.yaml diff --cc sys/contrib/device-tree/Bindings/media/st,stm32mp25-csi.yaml index 000000000000,33bedfe41924..33bedfe41924 mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/media/st,stm32mp25-csi.yaml +++ b/sys/contrib/device-tree/Bindings/media/st,stm32mp25-csi.yaml diff --cc sys/contrib/device-tree/Bindings/mfd/atmel,at91sam9260-gpbr.yaml index 000000000000,f805545aa62a..f805545aa62a mode 000000,100644..100644 --- a/sys/contrib/device-tree/Bindings/mfd/atmel,at91sam9260-gpbr.yaml +++ b/sys/contrib/device-tree/Bindings/mfd/atmel,at91sam9260-gpbr.yaml *** 705 LINES SKIPPED *** From nobody Sat Nov 22 11:26:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8tQ0VNlz6GwM3 for ; Sat, 22 Nov 2025 11:26:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8tP4dQ4z3QjZ for ; Sat, 22 Nov 2025 11:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kitMK7xL09XFj5MdThe+tX0w3LF77hLzHQCp0iinGIw=; b=E71v6XYOlth81ZqAde8etZrsG5R9K+G3h9Bf+Q+YRahrFWuxVuRKAAN9IJPxYVGziENWbb ccmpMH1+/UyOpHA6OHeaN6lWsCjRljlDj3yesOYzpe+8L6RderKyEgeURiGahtRVa9FrQB m6AxsQhOtjEtA/INL4iOL2WKYeI5Q1fp/pRBWJz5bqs0krJ7tDz8ITGjeqnFFhFs/YumAl 6fJzdrrodHF0dNPLk4wBSTJbRGGd1EIi9Gla6IkdPqreWnc8McDQuas4utp1Vr45+PphGn g/qMBwb74nzjafGwGWlYodGtZ1QMsY7nAAYDNRyVoHxD9lyVjjZBNJDoiwu1fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kitMK7xL09XFj5MdThe+tX0w3LF77hLzHQCp0iinGIw=; b=Yqejf1LXmY6PHCTvgAkBwJW4WczoxLfXQeQxuOiy9OPptpdIrscAJJOsBBLxJeY5zXC1P9 yaxw+J6vPvrG+6fgx7MCJuTs+K1Ksr4aUOrMRDfxtK0iQ7MWYu8m6G/8EiO9hPiH9zRaSh lAo2tLbqRxCj89ALI4+lXBfbgdYsfbRPh2tzcMsh8JlGJGJTjIL3kUezHQjHswaoeaUxfz DfktzDJ1/U365ss5bo459cids45GGjNurz5cUY9siMF9Upb9fOJmBj94r3d6uY/OXkSRgj xNu8WbFk56g3btVgo0eSsyZZ0ZVA6+AJK5tBnRdKM4rRxC62spy0NIn222uCvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810797; a=rsa-sha256; cv=none; b=uYGwLaTIc0pEp4nINx82nmyIoH2S6Px632eHe4gu2sATgVXBjfNXyPK31HZ0ZfsyTI+TDU gZgAkXd1aOPBB89j3no4j3aRbsX1J+Y5ercrSaYPkAhpquaXFZ92HcC3T6/f/QJ/FHF0PW kXqeUPtUYwRm8bqzpPjIHg1Ssn7Wo87HAOqA1R3U0fAjQ2zF1KQVVifFFqyaVp7tvRw+9O xOpNSCYha4YHszKfDdVMqHX7K/zwaJO0Uzwn4Namy7kXQJbLnBUXDLiyCpycOm1v+g6uvF Fo8SBAo1v4tNxIC42KidBFB/GVaCiuaL0O7BMlnLuT0gxfJBfWbwy/WNaO4tHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8tP2hjPzw6L for ; Sat, 22 Nov 2025 11:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c74e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:26:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: 08b3ef957d69..3721eb5a725c - vendor/device-tree - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/vendor/device-tree X-Git-Reftype: branch X-Git-Commit: 3721eb5a725c2b59fe986ff137accfa502503476 X-Git-Oldrev: 08b3ef957d695abfaec3aac3603842d1eac9bda4 X-Git-Newrev: 3721eb5a725c2b59fe986ff137accfa502503476 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 11:26:37 +0000 Message-Id: <69219ded.c74e.114ca75f@gitrepo.freebsd.org> The branch vendor/device-tree has been updated by manu: URL: https://cgit.FreeBSD.org/src/log/?id=08b3ef957d69..3721eb5a725c 3721eb5a725c Import device-tree files from Linux 6.15 From nobody Sat Nov 22 11:26:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8tQ0Vwzz6Gw4s for ; Sat, 22 Nov 2025 11:26:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8tP4cVCz3QYB for ; Sat, 22 Nov 2025 11:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=Sm3keZKQ0RMQQTCLPWb4C5IxGzPjiAwnW9vX6YMcmTw=; b=XEoxxe0RyzysF9BohVT3CLIUfGKBdYgQbRJlSf1VHxCxDBTSYgaP5+mnQFx9WF7aS8h6yX GeY6bi2k7TqRuHcjf1LVLM/6jqDLo4o5io+79SKluZbek9vyZA/05taaGwNsAL28btQev7 m4fByqPSm2mGfrAxuSa3xNSJwp/wPQ/YZc9yDSf7/M1FE6ghvgFeGXl/ivrw46RZfD/jrz IvWVqHMxABbXpi9gIlqjIYrSILIzw6kYiUMzOypK6CJ+CCVAgK8rE2TUT8Zizx5bkKB2kB bZ/rN/odVx2xJ4Ya8G/KxS/XH8cBYNUfAfqXsIVfJszu5qvQEt2dYEPb3zGQsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=Sm3keZKQ0RMQQTCLPWb4C5IxGzPjiAwnW9vX6YMcmTw=; b=R1QVmBuX/7FyovsgAC67wbk6PfadyrI977DvrKb5kz5LmgKvFvPyZycWd1pycvaFpbGekK fGW3osxVO7q+IORSRnFLQ574mh3aHhH+39/UiJtxEPLKB7UjDbp37FGoFVa4SQikSGora7 7Gm6bObeIyGaAfDkGIKPJN0ibnxbVlFhVA47Qo+KNm044t3CT2JEwTdd/t690Ecr1fa8gl rC4gfecKhhVHC2yYjuZGKbxU7WgN05XOvTcfzbz5iR0y7E3edGOpy7e1wJ3H4bUpY1IcWs 4QK/FaNdTEA8Nh8QSHxpVIit49wVtzufj2El6tUEFDzEyxaHJucmyHCWBSNrLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810797; a=rsa-sha256; cv=none; b=xyJdusONluvby/EZ81z8gJ90ywUVy3/bXVyGRkeGd3Qhpt+JSFMAiSoI/G/Xc9BWA3wVCr Fbc55gpCXBRlhluxRt2zJ67S1Pu/cAfilL6MUbpXYtImJzPQuHbP4bgrwxZS/HxcNF7h5s IutObXBu2+qm+EdAx8RQvXO2PrDatUUivuN713wZJ70HJTVDG6fI4+J+FqYqVU7RHl66un qNIWIICI8hFSq81Xx+tUcQxJv9ckNT0++WVLgIqafwmBXpTNz0lecPel7a3onfdZbJNEGK 7cHUExkKBE3EdiWQMoKKWB3t/PSaHAoSVaXabuTM0Q8QCipY676VAZUwhMqC8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8tP3XsXzwby for ; Sat, 22 Nov 2025 11:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id be9a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:26:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: tag vendor/device-tree/6.15 Tagger: Emmanuel Vadot Date: Sat, 22 Nov 2025 11:26:37 +0000 Message-Id: <69219ded.be9a.1f143a18@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Tag device-tree files from Linux 6.15 3721eb5a725c - MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/tags/vendor/device-tree/6.15 X-Git-Reftype: annotated tag X-Git-Commit: 543485b6e97d01bb1a0c5e256c8c57ea62033c03 Auto-Submitted: auto-generated The annotated tag vendor/device-tree/6.15 has been created by manu: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/device-tree/6.15 tag vendor/device-tree/6.15 Tagger: Emmanuel Vadot TaggerDate: 2025-11-22 11:22:26 +0000 Tag device-tree files from Linux 6.15 commit 3721eb5a725c2b59fe986ff137accfa502503476 Author: Emmanuel Vadot AuthorDate: 2025-11-22 11:22:22 +0000 Commit: Emmanuel Vadot CommitDate: 2025-11-22 11:22:22 +0000 Import device-tree files from Linux 6.15 From nobody Sat Nov 22 11:27:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8vn4r0pz6GwDc for ; Sat, 22 Nov 2025 11:27: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8vn44Kbz3RKl for ; Sat, 22 Nov 2025 11:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xGgs+9cU1rjbyG30JEpyqXSen2/WnRl5sAPCxgaO5qo=; b=c7a1w2nQ6F5nL0VMTQDBXwnW9/0cJbImw1niEKc2Vrce1unFnLBd/V+xayTZdwOseOtVY2 iFbYPjhVtXXdAfFbf3SLPmj6tBTcMryy2HDKPdTVzmp1rDWzNQvFbeC4oHPkGGpBZKssHv DuhGn5Im2JCgj1idjMQD2ojd0j0kCwpxAITSJc9EOhDI4Fi5MC4HP4PwQ+jjE+mgcWv2u7 M4Q/3lwK3K/LPJ1UE8gIUelwnpFK/32oSuWLYEVDwtDEgsXyZds8ac8itiLBUncgJ258ZM T7jX8VuZJ96YFmToDRT1zDNEsFPHmo0EvG9KlMClBwlgMPDESGM3Z39xORwO8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xGgs+9cU1rjbyG30JEpyqXSen2/WnRl5sAPCxgaO5qo=; b=eZ5wvh71zw2JMPtLF2+UByq7uCAQJxNBvK4yDHoOHpw3+oNHyT/55hheWG7zF2Q+QQNbbz WlvqjqUeT3ErXMB/ERLdgtYqxMDfpKtrrm4h5Kei4Iskdomm1nsQ3jUpR/ic0YHguUcSJT aeJR3wjBJdGiNoxZ3isL11GI7FKJCi+seZ3YbOr777NcaTCYHd5UxslG4X8zRaN/EYtYCk uDsM7m87u47oO+yTeDkcWnI8eEruTKghg00XZKWnxnv8/UWOVTlcBC73BaHUH4NCD55i4C 61bM4oB10lONIONLHuwOvT4D25zvr3D3ByC0pWM4ck3DDrOONjPyF92eAE3nlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810869; a=rsa-sha256; cv=none; b=T2Tya7yQq74QSSVqXUtorrvrbdlm3aRSHsq3XI0MnJvU8W6TkzvxTi6Dj728UT1YYQ7yun paYFe1U+/wi6RTSl52iWW/sRWu6twFxuGJuyNzuasfjjQFEHecyja6mvnC6zxHhIW7f0sc yLanGH6xLhyat9CKfhvD6MGSL2shxL6opbtmu3w/Si088uZtiUD4VddvlgdiJtRdexUKwr Rpsk27iavdrPa7wa8/oD+i4qXvtxBK+dCO0rvkUsN484yM00daP9sAyx69k2hI4+ZsKBt5 jzXgy1uIol8WWRANL3zTGd1FlSkll5vBRuOKB8l6B6DXqwpuWjB5XqNA3sTgug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8vn3CDZzwYY for ; Sat, 22 Nov 2025 11:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c6f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:27:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: 3721eb5a725c..b8aada787cdf - vendor/device-tree - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/vendor/device-tree X-Git-Reftype: branch X-Git-Commit: b8aada787cdf692c810a139664cdbd5fe3898e25 X-Git-Oldrev: 3721eb5a725c2b59fe986ff137accfa502503476 X-Git-Newrev: b8aada787cdf692c810a139664cdbd5fe3898e25 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 11:27:49 +0000 Message-Id: <69219e35.c6f5.63f4e888@gitrepo.freebsd.org> The branch vendor/device-tree has been updated by manu: URL: https://cgit.FreeBSD.org/src/log/?id=3721eb5a725c..b8aada787cdf b8aada787cdf Import device-tree files from Linux 6.16 From nobody Sat Nov 22 11:27:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8vn6nDGz6Gwmb for ; Sat, 22 Nov 2025 11:27: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8vn4zTqz3RQF for ; Sat, 22 Nov 2025 11:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=1Ytu57GWImHrbNozOejFxOVak0i/WYj6OSCzzaGMtKk=; b=Fp+rLG8i0QoEl5y20qV/l78ObgoczbtINPr+d4C0b7yhyibbvJjVTf/uCCCpqAD2JnD7ho nOcQcYxQ+AjOD+oG/OXTBvleV2edTHKaFvSS4a1xvstAvL7Wd0yWLMBM7m9UFy8n21CMx3 N/OV9c60AECuavmRzZVU8bK8CFsviXFCCaUvSOF0FUNQIdHraj8VUlA0ce0S1QQJBPzB1f y2bw5TeD8ByqAudMquvI0/b91trnSAhJQvhlKYwDHizdj8eCVeIkaSFuc+5qhYd+1HwPul ICasnFluOpqzjtJZ0b75OgwSu7I8+1idC+ccEAfMoVEwpAhrZjCUcTgJ0QlUHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=1Ytu57GWImHrbNozOejFxOVak0i/WYj6OSCzzaGMtKk=; b=t50/WSyDO3CUhI4axLPTHsLvvDE9VsjOohnaAkWmHYz1GAh3pc3NPDNJfUaE4P/GbkDQwg ue5mGfKpA/Sbj6jnkP6sLgJ/z2z4qQm0Dmm1ILp5s6a/69qZ+bToI8DvWPcgeni1FqeC2Q LKaoFyIy28h+Ls56B83fn8mEAqCc0O2Ia28kHueN1uHO15ysLX1Gg2LBq/pM1p+ZqU9UWe POcdSnUNwWVn6l/XsyBfO6LbXdfHBpl9g2pJqP9Wz/juSfkfMHpEkutTRbQBI35j/3R5+G kvvoeNoqGSzbwcSOh4d5TNQZrQ5/pVjIomzDEMMk37gIbSMhIeeTXMNnX1XG3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810869; a=rsa-sha256; cv=none; b=ckIYU65dc1QfhwRIcehIRiazJn32KgFC5bjwunedqEoa95GggZV3WuGxdgYukGOknYaoPs HshJBFsNjAqNdYGZS98iD/uSqk50h3rk4SudhvTuhpklh+o0PIr+oW1F8tmqnpGqTWl0gv fa1yX9ARNYePNvcOiyRsjWNplX9mXwfl+Ksc+/l+dpDoV+prlCtHR3Ay9uAVSAFM5zpsVh Lf8WfRHNTTEyGbAsMd135fALL0DGiT6r+erX3iUulfZTtKwOt3PAUZtNCgsliML35xlbbg N00lkw6dzQWY6Pc8N0gvsrszvzfyG+TBrhxBH4Dibv/RSe6p4FjvgnB63aP7/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8vn44ftzwmX for ; Sat, 22 Nov 2025 11:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a865 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:27:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: tag vendor/device-tree/6.16 Tagger: Emmanuel Vadot Date: Sat, 22 Nov 2025 11:27:49 +0000 Message-Id: <69219e35.a865.de7b5e1@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Tag device-tree files from Linux 6.16 b8aada787cdf - MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/tags/vendor/device-tree/6.16 X-Git-Reftype: annotated tag X-Git-Commit: 4d3cda8a5edc58618d0afd25f3fd67c94a4435a8 Auto-Submitted: auto-generated The annotated tag vendor/device-tree/6.16 has been created by manu: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/device-tree/6.16 tag vendor/device-tree/6.16 Tagger: Emmanuel Vadot TaggerDate: 2025-11-22 11:27:20 +0000 Tag device-tree files from Linux 6.16 commit b8aada787cdf692c810a139664cdbd5fe3898e25 Author: Emmanuel Vadot AuthorDate: 2025-11-22 11:27:17 +0000 Commit: Emmanuel Vadot CommitDate: 2025-11-22 11:27:17 +0000 Import device-tree files from Linux 6.16 From nobody Sat Nov 22 11:28:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8wZ2SZqz6Gwmk for ; Sat, 22 Nov 2025 11: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8wZ1866z3RqG for ; Sat, 22 Nov 2025 11: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=1763810910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=asT1ORIz7H6euGiOWAJBRHzKEJQatcKsiUsOx1E5KcA=; b=k8T43J3NX18VZ+8+EGRR/f8YfT4HWZ8p0c2Uih9QGaX+6D7ejI+wj6ebFJ7+XlXyzotHMQ 9GSURj4fkDcXmDDAMJYSyn3/gxFbz3DBUahXHx0OVewICjfi6f+BWJN+z6JONQvtLlBCB2 ubRvXjBtGtZFZu4KXH8hpUrnoE9x8vQHWFRld8WwRv1/29766+G3Y7kVA5vJgjoP0KSwZC 346rQK3yOWLhbM2azw4aqBQK07dBks28N0evOeMxWHAgQ10vfkkEoaNbE7Eim3s+Q82cOg 8xU0YityrPpEz/czJr7ayGpbfVsQ5wvQAOLVIcoDVUARvcW2iGJFopQkacJiGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=asT1ORIz7H6euGiOWAJBRHzKEJQatcKsiUsOx1E5KcA=; b=c7L4qZ0dCYGK3vDpALwF+IZbjHqWS7P+TitNeKWGWy92eiNO90YeSteN8G8FO2Auvq/D7y JnOpfT+W6zc90VtF/KtRj23HM/n40X/E7YlJY5VvlldgerJ4hNWfySbxIXih5trnte5qbJ ZwdXP33lpjAS1QO5igxt3WziONta2IEfQ3nb2UW/XV1yKPraQ/CPA9pWnQNEA+CK2vt8YT Y8DZ6KiQC51XXs7Gkptdy44bvBrfsxH9RNAv71Vs7lNbxOGkNvsEOqPOaHdcPg7Y4Chqxk pVJtmmhEXgBZKSXc9ZicCFR1BvRRvGFoLw7I4Us85VlRAoQObfYCVNfn9AUR8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810910; a=rsa-sha256; cv=none; b=cgXogmtNyVjoKysFvSswznowlmyYXqo+dekaC45du6aVPPgMYCojSv9yJFgs3D5UE2QzSY cZw8WmiApO6MKREOGjzmDtx1zXKCTUHND48znfSEviU3DmmRxKHh45JmehZ9Mut/2dFnHd 7vUODLl59t0DxFQ6uUvhy+K46jpf2XD8LVPP7moCWH2H/OoCI8+hGW8SwaVw16InMsPsyQ MsttLmUmbytnMqLdI1n2THJ1MVUTc7jG6CzvXMa7H+/3gMPbgMLPus4jA1qfiw78TD1SXg TjjrwSJaqWRKnhQa3Uqkj/MlWViwhGnT3SzJiruemuc5LvvLQ0bIRvb8XymqnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8wZ0kSkzwmb for ; Sat, 22 Nov 2025 11:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c383 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:28:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 8ccc0d235c22 - main - Import device-tree files from Linux 6.15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ccc0d235c226d84112561d453c49904398d085c Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 11:28:29 +0000 Message-Id: <69219e5d.c383.454e6afc@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=8ccc0d235c226d84112561d453c49904398d085c commit 8ccc0d235c226d84112561d453c49904398d085c Merge: 2846c90520eb 3721eb5a725c Author: Emmanuel Vadot AuthorDate: 2025-11-22 11:26:43 +0000 Commit: Emmanuel Vadot CommitDate: 2025-11-22 11:26:43 +0000 Import device-tree files from Linux 6.15 sys/contrib/device-tree/Bindings/arm/apple.yaml | 41 + .../device-tree/Bindings/arm/apple/apple,pmgr.yaml | 5 + .../Bindings/arm/arm,coresight-tmc.yaml | 26 + .../device-tree/Bindings/arm/arm,morello.yaml | 35 + .../device-tree/Bindings/arm/atmel-at91.yaml | 33 +- .../device-tree/Bindings/arm/atmel-sysregs.txt | 1 + sys/contrib/device-tree/Bindings/arm/cpus.yaml | 1 + sys/contrib/device-tree/Bindings/arm/fsl.yaml | 27 +- sys/contrib/device-tree/Bindings/arm/google.yaml | 3 +- .../Bindings/arm/marvell/armada-37xx.yaml | 1 + .../Bindings/arm/marvell/armada-7k-8k.yaml | 25 + sys/contrib/device-tree/Bindings/arm/mediatek.yaml | 5 + sys/contrib/device-tree/Bindings/arm/pmu.yaml | 1 + .../Bindings/arm/qcom,coresight-ctcu.yaml | 84 ++ .../Bindings/arm/qcom,coresight-tpda.yaml | 3 +- .../Bindings/arm/qcom,coresight-tpdm.yaml | 3 +- sys/contrib/device-tree/Bindings/arm/rockchip.yaml | 25 +- .../Bindings/arm/stm32/st,stm32-syscon.yaml | 2 + .../device-tree/Bindings/arm/stm32/stm32.yaml | 22 + sys/contrib/device-tree/Bindings/arm/sunxi.yaml | 5 + sys/contrib/device-tree/Bindings/arm/ti/omap.yaml | 7 + .../device-tree/Bindings/ata/ceva,ahci-1v84.yaml | 5 +- .../device-tree/Bindings/ata/fsl,pq-sata.yaml | 60 + .../Bindings/clock/allwinner,sun55i-a523-ccu.yaml | 103 ++ .../Bindings/clock/atmel,at91rm9200-pmc.yaml | 4 + .../device-tree/Bindings/clock/imx8m-clock.yaml | 8 + .../Bindings/clock/imx8mp-audiomix.yaml | 10 +- .../Bindings/clock/mediatek,mt8188-clock.yaml | 21 + .../Bindings/clock/mediatek,mtmips-sysc.yaml | 11 +- .../Bindings/clock/qcom,ipq9574-nsscc.yaml | 98 ++ .../device-tree/Bindings/clock/qcom,rpmcc.yaml | 2 + .../Bindings/clock/qcom,sc7280-lpasscorecc.yaml | 5 +- .../Bindings/clock/qcom,sm8450-camcc.yaml | 1 - .../Bindings/clock/qcom,x1e80100-camcc.yaml | 9 +- .../Bindings/clock/rockchip,rk3528-cru.yaml | 64 + .../Bindings/clock/rockchip,rk3562-cru.yaml | 55 + .../Bindings/clock/samsung,exynos2200-cmu.yaml | 247 ++++ .../Bindings/clock/samsung,exynos7870-cmu.yaml | 227 ++++ .../Bindings/clock/samsung,exynos990-clock.yaml | 19 + .../device-tree/Bindings/clock/ti,clkctrl.yaml | 65 + .../connector/gocontroll,moduline-module-slot.yaml | 88 ++ .../Bindings/cpufreq/cpufreq-qcom-hw.yaml | 35 +- .../device-tree/Bindings/crypto/fsl,sec2.0.yaml | 144 ++ .../crypto/inside-secure,safexcel-eip93.yaml | 67 + .../Bindings/crypto/inside-secure,safexcel.yaml | 2 + .../device-tree/Bindings/crypto/qcom,prng.yaml | 1 + .../device-tree/Bindings/crypto/qcom-qce.yaml | 1 + .../display/apple,h7-display-pipe-mipi.yaml | 83 ++ .../Bindings/display/apple,h7-display-pipe.yaml | 88 ++ .../Bindings/display/bridge/lvds-codec.yaml | 1 + .../Bindings/display/bridge/nwl-dsi.yaml | 18 +- .../Bindings/display/bridge/ti,sn65dsi83.yaml | 3 + .../Bindings/display/mediatek/mediatek,dpi.yaml | 7 + .../Bindings/display/mediatek/mediatek,dsc.yaml | 3 + .../Bindings/display/msm/dsi-controller-main.yaml | 70 +- .../Bindings/display/msm/dsi-phy-common.yaml | 2 + .../device-tree/Bindings/display/msm/gmu.yaml | 1 + .../Bindings/display/msm/qcom,sa8775p-mdss.yaml | 32 +- .../Bindings/display/msm/qcom,sm8550-mdss.yaml | 14 +- .../Bindings/display/msm/qcom,sm8650-mdss.yaml | 13 +- .../Bindings/display/panel/apple,summit.yaml | 58 + .../Bindings/display/panel/himax,hx83102.yaml | 6 + .../display/panel/mitsubishi,aa104xd12.yaml | 6 +- .../panel/panel-simple-lvds-dual-ports.yaml | 2 + .../Bindings/display/panel/panel-simple.yaml | 2 + .../Bindings/display/panel/raydium,rm67200.yaml | 72 + .../Bindings/display/panel/visionox,rm692e5.yaml | 77 ++ .../device-tree/Bindings/display/renesas,du.yaml | 36 +- .../rockchip/rockchip,rk3588-dw-hdmi-qp.yaml | 3 +- .../Bindings/display/rockchip/rockchip-vop2.yaml | 103 +- .../display/tegra/nvidia,tegra114-mipi.yaml | 1 + .../Bindings/dma/atmel,at91sam9g45-dma.yaml | 68 + .../Bindings/dma/atmel,sama5d4-dma.yaml | 3 + sys/contrib/device-tree/Bindings/dma/fsl,edma.yaml | 8 + .../device-tree/Bindings/dma/fsl,elo-dma.yaml | 137 ++ .../device-tree/Bindings/dma/fsl,elo3-dma.yaml | 125 ++ .../device-tree/Bindings/dma/fsl,eloplus-dma.yaml | 132 ++ .../device-tree/Bindings/dma/fsl,mxs-dma.yaml | 6 + .../device-tree/Bindings/dma/snps,dw-axi-dmac.yaml | 2 + .../Bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml | 3 +- sys/contrib/device-tree/Bindings/dsp/fsl,dsp.yaml | 24 +- .../device-tree/Bindings/dts-coding-style.rst | 8 +- .../Bindings/edac/altr,socfpga-ecc-manager.yaml | 323 +++++ sys/contrib/device-tree/Bindings/eeprom/at24.yaml | 5 +- .../device-tree/Bindings/firmware/fsl,scu.yaml | 12 + .../Bindings/firmware/google,gs101-acpm-ipc.yaml | 50 + .../Bindings/firmware/thead,th1520-aon.yaml | 53 + .../device-tree/Bindings/fsi/ibm,p9-scom.yaml | 1 + .../Bindings/gpio/aspeed,ast2400-gpio.yaml | 6 + .../device-tree/Bindings/gpio/gpio-mvebu.yaml | 10 + .../device-tree/Bindings/gpio/gpio-vf610.yaml | 1 + .../Bindings/gpio/loongson,ls-gpio.yaml | 3 + .../device-tree/Bindings/gpio/nxp,pcf8575.yaml | 37 + .../Bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml | 1 - .../device-tree/Bindings/gpu/arm,mali-bifrost.yaml | 4 + .../device-tree/Bindings/gpu/arm,mali-midgard.yaml | 5 +- .../Bindings/hwinfo/samsung,exynos-chipid.yaml | 2 + .../device-tree/Bindings/hwmon/adi,ad741x.yaml | 1 - .../device-tree/Bindings/hwmon/adi,adm1275.yaml | 1 - .../device-tree/Bindings/hwmon/adi,ltc2991.yaml | 1 - .../device-tree/Bindings/hwmon/gpio-fan.yaml | 3 + .../device-tree/Bindings/hwmon/lltc,ltc2978.yaml | 5 + .../device-tree/Bindings/hwmon/maxim,max20730.yaml | 1 - .../device-tree/Bindings/hwmon/maxim,max6639.yaml | 1 - .../device-tree/Bindings/hwmon/maxim,max6650.yaml | 1 - .../Bindings/hwmon/microchip,emc2305.yaml | 111 ++ .../device-tree/Bindings/hwmon/national,lm90.yaml | 6 + .../device-tree/Bindings/hwmon/ntc-thermistor.yaml | 2 +- .../Bindings/hwmon/nuvoton,nct6775.yaml | 1 - .../Bindings/hwmon/nuvoton,nct7363.yaml | 1 - .../Bindings/hwmon/nuvoton,nct7802.yaml | 1 - .../Bindings/hwmon/pmbus/ti,ucd90320.yaml | 9 + .../device-tree/Bindings/hwmon/ti,adc128d818.yaml | 1 - .../device-tree/Bindings/hwmon/ti,ads7828.yaml | 1 - .../device-tree/Bindings/hwmon/ti,ina2xx.yaml | 31 +- .../device-tree/Bindings/hwmon/ti,lm87.yaml | 1 - .../device-tree/Bindings/hwmon/ti,tmp513.yaml | 1 - .../device-tree/Bindings/hwmon/ti,tps23861.yaml | 1 - .../Bindings/hwmon/winbond,w83781d.yaml | 1 - .../device-tree/Bindings/i2c/i2c-exynos5.yaml | 1 + .../device-tree/Bindings/i2c/i2c-imx-lpi2c.yaml | 1 + sys/contrib/device-tree/Bindings/i2c/i2c-rk3x.yaml | 1 + .../device-tree/Bindings/i2c/qcom,i2c-qup.yaml | 14 + .../Bindings/i2c/samsung,s3c2410-i2c.yaml | 1 + .../Bindings/i2c/snps,designware-i2c.yaml | 5 + .../device-tree/Bindings/i2c/spacemit,k1-i2c.yaml | 61 + .../device-tree/Bindings/i2c/ti,omap4-i2c.yaml | 6 + .../Bindings/i3c/silvaco,i3c-master.yaml | 4 +- .../Bindings/i3c/snps,dw-i3c-master.yaml | 3 + .../device-tree/Bindings/iio/adc/adi,ad4030.yaml | 110 ++ .../device-tree/Bindings/iio/adc/adi,ad4695.yaml | 13 + .../device-tree/Bindings/iio/adc/adi,ad4851.yaml | 153 +++ .../device-tree/Bindings/iio/adc/adi,ad7191.yaml | 149 +++ .../device-tree/Bindings/iio/adc/adi,ad7380.yaml | 4 + .../device-tree/Bindings/iio/adc/adi,axi-adc.yaml | 72 +- .../Bindings/iio/adc/nxp,imx93-adc.yaml | 9 +- .../Bindings/iio/adc/rockchip-saradc.yaml | 2 + .../device-tree/Bindings/iio/adc/ti,ads7138.yaml | 63 + .../Bindings/iio/adc/xlnx,zynqmp-ams.yaml | 3 +- .../device-tree/Bindings/iio/dac/adi,ad5380.yaml | 18 +- .../Bindings/iio/frequency/adf4371.yaml | 5 +- .../Bindings/iio/humidity/sciosense,ens210.yaml | 12 +- .../Bindings/iio/imu/adi,adis16550.yaml | 74 ++ .../Bindings/iio/light/brcm,apds9160.yaml | 78 ++ .../Bindings/iio/light/dynaimage,al3010.yaml | 6 +- .../Bindings/iio/magnetometer/silabs,si7210.yaml | 48 + .../Bindings/iio/temperature/maxim,max31865.yaml | 20 +- .../Bindings/iio/temperature/ti,tmp117.yaml | 6 +- .../Bindings/input/gpio-matrix-keypad.yaml | 103 ++ .../Bindings/input/mediatek,mt6779-keypad.yaml | 2 +- .../Bindings/input/qcom,pm8921-keypad.yaml | 46 +- .../Bindings/input/qcom,pm8921-pwrkey.yaml | 36 +- .../input/touchscreen/apple,z2-multitouch.yaml | 70 + .../Bindings/input/touchscreen/goodix,gt9916.yaml | 1 + .../Bindings/input/touchscreen/ti,ads7843.yaml | 32 +- .../allwinner,sun7i-a20-sc-nmi.yaml | 1 + .../amlogic,meson-gpio-intc.yaml | 19 +- .../interrupt-controller/brcm,bcm2712-msix.yaml | 60 + .../interrupt-controller/fsl,irqsteer.yaml | 1 + .../interrupt-controller/nxp,lpc3220-mic.yaml | 68 + .../interrupt-controller/renesas,rzv2h-icu.yaml | 6 +- .../Bindings/interrupt-controller/riscv,aplic.yaml | 8 + .../interrupt-controller/sophgo,sg2042-msi.yaml | 61 + .../device-tree/Bindings/iommu/arm,smmu.yaml | 3 +- .../device-tree/Bindings/iommu/qcom,iommu.yaml | 1 + .../Bindings/leds/backlight/apple,dwi-bl.yaml | 57 + .../device-tree/Bindings/leds/leds-qcom-lpg.yaml | 4 + .../device-tree/Bindings/leds/ti,tlc59116.yaml | 90 ++ .../device-tree/Bindings/mailbox/fsl,mu.yaml | 7 +- .../Bindings/mailbox/mediatek,gce-mailbox.yaml | 4 + .../Bindings/mailbox/qcom,apcs-kpss-global.yaml | 1 + .../Bindings/media/aspeed,video-engine.yaml | 70 + .../device-tree/Bindings/media/i2c/adv7180.yaml | 4 + .../Bindings/media/i2c/st,st-mipid02.yaml | 2 +- .../Bindings/media/mediatek,vcodec-encoder.yaml | 6 - .../media/mediatek,vcodec-subdev-decoder.yaml | 100 +- .../Bindings/media/mediatek-jpeg-decoder.yaml | 3 +- .../Bindings/media/mediatek-jpeg-encoder.yaml | 2 +- .../Bindings/media/qcom,sc7280-camss.yaml | 10 +- .../Bindings/media/qcom,sdm670-camss.yaml | 318 +++++ .../Bindings/media/qcom,sm8550-camss.yaml | 597 +++++++++ .../Bindings/media/qcom,sm8550-iris.yaml | 158 +++ .../Bindings/media/snps,dw-hdmi-rx.yaml | 132 ++ .../Bindings/media/st,stm32mp25-csi.yaml | 5 +- .../Bindings/memory-controllers/exynos-srom.yaml | 36 +- .../memory-controllers/mc-peripheral-props.yaml | 2 + .../qcom,ebi2-peripheral-props.yaml | 91 ++ .../Bindings/memory-controllers/qcom,ebi2.yaml | 156 +++ .../samsung,exynos4210-srom-peripheral-props.yaml | 35 + .../device-tree/Bindings/mfd/aspeed-lpc.yaml | 2 +- .../Bindings/mfd/atmel,sama5d2-flexcom.yaml | 9 +- .../Bindings/mfd/fsl,mcu-mpc8349emitx.yaml | 53 + .../device-tree/Bindings/mfd/maxim,max77705.yaml | 158 +++ .../device-tree/Bindings/mfd/motorola-cpcap.txt | 6 + .../device-tree/Bindings/mfd/qcom,tcsr.yaml | 1 + .../device-tree/Bindings/mfd/samsung,s2mps11.yaml | 13 + .../device-tree/Bindings/mfd/st,stm32-timers.yaml | 18 +- sys/contrib/device-tree/Bindings/mfd/syscon.yaml | 8 + .../device-tree/Bindings/mips/mti,mips-cm.yaml | 57 + .../Bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 38 +- .../Bindings/mmc/amlogic,meson-mx-sdio.yaml | 3 + .../device-tree/Bindings/mmc/atmel,hsmci.yaml | 106 ++ .../device-tree/Bindings/mmc/fsl-imx-esdhc.yaml | 1 + .../device-tree/Bindings/mmc/mmc-controller.yaml | 2 +- sys/contrib/device-tree/Bindings/mmc/mmc-slot.yaml | 1 - .../device-tree/Bindings/mmc/renesas,sdhi.yaml | 16 + .../device-tree/Bindings/mmc/rockchip-dw-mshc.yaml | 2 + .../Bindings/mmc/samsung,exynos-dw-mshc.yaml | 2 + .../Bindings/mmc/snps,dwcmshc-sdhci.yaml | 5 +- .../Bindings/mtd/arasan,nand-controller.yaml | 2 +- .../device-tree/Bindings/mtd/atmel,dataflash.yaml | 55 + .../device-tree/Bindings/mtd/gpmi-nand.yaml | 7 + .../device-tree/Bindings/mtd/mtd-physmap.yaml | 5 +- sys/contrib/device-tree/Bindings/mtd/mxc-nand.yaml | 8 +- .../Bindings/net/airoha,en7581-eth.yaml | 10 + .../Bindings/net/airoha,en7581-npu.yaml | 84 ++ .../Bindings/net/amlogic,meson-dwmac.yaml | 6 + .../Bindings/net/bluetooth/nxp,88w8987-bt.yaml | 18 +- .../Bindings/net/bluetooth/qualcomm-bluetooth.yaml | 2 + .../device-tree/Bindings/net/can/fsl,flexcan.yaml | 57 +- .../Bindings/net/can/microchip,mcp2510.yaml | 2 +- .../Bindings/net/can/microchip,mcp251xfd.yaml | 2 +- .../device-tree/Bindings/net/cdns,macb.yaml | 7 +- .../device-tree/Bindings/net/dsa/brcm,b53.yaml | 2 + .../Bindings/net/ethernet-controller.yaml | 97 +- .../device-tree/Bindings/net/ethernet-phy.yaml | 6 + .../Bindings/net/faraday,ftgmac100.yaml | 3 + .../device-tree/Bindings/net/fsl,gianfar-mdio.yaml | 112 ++ .../device-tree/Bindings/net/fsl,gianfar.yaml | 248 ++++ .../device-tree/Bindings/net/fsl-tsec-phy.txt | 80 +- .../device-tree/Bindings/net/ieee802154/ca8210.txt | 2 +- .../device-tree/Bindings/net/intel,dwmac-plat.yaml | 6 + .../device-tree/Bindings/net/mediatek-dwmac.yaml | 6 + .../device-tree/Bindings/net/nxp,dwmac-imx.yaml | 8 + sys/contrib/device-tree/Bindings/net/qcom,ipa.yaml | 128 +- .../Bindings/net/realtek,rtl9301-mdio.yaml | 86 ++ .../Bindings/net/realtek,rtl9301-switch.yaml | 175 +++ .../device-tree/Bindings/net/rfkill-gpio.yaml | 5 + .../device-tree/Bindings/net/rockchip-dwmac.yaml | 47 +- .../device-tree/Bindings/net/smsc,lan9115.yaml | 6 +- .../device-tree/Bindings/net/snps,dwmac.yaml | 10 +- .../Bindings/net/sophgo,sg2044-dwmac.yaml | 126 ++ .../device-tree/Bindings/net/stm32-dwmac.yaml | 10 + .../device-tree/Bindings/net/tesla,fsd-ethqos.yaml | 118 ++ .../Bindings/net/toshiba,visconti-dwmac.yaml | 6 + .../Bindings/net/wireless/qcom,ath10k.yaml | 21 + .../Bindings/net/wireless/qcom,ath11k-pci.yaml | 9 +- .../Bindings/net/wireless/qcom,ath11k.yaml | 7 + .../Bindings/net/wireless/qcom,ath12k-wsi.yaml | 13 +- .../Bindings/nvmem/layouts/fixed-cell.yaml | 2 +- .../device-tree/Bindings/nvmem/qcom,qfprom.yaml | 4 + .../device-tree/Bindings/nvmem/rockchip,otp.yaml | 25 + .../Bindings/pci/altr,pcie-root-port.yaml | 10 + .../Bindings/pci/amd,versal2-mdb-host.yaml | 121 ++ .../device-tree/Bindings/pci/brcm,stb-pcie.yaml | 6 +- .../device-tree/Bindings/pci/fsl,imx6q-pcie.yaml | 4 + .../Bindings/pci/fsl,layerscape-pcie-ep.yaml | 3 - .../device-tree/Bindings/pci/fsl,mpc8xxx-pci.yaml | 113 ++ .../Bindings/pci/mediatek-pcie-gen3.yaml | 17 + .../device-tree/Bindings/pci/pci-ep-bus.yaml | 58 + .../device-tree/Bindings/pci/qcom,pcie-ep.yaml | 100 +- .../device-tree/Bindings/pci/qcom,pcie.yaml | 8 +- .../device-tree/Bindings/pci/snps,dw-pcie.yaml | 2 + .../Bindings/pci/xilinx-versal-cpm.yaml | 1 + .../Bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 4 +- .../Bindings/phy/phy-rockchip-naneng-combphy.yaml | 1 + .../Bindings/phy/qcom,ipq5332-uniphy-pcie-phy.yaml | 76 ++ .../Bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 11 +- .../Bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 2 + .../Bindings/phy/rockchip,rk3588-hdptx-phy.yaml | 62 +- .../Bindings/phy/rockchip,rk3588-mipi-dcphy.yaml | 87 ++ .../device-tree/Bindings/phy/samsung,ufs-phy.yaml | 1 + .../Bindings/phy/samsung,usb3-drd-phy.yaml | 21 +- .../Bindings/pinctrl/airoha,en7581-pinctrl.yaml | 3 + .../pinctrl/allwinner,sun55i-a523-pinctrl.yaml | 175 +++ .../Bindings/pinctrl/amlogic,pinctrl-a4.yaml | 126 ++ .../Bindings/pinctrl/atmel,at91-pio4-pinctrl.txt | 1 + .../Bindings/pinctrl/brcm,bcm21664-pinctrl.yaml | 152 +++ .../Bindings/pinctrl/ingenic,pinctrl.yaml | 2 + .../Bindings/pinctrl/qcom,sa8775p-tlmm.yaml | 2 +- .../Bindings/pinctrl/rockchip,pinctrl.yaml | 1 + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 3 + .../Bindings/pinctrl/samsung,pinctrl.yaml | 2 + .../Bindings/pinctrl/sophgo,sg2042-pinctrl.yaml | 129 ++ .../Bindings/platform/huawei,gaokun-ec.yaml | 124 ++ .../Bindings/power/allwinner,sun20i-d1-ppu.yaml | 1 + .../Bindings/power/apple,pmgr-pwrstate.yaml | 5 + .../Bindings/power/qcom,kpss-acc-v2.yaml | 4 +- .../Bindings/power/reset/atmel,sama5d2-shdwc.yaml | 5 + .../Bindings/power/reset/xlnx,zynqmp-power.yaml | 1 - .../Bindings/power/rockchip,power-controller.yaml | 3 + .../Bindings/power/supply/maxim,max77705.yaml | 50 + .../x-powers,axp20x-battery-power-supply.yaml | 20 +- .../device-tree/Bindings/power/wakeup-source.txt | 2 +- sys/contrib/device-tree/Bindings/pps/pps-gpio.yaml | 22 +- .../device-tree/Bindings/pwm/imx-tpm-pwm.yaml | 11 +- .../device-tree/Bindings/pwm/pwm-nexus-node.yaml | 65 + .../device-tree/Bindings/pwm/pwm-rockchip.yaml | 2 + .../device-tree/Bindings/pwm/renesas,tpu-pwm.yaml | 9 - .../Bindings/pwm/sophgo,sg2042-pwm.yaml | 58 + .../Bindings/regulator/nxp,pca9450-regulator.yaml | 51 +- .../Bindings/regulator/richtek,rtq2208.yaml | 3 +- .../Bindings/regulator/samsung,s2mpu05.yaml | 47 + .../Bindings/regulator/ti,tps65219.yaml | 27 +- .../Bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 64 +- .../Bindings/remoteproc/qcom,sm6115-pas.yaml | 2 +- .../Bindings/remoteproc/qcom,sm8150-pas.yaml | 7 + .../Bindings/remoteproc/qcom,sm8550-pas.yaml | 46 +- .../Bindings/remoteproc/qcom,wcnss-pil.yaml | 45 +- .../Bindings/reset/atmel,at91sam9260-reset.yaml | 4 + .../Bindings/reset/xlnx,zynqmp-reset.yaml | 1 - .../device-tree/Bindings/riscv/extensions.yaml | 149 +++ .../device-tree/Bindings/riscv/spacemit.yaml | 1 + .../Bindings/rng/rockchip,rk3588-rng.yaml | 59 + .../device-tree/Bindings/rtc/adi,max31335.yaml | 4 +- .../device-tree/Bindings/rtc/nxp,pcf2127.yaml | 3 +- .../device-tree/Bindings/rtc/qcom-pm8xxx-rtc.yaml | 5 + sys/contrib/device-tree/Bindings/serial/8250.yaml | 2 +- .../device-tree/Bindings/serial/fsl-lpuart.yaml | 1 + .../Bindings/serial/nvidia,tegra264-utc.yaml | 73 + sys/contrib/device-tree/Bindings/serial/pl011.yaml | 3 + .../device-tree/Bindings/serial/samsung_uart.yaml | 4 + .../Bindings/serial/snps-dw-apb-uart.yaml | 21 + .../device-tree/Bindings/serial/sprd-uart.yaml | 9 +- .../Bindings/soc/fsl/fsl,ls1028a-reset.yaml | 2 +- .../device-tree/Bindings/soc/imx/fsl,aips-bus.yaml | 5 +- .../Bindings/soc/qcom/qcom,geni-se.yaml | 5 + .../Bindings/soc/qcom/qcom,pmic-glink.yaml | 1 + .../soc/renesas/renesas,r9a09g057-sys.yaml | 5 +- .../device-tree/Bindings/soc/renesas/renesas.yaml | 16 + .../device-tree/Bindings/soc/rockchip/grf.yaml | 3 + .../Bindings/soc/samsung/exynos-pmu.yaml | 2 + .../Bindings/soc/samsung/exynos-usi.yaml | 100 +- .../soc/samsung/samsung,exynos-sysreg.yaml | 5 + .../device-tree/Bindings/soc/xilinx/xilinx.yaml | 11 +- .../Bindings/sound/allwinner,sun4i-a10-codec.yaml | 6 + .../device-tree/Bindings/sound/atmel,at91-ssc.yaml | 104 ++ .../Bindings/sound/atmel,at91sam9g20ek-wm8731.yaml | 72 + .../Bindings/sound/audio-graph-card2.yaml | 4 + .../device-tree/Bindings/sound/awinic,aw88395.yaml | 1 + .../device-tree/Bindings/sound/dmic-codec.yaml | 3 + .../device-tree/Bindings/sound/everest,es8328.yaml | 11 +- .../device-tree/Bindings/sound/fsl,audmix.yaml | 61 +- .../device-tree/Bindings/sound/fsl,easrc.yaml | 5 +- .../device-tree/Bindings/sound/fsl,imx-asrc.yaml | 15 +- .../Bindings/sound/fsl,imx95-cm7-sof.yaml | 64 + .../device-tree/Bindings/sound/fsl,sai.yaml | 55 + .../device-tree/Bindings/sound/fsl,sof-cpu.yaml | 27 + .../device-tree/Bindings/sound/imx-audio-card.yaml | 14 + .../Bindings/sound/invensense,ics43432.yaml | 51 + .../Bindings/sound/mediatek,mt8188-mt6359.yaml | 9 + .../Bindings/sound/nvidia,tegra30-hda.yaml | 1 + .../Bindings/sound/qcom,wcd937x-sdw.yaml | 36 + .../device-tree/Bindings/sound/rockchip-spdif.yaml | 4 + .../device-tree/Bindings/sound/ti,tas2770.yaml | 1 + .../device-tree/Bindings/sound/ti,tas27xx.yaml | 1 + .../device-tree/Bindings/sound/wlf,wm8904.yaml | 129 ++ .../device-tree/Bindings/sound/wlf,wm8960.yaml | 4 + .../Bindings/sound/xlnx,audio-formatter.yaml | 72 + .../device-tree/Bindings/sound/xlnx,i2s.yaml | 65 + .../device-tree/Bindings/sound/xlnx,spdif.yaml | 77 ++ .../Bindings/spi/adi,axi-spi-engine.yaml | 24 + .../device-tree/Bindings/spi/cdns,qspi-nor.yaml | 25 +- sys/contrib/device-tree/Bindings/spi/fsl,espi.yaml | 65 + sys/contrib/device-tree/Bindings/spi/fsl,spi.yaml | 74 ++ .../Bindings/spi/mediatek,spi-mt65xx.yaml | 2 + .../Bindings/spi/qcom,spi-qpic-snand.yaml | 83 ++ .../device-tree/Bindings/spi/snps,dw-apb-ssi.yaml | 19 +- .../device-tree/Bindings/spi/spi-fsl-lpspi.yaml | 1 + .../device-tree/Bindings/spi/spi-rockchip.yaml | 1 + .../device-tree/Bindings/spi/spi-sg2044-nor.yaml | 52 + .../device-tree/Bindings/spi/spi-zynqmp-qspi.yaml | 3 +- .../Bindings/spi/st,stm32mp25-ospi.yaml | 105 ++ .../device-tree/Bindings/submitting-patches.rst | 19 +- .../Bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 48 +- .../Bindings/thermal/brcm,avs-tmon.yaml | 1 + .../device-tree/Bindings/thermal/imx-thermal.yaml | 40 +- .../Bindings/thermal/imx8mm-thermal.yaml | 8 +- .../device-tree/Bindings/thermal/qcom-tsens.yaml | 18 + .../Bindings/thermal/thermal-zones.yaml | 5 +- .../device-tree/Bindings/timer/arm,twd-timer.yaml | 6 +- .../Bindings/timer/nxp,sysctr-timer.yaml | 11 +- .../device-tree/Bindings/timer/renesas,cmt.yaml | 44 +- .../device-tree/Bindings/timer/renesas,em-sti.yaml | 10 +- .../device-tree/Bindings/timer/renesas,mtu2.yaml | 14 +- .../device-tree/Bindings/timer/renesas,ostm.yaml | 10 +- .../device-tree/Bindings/timer/renesas,tmu.yaml | 22 +- .../Bindings/timer/samsung,exynos4210-mct.yaml | 4 + .../device-tree/Bindings/timer/sifive,clint.yaml | 24 +- .../Bindings/trigger-source/pwm-trigger.yaml | 37 + .../device-tree/Bindings/trivial-devices.yaml | 13 + .../device-tree/Bindings/ufs/renesas,ufs.yaml | 12 + .../Bindings/ufs/rockchip,rk3576-ufshc.yaml | 105 ++ .../device-tree/Bindings/usb/dwc3-xilinx.yaml | 4 +- .../device-tree/Bindings/usb/generic-xhci.yaml | 2 + .../Bindings/usb/mediatek,mtk-xhci.yaml | 4 + .../device-tree/Bindings/usb/mediatek,mtu3.yaml | 12 + .../Bindings/usb/microchip,usb2514.yaml | 35 +- .../Bindings/usb/microchip,usb5744.yaml | 1 - .../device-tree/Bindings/usb/parade,ps8830.yaml | 140 ++ .../device-tree/Bindings/usb/qcom,dwc3.yaml | 2 + .../device-tree/Bindings/usb/richtek,rt1711h.yaml | 3 + .../device-tree/Bindings/usb/rockchip,dwc3.yaml | 19 + .../Bindings/usb/samsung,exynos-dwc3.yaml | 44 +- .../device-tree/Bindings/usb/snps,dwc3-common.yaml | 11 + .../device-tree/Bindings/usb/usb-device.yaml | 6 +- .../device-tree/Bindings/usb/xlnx,usb2.yaml | 1 - .../device-tree/Bindings/vendor-prefixes.yaml | 16 +- .../Bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 2 + .../Bindings/watchdog/fsl-imx7ulp-wdt.yaml | 4 + .../device-tree/Bindings/watchdog/renesas,wdt.yaml | 4 + sys/contrib/device-tree/Bindings/xilinx.txt | 26 - .../dt-bindings/clock/mediatek,mt8188-clk.h | 2 +- .../dt-bindings/clock/mediatek,mtmips-sysc.h | 130 ++ .../include/dt-bindings/clock/qcom,dsi-phy-28nm.h | 9 + .../include/dt-bindings/clock/qcom,gcc-sdm660.h | 2 + .../include/dt-bindings/clock/qcom,ipq9574-gcc.h | 1 + .../include/dt-bindings/clock/qcom,ipq9574-nsscc.h | 152 +++ .../include/dt-bindings/clock/qcom,rpmcc.h | 4 + .../include/dt-bindings/clock/rk3188-cru-common.h | 2 + .../dt-bindings/clock/rockchip,rk3528-cru.h | 453 +++++++ .../dt-bindings/clock/rockchip,rk3562-cru.h | 379 ++++++ .../dt-bindings/clock/rockchip,rk3576-cru.h | 5 + .../dt-bindings/clock/samsung,exynos2200-cmu.h | 431 ++++++ .../dt-bindings/clock/samsung,exynos7870-cmu.h | 324 +++++ .../include/dt-bindings/clock/samsung,exynos990.h | 21 + .../include/dt-bindings/clock/sun50i-h616-ccu.h | 4 + .../include/dt-bindings/clock/sun55i-a523-ccu.h | 189 +++ .../include/dt-bindings/clock/sun55i-a523-r-ccu.h | 37 + .../include/dt-bindings/clock/xlnx-zynqmp-clk.h | 7 + .../include/dt-bindings/iio/adc/adi,ad4695.h | 7 + .../include/dt-bindings/pinctrl/amlogic,pinctrl.h | 46 + .../include/dt-bindings/pinctrl/pinctrl-sg2042.h | 196 +++ .../include/dt-bindings/pinctrl/pinctrl-sg2044.h | 221 ++++ .../dt-bindings/power/allwinner,sun8i-v853-ppu.h | 10 + .../include/dt-bindings/power/qcom-rpmpd.h | 2 +- .../include/dt-bindings/power/thead,th1520-power.h | 19 + .../dt-bindings/reset/imx8mp-reset-audiomix.h | 13 + .../include/dt-bindings/reset/qcom,ipq9574-nsscc.h | 134 ++ .../dt-bindings/reset/rockchip,rk3528-cru.h | 241 ++++ .../dt-bindings/reset/rockchip,rk3562-cru.h | 358 +++++ .../dt-bindings/reset/rockchip,rk3588-cru.h | 41 +- .../include/dt-bindings/reset/sun50i-h616-ccu.h | 2 + .../include/dt-bindings/reset/sun55i-a523-ccu.h | 88 ++ .../include/dt-bindings/reset/sun55i-a523-r-ccu.h | 25 + .../include/dt-bindings/soc/samsung,exynos-usi.h | 17 +- .../include/dt-bindings/sound/qcom,wcd934x.h | 16 + .../arm/allwinner/sun8i-v3s-netcube-kumquat.dts | 276 ++++ .../device-tree/src/arm/allwinner/sun8i-v3s.dtsi | 6 + .../device-tree/src/arm/amlogic/meson8.dtsi | 18 +- .../device-tree/src/arm/amlogic/meson8b-ec100.dts | 2 - .../device-tree/src/arm/amlogic/meson8b-mxq.dts | 2 - .../src/arm/amlogic/meson8b-odroidc1.dts | 2 - .../device-tree/src/arm/amlogic/meson8b.dtsi | 18 +- .../device-tree/src/arm/cirrus/ep7211-edb7211.dts | 2 +- .../arm/intel/ixp/intel-ixp42x-netgear-wg302v1.dts | 40 +- .../src/arm/intel/ixp/intel-ixp4xx.dtsi | 2 +- .../src/arm/marvell/armada-385-clearfog-gtr.dtsi | 8 +- .../src/arm/marvell/armada-388-clearfog-base.dts | 2 +- .../src/arm/marvell/kirkwood-openrd.dtsi | 4 +- .../device-tree/src/arm/microchip/aks-cdu.dts | 2 +- .../device-tree/src/arm/microchip/animeo_ip.dts | 2 +- .../device-tree/src/arm/microchip/at91-foxg20.dts | 2 +- .../src/arm/microchip/at91-qil_a9260.dts | 2 +- .../src/arm/microchip/at91-sam9_l9260.dts | 2 +- .../src/arm/microchip/at91-sama5d27_som1_ek.dts | 4 +- .../src/arm/microchip/at91-sama5d2_ptc_ek.dts | 4 +- .../src/arm/microchip/at91-sama5d2_xplained.dts | 4 +- .../src/arm/microchip/at91-sama5d3_xplained.dts | 4 +- .../src/arm/microchip/at91-sama5d4_ma5d4evk.dts | 4 +- .../src/arm/microchip/at91-sama5d4_xplained.dts | 4 +- .../src/arm/microchip/at91-sama5d4ek.dts | 4 +- .../src/arm/microchip/at91-sama7d65_curiosity.dts | 73 + .../src/arm/microchip/at91-sama7g5ek.dts | 1 + .../device-tree/src/arm/microchip/at91-vinco.dts | 4 +- .../device-tree/src/arm/microchip/at91rm9200.dtsi | 2 +- .../device-tree/src/arm/microchip/at91rm9200ek.dts | 2 +- .../device-tree/src/arm/microchip/at91sam9260.dtsi | 2 +- .../src/arm/microchip/at91sam9260ek.dts | 2 +- .../device-tree/src/arm/microchip/at91sam9261.dtsi | 2 +- .../src/arm/microchip/at91sam9261ek.dts | 2 +- .../device-tree/src/arm/microchip/at91sam9263.dtsi | 2 +- .../src/arm/microchip/at91sam9263ek.dts | 2 +- .../src/arm/microchip/at91sam9g20ek_common.dtsi | 2 +- .../device-tree/src/arm/microchip/at91sam9g45.dtsi | 4 +- .../src/arm/microchip/at91sam9m10g45ek.dts | 4 +- .../device-tree/src/arm/microchip/at91sam9n12.dtsi | 2 +- .../src/arm/microchip/at91sam9n12ek.dts | 2 +- .../device-tree/src/arm/microchip/at91sam9x5.dtsi | 4 +- .../device-tree/src/arm/microchip/ethernut5.dts | 2 +- .../device-tree/src/arm/microchip/evk-pro3.dts | 2 +- .../device-tree/src/arm/microchip/mpa1600.dts | 2 +- .../device-tree/src/arm/microchip/pm9g45.dts | 4 +- .../device-tree/src/arm/microchip/sam9x60.dtsi | 4 +- .../device-tree/src/arm/microchip/sama5d2.dtsi | 4 +- .../device-tree/src/arm/microchip/sama5d3.dtsi | 4 +- .../device-tree/src/arm/microchip/sama5d3xmb.dtsi | 4 +- .../device-tree/src/arm/microchip/sama5d4.dtsi | 4 +- .../device-tree/src/arm/microchip/sama7d65.dtsi | 95 ++ .../device-tree/src/arm/microchip/tny_a9260.dts | 2 +- .../src/arm/microchip/tny_a9260_common.dtsi | 2 +- .../device-tree/src/arm/microchip/tny_a9263.dts | 2 +- .../device-tree/src/arm/microchip/tny_a9g20.dts | 2 +- .../device-tree/src/arm/microchip/usb_a9260.dts | 2 +- .../src/arm/microchip/usb_a9260_common.dtsi | 11 +- .../device-tree/src/arm/microchip/usb_a9263.dts | 11 +- .../src/arm/microchip/usb_a9g20-dab-mmx.dtsi | 10 +- .../device-tree/src/arm/microchip/usb_a9g20.dts | 2 +- .../src/arm/microchip/usb_a9g20_common.dtsi | 2 +- .../src/arm/microchip/usb_a9g20_lpw.dts | 4 +- .../device-tree/src/arm/nvidia/tegra114.dtsi | 34 +- .../device-tree/src/arm/nvidia/tegra124.dtsi | 40 + .../src/arm/nvidia/tegra20-asus-tf101.dts | 11 + sys/contrib/device-tree/src/arm/nxp/imx/imx31.dtsi | 2 +- sys/contrib/device-tree/src/arm/nxp/imx/imx50.dtsi | 2 +- sys/contrib/device-tree/src/arm/nxp/imx/imx51.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx53-mba53.dts | 2 +- .../device-tree/src/arm/nxp/imx/imx53-ppd.dts | 2 +- sys/contrib/device-tree/src/arm/nxp/imx/imx53.dtsi | 2 +- .../src/arm/nxp/imx/imx6dl-colibri-v1.2-aster.dts | 11 + .../arm/nxp/imx/imx6dl-colibri-v1.2-eval-v3.dts | 11 + .../arm/nxp/imx/imx6dl-colibri-v1.2-iris-v2.dts | 11 + .../src/arm/nxp/imx/imx6dl-colibri-v1.2-iris.dts | 11 + .../arm/nxp/imx/imx6q-apalis-v1.2-eval-v1.2.dts | 11 + .../src/arm/nxp/imx/imx6q-apalis-v1.2-eval.dts | 11 + .../arm/nxp/imx/imx6q-apalis-v1.2-ixora-v1.1.dts | 11 + .../arm/nxp/imx/imx6q-apalis-v1.2-ixora-v1.2.dts | 11 + .../src/arm/nxp/imx/imx6q-apalis-v1.2-ixora.dts | 11 + .../src/arm/nxp/imx/imx6qdl-apalis-v1.2.dtsi | 57 + .../src/arm/nxp/imx/imx6qdl-apalis.dtsi | 2 - .../src/arm/nxp/imx/imx6qdl-colibri-v1.2.dtsi | 57 + .../src/arm/nxp/imx/imx6qdl-colibri.dtsi | 2 - .../device-tree/src/arm/nxp/imx/imx6qdl-mba6.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx6qdl-tqma6.dtsi | 25 +- .../src/arm/nxp/imx/imx6qdl-tqma6a.dtsi | 4 +- .../src/arm/nxp/imx/imx6qdl-tqma6b.dtsi | 4 +- .../src/arm/nxp/imx/imx6ul-14x14-evk.dtsi | 32 + .../src/arm/nxp/imx/imx6ul-imx6ull-opos6ul.dtsi | 3 + .../src/arm/nxp/imx/imx6ul-tqma6ul-common.dtsi | 11 +- .../src/arm/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts | 3 +- .../src/arm/nxp/imx/imx6ul-tqma6ul1.dtsi | 2 - .../src/arm/nxp/imx/imx6ul-var-som-concerto.dts | 320 +++++ .../src/arm/nxp/imx/imx6ul-var-som.dtsi | 233 ++++ .../device-tree/src/arm/nxp/imx/imx7-mba7.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx7-tqma7.dtsi | 7 + .../device-tree/src/arm/nxp/imx/imx7d-sdb.dts | 32 + sys/contrib/device-tree/src/arm/nxp/imx/imx7s.dtsi | 56 +- .../device-tree/src/arm/nxp/imx/mba6ulx.dtsi | 2 +- .../device-tree/src/arm/nxp/mxs/imx28-btt3-0.dts | 12 + .../device-tree/src/arm/nxp/mxs/imx28-btt3-1.dts | 8 + .../device-tree/src/arm/nxp/mxs/imx28-btt3-2.dts | 39 + .../device-tree/src/arm/nxp/mxs/imx28-btt3.dtsi | 313 +++++ .../device-tree/src/arm/nxp/mxs/imx28-sps1.dts | 13 +- .../device-tree/src/arm/nxp/vf/vf610-bk4.dts | 4 +- .../device-tree/src/arm/nxp/vf/vf610-colibri.dtsi | 1 - .../src/arm/nxp/vf/vf610-zii-dev-rev-c.dts | 4 +- sys/contrib/device-tree/src/arm/nxp/vf/vfxxx.dtsi | 21 +- .../device-tree/src/arm/renesas/r8a7790-lager.dts | 1 + .../device-tree/src/arm/renesas/r8a7790-stout.dts | 1 + .../device-tree/src/arm/renesas/r8a7790.dtsi | 7 + .../src/arm/renesas/r8a7791-koelsch.dts | 1 + .../device-tree/src/arm/renesas/r8a7791-porter.dts | 1 + .../device-tree/src/arm/renesas/r8a7791.dtsi | 7 + .../src/arm/renesas/r8a7792-blanche.dts | 1 + .../device-tree/src/arm/renesas/r8a7792-wheat.dts | 1 + .../device-tree/src/arm/renesas/r8a7792.dtsi | 6 + .../device-tree/src/arm/renesas/r8a7793-gose.dts | 1 + .../device-tree/src/arm/renesas/r8a7793.dtsi | 7 + .../device-tree/src/arm/renesas/r8a7794-alt.dts | 1 + .../device-tree/src/arm/renesas/r8a7794-silk.dts | 1 + .../device-tree/src/arm/renesas/r8a7794.dtsi | 7 + .../device-tree/src/arm/renesas/r9a06g032.dtsi | 20 +- .../device-tree/src/arm/st/stm32f746-disco.dts | 18 + .../device-tree/src/arm/st/stm32f769-disco.dts | 7 +- sys/contrib/device-tree/src/arm/st/stm32mp131.dtsi | 35 + .../device-tree/src/arm/st/stm32mp133c-prihmb.dts | 496 +++++++ .../src/arm/st/stm32mp135f-dhcor-dhsbc.dts | 30 +- .../device-tree/src/arm/st/stm32mp15-pinctrl.dtsi | 292 ++++ sys/contrib/device-tree/src/arm/st/stm32mp151.dtsi | 1 - .../device-tree/src/arm/st/stm32mp151c-plyaqm.dts | 376 ++++++ .../src/arm/st/stm32mp153c-lxa-fairytux2-gen1.dts | 103 ++ .../src/arm/st/stm32mp153c-lxa-fairytux2-gen2.dts | 147 ++ .../src/arm/st/stm32mp153c-lxa-fairytux2.dtsi | 397 ++++++ .../device-tree/src/arm/st/stm32mp157c-dk2.dts | 2 +- .../src/arm/ti/davinci/da850-lego-ev3.dts | 10 +- .../arm/ti/omap/omap3-evm-processor-common.dtsi | 2 +- .../device-tree/src/arm/ti/omap/omap4-l4.dtsi | 8 +- .../device-tree/src/arm/ti/omap/omap4-panda-a4.dts | 5 + .../device-tree/src/arm/xilinx/zynq-7000.dtsi | 33 +- .../device-tree/src/arm/xilinx/zynq-cc108.dts | 41 +- .../device-tree/src/arm/xilinx/zynq-ebaz4205.dts | 2 + .../device-tree/src/arm/xilinx/zynq-microzed.dts | 10 +- .../device-tree/src/arm/xilinx/zynq-parallella.dts | 1 - .../device-tree/src/arm/xilinx/zynq-zc702.dts | 85 +- .../device-tree/src/arm/xilinx/zynq-zc706.dts | 67 +- .../src/arm/xilinx/zynq-zc770-xm010.dts | 39 +- .../src/arm/xilinx/zynq-zc770-xm011.dts | 31 + .../src/arm/xilinx/zynq-zc770-xm012.dts | 35 + .../src/arm/xilinx/zynq-zc770-xm013.dts | 41 +- .../device-tree/src/arm/xilinx/zynq-zed.dts | 43 +- .../src/arm/xilinx/zynq-zturn-common.dtsi | 8 + .../device-tree/src/arm/xilinx/zynq-zybo-z7.dts | 10 +- .../device-tree/src/arm/xilinx/zynq-zybo.dts | 9 +- .../device-tree/src/arm64/airoha/en7581-evb.dts | 44 + .../device-tree/src/arm64/airoha/en7581.dtsi | 91 ++ .../allwinner/sun50i-a100-allwinner-perf1.dts | 5 + .../src/arm64/allwinner/sun50i-a100-cpu-opp.dtsi | 90 ++ .../src/arm64/allwinner/sun50i-a100.dtsi | 8 + .../src/arm64/allwinner/sun50i-h6-beelink-gs1.dts | 38 +- .../src/arm64/allwinner/sun50i-h6-orangepi-3.dts | 14 +- .../src/arm64/allwinner/sun50i-h6-orangepi.dtsi | 22 +- .../allwinner/sun50i-h700-anbernic-rg35xx-2024.dts | 18 +- .../allwinner/sun50i-h700-anbernic-rg35xx-h.dts | 23 + .../device-tree/src/arm64/amazon/alpine-v2.dtsi | 2 +- .../device-tree/src/arm64/amazon/alpine-v3.dtsi | 2 +- .../src/arm64/amd/amd-overdrive-rev-b0.dts | 2 +- .../src/arm64/amd/amd-overdrive-rev-b1.dts | 61 +- .../src/arm64/amd/amd-seattle-clks.dtsi | 24 +- .../device-tree/src/arm64/amd/amd-seattle-soc.dtsi | 8 +- .../src/arm64/amd/amd-seattle-xgbe-b.dtsi | 32 +- .../device-tree/src/arm64/amlogic/amlogic-a4.dtsi | 21 + .../device-tree/src/arm64/amlogic/amlogic-a5.dtsi | 12 + .../device-tree/src/arm64/amlogic/meson-axg.dtsi | 24 +- .../src/arm64/amlogic/meson-g12-common.dtsi | 33 +- .../src/arm64/amlogic/meson-g12a-fbx8am.dts | 4 - .../src/arm64/amlogic/meson-g12a-radxa-zero.dts | 4 - .../src/arm64/amlogic/meson-g12a-sei510.dts | 4 - .../src/arm64/amlogic/meson-g12a-u200.dts | 2 - .../src/arm64/amlogic/meson-g12a-x96-max.dts | 4 - .../amlogic/meson-g12b-a311d-libretech-cc.dts | 2 - .../src/arm64/amlogic/meson-g12b-bananapi-cm4.dtsi | 4 - .../src/arm64/amlogic/meson-g12b-bananapi.dtsi | 4 - .../src/arm64/amlogic/meson-g12b-dreambox.dtsi | 4 + .../src/arm64/amlogic/meson-g12b-khadas-vim3.dtsi | 4 - .../src/arm64/amlogic/meson-g12b-odroid.dtsi | 4 - .../src/arm64/amlogic/meson-g12b-radxa-zero2.dts | 8 - .../src/arm64/amlogic/meson-g12b-w400.dtsi | 6 - .../src/arm64/amlogic/meson-gx-libretech-pc.dtsi | 6 - .../src/arm64/amlogic/meson-gx-p23x-q20x.dtsi | 2 - .../device-tree/src/arm64/amlogic/meson-gx.dtsi | 8 +- .../src/arm64/amlogic/meson-gxbb-nanopi-k2.dts | 2 - .../src/arm64/amlogic/meson-gxbb-nexbox-a95x.dts | 2 - .../src/arm64/amlogic/meson-gxbb-p20x.dtsi | 2 - .../src/arm64/amlogic/meson-gxbb-vega-s95.dtsi | 2 - .../src/arm64/amlogic/meson-gxbb-wetek.dtsi | 2 - .../device-tree/src/arm64/amlogic/meson-gxbb.dtsi | 25 + .../src/arm64/amlogic/meson-gxl-s805x-p241.dts | 2 - .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 2 - .../amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 2 - .../arm64/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 - .../arm64/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 2 - .../src/arm64/amlogic/meson-gxl-s905x-p212.dtsi | 2 - .../device-tree/src/arm64/amlogic/meson-gxl.dtsi | 25 + .../src/arm64/amlogic/meson-gxm-khadas-vim2.dts | 4 - .../src/arm64/amlogic/meson-gxm-rbox-pro.dts | 2 - .../arm64/amlogic/meson-libretech-cottonwood.dtsi | 6 - .../src/arm64/amlogic/meson-sm1-ac2xx.dtsi | 6 - .../src/arm64/amlogic/meson-sm1-bananapi.dtsi | 2 - .../src/arm64/amlogic/meson-sm1-khadas-vim3l.dts | 2 - .../src/arm64/amlogic/meson-sm1-odroid.dtsi | 2 - .../src/arm64/amlogic/meson-sm1-sei610.dts | 6 - .../device-tree/src/arm64/apple/s5l8960x-5s.dtsi | 9 + .../device-tree/src/arm64/apple/s5l8960x-air1.dtsi | 5 + .../src/arm64/apple/s5l8960x-mini2.dtsi | 5 + .../device-tree/src/arm64/apple/s5l8960x-opp.dtsi | 45 + .../device-tree/src/arm64/apple/s5l8960x-pmgr.dtsi | 610 +++++++++ .../device-tree/src/arm64/apple/s5l8960x.dtsi | 30 + .../device-tree/src/arm64/apple/s5l8965x-opp.dtsi | 45 + .../src/arm64/apple/s800-0-3-common.dtsi | 4 + .../device-tree/src/arm64/apple/s800-0-3-pmgr.dtsi | 757 +++++++++++ .../device-tree/src/arm64/apple/s800-0-3.dtsi | 179 +++ sys/contrib/device-tree/src/arm64/apple/s8000.dtsi | 162 +-- .../device-tree/src/arm64/apple/s8001-common.dtsi | 1 + .../src/arm64/apple/s8001-j98a-j99a.dtsi | 26 + .../device-tree/src/arm64/apple/s8001-j98a.dts | 1 + .../device-tree/src/arm64/apple/s8001-j99a.dts | 1 + .../device-tree/src/arm64/apple/s8001-pmgr.dtsi | 822 ++++++++++++ sys/contrib/device-tree/src/arm64/apple/s8001.dtsi | 81 ++ sys/contrib/device-tree/src/arm64/apple/s8003.dtsi | 63 +- .../device-tree/src/arm64/apple/s800x-6s.dtsi | 4 + .../device-tree/src/arm64/apple/s800x-ipad5.dtsi | 4 + .../device-tree/src/arm64/apple/s800x-se.dtsi | 4 + .../device-tree/src/arm64/apple/spi1-nvram.dtsi | 39 + .../device-tree/src/arm64/apple/t600x-common.dtsi | 7 + .../device-tree/src/arm64/apple/t600x-die0.dtsi | 28 + .../src/arm64/apple/t600x-gpio-pins.dtsi | 14 + .../src/arm64/apple/t600x-j314-j316.dtsi | 2 + .../device-tree/src/arm64/apple/t600x-j375.dtsi | 2 + .../device-tree/src/arm64/apple/t7000-6.dtsi | 8 + .../src/arm64/apple/t7000-handheld.dtsi | 4 + .../device-tree/src/arm64/apple/t7000-j42d.dts | 5 + .../device-tree/src/arm64/apple/t7000-mini4.dtsi | 12 + .../device-tree/src/arm64/apple/t7000-n102.dts | 4 + .../device-tree/src/arm64/apple/t7000-pmgr.dtsi | 641 +++++++++ sys/contrib/device-tree/src/arm64/apple/t7000.dtsi | 73 + .../device-tree/src/arm64/apple/t7001-air2.dtsi | 1 + .../device-tree/src/arm64/apple/t7001-pmgr.dtsi | 650 +++++++++ sys/contrib/device-tree/src/arm64/apple/t7001.dtsi | 65 + .../device-tree/src/arm64/apple/t8010-7.dtsi | 12 + .../device-tree/src/arm64/apple/t8010-common.dtsi | 4 + .../device-tree/src/arm64/apple/t8010-ipad6.dtsi | 12 + .../device-tree/src/arm64/apple/t8010-n112.dts | 4 + .../device-tree/src/arm64/apple/t8010-pmgr.dtsi | 772 +++++++++++ sys/contrib/device-tree/src/arm64/apple/t8010.dtsi | 115 ++ .../device-tree/src/arm64/apple/t8011-common.dtsi | 1 + .../device-tree/src/arm64/apple/t8011-pmgr.dtsi | 806 +++++++++++ .../device-tree/src/arm64/apple/t8011-pro2.dtsi | 8 + sys/contrib/device-tree/src/arm64/apple/t8011.dtsi | 101 ++ .../device-tree/src/arm64/apple/t8012-j132.dts | 14 + .../device-tree/src/arm64/apple/t8012-j137.dts | 14 + .../device-tree/src/arm64/apple/t8012-j140a.dts | 14 + .../device-tree/src/arm64/apple/t8012-j140k.dts | 14 + .../device-tree/src/arm64/apple/t8012-j152f.dts | 15 + .../device-tree/src/arm64/apple/t8012-j160.dts | 14 + .../device-tree/src/arm64/apple/t8012-j174.dts | 14 + .../device-tree/src/arm64/apple/t8012-j185.dts | 14 + .../device-tree/src/arm64/apple/t8012-j185f.dts | 14 + .../device-tree/src/arm64/apple/t8012-j213.dts | 15 + .../device-tree/src/arm64/apple/t8012-j214k.dts | 15 + .../device-tree/src/arm64/apple/t8012-j215.dts | 15 + .../device-tree/src/arm64/apple/t8012-j223.dts | 15 + .../device-tree/src/arm64/apple/t8012-j230k.dts | 14 + .../device-tree/src/arm64/apple/t8012-j680.dts | 15 + .../device-tree/src/arm64/apple/t8012-j780.dts | 15 + .../device-tree/src/arm64/apple/t8012-jxxx.dtsi | 44 + .../device-tree/src/arm64/apple/t8012-pmgr.dtsi | 837 ++++++++++++ .../src/arm64/apple/t8012-touchbar.dtsi | 20 + sys/contrib/device-tree/src/arm64/apple/t8012.dtsi | 281 ++++ .../device-tree/src/arm64/apple/t8015-8.dtsi | 4 + .../device-tree/src/arm64/apple/t8015-common.dtsi | 1 + .../device-tree/src/arm64/apple/t8015-pmgr.dtsi | 931 +++++++++++++ sys/contrib/device-tree/src/arm64/apple/t8015.dtsi | 151 +++ .../device-tree/src/arm64/apple/t8103-j293.dts | 68 + .../device-tree/src/arm64/apple/t8103-jxxx.dtsi | 2 + .../device-tree/src/arm64/apple/t8103-pmgr.dtsi | 18 +- sys/contrib/device-tree/src/arm64/apple/t8103.dtsi | 137 ++ .../device-tree/src/arm64/apple/t8112-j493.dts | 64 + .../device-tree/src/arm64/apple/t8112-jxxx.dtsi | 2 + sys/contrib/device-tree/src/arm64/apple/t8112.dtsi | 105 +- .../device-tree/src/arm64/arm/corstone1000-fvp.dts | 26 + .../device-tree/src/arm64/arm/corstone1000.dtsi | 3 +- .../device-tree/src/arm64/arm/morello-fvp.dts | 77 ++ .../device-tree/src/arm64/arm/morello-sdp.dts | 157 +++ sys/contrib/device-tree/src/arm64/arm/morello.dtsi | 323 +++++ .../src/arm64/exynos/exynos8895-dreamlte.dts | 72 + .../device-tree/src/arm64/exynos/exynos8895.dtsi | 956 +++++++++++++- .../device-tree/src/arm64/exynos/exynos990.dtsi | 92 +- .../src/arm64/exynos/exynosautov920.dtsi | 138 ++ .../src/arm64/exynos/google/gs101-oriole.dts | 267 +--- .../arm64/exynos/google/gs101-pixel-common.dtsi | 294 ++++ .../src/arm64/exynos/google/gs101-raven.dts | 29 + .../device-tree/src/arm64/exynos/google/gs101.dtsi | 66 +- .../src/arm64/freescale/fsl-ls1088a-ten64.dts | 44 + .../src/arm64/freescale/imx8-apalis-v1.1.dtsi | 16 + .../src/arm64/freescale/imx8-ss-hsio.dtsi | 30 +- .../src/arm64/freescale/imx8dxl-evk.dts | 42 + .../src/arm64/freescale/imx8mm-kontron-bl.dts | 10 +- .../src/arm64/freescale/imx8mm-kontron-osm-s.dtsi | 7 +- .../freescale/imx8mm-phyboard-polis-peb-av-10.dtso | 237 ++++ .../imx8mm-phyboard-polis-peb-eval-01.dtso | 72 + .../arm64/freescale/imx8mm-phyboard-polis-rdk.dts | 17 +- .../src/arm64/freescale/imx8mm-phycore-no-eth.dtso | 12 + .../freescale/imx8mm-phycore-no-spiflash.dtso | 16 + .../src/arm64/freescale/imx8mm-phycore-rpmsg.dtso | 58 + .../src/arm64/freescale/imx8mm-phycore-som.dtsi | 22 +- .../src/arm64/freescale/imx8mm-phygate-tauri-l.dts | 11 + .../src/arm64/freescale/imx8mm-tqma8mqml.dtsi | 1 + .../src/arm64/freescale/imx8mm-verdin.dtsi | 46 +- .../src/arm64/freescale/imx8mn-bsh-smm-s2pro.dts | 1 - .../src/arm64/freescale/imx8mn-tqma8mqnl.dtsi | 1 + .../device-tree/src/arm64/freescale/imx8mp-evk.dts | 22 + .../src/arm64/freescale/imx8mp-kontron-osm-s.dtsi | 7 +- .../src/arm64/freescale/imx8mp-nominal.dtsi | 92 ++ .../src/arm64/freescale/imx8mp-skov-basic.dts | 10 + .../src/arm64/freescale/imx8mp-skov-reva.dtsi | 131 +- .../src/arm64/freescale/imx8mp-skov-revb-hdmi.dts | 45 +- .../src/arm64/freescale/imx8mp-skov-revb-lt6.dts | 60 + .../freescale/imx8mp-skov-revb-mi1010ait-1cp1.dts | 30 +- .../src/arm64/freescale/imx8mp-skov-revc-bd500.dts | 91 ++ .../freescale/imx8mp-skov-revc-tian-g07017.dts | 81 ++ .../arm64/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 2 +- .../src/arm64/freescale/imx8mp-tqma8mpql.dtsi | 1 + .../src/arm64/freescale/imx8mp-var-som.dtsi | 12 +- .../device-tree/src/arm64/freescale/imx8mp.dtsi | 29 +- .../src/arm64/freescale/imx8mq-librem5-devkit.dts | 25 +- .../src/arm64/freescale/imx8mq-librem5.dtsi | 26 +- .../src/arm64/freescale/imx8mq-tqma8mq.dtsi | 1 + .../src/arm64/freescale/imx8qm-apalis-v1.1.dtsi | 2 - .../src/arm64/freescale/imx8qm-apalis.dtsi | 2 - .../device-tree/src/arm64/freescale/imx8qm-mek.dts | 112 ++ .../src/arm64/freescale/imx8qm-ss-hsio.dtsi | 24 +- .../src/arm64/freescale/imx8qxp-mek-pcie-ep.dtso | 22 + .../src/arm64/freescale/imx8qxp-mek.dts | 32 + .../src/arm64/freescale/imx8x-colibri.dtsi | 4 +- .../src/arm64/freescale/imx93-kontron-osm-s.dtsi | 5 +- .../arm64/freescale/imx93-tqma9352-mba93xxca.dts | 54 +- .../arm64/freescale/imx93-tqma9352-mba93xxla.dts | 6 +- .../device-tree/src/arm64/freescale/imx93.dtsi | 8 + .../src/arm64/freescale/imx95-15x15-evk.dts | 1130 ++++++++++++++++ .../src/arm64/freescale/imx95-19x19-evk.dts | 83 ++ .../device-tree/src/arm64/freescale/imx95.dtsi | 116 +- .../device-tree/src/arm64/freescale/mba8mx.dtsi | 2 +- .../device-tree/src/arm64/freescale/mba8xx.dtsi | 31 +- .../device-tree/src/arm64/freescale/s32g2.dtsi | 141 ++ .../src/arm64/freescale/s32g274a-evb.dts | 1 + .../src/arm64/freescale/s32g274a-rdb2.dts | 1 + .../device-tree/src/arm64/freescale/s32g3.dtsi | 150 +++ .../src/arm64/freescale/s32g399a-rdb3.dts | 9 + .../src/arm64/freescale/s32gxxxa-evb.dtsi | 222 ++++ .../src/arm64/freescale/s32gxxxa-rdb.dtsi | 170 +++ .../device-tree/src/arm64/freescale/tqma8xx.dtsi | 12 +- .../src/arm64/hisilicon/hi3660-coresight.dtsi | 8 + .../src/arm64/marvell/ac5-98dx25xx.dtsi | 2 +- .../src/arm64/marvell/armada-3720-db.dts | 2 +- .../arm64/marvell/armada-3720-espressobin-emmc.dts | 2 +- .../marvell/armada-3720-espressobin-ultra.dts | 2 +- .../marvell/armada-3720-espressobin-v7-emmc.dts | 2 +- .../arm64/marvell/armada-3720-espressobin-v7.dts | 2 +- .../src/arm64/marvell/armada-3720-espressobin.dts | 2 +- .../src/arm64/marvell/armada-3720-gl-mv1000.dts | 2 +- .../src/arm64/marvell/armada-3720-turris-mox.dts | 2 +- .../src/arm64/marvell/armada-3720-uDPU.dtsi | 8 +- .../device-tree/src/arm64/marvell/armada-372x.dtsi | 3 - .../device-tree/src/arm64/marvell/armada-37xx.dtsi | 4 +- .../device-tree/src/arm64/marvell/armada-7020.dtsi | 6 - .../device-tree/src/arm64/marvell/armada-7040.dtsi | 6 - .../device-tree/src/arm64/marvell/armada-8020.dtsi | 6 - .../arm64/marvell/armada-8040-clearfog-gt-8k.dts | 8 +- .../src/arm64/marvell/armada-8040-puzzle-m801.dts | 2 +- .../device-tree/src/arm64/marvell/armada-8040.dtsi | 6 - .../device-tree/src/arm64/marvell/armada-8080.dtsi | 6 - .../src/arm64/marvell/armada-ap806-dual.dtsi | 3 - .../src/arm64/marvell/armada-ap806-quad.dtsi | 3 - .../src/arm64/marvell/armada-ap806.dtsi | 6 - .../src/arm64/marvell/armada-ap807-quad.dtsi | 3 - .../src/arm64/marvell/armada-ap807.dtsi | 6 - .../src/arm64/marvell/armada-ap80x.dtsi | 33 +- .../arm64/marvell/armada-ap810-ap0-octa-core.dtsi | 1 - .../src/arm64/marvell/armada-ap810-ap0.dtsi | 24 +- .../src/arm64/marvell/armada-cp110.dtsi | 4 - .../src/arm64/marvell/armada-cp115.dtsi | 4 - .../src/arm64/marvell/armada-cp11x.dtsi | 4 +- .../src/arm64/marvell/cn9130-sr-som.dtsi | 3 - .../device-tree/src/arm64/mediatek/mt6359.dtsi | 3 +- .../device-tree/src/arm64/mediatek/mt8173-elm.dtsi | 2 - .../device-tree/src/arm64/mediatek/mt8173.dtsi | 12 +- .../arm64/mediatek/mt8183-kukui-jacuzzi-damu.dts | 9 +- .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 8 +- .../mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts | 8 +- .../mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts | 8 +- .../src/arm64/mediatek/mt8188-geralt.dtsi | 173 ++- .../device-tree/src/arm64/mediatek/mt8188.dtsi | 307 ++++- .../src/arm64/mediatek/mt8195-cherry.dtsi | 184 ++- .../device-tree/src/arm64/mediatek/mt8195.dtsi | 129 ++ .../device-tree/src/arm64/mediatek/mt8365-evk.dts | 245 +++- .../device-tree/src/arm64/mediatek/mt8365.dtsi | 336 +++++ .../src/arm64/mediatek/mt8370-genio-510-evk.dts | 19 + .../device-tree/src/arm64/mediatek/mt8370.dtsi | 64 + .../src/arm64/mediatek/mt8390-genio-700-evk.dts | 1033 +-------------- .../src/arm64/mediatek/mt8390-genio-common.dtsi | 1223 +++++++++++++++++ .../src/arm64/mediatek/mt8395-genio-1200-evk.dts | 102 ++ .../mediatek/mt8395-radxa-nio-12l-8-hd-panel.dtso | 84 ++ .../src/arm64/mediatek/mt8395-radxa-nio-12l.dts | 71 + .../src/arm64/nvidia/tegra210-p2180.dtsi | 13 + .../src/arm64/nvidia/tegra210-p2597.dtsi | 20 +- .../src/arm64/nvidia/tegra210-p3450-0000.dts | 10 - .../device-tree/src/arm64/nvidia/tegra210.dtsi | 10 + .../nvidia/tegra234-p3740-0002+p3701-0008.dts | 10 + .../arm64/nvidia/tegra234-p3768-0000+p3767.dtsi | 7 - .../src/arm64/qcom/sc8280xp-huawei-gaokun3.dts | 163 +++ .../src/arm64/renesas/beacon-renesom-som.dtsi | 1 + .../src/arm64/renesas/condor-common.dtsi | 1 + .../device-tree/src/arm64/renesas/draak.dtsi | 1 + .../device-tree/src/arm64/renesas/ebisu.dtsi | 1 + .../src/arm64/renesas/hihope-common.dtsi | 1 + .../device-tree/src/arm64/renesas/r8a774a1.dtsi | 8 + .../device-tree/src/arm64/renesas/r8a774b1.dtsi | 8 + .../src/arm64/renesas/r8a774c0-cat874.dts | 1 + .../device-tree/src/arm64/renesas/r8a774c0.dtsi | 11 + .../device-tree/src/arm64/renesas/r8a774e1.dtsi | 8 + .../device-tree/src/arm64/renesas/r8a77951.dtsi | 7 + .../device-tree/src/arm64/renesas/r8a77960.dtsi | 8 + .../device-tree/src/arm64/renesas/r8a77961.dtsi | 8 + .../device-tree/src/arm64/renesas/r8a77965.dtsi | 8 + .../renesas/r8a77970-eagle-function-expansion.dtso | 2 +- .../src/arm64/renesas/r8a77970-eagle.dts | 1 + .../src/arm64/renesas/r8a77970-v3msk.dts | 1 + .../device-tree/src/arm64/renesas/r8a77970.dtsi | 7 + .../src/arm64/renesas/r8a77980-v3hsk.dts | 1 + .../device-tree/src/arm64/renesas/r8a77980.dtsi | 7 + .../device-tree/src/arm64/renesas/r8a77990.dtsi | 11 + .../device-tree/src/arm64/renesas/r8a77995.dtsi | 7 + .../src/arm64/renesas/r8a779a0-falcon-cpu.dtsi | 1 + .../device-tree/src/arm64/renesas/r8a779a0.dtsi | 88 ++ .../src/arm64/renesas/r8a779f0-spider-cpu.dtsi | 1 + .../arm64/renesas/r8a779f0-spider-ethernet.dtsi | 104 +- .../device-tree/src/arm64/renesas/r8a779f0.dtsi | 17 +- .../src/arm64/renesas/r8a779f4-s4sk.dts | 69 +- .../device-tree/src/arm64/renesas/r8a779g0.dtsi | 88 +- .../arm64/renesas/r8a779h0-gray-hawk-single.dts | 154 ++- .../device-tree/src/arm64/renesas/r8a779h0.dtsi | 34 +- .../src/arm64/renesas/r9a07g044l2-remi-pi.dts | 339 +++++ .../device-tree/src/arm64/renesas/r9a08g045.dtsi | 29 +- .../renesas/r9a08g045s33-smarc-pmod1-type-3a.dtso | 48 + .../device-tree/src/arm64/renesas/r9a09g047.dtsi | 37 + .../device-tree/src/arm64/renesas/r9a09g057.dtsi | 52 +- .../src/arm64/renesas/r9a09g057h44-rzv2h-evk.dts | 15 + .../src/arm64/renesas/r9a09g057h48-kakip.dts | 136 ++ .../src/arm64/renesas/rzg3e-smarc-som.dtsi | 4 + .../src/arm64/renesas/rzg3s-smarc-som.dtsi | 20 +- .../src/arm64/renesas/rzg3s-smarc-switches.h | 40 + .../device-tree/src/arm64/renesas/rzg3s-smarc.dtsi | 13 + .../src/arm64/renesas/salvator-common.dtsi | 1 + .../ulcb-kf-audio-graph-card-mix+split.dtsi | 73 +- .../ulcb-kf-audio-graph-card2-mix+split.dtsi | 66 +- .../ulcb-kf-simple-audio-card-mix+split.dtsi | 53 +- .../device-tree/src/arm64/renesas/ulcb.dtsi | 1 + .../src/arm64/renesas/white-hawk-cpu-common.dtsi | 1 + .../src/arm64/renesas/white-hawk-csi-dsi.dtsi | 8 +- .../src/arm64/rockchip/px30-engicam-common.dtsi | 3 +- .../src/arm64/rockchip/px30-engicam-ctouch2.dtsi | 2 +- .../rockchip/px30-engicam-px30-core-edimm2.2.dts | 2 +- .../px30-ringneck-haikou-lvds-9904379.dtso | 130 ++ .../rockchip/px30-ringneck-haikou-video-demo.dtso | 190 +++ .../src/arm64/rockchip/px30-ringneck-haikou.dts | 2 + .../src/arm64/rockchip/px30-ringneck.dtsi | 4 - .../src/arm64/rockchip/rk3308-roc-cc.dts | 2 +- .../src/arm64/rockchip/rk3318-a95x-z2.dts | 4 +- .../src/arm64/rockchip/rk3328-rock-pi-e.dts | 8 + .../src/arm64/rockchip/rk3399-nanopi4.dtsi | 2 +- .../rockchip/rk3399-puma-haikou-video-demo.dtso | 166 +++ .../src/arm64/rockchip/rk3399-puma-haikou.dts | 26 +- .../src/arm64/rockchip/rk3399-puma.dtsi | 10 +- .../src/arm64/rockchip/rk3399-roc-pc-plus.dts | 2 +- .../src/arm64/rockchip/rk3399-rock-pi-4.dtsi | 2 +- .../src/arm64/rockchip/rk3528-pinctrl.dtsi | 1397 ++++++++++++++++++++ .../src/arm64/rockchip/rk3528-radxa-e20c.dts | 133 ++ .../device-tree/src/arm64/rockchip/rk3528.dtsi | 378 +++++- .../src/arm64/rockchip/rk3566-bigtreetech-cb2.dtsi | 2 +- .../src/arm64/rockchip/rk3566-pinenote.dtsi | 2 + .../src/arm64/rockchip/rk3566-quartz64-a.dts | 8 +- .../src/arm64/rockchip/rk3566-quartz64-b.dts | 8 +- .../src/arm64/rockchip/rk3568-photonicat.dts | 588 ++++++++ .../src/arm64/rockchip/rk3568-qnap-ts433.dts | 2 + .../src/arm64/rockchip/rk3568-rock-3a.dts | 14 - .../src/arm64/rockchip/rk356x-base.dtsi | 44 +- .../src/arm64/rockchip/rk3576-armsom-sige5.dts | 52 +- .../src/arm64/rockchip/rk3576-evb1-v10.dts | 47 + .../src/arm64/rockchip/rk3576-roc-pc.dts | 736 +++++++++++ .../src/arm64/rockchip/rk3576-rock-4d.dts | 751 +++++++++++ .../device-tree/src/arm64/rockchip/rk3576.dtsi | 229 +++- .../src/arm64/rockchip/rk3588-armsom-lm7.dtsi | 4 + .../src/arm64/rockchip/rk3588-armsom-sige7.dts | 75 ++ .../src/arm64/rockchip/rk3588-base.dtsi | 110 +- .../src/arm64/rockchip/rk3588-coolpi-cm5-evb.dts | 2 +- .../arm64/rockchip/rk3588-coolpi-cm5-genbook.dts | 2 +- .../src/arm64/rockchip/rk3588-coolpi-cm5.dtsi | 4 + .../rockchip/rk3588-edgeble-neu6a-common.dtsi | 4 + .../arm64/rockchip/rk3588-edgeble-neu6a-io.dtsi | 47 + .../src/arm64/rockchip/rk3588-evb1-v10.dts | 50 +- .../src/arm64/rockchip/rk3588-extra.dtsi | 186 +++ .../src/arm64/rockchip/rk3588-fet3588-c.dtsi | 4 + .../arm64/rockchip/rk3588-firefly-core-3588j.dtsi | 4 + .../arm64/rockchip/rk3588-firefly-icore-3588q.dtsi | 443 +++++++ .../arm64/rockchip/rk3588-firefly-itx-3588j.dts | 2 +- .../rockchip/rk3588-friendlyelec-cm3588-nas.dts | 2 +- .../arm64/rockchip/rk3588-friendlyelec-cm3588.dtsi | 8 + .../src/arm64/rockchip/rk3588-h96-max-v58.dts | 30 +- .../rockchip/rk3588-jaguar-pre-ict-tester.dtso | 171 +++ .../src/arm64/rockchip/rk3588-jaguar.dts | 224 +++- .../src/arm64/rockchip/rk3588-mnt-reform2.dts | 336 +++++ .../src/arm64/rockchip/rk3588-nanopc-t6.dtsi | 6 +- .../src/arm64/rockchip/rk3588-ok3588-c.dts | 4 + .../arm64/rockchip/rk3588-orangepi-5-compact.dtsi | 11 +- *** 1230 LINES SKIPPED *** From nobody Sat Nov 22 11:29:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8xD4BfQz6Gwq0 for ; Sat, 22 Nov 2025 11:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8xD3f06z3SCc for ; Sat, 22 Nov 2025 11: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=1763810944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9+NXAmIkvIlLVEXGu5NL0n3HAA3O26HV7I8T/kprTC4=; b=T7sWTLK3JVNO/9KNPMF0WfA9mEGAg/ZRLgXaF+xWnbaY560sbbdrOnV/KhE/BehkiyyGdx EIIoWmvQrvqJWCKWRvvgJrwzITMMpURgwEGpXTLD5q4fT0CZFWTc26f3HOqB4J2/YDKQfF Yy5Sd5G7ccZvVc/WioTbVqlxmKq9cKaMIgYqZWqx64U9vpnecxvPboLeDsVcfup3sYeXHj pmKXyzMHPunuzNpcNA7KLKZF16zucm/glu2e1i7a5473uvGXxye37snMu9ayzeVKLzSwyJ YRwzjKdmUCPzRA48YEzze7wceflsieHSHDE22OW9LzqmmTDm53DatehjBxuiNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9+NXAmIkvIlLVEXGu5NL0n3HAA3O26HV7I8T/kprTC4=; b=mlKrrbXUkiI3uPSJW6PC2KS39SESOFgJh5fTtTsgpNmh31Gz98tVp3VJqaCHIxQdU1aPwS /JIdsuBhpn4PoswdqiKvHeiH7GjDdejv2HtCLxwFLtQNCvWhYXeuNejiX0VGFSrRxc7WQ2 1wSqzreDF5NpTxtG5uyn7LkvJ42anM0ZF13Aj3/t8qVHShsm7xg+XMqK5IPhGUOKJ7khld P3Lbiow/5pwP+Q2QfJ/kSlPfKyj1tfkA8IuZK543+eybIbZppc6nEhvNDp+cmZg6bMabds rnJSbZse1dDIXrDAGCfs71gamIBAQjM7Y5CObcnNBU3RUqnKkKsBYZ4H/eiuVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810944; a=rsa-sha256; cv=none; b=CIZwfZMJN3WKy1ds7PdO8/DoMWsw422tI5VfaxAkezHgbzDegHnF/C9PlbeUxXqwpczrJq ZdZ7KZTOz8OcW8gXAXsa60jsUwgDajPsA4YYjlwerHrKlorYj4ofOEdUBxzRFHi/Hsv+b3 oMOvAwBDsYGLEejyiFbDmtX/yJtk3nLvrKhrX+7pQjb8poQ867EdvnVjaLN3Azza1hj2Zo hPNXaU300oSZvyl4IcqH8ZD0Rk9LkIUk1i7Dr07Oax294Eln2aNtfA1Wa6WoCAp40/LgyV yMWHqAyC+JELjESdPaSB5J61tqi6dW0pKa0y6ypqNeTY8oIMjgVfE3afLvthdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8xD2zZLzvp3 for ; Sat, 22 Nov 2025 11:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ce01 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:29:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: ae5de77ed78a - main - Import device-tree files from Linux 6.16 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae5de77ed78ae54d86cead5604869212e8008e6b Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 11:29:03 +0000 Message-Id: <69219e7f.ce01.3cf709b2@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=ae5de77ed78ae54d86cead5604869212e8008e6b commit ae5de77ed78ae54d86cead5604869212e8008e6b Merge: 8ccc0d235c22 b8aada787cdf Author: Emmanuel Vadot AuthorDate: 2025-11-22 11:28:38 +0000 Commit: Emmanuel Vadot CommitDate: 2025-11-22 11:28:38 +0000 Import device-tree files from Linux 6.16 sys/contrib/device-tree/Bindings/arm/altera.yaml | 1 + .../Bindings/arm/altera/socfpga-clk-manager.yaml | 102 +- sys/contrib/device-tree/Bindings/arm/amlogic.yaml | 26 + .../arm/arm,coresight-static-replicator.yaml | 13 + .../Bindings/arm/atmel,sama5d2-secumod.yaml | 49 + .../device-tree/Bindings/arm/atmel-sysregs.txt | 25 - .../device-tree/Bindings/arm/bcm/bcm2835.yaml | 1 + sys/contrib/device-tree/Bindings/arm/cpus.yaml | 234 +- .../Bindings/arm/freescale/fsl,imx51-m4if.yaml | 41 + sys/contrib/device-tree/Bindings/arm/fsl.yaml | 61 +- .../device-tree/Bindings/arm/intel,socfpga.yaml | 1 + sys/contrib/device-tree/Bindings/arm/mediatek.yaml | 11 + sys/contrib/device-tree/Bindings/arm/psci.yaml | 30 +- sys/contrib/device-tree/Bindings/arm/qcom.yaml | 14 +- sys/contrib/device-tree/Bindings/arm/rockchip.yaml | 37 +- .../device-tree/Bindings/arm/rockchip/pmu.yaml | 2 + .../Bindings/arm/samsung/samsung-boards.yaml | 8 + .../device-tree/Bindings/arm/stm32/stm32.yaml | 9 + sys/contrib/device-tree/Bindings/arm/sunxi.yaml | 25 + sys/contrib/device-tree/Bindings/arm/tegra.yaml | 19 +- sys/contrib/device-tree/Bindings/arm/ti/k3.yaml | 32 + sys/contrib/device-tree/Bindings/arm/vt8500.yaml | 10 +- .../device-tree/Bindings/ata/apm,xgene-ahci.yaml | 58 + .../Bindings/ata/arasan,cf-spear1340.yaml | 70 + .../Bindings/ata/cavium,ebt3000-compact-flash.yaml | 59 + .../Bindings/ata/marvell,orion-sata.yaml | 83 + .../Bindings/ata/rockchip,dwc-ahci.yaml | 3 + sys/contrib/device-tree/Bindings/ata/st,ahci.yaml | 72 + .../device-tree/Bindings/ata/ti,dm816-ahci.yaml | 43 + .../device-tree/Bindings/bus/microsoft,vmbus.yaml | 16 +- .../Bindings/bus/nvidia,tegra210-aconnect.yaml | 1 + .../Bindings/cache/andestech,ax45mp-cache.yaml | 20 +- .../Bindings/cache/marvell,kirkwood-cache.yaml | 45 + .../Bindings/cache/marvell,tauros2-cache.yaml | 39 + .../device-tree/Bindings/cache/qcom,llcc.yaml | 2 + .../device-tree/Bindings/cache/sifive,ccache0.yaml | 44 +- .../clock/allwinner,sun8i-a83t-de2-clk.yaml | 1 + .../Bindings/clock/brcm,bcm2835-aux-clock.yaml | 47 + .../device-tree/Bindings/clock/fsl,vf610-ccm.yaml | 58 + .../Bindings/clock/mediatek,mt8188-clock.yaml | 3 + .../device-tree/Bindings/clock/qcom,videocc.yaml | 20 + .../Bindings/clock/renesas,rzv2h-cpg.yaml | 5 +- .../clock/samsung,exynosautov920-clock.yaml | 69 + .../Bindings/clock/sophgo,cv1800-clk.yaml | 16 +- .../Bindings/clock/sophgo,sg2044-clk.yaml | 99 + .../Bindings/clock/spacemit,k1-pll.yaml | 50 + .../Bindings/clock/thead,th1520-clk-ap.yaml | 17 +- .../Bindings/counter/fsl,ftm-quaddec.yaml | 36 + .../Bindings/crypto/amd,ccp-seattle-v1a.yaml | 38 + .../Bindings/crypto/axis,artpec6-crypto.yaml | 39 + .../Bindings/crypto/brcm,spum-crypto.yaml | 44 + .../Bindings/crypto/fsl,sec-v4.0-mon.yaml | 5 + .../device-tree/Bindings/crypto/fsl,sec-v4.0.yaml | 10 +- .../Bindings/crypto/hisilicon,hip06-sec.yaml | 134 + .../Bindings/crypto/img,hash-accelerator.yaml | 69 + .../Bindings/crypto/marvell,orion-crypto.yaml | 133 + .../device-tree/Bindings/crypto/qcom-qce.yaml | 1 + .../Bindings/display/bridge/renesas,dsi.yaml | 67 +- .../Bindings/display/bridge/ti,sn65dsi83.yaml | 4 - .../Bindings/display/fsl,vf610-tcon.yaml | 43 + .../display/imx/fsl,imx-display-subsystem.yaml | 36 + .../display/imx/fsl,imx-parallel-display.yaml | 74 + .../Bindings/display/imx/fsl,imx6q-ipu.yaml | 97 + .../Bindings/display/imx/fsl,imx6q-ldb.yaml | 193 + .../Bindings/display/imx/fsl,imx6qp-pre.yaml | 55 + .../Bindings/display/imx/fsl,imx6qp-prg.yaml | 54 + .../Bindings/display/mediatek/mediatek,aal.yaml | 4 + .../Bindings/display/mediatek/mediatek,color.yaml | 4 + .../Bindings/display/mediatek/mediatek,merge.yaml | 4 + .../display/mediatek/mediatek,mt8195-hdmi-ddc.yaml | 41 + .../display/mediatek/mediatek,mt8195-hdmi.yaml | 151 + .../display/mediatek/mediatek,padding.yaml | 10 +- .../Bindings/display/msm/dp-controller.yaml | 1 + .../Bindings/display/msm/dsi-controller-main.yaml | 4 + .../Bindings/display/msm/dsi-phy-7nm.yaml | 2 + .../device-tree/Bindings/display/msm/hdmi.yaml | 19 +- .../device-tree/Bindings/display/msm/mdp4.yaml | 9 +- .../Bindings/display/msm/qcom,mdss.yaml | 12 + .../Bindings/display/msm/qcom,sa8775p-mdss.yaml | 181 +- .../Bindings/display/msm/qcom,sar2130p-mdss.yaml | 439 ++ .../Bindings/display/msm/qcom,sc7280-dpu.yaml | 1 + .../Bindings/display/msm/qcom,sm8350-mdss.yaml | 13 +- .../Bindings/display/panel/boe,td4320.yaml | 65 + .../Bindings/display/panel/himax,hx8279.yaml | 75 + .../display/panel/leadtek,ltk050h3146w.yaml | 1 + .../display/panel/leadtek,ltk500hd1829.yaml | 1 + .../Bindings/display/panel/lg,sw43408.yaml | 2 +- .../Bindings/display/panel/novatek,nt37801.yaml | 69 + .../Bindings/display/panel/panel-simple.yaml | 6 + .../Bindings/display/panel/samsung,atna33xc20.yaml | 2 + .../display/panel/truly,nt35597-2K-display.yaml | 97 + .../display/panel/visionox,g2647fb105.yaml | 79 + .../display/rockchip/rockchip,analogix-dp.yaml | 25 +- .../display/rockchip/rockchip,inno-hdmi.yaml | 20 +- .../display/rockchip/rockchip,rk3399-cdn-dp.yaml | 170 + .../Bindings/display/rockchip/rockchip-vop.yaml | 6 - .../Bindings/display/sitronix,st7571.yaml | 73 + .../device-tree/Bindings/dma/arm,dma-350.yaml | 44 + sys/contrib/device-tree/Bindings/dma/fsl,edma.yaml | 4 +- .../Bindings/dma/nvidia,tegra20-apbdma.yaml | 90 + .../Bindings/dma/nvidia,tegra210-adma.yaml | 2 + .../device-tree/Bindings/dma/qcom,bam-dma.yaml | 2 + .../device-tree/Bindings/dma/renesas,rz-dmac.yaml | 107 +- .../device-tree/Bindings/example-schema.yaml | 15 +- .../Bindings/firmware/google,gs101-acpm-ipc.yaml | 35 + .../Bindings/firmware/intel,stratix10-svc.yaml | 93 + .../Bindings/firmware/nxp,imx95-scmi.yaml | 23 + .../fpga/intel,stratix10-soc-fpga-mgr.yaml | 36 + .../Bindings/gpio/atmel,at91rm9200-gpio.yaml | 16 +- .../Bindings/gpio/blaize,blzp1600-gpio.yaml | 77 + .../Bindings/gpio/fairchild,74hc595.yaml | 22 +- .../device-tree/Bindings/gpio/gpio-mxs.yaml | 70 +- .../device-tree/Bindings/gpio/gpio-pca95xx.yaml | 4 + .../device-tree/Bindings/gpio/gpio-vf610.yaml | 7 + .../Bindings/gpio/maxim,max77759-gpio.yaml | 44 + .../Bindings/gpio/nvidia,tegra186-gpio.yaml | 3 + .../device-tree/Bindings/gpio/nxp,pcf8575.yaml | 26 +- .../Bindings/gpio/realtek,otto-gpio.yaml | 8 +- .../device-tree/Bindings/gpio/renesas,em-gio.yaml | 20 +- .../Bindings/gpio/renesas,rcar-gpio.yaml | 24 +- .../device-tree/Bindings/gpio/sifive,gpio.yaml | 6 +- .../Bindings/gpio/spacemit,k1-gpio.yaml | 96 + .../Bindings/gpio/toshiba,gpio-visconti.yaml | 24 +- .../Bindings/gpio/xlnx,gpio-xilinx.yaml | 48 +- .../device-tree/Bindings/gpu/arm,mali-bifrost.yaml | 4 + .../device-tree/Bindings/gpu/brcm,bcm-v3d.yaml | 90 +- .../Bindings/gpu/img,powervr-rogue.yaml | 82 +- .../Bindings/hwinfo/via,vt8500-scc-id.yaml | 37 + .../Bindings/hwmon/pmbus/adi,lt3074.yaml | 50 + .../Bindings/hwmon/pmbus/mps,mpq8785.yaml | 74 + .../Bindings/hwmon/sophgo,sg2042-hwmon-mcu.yaml | 6 +- .../device-tree/Bindings/hwmon/ti,amc6821.yaml | 18 +- .../device-tree/Bindings/hwmon/ti,ina2xx.yaml | 5 + .../device-tree/Bindings/hwmon/ti,tmp102.yaml | 4 + .../device-tree/Bindings/i2c/i2c-mt65xx.yaml | 1 + sys/contrib/device-tree/Bindings/i2c/i2c-rk3x.yaml | 1 + .../Bindings/i2c/nvidia,tegra20-i2c.yaml | 24 +- .../Bindings/i2c/realtek,rtl9301-i2c.yaml | 3 +- .../device-tree/Bindings/i2c/renesas,riic.yaml | 1 + .../Bindings/i2c/snps,designware-i2c.yaml | 12 +- .../device-tree/Bindings/i2c/wm,wm8505-i2c.yaml | 47 + .../Bindings/i3c/silvaco,i3c-master.yaml | 45 +- .../device-tree/Bindings/iio/adc/adi,ad7380.yaml | 11 + .../device-tree/Bindings/iio/adc/adi,ad7476.yaml | 63 +- .../device-tree/Bindings/iio/adc/adi,ad7606.yaml | 14 +- .../Bindings/iio/adc/amlogic,meson-saradc.yaml | 1 + .../Bindings/iio/adc/mediatek,mt2701-auxadc.yaml | 1 + .../Bindings/iio/adc/microchip,mcp3911.yaml | 5 + .../Bindings/iio/adc/nuvoton,nct7201.yaml | 70 + .../Bindings/iio/adc/qcom,spmi-rradc.yaml | 2 +- .../device-tree/Bindings/iio/adc/rohm,bd79104.yaml | 69 + .../device-tree/Bindings/iio/adc/rohm,bd79124.yaml | 114 + .../device-tree/Bindings/iio/adc/st,stm32-adc.yaml | 102 +- .../Bindings/iio/chemical/winsen,mhz19b.yaml | 33 + .../device-tree/Bindings/iio/dac/adi,ad3530r.yaml | 100 + .../device-tree/Bindings/iio/dac/adi,ad3552r.yaml | 2 +- .../device-tree/Bindings/iio/dac/adi,ad7293.yaml | 2 + .../device-tree/Bindings/iio/dac/adi,ltc2664.yaml | 2 +- .../device-tree/Bindings/iio/dac/adi,ltc2672.yaml | 2 +- .../Bindings/iio/dac/microchip,mcp4821.yaml | 2 +- .../device-tree/Bindings/iio/dac/rohm,bd79703.yaml | 35 +- .../Bindings/iio/filter/adi,admv8818.yaml | 20 + .../Bindings/iio/gyroscope/invensense,mpu3050.yaml | 2 +- .../Bindings/iio/imu/adi,adis16550.yaml | 2 +- .../Bindings/iio/imu/invensense,icm42600.yaml | 13 +- .../device-tree/Bindings/iio/light/bh1750.yaml | 6 + .../Bindings/iio/pressure/honeywell,hsc030pa.yaml | 2 +- .../iio/pressure/honeywell,mprls0025pa.yaml | 2 +- .../device-tree/Bindings/input/dlg,da7280.yaml | 248 + .../device-tree/Bindings/input/elan,ekth6915.yaml | 12 +- .../Bindings/input/touchscreen/edt-ft5x06.yaml | 9 +- .../Bindings/interconnect/qcom,msm8939.yaml | 8 +- .../Bindings/interconnect/qcom,msm8953.yaml | 20 +- .../Bindings/interconnect/qcom,msm8974.yaml | 20 +- .../Bindings/interconnect/qcom,osm-l3.yaml | 1 + .../Bindings/interconnect/qcom,rpm.yaml | 12 +- .../Bindings/interconnect/qcom,rpmh.yaml | 28 +- .../Bindings/interconnect/qcom,sdx75-rpmh.yaml | 16 +- .../interrupt-controller/abilis,tb10x-ictl.yaml | 54 + .../interrupt-controller/al,alpine-msix.yaml | 49 + .../interrupt-controller/altr,msi-controller.yaml | 65 + .../interrupt-controller/amazon,al-fic.yaml | 46 + .../Bindings/interrupt-controller/arm,nvic.yaml | 61 + .../arm,versatile-fpga-irq.yaml | 61 + .../aspeed,ast2400-i2c-ic.yaml | 46 + .../aspeed,ast2500-scu-ic.yaml | 48 + .../brcm,bcm2835-armctrl-ic.yaml | 162 + .../interrupt-controller/brcm,bcm6345-l1-intc.yaml | 81 + .../interrupt-controller/cdns,xtensa-pic.yaml | 50 + .../interrupt-controller/chrp,open-pic.yaml | 63 + .../interrupt-controller/cirrus,ep7209-intc.yaml | 71 + .../interrupt-controller/cnxt,cx92755-ic.yaml | 47 + .../interrupt-controller/csky,apb-intc.yaml | 54 + .../Bindings/interrupt-controller/csky,mpintc.yaml | 43 + .../interrupt-controller/econet,en751221-intc.yaml | 78 + .../interrupt-controller/ezchip,nps400-ic.yaml | 34 + .../interrupt-controller/faraday,ftintc010.yaml | 51 + .../Bindings/interrupt-controller/fsl,tzic.yaml | 48 + .../interrupt-controller/google,goldfish-pic.yaml | 47 + .../interrupt-controller/img,pdc-intc.yaml | 79 + .../Bindings/interrupt-controller/jcore,aic.yaml | 43 + .../interrupt-controller/lsi,zevio-intc.yaml | 43 + .../interrupt-controller/marvell,ap806-gicp.yaml | 50 + .../interrupt-controller/marvell,ap806-sei.yaml | 58 + .../marvell,armada-8k-pic.yaml | 52 + .../interrupt-controller/marvell,cp110-icu.yaml | 98 + .../marvell,odmi-controller.yaml | 54 + .../marvell,orion-bridge-intc.yaml | 52 + .../microchip,pic32mzda-evic.yaml | 60 + .../interrupt-controller/nvidia,tegra20-ictlr.yaml | 82 + .../interrupt-controller/opencores,or1k-pic.yaml | 38 + .../interrupt-controller/openrisc,ompic.yaml | 45 + .../interrupt-controller/qca,ar7100-cpu-intc.yaml | 61 + .../interrupt-controller/qca,ar7100-misc-intc.yaml | 52 + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + .../interrupt-controller/snps,arc700-intc.yaml | 42 + .../interrupt-controller/snps,archs-idu-intc.yaml | 48 + .../interrupt-controller/snps,archs-intc.yaml | 48 + .../interrupt-controller/snps,dw-apb-ictl.yaml | 64 + .../interrupt-controller/sophgo,sg2042-msi.yaml | 4 +- .../interrupt-controller/st,spear300-shirq.yaml | 67 + .../technologic,ts4800-irqc.yaml | 49 + .../thead,c900-aclint-mswi.yaml | 1 + .../Bindings/interrupt-controller/ti,cp-intc.yaml | 50 + .../interrupt-controller/ti,keystone-irq.yaml | 63 + .../interrupt-controller/ti,omap-intc-irq.yaml | 52 + .../interrupt-controller/ti,omap4-wugen-mpu.yaml | 55 + .../interrupt-controller/via,vt8500-intc.yaml | 76 + .../device-tree/Bindings/iommu/mediatek,iommu.yaml | 4 + .../Bindings/leds/backlight/ti,lp8864.yaml | 80 + .../device-tree/Bindings/leds/ti,tps61310.yaml | 120 + .../Bindings/mailbox/qcom,apcs-kpss-global.yaml | 170 +- .../Bindings/mailbox/sophgo,cv1800b-mailbox.yaml | 60 + .../Bindings/media/allwinner,sun6i-a31-csi.yaml | 2 +- .../Bindings/media/allwinner,sun6i-a31-isp.yaml | 2 +- .../media/allwinner,sun6i-a31-mipi-csi2.yaml | 2 +- .../device-tree/Bindings/media/amlogic,c3-isp.yaml | 88 + .../Bindings/media/amlogic,c3-mipi-adapter.yaml | 111 + .../Bindings/media/amlogic,c3-mipi-csi2.yaml | 127 + .../Bindings/media/cec/nvidia,tegra114-cec.yaml | 14 +- .../Bindings/media/fsl,imx-capture-subsystem.yaml | 37 + .../Bindings/media/fsl,imx6-mipi-csi2.yaml | 143 + .../device-tree/Bindings/media/i2c/adi,ad5820.yaml | 56 + .../device-tree/Bindings/media/i2c/adi,adp1653.txt | 38 + .../Bindings/media/i2c/adi,adv7180.yaml | 189 + .../device-tree/Bindings/media/i2c/adi,adv7343.txt | 48 + .../Bindings/media/i2c/adi,adv748x.yaml | 212 + .../Bindings/media/i2c/adi,adv7604.yaml | 160 + .../Bindings/media/i2c/aptina,mt9v032.txt | 41 + .../Bindings/media/i2c/maxim,max2175.txt | 59 + .../Bindings/media/i2c/micron,mt9m111.txt | 37 + .../Bindings/media/i2c/nxp,tda1997x.txt | 178 + .../Bindings/media/i2c/onnn,mt9m001.txt | 38 + .../Bindings/media/i2c/ovti,ov02e10.yaml | 152 + .../device-tree/Bindings/media/i2c/ovti,ov2640.txt | 41 + .../device-tree/Bindings/media/i2c/ovti,ov2659.txt | 47 + .../device-tree/Bindings/media/i2c/ovti,ov7670.txt | 55 + .../device-tree/Bindings/media/i2c/ovti,ov7740.txt | 47 + .../device-tree/Bindings/media/i2c/ovti,ov9650.txt | 36 + .../Bindings/media/i2c/sony,imx219.yaml | 112 + .../Bindings/media/i2c/sony,imx290.yaml | 2 +- .../Bindings/media/i2c/sony,imx415.yaml | 2 +- .../device-tree/Bindings/media/i2c/st,vd55g1.yaml | 133 + .../device-tree/Bindings/media/i2c/st,vd56g3.yaml | 139 + .../Bindings/media/i2c/ti,ds90ub953.yaml | 77 +- .../Bindings/media/i2c/ti,ds90ub960.yaml | 16 +- .../device-tree/Bindings/media/i2c/ti,ths8200.txt | 19 + .../device-tree/Bindings/media/i2c/ti,tvp514x.txt | 44 + .../device-tree/Bindings/media/i2c/ti,tvp5150.txt | 157 + .../device-tree/Bindings/media/i2c/ti,tvp7002.txt | 53 + .../Bindings/media/i2c/toshiba,tc358743.txt | 48 + .../Bindings/media/mediatek,mdp3-fg.yaml | 8 +- .../Bindings/media/mediatek,mdp3-hdr.yaml | 8 +- .../Bindings/media/mediatek,mdp3-rsz.yaml | 1 + .../Bindings/media/mediatek,mdp3-stitch.yaml | 8 +- .../Bindings/media/mediatek,mdp3-tcc.yaml | 8 +- .../Bindings/media/mediatek,mdp3-tdshp.yaml | 8 +- .../Bindings/media/mediatek,mdp3-wrot.yaml | 1 + .../Bindings/media/qcom,msm8916-camss.yaml | 8 + .../Bindings/media/qcom,msm8953-camss.yaml | 15 + .../Bindings/media/qcom,msm8996-camss.yaml | 20 + .../Bindings/media/qcom,sc7180-venus.yaml | 7 +- .../Bindings/media/qcom,sc8280xp-camss.yaml | 20 + .../Bindings/media/qcom,sdm660-camss.yaml | 20 + .../Bindings/media/qcom,sdm845-camss.yaml | 20 + .../Bindings/media/qcom,sm8250-camss.yaml | 30 + .../Bindings/media/qcom,sm8550-iris.yaml | 39 +- .../Bindings/media/qcom,x1e80100-camss.yaml | 367 ++ .../device-tree/Bindings/media/renesas,fcp.yaml | 25 +- .../device-tree/Bindings/media/renesas,isp.yaml | 63 +- .../Bindings/media/renesas,rzg2l-cru.yaml | 65 +- .../Bindings/media/renesas,rzg2l-csi2.yaml | 62 +- .../device-tree/Bindings/media/renesas,vsp1.yaml | 25 +- .../memory-controllers/mediatek,smi-common.yaml | 1 + .../memory-controllers/mediatek,smi-larb.yaml | 1 + .../memory-controllers/renesas,rzg3e-xspi.yaml | 135 + .../memory-controllers/st,stm32mp25-omm.yaml | 226 + .../Bindings/mfd/aspeed,ast2x00-scu.yaml | 9 +- .../Bindings/mfd/atmel,at91sam9260-gpbr.yaml | 1 + .../device-tree/Bindings/mfd/brcm,bcm59056.yaml | 76 + sys/contrib/device-tree/Bindings/mfd/iqs62x.yaml | 177 +- .../device-tree/Bindings/mfd/maxim,max77759.yaml | 99 + .../Bindings/mfd/mediatek,mt8195-scpsys.yaml | 1 + .../device-tree/Bindings/mfd/mscc,ocelot.yaml | 6 - .../device-tree/Bindings/mfd/netronix,ntxec.yaml | 39 +- .../device-tree/Bindings/mfd/qcom,tcsr.yaml | 1 + .../device-tree/Bindings/mfd/rohm,bd9571mwv.yaml | 50 +- .../Bindings/mfd/rohm,bd96801-pmic.yaml | 10 +- .../Bindings/mfd/rohm,bd96802-pmic.yaml | 101 + .../device-tree/Bindings/mfd/samsung,s2mps11.yaml | 26 +- .../device-tree/Bindings/mfd/st,stm32-lptimer.yaml | 40 +- sys/contrib/device-tree/Bindings/mfd/syscon.yaml | 7 + .../device-tree/Bindings/mfd/x-powers,axp152.yaml | 202 +- sys/contrib/device-tree/Bindings/mips/cpus.yaml | 3 +- sys/contrib/device-tree/Bindings/mips/econet.yaml | 26 + .../device-tree/Bindings/misc/ti,fpc202.yaml | 94 + .../device-tree/Bindings/mmc/arasan,sdhci.yaml | 22 +- .../device-tree/Bindings/mmc/fsl,esdhc.yaml | 1 + .../Bindings/mmc/marvell,xenon-sdhci.yaml | 27 +- .../Bindings/mmc/microchip,sdhci-pic32.yaml | 66 + sys/contrib/device-tree/Bindings/mmc/mtk-sd.yaml | 2 + .../device-tree/Bindings/mmc/renesas,sdhi.yaml | 4 +- .../device-tree/Bindings/mmc/sdhci-msm.yaml | 1 + .../Bindings/mmc/snps,dwcmshc-sdhci.yaml | 7 +- .../device-tree/Bindings/mmc/spacemit,sdhci.yaml | 53 + .../device-tree/Bindings/mmc/wm,wm8505-sdhc.yaml | 66 + .../device-tree/Bindings/mtd/fsl,vf610-nfc.yaml | 89 + .../mtd/loongson,ls1b-nand-controller.yaml | 72 + .../device-tree/Bindings/mtd/qcom,nandc.yaml | 30 +- sys/contrib/device-tree/Bindings/mux/gpio-mux.yaml | 4 + .../device-tree/Bindings/net/aeonsemi,as21xxx.yaml | 122 + .../Bindings/net/airoha,en7581-eth.yaml | 13 + .../Bindings/net/allwinner,sun8i-a83t-emac.yaml | 1 + .../Bindings/net/bluetooth/nxp,88w8987-bt.yaml | 17 + .../device-tree/Bindings/net/brcm,asp-v2.0.yaml | 23 +- .../device-tree/Bindings/net/brcm,unimac-mdio.yaml | 2 +- .../device-tree/Bindings/net/can/nxp,sja1000.yaml | 4 +- .../Bindings/net/can/renesas,rcar-canfd.yaml | 171 +- .../Bindings/net/dsa/mediatek,mt7530.yaml | 5 + .../Bindings/net/ethernet-controller.yaml | 27 +- .../device-tree/Bindings/net/ethernet-phy.yaml | 10 + .../device-tree/Bindings/net/network-class.yaml | 46 + .../Bindings/net/renesas,r9a09g057-gbeth.yaml | 203 + .../device-tree/Bindings/net/snps,dwmac.yaml | 27 +- .../Bindings/net/sophgo,sg2044-dwmac.yaml | 3 +- .../device-tree/Bindings/net/ti,dp83822.yaml | 4 + .../Bindings/net/ti,k3-am654-cpsw-nuss.yaml | 2 + .../Bindings/net/vertexcom-mse102x.yaml | 2 +- .../device-tree/Bindings/net/via,vt8500-rhine.yaml | 41 + .../Bindings/net/wireless/brcm,bcm4329-fmac.yaml | 2 +- .../Bindings/net/wireless/qcom,ath12k.yaml | 6 + .../Bindings/net/wireless/qcom,ipq5332-wifi.yaml | 315 ++ .../Bindings/net/wireless/realtek,rtl8188e.yaml | 50 + .../Bindings/net/wireless/silabs,wfx.yaml | 5 +- .../Bindings/net/wireless/wireless-controller.yaml | 23 + .../Bindings/nvmem/apple,spmi-nvmem.yaml | 54 + .../Bindings/nvmem/maxim,max77759-nvmem.yaml | 32 + sys/contrib/device-tree/Bindings/opp/opp-v1.yaml | 18 +- .../Bindings/opp/opp-v2-qcom-adreno.yaml | 96 + .../device-tree/Bindings/pci/apple,pcie.yaml | 33 +- .../device-tree/Bindings/pci/brcm,stb-pcie.yaml | 87 +- .../Bindings/pci/cdns,cdns-pcie-ep.yaml | 16 +- .../Bindings/pci/intel,keembay-pcie-ep.yaml | 26 +- .../Bindings/pci/intel,keembay-pcie.yaml | 38 +- .../Bindings/pci/marvell,armada8k-pcie.yaml | 100 + .../Bindings/pci/marvell,kirkwood-pcie.yaml | 277 ++ .../Bindings/pci/microchip,pcie-host.yaml | 56 +- .../Bindings/pci/nvidia,tegra194-pcie-ep.yaml | 2 +- sys/contrib/device-tree/Bindings/pci/pci-ep.yaml | 68 + .../Bindings/pci/qcom,pcie-sa8775p.yaml | 10 +- .../device-tree/Bindings/pci/qcom,pcie-sc7280.yaml | 9 +- .../Bindings/pci/qcom,pcie-sc8180x.yaml | 10 +- .../device-tree/Bindings/pci/qcom,pcie-sm8150.yaml | 9 +- .../device-tree/Bindings/pci/qcom,pcie-sm8250.yaml | 9 +- .../device-tree/Bindings/pci/qcom,pcie-sm8350.yaml | 9 +- .../device-tree/Bindings/pci/qcom,pcie.yaml | 65 +- .../device-tree/Bindings/pci/rcar-pci-ep.yaml | 34 +- .../device-tree/Bindings/pci/rcar-pci-host.yaml | 46 +- .../Bindings/pci/rockchip-dw-pcie-common.yaml | 10 +- .../device-tree/Bindings/pci/rockchip-dw-pcie.yaml | 60 +- .../Bindings/pci/sifive,fu740-pcie.yaml | 2 +- .../Bindings/pci/snps,dw-pcie-common.yaml | 3 +- .../device-tree/Bindings/pci/snps,dw-pcie.yaml | 4 +- .../device-tree/Bindings/pci/v3,v360epc-pci.yaml | 100 + .../Bindings/pci/xilinx-versal-cpm.yaml | 116 +- .../Bindings/phy/brcm,brcmstb-usb-phy.yaml | 5 +- .../Bindings/phy/fsl,imx8mq-usb-phy.yaml | 37 +- .../device-tree/Bindings/phy/mediatek,dsi-phy.yaml | 1 + .../device-tree/Bindings/phy/mediatek,tphy.yaml | 1 + .../device-tree/Bindings/phy/mediatek,xsphy.yaml | 16 + .../Bindings/phy/phy-cadence-torrent.yaml | 3 +- .../Bindings/phy/phy-rockchip-naneng-combphy.yaml | 3 + .../Bindings/phy/phy-rockchip-usbdp.yaml | 3 + .../Bindings/phy/qcom,ipq5332-uniphy-pcie-phy.yaml | 49 +- .../device-tree/Bindings/phy/renesas,usb2-phy.yaml | 8 +- .../Bindings/phy/rockchip,inno-usb2phy.yaml | 4 + .../Bindings/phy/rockchip,pcie3-phy.yaml | 3 + .../Bindings/phy/rockchip,rk3399-pcie-phy.yaml | 45 + .../Bindings/phy/rockchip,rk3399-typec-phy.yaml | 116 + .../Bindings/phy/samsung,exynos2200-eusb2-phy.yaml | 80 + .../Bindings/phy/samsung,usb3-drd-phy.yaml | 40 +- .../Bindings/pinctrl/amlogic,pinctrl-a4.yaml | 8 +- .../Bindings/pinctrl/fsl,imx7ulp-iomuxc1.yaml | 99 + .../Bindings/pinctrl/fsl,vf610-iomuxc.yaml | 83 + .../Bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 95 +- .../Bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 5 - .../Bindings/pinctrl/mediatek,mt6893-pinctrl.yaml | 193 + .../Bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 56 +- .../Bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 70 +- .../Bindings/pinctrl/mediatek,mt8192-pinctrl.yaml | 78 +- .../Bindings/pinctrl/mediatek,mt8196-pinctrl.yaml | 236 + .../Bindings/pinctrl/qcom,qcs615-tlmm.yaml | 2 +- .../Bindings/pinctrl/qcom,qcs8300-tlmm.yaml | 2 +- .../Bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 2 + .../Bindings/pinctrl/renesas,rzn1-pinctrl.yaml | 4 +- .../Bindings/pinctrl/spacemit,k1-pinctrl.yaml | 18 + .../pinctrl/starfive,jh7110-aon-pinctrl.yaml | 2 +- .../pinctrl/starfive,jh7110-sys-pinctrl.yaml | 2 +- .../device-tree/Bindings/pmem/pmem-region.yaml | 48 + .../power/allwinner,sun50i-h6-prcm-ppu.yaml | 42 + .../Bindings/power/mediatek,power-controller.yaml | 2 + .../device-tree/Bindings/power/qcom,rpmpd.yaml | 1 + .../Bindings/power/reset/syscon-reboot.yaml | 42 +- .../Bindings/power/reset/toradex,smarc-ec.yaml | 52 + .../Bindings/power/rockchip,power-controller.yaml | 1 + .../device-tree/Bindings/power/supply/bq24190.yaml | 1 + .../device-tree/Bindings/power/supply/bq25980.yaml | 36 +- .../Bindings/power/supply/ingenic,battery.yaml | 14 +- .../Bindings/power/supply/ltc4162-l.yaml | 18 +- .../Bindings/power/supply/maxim,max77705.yaml | 4 +- .../Bindings/power/supply/maxim,max8971.yaml | 68 + .../Bindings/power/supply/pegatron,chagall-ec.yaml | 49 + .../power/supply/qcom,pmi8998-charger.yaml | 2 +- .../device-tree/Bindings/powerpc/fsl/pmc.yaml | 152 + .../device-tree/Bindings/pwm/adi,axi-pwmgen.yaml | 13 +- .../Bindings/pwm/loongson,ls7a-pwm.yaml | 67 + .../Bindings/pwm/mediatek,pwm-disp.yaml | 1 + .../device-tree/Bindings/pwm/nxp,mc33xs2410.yaml | 118 + .../Bindings/pwm/renesas,rzg2l-gpt.yaml | 378 ++ .../device-tree/Bindings/pwm/via,vt8500-pwm.yaml | 43 + .../Bindings/regulator/adi,adp5055-regulator.yaml | 157 + .../Bindings/regulator/brcm,bcm59054.yaml | 56 + .../Bindings/regulator/brcm,bcm59056.yaml | 51 + .../regulator/mediatek,mt6357-regulator.yaml | 12 +- .../Bindings/regulator/rohm,bd96802-regulator.yaml | 44 + .../Bindings/remoteproc/qcom,sm8150-pas.yaml | 3 + .../Bindings/remoteproc/qcom,sm8350-pas.yaml | 54 +- .../Bindings/remoteproc/st,stm32-rproc.yaml | 4 + .../Bindings/reset/amlogic,meson-reset.yaml | 22 +- .../Bindings/reset/atmel,at91sam9260-reset.yaml | 3 + .../reset/renesas,rzv2h-usb2phy-reset.yaml | 56 + .../Bindings/reset/sophgo,sg2042-reset.yaml | 7 +- .../Bindings/reset/thead,th1520-reset.yaml | 44 + .../device-tree/Bindings/riscv/extensions.yaml | 25 + sys/contrib/device-tree/Bindings/riscv/sophgo.yaml | 4 + .../Bindings/rng/rockchip,rk3588-rng.yaml | 5 +- .../Bindings/rtc/atmel,at91rm9200-rtc.yaml | 4 +- .../Bindings/rtc/atmel,at91sam9260-rtt.yaml | 1 + .../device-tree/Bindings/rtc/nxp,s32g-rtc.yaml | 72 + .../device-tree/Bindings/rtc/qcom-pm8xxx-rtc.yaml | 6 + .../device-tree/Bindings/rtc/renesas,rzn1-rtc.yaml | 8 +- sys/contrib/device-tree/Bindings/serial/8250.yaml | 32 +- .../device-tree/Bindings/serial/8250_omap.yaml | 7 - .../Bindings/serial/altr,juart-1.0.yaml | 19 + .../device-tree/Bindings/serial/altr,uart-1.0.yaml | 25 + .../Bindings/serial/amlogic,meson-uart.yaml | 3 + .../device-tree/Bindings/serial/arm,mps2-uart.yaml | 46 + .../device-tree/Bindings/serial/arm,sbsa-uart.yaml | 38 + .../Bindings/serial/atmel,at91-usart.yaml | 1 + .../Bindings/serial/cirrus,ep7209-uart.yaml | 56 + .../Bindings/serial/cnxt,cx92755-usart.yaml | 48 + .../device-tree/Bindings/serial/lantiq,asc.yaml | 56 + .../Bindings/serial/marvell,armada-3700-uart.yaml | 102 + .../device-tree/Bindings/serial/mediatek,uart.yaml | 1 + .../Bindings/serial/microchip,pic32mzda-uart.yaml | 53 + .../Bindings/serial/nxp,lpc3220-hsuart.yaml | 39 + .../device-tree/Bindings/serial/renesas,rsci.yaml | 78 + .../device-tree/Bindings/serial/snps,arc-uart.yaml | 51 + .../Bindings/serial/snps-dw-apb-uart.yaml | 12 +- .../serial/socionext,milbeaut-usio-uart.yaml | 56 + .../soc/amlogic/amlogic,meson-gx-clk-measure.yaml | 2 + .../Bindings/soc/fsl/fsl,ls1028a-reset.yaml | 2 +- .../device-tree/Bindings/soc/fsl/fsl,qman-fqd.yaml | 4 +- .../soc/google/google,gs101-pmu-intr-gen.yaml | 35 + .../soc/mediatek/mediatek,mt8183-dvfsrc.yaml | 1 + .../device-tree/Bindings/soc/qcom/qcom,rpm.yaml | 15 + .../Bindings/soc/qcom/qcom,rpmh-rsc.yaml | 24 +- .../device-tree/Bindings/soc/qcom/qcom,saw2.yaml | 3 +- .../device-tree/Bindings/soc/qcom/qcom,wcnss.yaml | 5 +- .../soc/renesas/renesas,r9a09g057-sys.yaml | 1 + .../device-tree/Bindings/soc/renesas/renesas.yaml | 32 + .../device-tree/Bindings/soc/rockchip/grf.yaml | 20 +- .../Bindings/soc/samsung/exynos-pmu.yaml | 15 + .../Bindings/soc/sophgo/sophgo,cv1800b-rtc.yaml | 86 + .../soc/sophgo/sophgo,sg2044-top-syscon.yaml | 49 + .../Bindings/soc/spacemit/spacemit,k1-syscon.yaml | 80 + .../soc/ti/ti,j721e-system-controller.yaml | 23 + .../Bindings/sound/audio-graph-card2.yaml | 8 +- .../device-tree/Bindings/sound/cirrus,cs48l32.yaml | 195 + .../device-tree/Bindings/sound/everest,es8375.yaml | 71 + .../device-tree/Bindings/sound/everest,es8389.yaml | 50 + .../device-tree/Bindings/sound/fsl,mqs.yaml | 10 +- .../Bindings/sound/loongson,ls1b-ac97.yaml | 68 + .../device-tree/Bindings/sound/maxim,max98925.yaml | 2 +- .../Bindings/sound/mediatek,mt8188-mt6359.yaml | 7 +- .../sound/mt8186-mt6366-da7219-max98357.yaml | 7 +- .../device-tree/Bindings/sound/mt8195-mt6359.yaml | 4 + .../sound/nvidia,tegra-audio-graph-card.yaml | 1 + .../Bindings/sound/nvidia,tegra186-asrc.yaml | 4 +- .../Bindings/sound/nvidia,tegra186-dspk.yaml | 1 + .../Bindings/sound/nvidia,tegra210-admaif.yaml | 17 + .../Bindings/sound/nvidia,tegra210-adx.yaml | 4 +- .../Bindings/sound/nvidia,tegra210-ahub.yaml | 1 + .../Bindings/sound/nvidia,tegra210-amx.yaml | 6 +- .../Bindings/sound/nvidia,tegra210-dmic.yaml | 1 + .../Bindings/sound/nvidia,tegra210-i2s.yaml | 4 +- .../Bindings/sound/nvidia,tegra210-mbdrc.yaml | 1 + .../Bindings/sound/nvidia,tegra210-mixer.yaml | 1 + .../Bindings/sound/nvidia,tegra210-mvc.yaml | 1 + .../Bindings/sound/nvidia,tegra210-ope.yaml | 1 + .../Bindings/sound/nvidia,tegra210-peq.yaml | 1 + .../Bindings/sound/nvidia,tegra210-sfc.yaml | 1 + .../Bindings/sound/nvidia,tegra30-hda.yaml | 108 +- .../device-tree/Bindings/sound/qcom,sm8250.yaml | 18 + .../device-tree/Bindings/sound/qcom,wcd938x.yaml | 6 + .../device-tree/Bindings/sound/realtek,alc203.yaml | 36 + .../device-tree/Bindings/sound/richtek,rt9123.yaml | 56 + .../Bindings/sound/richtek,rt9123p.yaml | 48 + .../Bindings/sound/rockchip,rk3576-sai.yaml | 144 + .../Bindings/soundwire/qcom,soundwire.yaml | 19 +- sys/contrib/device-tree/Bindings/spi/fsl,dspi.yaml | 14 +- .../Bindings/spi/nuvoton,wpcm450-fiu.yaml | 5 - .../Bindings/spi/nvidia,tegra210-quad.yaml | 18 +- .../Bindings/spi/qcom,spi-qpic-snand.yaml | 8 +- .../device-tree/Bindings/spi/renesas,sh-msiof.yaml | 43 +- .../device-tree/Bindings/spi/samsung,spi.yaml | 1 + .../device-tree/Bindings/spi/snps,dw-apb-ssi.yaml | 4 +- .../Bindings/spi/spi-peripheral-props.yaml | 13 +- .../device-tree/Bindings/spi/spi-rockchip.yaml | 1 + .../device-tree/Bindings/spi/spi-sg2044-nor.yaml | 7 +- .../Bindings/spi/st,stm32mp25-ospi.yaml | 1 + .../device-tree/Bindings/spmi/apple,spmi.yaml | 49 + .../sram/allwinner,sun4i-a10-system-control.yaml | 1 + .../Bindings/thermal/airoha,en7581-thermal.yaml | 48 + .../device-tree/Bindings/thermal/qcom-tsens.yaml | 2 + .../device-tree/Bindings/timer/altr,timer-1.0.yaml | 39 + .../device-tree/Bindings/timer/arm,mps2-timer.yaml | 49 + .../Bindings/timer/cirrus,clps711x-timer.yaml | 45 + .../Bindings/timer/cnxt,cx92755-timer.yaml | 49 + .../Bindings/timer/csky,gx6605s-timer.yaml | 40 + .../device-tree/Bindings/timer/csky,mptimer.yaml | 46 + .../Bindings/timer/econet,en751221-timer.yaml | 80 + .../Bindings/timer/ezchip,nps400-timer.yaml | 45 + .../device-tree/Bindings/timer/fsl,gtm.yaml | 83 + .../device-tree/Bindings/timer/fsl,vf610-pit.yaml | 54 + .../Bindings/timer/img,pistachio-gptimer.yaml | 69 + .../device-tree/Bindings/timer/jcore,pit.yaml | 43 + .../Bindings/timer/lsi,zevio-timer.yaml | 56 + .../Bindings/timer/marvell,armada-370-timer.yaml | 88 + .../Bindings/timer/marvell,orion-timer.yaml | 43 + .../device-tree/Bindings/timer/nxp,s32g2-stm.yaml | 64 + .../device-tree/Bindings/timer/renesas,ostm.yaml | 12 +- .../device-tree/Bindings/timer/sifive,clint.yaml | 1 + .../device-tree/Bindings/timer/snps,arc-timer.yaml | 45 + .../Bindings/timer/snps,archs-gfrc.yaml | 30 + .../device-tree/Bindings/timer/snps,archs-rtc.yaml | 30 + .../Bindings/timer/socionext,milbeaut-timer.yaml | 40 + .../device-tree/Bindings/timer/st,spear-timer.yaml | 36 + .../Bindings/timer/thead,c900-aclint-mtimer.yaml | 1 + .../Bindings/timer/ti,keystone-timer.yaml | 63 + .../device-tree/Bindings/trivial-devices.yaml | 8 +- sys/contrib/device-tree/Bindings/ufs/qcom,ufs.yaml | 2 + .../Bindings/usb/chipidea,usb2-common.yaml | 3 + .../Bindings/usb/chipidea,usb2-imx.yaml | 24 +- .../device-tree/Bindings/usb/cypress,hx3.yaml | 19 +- .../device-tree/Bindings/usb/dwc3-xilinx.yaml | 2 + .../device-tree/Bindings/usb/fsl,usbmisc.yaml | 23 +- .../device-tree/Bindings/usb/generic-ehci.yaml | 1 + .../device-tree/Bindings/usb/parade,ps5511.yaml | 108 + .../device-tree/Bindings/usb/parade,ps8830.yaml | 7 +- .../device-tree/Bindings/usb/qcom,dwc3.yaml | 16 +- .../device-tree/Bindings/usb/qcom,snps-dwc3.yaml | 622 +++ .../device-tree/Bindings/usb/realtek,rts5411.yaml | 52 +- .../device-tree/Bindings/usb/renesas,usbhs.yaml | 7 +- .../device-tree/Bindings/usb/rockchip,dwc3.yaml | 2 +- .../Bindings/usb/samsung,exynos-dwc3.yaml | 30 + .../device-tree/Bindings/usb/smsc,usb3503.yaml | 90 +- .../device-tree/Bindings/usb/snps,dwc3-common.yaml | 6 + .../device-tree/Bindings/usb/ti,usb8041.yaml | 4 +- .../device-tree/Bindings/usb/usb-device.yaml | 3 +- sys/contrib/device-tree/Bindings/usb/usb-hub.yaml | 84 + .../device-tree/Bindings/usb/usb-switch.yaml | 15 +- .../device-tree/Bindings/vendor-prefixes.yaml | 20 + .../device-tree/Bindings/virtio/pci-iommu.yaml | 10 +- .../device-tree/Bindings/watchdog/fsl,scu-wdt.yaml | 1 + .../device-tree/Bindings/watchdog/fsl-imx-wdt.yaml | 2 + .../Bindings/watchdog/nxp,s32g2-swt.yaml | 54 + .../device-tree/Bindings/watchdog/renesas,wdt.yaml | 4 +- .../device-tree/Bindings/watchdog/samsung-wdt.yaml | 11 +- .../device-tree/Bindings/watchdog/snps,dw-wdt.yaml | 1 + .../device-tree/Bindings/writing-schema.rst | 11 +- .../device-tree/include/dt-bindings/arm/qcom,ids.h | 1 + .../dt-bindings/clock/qcom,sm6350-videocc.h | 27 + .../dt-bindings/clock/renesas,r9a09g047-cpg.h | 3 + .../dt-bindings/clock/renesas,r9a09g056-cpg.h | 24 + .../dt-bindings/clock/renesas,r9a09g057-cpg.h | 4 + .../include/dt-bindings/clock/rk3036-cru.h | 1 + .../dt-bindings/clock/rockchip,rk3528-cru.h | 6 + .../dt-bindings/clock/rockchip,rk3576-cru.h | 10 + .../dt-bindings/clock/samsung,exynosautov920.h | 51 + .../include/dt-bindings/clock/sophgo,sg2044-clk.h | 153 + .../include/dt-bindings/clock/sophgo,sg2044-pll.h | 27 + .../include/dt-bindings/clock/spacemit,k1-syscon.h | 247 + .../include/dt-bindings/clock/stm32h7-clks.h | 4 +- .../include/dt-bindings/clock/sun8i-v3s-ccu.h | 2 +- .../dt-bindings/clock/thead,th1520-clk-ap.h | 34 + .../include/dt-bindings/iio/adc/adi,ad7606.h | 9 + .../include/dt-bindings/input/linux-event-codes.h | 3 +- .../dt-bindings/interconnect/qcom,sm8650-rpmh.h | 1 + .../memory/mediatek,mt6893-memory-port.h | 288 ++ .../dt-bindings/power/mediatek,mt6893-power.h | 35 + .../dt-bindings/power/rockchip,rk3562-power.h | 35 + .../include/dt-bindings/reset/sun50i-h616-ccu.h | 1 + .../include/dt-bindings/reset/thead,th1520-reset.h | 16 + .../include/dt-bindings/sound/cs48l32.h | 20 + .../dt-bindings/sound/qcom,q6dsp-lpass-ports.h | 1 + .../src/arm/allwinner/sun7i-a20-bananapi.dts | 27 + .../device-tree/src/arm/allwinner/sun8i-a83t.dtsi | 4 +- .../src/arm/allwinner/sun8i-h3-nanopi-neo-air.dts | 2 +- .../device-tree/src/arm/allwinner/sun8i-h3.dtsi | 2 +- .../device-tree/src/arm/allwinner/sun8i-r40.dtsi | 2 +- .../device-tree/src/arm/allwinner/sun8i-v3s.dtsi | 2 +- .../src/arm/amlogic/meson8-fernsehfee3.dts | 306 ++ .../device-tree/src/arm/amlogic/meson8.dtsi | 22 +- .../device-tree/src/arm/amlogic/meson8b.dtsi | 4 +- .../src/arm/broadcom/bcm2166x-common.dtsi | 7 + .../src/arm/broadcom/bcm2166x-pinctrl.dtsi | 297 ++ .../device-tree/src/arm/broadcom/bcm28155-ap.dts | 68 +- .../src/arm/broadcom/bcm2837-rpi-2-b.dts | 130 + .../intel/socfpga/socfpga_cyclone5_de10nano.dts | 95 + .../device-tree/src/arm/marvell/kirkwood-db.dtsi | 2 +- .../src/arm/marvell/kirkwood-dir665.dts | 2 +- .../src/arm/marvell/kirkwood-mv88f6281gtw-ge.dts | 2 +- .../device-tree/src/arm/marvell/kirkwood.dtsi | 2 +- .../device-tree/src/arm/marvell/orion5x.dtsi | 4 +- .../device-tree/src/arm/mediatek/mt2701-evb.dts | 1 + .../src/arm/microchip/at91-sama7d65_curiosity.dts | 209 + .../src/arm/microchip/at91-sama7g54_curiosity.dts | 32 + .../src/arm/microchip/at91sam9263ek.dts | 2 +- .../device-tree/src/arm/microchip/sama7d65.dtsi | 346 ++ .../device-tree/src/arm/microchip/tny_a9263.dts | 2 +- .../device-tree/src/arm/microchip/usb_a9260.dts | 8 - .../src/arm/microchip/usb_a9260_common.dtsi | 9 + .../device-tree/src/arm/microchip/usb_a9263.dts | 4 +- .../device-tree/src/arm/microchip/usb_a9g20.dts | 17 +- .../src/arm/microchip/usb_a9g20_lpw.dts | 10 +- .../src/arm/nuvoton/nuvoton-common-npcm7xx.dtsi | 108 + .../src/arm/nuvoton/nuvoton-npcm730-gbs.dts | 12 +- .../arm/nuvoton/nuvoton-npcm750-runbmc-olympus.dts | 120 +- .../src/arm/nuvoton/nuvoton-npcm750.dtsi | 65 + .../src/arm/nvidia/tegra124-apalis-eval.dts | 5 - .../src/arm/nvidia/tegra124-apalis-v1.2-eval.dts | 5 - .../device-tree/src/arm/nvidia/tegra20.dtsi | 2 +- .../src/arm/nvidia/tegra30-apalis-eval.dts | 5 - .../src/arm/nvidia/tegra30-apalis-v1.1-eval.dts | 5 - .../src/arm/nvidia/tegra30-asus-tf300tl.dts | 857 ++++ .../device-tree/src/arm/nvidia/tegra30.dtsi | 2 +- sys/contrib/device-tree/src/arm/nxp/imx/imx25.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx31-lite.dts | 2 +- sys/contrib/device-tree/src/arm/nxp/imx/imx31.dtsi | 2 +- sys/contrib/device-tree/src/arm/nxp/imx/imx35.dtsi | 2 +- .../arm/nxp/imx/imx51-digi-connectcore-som.dtsi | 2 +- sys/contrib/device-tree/src/arm/nxp/imx/imx51.dtsi | 4 +- sys/contrib/device-tree/src/arm/nxp/imx/imx53.dtsi | 4 +- .../src/arm/nxp/imx/imx6q-apalis-eval.dts | 9 - .../device-tree/src/arm/nxp/imx/imx6q-mccmon6.dts | 2 +- .../src/arm/nxp/imx/imx6qdl-sabreauto.dtsi | 2 +- .../device-tree/src/arm/nxp/imx/imx6qp-prtwd3.dts | 2 +- .../src/arm/nxp/imx/imx7d-remarkable2.dts | 2 +- sys/contrib/device-tree/src/arm/nxp/imx/imx7d.dtsi | 6 +- sys/contrib/device-tree/src/arm/nxp/imx/imx7s.dtsi | 1 - .../device-tree/src/arm/nxp/lpc/lpc32xx.dtsi | 2 +- .../nxp/ls/ls1021a-tqmls1021a-mbls1021a-hdmi.dtso | 32 + ...021a-tqmls1021a-mbls1021a-lvds-tm070jvhg33.dtso | 47 + ...1021a-tqmls1021a-mbls1021a-rgb-cdtech-dc44.dtso | 55 + ...1021a-tqmls1021a-mbls1021a-rgb-cdtech-fc21.dtso | 55 + .../arm/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts | 5 +- .../src/arm/nxp/ls/ls1021a-tqmls1021a.dtsi | 3 +- .../device-tree/src/arm/nxp/mxs/imx23-sansa.dts | 6 +- .../device-tree/src/arm/nxp/mxs/imx23-xfi3.dts | 12 +- .../device-tree/src/arm/nxp/mxs/imx28-btt3.dtsi | 2 +- .../device-tree/src/arm/nxp/mxs/imx28-cfa10036.dts | 6 +- .../src/arm/qcom/msm8226-motorola-falcon.dts | 22 +- sys/contrib/device-tree/src/arm/qcom/msm8926.dtsi | 11 + .../arm/qcom/qcom-apq8026-samsung-matisse-wifi.dts | 1 + .../arm/qcom/qcom-apq8026-samsung-milletwifi.dts | 2 + .../src/arm/qcom/qcom-apq8064-ifc6410.dts | 1 - .../src/arm/qcom/qcom-apq8064-lg-nexus4-mako.dts | 359 ++ .../device-tree/src/arm/qcom/qcom-apq8064.dtsi | 104 +- .../src/arm/qcom/qcom-apq8074-dragonboard.dts | 4 +- .../src/arm/qcom/qcom-ipq4018-ap120c-ac.dtsi | 2 +- .../src/arm/qcom/qcom-ipq4018-jalapeno.dts | 4 +- .../src/arm/qcom/qcom-ipq4019-ap.dk07.1.dtsi | 2 +- .../device-tree/src/arm/qcom/qcom-ipq4019.dtsi | 6 +- .../arm/qcom/qcom-msm8226-microsoft-common.dtsi | 6 +- .../arm/qcom/qcom-msm8226-microsoft-dempsey.dts | 1 + .../arm/qcom/qcom-msm8226-microsoft-makepeace.dts | 1 + .../arm/qcom/qcom-msm8226-microsoft-moneypenny.dts | 1 + .../qcom/qcom-msm8226-samsung-matisse-common.dtsi | 19 +- .../device-tree/src/arm/qcom/qcom-msm8226.dtsi | 164 +- .../src/arm/qcom/qcom-msm8926-htc-memul.dts | 14 +- .../qcom/qcom-msm8926-microsoft-superman-lte.dts | 1 + .../src/arm/qcom/qcom-msm8926-microsoft-tesla.dts | 1 + .../arm/qcom/qcom-msm8926-motorola-peregrine.dts | 2 +- .../arm/qcom/qcom-msm8926-samsung-matisselte.dts | 5 + .../device-tree/src/arm/qcom/qcom-msm8960.dtsi | 101 +- .../device-tree/src/arm/qcom/qcom-msm8974.dtsi | 21 +- .../device-tree/src/arm/qcom/qcom-sdx55.dtsi | 2 +- .../device-tree/src/arm/qcom/qcom-sdx65.dtsi | 2 +- .../src/arm/renesas/r9a06g032-rzn1d400-db.dts | 124 +- .../src/arm/renesas/r9a06g032-rzn1d400-eb.dts | 244 + .../device-tree/src/arm/renesas/r9a06g032.dtsi | 46 + .../device-tree/src/arm/rockchip/rk3036-kylin.dts | 18 + .../device-tree/src/arm/rockchip/rk3036.dtsi | 40 +- .../src/arm/rockchip/rk3066a-marsboard.dts | 37 + .../device-tree/src/arm/rockchip/rk3128.dtsi | 8 +- .../device-tree/src/arm/rockchip/rk3188.dtsi | 1 - .../device-tree/src/arm/rockchip/rk322x.dtsi | 1 - .../device-tree/src/arm/rockchip/rk3288.dtsi | 5 +- .../device-tree/src/arm/rockchip/rv1108.dtsi | 1 - .../src/arm/rockchip/rv1126-sonoff-ihost.dtsi | 14 +- .../device-tree/src/arm/samsung/s5pv210-aries.dtsi | 2 +- .../device-tree/src/arm/st/spear1310-evb.dts | 8 +- .../device-tree/src/arm/st/spear1340-evb.dts | 8 +- sys/contrib/device-tree/src/arm/st/spear13xx.dtsi | 8 +- .../device-tree/src/arm/st/spear300-evb.dts | 6 +- .../device-tree/src/arm/st/spear310-evb.dts | 6 +- .../device-tree/src/arm/st/spear320-evb.dts | 6 +- .../device-tree/src/arm/st/spear320-hmi.dts | 6 +- sys/contrib/device-tree/src/arm/st/spear3xx.dtsi | 6 +- sys/contrib/device-tree/src/arm/st/spear600.dtsi | 8 +- sys/contrib/device-tree/src/arm/st/stm32f746.dtsi | 34 + .../device-tree/src/arm/st/stm32h7-pinctrl.dtsi | 34 +- sys/contrib/device-tree/src/arm/st/stm32h743.dtsi | 8 + .../device-tree/src/arm/st/stm32h743i-disco.dts | 2 +- .../device-tree/src/arm/st/stm32h743i-eval.dts | 2 +- .../device-tree/src/arm/st/stm32h747i-disco.dts | 136 + .../device-tree/src/arm/st/stm32h750i-art-pi.dts | 8 +- sys/contrib/device-tree/src/arm/st/stm32mp131.dtsi | 5 + sys/contrib/device-tree/src/arm/st/stm32mp133.dtsi | 2 + .../device-tree/src/arm/st/stm32mp135f-dk.dts | 2 +- .../src/arm/st/stm32mp13xx-dhcor-som.dtsi | 2 +- .../device-tree/src/arm/st/stm32mp157a-iot-box.dts | 2 +- .../device-tree/src/arm/st/stm32mp157c-dk2.dts | 2 +- .../src/arm/st/stm32mp157c-ultra-fly-sbc.dts | 1152 +++++ .../src/arm/st/stm32mp15xx-dhcor-avenger96.dtsi | 2 +- .../device-tree/src/arm/ti/davinci/da850-evm.dts | 2 +- .../device-tree/src/arm/ti/omap/am335x-evm.dts | 2 +- .../device-tree/src/arm/ti/omap/omap3-n900.dts | 2 - sys/contrib/device-tree/src/arm/ti/omap/omap3.dtsi | 4 +- .../device-tree/src/arm/ti/omap/omap4-l4.dtsi | 4 +- .../src/arm/ti/omap/omap4-panda-common.dtsi | 39 +- .../device-tree/src/arm/ti/omap/omap4-panda-es.dts | 32 - .../device-tree/src/arm/ti/omap/omap5-l4.dtsi | 4 +- sys/contrib/device-tree/src/arm/vt8500/vt8500.dtsi | 9 +- sys/contrib/device-tree/src/arm/vt8500/wm8505.dtsi | 9 +- sys/contrib/device-tree/src/arm/vt8500/wm8650.dtsi | 9 +- sys/contrib/device-tree/src/arm/vt8500/wm8750.dtsi | 9 +- sys/contrib/device-tree/src/arm/vt8500/wm8850.dtsi | 9 +- .../device-tree/src/arm/vt8500/wm8950-apc-rock.dts | 21 + sys/contrib/device-tree/src/arm/vt8500/wm8950.dtsi | 11 + .../device-tree/src/arm64/airoha/en7581-evb.dts | 30 + .../device-tree/src/arm64/airoha/en7581.dtsi | 105 + .../src/arm64/allwinner/sun50i-a100.dtsi | 3 + .../allwinner/sun50i-a133-liontron-h-a133l.dts | 211 + .../src/arm64/allwinner/sun50i-a64-pine64.dts | 12 + .../allwinner/sun50i-a64-sopine-baseboard.dts | 19 + .../src/arm64/allwinner/sun50i-h313-tanix-tx1.dts | 5 + .../device-tree/src/arm64/allwinner/sun50i-h5.dtsi | 6 +- .../src/arm64/allwinner/sun50i-h6-orangepi-3.dts | 2 +- .../arm64/allwinner/sun50i-h6-orangepi-lite2.dts | 2 +- .../device-tree/src/arm64/allwinner/sun50i-h6.dtsi | 4 - .../allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 5 + .../arm64/allwinner/sun50i-h616-orangepi-zero.dtsi | 4 + .../arm64/allwinner/sun50i-h616-orangepi-zero2.dts | 4 + .../src/arm64/allwinner/sun50i-h616-x96-mate.dts | 5 + .../src/arm64/allwinner/sun50i-h616.dtsi | 21 + .../allwinner/sun50i-h618-longan-module-3h.dtsi | 5 + .../allwinner/sun50i-h618-orangepi-zero2w.dts | 5 + .../arm64/allwinner/sun50i-h618-orangepi-zero3.dts | 4 + .../allwinner/sun50i-h618-transpeed-8k618-t.dts | 5 + .../allwinner/sun50i-h618-yuzukihd-chameleon.dts | 222 + .../allwinner/sun50i-h700-anbernic-rg35xx-2024.dts | 10 +- .../src/arm64/allwinner/sun55i-a523.dtsi | 639 +++ .../src/arm64/allwinner/sun55i-a527-cubie-a5e.dts | 318 ++ .../src/arm64/allwinner/sun55i-h728-x96qpro+.dts | 287 ++ .../src/arm64/allwinner/sun55i-t527-avaota-a1.dts | 327 ++ .../src/arm64/amlogic/amlogic-a4-reset.h | 93 + .../device-tree/src/arm64/amlogic/amlogic-a4.dtsi | 133 + .../src/arm64/amlogic/amlogic-a5-reset.h | 95 + .../device-tree/src/arm64/amlogic/amlogic-a5.dtsi | 8 + .../device-tree/src/arm64/amlogic/amlogic-c3.dtsi | 5 + .../src/arm64/amlogic/amlogic-s6-s905x5-bl209.dts | 42 + .../device-tree/src/arm64/amlogic/amlogic-s6.dtsi | 97 + .../src/arm64/amlogic/amlogic-s7-s805x3-bp201.dts | 41 + .../device-tree/src/arm64/amlogic/amlogic-s7.dtsi | 99 + .../arm64/amlogic/amlogic-s7d-s905x5m-bm202.dts | 41 + .../device-tree/src/arm64/amlogic/amlogic-s7d.dtsi | 99 + .../device-tree/src/arm64/amlogic/meson-a1.dtsi | 1 + .../device-tree/src/arm64/amlogic/meson-axg.dtsi | 12 +- .../src/arm64/amlogic/meson-g12-common.dtsi | 10 +- .../src/arm64/amlogic/meson-g12a-fbx8am.dts | 4 - .../src/arm64/amlogic/meson-g12a-radxa-zero.dts | 4 - .../src/arm64/amlogic/meson-g12a-sei510.dts | 4 - .../src/arm64/amlogic/meson-g12a-u200.dts | 4 - .../src/arm64/amlogic/meson-g12a-x96-max.dts | 4 - .../device-tree/src/arm64/amlogic/meson-g12a.dtsi | 1 + .../amlogic/meson-g12b-a311d-libretech-cc.dts | 6 - .../src/arm64/amlogic/meson-g12b-a311d.dtsi | 2 + .../src/arm64/amlogic/meson-g12b-bananapi-cm4.dtsi | 6 - .../src/arm64/amlogic/meson-g12b-bananapi.dtsi | 6 - .../src/arm64/amlogic/meson-g12b-khadas-vim3.dtsi | 6 - .../arm64/amlogic/meson-g12b-odroid-go-ultra.dts | 6 - .../src/arm64/amlogic/meson-g12b-odroid.dtsi | 6 - .../src/arm64/amlogic/meson-g12b-radxa-zero2.dts | 6 - .../src/arm64/amlogic/meson-g12b-s922x.dtsi | 2 + .../src/arm64/amlogic/meson-g12b-w400.dtsi | 6 - .../device-tree/src/arm64/amlogic/meson-gxbb.dtsi | 10 +- .../amlogic/meson-gxl-s805y-xiaomi-aquaman.dts | 262 ++ .../src/arm64/amlogic/meson-gxl-s805y.dtsi | 10 + .../device-tree/src/arm64/amlogic/meson-gxl.dtsi | 22 +- .../src/arm64/amlogic/meson-gxlx-s905l-p271.dts | 4 + .../device-tree/src/arm64/amlogic/meson-s4.dtsi | 5 + .../src/arm64/amlogic/meson-sm1-ac2xx.dtsi | 4 - .../src/arm64/amlogic/meson-sm1-bananapi.dtsi | 4 - .../src/arm64/amlogic/meson-sm1-khadas-vim3l.dts | 4 - .../src/arm64/amlogic/meson-sm1-odroid.dtsi | 4 - .../amlogic/meson-sm1-s905d3-libretech-cc.dts | 4 - .../src/arm64/amlogic/meson-sm1-sei610.dts | 4 - .../device-tree/src/arm64/amlogic/meson-sm1.dtsi | 1 + .../device-tree/src/arm64/apple/s5l8960x.dtsi | 13 + .../device-tree/src/arm64/apple/s800-0-3.dtsi | 13 + sys/contrib/device-tree/src/arm64/apple/s8001.dtsi | 13 + .../device-tree/src/arm64/apple/spi1-nvram.dtsi | 2 - sys/contrib/device-tree/src/arm64/apple/t6001.dtsi | 1 + sys/contrib/device-tree/src/arm64/apple/t6002.dtsi | 1 + .../device-tree/src/arm64/apple/t600x-die0.dtsi | 57 + sys/contrib/device-tree/src/arm64/apple/t7000.dtsi | 13 + sys/contrib/device-tree/src/arm64/apple/t7001.dtsi | 16 + sys/contrib/device-tree/src/arm64/apple/t8010.dtsi | 13 + sys/contrib/device-tree/src/arm64/apple/t8011.dtsi | 16 + sys/contrib/device-tree/src/arm64/apple/t8012.dtsi | 13 + sys/contrib/device-tree/src/arm64/apple/t8015.dtsi | 32 + .../device-tree/src/arm64/apple/t8103-j293.dts | 2 + .../device-tree/src/arm64/apple/t8103-jxxx.dtsi | 2 +- sys/contrib/device-tree/src/arm64/apple/t8103.dtsi | 60 +- .../device-tree/src/arm64/apple/t8112-j493.dts | 2 + sys/contrib/device-tree/src/arm64/apple/t8112.dtsi | 59 +- .../device-tree/src/arm64/arm/corstone1000.dtsi | 1 - .../device-tree/src/arm64/arm/foundation-v8.dtsi | 1 - .../device-tree/src/arm64/arm/fvp-base-revc.dts | 101 +- .../device-tree/src/arm64/arm/juno-base.dtsi | 1 - .../device-tree/src/arm64/arm/rtsm_ve-aemv8a.dts | 1 - .../src/arm64/blaize/blaize-blzp1600-cb2.dts | 36 + .../src/arm64/blaize/blaize-blzp1600.dtsi | 12 + .../src/arm64/broadcom/bcm2712-rpi-5-b.dts | 8 + .../device-tree/src/arm64/broadcom/bcm2712.dtsi | 155 +- .../src/arm64/broadcom/bcm2837-rpi-2-b.dts | 2 + .../src/arm64/exynos/exynos7870-a2corelte.dts | 630 +++ .../src/arm64/exynos/exynos7870-j6lte.dts | 613 +++ .../src/arm64/exynos/exynos7870-on7xelte.dts | 662 +++ .../src/arm64/exynos/exynos7870-pinctrl.dtsi | 1021 ++++ .../device-tree/src/arm64/exynos/exynos7870.dtsi | 712 +++ .../device-tree/src/arm64/exynos/exynos850.dtsi | 14 +- .../device-tree/src/arm64/exynos/exynosautov9.dtsi | 48 +- .../src/arm64/exynos/exynosautov920.dtsi | 536 ++- .../arm64/exynos/google/gs101-pixel-common.dtsi | 4 +- .../device-tree/src/arm64/exynos/google/gs101.dtsi | 8 +- .../src/arm64/freescale/fsl-ls1046a.dtsi | 3 +- .../src/arm64/freescale/imx-pcie0-ep.dtso | 15 + .../src/arm64/freescale/imx-pcie1-ep.dtso | 15 + .../src/arm64/freescale/imx8-apalis-eval.dtsi | 10 +- .../arm64/freescale/imx8-apalis-ixora-v1.1.dtsi | 10 +- .../arm64/freescale/imx8-apalis-ixora-v1.2.dtsi | 10 +- .../src/arm64/freescale/imx8-apalis-v1.1.dtsi | 70 +- .../src/arm64/freescale/imx8dxl-evk.dts | 12 +- .../src/arm64/freescale/imx8dxl-ss-hsio.dtsi | 25 +- .../freescale/imx8dxp-tqma8xdps-mb-smarc-2.dts | 16 + .../src/arm64/freescale/imx8dxp-tqma8xdps.dtsi | 24 + .../src/arm64/freescale/imx8mm-beacon-kit.dts | 1 + .../src/arm64/freescale/imx8mm-beacon-som.dtsi | 18 +- .../src/arm64/freescale/imx8mm-evk.dtsi | 13 + .../freescale/imx8mm-phyboard-polis-peb-av-10.dtso | 2 + .../src/arm64/freescale/imx8mm-var-som.dtsi | 2 +- .../src/arm64/freescale/imx8mm-verdin.dtsi | 7 +- .../device-tree/src/arm64/freescale/imx8mm.dtsi | 4 - .../src/arm64/freescale/imx8mn-beacon-kit.dts | 1 + .../src/arm64/freescale/imx8mn-beacon-som.dtsi | 18 +- .../arm64/freescale/imx8mn-bsh-smm-s2-common.dtsi | 2 +- .../src/arm64/freescale/imx8mn-var-som.dtsi | 2 +- .../device-tree/src/arm64/freescale/imx8mn.dtsi | 4 - .../src/arm64/freescale/imx8mp-beacon-som.dtsi | 12 + .../src/arm64/freescale/imx8mp-dhcom-som.dtsi | 2 +- .../device-tree/src/arm64/freescale/imx8mp-evk.dts | 22 +- .../imx8mp-libra-rdk-fpsc-lvds-etml1010g3dra.dtso | 44 + .../src/arm64/freescale/imx8mp-libra-rdk-fpsc.dts | 290 ++ .../imx8mp-nitrogen-enc-carrier-board.dts | 452 ++ .../src/arm64/freescale/imx8mp-nitrogen-som.dtsi | 409 ++ .../src/arm64/freescale/imx8mp-phycore-fpsc.dtsi | 796 ++++ .../arm64/freescale/imx8mp-toradex-smarc-dev.dts | 304 ++ .../src/arm64/freescale/imx8mp-toradex-smarc.dtsi | 1314 ++++++ .../imx8mp-tqma8mpql-mba8mp-ras314-imx219.dtso | 107 + .../src/arm64/freescale/imx8mp-venice-gw71xx.dtsi | 2 +- .../src/arm64/freescale/imx8mp-venice-gw72xx.dtsi | 2 +- .../src/arm64/freescale/imx8mp-venice-gw73xx.dtsi | 2 +- .../src/arm64/freescale/imx8mp-venice-gw74xx.dts | 2 +- .../src/arm64/freescale/imx8mp-verdin.dtsi | 6 +- .../device-tree/src/arm64/freescale/imx8mp.dtsi | 30 +- .../device-tree/src/arm64/freescale/imx8mq-evk.dts | 20 + .../device-tree/src/arm64/freescale/imx8mq.dtsi | 40 +- .../src/arm64/freescale/imx8qm-apalis.dtsi | 10 +- .../src/arm64/freescale/imx8qm-ss-hsio.dtsi | 6 +- .../src/arm64/freescale/imx8qxp-mek.dts | 45 +- .../src/arm64/freescale/imx8qxp-ss-hsio.dtsi | 6 + .../freescale/imx8qxp-tqma8xqps-mb-smarc-2.dts | 16 + .../src/arm64/freescale/imx8qxp-tqma8xqps.dtsi | 14 + .../src/arm64/freescale/imx8x-colibri.dtsi | 29 +- .../src/arm64/freescale/imx93-phyboard-nash.dts | 317 ++ .../src/arm64/freescale/imx93-phyboard-segin.dts | 243 +- .../src/arm64/freescale/imx93-phycore-som.dtsi | 165 +- .../arm64/freescale/imx93-tqma9352-mba91xxca.dts | 749 +++ .../arm64/freescale/imx93-tqma9352-mba93xxca.dts | 8 +- .../arm64/freescale/imx93-tqma9352-mba93xxla.dts | 8 +- .../device-tree/src/arm64/freescale/imx94-clock.h | 193 + .../src/arm64/freescale/imx94-pinfunc.h | 1570 +++++++ .../device-tree/src/arm64/freescale/imx94-power.h | 41 + .../device-tree/src/arm64/freescale/imx94.dtsi | 1148 +++++ .../device-tree/src/arm64/freescale/imx943-evk.dts | 195 + .../device-tree/src/arm64/freescale/imx943.dtsi | 148 + .../src/arm64/freescale/imx95-15x15-evk.dts | 43 +- .../src/arm64/freescale/imx95-19x19-evk-sof.dts | 84 + .../src/arm64/freescale/imx95-19x19-evk.dts | 42 +- .../freescale/imx95-tqma9596sa-mb-smarc-2.dts | 324 ++ .../src/arm64/freescale/imx95-tqma9596sa.dtsi | 698 +++ .../device-tree/src/arm64/freescale/imx95.dtsi | 32 +- .../src/arm64/freescale/s32gxxxa-rdb.dtsi | 5 + .../src/arm64/freescale/tqma8xxs-mb-smarc-2.dtsi | 194 + .../device-tree/src/arm64/freescale/tqma8xxs.dtsi | 768 +++ .../src/arm64/intel/socfpga_agilex.dtsi | 6 + .../src/arm64/intel/socfpga_agilex5.dtsi | 4 +- .../src/arm64/intel/socfpga_agilex5_socdk.dts | 51 + .../src/arm64/intel/socfpga_agilex5_socdk_nand.dts | 89 + .../src/arm64/marvell/armada-7040-db.dts | 1 - .../src/arm64/marvell/armada-8040-db.dts | 2 - .../device-tree/src/arm64/marvell/cn9130-db.dtsi | 1 - .../device-tree/src/arm64/mediatek/mt6357.dtsi | 10 - .../device-tree/src/arm64/mediatek/mt6359.dtsi | 4 +- .../src/arm64/mediatek/mt6893-pinfunc.h | 1356 ++++++ .../src/arm64/mediatek/mt7622-bananapi-bpi-r64.dts | 2 +- .../arm64/mediatek/mt7988a-bananapi-bpi-r4-2g5.dts | 11 + .../src/arm64/mediatek/mt7988a-bananapi-bpi-r4.dts | 400 +- .../arm64/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 450 ++ .../device-tree/src/arm64/mediatek/mt7988a.dtsi | 115 + .../src/arm64/mediatek/mt8183-kukui.dtsi | 11 +- .../device-tree/src/arm64/mediatek/mt8183.dtsi | 4 + .../arm64/mediatek/mt8186-corsola-ponyta-sku0.dts | 18 + .../arm64/mediatek/mt8186-corsola-ponyta-sku1.dts | 22 + .../src/arm64/mediatek/mt8186-corsola-ponyta.dtsi | 49 + .../src/arm64/mediatek/mt8186-corsola-starmie.dtsi | 45 - .../src/arm64/mediatek/mt8186-corsola.dtsi | 1 - .../device-tree/src/arm64/mediatek/mt8188-evb.dts | 6 +- .../device-tree/src/arm64/mediatek/mt8188.dtsi | 345 +- .../device-tree/src/arm64/mediatek/mt8195.dtsi | 51 +- .../src/arm64/mediatek/mt8196-pinfunc.h | 1574 +++++++ *** 2328 LINES SKIPPED *** From nobody Sat Nov 22 11:29:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8xh0cnPz6GwqD for ; Sat, 22 Nov 2025 11:29: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8xg70rqz3SW4 for ; Sat, 22 Nov 2025 11:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NikdqFimVSLvIawCq8iPtMYEUxk7hWUO3/wffBUyyCE=; b=tOu49m1z6ksiWrYTlJ82pggkIszow8CvAAeYci6hif12bRFGC3wgpwIVP+RFWXf2t2VchH S/+im8ZekKfpNaXphreM1GelgxEXlFQKfcONagEZxGda1rY3zHr0v7RdX0PF+3P1On2dNy SG1EEaUwWFEo2WOLDw3MvHkx8IQVJjE3yp8t0vJ6DJsB/b6zIo3S1f5/+4qg6ZXrSaB7+v AFUAFwj2RtvMWtfJaqr/vDY9MsKrQKQ7lbX5IJl/5LQl6gdNe6p8Y193HBlngyo58WJiL4 tW/TPiiv58HJGLsMOnNgMPzJPCmyqSBSr3JRu5v3C839VxMm4RqjB5S/X82msg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NikdqFimVSLvIawCq8iPtMYEUxk7hWUO3/wffBUyyCE=; b=iSMRh8lFee34ssYpevZJdvgDtIOnHRc6UaWJWnPT+DEgakN3fZgnvehvyabtQ21yh9B74X YF5RYrqsEBGrADQtUf4SWI1/2bSCMk3PQVKQNB2G3xvJ974tVWbjADSVX+oM/3vuW5PoPu iIsixU0cauupZcqqclxqiLH/e/uBmU8/i6GY6KXr3FyRIUdIJTSQuivEdsqEfyGaakIdjf KnRg9wV5j93badT5HU+dyvUlIzgX9s3nghZlNex3Cyix0UDTLfWl0sPvwCXLvW2yJtGfmI Le8NQZb67HXfmvUjT4361uB6cpN55dxQ9nDwPOcxn4K/buwzZ2dgxACsMy6qlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810968; a=rsa-sha256; cv=none; b=R47cKQTeeTI9XooGvC65l9O2J0eZLErmuj6cPrPEkmerMzQjpctkkWDP+DNFsz7QQ3nFQf lifOyOZHdMieqieudQkBeLn5sJfBVy51bzLqLZlpazkS6hhy09aQPZC9x5LwBdpxIOuqvW z/XpNvkGPd7twV1lixDBICgIcFueiDemTniOwt3Kx+AsmwyH8u/5HYC4nfSBlUxDYc7V4K N3bSo+KO7M9sKb021Prgmizr3BAkd0hsWIsLWDeUU9ZITScjRAymLQIzwYvoRkWvU97AgJ XBQf2Dwcns8WX2W1qWGTu0CVNVAXXVVu7LrBDWVS14YAB9WPYu2FB8FGr9B/Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8xg69rdzwmd for ; Sat, 22 Nov 2025 11:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bf9e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:29:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: b8aada787cdf..d50fbf3559ea - vendor/device-tree - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/vendor/device-tree X-Git-Reftype: branch X-Git-Commit: d50fbf3559ea220ee3ea5a8bde6e33ddbf29d019 X-Git-Oldrev: b8aada787cdf692c810a139664cdbd5fe3898e25 X-Git-Newrev: d50fbf3559ea220ee3ea5a8bde6e33ddbf29d019 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 11:29:27 +0000 Message-Id: <69219e97.bf9e.4f2d5ba1@gitrepo.freebsd.org> The branch vendor/device-tree has been updated by manu: URL: https://cgit.FreeBSD.org/src/log/?id=b8aada787cdf..d50fbf3559ea d50fbf3559ea Import device-tree files from Linux 6.17 From nobody Sat Nov 22 11:29:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8xh32N1z6Gww0 for ; Sat, 22 Nov 2025 11:29: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8xh0lz7z3Sdj for ; Sat, 22 Nov 2025 11:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=iVhtuRbwxNtO5dBJMa9MkUKijFlpqCTD+FYu8DNCvTE=; b=rpGIyXVRyuragdvknn+hDH2jifSuHtvbDybVIZIbGINbyxribXWL3AjpLx2zkHAIrS8DNP 0lEF7q14QJVsytS6zvboi21omRzekOIvZx4UDPemPC/AxLueHMJZoa5VgJkMhgJdTjKcC7 u7tmBqopDZ4Qq94Dv9ne3VbGJiegQYpKI/n19ed5jQEkGtb12P0jvsaVeY9o7+CxwpOZzJ q6CdpX3m0YTHcYxF/yunFckuhb7MHSJsoeHyd/yWsaQ4k5RnUOJPPLxUtbt2Ano5XTH1kB /GHpg8Xu5TnOPZRETRTcbPM0LPfXZTnibNlay243DbjvqmbFdMD33Si6R5H3nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=iVhtuRbwxNtO5dBJMa9MkUKijFlpqCTD+FYu8DNCvTE=; b=LoOvANUMaGjc67/3vExlu1xPSCHGzuYJuRGyQxU3eLg9GxWI2meTVlLcwR4sKT3O+gycc2 gH+ImlE2SGRhaM6WPvkvLlsewEFihFRYC+ruBqLfeyxmouVkX/XYlN3kETMSVBcC2nz8vv 42q0zKtx9UoKSVbvp+c0afrSGSPzRP1Z5SvBonW93khMWd0P+wmWU8O8EyaC7GTzU7pP9O wkTlFkPaJ54ngmAz9Pq4kU/GoAvewF1qIm6mM7C0d6yeONn/fJ4WPDMXzl+RMD6LsUaHOY H2jRI+4MAQ/lHFylZ+KssOvu/PrGq4Kc2uU6QBERwB9dmb+FSnlVe8ppkqxR5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810968; a=rsa-sha256; cv=none; b=UziQNtLmMg0bNYlxXSGbagvhTNDGWkF/OKK0gl53KGSWVPVTpnUZ+9zsOfpe8YEKRvHVNJ 8/eIq0lzEh/glW5SJz8HmfKxYjmyddslkG9KnDLQSL/qdkIFCIxqVVqop5mG9cNe5071sU dmFisy5APVuiko9fXACT7dJx17PUG/r4J9U5GX/mBC0nYpigDEE0dK8nHK41mV2Iad+FDY RzH+PTWfw4g5NTRtUgu5KL4lLkUYBuIrdWUN6AJLZxfcT8fqjTPaBclk5MJryT0eQbHr9p 7y5sNfA1QqD82QwhzwGuGbeiewSgLE3dp9uD9LbN9wuPu533SL32THjLqke1fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8xg73mZzvlq for ; Sat, 22 Nov 2025 11:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bfa1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:29:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: tag vendor/device-tree/6.17 Tagger: Emmanuel Vadot Date: Sat, 22 Nov 2025 11:29:27 +0000 Message-Id: <69219e97.bfa1.1b887322@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Tag device-tree files from Linux 6.17 d50fbf3559ea - MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/tags/vendor/device-tree/6.17 X-Git-Reftype: annotated tag X-Git-Commit: decea99e8b986e38a6f772a8729c2c75083d889b Auto-Submitted: auto-generated The annotated tag vendor/device-tree/6.17 has been created by manu: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/device-tree/6.17 tag vendor/device-tree/6.17 Tagger: Emmanuel Vadot TaggerDate: 2025-11-22 11:29:11 +0000 Tag device-tree files from Linux 6.17 commit d50fbf3559ea220ee3ea5a8bde6e33ddbf29d019 Author: Emmanuel Vadot AuthorDate: 2025-11-22 11:29:08 +0000 Commit: Emmanuel Vadot CommitDate: 2025-11-22 11:29:08 +0000 Import device-tree files from Linux 6.17 From nobody Sat Nov 22 11:29:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8y819Krz6GwwD for ; Sat, 22 Nov 2025 11:29: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD8y80gmJz3SyK for ; Sat, 22 Nov 2025 11:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zyDJzajs8lUNAiEi5FMAl1iH2GZXreA7LD3qDepvMzg=; b=BYepP3ZzPrbk5/ya6FKsjMX6mRKHizz3+Rko3K+lwKmKCFAOac+lLot7yKT/AKcgwu+Xl0 JYocQ2z25G8TJpfoP0LanQs3lezNE4OMcicvCThY/DHxc+lLUVX8O/jyzcrhRTKJMewkT/ p9nm8N6V3GDdU2GGjzpuN0Keo67fMllLj90696AFlp3nUd7keakCVi8FSUOlD0a/A0EOZn L06MfmUQXxa7CKK70Zr4McPvTEi5hJP3X7nCCuhY6V8BVyUWG4hAVFNFvH3nQmIWhHLUcm Raefvz/OnXrphrL57jZA5hUSHy855jvtvmw8KidBSo3D6KPMy9lmeI/vVI2MrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763810992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zyDJzajs8lUNAiEi5FMAl1iH2GZXreA7LD3qDepvMzg=; b=q7bbqwV4erNJS6wi6GZwPm7Fe+C3KmhUagK83LS79C1GQlFNDGcYShovdWhIhy4rV5Drhq kDA90u+8yKwIZx3N2hVBERe6tIljxGVEYcnAFW31Tke62sbplMEdP6ypT/9D0ISeGPd+TX XyhvNmWaqZD+fMtg5Fo4zOklih4HAATYkYTdeojI0JyGeskY3rlXf6N9v4ttRy31NWCzyf bLn2MMJKJuHlBihPf0RApIrjR3oiAZijNWXSykJ65V4fqo+d5azs2Oq6hxZ1Lc/XDSWlOz M8y5AQUUMEi859sKzphNoJsOY/Zb0UFKv5BITOB5uUzmoOKLhdbZI/Jxw9mvlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763810992; a=rsa-sha256; cv=none; b=rfFsTBhBG7wY2RvIWmyIGjlT9hacWiLJc2IFEf+sEtQXrrvZ346FcHVv4ZgEyk2ubs6Zlu nf1EGJ/vYQRUMaZH06Hj4MngFagwFFT/uxwK3ePeO8gFiLQQplmx0lvHg8jT6r75FGZELA 9r0NCiLfGUEWwvnz0h+gf9SIDZORyhqfRuKZAcV80qCyoPEUQ/rTsPnQOyGaOSRxXKWmlz miWAR6BayEtzvIXPGmYct1Ba2C0zeQArAPAwWfDE/gf9VChmH5XD23vXP+9RKABcTDuOih IYMWjPB0Ux/QOZIvVAfgscy7g+hTT363Z3AV4AcqpEU2yj4Jt7lURtRbXgz8Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD8y80FFhzw6P for ; Sat, 22 Nov 2025 11:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b046 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 11:29:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 833e5d42ab13 - main - Import device-tree files from Linux 6.17 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 833e5d42ab135b0238e61c5b3c19b8619677cbfa Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 11:29:51 +0000 Message-Id: <69219eaf.b046.55090f9c@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=833e5d42ab135b0238e61c5b3c19b8619677cbfa commit 833e5d42ab135b0238e61c5b3c19b8619677cbfa Merge: ae5de77ed78a d50fbf3559ea Author: Emmanuel Vadot AuthorDate: 2025-11-22 11:29:29 +0000 Commit: Emmanuel Vadot CommitDate: 2025-11-22 11:29:29 +0000 Import device-tree files from Linux 6.17 sys/contrib/device-tree/Bindings/arm/amlogic.yaml | 1 + .../Bindings/arm/arm,trace-buffer-extension.yaml | 10 +- .../device-tree/Bindings/arm/aspeed/aspeed.yaml | 2 + sys/contrib/device-tree/Bindings/arm/axiado.yaml | 23 + sys/contrib/device-tree/Bindings/arm/cix.yaml | 26 + sys/contrib/device-tree/Bindings/arm/cpus.yaml | 1 + sys/contrib/device-tree/Bindings/arm/fsl.yaml | 18 + sys/contrib/device-tree/Bindings/arm/mediatek.yaml | 12 +- .../device-tree/Bindings/arm/mrvl/mrvl.yaml | 5 + sys/contrib/device-tree/Bindings/arm/qcom.yaml | 6 + sys/contrib/device-tree/Bindings/arm/rockchip.yaml | 28 + .../device-tree/Bindings/arm/rockchip/pmu.yaml | 2 + .../Bindings/arm/samsung/samsung-boards.yaml | 6 + .../device-tree/Bindings/arm/stm32/st,mlahb.yaml | 20 +- .../device-tree/Bindings/arm/stm32/stm32.yaml | 1 + sys/contrib/device-tree/Bindings/arm/sunxi.yaml | 36 +- sys/contrib/device-tree/Bindings/arm/tegra.yaml | 13 + .../Bindings/arm/tegra/nvidia,tegra186-pmc.yaml | 1 + sys/contrib/device-tree/Bindings/arm/ti/k3.yaml | 6 + sys/contrib/device-tree/Bindings/arm/ti/omap.yaml | 1 + .../Bindings/bus/fsl,imx8mp-aipstz.yaml | 104 + .../bus/fsl,imx8qxp-pixel-link-msi-bus.yaml | 7 +- .../clock/alphascale,asm9260-clock-controller.yaml | 49 + .../Bindings/clock/apm,xgene-device-clock.yaml | 80 + .../Bindings/clock/apm,xgene-socpll-clock.yaml | 50 + .../Bindings/clock/axis,artpec6-clkctrl.yaml | 55 + .../Bindings/clock/brcm,bcm2835-cprman.yaml | 59 + .../Bindings/clock/brcm,bcm53573-ilp.yaml | 46 + .../Bindings/clock/brcm,bcm63xx-clocks.yaml | 44 + .../Bindings/clock/cirrus,ep7209-clk.yaml | 47 + .../Bindings/clock/img,pistachio-clk.yaml | 136 ++ .../Bindings/clock/lsi,axm5516-clks.yaml | 43 + .../Bindings/clock/lsi,nspire-cx-clock.yaml | 33 + .../clock/marvell,armada-370-corediv-clock.yaml | 52 + .../clock/marvell,armada-3700-periph-clock.yaml | 96 + .../clock/marvell,armada-3700-tbg-clock.yaml | 54 + .../clock/marvell,armada-xp-cpu-clock.yaml | 44 + .../Bindings/clock/marvell,berlin2-clk.yaml | 51 + .../Bindings/clock/marvell,dove-divider-clock.yaml | 50 + .../Bindings/clock/marvell,mvebu-core-clock.yaml | 94 + .../clock/marvell-armada-370-gating-clock.yaml | 227 ++ .../device-tree/Bindings/clock/maxim,max9485.yaml | 82 + .../Bindings/clock/mediatek,mtmips-sysc.yaml | 28 +- .../Bindings/clock/microchip,pic32mzda-clk.yaml | 45 + .../Bindings/clock/moxa,moxart-clock.yaml | 38 + .../Bindings/clock/nuvoton,npcm750-clk.yaml | 66 + .../Bindings/clock/nxp,imx95-blk-ctl.yaml | 2 + .../Bindings/clock/nxp,lpc1850-ccu.yaml | 104 + .../Bindings/clock/nxp,lpc1850-cgu.yaml | 99 + .../device-tree/Bindings/clock/qca,ath79-pll.yaml | 70 + .../Bindings/clock/qcom,camcc-sm8250.yaml | 2 +- .../Bindings/clock/qcom,dispcc-sm6125.yaml | 2 +- .../Bindings/clock/qcom,dispcc-sm6350.yaml | 2 +- .../Bindings/clock/qcom,gcc-ipq4019.yaml | 2 +- .../Bindings/clock/qcom,gcc-ipq8074.yaml | 2 +- .../Bindings/clock/qcom,gcc-msm8976.yaml | 2 +- .../Bindings/clock/qcom,gcc-msm8994.yaml | 2 +- .../Bindings/clock/qcom,gcc-msm8996.yaml | 2 +- .../Bindings/clock/qcom,gcc-msm8998.yaml | 2 +- .../Bindings/clock/qcom,gcc-qcm2290.yaml | 2 +- .../Bindings/clock/qcom,gcc-qcs404.yaml | 2 +- .../Bindings/clock/qcom,gcc-sc7180.yaml | 2 +- .../Bindings/clock/qcom,gcc-sc7280.yaml | 2 +- .../Bindings/clock/qcom,gcc-sc8180x.yaml | 2 +- .../Bindings/clock/qcom,gcc-sc8280xp.yaml | 2 +- .../Bindings/clock/qcom,gcc-sdm845.yaml | 2 +- .../device-tree/Bindings/clock/qcom,gcc-sdx55.yaml | 2 +- .../device-tree/Bindings/clock/qcom,gcc-sdx65.yaml | 2 +- .../Bindings/clock/qcom,gcc-sm6115.yaml | 2 +- .../Bindings/clock/qcom,gcc-sm6125.yaml | 2 +- .../Bindings/clock/qcom,gcc-sm6350.yaml | 2 +- .../Bindings/clock/qcom,gcc-sm8150.yaml | 2 +- .../Bindings/clock/qcom,gcc-sm8250.yaml | 2 +- .../Bindings/clock/qcom,gcc-sm8350.yaml | 2 +- .../Bindings/clock/qcom,gcc-sm8450.yaml | 2 +- .../Bindings/clock/qcom,ipq9574-cmn-pll.yaml | 2 + .../device-tree/Bindings/clock/qcom,krait-cc.yaml | 43 + .../Bindings/clock/qcom,milos-camcc.yaml | 51 + .../Bindings/clock/qcom,milos-dispcc.yaml | 63 + .../device-tree/Bindings/clock/qcom,milos-gcc.yaml | 62 + .../Bindings/clock/qcom,milos-videocc.yaml | 53 + .../device-tree/Bindings/clock/qcom,mmcc.yaml | 24 +- .../Bindings/clock/qcom,msm8998-gpucc.yaml | 2 +- .../Bindings/clock/qcom,qcm2290-dispcc.yaml | 2 +- .../Bindings/clock/qcom,qcs615-dispcc.yaml | 55 + .../Bindings/clock/qcom,qcs615-gpucc.yaml | 49 + .../Bindings/clock/qcom,qcs615-videocc.yaml | 47 + .../Bindings/clock/qcom,qdu1000-ecpricc.yaml | 2 +- .../Bindings/clock/qcom,qdu1000-gcc.yaml | 2 +- .../device-tree/Bindings/clock/qcom,rpmhcc.yaml | 1 + .../Bindings/clock/qcom,sa8775p-camcc.yaml | 15 + .../Bindings/clock/qcom,sa8775p-gcc.yaml | 2 +- .../Bindings/clock/qcom,sc7180-camcc.yaml | 2 +- .../Bindings/clock/qcom,sc7180-dispcc.yaml | 2 +- .../Bindings/clock/qcom,sc7180-lpasscorecc.yaml | 2 +- .../Bindings/clock/qcom,sc7280-camcc.yaml | 2 +- .../Bindings/clock/qcom,sc7280-dispcc.yaml | 2 +- .../Bindings/clock/qcom,sc7280-lpasscc.yaml | 2 +- .../Bindings/clock/qcom,sc8180x-camcc.yaml | 67 + .../Bindings/clock/qcom,sdm845-camcc.yaml | 2 +- .../Bindings/clock/qcom,sdm845-dispcc.yaml | 2 +- .../Bindings/clock/qcom,sdm845-lpasscc.yaml | 2 +- .../device-tree/Bindings/clock/qcom,sdx75-gcc.yaml | 2 +- .../Bindings/clock/qcom,sm4450-camcc.yaml | 22 +- .../Bindings/clock/qcom,sm4450-dispcc.yaml | 22 +- .../Bindings/clock/qcom,sm4450-gcc.yaml | 2 +- .../Bindings/clock/qcom,sm6115-dispcc.yaml | 2 +- .../Bindings/clock/qcom,sm6115-gpucc.yaml | 2 +- .../Bindings/clock/qcom,sm6125-gpucc.yaml | 2 +- .../Bindings/clock/qcom,sm6350-camcc.yaml | 11 +- .../Bindings/clock/qcom,sm6375-dispcc.yaml | 2 +- .../Bindings/clock/qcom,sm6375-gcc.yaml | 2 +- .../Bindings/clock/qcom,sm6375-gpucc.yaml | 2 +- .../Bindings/clock/qcom,sm7150-camcc.yaml | 2 +- .../Bindings/clock/qcom,sm7150-dispcc.yaml | 2 +- .../Bindings/clock/qcom,sm7150-gcc.yaml | 2 +- .../Bindings/clock/qcom,sm7150-videocc.yaml | 2 +- .../Bindings/clock/qcom,sm8150-camcc.yaml | 22 +- .../Bindings/clock/qcom,sm8450-camcc.yaml | 20 +- .../Bindings/clock/qcom,sm8450-dispcc.yaml | 2 +- .../Bindings/clock/qcom,sm8450-gpucc.yaml | 2 + .../Bindings/clock/qcom,sm8450-videocc.yaml | 19 +- .../Bindings/clock/qcom,sm8550-gcc.yaml | 2 +- .../Bindings/clock/qcom,sm8550-tcsr.yaml | 1 + .../Bindings/clock/qcom,sm8650-gcc.yaml | 2 +- .../Bindings/clock/qcom,x1e80100-gcc.yaml | 2 +- .../Bindings/clock/raspberrypi,rp1-clocks.yaml | 58 + .../Bindings/clock/renesas,cpg-mssr.yaml | 49 +- .../Bindings/clock/renesas,rzg2l-cpg.yaml | 18 +- .../clock/samsung,exynosautov920-clock.yaml | 37 +- .../device-tree/Bindings/clock/ti/ti,autoidle.yaml | 34 + .../Bindings/clock/ti/ti,divider-clock.yaml | 22 +- .../Bindings/clock/ti/ti,fixed-factor-clock.yaml | 76 + .../Bindings/crypto/atmel,at91sam9g46-aes.yaml | 4 +- .../Bindings/crypto/atmel,at91sam9g46-sha.yaml | 4 +- .../Bindings/crypto/atmel,at91sam9g46-tdes.yaml | 4 +- .../device-tree/Bindings/crypto/fsl,sec-v4.0.yaml | 41 +- .../device-tree/Bindings/crypto/ti,omap2-aes.yaml | 58 + .../device-tree/Bindings/crypto/ti,omap4-des.yaml | 65 + .../display/allwinner,sun8i-a83t-de2-mixer.yaml | 34 +- .../device-tree/Bindings/display/arm,pl11x.yaml | 3 + .../device-tree/Bindings/display/fsl,lcdif.yaml | 19 +- .../Bindings/display/fsl,ls1021a-dcu.yaml | 71 + .../device-tree/Bindings/display/himax,hx8357.yaml | 78 + .../fsl,imx8qxp-dc-axi-performance-counter.yaml | 57 + .../display/imx/fsl,imx8qxp-dc-blit-engine.yaml | 204 ++ .../display/imx/fsl,imx8qxp-dc-blitblend.yaml | 41 + .../Bindings/display/imx/fsl,imx8qxp-dc-clut.yaml | 44 + .../imx/fsl,imx8qxp-dc-command-sequencer.yaml | 67 + .../display/imx/fsl,imx8qxp-dc-constframe.yaml | 44 + .../display/imx/fsl,imx8qxp-dc-display-engine.yaml | 152 ++ .../display/imx/fsl,imx8qxp-dc-dither.yaml | 45 + .../display/imx/fsl,imx8qxp-dc-extdst.yaml | 72 + .../display/imx/fsl,imx8qxp-dc-fetchunit.yaml | 141 ++ .../display/imx/fsl,imx8qxp-dc-filter.yaml | 43 + .../display/imx/fsl,imx8qxp-dc-framegen.yaml | 64 + .../display/imx/fsl,imx8qxp-dc-gammacor.yaml | 32 + .../display/imx/fsl,imx8qxp-dc-layerblend.yaml | 39 + .../display/imx/fsl,imx8qxp-dc-matrix.yaml | 44 + .../display/imx/fsl,imx8qxp-dc-pixel-engine.yaml | 250 ++ .../Bindings/display/imx/fsl,imx8qxp-dc-rop.yaml | 43 + .../display/imx/fsl,imx8qxp-dc-safety.yaml | 34 + .../display/imx/fsl,imx8qxp-dc-scaling-engine.yaml | 83 + .../display/imx/fsl,imx8qxp-dc-signature.yaml | 53 + .../Bindings/display/imx/fsl,imx8qxp-dc-store.yaml | 96 + .../Bindings/display/imx/fsl,imx8qxp-dc-tcon.yaml | 45 + .../Bindings/display/imx/fsl,imx8qxp-dc.yaml | 236 ++ .../Bindings/display/mediatek/mediatek,dp.yaml | 3 + .../Bindings/display/msm/dp-controller.yaml | 4 + .../Bindings/display/msm/dsi-controller-main.yaml | 54 +- .../Bindings/display/msm/dsi-phy-7nm.yaml | 1 + .../Bindings/display/msm/qcom,mdp5.yaml | 1 - .../Bindings/display/msm/qcom,sm8650-dpu.yaml | 1 + .../Bindings/display/msm/qcom,sm8750-mdss.yaml | 470 ++++ .../Bindings/display/panel/himax,hx83112b.yaml | 73 + .../Bindings/display/panel/himax,hx8394.yaml | 17 +- .../Bindings/display/panel/ilitek,ili9881c.yaml | 1 + .../Bindings/display/panel/panel-simple.yaml | 2 + .../Bindings/display/panel/raydium,rm67200.yaml | 1 - .../Bindings/display/panel/renesas,r61307.yaml | 94 + .../Bindings/display/panel/renesas,r69328.yaml | 73 + .../Bindings/display/panel/samsung,atna33xc20.yaml | 2 + .../Bindings/display/panel/sitronix,st7701.yaml | 1 + .../Bindings/display/panel/visionox,rm69299.yaml | 4 +- .../Bindings/display/renesas,rzg2l-du.yaml | 23 +- .../display/rockchip/rockchip,dw-mipi-dsi.yaml | 6 - .../Bindings/display/rockchip/rockchip-vop2.yaml | 56 +- .../Bindings/display/sitronix,st7567.yaml | 63 + .../Bindings/display/sitronix,st7586.yaml | 61 + .../Bindings/display/sprd/sprd,sharkl3-dpu.yaml | 2 +- .../display/sprd/sprd,sharkl3-dsi-host.yaml | 2 +- .../Bindings/display/ti/ti,am625-oldi.yaml | 79 + .../Bindings/display/ti/ti,am65x-dss.yaml | 220 +- .../device-tree/Bindings/dma/brcm,iproc-sba.yaml | 41 + .../device-tree/Bindings/dma/fsl,mxs-dma.yaml | 33 + .../Bindings/dma/marvell,orion-xor.yaml | 84 + .../Bindings/dma/nvidia,tegra186-gpc-dma.yaml | 1 + .../device-tree/Bindings/dma/qcom,bam-dma.yaml | 4 + sys/contrib/device-tree/Bindings/dma/qcom,gpi.yaml | 2 + .../Bindings/dma/sophgo,cv1800b-dmamux.yaml | 51 + .../device-tree/Bindings/dpll/dpll-device.yaml | 76 + .../device-tree/Bindings/dpll/dpll-pin.yaml | 45 + .../Bindings/dpll/microchip,zl30731.yaml | 115 + sys/contrib/device-tree/Bindings/dsp/fsl,dsp.yaml | 3 + .../Bindings/dsp/mediatek,mt8195-dsp.yaml | 42 +- .../intel,ixp4xx-network-processing-engine.yaml | 52 +- .../Bindings/firmware/nvidia,tegra186-bpmp.yaml | 1 + .../device-tree/Bindings/firmware/qcom,scm.yaml | 2 + .../Bindings/firmware/thead,th1520-aon.yaml | 7 + .../device-tree/Bindings/fpga/fpga-region.yaml | 1 + .../Bindings/fpga/xlnx,versal-fpga.yaml | 2 +- .../device-tree/Bindings/gnss/u-blox,neo-6m.yaml | 12 +- .../Bindings/gpio/abilis,tb10x-gpio.yaml | 63 + .../device-tree/Bindings/gpio/altr-pio-1.0.yaml | 75 + .../Bindings/gpio/apm,xgene-gpio-sb.yaml | 94 + .../device-tree/Bindings/gpio/apple,smc-gpio.yaml | 29 + .../Bindings/gpio/cavium,octeon-3860-gpio.yaml | 62 + .../device-tree/Bindings/gpio/cdns,gpio.yaml | 84 + .../Bindings/gpio/cirrus,clps711x-mctrl-gpio.yaml | 49 + .../device-tree/Bindings/gpio/exar,xra1403.yaml | 75 + .../device-tree/Bindings/gpio/fsl,qoriq-gpio.yaml | 7 + .../device-tree/Bindings/gpio/gpio-pca95xx.yaml | 1 + .../Bindings/gpio/lacie,netxbig-gpio-ext.yaml | 60 + .../Bindings/gpio/lantiq,gpio-mm-lantiq.yaml | 54 + .../device-tree/Bindings/gpio/maxim,max31910.yaml | 104 + .../Bindings/gpio/microchip,pic32mzda-gpio.yaml | 71 + .../Bindings/gpio/nxp,lpc1850-gpio.yaml | 78 + .../device-tree/Bindings/gpio/pisosr-gpio.yaml | 67 + .../device-tree/Bindings/gpio/pl061-gpio.yaml | 3 - .../device-tree/Bindings/gpio/qca,ar7100-gpio.yaml | 60 + .../Bindings/gpio/rockchip,gpio-bank.yaml | 3 + .../Bindings/gpio/st,spear-spics-gpio.yaml | 82 + .../Bindings/gpio/ti,keystone-dsp-gpio.yaml | 65 + .../device-tree/Bindings/gpio/ti,twl4030-gpio.yaml | 61 + .../device-tree/Bindings/gpio/trivial-gpio.yaml | 110 + .../Bindings/gpio/xlnx,gpio-xilinx.yaml | 1 + .../device-tree/Bindings/gpu/apple,agx.yaml | 94 + .../device-tree/Bindings/gpu/arm,mali-bifrost.yaml | 6 +- .../device-tree/Bindings/gpu/arm,mali-utgard.yaml | 2 + .../device-tree/Bindings/hwmon/adi,adm1266.yaml | 2 +- .../device-tree/Bindings/hwmon/adi,ltc2992.yaml | 2 +- .../device-tree/Bindings/hwmon/adt7475.yaml | 15 +- .../device-tree/Bindings/hwmon/lltc,ltc2978.yaml | 2 + .../device-tree/Bindings/hwmon/maxim,max20730.yaml | 1 + .../device-tree/Bindings/hwmon/national,lm90.yaml | 8 + .../Bindings/hwmon/pmbus/adi,adp1050.yaml | 15 +- .../Bindings/hwmon/pmbus/isil,isl68137.yaml | 1 + .../Bindings/hwmon/pmbus/ti,ucd90320.yaml | 6 + .../device-tree/Bindings/hwmon/ti,amc6821.yaml | 6 + .../device-tree/Bindings/hwmon/ti,ina2xx.yaml | 2 + .../device-tree/Bindings/hwmon/ti,lm87.yaml | 4 +- .../device-tree/Bindings/i2c/apple,i2c.yaml | 5 + .../device-tree/Bindings/i2c/i2c-exynos5.yaml | 1 + sys/contrib/device-tree/Bindings/i2c/i2c-rk3x.yaml | 3 + .../device-tree/Bindings/i2c/nxp,pnx-i2c.yaml | 3 + .../device-tree/Bindings/i2c/renesas,riic.yaml | 105 +- .../device-tree/Bindings/i2c/spacemit,k1-i2c.yaml | 3 + .../device-tree/Bindings/i3c/cdns,i3c-master.yaml | 7 +- .../device-tree/Bindings/i3c/renesas,i3c.yaml | 179 ++ .../device-tree/Bindings/iio/adc/adi,ad4080.yaml | 96 + .../device-tree/Bindings/iio/adc/adi,ad4170-4.yaml | 554 +++++ .../device-tree/Bindings/iio/adc/adi,ad4851.yaml | 2 + .../device-tree/Bindings/iio/adc/adi,ad7405.yaml | 60 + .../device-tree/Bindings/iio/adc/adi,ad7606.yaml | 29 + .../device-tree/Bindings/iio/adc/adi,ad7768-1.yaml | 68 +- .../device-tree/Bindings/iio/adc/adi,axi-adc.yaml | 2 + .../Bindings/iio/adc/mediatek,mt2701-auxadc.yaml | 4 + .../Bindings/iio/adc/mediatek,mt6359-auxadc.yaml | 2 + .../Bindings/iio/adc/nxp,lpc3220-adc.yaml | 3 + .../Bindings/iio/adc/st,spear600-adc.yaml | 69 + .../Bindings/iio/gyroscope/invensense,itg3200.yaml | 59 + .../Bindings/iio/proximity/nicera,d3323aa.yaml | 62 + .../device-tree/Bindings/input/syna,rmi4.yaml | 20 + .../Bindings/input/touchscreen/edt-ft5x06.yaml | 1 + .../input/touchscreen/nxp,lpc3220-tsc.yaml | 43 + .../input/touchscreen/sitronix,st1232.yaml | 29 + .../Bindings/input/touchscreen/ti.tsc2007.yaml | 75 + .../Bindings/input/touchscreen/touchscreen.yaml | 119 + .../Bindings/interconnect/mediatek,cci.yaml | 11 +- .../Bindings/interconnect/qcom,milos-rpmh.yaml | 136 ++ .../Bindings/interconnect/qcom,msm8998-bwmon.yaml | 2 + .../Bindings/interconnect/qcom,osm-l3.yaml | 5 + .../Bindings/interconnect/qcom,sa8775p-rpmh.yaml | 2 +- .../Bindings/interconnect/qcom,sar2130p-rpmh.yaml | 2 +- .../Bindings/interconnect/qcom,sc7280-rpmh.yaml | 2 +- .../Bindings/interconnect/qcom,sc8280xp-rpmh.yaml | 2 +- .../Bindings/interconnect/qcom,sm7150-rpmh.yaml | 2 +- .../Bindings/interconnect/qcom,sm8450-rpmh.yaml | 2 +- .../Bindings/interconnect/qcom,sm8550-rpmh.yaml | 2 +- .../Bindings/interconnect/qcom,sm8650-rpmh.yaml | 2 +- .../Bindings/interconnect/qcom,sm8750-rpmh.yaml | 2 +- .../Bindings/interconnect/qcom,x1e80100-rpmh.yaml | 2 +- .../interrupt-controller/andestech,plicsw.yaml | 54 + .../interrupt-controller/apm,xgene1-msi.yaml | 54 + .../interrupt-controller/arm,gic-v5-iwb.yaml | 78 + .../Bindings/interrupt-controller/arm,gic-v5.yaml | 267 +++ .../Bindings/interrupt-controller/arm,nvic.yaml | 3 +- .../Bindings/interrupt-controller/fsl,icoll.yaml | 45 + .../interrupt-controller/fsl,imx8qxp-dc-intc.yaml | 318 +++ .../interrupt-controller/fsl,mpic-msi.yaml | 161 ++ .../interrupt-controller/fsl,vf610-mscm-ir.yaml | 63 + .../mediatek,mt6577-sysirq.yaml | 1 + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + .../thead,c900-aclint-sswi.yaml | 64 +- .../Bindings/interrupt-controller/xlnx,intc.yaml | 82 + .../device-tree/Bindings/iommu/arm,smmu.yaml | 7 +- .../device-tree/Bindings/iommu/riscv,iommu.yaml | 6 +- .../device-tree/Bindings/ipmi/ipmb-dev.yaml | 56 + .../device-tree/Bindings/leds/leds-lp50xx.yaml | 19 +- .../device-tree/Bindings/leds/leds-mt6360.yaml | 199 +- .../device-tree/Bindings/leds/onnn,ncp5623.yaml | 4 +- .../mailbox/allwinner,sun6i-a31-msgbox.yaml | 14 +- .../Bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 10 +- .../Bindings/mailbox/apple,mailbox.yaml | 16 +- .../Bindings/mailbox/aspeed,ast2700-mailbox.yaml | 68 + .../Bindings/mailbox/brcm,bcm74110-mbox.yaml | 64 + .../Bindings/mailbox/cix,sky1-mbox.yaml | 77 + .../Bindings/mailbox/nvidia,tegra186-hsp.yaml | 37 +- .../Bindings/mailbox/qcom,apcs-kpss-global.yaml | 9 +- .../device-tree/Bindings/mailbox/qcom-ipcc.yaml | 1 + .../Bindings/mailbox/ti,omap-mailbox.yaml | 10 +- .../Bindings/mailbox/ti,secure-proxy.yaml | 18 +- .../device-tree/Bindings/media/cdns,csi2rx.yaml | 8 + .../device-tree/Bindings/media/fsl,imx6q-vdoa.yaml | 42 + .../device-tree/Bindings/media/fsl,imx8qm-isi.yaml | 117 + .../Bindings/media/fsl,imx8qxp-isi.yaml | 106 + .../device-tree/Bindings/media/i2c/mipi-ccs.yaml | 13 +- .../Bindings/media/i2c/onnn,mt9m114.yaml | 9 + .../Bindings/media/i2c/ovti,ov8858.yaml | 4 +- .../Bindings/media/i2c/sony,imx214.yaml | 29 +- .../Bindings/media/i2c/sony,imx258.yaml | 4 +- .../device-tree/Bindings/media/nxp,imx8-jpeg.yaml | 28 +- .../Bindings/media/nxp,imx8mq-mipi-csi2.yaml | 38 +- .../Bindings/media/qcom,x1e80100-camss.yaml | 14 +- .../device-tree/Bindings/media/renesas,fcp.yaml | 1 + .../device-tree/Bindings/media/renesas,vsp1.yaml | 1 + .../device-tree/Bindings/media/rockchip,vdec.yaml | 80 +- .../Bindings/memory-controllers/arm,pl172.yaml | 222 ++ .../memory-controllers/brcm,brcmstb-memc-ddr.yaml | 54 +- .../memory-controllers/nvidia,tegra186-mc.yaml | 84 +- .../memory-controllers/renesas,rzg3e-xspi.yaml | 9 +- .../device-tree/Bindings/mfd/adi,adp5585.yaml | 240 +- .../device-tree/Bindings/mfd/apple,smc.yaml | 79 + sys/contrib/device-tree/Bindings/mfd/lp3943.txt | 2 +- .../device-tree/Bindings/mfd/motorola-cpcap.txt | 2 +- .../device-tree/Bindings/mfd/mxs-lradc.yaml | 134 ++ .../device-tree/Bindings/mfd/nxp,lpc1850-creg.yaml | 148 ++ .../device-tree/Bindings/mfd/rockchip,rk806.yaml | 21 + .../device-tree/Bindings/mfd/samsung,s2mps11.yaml | 3 + .../device-tree/Bindings/mfd/ti,tps65910.yaml | 318 +++ .../device-tree/Bindings/mfd/ti,tps6594.yaml | 1 + .../device-tree/Bindings/mips/brcm/soc.yaml | 50 +- .../misc/intel,ixp4xx-ahb-queue-manager.yaml | 6 +- .../Bindings/misc/nvidia,tegra186-misc.yaml | 1 + .../device-tree/Bindings/misc/pci1de4,1.yaml | 137 ++ .../device-tree/Bindings/mmc/cdns,sdhci.yaml | 1 + .../Bindings/mmc/loongson,ls2k0500-mmc.yaml | 112 + sys/contrib/device-tree/Bindings/mmc/mxs-mmc.yaml | 7 +- .../device-tree/Bindings/mmc/renesas,sdhi.yaml | 161 +- .../device-tree/Bindings/mmc/sdhci-msm.yaml | 2 + .../device-tree/Bindings/mmc/sdhci-pxa.yaml | 36 +- .../device-tree/Bindings/mtd/jedec,spi-nor.yaml | 2 +- .../Bindings/mtd/nxp,lpc1773-spifi.yaml | 74 + .../device-tree/Bindings/mtd/technologic,nand.yaml | 2 +- sys/contrib/device-tree/Bindings/net/adi,adin.yaml | 2 +- .../device-tree/Bindings/net/adi,adin1110.yaml | 2 +- .../Bindings/net/airoha,an7583-mdio.yaml | 59 + .../Bindings/net/allwinner,sun8i-a83t-emac.yaml | 1 + .../Bindings/net/altr,gmii-to-sgmii-2.0.yaml | 49 + .../Bindings/net/altr,socfpga-stmmac.yaml | 171 ++ .../Bindings/net/bluetooth/nxp,88w8987-bt.yaml | 18 + .../device-tree/Bindings/net/cdns,macb.yaml | 8 + .../device-tree/Bindings/net/dsa/brcm,b53.yaml | 6 + .../Bindings/net/dsa/mediatek,mt7530.yaml | 24 +- .../Bindings/net/dsa/micrel,ks8995.yaml | 135 ++ .../Bindings/net/dsa/microchip,ksz.yaml | 1 + .../Bindings/net/ethernet-controller.yaml | 1 + .../Bindings/net/faraday,ftgmac100.yaml | 21 +- .../Bindings/net/ieee802154/atmel,at86rf233.yaml | 66 + .../Bindings/net/intel,ixp4xx-ethernet.yaml | 2 + .../Bindings/net/marvell,armada-370-neta.yaml | 79 + .../Bindings/net/marvell,armada-380-neta-bm.yaml | 60 + .../device-tree/Bindings/net/mediatek,net.yaml | 64 +- .../device-tree/Bindings/net/nfc/ti,trf7970a.yaml | 7 + .../device-tree/Bindings/net/nxp,lpc-eth.yaml | 48 + .../Bindings/net/nxp,lpc1850-dwmac.yaml | 85 + .../Bindings/net/pse-pd/microchip,pd692x0.yaml | 22 +- .../Bindings/net/pse-pd/ti,tps23881.yaml | 18 +- .../device-tree/Bindings/net/qca,ar803x.yaml | 43 + .../device-tree/Bindings/net/qca,qca7000.yaml | 109 + .../Bindings/net/renesas,rzv2h-gbeth.yaml | 205 ++ .../device-tree/Bindings/net/snps,dwmac.yaml | 4 + .../Bindings/net/sophgo,cv1800b-dwmac.yaml | 114 + .../Bindings/net/sophgo,sg2044-dwmac.yaml | 11 +- .../Bindings/net/thead,th1520-gmac.yaml | 6 +- .../Bindings/net/ti,k3-am654-cpsw-nuss.yaml | 2 +- .../Bindings/net/wireless/qca,ath9k.yaml | 18 +- .../Bindings/net/wireless/qcom,ath11k-pci.yaml | 6 + .../Bindings/net/wireless/ralink,rt2880.yaml | 49 + .../Bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 1 + .../Bindings/nvmem/amlogic,meson6-efuse.yaml | 2 +- .../Bindings/nvmem/fsl,vf610-ocotp.yaml | 47 + .../Bindings/nvmem/layouts/fixed-layout.yaml | 2 +- .../device-tree/Bindings/nvmem/mediatek,efuse.yaml | 17 +- .../Bindings/nvmem/nxp,lpc1857-eeprom.yaml | 61 + .../Bindings/opp/opp-v2-qcom-adreno.yaml | 2 +- .../Bindings/pci/amazon,al-alpine-v3-pcie.yaml | 71 + .../device-tree/Bindings/pci/apm,xgene-pcie.yaml | 84 + .../Bindings/pci/axis,artpec6-pcie.yaml | 118 + .../device-tree/Bindings/pci/brcm,stb-pcie.yaml | 4 + .../Bindings/pci/marvell,armada-3700-pcie.yaml | 99 + sys/contrib/device-tree/Bindings/pci/pci-ep.yaml | 2 +- .../device-tree/Bindings/pci/qcom,pcie-common.yaml | 32 +- .../Bindings/pci/qcom,pcie-sa8255p.yaml | 122 + .../Bindings/pci/qcom,pcie-sa8775p.yaml | 18 +- .../device-tree/Bindings/pci/qcom,pcie-sc7280.yaml | 16 +- .../Bindings/pci/qcom,pcie-sc8180x.yaml | 14 +- .../device-tree/Bindings/pci/qcom,pcie-sm8150.yaml | 21 +- .../device-tree/Bindings/pci/snps,dw-pcie.yaml | 2 +- .../Bindings/pci/sophgo,sg2044-pcie.yaml | 122 + .../Bindings/pci/st,spear1340-pcie.yaml | 45 + .../device-tree/Bindings/pci/ti,j721e-pci-ep.yaml | 34 +- .../device-tree/Bindings/phy/apm,xgene-phy.yaml | 169 ++ .../device-tree/Bindings/phy/brcm,ns2-drd-phy.yaml | 62 + .../device-tree/Bindings/phy/brcm,sr-pcie-phy.yaml | 46 + .../Bindings/phy/brcm,sr-usb-combo-phy.yaml | 65 + .../Bindings/phy/hisilicon,hi6220-usb-phy.yaml | 35 + .../Bindings/phy/hisilicon,hix5hd2-sata-phy.yaml | 48 + .../Bindings/phy/hisilicon,inno-usb2-phy.yaml | 93 + .../Bindings/phy/img,pistachio-usb-phy.yaml | 62 + .../Bindings/phy/lantiq,ase-usb2-phy.yaml | 71 + .../phy/marvell,armada-375-usb-cluster.yaml | 40 + .../Bindings/phy/marvell,armada-380-comphy.yaml | 83 + .../Bindings/phy/marvell,berlin2-sata-phy.yaml | 76 + .../Bindings/phy/marvell,berlin2-usb-phy.yaml | 42 + .../Bindings/phy/marvell,comphy-cp110.yaml | 167 ++ .../Bindings/phy/marvell,mmp2-usb-phy.yaml | 37 + .../Bindings/phy/marvell,mvebu-sata-phy.yaml | 47 + .../Bindings/phy/mixel,mipi-dsi-phy.yaml | 5 - .../Bindings/phy/motorola,cpcap-usb-phy.yaml | 107 + .../Bindings/phy/motorola,mapphone-mdm6600.yaml | 81 + .../Bindings/phy/qca,ar7100-usb-phy.yaml | 49 + .../Bindings/phy/qcom,m31-eusb2-phy.yaml | 79 + .../Bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 6 +- .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 2 + .../Bindings/phy/qcom,snps-eusb2-phy.yaml | 1 + .../Bindings/phy/qcom,snps-eusb2-repeater.yaml | 3 - .../device-tree/Bindings/phy/renesas,usb2-phy.yaml | 4 + .../Bindings/phy/samsung,mipi-video-phy.yaml | 29 +- .../Bindings/phy/samsung,usb3-drd-phy.yaml | 2 + .../Bindings/phy/st,spear1310-miphy.yaml | 53 + .../device-tree/Bindings/phy/ti,da830-usb-phy.yaml | 53 + .../Bindings/phy/ti,dm8168-usb-phy.yaml | 58 + .../Bindings/phy/ti,keystone-usbphy.yaml | 37 + .../Bindings/pinctrl/amlogic,pinctrl-a4.yaml | 9 +- .../Bindings/pinctrl/eswin,eic7700-pinctrl.yaml | 156 ++ .../Bindings/pinctrl/mediatek,mt8189-pinctrl.yaml | 213 ++ .../Bindings/pinctrl/nxp,lpc1850-scu.yaml | 79 + .../Bindings/pinctrl/qcom,milos-tlmm.yaml | 133 ++ .../Bindings/pinctrl/qcom,pmic-gpio.yaml | 4 + .../Bindings/pinctrl/raspberrypi,rp1-gpio.yaml | 198 ++ .../Bindings/pinctrl/rockchip,pinctrl.yaml | 2 +- .../device-tree/Bindings/pinctrl/st,stm32-hdp.yaml | 187 ++ .../Bindings/pinctrl/st,stm32-pinctrl.yaml | 25 + .../Bindings/power/allwinner,sun20i-d1-ppu.yaml | 4 +- .../device-tree/Bindings/power/power-domain.yaml | 2 +- .../device-tree/Bindings/power/qcom,rpmpd.yaml | 2 + .../Bindings/power/reset/apple,smc-reboot.yaml | 40 + .../device-tree/Bindings/power/reset/qcom,pon.yaml | 72 +- .../Bindings/power/rockchip,power-controller.yaml | 1 + .../device-tree/Bindings/power/supply/bq24190.yaml | 1 - .../device-tree/Bindings/power/supply/bq2515x.yaml | 7 +- .../device-tree/Bindings/power/supply/bq256xx.yaml | 5 +- .../device-tree/Bindings/power/supply/bq25980.yaml | 4 +- .../Bindings/power/supply/cw2015_battery.yaml | 5 +- .../power/supply/qcom,pmi8998-charger.yaml | 7 +- .../power/supply/richtek,rt5033-charger.yaml | 4 +- .../power/supply/stericsson,ab8500-btemp.yaml | 4 +- .../power/supply/stericsson,ab8500-chargalg.yaml | 4 +- .../power/supply/stericsson,ab8500-charger.yaml | 4 +- .../power/supply/stericsson,ab8500-fg.yaml | 4 +- .../power/supply/summit,smb347-charger.yaml | 5 +- .../x-powers,axp20x-battery-power-supply.yaml | 6 +- .../device-tree/Bindings/powerpc/nintendo/wii.txt | 4 - .../device-tree/Bindings/pwm/adi,axi-pwmgen.yaml | 2 +- .../device-tree/Bindings/pwm/argon40,fan-hat.yaml | 48 + .../device-tree/Bindings/pwm/marvell,pxa-pwm.yaml | 35 +- .../Bindings/pwm/mediatek,mt2712-pwm.yaml | 5 + .../Bindings/pwm/nxp,lpc1850-sct-pwm.yaml | 54 + .../device-tree/Bindings/pwm/nxp,lpc3220-pwm.yaml | 44 + .../Bindings/pwm/sophgo,sg2042-pwm.yaml | 4 +- .../Bindings/regulator/infineon,ir38060.yaml | 2 +- .../mediatek,mt6873-dvfsrc-regulator.yaml | 2 + .../Bindings/regulator/nxp,pca9450-regulator.yaml | 14 + .../Bindings/regulator/qcom,rpmh-regulator.yaml | 35 + ...pberrypi,7inch-touchscreen-panel-regulator.yaml | 7 +- .../Bindings/remoteproc/qcom,sa8775p-pas.yaml | 2 +- .../Bindings/remoteproc/qcom,sm8150-pas.yaml | 65 +- .../nvidia,tegra264-bpmp-shmem.yaml | 15 +- .../Bindings/reset/canaan,k230-rst.yaml | 39 + .../Bindings/reset/nxp,lpc1850-rgu.yaml | 101 + .../reset/renesas,rzv2h-usb2phy-reset.yaml | 7 +- .../device-tree/Bindings/reset/snps,dw-reset.yaml | 39 + .../Bindings/reset/sophgo,sg2042-reset.yaml | 4 +- sys/contrib/device-tree/Bindings/riscv/andes.yaml | 25 + sys/contrib/device-tree/Bindings/riscv/cpus.yaml | 1 + .../device-tree/Bindings/rng/atmel,at91-trng.yaml | 1 + .../Bindings/rng/brcm,iproc-rng200.yaml | 6 + .../device-tree/Bindings/rtc/amlogic,a4-rtc.yaml | 11 +- .../Bindings/rtc/nvidia,tegra20-rtc.yaml | 1 + .../device-tree/Bindings/rtc/nxp,lpc1788-rtc.yaml | 7 +- .../device-tree/Bindings/rtc/nxp,lpc3220-rtc.yaml | 49 + .../device-tree/Bindings/rtc/nxp,pcf85063.yaml | 33 +- .../device-tree/Bindings/rtc/renesas,rzn1-rtc.yaml | 22 +- .../Bindings/rtc/sophgo,cv1800b-rtc.yaml | 86 + .../device-tree/Bindings/rtc/trivial-rtc.yaml | 2 - sys/contrib/device-tree/Bindings/serial/8250.yaml | 85 +- .../Bindings/serial/brcm,bcm7271-uart.yaml | 2 +- .../device-tree/Bindings/serial/cdns,uart.yaml | 7 +- .../device-tree/Bindings/serial/mediatek,uart.yaml | 1 + .../Bindings/serial/qcom,sa8255p-geni-uart.yaml | 69 + .../device-tree/Bindings/serial/renesas,hscif.yaml | 7 + .../device-tree/Bindings/serial/renesas,rsci.yaml | 27 +- .../device-tree/Bindings/serial/renesas,scif.yaml | 8 + .../device-tree/Bindings/serial/samsung_uart.yaml | 4 + .../Bindings/serial/snps-dw-apb-uart.yaml | 3 + .../soc/amlogic/amlogic,meson-gx-hhi-sysctrl.yaml | 28 +- .../Bindings/soc/fsl/fsl,imx23-digctl.yaml | 53 + .../Bindings/soc/qcom/qcom,aoss-qmp.yaml | 2 + .../device-tree/Bindings/soc/qcom/qcom,dcc.yaml | 1 + .../device-tree/Bindings/soc/qcom/qcom,eud.yaml | 38 +- .../Bindings/soc/qcom/qcom,pmic-glink.yaml | 1 + .../soc/qcom/qcom,sa8255p-geni-se-qup.yaml | 107 + .../device-tree/Bindings/soc/renesas/renesas.yaml | 21 +- .../device-tree/Bindings/soc/rockchip/grf.yaml | 8 +- .../Bindings/soc/samsung/exynos-pmu.yaml | 3 + .../soc/samsung/samsung,exynos-sysreg.yaml | 1 + .../device-tree/Bindings/soc/sophgo/sophgo.yaml | 52 + .../Bindings/soc/spacemit/spacemit,k1-syscon.yaml | 27 +- .../Bindings/soc/ti/ti,j784s4-bist.yaml | 63 + .../device-tree/Bindings/soc/ti/wkup-m3-ipc.yaml | 32 +- .../device-tree/Bindings/sound/atmel,at91-ssc.yaml | 11 +- .../device-tree/Bindings/sound/cirrus,cs42xx8.yaml | 4 + .../Bindings/sound/fsl,mxs-audio-sgtl5000.yaml | 81 + .../Bindings/sound/mediatek,mt8173-afe-pcm.yaml | 98 + .../device-tree/Bindings/sound/mt8186-afe-pcm.yaml | 5 + .../device-tree/Bindings/sound/mt8192-afe-pcm.yaml | 5 + .../Bindings/sound/qcom,lpass-va-macro.yaml | 28 +- .../device-tree/Bindings/sound/qcom,q6afe.yaml | 13 + .../device-tree/Bindings/sound/qcom,sm8250.yaml | 2 + .../device-tree/Bindings/sound/qcom,wcd939x.yaml | 3 + .../device-tree/Bindings/sound/richtek,rt9123.yaml | 9 +- .../device-tree/Bindings/sound/ti,tas57xx.yaml | 2 + .../device-tree/Bindings/spi/amlogic,a4-spisg.yaml | 59 + sys/contrib/device-tree/Bindings/spi/fsl,dspi.yaml | 18 + .../Bindings/spi/marvell,orion-spi.yaml | 102 + .../Bindings/spi/mediatek,spi-mt65xx.yaml | 5 + sys/contrib/device-tree/Bindings/spi/mxs-spi.yaml | 3 + .../device-tree/Bindings/spi/nxp,lpc3220-spi.yaml | 44 + .../Bindings/spi/renesas,rzv2h-rspi.yaml | 96 + .../device-tree/Bindings/spi/spi-fsl-lpspi.yaml | 5 + sys/contrib/device-tree/Bindings/spi/spi-mux.yaml | 1 - .../Bindings/spi/spi-peripheral-props.yaml | 1 + .../device-tree/Bindings/spi/spi-sg2044-nor.yaml | 9 +- .../device-tree/Bindings/spi/st,stm32-spi.yaml | 48 +- .../device-tree/Bindings/sram/qcom,imem.yaml | 15 + .../device-tree/Bindings/submitting-patches.rst | 12 +- .../Bindings/thermal/mediatek,thermal.yaml | 27 +- .../Bindings/thermal/nvidia,tegra124-soctherm.yaml | 2 + .../device-tree/Bindings/thermal/qcom-tsens.yaml | 1 + .../Bindings/thermal/rockchip-thermal.yaml | 62 + .../Bindings/timer/andestech,plmt0.yaml | 53 + .../Bindings/timer/via,vt8500-timer.yaml | 51 + .../trigger-source/adi,util-sigma-delta-spi.yaml | 49 + .../Bindings/trigger-source/gpio-trigger.yaml | 40 + .../device-tree/Bindings/trivial-devices.yaml | 60 +- .../device-tree/Bindings/ufs/mediatek,ufs.yaml | 46 +- .../device-tree/Bindings/usb/ci-hdrc-usb2.yaml | 5 + sys/contrib/device-tree/Bindings/usb/dwc2.yaml | 2 +- .../device-tree/Bindings/usb/fsl,usbmisc.yaml | 2 + .../device-tree/Bindings/usb/genesys,gl850g.yaml | 28 +- .../device-tree/Bindings/usb/nxp,lpc3220-udc.yaml | 50 + .../device-tree/Bindings/usb/qcom,snps-dwc3.yaml | 3 + .../device-tree/Bindings/usb/renesas,usbhs.yaml | 1 + .../device-tree/Bindings/vendor-prefixes.yaml | 21 + .../device-tree/Bindings/watchdog/fsl-imx-wdt.yaml | 2 + .../Bindings/watchdog/mediatek,mtk-wdt.yaml | 1 + .../Bindings/watchdog/nxp,pnx4008-wdt.yaml | 3 + .../device-tree/Bindings/writing-bindings.rst | 42 +- .../device-tree/Bindings/writing-schema.rst | 3 + .../device-tree/include/dt-bindings/arm/qcom,ids.h | 5 + .../include/dt-bindings/clock/ast2600-clock.h | 2 + .../include/dt-bindings/clock/cix,sky1.h | 279 +++ .../include/dt-bindings/clock/nvidia,tegra264.h | 466 ++++ .../include/dt-bindings/clock/nxp,imx94-clock.h | 13 + .../include/dt-bindings/clock/qcom,gcc-sc8180x.h | 10 + .../dt-bindings/clock/qcom,ipq5018-cmn-pll.h | 16 + .../dt-bindings/clock/qcom,ipq5424-cmn-pll.h | 22 + .../include/dt-bindings/clock/qcom,milos-camcc.h | 131 + .../include/dt-bindings/clock/qcom,milos-dispcc.h | 61 + .../include/dt-bindings/clock/qcom,milos-gcc.h | 210 ++ .../include/dt-bindings/clock/qcom,milos-gpucc.h | 56 + .../include/dt-bindings/clock/qcom,milos-videocc.h | 36 + .../include/dt-bindings/clock/qcom,qcs615-camcc.h | 110 + .../include/dt-bindings/clock/qcom,qcs615-dispcc.h | 52 + .../include/dt-bindings/clock/qcom,qcs615-gpucc.h | 39 + .../dt-bindings/clock/qcom,qcs615-videocc.h | 30 + .../include/dt-bindings/clock/qcom,sc8180x-camcc.h | 181 ++ .../include/dt-bindings/clock/qcom,x1e80100-gcc.h | 2 + .../include/dt-bindings/clock/r9a07g043-cpg.h | 53 - .../include/dt-bindings/clock/r9a07g044-cpg.h | 58 - .../include/dt-bindings/clock/r9a07g054-cpg.h | 58 - .../include/dt-bindings/clock/r9a08g045-cpg.h | 71 - .../dt-bindings/clock/raspberrypi,rp1-clocks.h | 61 + .../dt-bindings/clock/renesas,r9a09g056-cpg.h | 1 + .../dt-bindings/clock/renesas,r9a09g057-cpg.h | 1 + .../dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h | 29 + .../dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h | 29 + .../dt-bindings/clock/samsung,exynosautov920.h | 9 + .../include/dt-bindings/clock/spacemit,k1-syscon.h | 141 ++ .../include/dt-bindings/iio/adc/adi,ad7768-1.h | 10 + .../dt-bindings/iio/adc/mediatek,mt6363-auxadc.h | 24 + .../dt-bindings/iio/adc/mediatek,mt6373-auxadc.h | 19 + .../include/dt-bindings/input/linux-event-codes.h | 8 + .../dt-bindings/interconnect/qcom,milos-rpmh.h | 141 ++ .../include/dt-bindings/memory/nvidia,tegra264.h | 136 ++ .../include/dt-bindings/pinctrl/stm32-pinfunc.h | 1 + .../power/allwinner,sun55i-a523-pck-600.h | 15 + .../dt-bindings/power/allwinner,sun55i-a523-ppu.h | 12 + .../include/dt-bindings/power/qcom-rpmpd.h | 1 + .../dt-bindings/power/rockchip,rk3528-power.h | 19 + .../dt-bindings/regulator/nxp,pca9450-regulator.h | 18 + .../dt-bindings/regulator/st,stm32mp15-regulator.h | 40 + .../include/dt-bindings/reset/canaan,k230-rst.h | 90 + .../include/dt-bindings/reset/nvidia,tegra264.h | 92 + .../include/dt-bindings/reset/sun55i-a523-r-ccu.h | 1 + .../src/arm/allwinner/sun4i-a10-olinuxino-lime.dts | 2 +- .../src/arm/allwinner/sun8i-q8-common.dtsi | 2 +- .../device-tree/src/arm/allwinner/sun8i-r40.dtsi | 2 +- .../device-tree/src/arm/allwinner/sun8i-v3.dtsi | 9 + .../arm/allwinner/sun8i-v3s-netcube-kumquat.dts | 2 +- .../device-tree/src/arm/allwinner/sun8i-v3s.dtsi | 9 + .../src/arm/aspeed/aspeed-bmc-ampere-mtjade.dts | 2 +- .../aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts | 4 +- .../src/arm/aspeed/aspeed-bmc-asrock-e3c246d4i.dts | 2 +- .../src/arm/aspeed/aspeed-bmc-bytedance-g220a.dts | 4 +- .../src/arm/aspeed/aspeed-bmc-delta-ahe50dc.dts | 2 +- .../arm/aspeed/aspeed-bmc-facebook-bletchley.dts | 71 +- .../arm/aspeed/aspeed-bmc-facebook-catalina.dts | 209 +- .../src/arm/aspeed/aspeed-bmc-facebook-harma.dts | 85 +- .../aspeed/aspeed-bmc-facebook-santabarbara.dts | 982 ++++++++ .../arm/aspeed/aspeed-bmc-facebook-yosemite4.dts | 40 + .../src/arm/aspeed/aspeed-bmc-ibm-bonnell.dts | 2 +- .../src/arm/aspeed/aspeed-bmc-ibm-everest.dts | 2 +- .../src/arm/aspeed/aspeed-bmc-ibm-rainier.dts | 4 +- .../src/arm/aspeed/aspeed-bmc-ibm-system1.dts | 139 +- .../src/arm/aspeed/aspeed-bmc-lenovo-hr630.dts | 46 +- .../src/arm/aspeed/aspeed-bmc-lenovo-hr855xg2.dts | 68 +- .../arm/aspeed/aspeed-bmc-nvidia-gb200nvl-bmc.dts | 1128 +++++++++ .../src/arm/aspeed/aspeed-bmc-opp-lanyang.dts | 18 +- .../src/arm/aspeed/aspeed-bmc-opp-nicole.dts | 10 +- .../src/arm/aspeed/aspeed-bmc-opp-palmetto.dts | 40 +- .../src/arm/aspeed/aspeed-bmc-opp-romulus.dts | 6 +- .../src/arm/aspeed/aspeed-bmc-opp-zaius.dts | 8 +- .../device-tree/src/arm/broadcom/bcm63138.dtsi | 79 +- .../device-tree/src/arm/broadcom/bcm63148.dtsi | 64 + .../device-tree/src/arm/broadcom/bcm63178.dtsi | 112 + .../device-tree/src/arm/broadcom/bcm6846.dtsi | 1 + .../device-tree/src/arm/broadcom/bcm6855.dtsi | 127 + .../device-tree/src/arm/broadcom/bcm6878.dtsi | 120 +- .../device-tree/src/arm/broadcom/bcm7445.dtsi | 9 +- .../arm/broadcom/bcm958625-meraki-mx6x-common.dtsi | 7 +- .../arm/intel/ixp/intel-ixp42x-linksys-wrv54g.dts | 92 +- .../arm/intel/socfpga/socfpga_cyclone5_sodia.dts | 6 +- .../device-tree/src/arm/marvell/armada-370-db.dts | 2 +- .../src/arm/marvell/kirkwood-km_common.dtsi | 4 +- .../src/arm/marvell/kirkwood-openrd-client.dts | 2 +- .../src/arm/mediatek/mt6572-jty-d101.dts | 61 + .../src/arm/mediatek/mt6572-lenovo-a369i.dts | 56 + .../device-tree/src/arm/mediatek/mt6572.dtsi | 108 + .../src/arm/microchip/at91-sam9x60ek.dts | 2 +- .../src/arm/microchip/at91-sama5d27_som1.dtsi | 2 +- .../src/arm/microchip/at91-sama5d27_wlsom1.dtsi | 4 +- .../src/arm/microchip/at91-sama5d2_icp.dts | 2 +- .../src/arm/microchip/at91-sama7d65_curiosity.dts | 37 + .../src/arm/microchip/at91-sama7g5ek.dts | 18 +- .../device-tree/src/arm/microchip/at91rm9200.dtsi | 5 +- .../device-tree/src/arm/microchip/at91sam9260.dtsi | 5 +- .../device-tree/src/arm/microchip/at91sam9261.dtsi | 4 +- .../device-tree/src/arm/microchip/at91sam9263.dtsi | 5 +- .../at91sam9g25-gardena-smart-gateway.dts | 2 +- .../device-tree/src/arm/microchip/at91sam9g45.dtsi | 5 +- .../device-tree/src/arm/microchip/at91sam9n12.dtsi | 5 +- .../device-tree/src/arm/microchip/at91sam9rl.dtsi | 8 +- .../device-tree/src/arm/microchip/at91sam9x5.dtsi | 15 +- .../device-tree/src/arm/microchip/sam9x7.dtsi | 37 + .../device-tree/src/arm/microchip/sama5d2.dtsi | 3 + .../device-tree/src/arm/microchip/sama5d3.dtsi | 2 + .../device-tree/src/arm/microchip/sama5d4.dtsi | 3 + .../device-tree/src/arm/microchip/sama7d65.dtsi | 140 ++ .../device-tree/src/arm/microchip/sama7g5.dtsi | 19 +- .../src/arm/nvidia/tegra30-asus-p1801-t.dts | 2087 ++++++++++++++++ .../src/arm/nvidia/tegra30-asus-tf600t.dts | 2500 ++++++++++++++++++++ .../src/arm/nvidia/tegra30-pegatron-chagall.dts | 16 + .../src/arm/nxp/imx/imx53-tx53-x03x.dts | 38 +- .../src/arm/nxp/imx/imx53-tx53-x13x.dts | 44 +- .../device-tree/src/arm/nxp/imx/imx53-tx53.dtsi | 38 +- .../device-tree/src/arm/nxp/imx/imx6dl-gw551x.dts | 44 +- .../device-tree/src/arm/nxp/imx/imx6dl-gw553x.dts | 44 +- .../device-tree/src/arm/nxp/imx/imx6dl-gw560x.dts | 44 +- .../device-tree/src/arm/nxp/imx/imx6dl-gw5903.dts | 44 +- .../device-tree/src/arm/nxp/imx/imx6dl-gw5904.dts | 44 +- .../src/arm/nxp/imx/imx6dl-tx6dl-comtft.dts | 38 +- .../src/arm/nxp/imx/imx6dl-tx6s-8034-mb7.dts | 38 +- .../src/arm/nxp/imx/imx6dl-tx6s-8034.dts | 38 +- .../src/arm/nxp/imx/imx6dl-tx6s-8035-mb7.dts | 38 +- .../src/arm/nxp/imx/imx6dl-tx6s-8035.dts | 38 +- .../src/arm/nxp/imx/imx6dl-tx6u-801x.dts | 38 +- .../src/arm/nxp/imx/imx6dl-tx6u-8033-mb7.dts | 38 +- .../src/arm/nxp/imx/imx6dl-tx6u-8033.dts | 38 +- .../src/arm/nxp/imx/imx6dl-tx6u-80xx-mb7.dts | 38 +- .../src/arm/nxp/imx/imx6dl-tx6u-811x.dts | 38 +- .../src/arm/nxp/imx/imx6dl-tx6u-81xx-mb7.dts | 38 +- .../device-tree/src/arm/nxp/imx/imx6q-gw551x.dts | 44 +- .../device-tree/src/arm/nxp/imx/imx6q-gw553x.dts | 44 +- .../device-tree/src/arm/nxp/imx/imx6q-gw560x.dts | 44 +- .../device-tree/src/arm/nxp/imx/imx6q-gw5903.dts | 44 +- .../device-tree/src/arm/nxp/imx/imx6q-gw5904.dts | 44 +- .../src/arm/nxp/imx/imx6q-tx6q-1010-comtft.dts | 38 +- .../src/arm/nxp/imx/imx6q-tx6q-1010.dts | 38 +- .../src/arm/nxp/imx/imx6q-tx6q-1020-comtft.dts | 38 +- .../src/arm/nxp/imx/imx6q-tx6q-1020.dts | 38 +- .../src/arm/nxp/imx/imx6q-tx6q-1036-mb7.dts | 38 +- .../src/arm/nxp/imx/imx6q-tx6q-1036.dts | 38 +- .../src/arm/nxp/imx/imx6q-tx6q-10x0-mb7.dts | 38 +- .../src/arm/nxp/imx/imx6q-tx6q-1110.dts | 38 +- .../src/arm/nxp/imx/imx6q-tx6q-11x0-mb7.dts | 38 +- .../src/arm/nxp/imx/imx6qdl-gw551x.dtsi | 44 +- .../src/arm/nxp/imx/imx6qdl-gw553x.dtsi | 44 +- .../src/arm/nxp/imx/imx6qdl-gw560x.dtsi | 44 +- .../src/arm/nxp/imx/imx6qdl-gw5903.dtsi | 44 +- .../src/arm/nxp/imx/imx6qdl-gw5904.dtsi | 44 +- .../src/arm/nxp/imx/imx6qdl-tx6-lcd.dtsi | 38 +- .../src/arm/nxp/imx/imx6qdl-tx6-lvds.dtsi | 38 +- .../src/arm/nxp/imx/imx6qdl-tx6-mb7.dtsi | 38 +- .../device-tree/src/arm/nxp/imx/imx6qdl-tx6.dtsi | 38 +- .../src/arm/nxp/imx/imx6qp-tx6qp-8037-mb7.dts | 38 +- .../src/arm/nxp/imx/imx6qp-tx6qp-8037.dts | 38 +- .../src/arm/nxp/imx/imx6qp-tx6qp-8137-mb7.dts | 38 +- .../src/arm/nxp/imx/imx6qp-tx6qp-8137.dts | 38 +- .../src/arm/nxp/imx/imx6ul-kontron-bl-common.dtsi | 1 - .../src/arm/nxp/imx/imx6ul-kontron-sl-common.dtsi | 25 +- .../src/arm/nxp/imx/imx6ul-tx6ul-0010.dts | 38 +- .../src/arm/nxp/imx/imx6ul-tx6ul-0011.dts | 38 +- .../src/arm/nxp/imx/imx6ul-tx6ul-mainboard.dts | 38 +- .../device-tree/src/arm/nxp/imx/imx6ul-tx6ul.dtsi | 38 +- .../arm/nxp/imx/imx6ull-engicam-microgea-bmm.dts | 303 +++ .../arm/nxp/imx/imx6ull-engicam-microgea-gtw.dts | 162 ++ .../arm/nxp/imx/imx6ull-engicam-microgea-rmm.dts | 360 +++ .../src/arm/nxp/imx/imx6ull-engicam-microgea.dtsi | 95 + .../device-tree/src/arm/nxp/imx/imx7s-warp.dts | 49 +- .../device-tree/src/arm/nxp/imx/imx7ulp.dtsi | 4 + .../device-tree/src/arm/nxp/lpc/lpc32xx.dtsi | 2 + .../src/arm/nxp/mxs/imx28-amarula-rmm.dts | 300 +++ sys/contrib/device-tree/src/arm/nxp/mxs/imx28.dtsi | 10 + .../src/arm/nxp/vf/vf-colibri-eval-v3.dtsi | 11 +- .../device-tree/src/arm/nxp/vf/vf-colibri.dtsi | 348 ++- .../device-tree/src/arm/nxp/vf/vf500-colibri.dtsi | 44 +- sys/contrib/device-tree/src/arm/nxp/vf/vf500.dtsi | 14 +- .../device-tree/src/arm/nxp/vf/vf610-bk4.dts | 2 +- .../device-tree/src/arm/nxp/vf/vf610-cosmic.dts | 60 +- .../device-tree/src/arm/nxp/vf/vf610-twr.dts | 228 +- .../device-tree/src/arm/nxp/vf/vf610-zii-cfu1.dts | 6 +- .../src/arm/nxp/vf/vf610-zii-dev-rev-c.dts | 10 +- .../src/arm/nxp/vf/vf610-zii-scu4-aib.dts | 12 +- .../device-tree/src/arm/nxp/vf/vf610-zii-spb4.dts | 4 +- .../src/arm/nxp/vf/vf610-zii-ssmb-dtu.dts | 6 +- .../src/arm/nxp/vf/vf610-zii-ssmb-spu3.dts | 4 +- .../device-tree/src/arm/nxp/vf/vf610m4-colibri.dts | 16 +- .../device-tree/src/arm/nxp/vf/vf610m4-cosmic.dts | 12 +- sys/contrib/device-tree/src/arm/nxp/vf/vfxxx.dtsi | 7 +- .../device-tree/src/arm/qcom/qcom-msm8960.dtsi | 10 +- .../qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 3 +- .../qcom/qcom-msm8974-sony-xperia-rhine-amami.dts | 16 + .../qcom/qcom-msm8974-sony-xperia-rhine-honami.dts | 16 + .../qcom/qcom-msm8974-sony-xperia-rhine-togari.dts | 16 + .../arm/qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 20 +- .../src/arm/qcom/qcom-msm8974pro-oneplus-bacon.dts | 1 + .../src/arm/renesas/r9a06g032-rzn1d400-db.dts | 64 + .../device-tree/src/arm/renesas/r9a06g032.dtsi | 4 +- .../src/arm/rockchip/rk3128-xpi-3128.dts | 2 +- .../src/arm/rockchip/rv1109-relfor-saib.dts | 6 +- .../src/arm/samsung/exynos3250-monk.dts | 2 +- .../src/arm/samsung/exynos3250-rinato.dts | 2 +- .../src/arm/samsung/exynos4210-i9100.dts | 6 +- .../src/arm/samsung/exynos4212-tab3.dtsi | 10 +- .../src/arm/samsung/exynos4412-galaxy-s3.dtsi | 4 +- .../src/arm/samsung/exynos4412-midas.dtsi | 8 +- .../src/arm/samsung/exynos4412-p4note.dtsi | 8 +- .../device-tree/src/arm/samsung/s5pv210-aquila.dts | 2 +- .../device-tree/src/arm/samsung/s5pv210-aries.dtsi | 16 +- .../src/arm/samsung/s5pv210-galaxys.dts | 2 +- .../device-tree/src/arm/samsung/s5pv210-goni.dts | 2 +- .../device-tree/src/arm/st/spear1310-evb.dts | 2 +- sys/contrib/device-tree/src/arm/st/spear1310.dtsi | 8 +- .../device-tree/src/arm/st/spear1340-evb.dts | 2 +- sys/contrib/device-tree/src/arm/st/spear13xx.dtsi | 2 +- .../device-tree/src/arm/st/spear300-evb.dts | 2 +- .../device-tree/src/arm/st/spear310-evb.dts | 2 +- .../device-tree/src/arm/st/spear320-evb.dts | 2 +- sys/contrib/device-tree/src/arm/st/spear3xx.dtsi | 2 +- sys/contrib/device-tree/src/arm/st/stm32mp131.dtsi | 2 + sys/contrib/device-tree/src/arm/st/stm32mp133.dtsi | 2 + .../device-tree/src/arm/st/stm32mp15-scmi.dtsi | 10 +- .../src/arm/st/stm32mp157f-dk2-scmi.dtsi | 196 ++ .../device-tree/src/arm/st/stm32mp157f-dk2.dts | 179 ++ .../device-tree/src/arm/st/stm32mp15xf.dtsi | 17 + .../device-tree/src/arm/st/stm32mp15xx-dkx.dtsi | 3 +- .../src/arm/ti/omap/am335x-bone-common.dtsi | 2 +- .../src/arm/ti/omap/am335x-boneblack.dts | 2 +- .../src/arm/ti/omap/am335x-bonegreen-eco.dts | 169 ++ .../device-tree/src/arm/ti/omap/am335x-nano.dts | 8 +- .../device-tree/src/arm/ti/omap/am335x-pdu001.dts | 3 +- sys/contrib/device-tree/src/arm/ti/omap/dra7.dtsi | 29 +- .../device-tree/src/arm/vt8500/vt8500-bv07.dts | 5 + sys/contrib/device-tree/src/arm/vt8500/vt8500.dtsi | 12 +- .../device-tree/src/arm/vt8500/wm8505-ref.dts | 5 + sys/contrib/device-tree/src/arm/vt8500/wm8505.dtsi | 12 +- .../device-tree/src/arm/vt8500/wm8650-mid.dts | 5 + sys/contrib/device-tree/src/arm/vt8500/wm8650.dtsi | 12 +- .../device-tree/src/arm/vt8500/wm8750-apc8750.dts | 5 + sys/contrib/device-tree/src/arm/vt8500/wm8750.dtsi | 12 +- .../device-tree/src/arm/vt8500/wm8850-w70v2.dts | 5 + sys/contrib/device-tree/src/arm/vt8500/wm8850.dtsi | 21 +- .../device-tree/src/arm64/airoha/en7581-evb.dts | 8 + .../device-tree/src/arm64/airoha/en7581.dtsi | 49 + .../src/arm64/allwinner/sun50i-a100.dtsi | 35 + .../allwinner/sun50i-a133-liontron-h-a133l.dts | 19 + .../src/arm64/allwinner/sun55i-a523.dtsi | 201 +- .../src/arm64/allwinner/sun55i-a527-cubie-a5e.dts | 5 + .../src/arm64/allwinner/sun55i-h728-x96qpro+.dts | 5 + .../src/arm64/allwinner/sun55i-t527-avaota-a1.dts | 5 + .../arm64/allwinner/sun55i-t527-orangepi-4a.dts | 390 +++ .../src/arm64/altera/socfpga_stratix10.dtsi | 5 +- .../src/arm64/altera/socfpga_stratix10_swvp.dts | 6 - .../device-tree/src/arm64/amlogic/amlogic-s6.dtsi | 97 + .../device-tree/src/arm64/amlogic/amlogic-s7.dtsi | 81 + .../device-tree/src/arm64/amlogic/amlogic-s7d.dtsi | 90 + .../arm64/amlogic/meson-g12b-a311d-khadas-vim3.dts | 4 + .../amlogic/meson-g12b-a311d-libretech-cc.dts | 4 + .../src/arm64/amlogic/meson-gx-p23x-q20x.dtsi | 2 +- .../src/arm64/amlogic/meson-gxm-rbox-pro.dts | 2 +- .../src/arm64/amlogic/meson-gxm-ugoos-am3.dts | 91 + sys/contrib/device-tree/src/arm64/apple/t6000.dtsi | 4 + sys/contrib/device-tree/src/arm64/apple/t6001.dtsi | 4 + sys/contrib/device-tree/src/arm64/apple/t6002.dtsi | 4 + .../device-tree/src/arm64/apple/t600x-common.dtsi | 34 + .../device-tree/src/arm64/apple/t600x-die0.dtsi | 34 +- .../device-tree/src/arm64/apple/t8012-j132.dts | 1 + sys/contrib/device-tree/src/arm64/apple/t8103.dtsi | 68 +- sys/contrib/device-tree/src/arm64/apple/t8112.dtsi | 68 +- .../device-tree/src/arm64/axiado/ax3000-evk.dts | 82 + .../device-tree/src/arm64/axiado/ax3000.dtsi | 520 ++++ .../src/arm64/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts | 121 + .../src/arm64/broadcom/bcm2712-rpi-5-b.dts | 111 +- .../src/arm64/broadcom/bcmbca/bcm4908.dtsi | 116 +- .../src/arm64/broadcom/bcmbca/bcm63158.dtsi | 129 + .../src/arm64/broadcom/bcmbca/bcm6856.dtsi | 130 +- .../src/arm64/broadcom/bcmbca/bcm6858.dtsi | 119 +- .../src/arm64/broadcom/northstar2/ns2.dtsi | 8 - .../device-tree/src/arm64/broadcom/rp1-common.dtsi | 42 + .../device-tree/src/arm64/broadcom/rp1-nexus.dtsi | 14 + .../device-tree/src/arm64/broadcom/rp1.dtso | 11 + .../src/arm64/cavium/thunder2-99xx.dtsi | 4 +- .../device-tree/src/arm64/cix/sky1-orion-o6.dts | 39 + sys/contrib/device-tree/src/arm64/cix/sky1.dtsi | 330 +++ .../src/arm64/exynos/exynos2200-g0s.dts | 169 ++ .../src/arm64/exynos/exynos2200-pinctrl.dtsi | 1765 ++++++++++++++ .../device-tree/src/arm64/exynos/exynos2200.dtsi | 561 +++++ .../src/arm64/exynos/exynos5433-tm2-common.dtsi | 2 +- .../src/arm64/exynos/exynos7870-j6lte.dts | 2 +- .../src/arm64/exynos/exynos7870-on7xelte.dts | 2 +- .../device-tree/src/arm64/exynos/exynos7870.dtsi | 1 + .../src/arm64/exynos/exynosautov920.dtsi | 378 +++ .../arm64/exynos/google/gs101-pixel-common.dtsi | 96 + .../device-tree/src/arm64/exynos/google/gs101.dtsi | 10 +- .../freescale/fsl-ls1043a-tqmls1043a-mbls10xxa.dts | 12 + .../arm64/freescale/fsl-ls1043a-tqmls1043a.dtsi | 3 +- .../src/arm64/freescale/fsl-ls1043a.dtsi | 27 + .../freescale/fsl-ls1046a-tqmls1046a-mbls10xxa.dts | 22 +- .../arm64/freescale/fsl-ls1046a-tqmls1046a.dtsi | 4 +- .../src/arm64/freescale/fsl-ls1046a.dtsi | 27 + .../freescale/fsl-ls1088a-tqmls1088a-mbls10xxa.dts | 8 + .../arm64/freescale/fsl-ls1088a-tqmls1088a.dtsi | 4 +- .../src/arm64/freescale/fsl-lx2160a-qds.dts | 20 + .../src/arm64/freescale/imx8-ss-img.dtsi | 362 +++ .../src/arm64/freescale/imx8-ss-security.dtsi | 38 + .../src/arm64/freescale/imx8mm-beacon-som.dtsi | 2 + .../src/arm64/freescale/imx8mm-venice-gw700x.dtsi | 2 + .../src/arm64/freescale/imx8mm-venice-gw7901.dts | 2 + .../src/arm64/freescale/imx8mm-venice-gw7902.dts | 2 + .../src/arm64/freescale/imx8mm-venice-gw7903.dts | 2 + .../src/arm64/freescale/imx8mm-venice-gw7904.dts | 2 + .../device-tree/src/arm64/freescale/imx8mm.dtsi | 2 + .../src/arm64/freescale/imx8mn-beacon-som.dtsi | 2 + .../arm64/freescale/imx8mn-tqma8mqnl-mba8mx.dts | 4 + .../src/arm64/freescale/imx8mn-tqma8mqnl.dtsi | 4 + .../src/arm64/freescale/imx8mn-venice-gw7902.dts | 2 + .../device-tree/src/arm64/freescale/imx8mn.dtsi | 2 + .../arm64/freescale/imx8mp-data-modul-edm-sbc.dts | 1 + .../src/arm64/freescale/imx8mp-dhcom-som.dtsi | 1 + .../device-tree/src/arm64/freescale/imx8mp-evk.dts | 62 +- .../src/arm64/freescale/imx8mp-nominal.dtsi | 18 + .../src/arm64/freescale/imx8mp-pinfunc.h | 33 + .../arm64/freescale/imx8mp-toradex-smarc-dev.dts | 6 +- .../src/arm64/freescale/imx8mp-toradex-smarc.dtsi | 10 +- .../freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 13 +- ...imx8mp-tqma8mpql-mba8mpxl-lvds-tm070jvhg33.dtso | 61 + .../arm64/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 14 +- .../src/arm64/freescale/imx8mp-tqma8mpql.dtsi | 35 +- ...x8p-ml81-moduline-display-106-av101hdt-a10.dtso | 94 + ...x8p-ml81-moduline-display-106-av123z7m-n17.dtso | 139 ++ .../imx8mp-tx8p-ml81-moduline-display-106.dts | 527 +++++ .../src/arm64/freescale/imx8mp-tx8p-ml81.dtsi | 548 +++++ .../src/arm64/freescale/imx8mp-var-som.dtsi | 86 + .../src/arm64/freescale/imx8mp-venice-gw702x.dtsi | 2 + .../src/arm64/freescale/imx8mp-venice-gw74xx.dts | 8 +- .../device-tree/src/arm64/freescale/imx8mp.dtsi | 40 +- .../arm64/freescale/imx8qm-mek-ov5640-csi0.dtso | 62 + .../arm64/freescale/imx8qm-mek-ov5640-csi1.dtso | 62 + .../device-tree/src/arm64/freescale/imx8qm-mek.dts | 168 +- .../src/arm64/freescale/imx8qm-ss-img.dtsi | 79 + .../device-tree/src/arm64/freescale/imx8qm.dtsi | 11 + .../arm64/freescale/imx8qxp-mek-ov5640-csi.dtso | 61 + .../src/arm64/freescale/imx8qxp-mek.dts | 148 +- .../src/arm64/freescale/imx8qxp-ss-img.dtsi | 84 + .../src/arm64/freescale/imx8qxp-ss-security.dtsi | 16 + .../device-tree/src/arm64/freescale/imx8qxp.dtsi | 7 + .../device-tree/src/arm64/freescale/imx8ulp.dtsi | 3 + .../src/arm64/freescale/imx93-11x11-evk.dts | 121 +- .../src/arm64/freescale/imx93-14x14-evk.dts | 99 + .../src/arm64/freescale/imx93-9x9-qsb.dts | 98 +- .../freescale/imx93-phyboard-nash-peb-wlbt-07.dtso | 88 + .../src/arm64/freescale/imx93-phyboard-nash.dts | 9 - .../imx93-phyboard-segin-peb-eval-01.dtso | 52 + .../imx93-phyboard-segin-peb-wlbt-05.dtso | 93 + .../src/arm64/freescale/imx93-phyboard-segin.dts | 1 + .../src/arm64/freescale/imx93-phycore-rpmsg.dtso | 60 + .../src/arm64/freescale/imx93-phycore-som.dtsi | 26 + .../src/arm64/freescale/imx93-tqma9352.dtsi | 21 +- .../src/arm64/freescale/imx93-var-som.dtsi | 46 +- .../device-tree/src/arm64/freescale/imx93.dtsi | 10 +- .../device-tree/src/arm64/freescale/imx94.dtsi | 44 + .../device-tree/src/arm64/freescale/imx943-evk.dts | 432 ++++ .../src/arm64/freescale/imx95-15x15-evk.dts | 11 + .../src/arm64/freescale/imx95-19x19-evk.dts | 178 +- .../src/arm64/freescale/imx95-libra-rdk-fpsc.dts | 318 +++ .../src/arm64/freescale/imx95-phycore-fpsc.dtsi | 656 +++++ .../device-tree/src/arm64/freescale/imx95.dtsi | 67 +- .../device-tree/src/arm64/freescale/mba8mx.dtsi | 2 +- .../device-tree/src/arm64/freescale/s32g2.dtsi | 109 + .../device-tree/src/arm64/freescale/s32g3.dtsi | 110 + .../src/arm64/freescale/s32gxxxa-evb.dtsi | 84 + .../src/arm64/freescale/s32gxxxa-rdb.dtsi | 84 + .../arm64/freescale/tqmls1088a-mbls10xxa-mc.dtsi | 16 - .../src/arm64/freescale/tqmls10xxa-mbls10xxa.dtsi | 21 + .../src/arm64/freescale/tqmls10xxa.dtsi | 8 + .../src/arm64/intel/socfpga_agilex.dtsi | 1 + sys/contrib/device-tree/src/arm64/lg/lg1312.dtsi | 324 +-- sys/contrib/device-tree/src/arm64/lg/lg1313.dtsi | 324 +-- sys/contrib/device-tree/src/arm64/lg/lg131x.dtsi | 333 +++ .../src/arm64/marvell/armada-8040-mcbin.dtsi | 2 + .../device-tree/src/arm64/marvell/cn9130-cf.dtsi | 7 +- .../src/arm64/marvell/cn9131-cf-solidwan.dts | 6 +- *** 1905 LINES SKIPPED *** From nobody Sat Nov 22 12:12:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD9v20GnQz6H0sM for ; Sat, 22 Nov 2025 12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD9v16m0vz3bKZ for ; Sat, 22 Nov 2025 12:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763813534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VJ2yMjxeRCXWLT3xDtFV0+eMxU2gQckhUw6g0DovgDo=; b=YLb5Looec+YQRTsOFOYIKLfFtoJe1Psc65K+N5YsLSvOUeW1KY5txnzb139rIJYWMKgAeY GVuAVLJFuaJbf7YsCqulB2bKAVm6ohqfOsAQwJSm+d6cIaI3dCVLuYz/A1zzSyeikFyfJH sUJeRmPsiRtFwDBuppGAJDL6EsL4fWF6kA0YNAkhgXc9kfWpfkMhctG5d75A3cyrE0bXdj XROHuxARMLwg0BY6MJ9wk6OrPwMu2MxV4XaIIkk0JAetqO+em9lBs9CJ+1wa4Hszp+Qg4F m1V1RMe20ZU/VY0sVCgUieqtDoDrr0zCGj5DJZY6sNbSILT6D9JkGehwVOIYcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763813533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VJ2yMjxeRCXWLT3xDtFV0+eMxU2gQckhUw6g0DovgDo=; b=iA6hRPuVOdMeIojIXCNK6l2S3FkIOzT7BngCjF77NlkKJXREvLyboawDx+EApUW/5krBES Nzg+gWtSPHtvYwlRHnaW4vhZfDbhgeGn3z13kIiVfmCSSh4Cq/gZn/6PK69JizoWOqHKIF 70Ey9r6tAUuqnFkVGUmp0DEKtvI3K3lQA/j9LXm7jm0rzQFYlZicKVfaZMba+gcu/CRf3R 7GUhbKsCxHT2DtB7EMbIlZULlz+g9BijFqugOzcwwP0fi0E2IfT0dEfxsh7+fRa+RWNMYa sZa1XOI6PaKnITgpxeuC/vFKjoxFqEH+Z/Hhs5zt9UxHaIcsILVm5rNOefmndw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763813533; a=rsa-sha256; cv=none; b=oryDZ8q8fD6ExDoPf5M6e7Vlv90p87YQLKr2ArJhFAFAALhavczBQuJSUi4Ag05IQOTIAo LgqZnanzC0YlSaHqE3jtIG1GBwpi+UOxh/jF1UBOyubbh8fYVDNOjW5H3LVy1nE544sZ0z zByXuHaWVFcXGkQudQL+07TjxMqQg79qwrmdIFWS0UMXotwrkRgrCz0KvvrUVFn60fDdS1 dvlaCPf//p+7VqWSK74gV635mGoOihlwGuDFxEuxi1WwMCn+nua+ivWGcPqmJqTCv3po9+ gksd8GVFbZhoacCxrOk0Z27jtAw+9+frDSuIcJKJivJMKWsJF1/Epbaaez1iyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD9v166HTzxX4 for ; Sat, 22 Nov 2025 12:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fc66 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 12:12:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: fe836c50120d - main - cp: Fix copying the root directory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe836c50120daed3e4084f43c27d8d650d36dee8 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 12:12:13 +0000 Message-Id: <6921a89d.fc66.7dd6db22@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fe836c50120daed3e4084f43c27d8d650d36dee8 commit fe836c50120daed3e4084f43c27d8d650d36dee8 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-22 12:11:59 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-22 12:11:59 +0000 cp: Fix copying the root directory When the source of the copy operation is the root directory, we should neither append it to the destination path on FTS_D nor trim it back off on FTS_DP. PR: 291132 MFC after: 3 days Fixes: 82fc0d09e862 ("cp: Partly restore symlink folllowing.") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53863 --- bin/cp/cp.c | 7 ++++++- bin/cp/tests/cp_test.sh | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 38fe65399d06..7ac1e5f6a4c4 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -433,6 +433,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) sep = strchr(to.base, '\0'); sep[0] = '/'; sep[1] = '\0'; + } else if (strcmp(curr->fts_name, "/") == 0) { + /* special case when source is the root directory */ } else { /* entering a directory; append its name to to.path */ len = snprintf(to.end, END(to.path) - to.end, "%s%s", @@ -520,6 +522,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) if (type == DIR_TO_DNE && curr->fts_level == FTS_ROOTLEVEL) { /* this is actually our created root */ + } else if (strcmp(curr->fts_name, "/") == 0) { + /* special case when source is the root directory */ } else { while (to.end > to.path && *to.end != '/') to.end--; @@ -551,7 +555,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) /* Not an error but need to remember it happened. */ if (to.path[0] == '\0') { /* - * This can happen in two cases: + * This can happen in three cases: + * - The source path is the root directory. * - DIR_TO_DNE; we created the directory and * populated root_stat earlier. * - FILE_TO_DIR if a source has a trailing slash; diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index b637f862b7d3..af309ca7ea80 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -747,9 +747,23 @@ dstmode_body() atf_check cmp dir/file dst/file } +atf_test_case root +root_head() +{ + atf_set "descr" "Test copying the root directory" +} +root_body() +{ + atf_check mkdir dst + atf_check -s exit:1 \ + -e inline:"cp: / is a directory (not copied).\n" \ + cp / dst +} + atf_test_case to_root cleanup to_root_head() { + atf_set "descr" "Test copying to the root directory" atf_set "require.user" "unprivileged" } to_root_body() @@ -893,6 +907,7 @@ atf_init_test_cases() atf_add_test_case to_deaddirlink atf_add_test_case to_link_outside atf_add_test_case dstmode + atf_add_test_case root atf_add_test_case to_root atf_add_test_case dirloop atf_add_test_case unrdir From nobody Sat Nov 22 13:10:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDCBS74wWz6H5s9 for ; Sat, 22 Nov 2025 13:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDCBS4NJJz3q8x for ; Sat, 22 Nov 2025 13:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763817040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KLX3YjI0CodNonrQ26OtqtJyxS8UJbcpIdw254lVXo8=; b=t3RAckUohBCGgvtNoVtTDofTpzVftC7ZRou9Sg/7h5eIL4Dn2w2tDWEgGw82/wuxcCugon be/jv++4pJC399p3KQKqegEhLBTZU7/75EK8a0Ppbq6yql6PhXYi501+ALPiojoENFdXu+ w7tljzaJ2/WHwoThHSlDhmAwQsHkPBOypZ/AqNLHpmVU/rzon5y4te/siynm3IC1eOqtqf fzY3GPXMePtAIefsW1WZ35Dq8DwH5Jy6yYmerqnZ52d6JkDZDLGMBRDp+HkldIa57Skt1a bmCrkXQEkhc5Sv4EVmEnezNrcfNX3tg2rUNBYRrhYnUoupupX+5By+zhTxEWlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763817040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KLX3YjI0CodNonrQ26OtqtJyxS8UJbcpIdw254lVXo8=; b=kQzYzJOe9kA8taQT9zbufVj6XK8QUQLOYPxY5WKC6VJl3Dbt28TcZ9+qc9Uo5EEW+lF/wO EdT3z0lS8BbzAE4PMssldGC/yIrsTMsa7yDueDOEhai6xxo9IMf8ofBJsz1bsQzNI3dS1p PYjaP2kzbveTuvpF5O31dLkrt5oiVRyooX6fZaqXPQe527udFhfRf2fWAKrLsErFN0qU2L Gk9u4HiRc35CRwrQpuztWGzazcwjQ5a9mWjEnjDPcx3rLnKGPP+6Jvb3J+JIorMQv6w043 1Pc8bJCl8TjLNjciirsEqo49bfzRzMclUbT1faCZIRjBKt0xTwji6iO+hQ6fpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763817040; a=rsa-sha256; cv=none; b=hQzzPhLfZYo5zSC+CNESrqyuotUdocpSlDSEjLedqe//4dgWBRFDL1FgvW84xGU3a5rG3c r3VXvoIJ9PmnE+ud8bMZYhws1owEw2ckKxsoUEI3CI6CnooCWqb7516I8zDx2gkVsipu5d 8qf5e1dhDA/0Uk4NQOsCvReXLvj5j0+LlPsJt3s7Jwqb9R6ipjz32qYmosksc8jhApT0h5 b036PYL4s2NY1Qz8YD+IW5xECQ1b7YFD97TMfFUlQZfPnxWN5QuQutAJJE24LOVHEI7eXF CS0gFd+8nKyE5Mr9Fp+YYwwBXL78nr4gelyFZ/Sg0zIhrJ5d1QY0t9HMnoeFdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDCBS3kDvzyrg for ; Sat, 22 Nov 2025 13:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27ae2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 13:10:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 46d05a49a1d0 - main - loader.efi.8: Minor formatting nits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46d05a49a1d0d655af6cae2afd48a973698cbf71 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 13:10:40 +0000 Message-Id: <6921b650.27ae2.3f7a2017@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=46d05a49a1d0d655af6cae2afd48a973698cbf71 commit 46d05a49a1d0d655af6cae2afd48a973698cbf71 Author: John Baldwin AuthorDate: 2025-11-22 13:10:20 +0000 Commit: John Baldwin CommitDate: 2025-11-22 13:10:20 +0000 loader.efi.8: Minor formatting nits - Add several missing .Pp after lists and literal blocks. - Fix the column widths for the console table and use a shorter indent so that it doesn't wrap on an 80-col display. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D53866 --- stand/man/loader.efi.8 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/stand/man/loader.efi.8 b/stand/man/loader.efi.8 index c488ac257804..d9a5c827ba71 100644 --- a/stand/man/loader.efi.8 +++ b/stand/man/loader.efi.8 @@ -158,6 +158,7 @@ The serial ports are assigned as follows on IBM PC compatible systems: .It COM3 Ta 0x3e8 Ta Pa /dev/uart2 .It COM4 Ta 0x2e8 Ta Pa /dev/uart3 .El +.Pp Though .Dv COM3 and @@ -191,8 +192,9 @@ of any behavior not covered in this document. .It Fl s Ta Dv boot_single Ta Va RB_SINGLE .It Fl v Ta Dv boot_verbose Ta Va RB_VERBOSE .El +.Pp And the following flags determine the primary console: -.Bl -column -offset indent ".Sy Flags" ".Sy Kernel Flags" ".Sy Kernel Consoles" ".Sy Primary Console" +.Bl -column -offset xxx "Flags" "RB_SERIAL | RB_MULTIPLE" "Kernel Consoles" "Primary Console" .It Sy Flags Ta Sy Kernel Flags Ta Sy Kernel Consoles Ta Sy Primary Console .It none Ta 0 Ta Video Ta Video .It Fl h Ta RB_SERIAL Ta Serial Ta Serial @@ -380,6 +382,7 @@ To check: # mount | grep nda0p1 /dev/nda0p1 on /boot/efi (msdosfs, local) .Ed +.Pp If it's not mounted, you will need to mount it: .Bd -literal -offset indent # mount -t msdosfs /dev/nda0p1 /boot/efi @@ -398,6 +401,7 @@ BootOrder : 0000, 0001, 0003, 0004, 0005, 0006, 0001, 0008, 000A, 000B, 000C, 0 nda0p1:/EFI/FREEBSD/LOADER.EFI /boot/efi//EFI/FREEBSD/LOADER.EFI \&... .Ed +.Pp Often there are several options, depending on the BIOS. The entry that we booted with is marked with a .Sq + @@ -416,6 +420,7 @@ loader, which varies by architecture. .It i386 Ta Pa /EFI/BOOT/BOOTIA32.EFI .It riscv Ta Pa /EFI/BOOT/BOOTRISCV64.EFI .El +.Pp However, care must be taken: some multiple-boot environments rely on a special .Pa bootXXX.efi to function. @@ -436,10 +441,12 @@ above table): .Bd -literal -offset indent # cmp /boot/efi/EFI/FREEBSD/LOADER.EFI /boot/efi/EFI/BOOT/BOOTX64.EFI .Ed +.Pp Copy the loader: .Bd -literal -offset indent # cp /boot/loader.efi /boot/efi/EFI/FREEBSD/LOADER.EFI .Ed +.Pp replacing the all caps part of the example with the proper path. .Pp If ESP path was From nobody Sat Nov 22 14:30:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz05Zwqz6HDRx for ; Sat, 22 Nov 2025 14:30: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDz04fksz40lL for ; Sat, 22 Nov 2025 14:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aVExHbEmWsPplXAatF6NKFgSKMREpXhl+IU+2g3yPcY=; b=ZZpXiAXPd/H0fheijdSKPjhfyaPepWY8kl1PrrrUfMVSFwBYDnBcxzMODoaaT4Xe1dnTMl RZlo06q4v0dPEJ8h7HwR6Wf1c07AFz1Ve0dNGu2aJ2EBh8wd436oAhd0LeN+4O1KmV15gE DIT1OynBHPd1r9AGqo4Dr6qN6ugCuqv34kh3NX1bl05KHk3nVjvuujT1/Se2rQvGCHDx5M BXszfs6IvckRwI66Dv49nhY3b1LOa1zZcetDnwgeKhKaPSMSKQxPFfook/Xv9X55uJFz3O Sx8mIt8MjSpu6lkTW5d5VKBpzzMaZIDkK+Nyypp168yRX7OQD6M7gF/Zw3SQaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aVExHbEmWsPplXAatF6NKFgSKMREpXhl+IU+2g3yPcY=; b=qim09DVI71KNwZXZzSCsdTWAsNH5Bkkq2TZ+poWxML1OzjWOVplPAsYxtlwbVGDl3XL15s DlUT4Yu2ilNcO6jiNvNReU3IxsXtKqFQHHcQc3QhSvYxTOvRi8V5FSNKQKZ6fVm8TpRSnK jJfhKvPSdS2o6mqdMUvWIto8DeRGVfRNLtdGKUGlzk0u1tAMDqe/2NUcv9/JjKXK8buQSD +QwpeF3sFWelbMUNJU+MrYQtcMDp8taeor2vPpzdGkYNoZMWs5Pr8+R4YmL3YW0sugh+Ak LuXWO23hoR7ZfyHo+R/Qw8iMMoD7WgAFulwmj0+42MIdMnF4afZUs0UPaNxZCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821852; a=rsa-sha256; cv=none; b=FisoD0Xsh3H3IXAnolLIJwhourOmP007bCk8bKY+BrNOCp1k/6r590CB3yr5b7lJsfAqJh wtM3Yyb2XMJE0gGGZEZWJCMhrZGyPR7XmF42MCETOJ4AwuNgqcYRNZQf/jl1JEwTw9qqMd GxFkEweUPh8gt44HWXvYBU7A5ojGR/Rfgmj9sZHZEvIU+y12o3sZqL4UbgUp24Flw2zKNM dok9wPPz2D19nV9nmQMUPZ3RRDPAiWqy8fV67ncas1PqC+92VZ2CWbL80a5rHPlMuX3kBt hdZ1yeuNT5/cpwD9fmNsmFnfqqNRwvU/+vzGLiPYlDynJvdtSCJfL4Nj/7WgJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz040jmz12FD for ; Sat, 22 Nov 2025 14:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f9ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:30:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: d381a6b4a552 - main - cxgbe: use newly exposed RSS hash key API rather than ad-hoc hashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d381a6b4a552305de48027c51919a7cf28d52d02 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:30:52 +0000 Message-Id: <6921c91c.2f9ff.4a45c816@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=d381a6b4a552305de48027c51919a7cf28d52d02 commit d381a6b4a552305de48027c51919a7cf28d52d02 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:32 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:32 +0000 cxgbe: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53092 Reviewed by: np (outside of differential) Sponsored by: Netflix --- sys/dev/cxgbe/t4_main.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 9bd5e02fabf0..15b3fd94fa54 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -57,9 +57,7 @@ #include #include #include -#ifdef RSS #include -#endif #include #include #ifdef KERN_TLS @@ -7035,7 +7033,6 @@ t4_setup_intr_handlers(struct adapter *sc) static void write_global_rss_key(struct adapter *sc) { -#ifdef RSS int i; uint32_t raw_rss_key[RSS_KEYSIZE / sizeof(uint32_t)]; uint32_t rss_key[RSS_KEYSIZE / sizeof(uint32_t)]; @@ -7047,7 +7044,6 @@ write_global_rss_key(struct adapter *sc) rss_key[i] = htobe32(raw_rss_key[nitems(rss_key) - 1 - i]); } t4_write_rss_key(sc, &rss_key[0], -1, 1); -#endif } /* @@ -7127,7 +7123,6 @@ adapter_full_uninit(struct adapter *sc) sc->flags &= ~FULL_INIT_DONE; } -#ifdef RSS #define SUPPORTED_RSS_HASHTYPES (RSS_HASHTYPE_RSS_IPV4 | \ RSS_HASHTYPE_RSS_TCP_IPV4 | RSS_HASHTYPE_RSS_IPV6 | \ RSS_HASHTYPE_RSS_TCP_IPV6 | RSS_HASHTYPE_RSS_UDP_IPV4 | \ @@ -7190,7 +7185,6 @@ hashen_to_hashconfig(int hashen) return (hashconfig); } -#endif /* * Idempotent. @@ -7201,9 +7195,9 @@ vi_full_init(struct vi_info *vi) struct adapter *sc = vi->adapter; struct sge_rxq *rxq; int rc, i, j; + int hashconfig = rss_gethashconfig(); #ifdef RSS int nbuckets = rss_getnumbuckets(); - int hashconfig = rss_gethashconfig(); int extra; #endif @@ -7259,9 +7253,9 @@ vi_full_init(struct vi_info *vi) return (rc); } -#ifdef RSS vi->hashen = hashconfig_to_hashen(hashconfig); +#ifdef RSS /* * We may have had to enable some hashes even though the global config * wants them disabled. This is a potential problem that must be @@ -7295,11 +7289,6 @@ vi_full_init(struct vi_info *vi) CH_ALERT(vi, "UDP/IPv4 4-tuple hashing forced on.\n"); if (extra & RSS_HASHTYPE_RSS_UDP_IPV6) CH_ALERT(vi, "UDP/IPv6 4-tuple hashing forced on.\n"); -#else - vi->hashen = F_FW_RSS_VI_CONFIG_CMD_IP6FOURTUPEN | - F_FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN | - F_FW_RSS_VI_CONFIG_CMD_IP4FOURTUPEN | - F_FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN | F_FW_RSS_VI_CONFIG_CMD_UDPEN; #endif rc = -t4_config_vi_rss(sc, sc->mbox, vi->viid, vi->hashen, vi->rss[0], 0, 0); From nobody Sat Nov 22 14:30:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz20SfZz6HDJy for ; Sat, 22 Nov 2025 14:30: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDz15G8yz40lS for ; Sat, 22 Nov 2025 14:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1/tKnokaPjY8EamKpzkdjL0AMbMvhryBWABqO8ch9vM=; b=FtB/ZsxbBLYTH+VL/vmtFxe+voTXFS3v5ZJou+XEcKRNWujmgOE4NPj1daOQKuaKKhAWfO NUzStiR+p4tHTJqrGDuzWD9h45Z1Dzi5al+MmJR4ui6s8njewcRaMbZ9MGeo4BSD2Ekb03 Q9tGK8nfg1tYmXawhjjvuVQPQ19oR6Xbm0v3UIE5R+yo5e+Vxbk+uG8RpsAwIuAlSNfkNV /ByuFxvyj4/ynQ/Dn5JDxe0YmPNSSYhnsRvjt16vD5u6iaqVMyG2DjMXDAD9ogoApz40M/ eWTrf8b6NTxBxdXmiR7AYGSQIoFZxpSWxBDfCmVyxJwRQYS92wUis3+6rLvtkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1/tKnokaPjY8EamKpzkdjL0AMbMvhryBWABqO8ch9vM=; b=xotBTSech1FTyMQDcUktIpExJ5DlattKjch8/KWLkbRxVXOzu1kQIdNfSlEJkX0XzHeTwS jv8MqVUlzX9xROlrdOOADr9bNsuvJIDAVUHS5SilI4pwbwqHTihRabGrXRtgtUJfQpH0J9 Y6QtCvNGMBkrW1r+oufZIqmyphgBR6euBC2l9071PeR4gMcphwv5e/fes1J8NKp4vqoswI nIKzy9h5bbFEtDCS+Awal0dztQyengOQ4qRWO1/zE9z83iJFwG/sdlGVaX/iLE9ld28KZs lEj1RtMxpVs6AP+8hYVaEziHtd3pIgdPx2hauYmJiYRZ9z6FBPIw9tIZZIrgHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821853; a=rsa-sha256; cv=none; b=vPBAJS9M01JcqdSVx0hoQjKIX6cK6+hoYXFz823GyvHQ55Xezci3lhnKVTET5xW7EmAirJ jceGOme0zjmdE1bZcj8KkzZ/o3EXEHqZ6n54BhS5l+YizX3QDVMk+m4OhnVeuVHEdbLpLJ ttYxTAbztF0D/HTgzepn8jp/L/6JFEtjegTMOQ4dp/6NOZungzAr5xLFlVqfBKZlTGFQiC KLB++LpowiRXrcIvA5l5Se/I/mXOBk5wIuKyqy1NWoEcNkEBeb6tDhYn13YUJphpKcwuYo bpsMhRiHuPPiiRB8egR85CLLtdFipo+uWZrplEO8UITY7MKj+3hZI8vsyfoLKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz14Ljyz12CL for ; Sat, 22 Nov 2025 14:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30488 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:30:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 5a14756a1363 - main - ixgbe: Use newly exposed RSS hash API rather than ad-hoc hashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a14756a13635c988efcfb01f9a116901dbd455a Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:30:53 +0000 Message-Id: <6921c91d.30488.4eb863c8@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=5a14756a13635c988efcfb01f9a116901dbd455a commit 5a14756a13635c988efcfb01f9a116901dbd455a Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:32 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:32 +0000 ixgbe: Use newly exposed RSS hash API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53093 Reviewed by: kbowling Sponsored by: Netflix --- sys/dev/ixgbe/ixgbe_rss.h | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_rss.h b/sys/dev/ixgbe/ixgbe_rss.h index 84c802671195..6e02c5ec9ed5 100644 --- a/sys/dev/ixgbe/ixgbe_rss.h +++ b/sys/dev/ixgbe/ixgbe_rss.h @@ -34,30 +34,16 @@ #ifndef _IXGBE_RSS_H_ #define _IXGBE_RSS_H_ -#ifdef RSS - #include #include +#ifdef RSS +/* RSS CPU/bucket mapping functions - only available with options RSS */ #else - -#define RSS_HASHTYPE_RSS_IPV4 (1 << 1) -#define RSS_HASHTYPE_RSS_TCP_IPV4 (1 << 2) -#define RSS_HASHTYPE_RSS_IPV6 (1 << 3) -#define RSS_HASHTYPE_RSS_TCP_IPV6 (1 << 4) -#define RSS_HASHTYPE_RSS_IPV6_EX (1 << 5) -#define RSS_HASHTYPE_RSS_TCP_IPV6_EX (1 << 6) -#define RSS_HASHTYPE_RSS_UDP_IPV4 (1 << 7) -#define RSS_HASHTYPE_RSS_UDP_IPV4_EX (1 << 8) -#define RSS_HASHTYPE_RSS_UDP_IPV6 (1 << 9) -#define RSS_HASHTYPE_RSS_UDP_IPV6_EX (1 << 10) - +/* Stub CPU/bucket functions when RSS not configured */ #define rss_getcpu(_a) 0 #define rss_getnumbuckets() 1 -#define rss_getkey(_a) #define rss_get_indirection_to_bucket(_a) 0 -#define rss_gethashconfig() 0x7E #define rss_hash2bucket(_a,_b,_c) -1 - #endif #endif /* _IXGBE_RSS_H_ */ From nobody Sat Nov 22 14:30:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz32vrjz6HDK0 for ; Sat, 22 Nov 2025 14:30: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDz273YDz40jT for ; Sat, 22 Nov 2025 14:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vEAS4CCnIlZQAjgSG6gx5qwuTXJXsA4jTG68IXCL1K0=; b=Vh6W3SvMUwHy1pxzCSx1CIVPlk5po99z4EyRBHJe/9q2g3JdUDbuRhxbE8lyOBg42Uc+UP brKV3CRMq0drTpeLbvJSJRw9BIho03wMOuvaUGH1uJH/pPmqTclaC8h1r12VaVOE4PN124 fbi/CTEx8db+FtRtrQwJTJq4xKex4I+Y/DWvbVLf6Fs+PoOECV/GMcXpdr6xzatpVvPds5 2fuDIDdgHP9EAQ0rtqOnmB4o6ZPMVjtCg6/8uz0OTYP9X+Vzc0atctn85bCUJcOvZhNtZv l4AioD9sGJ9o1WjXDKeO5P34PRGBQMhuCh9OL5GIY5ujzj6So2qo7ZUq/r3KRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vEAS4CCnIlZQAjgSG6gx5qwuTXJXsA4jTG68IXCL1K0=; b=mte8RBwU6b0P41s1zzUagCmTILUIpIakayYi/NJl8irgf/DNoYwC0FaJ3krhq5WeRMGeFr 7s5EEd1OwDUbQrEssgaoZ3Zvcd3kTBrS8bwmeRPjUi38qPvRgjyFzeqImX0w4//J4xh0Qp hSZyRDynDAoGvEAJSog6VoDaU9ZskYegcKyPc8BlgrXyTLyjG08BR4oukcHasDvUWo0zf0 1Sf4C4Fj1u2Jw9h1NcAHYMeOzlfdse3+Q4O+1/oadUJknxdkzjkZFPql10Qrx63Qj5QaO2 GJwVsVLwMcpas7wpEj2yBIA6J+cwzqAwNy5UhI3H2b8jRcC/IJL8pPjruyhX7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821855; a=rsa-sha256; cv=none; b=H/VvDg6RwE7unkMiwgeO8ZeoZV3WmGOFCni0/ZzYLUxe9nFTmxkRD4WBrPlcfBz6Kq8UtG EYd2L1KfpfL36jmYDdegZQW6O99D1l1i/rm3JFBwClv9qDENITWHL2BviGNqZFzhIS5sOJ faAiRB3nPKG0WaIw85NmJ/OrAqEwx9vu9yVaypqEiukQrN/MGPD/YjbKyIjxhOxqdHOnFD qwKniXjZp+sWF0joookzKOC4Nx/yQjEdQgpLW370lYAY9sJJ0u17alV42DCZShlh5012G0 hNBO4htvPYS9VpdKrM2S36eppKlnTOcfmvJVonwXcuNGon9Fa6Hno7TW+XW5Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz25BZvz12Hx for ; Sat, 22 Nov 2025 14:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30529 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:30:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: dd615b57df62 - main - ixl: use newly exposed RSS hash key API rather than ad-hoc hashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd615b57df62e2fa858569d66164dcd1ef840c94 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:30:54 +0000 Message-Id: <6921c91e.30529.57dc3e60@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=dd615b57df62e2fa858569d66164dcd1ef840c94 commit dd615b57df62e2fa858569d66164dcd1ef840c94 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:32 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:32 +0000 ixl: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53094 Sponsored by: Netflix --- sys/dev/ixl/ixl.h | 2 -- sys/dev/ixl/ixl_pf_main.c | 15 ++------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h index ab0f38307d90..e265c8fbe3eb 100644 --- a/sys/dev/ixl/ixl.h +++ b/sys/dev/ixl/ixl.h @@ -98,10 +98,8 @@ #include #include -#ifdef RSS #include #include -#endif #include "ifdi_if.h" #include "i40e_type.h" diff --git a/sys/dev/ixl/ixl_pf_main.c b/sys/dev/ixl/ixl_pf_main.c index b62619ced5cb..674e45823cc4 100644 --- a/sys/dev/ixl/ixl_pf_main.c +++ b/sys/dev/ixl/ixl_pf_main.c @@ -1101,12 +1101,8 @@ ixl_set_rss_key(struct ixl_pf *pf) u32 rss_seed[IXL_RSS_KEY_SIZE_REG]; enum i40e_status_code status; -#ifdef RSS - /* Fetch the configured RSS key */ - rss_getkey((uint8_t *) &rss_seed); -#else - ixl_get_default_rss_key(rss_seed); -#endif + /* Fetch the configured RSS key */ + rss_getkey((uint8_t *) &rss_seed); /* Fill out hash function seed */ if (hw->mac.type == I40E_MAC_X722) { struct i40e_aqc_get_set_rss_key_data key_data; @@ -1132,7 +1128,6 @@ ixl_set_rss_pctypes(struct ixl_pf *pf) struct i40e_hw *hw = &pf->hw; u64 set_hena = 0, hena; -#ifdef RSS u32 rss_hash_config; rss_hash_config = rss_gethashconfig(); @@ -1150,12 +1145,6 @@ ixl_set_rss_pctypes(struct ixl_pf *pf) set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_TCP); if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6) set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_UDP); -#else - if (hw->mac.type == I40E_MAC_X722) - set_hena = IXL_DEFAULT_RSS_HENA_X722; - else - set_hena = IXL_DEFAULT_RSS_HENA_XL710; -#endif hena = (u64)i40e_read_rx_ctl(hw, I40E_PFQF_HENA(0)) | ((u64)i40e_read_rx_ctl(hw, I40E_PFQF_HENA(1)) << 32); hena |= set_hena; From nobody Sat Nov 22 14:30:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz423vCz6HDS4 for ; Sat, 22 Nov 2025 14:30: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDz36SS6z40xQ for ; Sat, 22 Nov 2025 14:30:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VUwMe9BW9lQWvWSpdI0DBoIcgm/Gb8iuBcZOcPpFIi4=; b=fRPCegA6GtpEAGaJ3t3BR+BrlqJEtsM5Tjip+BsFd9RYkWgQotnTewV49fytD38QyLQ8E5 p+alXkZcL3nabvsuP6hoH9+sBCUXNMQXhd8JN5ep6IAbztTo5sYWG1RAbZoQfRK3UPXh7s uTV4mWUtcl45/sT++QUpcn9dbiilCYZSSAc1ngStluJ8FfygtGqi2TEHHXOiQvTjDINoZW ixGhh7LwvDyXdwbtm3EX1yl5j7Io4oIfQU8yHn6WonxG9QWFec85XA9qmNlRNKy7/QILGf mSCrBo8TFQW49VnXdUbnZfMcsn7je3iIKPI1GTd5vVGQQBSx7rFzoK3o6aiCxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VUwMe9BW9lQWvWSpdI0DBoIcgm/Gb8iuBcZOcPpFIi4=; b=YbK6yooVaSJCjzwatPBqKwkhnc5UWPXbK6H3U9jyNUC0e9BowD88ZOEVUJEWTmdV2WT5Ul Xr0SFc7k5VhhJeq3y8+q2jNA+9it6M9oUYtoy+3QO/PvI5OkGaiev72U84CQMf6Rk5/m7F J7z3K6Bo2BznbX5jbwbf0/+HaEDCI5O3TuRMpcWYRioLBh/lsXVbFT+mTfxDZyKXyZJkdT DsgXpEsGE8InJ+gTHIqc9L7N8Oeh9VQ8DHO5LZZ+QRWTsjDVUfiACR+UapkwRsCy8uXGxG eYLu9drgjk/T54m9CdGTAAVYX65O5X+BYXOr/yryhfeGB+UWx1QylB8i0qinkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821855; a=rsa-sha256; cv=none; b=ouXYQp7BXjO3AQlHoJJu+StHtOERCi0rNbKvOnW3IkHNr3uHxrMKmzqbSizaBEvKEh7vBo nu4VBATiao2I1iPQr3Q/noFJ2T9gh31EPTB5m2dWacWaUSOP77P2NEBcvlU7rYfJRrREQh mnhIlxOHsmDO5rbjZaweJRv3sUOcrvF8IH9QlcRwENCBLYyLQTSKHwWRc80CV0oNMuPnWL WYL2uGcsCesxyc5NFo3K0Ckr0JgL9lxT5Vp7Ri7WuD6haHQAARglAsZlqg84YCTcghxloG CjswwkoQvgfjk7oddf9QX4New0PNr98vNPWDcdEw10Lefo4ifM0l8xn8igBOnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz35zXwz11st for ; Sat, 22 Nov 2025 14:30:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f7be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:30:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: d2790dc77ef6 - main - iavf: use newly exposed RSS hash key API rather than ad-hoc hashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2790dc77ef667d3477017b37db85378ce0bca8c Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:30:55 +0000 Message-Id: <6921c91f.2f7be.28d09069@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=d2790dc77ef667d3477017b37db85378ce0bca8c commit d2790dc77ef667d3477017b37db85378ce0bca8c Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:33 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:33 +0000 iavf: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53095 Sponsored by: Netflix --- sys/dev/iavf/iavf_lib.c | 10 ---------- sys/dev/iavf/iavf_lib.h | 2 -- 2 files changed, 12 deletions(-) diff --git a/sys/dev/iavf/iavf_lib.c b/sys/dev/iavf/iavf_lib.c index 433d31904ea4..8596cf71bfff 100644 --- a/sys/dev/iavf/iavf_lib.c +++ b/sys/dev/iavf/iavf_lib.c @@ -1079,9 +1079,7 @@ iavf_config_rss_reg(struct iavf_sc *sc) u64 set_hena = 0, hena; int i, j, que_id; u32 rss_seed[IAVF_RSS_KEY_SIZE_REG]; -#ifdef RSS u32 rss_hash_config; -#endif /* Don't set up RSS if using a single queue */ if (IAVF_NRXQS(vsi) == 1) { @@ -1091,19 +1089,14 @@ iavf_config_rss_reg(struct iavf_sc *sc) return; } -#ifdef RSS /* Fetch the configured RSS key */ rss_getkey((uint8_t *) &rss_seed); -#else - iavf_get_default_rss_key(rss_seed); -#endif /* Fill out hash function seed */ for (i = 0; i < IAVF_RSS_KEY_SIZE_REG; i++) wr32(hw, IAVF_VFQF_HKEY(i), rss_seed[i]); /* Enable PCTYPES for RSS: */ -#ifdef RSS rss_hash_config = rss_gethashconfig(); if (rss_hash_config & RSS_HASHTYPE_RSS_IPV4) set_hena |= ((u64)1 << IAVF_FILTER_PCTYPE_NONF_IPV4_OTHER); @@ -1119,9 +1112,6 @@ iavf_config_rss_reg(struct iavf_sc *sc) set_hena |= ((u64)1 << IAVF_FILTER_PCTYPE_NONF_IPV6_TCP); if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6) set_hena |= ((u64)1 << IAVF_FILTER_PCTYPE_NONF_IPV6_UDP); -#else - set_hena = IAVF_DEFAULT_RSS_HENA_XL710; -#endif hena = (u64)rd32(hw, IAVF_VFQF_HENA(0)) | ((u64)rd32(hw, IAVF_VFQF_HENA(1)) << 32); hena |= set_hena; diff --git a/sys/dev/iavf/iavf_lib.h b/sys/dev/iavf/iavf_lib.h index 48c0f4560e5a..955f5c69288b 100644 --- a/sys/dev/iavf/iavf_lib.h +++ b/sys/dev/iavf/iavf_lib.h @@ -42,9 +42,7 @@ #include #include #include -#ifdef RSS #include -#endif #include "iavf_debug.h" #include "iavf_osdep.h" From nobody Sat Nov 22 14:30:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz4639rz6HDD6 for ; Sat, 22 Nov 2025 14:30: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDz43fc5z40d2 for ; Sat, 22 Nov 2025 14:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUTSvN+2lO7E0L/whrzx78zHPzCpnyyTllXYCBO/hwA=; b=XOU9xEFaD4xG+gVMkeoxCAVORdwU0CRUJniNl+cWf4rjQdAJJrLI83bSULRS6evjvF+aBw dwosG6YAzLq3vjxz2Caf0SNwY9IA7z3x99qCy4UdExD1vW8aJBbFVDMrfp82WWLSJZ96zC lF8HWxI4Cv55cv5UpJZarRs9KuOcHxFjKAeMelpuY3YgTdcKWqxbgwZ+nDNB9Yp/oqJcv8 rfM6vwE1BsnHqRzyPobiz/GsFwK45ySY53tlaDQGN9Fat60ug/ufDmAxIRF5tvWwAFgHrm mEbjp5ePkIPvPkshLQry/bad8/ktHdh0nyAmE0QhTrctMwo/LgcwdeLu0XKXBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUTSvN+2lO7E0L/whrzx78zHPzCpnyyTllXYCBO/hwA=; b=wSQ+bSdoqjsY3BoHY3zHDAiDLhklytk/iKP6JD5kopcm2o3mmXVlKVMFBxr92RTnj6FwqI rmSmAd5wEsbNKAZRB8uK744B7DHynewCDOqhgJ0fIGCzGdfqCrAY5kodq1uXTNVhuTRsNj tXNFsIXMregeJ82x473CatWnfw/GCxF+FIEuxl10oKs1Mdrs8U5EKEJHtTGzZz2vFR2LaT fsOD/8yt1q0YXj7YiGs4Z3JBxwvlSqkm0GwLl4TD7ry4HmqXXtgwMBCJDbrfhISefoYZQ3 +tULCWVRrXbh8GsYQcYBDA+NEUpGBYaNs7H6izI01qVbpVpLyL/VgXmRoq/wDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821856; a=rsa-sha256; cv=none; b=RquIv6xEk40mqhBDZki5mdsdTJLkm+OoMeLaK70ImF4jGheXm9gvXYmUityTBK+Okva8ep LatPRTIQfi+duB5IJ9owNiiM2Uhg4TIWxuNsdA9GlE35O1cyUTNn30ariAWVvc6Kzk1rNg S0NU7ySh5YdPlyEqoF4Qh0ByxyQUNytNIgQujCDYEF9f5JtuF8sS/YpoBF7tF6jTgbek84 x6Q6bB0fY+m1dSA8g4B3hKS6D27GKZT84D8oU5Hbn5n8/JeN/E92sIZzKNgRDIzGbBR30v sU2R3RKSwcc9CdrzvQ9amMt1yQdFC40DP1HeotUyvE23DT8HMM8pPlk3tpHyMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz4368rz11sw for ; Sat, 22 Nov 2025 14:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f53c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:30:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: d9c55b2e8cd6 - main - rss: Enable portions of RSS globally to enable symmetric hashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9c55b2e8cd6b79f6926278e10a79f1bcca27a4b Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:30:51 +0000 Message-Id: <6921c91b.2f53c.60323437@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=d9c55b2e8cd6b79f6926278e10a79f1bcca27a4b commit d9c55b2e8cd6b79f6926278e10a79f1bcca27a4b Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:31 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:31 +0000 rss: Enable portions of RSS globally to enable symmetric hashing We use the fact that all NICs that support hashing are using the same hash algorithm and hash key to enable symmetic hashing in TCP, where a software version of the same hash is used to establish hashes on outgoing connections. Sponsored by: Netflix Reviewed by: adrian, zlei (both early version) Differential Revision: https://reviews.freebsd.org/D53089 --- sys/conf/files | 8 +++--- sys/net/rss_config.c | 66 +++++++++++++++++++++++++++++++------------------- sys/net/rss_config.h | 20 +++++++++------ sys/netinet/in_rss.c | 3 +++ sys/netinet6/in6_rss.c | 3 +++ 5 files changed, 63 insertions(+), 37 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 53fcb80f2b8d..3314274b47a8 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4238,10 +4238,10 @@ net/route/route_rtentry.c standard net/route/route_subscription.c standard net/route/route_tables.c standard net/route/route_temporal.c standard -net/rss_config.c optional inet rss | inet6 rss +net/rss_config.c standard net/rtsock.c standard net/slcompress.c optional netgraph_vjc -net/toeplitz.c optional inet rss | inet6 rss | route_mpath +net/toeplitz.c optional inet | inet6 | route_mpath net/vnet.c optional vimage net80211/ieee80211.c optional wlan net80211/ieee80211_acl.c optional wlan wlan_acl @@ -4384,7 +4384,7 @@ netinet/in_pcb.c optional inet | inet6 netinet/in_prot.c optional inet | inet6 netinet/in_proto.c optional inet | inet6 netinet/in_rmx.c optional inet -netinet/in_rss.c optional inet rss +netinet/in_rss.c optional inet netinet/ip_divert.c optional ipdivert inet | ipdivert inet6 netinet/ip_ecn.c optional inet | inet6 netinet/ip_encap.c optional inet | inet6 @@ -4486,7 +4486,7 @@ netinet6/in6_mcast.c optional inet6 netinet6/in6_pcb.c optional inet6 netinet6/in6_proto.c optional inet6 netinet6/in6_rmx.c optional inet6 -netinet6/in6_rss.c optional inet6 rss +netinet6/in6_rss.c optional inet6 netinet6/in6_src.c optional inet6 netinet6/ip6_fastfwd.c optional inet6 netinet6/ip6_forward.c optional inet6 diff --git a/sys/net/rss_config.c b/sys/net/rss_config.c index 266ea57b2dc9..9e4120a4e9dd 100644 --- a/sys/net/rss_config.c +++ b/sys/net/rss_config.c @@ -29,6 +29,8 @@ #include "opt_inet6.h" +#include "opt_inet.h" +#include "opt_rss.h" #include #include @@ -72,6 +74,10 @@ * placement and pcbgroup expectations. */ +#if !defined(INET) && !defined(INET6) +#define _net_inet _net +#define _net_inet_rss _net_rss +#endif SYSCTL_DECL(_net_inet); SYSCTL_NODE(_net_inet, OID_AUTO, rss, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "Receive-side steering"); @@ -84,6 +90,7 @@ static u_int rss_hashalgo = RSS_HASH_TOEPLITZ; SYSCTL_INT(_net_inet_rss, OID_AUTO, hashalgo, CTLFLAG_RDTUN, &rss_hashalgo, 0, "RSS hash algorithm"); +#ifdef RSS /* * Size of the indirection table; at most 128 entries per the RSS spec. We * size it to at least 2 times the number of CPUs by default to allow useful @@ -132,6 +139,7 @@ static const u_int rss_basecpu; SYSCTL_INT(_net_inet_rss, OID_AUTO, basecpu, CTLFLAG_RD, __DECONST(int *, &rss_basecpu), 0, "RSS base CPU"); +#endif /* * Print verbose debugging messages. * 0 - disable @@ -159,6 +167,7 @@ static uint8_t rss_key[RSS_KEYSIZE] = { 0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa, }; +#ifdef RSS /* * RSS hash->CPU table, which maps hashed packet headers to particular CPUs. * Drivers may supplement this table with a separate CPU<->queue table when @@ -168,13 +177,15 @@ struct rss_table_entry { uint8_t rte_cpu; /* CPU affinity of bucket. */ }; static struct rss_table_entry rss_table[RSS_TABLE_MAXLEN]; +#endif static void rss_init(__unused void *arg) { +#ifdef RSS u_int i; u_int cpuid; - +#endif /* * Validate tunables, coerce to sensible values. */ @@ -189,6 +200,7 @@ rss_init(__unused void *arg) rss_hashalgo = RSS_HASH_TOEPLITZ; } +#ifdef RSS /* * Count available CPUs. * @@ -248,7 +260,7 @@ rss_init(__unused void *arg) rss_table[i].rte_cpu = cpuid; cpuid = CPU_NEXT(cpuid); } - +#endif /* RSS */ /* * Randomize rrs_key. * @@ -292,6 +304,30 @@ rss_hash(u_int datalen, const uint8_t *data) } } +/* + * Query the current RSS key; likely to be used by device drivers when + * configuring hardware RSS. Caller must pass an array of size RSS_KEYSIZE. + * + * XXXRW: Perhaps we should do the accept-a-length-and-truncate thing? + */ +void +rss_getkey(uint8_t *key) +{ + + bcopy(rss_key, key, sizeof(rss_key)); +} + +/* + * Query the RSS hash algorithm. + */ +u_int +rss_gethashalgo(void) +{ + + return (rss_hashalgo); +} + +#ifdef RSS /* * Query the number of RSS bits in use. */ @@ -406,29 +442,6 @@ rss_m2bucket(struct mbuf *m, uint32_t *bucket_id) bucket_id)); } -/* - * Query the RSS hash algorithm. - */ -u_int -rss_gethashalgo(void) -{ - - return (rss_hashalgo); -} - -/* - * Query the current RSS key; likely to be used by device drivers when - * configuring hardware RSS. Caller must pass an array of size RSS_KEYSIZE. - * - * XXXRW: Perhaps we should do the accept-a-length-and-truncate thing? - */ -void -rss_getkey(uint8_t *key) -{ - - bcopy(rss_key, key, sizeof(rss_key)); -} - /* * Query the number of buckets; this may be used by both network device * drivers, which will need to populate hardware shadows of the software @@ -454,6 +467,7 @@ rss_getnumcpus(void) return (rss_ncpus); } +#endif /* * Return the supported RSS hash configuration. * @@ -517,6 +531,7 @@ SYSCTL_PROC(_net_inet_rss, OID_AUTO, key, CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, sysctl_rss_key, "", "RSS keying material"); +#ifdef RSS static int sysctl_rss_bucket_mapping(SYSCTL_HANDLER_ARGS) { @@ -544,3 +559,4 @@ sysctl_rss_bucket_mapping(SYSCTL_HANDLER_ARGS) SYSCTL_PROC(_net_inet_rss, OID_AUTO, bucket_mapping, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, sysctl_rss_bucket_mapping, "", "RSS bucket -> CPU mapping"); +#endif diff --git a/sys/net/rss_config.h b/sys/net/rss_config.h index 07c2d09b44c5..aaa282b12e72 100644 --- a/sys/net/rss_config.h +++ b/sys/net/rss_config.h @@ -104,6 +104,7 @@ extern int rss_debug; +#ifdef RSS /* * Device driver interfaces to query RSS properties that must be programmed * into hardware. @@ -112,16 +113,8 @@ u_int rss_getbits(void); u_int rss_getbucket(u_int hash); u_int rss_get_indirection_to_bucket(u_int index); u_int rss_getcpu(u_int bucket); -void rss_getkey(uint8_t *key); -u_int rss_gethashalgo(void); u_int rss_getnumbuckets(void); u_int rss_getnumcpus(void); -u_int rss_gethashconfig(void); - -/* - * Hash calculation functions. - */ -uint32_t rss_hash(u_int datalen, const uint8_t *data); /* * Network stack interface to query desired CPU affinity of a packet. @@ -132,4 +125,15 @@ int rss_hash2bucket(uint32_t hash_val, uint32_t hash_type, uint32_t *bucket_id); int rss_m2bucket(struct mbuf *m, uint32_t *bucket_id); +#endif /* RSS */ + +void rss_getkey(uint8_t *key); +u_int rss_gethashalgo(void); +u_int rss_gethashconfig(void); +/* + * Hash calculation functions. + */ +uint32_t rss_hash(u_int datalen, const uint8_t *data); + + #endif /* !_NET_RSS_CONFIG_H_ */ diff --git a/sys/netinet/in_rss.c b/sys/netinet/in_rss.c index f93a1d2bfd7b..4854265bd9f4 100644 --- a/sys/netinet/in_rss.c +++ b/sys/netinet/in_rss.c @@ -29,6 +29,7 @@ #include "opt_inet6.h" +#include "opt_rss.h" #include #include @@ -350,6 +351,7 @@ rss_mbuf_software_hash_v4(const struct mbuf *m, int dir, uint32_t *hashval, } } +#ifdef RSS /* * Similar to rss_m2cpuid, but designed to be used by the IP NETISR * on incoming frames. @@ -387,3 +389,4 @@ rss_soft_m2cpuid_v4(struct mbuf *m, uintptr_t source, u_int *cpuid) } return (m); } +#endif diff --git a/sys/netinet6/in6_rss.c b/sys/netinet6/in6_rss.c index 79c7bfa6e68c..3d98d0065d1e 100644 --- a/sys/netinet6/in6_rss.c +++ b/sys/netinet6/in6_rss.c @@ -29,6 +29,7 @@ #include "opt_inet6.h" +#include "opt_rss.h" #include #include @@ -375,6 +376,7 @@ rss_mbuf_software_hash_v6(const struct mbuf *m, int dir, uint32_t *hashval, } } +#ifdef RSS /* * Similar to rss_m2cpuid, but designed to be used by the IPv6 NETISR * on incoming frames. @@ -412,3 +414,4 @@ rss_soft_m2cpuid_v6(struct mbuf *m, uintptr_t source, u_int *cpuid) } return (m); } +#endif From nobody Sat Nov 22 14:30:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz52pbdz6HDS9 for ; Sat, 22 Nov 2025 14:30: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDz50HrXz40dP for ; Sat, 22 Nov 2025 14:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+bMoTK6tidDm9lrZ9egm4NQhVCKlCBoWQTsGK5Gh6M4=; b=Cv3EBhvLIceWwzqqmmIRhN0FLsa5py1ugWy8ZmoK59JCuuHU2smsx+q4DXxMV8rhrRJqL3 taNY6r0xkNgrLrysWOPTCsyGI9LLk4BBRXypQvKgReLxiwxh41MNZgPdrDb/OblZ+gTEbw h7NHNAZmLkkrDL+fGPomAc+weLJAFabmrdJoYYGT+XJRL6NnryqYb5V3U73HMRfFvUG/EZ zadh0ILfunSnAuhIHt0Gt8NxRaST/rEpGkP0jTqX0LaETu+Fv/tGo4uCMbUrNtDV5Z4cxh cb6RU6fuqWz6JVNrMwtAqXju2sBwGfIKyZsXDQIYswDk4xcaAf+U1OVywg8l1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+bMoTK6tidDm9lrZ9egm4NQhVCKlCBoWQTsGK5Gh6M4=; b=lx9PAeibtDKKGDOzxfNbUS8i624r+odgZyDbKCZAJsP6/AWhqg18+b6ITgaU64Z11UrwdI v8tv05gsy5xtaU/VAwAU+rbtlsTA8EBoLLOSYxF0XAufZO0lXT81EfRFbUvfUx8m1t/7iL CysG8kSh8AW1Fd1Ia/BybmGBr2bZcomEWrVDUaiCkmULQjPxi9vDmA910BNdofg57iwp/A Nz/WGRerp4xKISOTCb32escAjIfnO5lhVrbGdOpBnHRjimcE97FzFBjXzTBW0n4oglSo/R 1UsudDKyMaxGYXfldgWWG/5yb32m6sOBbBmUwQExzpTRKDPGISI4nkr37OT01A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821857; a=rsa-sha256; cv=none; b=dK0cwGtOfrE5HBcgXxes9/dH3wEtBmie/Y4kWK2//hhp6bQ7q44lh3jhRuc75m/DDTJTq0 Ov0va2ZggUnB2d4ajNAJALn6BWqKlbiTg2/iMsaPoYV/mlBC2J+Co+BzuTx8n3d8L73Vn3 LaQFLupkvUsQVLD7PIE1debm9HaVS7PEMhmO2Q4fyNrYHMCLWwWh74SNXPgLw45Q0pAl5e jbiAVj2MTnnzReDoPk2UNdPcYPQyRfJKmVvQ2RI5sw5eaz57P0Ns+TP1blmM+lTZ1CihfC jbEXsSqzOvIb5WECsIKVacqtS1YqyDypvOi33MOHl7uSb9QgL+8ZR1u3uEiTWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz46mxYz128S for ; Sat, 22 Nov 2025 14:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 308a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:30:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 012ecdde3a81 - main - ice: use newly exposed RSS hash key API rather than ad-hoc hashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 012ecdde3a810c52cc2f68a22afa1a1b7d699bff Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:30:56 +0000 Message-Id: <6921c920.308a4.39021509@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=012ecdde3a810c52cc2f68a22afa1a1b7d699bff commit 012ecdde3a810c52cc2f68a22afa1a1b7d699bff Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:33 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:33 +0000 ice: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53096 Sponsored by: Netflix --- sys/dev/ice/ice_rss.h | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/sys/dev/ice/ice_rss.h b/sys/dev/ice/ice_rss.h index df485f4b1f5a..4efebb362025 100644 --- a/sys/dev/ice/ice_rss.h +++ b/sys/dev/ice/ice_rss.h @@ -42,36 +42,17 @@ #ifndef _ICE_RSS_H_ #define _ICE_RSS_H_ -#ifdef RSS -// We have the kernel RSS interface available #include /* Make sure our key size buffer has enough space to store the kernel RSS key */ CTASSERT(ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE >= RSS_KEYSIZE); -#else -/* The kernel RSS interface is not enabled. Use suitable defaults for the RSS - * configuration functions. - * - * The RSS hash key will be a pre-generated random key. - * The number of buckets will just match the number of CPUs. - * The lookup table will be assigned using round-robin with no indirection. - * The RSS hash configuration will be set to suitable defaults. - */ -#define RSS_HASHTYPE_RSS_IPV4 (1 << 1) /* IPv4 2-tuple */ -#define RSS_HASHTYPE_RSS_TCP_IPV4 (1 << 2) /* TCPv4 4-tuple */ -#define RSS_HASHTYPE_RSS_IPV6 (1 << 3) /* IPv6 2-tuple */ -#define RSS_HASHTYPE_RSS_TCP_IPV6 (1 << 4) /* TCPv6 4-tuple */ -#define RSS_HASHTYPE_RSS_IPV6_EX (1 << 5) /* IPv6 2-tuple + ext hdrs */ -#define RSS_HASHTYPE_RSS_TCP_IPV6_EX (1 << 6) /* TCPv6 4-tiple + ext hdrs */ -#define RSS_HASHTYPE_RSS_UDP_IPV4 (1 << 7) /* IPv4 UDP 4-tuple */ -#define RSS_HASHTYPE_RSS_UDP_IPV6 (1 << 9) /* IPv6 UDP 4-tuple */ -#define RSS_HASHTYPE_RSS_UDP_IPV6_EX (1 << 10) /* IPv6 UDP 4-tuple + ext hdrs */ - -#define rss_getkey(key) ice_get_default_rss_key(key) +#ifdef RSS +/* RSS CPU/bucket mapping functions - only available with options RSS */ +#else +/* Stub CPU/bucket functions when RSS not configured */ #define rss_getnumbuckets() (mp_ncpus) #define rss_get_indirection_to_bucket(index) (index) -#define rss_gethashconfig() (ICE_DEFAULT_RSS_HASH_CONFIG) /** * rss_hash2bucket - Determine the bucket for a given hash value @@ -102,7 +83,6 @@ rss_hash2bucket(uint32_t hash_val, uint32_t hash_type, uint32_t *bucket_id) return (-1); } } - #endif /* !RSS */ #define ICE_DEFAULT_RSS_HASH_CONFIG \ From nobody Sat Nov 22 14:30:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz63FG4z6HDSC for ; Sat, 22 Nov 2025 14:30: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDz612f6z40xg for ; Sat, 22 Nov 2025 14:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wswTZR3n95kjN86pDJhpecvqfkF6pLo6KvVdFCKdS/M=; b=CxF7QgOLaVvS89P6UdVcy+8qKLBXsF5XBZDsL+S7jkR0ntlWy+VGJl0WKoZt61GGNjuk3O r4uj45Uy428P4IAEc/FP1KgDBElV+MToTRqvBrUu9sw7a4HU6Crwh5Hmk6FY/lOTknTIWA 13vm8h26QkNO6yBUnRJpXWy8h0V4SL7+YVED4c/k1KCfu/mJe405zkThcCEWfunINH9tuN sMrlZfZJDXAjlUlcB6LFJZIWYHPypZHFmWaTG8i3gW4eD4at2IdV2/jrWTNuEkmISfgglp /8pO5FFMoBW1yWDMnpbJm+NlixH65qIOvvTkP9xna8LQMtPpgPX4+NCXfajjrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wswTZR3n95kjN86pDJhpecvqfkF6pLo6KvVdFCKdS/M=; b=PMwU90aDR5mZuzMkAbX2NedPcznMxb5EPEDqurbCVLNgYe8YdqLzM0M/hxf7a4IDz0vKP1 /rcLPI77mfackp7gFZGdZUJSozoSazSVAptQUgpDLW8YZJ5Isj33gAPRsg3jh+Vp0wr0tn zU1jPDizgee4QqCtVs99mP6hiLXX2mM0oh9elF9rXpkv4kYwk4epHsNzSOX6+TPITg3ynr 0jLvXHu0at0s4AFk1d93FryXGz5ES5k3xkR1W1nG20XjIcCcqL0WvfW09v0PaNvd81mKc+ H6rv6tKc39NITwx89wcFJ2/FWjOTivPxQWVwQ+e2c8UMLP3pw/Nq1LigXrhEtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821858; a=rsa-sha256; cv=none; b=CfK7qZ4ViB4g4dDoGvSzM7N+/WRzCt9/q8SKfPcaQ/ux748lbNwBU8Qjahr4u7zeYi3sTE 2PLhY+C9X6/JZ2xHu3BRuwgbxxMXMcKs0JaLAqbmaYoq1DYnP/MMB+KjRXrELs+EGUWFOh ICN3BaCcDXLp0RPPTKmaM3jTEJQnQ/B9srZ/iH2Jw4kbYLzqJxln+rQpT7s1mZKeaHQxaD DduQfCno5qXWoqzDO3xWeRQWG9fWn+yqhGi9xi1OgRlKbLDbHIHcrbJVaaf2B0aEV0kDvt +QU9+qJ3vhRjNzuzjSghqANxPvdWvfjZScZC866peHJfS1l8dx8b0+6Ed6JJMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz60F98z128T for ; Sat, 22 Nov 2025 14:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30a74 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:30:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: e07b4a2e9bc4 - main - e1000: use newly exposed RSS hash key API rather than ad-hoc hashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e07b4a2e9bc4f6b2e129f3a101dfce2027694bd3 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:30:58 +0000 Message-Id: <6921c922.30a74.4faaae18@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=e07b4a2e9bc4f6b2e129f3a101dfce2027694bd3 commit e07b4a2e9bc4f6b2e129f3a101dfce2027694bd3 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:33 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:33 +0000 e1000: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53097 Reviewed by: kbowling Sponsored by: Netflix --- sys/dev/e1000/em_txrx.c | 2 -- sys/dev/e1000/if_em.c | 4 ---- sys/dev/e1000/if_em.h | 2 -- sys/dev/e1000/igb_txrx.c | 2 -- 4 files changed, 10 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index ced8d0f41d14..647255417b3e 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -29,10 +29,8 @@ #include "if_em.h" -#ifdef RSS #include #include -#endif #ifdef VERBOSE_DEBUG #define DPRINTF device_printf diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 02f4c431badd..bc841ba87ceb 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -3415,12 +3415,8 @@ igb_initialize_rss_mapping(struct e1000_softc *sc) */ mrqc = E1000_MRQC_ENABLE_RSS_MQ; -#ifdef RSS /* XXX ew typecasting */ rss_getkey((uint8_t *) &rss_key); -#else - arc4rand(&rss_key, sizeof(rss_key), 0); -#endif for (i = 0; i < 10; i++) E1000_WRITE_REG_ARRAY(hw, E1000_RSSRK(0), i, rss_key[i]); diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index 582e8d9c6327..4c80c7696952 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -72,10 +72,8 @@ #include #include #include -#ifdef RSS #include #include -#endif #include #include diff --git a/sys/dev/e1000/igb_txrx.c b/sys/dev/e1000/igb_txrx.c index 568d84807173..46fe5c741055 100644 --- a/sys/dev/e1000/igb_txrx.c +++ b/sys/dev/e1000/igb_txrx.c @@ -28,10 +28,8 @@ #include "if_em.h" -#ifdef RSS #include #include -#endif #ifdef VERBOSE_DEBUG #define DPRINTF device_printf From nobody Sat Nov 22 14:30:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz75MkLz6HDKC for ; Sat, 22 Nov 2025 14:30: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDz71WTwz40s5 for ; Sat, 22 Nov 2025 14:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ATK9UpaOCZfhdJEYJcmAmaiOfYhCVGhT9V/qYLJAOjA=; b=DZ8A2ncEClxtUJtqyHOxkTA76tn1mWvFAVLjFOks2a8bhd2+GebAsSqJiRAaWH4DrIpUV7 sxkCr6SrBrN2pYcNfQxYioOQ6Ext9Qvf9jdM1qNvksP3Yysbq8hN2VM/+6S0BiLDcM7dwM TFAMHH2kb6aSzZGjjFB+4FAD4F3ADKEeQrp26tL+lINJZmg3CusBLKPVli7IzcAYkFfd3H tUN3WskzzqJRAhqUGW3UM9zE5EfMMjCmfvhh+CCsF8DRj1XJ1OLH05gO+DQc+8Q9KiBIVG ZABtS8vb2Mg4go8thZr5VG5vZFPou5TKYdeAEAtp8f+cYRoxGAKeLDxxVLcI8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ATK9UpaOCZfhdJEYJcmAmaiOfYhCVGhT9V/qYLJAOjA=; b=LJGGLpMx03cc3XSC6sqEuuBrPj8c1E2ahx5XEkyXezDhBCQdGkYtUvN6urkddifzQhd80I A1VOVy0P21Thp1KmKDdqlkhXI8H2KKSm6KcQIZYnIPvM0Qv3W8BjvDtJHKecfgRStbsMH+ v/utTMuEHqk9Z72tsQfEwEFMsDDboml3AuAA4xcZJjSiExnKmNmLMg0YK1S9hVtGC/ohwH Bzvd7Mq740l19n4+dWr5IwOB5XnRIL29YtS5aMRt5JQx+w5pwQZCeMYFic8EZu6I7Se4zL 7m6P/dE84YyIeh6oecrqkZvt0MIUoMIeQnArEs1A/kqpC/3yV/hr3jGADfwk4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821859; a=rsa-sha256; cv=none; b=t6N7YiZKjlcQmpf+qWZDW4AUcIc9bXAkrpzOqIQpPCBnYJGwTGt4ivubOX3ez3lSNwhYpK a3KRG7Ur08vzsrBy0pyiCdTXqp8vyAVtqe/8y2ivsVQP6kP++IKwrmhnSMKZ+If3XH7NXy LuClanfVG2OuDOfW1hBdh2mlty1tGV/Dk9cIupziC/Pca6yfSZB+6lyyec/i0KOP26qegM pFxbhd002LjYZcCL9M/dd7na6m92IUnNkm8axQLtgFxdU8Q8IafC953CNgHtMksgQKFHrC px20Evu4Pxv3mMb6xE7AL3gD9AbOyRKBaNkDzghTupA4LkZ84uUO8pvJh7W7tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz714LRz12CP for ; Sat, 22 Nov 2025 14:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3048c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:30:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: e10e0c63f0e4 - main - vmxnet3: use newly exposed RSS hash key API rather than ad-hoc hashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e10e0c63f0e40043c589e00cdeef6c5574c72858 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:30:59 +0000 Message-Id: <6921c923.3048c.525c15e@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=e10e0c63f0e40043c589e00cdeef6c5574c72858 commit e10e0c63f0e40043c589e00cdeef6c5574c72858 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:34 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:34 +0000 vmxnet3: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53098 Reviewed by: tuexen Sponsored by: Netflix --- sys/dev/vmware/vmxnet3/if_vmx.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c index 1a314ca6660e..c3706ed24ff5 100644 --- a/sys/dev/vmware/vmxnet3/if_vmx.c +++ b/sys/dev/vmware/vmxnet3/if_vmx.c @@ -46,9 +46,7 @@ #include #include #include -#ifdef RSS #include -#endif #include #include @@ -1141,18 +1139,6 @@ vmxnet3_init_shared_data(struct vmxnet3_softc *sc) static void vmxnet3_reinit_rss_shared_data(struct vmxnet3_softc *sc) { - /* - * Use the same key as the Linux driver until FreeBSD can do - * RSS (presumably Toeplitz) in software. - */ - static const uint8_t rss_key[UPT1_RSS_MAX_KEY_SIZE] = { - 0x3b, 0x56, 0xd1, 0x56, 0x13, 0x4a, 0xe7, 0xac, - 0xe8, 0x79, 0x09, 0x75, 0xe8, 0x65, 0x79, 0x28, - 0x35, 0x12, 0xb9, 0x56, 0x7c, 0x76, 0x4b, 0x70, - 0xd8, 0x56, 0xa3, 0x18, 0x9b, 0x0a, 0xee, 0xf3, - 0x96, 0xa6, 0x9f, 0x8f, 0x9e, 0x8c, 0x90, 0xc9, - }; - if_softc_ctx_t scctx; struct vmxnet3_rss_shared *rss; #ifdef RSS @@ -1169,16 +1155,18 @@ vmxnet3_reinit_rss_shared_data(struct vmxnet3_softc *sc) rss->hash_func = UPT1_RSS_HASH_FUNC_TOEPLITZ; rss->hash_key_size = UPT1_RSS_MAX_KEY_SIZE; rss->ind_table_size = UPT1_RSS_MAX_IND_TABLE_SIZE; -#ifdef RSS /* - * If the software RSS is configured to anything else other than - * Toeplitz, then just do Toeplitz in "hardware" for the sake of - * the packet distribution, but report the hash as opaque to - * disengage from the software RSS. + * Always use the kernel RSS key for consistent hashing. + * If software RSS is configured to Toeplitz and RSS CPU steering + * is available, use the RSS indirection table. Otherwise use + * simple round-robin but still report hash as opaque to disengage + * from software RSS when CPU steering is not available. */ + rss_getkey(rss->hash_key); + +#ifdef RSS rss_algo = rss_gethashalgo(); if (rss_algo == RSS_HASH_TOEPLITZ) { - rss_getkey(rss->hash_key); for (i = 0; i < UPT1_RSS_MAX_IND_TABLE_SIZE; i++) { rss->ind_table[i] = rss_get_indirection_to_bucket(i) % scctx->isc_nrxqsets; @@ -1187,7 +1175,6 @@ vmxnet3_reinit_rss_shared_data(struct vmxnet3_softc *sc) } else #endif { - memcpy(rss->hash_key, rss_key, UPT1_RSS_MAX_KEY_SIZE); for (i = 0; i < UPT1_RSS_MAX_IND_TABLE_SIZE; i++) rss->ind_table[i] = i % scctx->isc_nrxqsets; sc->vmx_flags &= ~VMXNET3_FLAG_SOFT_RSS; From nobody Sat Nov 22 14:31:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz857bZz6HDMG for ; Sat, 22 Nov 2025 14:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDz82Q51z40f6 for ; Sat, 22 Nov 2025 14:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PDY1a0zuBGVHLUjA79tKaQBFDa5BiIAKjfCFmEwlZo4=; b=CPbuvuD+0xaEjZb0l7cnEUV1A17B+U6FPxnEglZ1h3q3tL8hfmONx6glMm4GpQPhwh85hW 7ZifGERJP2RH+1xPylbucrI7IgSDM4egTglvw9VuUU/Llbhygep0GRraEmB6SlU8mEd0Ce 5ZROxs/bEPcZTQz33eW0QT1TnDAOqTw9dJIF6qC41VZ3AtT9vaCUacGP9l2rO3PeZ3lwK9 tWJlJ5pnuZ/AyBfWyN/PDpQyEzylXdHXfbAo87c7JAos6IjrO0/scmbWUm3sLLNHQLQpwB nS18D3OdtwZv6MN7TFulkTcl1LCd+a6lnEK5JiOx5g6yuUmeq7gtPMpd2uFs2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PDY1a0zuBGVHLUjA79tKaQBFDa5BiIAKjfCFmEwlZo4=; b=eZhDwvvSO0UuMy15r93TZH9nyNHbKVtCU0+ZLJ2A2K4h3cnKgzjEwNl0kqyCdXFvw5tEfh 9YY82qKHZzi5/H8TU52ou7Rfhe7Men3d6qaVtOLfnIWu2mKvILQtO5VaqMZEaW0RBYnPfh Oj1RF6M1vmCi5yS+8882zTYKpE1oTu5dXlrBMhAkkCea/8Mh1CrBZ+u/3z+GfXPdhYynTt 6YB7DvidmSga3ssIer19q43gjWtwrQFWtWxgtl9slyLI61N/UNd7z3Wu1vzAJAGe4WWbIu ZBWUyic+N5bKSksuzb9bnhBFEB1wfKrNq5eRPgY7VMNYjvMw1sKovDS29tlsIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821860; a=rsa-sha256; cv=none; b=vZRH2gUpbuh5JwF0kbTtV4P5q1ThWh1Dc/doQiMc8hr74BKnGL1dhAIlhebTavciENobWj svBvfNDR3NhNZeFbfnHy0QG02iBmIuAC2DYKOelk3u13EEQeoaWs7FHjWwcP7ogC47fx2+ xAEAnXV2ozSmMCWKpXxpinq3IZvl/8AItAV0q5ck6KsJQVCSZb3HShmzamKqAdasIc0jW3 FZeIaTvb0K4lbv0HgJQR99LmfijCJvwIdu9ghE/045hjJ1NHApWTcgAzu5xVfDsXsW7XyY ZK9on8pRZX0LhtQZu13ZtOUCZlAwBi71TCTBQLlcMGJrGdMwinvISDespx1ewQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz81vMwz12CQ for ; Sat, 22 Nov 2025 14:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f35e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:31:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 2ae6227ddfb8 - main - hn: use newly exposed RSS hash key API rather than ad-hoc hashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ae6227ddfb85965d9d2a3719583d8fddad02ba1 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:31:00 +0000 Message-Id: <6921c924.2f35e.52df9da4@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=2ae6227ddfb85965d9d2a3719583d8fddad02ba1 commit 2ae6227ddfb85965d9d2a3719583d8fddad02ba1 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:34 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:34 +0000 hn: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53099 Sponsored by: Netflix --- sys/dev/hyperv/netvsc/if_hn.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index b23c0d76115d..2ae9e710978e 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -98,9 +98,7 @@ #include #include #include -#ifdef RSS #include -#endif #include #include @@ -621,17 +619,6 @@ static struct rmlock hn_vfmap_lock; static int hn_vfmap_size; static if_t *hn_vfmap; -#ifndef RSS -static const uint8_t -hn_rss_key_default[NDIS_HASH_KEYSIZE_TOEPLITZ] = { - 0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2, - 0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0, - 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4, - 0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30, 0xf2, 0x0c, - 0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa -}; -#endif /* !RSS */ - static const struct hyperv_guid hn_guid = { .hv_guid = { 0x63, 0x51, 0x61, 0xf8, 0x3e, 0xdf, 0xc5, 0x46, @@ -6552,11 +6539,7 @@ hn_synth_attach(struct hn_softc *sc, int mtu) */ if (bootverbose) if_printf(sc->hn_ifp, "setup default RSS key\n"); -#ifdef RSS rss_getkey(rss->rss_key); -#else - memcpy(rss->rss_key, hn_rss_key_default, sizeof(rss->rss_key)); -#endif sc->hn_flags |= HN_FLAG_HAS_RSSKEY; } From nobody Sat Nov 22 14:31:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz95hFvz6HDDP for ; Sat, 22 Nov 2025 14:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDz93NHlz40qq for ; Sat, 22 Nov 2025 14:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OvJVv7lby7zLwJZvdFxHQ/cgn9MAAOhEkj5mAri0caI=; b=ZY6i2QQrPEGBN6OryFZoL7aeQqnAPnTFKE5SE31K+EH2hWriANghnSYsyBbO0+jKekG3DI nBTRdqik93Rr8XPWQQLBYQuvjhTsToFGi7BFOuvo91wZxWT6O923rEXSf1OdjgzVxJFTff RuwQP+Xrf1ilGpsJSrSbMzepGzSVxy9n+VLwm2BXBo+E8C0oAv9b9n2TFf0j+kKRn+ypdb JUWaPpf1wIUUq5NDuVUWzhtRNOdcyYVMJOIxsGwVYdNg84pkxV7Yrgxv1N5FmlUvMIQLo/ y1HrkQAz0OSO7Q+TfJePyERKLvJGQZCn9hLbWhsVbfoGgBVSX+ZmPF+FEvM58w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OvJVv7lby7zLwJZvdFxHQ/cgn9MAAOhEkj5mAri0caI=; b=xz1m18p2HTafShoQyi4cukFpwo/QC3vYz6qvfnq7HzGsqvJV4z6xWXknrYdlGW/wfXen/H THFZ5sYOdf6pHUJnJWESNdh1E6Aqp6/g+EapWeLyex2MapuGi4FrRIEod7GVykpgDgVdrD tk7ROF3+G6bKkJKq+mXXoOVsKTURqf5uPyOKgFqcuM6pY092Z8fk7sqMT/f+UIKP0qwvaA cJMh+sEf2BrOODlko5p0ECqe5sNrItevQfFafB8p4B1PQFTRPtX6MEGJ6ZFEofxoIZ0xhW fptI58J6Xzn1ju8rNojPCxhD034tWhWoRSIDZ8N61WyIE/a4dKkBKcqpKvGkXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821861; a=rsa-sha256; cv=none; b=KwE+UZ34Nsa8TuQ3yiWaObPmwUvpRf88la9vcqkVllbBmXLILZj7piR+Ea4stp2eExIwtN lxznmIYkWv88Pc1X1a3xM/CKmUzu/PMheo7s9HUMf2q3V+pxy+uqBO5oZdsQeCtq5c1fXm ljwq5PTi3q6rC6fGJw8XktxXkqDfrHjsf8jjC0SbnY2J2CjDQYEG8+HWIvnSaiOs6Kr2Cp Sx3avIVhe2uBeicug6USttDq/vRgutCsAkGQsheGJo9EHBNRO2LDp9cVQwKq67tc4ekWRO 6+VoIPQRerKt5Sa/Pd/2Sz1LSP0TK5AaxuBbhpbEu0ZbKHgzS5SHjKd8HjDopg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz92k2zz12NL for ; Sat, 22 Nov 2025 14:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f4c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:31:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 96cde0b9e606 - main - ena: use newly exposed RSS hash key API rather than ad-hoc hashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96cde0b9e6068cd4c3aaebd86764b34afec1b624 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:31:01 +0000 Message-Id: <6921c925.2f4c0.30e400aa@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=96cde0b9e6068cd4c3aaebd86764b34afec1b624 commit 96cde0b9e6068cd4c3aaebd86764b34afec1b624 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:34 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:34 +0000 ena: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53100 Reviewed by: akiyano_amazon.com --- sys/dev/ena/ena_datapath.c | 4 ---- sys/dev/ena/ena_rss.c | 2 -- sys/dev/ena/ena_rss.h | 2 -- 3 files changed, 8 deletions(-) diff --git a/sys/dev/ena/ena_datapath.c b/sys/dev/ena/ena_datapath.c index ab082fa1810f..ec64ae9324bf 100644 --- a/sys/dev/ena/ena_datapath.c +++ b/sys/dev/ena/ena_datapath.c @@ -34,9 +34,7 @@ #ifdef DEV_NETMAP #include "ena_netmap.h" #endif /* DEV_NETMAP */ -#ifdef RSS #include -#endif /* RSS */ #include @@ -351,7 +349,6 @@ ena_rx_hash_mbuf(struct ena_ring *rx_ring, struct ena_com_rx_ctx *ena_rx_ctx, if (likely(ENA_FLAG_ISSET(ENA_FLAG_RSS_ACTIVE, adapter))) { mbuf->m_pkthdr.flowid = ena_rx_ctx->hash; -#ifdef RSS /* * Hardware and software RSS are in agreement only when both are * configured to Toeplitz algorithm. This driver configures @@ -362,7 +359,6 @@ ena_rx_hash_mbuf(struct ena_ring *rx_ring, struct ena_com_rx_ctx *ena_rx_ctx, M_HASHTYPE_SET(mbuf, M_HASHTYPE_OPAQUE_HASH); return; } -#endif if (ena_rx_ctx->frag && (ena_rx_ctx->l3_proto != ENA_ETH_IO_L3_PROTO_UNKNOWN)) { diff --git a/sys/dev/ena/ena_rss.c b/sys/dev/ena/ena_rss.c index b7706e33065d..88fb3c902f5d 100644 --- a/sys/dev/ena/ena_rss.c +++ b/sys/dev/ena/ena_rss.c @@ -125,7 +125,6 @@ ena_rss_init_default(struct ena_adapter *adapter) } -#ifdef RSS uint8_t rss_algo = rss_gethashalgo(); if (rss_algo == RSS_HASH_TOEPLITZ) { uint8_t hash_key[RSS_KEYSIZE]; @@ -133,7 +132,6 @@ ena_rss_init_default(struct ena_adapter *adapter) rss_getkey(hash_key); rc = ena_rss_set_hash(ena_dev, hash_key); } else -#endif rc = ena_com_fill_hash_function(ena_dev, ENA_ADMIN_TOEPLITZ, NULL, ENA_HASH_KEY_SIZE, 0x0); if (unlikely((rc != 0) && (rc != EOPNOTSUPP))) { diff --git a/sys/dev/ena/ena_rss.h b/sys/dev/ena/ena_rss.h index 64dd41851fec..b7c5181397af 100644 --- a/sys/dev/ena/ena_rss.h +++ b/sys/dev/ena/ena_rss.h @@ -36,9 +36,7 @@ #include -#ifdef RSS #include -#endif #include "ena.h" From nobody Sat Nov 22 14:31:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDzB6jVJz6HDML for ; Sat, 22 Nov 2025 14:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDzB4fqxz40l7 for ; Sat, 22 Nov 2025 14:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uu0yBrZUKmU3BJ5xnUMbTtrdyxaAis4jFdp3rWtIOmI=; b=O3Qybf8uggiJuATooovnaCvqmTvdmiqBTavxUymxWOSZwD98oAEC7VbWCng2aTCov2Ly4v FzmU6FAeWNtqea5CLPrL4Sgast/0YN+9DBSYIXQCG+yq5dL8mcGQJWHu0MXpvdULC81pSA vcedXoOW6u9KKmOMPkG53YO2figlmopLJTbIvjzIpXvB+8xAbQFo6JJslrvosGKU6MaqZv 2JY4sZPXhE3GDFdpdC+0Ri6ZeoBZPAdfSrc7hr2fsuqzYsKNNQ9xTPsLyKpOOrdnyEddC+ /c3M+4RU4LqK5AQryeMRuuTLs6bkU0tLX08JHwzBA1w32WtFN5CIo4IqL2r0uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uu0yBrZUKmU3BJ5xnUMbTtrdyxaAis4jFdp3rWtIOmI=; b=IV/lBMxqWg5Y0AI7Ycr+sDAXZAnH9g69lYGQnXI0aTXnKOG/a9eJW3+Cl++hc1kIms+1Uc eUmLJHawgOidYuaLqEqrLdgYc+rmFxIGVEPM9GXzGGqpO1MWJJ2iWp/rzP7y6n09TZZb7S ClJQWIbhcCQzkST0KIhUbc5wcpE8mVAf5HeqNvmDzfh7UH3H0LIBKNEI+b5NIg9YIUW1Dg 7MxT5Sb3qGVYtNPSZJKULaXNT4mWVLnw3ioaMMbvnFToEdro2FLrAqcjeUGWD4fRph8UcB bPA1Ur8G9B30tWPvEZ/nfAnWWKhrWkcL/2yNMQO+Faj4FQh6rL19CLNLfdLvFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821862; a=rsa-sha256; cv=none; b=Nze34bOrHVIpAm3IdD0Eq8AHNCbeNe8eYwSu4cRCnXIUgcwpGgo76nlT/0IwuIPcYewieo TakR4nlE4K2XVmBc8Q27wHLZcF7DfUz9eSLRMhkG+tDJjsFcmqeuyKr6e/OZVQkrQQK8Aw H9RFBNKT+zDi0UEKjKmfUEmDXc/F+tRhsfTaEd+AhKiSPwDS5Si04pz8e4cDUereKXamCG 0i4v9CsANCdCiTWx+Sqa1UgxLXlH5GYphLgyqjP1w8phoc8ZW8f5ueAJrDVckRlMlWsJGB VnX9iYfY4nC6DLyTfHMJD3vu76O5RFiEa6bT1EycxkG6H/iaakzYJYGSKP5cCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDzB3Yltz120v for ; Sat, 22 Nov 2025 14:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f362 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:31:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 5a94c2e89f6a - main - lio: use newly exposed RSS hash key API rather than ad-hoc hashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a94c2e89f6a4fbdea49d6c3a51b5fe0154d2495 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:31:02 +0000 Message-Id: <6921c926.2f362.6af0f437@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=5a94c2e89f6a4fbdea49d6c3a51b5fe0154d2495 commit 5a94c2e89f6a4fbdea49d6c3a51b5fe0154d2495 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:34 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:34 +0000 lio: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53101 Reviewed by: zlei Sponsored by: Netflix --- sys/dev/liquidio/lio_main.c | 5 ----- sys/dev/liquidio/lio_network.h | 2 -- sys/dev/liquidio/lio_rss.c | 8 ++++---- sys/dev/liquidio/lio_rss.h | 4 ---- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c index 3c73a6b10eed..7b6eeb460095 100644 --- a/sys/dev/liquidio/lio_main.c +++ b/sys/dev/liquidio/lio_main.c @@ -64,10 +64,8 @@ static int num_queues_per_pf1; TUNABLE_INT("hw.lio.num_queues_per_pf0", &num_queues_per_pf0); TUNABLE_INT("hw.lio.num_queues_per_pf1", &num_queues_per_pf1); -#ifdef RSS static int lio_rss = 1; TUNABLE_INT("hw.lio.rss", &lio_rss); -#endif /* RSS */ /* Hardware LRO */ unsigned int lio_hwlro = 0; @@ -1437,13 +1435,10 @@ lio_setup_nic_devices(struct octeon_device *octeon_dev) lio_set_feature(ifp, LIO_CMD_TNL_TX_CSUM_CTL, LIO_CMD_TXCSUM_ENABLE); -#ifdef RSS if (lio_rss) { if (lio_send_rss_param(lio)) goto setup_nic_dev_fail; } else -#endif /* RSS */ - lio_set_feature(ifp, LIO_CMD_SET_FNV, LIO_CMD_FNV_ENABLE); diff --git a/sys/dev/liquidio/lio_network.h b/sys/dev/liquidio/lio_network.h index 856cc8f7ab09..65896bf8cfa9 100644 --- a/sys/dev/liquidio/lio_network.h +++ b/sys/dev/liquidio/lio_network.h @@ -125,9 +125,7 @@ struct lio { /* VLAN Filtering related */ eventhandler_tag vlan_attach; eventhandler_tag vlan_detach; -#ifdef RSS struct lio_rss_params_set rss_set; -#endif /* RSS */ }; #define LIO_MAX_CORES 12 diff --git a/sys/dev/liquidio/lio_rss.c b/sys/dev/liquidio/lio_rss.c index df10cbbe3a05..da1e18142e81 100644 --- a/sys/dev/liquidio/lio_rss.c +++ b/sys/dev/liquidio/lio_rss.c @@ -31,8 +31,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef RSS - #include "lio_bsd.h" #include "lio_common.h" #include "lio_droq.h" @@ -69,7 +67,11 @@ lio_set_rss_info(struct lio *lio) uint8_t queue_id; for (i = 0; i < LIO_RSS_TABLE_SZ; i++) { +#ifdef RSS queue_id = rss_get_indirection_to_bucket(i); +#else + queue_id = i; +#endif queue_id = queue_id % oct->num_oqs; rss_set->fw_itable[i] = queue_id; } @@ -168,5 +170,3 @@ lio_send_rss_param(struct lio *lio) return (0); } - -#endif /* RSS */ diff --git a/sys/dev/liquidio/lio_rss.h b/sys/dev/liquidio/lio_rss.h index 8a5020d47f7e..727f08b5fb0d 100644 --- a/sys/dev/liquidio/lio_rss.h +++ b/sys/dev/liquidio/lio_rss.h @@ -34,8 +34,6 @@ #ifndef __LIO_RSS_H__ #define __LIO_RSS_H__ -#ifdef RSS - #include #include @@ -76,8 +74,6 @@ struct lio_rss_params_set { }; -#endif /* RSS */ - #define LIO_RSS_HASH_IPV4 0x100 #define LIO_RSS_HASH_TCP_IPV4 0x200 #define LIO_RSS_HASH_IPV6 0x400 From nobody Sat Nov 22 14:31:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDzD0P8Hz6HDjc for ; Sat, 22 Nov 2025 14:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDzC4hyyz418N for ; Sat, 22 Nov 2025 14:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U4uWGNrNjNGCFgDciLwR7u0PsArqXEayt/ZMxtn2vRk=; b=nhJZA2DxY1QUkfFoCedToZqc6k/q1kIOuEJJGF5ItaZEHOJCRRg689oLtjK4m++vv43uts 6D+4TMHWH3DiomeRh1gx/JDWnfNCJcUrWPff624hbWdzfFFv+R2IwSRQAs2W9FMxETJ6JH ff1jrh6jJWnr1Rk1zeV/oNCsmKZtZchH3qeLWKjEMzA/LtSpiVGAjE0/pdCay7PvSqxqjH CHyx6dcvmq9D16qfX51UEBvivLgYpAj30nqXVvrFu7WUFg1Ps7X36m5R4aWdp1nNQ/M7zz OWtFjLyVRxSmjIEWfCaPILmTjdqEtdGzvI7N55k8G8VPTNyLKblkSJRD5gGHXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U4uWGNrNjNGCFgDciLwR7u0PsArqXEayt/ZMxtn2vRk=; b=V2GUUm2UnaC5A9Kbk3UFZBMj5Lhh15uqK4VrrSdQOaHlYfWSSDnyJrJkWeaYM1KMygk5kz BLwUqrWwLYZuS0h/vo0PyZ9vlVwjJfkHLgcfprrKMMdmtIxTtw6UKDWC8p241eM7NMJFAU p8fQn1Nq84AV40wzESNsMbN6oJL40O8eiEBVeI6CaLWAbjGYQfR4nPT/m1BQSQIDUR+hhC 7ADe3lLufIoCx+/27N1MLLX0J3/LlGklTUj2K3pRhjk6J4U1GfxQckj0f0guuZr8mmP9zl hCf8tvAZW7RNErauvodrtdwMqtZcNz4zqNY8SrM9x0wAAQubz8MaJ4UrPqGZ3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821863; a=rsa-sha256; cv=none; b=J8FyvuoMniMLbq/qM6+MYBTsFlHTrn9UG+AS6JD3Aq/7Au3o6s5nTEseZ0PZUWaDmfzNRs 9dD7E2Om7tYziff0JMpF5usNth1D51YvuKlrRAHcfg2WDTwxTXz7eJGX0VjQEMWTjflOrm CQ0Nog3xGcN3mDvKOXq5DQzUpcgWMPV10eTkQvYdyvbala6DmMVKwDSKIOmYyZeM8pXT7b s6fVn6MUsdi9aOLDj83T816iSUkVSwRNsn8Psgi6IY0/cd1DPrUwW897byjIEBznArWtkG CBJY3S3VYz2PD9qHcBb/9RSKkptl49/kp7UWvcOeYCMpIF3C4YXsjxwcvShb5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDzC40Jrz12CT for ; Sat, 22 Nov 2025 14:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2fd69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:31:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 99b3c9adbc41 - main - sfxge: use newly exposed RSS hash key API rather than ad-hoc hashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99b3c9adbc4152ceae234d21b6d0d19e2d0ea7d9 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:31:03 +0000 Message-Id: <6921c927.2fd69.7173a45b@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=99b3c9adbc4152ceae234d21b6d0d19e2d0ea7d9 commit 99b3c9adbc4152ceae234d21b6d0d19e2d0ea7d9 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:35 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:35 +0000 sfxge: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53102 Reviewed by: arybchik, zlei Sponsored by: Netflix --- sys/dev/sfxge/sfxge.c | 2 -- sys/dev/sfxge/sfxge_rx.c | 14 -------------- 2 files changed, 16 deletions(-) diff --git a/sys/dev/sfxge/sfxge.c b/sys/dev/sfxge/sfxge.c index 7d3217fb50de..5ad9313a841f 100644 --- a/sys/dev/sfxge/sfxge.c +++ b/sys/dev/sfxge/sfxge.c @@ -60,9 +60,7 @@ #include #include -#ifdef RSS #include -#endif #include "common/efx.h" diff --git a/sys/dev/sfxge/sfxge_rx.c b/sys/dev/sfxge/sfxge_rx.c index 7e0948425d77..961fea2e5f79 100644 --- a/sys/dev/sfxge/sfxge_rx.c +++ b/sys/dev/sfxge/sfxge_rx.c @@ -57,9 +57,7 @@ #include -#ifdef RSS #include -#endif #include "common/efx.h" @@ -165,17 +163,7 @@ sfxge_rx_qflush_failed(struct sfxge_rxq *rxq) rxq->flush_state = SFXGE_FLUSH_FAILED; } -#ifdef RSS static uint8_t toep_key[RSS_KEYSIZE]; -#else -static uint8_t toep_key[] = { - 0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2, - 0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0, - 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4, - 0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30, 0xf2, 0x0c, - 0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa -}; -#endif static void sfxge_rx_post_refill(void *arg) @@ -1143,9 +1131,7 @@ sfxge_rx_start(struct sfxge_softc *sc) EFX_RX_HASH_IPV4 | EFX_RX_HASH_TCPIPV4 | EFX_RX_HASH_IPV6 | EFX_RX_HASH_TCPIPV6, B_TRUE); -#ifdef RSS rss_getkey(toep_key); -#endif if ((rc = efx_rx_scale_key_set(sc->enp, EFX_RSS_CONTEXT_DEFAULT, toep_key, sizeof(toep_key))) != 0) From nobody Sat Nov 22 14:31:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDzG4fLRz6HDjs for ; Sat, 22 Nov 2025 14:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDzF6Nmtz40t7 for ; Sat, 22 Nov 2025 14:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8/E/exknoX3utXZUz8EUz6v9pUyvmDUy52Xvx+Tl25I=; b=josfXbaqcfK5ARS5rAQpJvCD139iYCsP509bqzqY+4A6XdOegU6/gIn6oIOnvaIhZGC3dc bjRpvlpvmoahe+MHD059HdH/4xtd19iVGsdeebg6Vz6/gsR5WKKE03lznPqd4MVu8VjeMf KruLw+iHW8EvI8minDrPPRCUVWvOdU9JQphJzmrKf5ra5zzApiGn/Bayij75Uopf928I3e 2FZA3bfFW0sTJcw+YAtnTxktXcmyba2I31jW2R0+c3uUBnjQ1DEAwtRYSDXpimqfy4glcs cNijPqhpu9RA1puvrXGOxNQyiErrEBgY6vHM8moVltogBFIF38yzYABftwapbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8/E/exknoX3utXZUz8EUz6v9pUyvmDUy52Xvx+Tl25I=; b=dDkfAAjIgpc1cWbURHUG+mAc51JR0XKpRADb3D5AkbtoKhJXjhm6kSUv8Ccbi67AKAMSn5 x6i1IN3X657QMYIkfRPtaZjgW3vsYHozSQHNUH7zqdS6RiVcU5h+RFhsP4MGnRuX+D+PYN amNfIR5u3ignY8UHt9PV66O6DvkuuAL4t+IAgfvmKyKehhyqb7j+Fsnj2bsKf50EghQmMB CEr6koaltgzFTkbQmAWFdS3NzvO9tCXFCqhenxysXrl98Ya9V4aHnGKnsEVY850LjaUsPW h8/7rhuyGcVtkkYfIyLTLn3GVpSIKbntbF+ssT5RbEa0sF3nQLp8n3Zm8kzAaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821865; a=rsa-sha256; cv=none; b=ffmTP5VN8hkBAczdgN3d+8op+DDcwkg1w5Fk53Wm879eY0dcSOdJEUYr9o5eBXWdLIwbR2 dxoxEkRKEcxb84IK5lPqPl9ZC2JnvoxQlcZBPapSibXPdzHzG0JwmFq3NMdOg5e5uOcIAZ e4OTYcw7i4jmqcaWVMxmuqvq86oDzGCjPydRMtUCDQOxM0VoHfbnV3WMDOurKrTxYuI8ub aeQ+UNKSk/IFYXfFATA6JarrDT8lNxbE/lfUyEkVDDYO4UojMolep4XTMpeo8V4KBsXpH9 C+dDJOhMappJRyZPZrurM0xf5sAXrZILcWj7F22uBv3KILJBw1BPGU3CaT0Z8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDzF5fHQz12J1 for ; Sat, 22 Nov 2025 14:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e6e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:31:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: dd0e6bb996dc - main - tcp: Enable symmetric hashing by setting hash on outgoing conns List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd0e6bb996dc46e1d91f3d9aef87979716479465 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:31:05 +0000 Message-Id: <6921c929.2e6e9.3918242d@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=dd0e6bb996dc46e1d91f3d9aef87979716479465 commit dd0e6bb996dc46e1d91f3d9aef87979716479465 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:35 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:35 +0000 tcp: Enable symmetric hashing by setting hash on outgoing conns Now that we can trust NICs to supply an identical hash result to software, we can setup the inpcb hash on outgoing connections. This gives us symmetric hashing, meaning packets should enter and leave on the same NIC queue. Differential Revision: https://reviews.freebsd.org/D53104 Reviewed by: adrian, cc, kbowling, tuexen, zlei Sponsored by: Netflix --- sys/netinet/tcp_usrreq.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 4d1a6455d09e..aeb28cd6a144 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -75,6 +75,7 @@ #include #include #include +#include #include #include #include @@ -82,6 +83,7 @@ #ifdef INET6 #include #include +#include #include #include #endif @@ -1487,6 +1489,10 @@ tcp_connect(struct tcpcb *tp, struct sockaddr_in *sin, struct thread *td) if (error != 0) return (error); + /* set the hash on the connection */ + rss_proto_software_hash_v4(inp->inp_faddr, inp->inp_laddr, + inp->inp_fport, inp->inp_lport, IPPROTO_TCP, + &inp->inp_flowid, &inp->inp_flowtype); /* * Compute window scaling to request: * Scale to fit into sweet spot. See tcp_syncache.c. @@ -1532,6 +1538,10 @@ tcp6_connect(struct tcpcb *tp, struct sockaddr_in6 *sin6, struct thread *td) if (error != 0) return (error); + /* set the hash on the connection */ + rss_proto_software_hash_v6(&inp->in6p_faddr, + &inp->in6p_laddr, inp->inp_fport, inp->inp_lport, IPPROTO_TCP, + &inp->inp_flowid, &inp->inp_flowtype); /* Compute window scaling to request. */ while (tp->request_r_scale < TCP_MAX_WINSHIFT && (TCP_MAXWIN << tp->request_r_scale) < sb_max) From nobody Sat Nov 22 14:31:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDzF1W8Rz6HDkd for ; Sat, 22 Nov 2025 14:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDzD5HzCz412S for ; Sat, 22 Nov 2025 14:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LAty0vYpbm5rRpJDoFyeJzjbvhNSp9CX+1lYztOKdHY=; b=fNlChXkKvLalAO6hk8u2tJTeE8hikpQY6YFTzjdD75l+U1pm42gPem1wVOD7wg3/l8xk35 IAmdq7YaIuHq3ubykLUYa+flOI2Kh8S8BngfCLFzxa0HCuVofAU+Svitxl5lbrAsjOS8J4 vmmq+AtYftPCmPoq8QhUbs+LarhesU2jIbJ4vsX7ZRUFoS0OjqneLqxLGUeTzwhLOMGtGf ++K/9YEF4p2+cXqrAxUMn4qIaIjHVp6KQ2caxtwDac5gupdjIYs7N1qAqFyh+RVg+TncTZ LO/M4VlYk/i8oOh3FxZoys0Q7wyB5tvc/rSgnVT0KJX+Scu9phb4DRc+Yk90gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LAty0vYpbm5rRpJDoFyeJzjbvhNSp9CX+1lYztOKdHY=; b=bK4FMcXU79Ad2kSY0+0l2jn0mT4x5dUQf8GlRLMLbmF5VHy9Ick0alEQje8RGtC71GCTJn LPtuPO1rq3BNyi/PAEFdGUbos/A1ucvWquivM1lPIAKPa10UftO+RxFfOWQN9+C4Rrr+JL l0Ufw5OUTaHLG+VYNVGQI+ipNfCx23xxUqhOD00JIBmcJFgaGqUNPYc6UZB3Gzs1SpmiRU NYbp3Icdw1Qv1EtWfqmnNeP9wqJ9VqfoblFYBZcCsKTXROR5RB8Dlj4O7zD2FyQhJ7kQ+P 7Pp0EUkLG2bJPoFEUx+V/bigPqAAa7oN/sNg4pGP1vFaz7ScDdRq7o2tlrvHxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821864; a=rsa-sha256; cv=none; b=FbcgcTI9RpG0YmxB6lMZhcmKBItirgseG8+7ucDNWcF43O9JXjbDD8FtL5q7TzL69oiiWM I9w2sHWtAGW5s50SV+yvXqOhAgvFrRQce/h5cTM4xSSk43MuIBu9dSOG64SABw3hV8bAyD 4AR3cUK37EhPwESHn+DJj3lyXO147qhHTKKRZYhq0Xfndz/YVV91vzhJhQcn+pVdo1kagh qiApk4UIQhqpv3ZJ6vaHDmGrgZ763LoEmQslVJ35RTJpUz6bXwgnA6zFpCi1uqZcPnb31Y ulEoiqnJK0N7xK3DRc/e5BPPoFgtM485uh8G5yGp4I6mlClLTanE6QmIXoynQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDzD4qsDz12FK for ; Sat, 22 Nov 2025 14:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30924 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:31:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: cfad68c5c6b9 - main - igc: use newly exposed RSS hash key API rather than ad-hoc hashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cfad68c5c6b9c1a203b3c3777e252048df92281d Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:31:04 +0000 Message-Id: <6921c928.30924.22d94024@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=cfad68c5c6b9c1a203b3c3777e252048df92281d commit cfad68c5c6b9c1a203b3c3777e252048df92281d Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:35 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:35 +0000 igc: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53103 Reviewed by: markj Sponsored by: Netflix --- sys/dev/igc/if_igc.c | 7 +------ sys/dev/igc/igc_txrx.c | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index d6c06803990f..a4e5de2ae82a 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -32,10 +32,9 @@ #include #include -#ifdef RSS #include #include -#endif + /********************************************************************* * PCI Device ID Table @@ -1940,12 +1939,8 @@ igc_initialize_rss_mapping(struct igc_softc *sc) */ mrqc = IGC_MRQC_ENABLE_RSS_4Q; -#ifdef RSS /* XXX ew typecasting */ rss_getkey((uint8_t *) &rss_key); -#else - arc4rand(&rss_key, sizeof(rss_key), 0); -#endif for (i = 0; i < RSSKEYLEN; i++) IGC_WRITE_REG_ARRAY(hw, IGC_RSSRK(0), i, rss_key[i]); diff --git a/sys/dev/igc/igc_txrx.c b/sys/dev/igc/igc_txrx.c index 92ba81c79c58..96949492fd24 100644 --- a/sys/dev/igc/igc_txrx.c +++ b/sys/dev/igc/igc_txrx.c @@ -30,10 +30,8 @@ #include #include "if_igc.h" -#ifdef RSS #include #include -#endif #ifdef VERBOSE_DEBUG #define DPRINTF device_printf From nobody Sat Nov 22 14:53:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDFT93yGhz6HGBq for ; Sat, 22 Nov 2025 14:53: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDFT92hQcz472D for ; Sat, 22 Nov 2025 14:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yq2jv7olUlfoWA01tDHUs4afH2sjXa5K8Snmw9xhs3k=; b=rqw6SGFsYXKWmiIM9H/bZNUC8en46by2NzXIcwJrX9ObZ7ootYi2Ghhta8PKMtV+6ldqbr Vv8x/onwDCF4bNYVqcTv8Tx78IiyEZFW4dGYdYCnjHSlhblFFwX040AAfKUeX85WIoqQOC G8Ky2xUh2rmFSf3LaQWomffXWDaebeOqDaX8E19Re0cmP+38/utCr8iUFZ5Ovy+PvAIRoD CzYkjmfVkCnWd2oh8IFZWaj5a9kFmYCwGPo89l9qvxjsrbW0GvuXJ2ozKvR2tsTM/uIk3R kkaNu2yv4ERryr6mKBg9hPjCpe24mxfxcYk/69ejJ5m2kCqqZtKkRdNGJGqkvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yq2jv7olUlfoWA01tDHUs4afH2sjXa5K8Snmw9xhs3k=; b=cLhuEnR8BHw2kE0NI5PXiWbZr87MxMddx2n/DHcUA7VB+LQ4sg5KLwf5p/fdYliF+28dKo JxKUr6k6ALQhwYOySykBnC8OuZz1knOt+aOucrpiKJPzh0vCJmUElMo5EtuSqvenegbN+7 TMPKGy8FBvGsL3wN7lXghVqZElz9sn99LESP2JitndP0BkgzYNrueEewe7CasCfiXlrVCH iQsXrevJHl8evbfWSGzp1VDtwl60osKO1RoUwtHKJFJ94ifY/Pc4sAfD4McCq73UWIum2q O7Wd5PVRuYeuxbfVfi5Scc2rBeEKa/ff2g2a6+p/ZPwg4C3MKv6SyOkHsz/DyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763823213; a=rsa-sha256; cv=none; b=OYgeT7feDr6KZclgfor6rDMCfHsivl4CZnUw0QhPBZ97b6FKdoxbT1km7IweLht7qrmnlG qKtxFP00VzBDEVatSvqANnos6P3+SaQ33w3AlR6qebgS4P61tWaD/u98Ie40kuiZ/MrmJE laKEzyqRPgZT8dtCjTPc3EglTRXHdjfzI7EOmA0DyC2j2aqbA9J4DDcE1PQItfPmfFe/6v o+CkpRqUbRA8XgGyFaRkWf3/ws16pjQjhnKUw1EknYdzH0bQUxRhxXANcnyHIlg7sdbTEx MlL+5jTCdipeK9D0QvcaxhLc3ONvzUI8BejH828MfMmRZdrIBAW3yqMO3S4nHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDFT924WZz12WH for ; Sat, 22 Nov 2025 14:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31444 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:53:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: e53590238a3d - stable/14 - fusefs: fix intermittency in the BadServer.ShortWrite test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e53590238a3dd39c9620100276c4633feb43de01 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:53:33 +0000 Message-Id: <6921ce6d.31444.534743f1@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=e53590238a3dd39c9620100276c4633feb43de01 commit e53590238a3dd39c9620100276c4633feb43de01 Author: Alan Somers AuthorDate: 2025-10-14 02:18:48 +0000 Commit: Alan Somers CommitDate: 2025-11-22 14:52:54 +0000 fusefs: fix intermittency in the BadServer.ShortWrite test This test implicitly depended on the order in which two threads completed. If the test thread finished first, the test would pass. But if the mock file system thread did, it would attempt to read from an unmounted file system, and fail. As a result, the test would randomly fail once out of every several thousand executions. Fix it by telling the mock file system's event loop to exit without attempting to read any more events. Reported by: Siva Mahadevan Reviewed by: Siva Mahadevan Differential Revision: https://reviews.freebsd.org/D53080 (cherry picked from commit d1bd541b385d49d2ae3a8bad9df72779b606e208) --- tests/sys/fs/fusefs/bad_server.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/sys/fs/fusefs/bad_server.cc b/tests/sys/fs/fusefs/bad_server.cc index af2ca146e431..c3d195735446 100644 --- a/tests/sys/fs/fusefs/bad_server.cc +++ b/tests/sys/fs/fusefs/bad_server.cc @@ -65,6 +65,11 @@ TEST_F(BadServer, ShortWrite) out.header.unique = 0; // Asynchronous notification out.expected_errno = EINVAL; m_mock->write_response(out); + /* + * Tell the event loop to quit. The kernel has already disconnected us + * because of the short write. + */ + m_mock->m_quit = true; } /* From nobody Sat Nov 22 14:53:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDFTB43hBz6HFv4 for ; Sat, 22 Nov 2025 14:53: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDFTB2ynSz46f6 for ; Sat, 22 Nov 2025 14:53:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zN709DdvDM/kU5Y2qsaExelu8J+HRCZKHCyvQAQ8ZKk=; b=Hc47IiodAIZfamnkbDNGNtSvSuXugahrHuhyMVHrWQ+QNREIpby9hEwVOE1OVWEnu6AzJ2 KisiSKSGYmq3988VJA8d+FprV97O8YJxM3mVcKY1K0uJTtUiZBZHvbrKLuQO2YXaKi7Bsb YYot2e5P+O5pLQEFIozutW1WD1fKoOw4X1BaYuUehcD6YmXfLw4H9oxP5q+/NvmvOxr7iT vYOWMXaXxIYysGEyUIpW616HxZU1PlspVP7SJ21UilikG+EtiTVCGqT6O/F/Zsnf5JMV1C QvCS74ezkNWSrjnD9NggprKhio1SDqp6R9Q/edVoJEwz95JbyPek2sSmH7Kfeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zN709DdvDM/kU5Y2qsaExelu8J+HRCZKHCyvQAQ8ZKk=; b=iE4q6Qdhnb2Ekdv7O5HFnbKI82vrfdYAjP1IkpWM+TdMV9dQO5yipKP1gsph/HOa4SbioW xRPEBn8jRzj7wgyxfvXKcVQrKdRUQd7ugrKNW0OzFZwQNtqMZMLdAqb1064Vi8gqq4Nziz eTQOwVmIR6ZjpEOKLW8O2twTgJx/3yCY8nuwTOlAbkXpyC8NfXZ84YXufzdsYKaQGX0Igx UFHyui2aT+enHte10VVJDc/aqNUflNSVKtpUZ5/wkO4NOJ4432D+PmrNf2ZmpbcLp90DXc xEDGDQNC3QR8DGWjLeK4+bhkgsDteliS8y0apZT5r9/euIDe696LEuc9Ej4lTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763823214; a=rsa-sha256; cv=none; b=aXwxJuS5QbTDDywv6eY3H7sSNoPDu7vNXJvsyum8HrNl7Lqz762nTzgIyOEqMEq5kxu00e zNdC9AiBpSiqh3zwslUh2pCIyvU3VfzA65YlvBgKRqbktir4iwAD/osdljXgsYa/Uyv3kN e3LmbGJ2CBK/YT5prbWrEJ0jZB5rG3PfiuQR7FZBatmB32Gc5/rlRlyhGSI6WEg7VDb15B wPdhV82ehFppDPFX5Xe2nsu9JJqy62QAEtd3ra0tfZ6fa3UGrANuyp2YBXPW1gq7J1jwkd ZSQR58JhNnU8NUzTlMLNPfc+L8z4MVpUf19GlyFWLr91ntbgo1FuQ+5TDpcCAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDFTB2Wjmz136m for ; Sat, 22 Nov 2025 14:53:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33004 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:53:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 3b8ac7895d7b - stable/14 - fusefs: fix page fault triggered by async notification when unmounted List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b8ac7895d7bcb66aaa83d2667b8e3de17f02ede Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:53:34 +0000 Message-Id: <6921ce6e.33004.50bd7f9@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3b8ac7895d7bcb66aaa83d2667b8e3de17f02ede commit 3b8ac7895d7bcb66aaa83d2667b8e3de17f02ede Author: Alan Somers AuthorDate: 2025-10-26 00:37:02 +0000 Commit: Alan Somers CommitDate: 2025-11-22 14:53:03 +0000 fusefs: fix page fault triggered by async notification when unmounted A FUSE daemon can send asynchronous notification to the kernel in order to, for example, invalidate an inode's cache. Fix a page fault that can happen if the file system isn't yet mounted, or is already unmounted, when that notification arrives. PR: 290519 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53356 (cherry picked from commit 5d42c8813976af484fd3e9a896c7839ba27ca764) --- sys/fs/fuse/fuse_device.c | 6 +++++ tests/sys/fs/fusefs/mockfs.cc | 4 +++- tests/sys/fs/fusefs/mockfs.hh | 4 +++- tests/sys/fs/fusefs/notify.cc | 56 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 2 deletions(-) diff --git a/sys/fs/fuse/fuse_device.c b/sys/fs/fuse/fuse_device.c index 26f764f1939c..8f557a51e82b 100644 --- a/sys/fs/fuse/fuse_device.c +++ b/sys/fs/fuse/fuse_device.c @@ -542,6 +542,12 @@ fuse_device_write(struct cdev *dev, struct uio *uio, int ioflag) } else if (ohead.unique == 0){ /* unique == 0 means asynchronous notification */ SDT_PROBE1(fusefs, , device, fuse_device_write_notify, &ohead); + if (data->mp == NULL) { + SDT_PROBE2(fusefs, , device, trace, 1, + "asynchronous notification before mount" + " or after unmount"); + return (ENODEV); + } mp = data->mp; vfs_ref(mp); err = vfs_busy(mp, 0); diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index f48165f6a151..4fa802cd7250 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -828,10 +828,12 @@ void MockFS::loop() { } } -int MockFS::notify_inval_entry(ino_t parent, const char *name, size_t namelen) +int MockFS::notify_inval_entry(ino_t parent, const char *name, size_t namelen, + int expected_errno) { std::unique_ptr out(new mockfs_buf_out); + out->expected_errno = expected_errno; out->header.unique = 0; /* 0 means asynchronous notification */ out->header.error = FUSE_NOTIFY_INVAL_ENTRY; out->body.inval_entry.parent = parent; diff --git a/tests/sys/fs/fusefs/mockfs.hh b/tests/sys/fs/fusefs/mockfs.hh index ba6f7fded9d0..4b0628d34dd7 100644 --- a/tests/sys/fs/fusefs/mockfs.hh +++ b/tests/sys/fs/fusefs/mockfs.hh @@ -390,8 +390,10 @@ class MockFS { * @param parent Parent directory's inode number * @param name name of dirent to invalidate * @param namelen size of name, including the NUL + * @param expected_errno The error that write() should return */ - int notify_inval_entry(ino_t parent, const char *name, size_t namelen); + int notify_inval_entry(ino_t parent, const char *name, size_t namelen, + int expected_errno = 0); /* * Send an asynchronous notification to invalidate an inode's cached diff --git a/tests/sys/fs/fusefs/notify.cc b/tests/sys/fs/fusefs/notify.cc index 1e22bde13db7..d370a1e6e706 100644 --- a/tests/sys/fs/fusefs/notify.cc +++ b/tests/sys/fs/fusefs/notify.cc @@ -385,6 +385,27 @@ TEST_F(Notify, inval_inode_with_clean_cache) leak(fd); } +/* + * Attempting to invalidate an entry or inode after unmounting should fail, but + * nothing bad should happen. + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290519 + */ +TEST_F(Notify, notify_after_unmount) +{ + const static char *name = "foo"; + struct inval_entry_args iea; + + expect_destroy(0); + + m_mock->unmount(); + + iea.mock = m_mock; + iea.parent = FUSE_ROOT_ID; + iea.name = name; + iea.namelen = strlen(name); + iea.mock->notify_inval_entry(iea.parent, iea.name, iea.namelen, ENODEV); +} + /* FUSE_NOTIFY_STORE with a file that's not in the entry cache */ /* disabled because FUSE_NOTIFY_STORE is not yet implemented */ TEST_F(Notify, DISABLED_store_nonexistent) @@ -544,3 +565,38 @@ TEST_F(NotifyWriteback, inval_inode_attrs_only) leak(fd); } + +/* + * Attempting asynchronous invalidation of an Entry before mounting the file + * system should fail, but nothing bad should happen. + * + * Note that invalidating an inode before mount goes through the same path, and + * is not separately tested. + * + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290519 + */ +TEST(PreMount, inval_entry_before_mount) +{ + const static char name[] = "foo"; + size_t namelen = strlen(name); + struct mockfs_buf_out *out; + int r; + int fuse_fd; + + fuse_fd = open("/dev/fuse", O_CLOEXEC | O_RDWR); + ASSERT_GE(fuse_fd, 0) << strerror(errno); + + out = new mockfs_buf_out; + out->header.unique = 0; /* 0 means asynchronous notification */ + out->header.error = FUSE_NOTIFY_INVAL_ENTRY; + out->body.inval_entry.parent = FUSE_ROOT_ID; + out->body.inval_entry.namelen = namelen; + strlcpy((char*)&out->body.bytes + sizeof(out->body.inval_entry), + name, sizeof(out->body.bytes) - sizeof(out->body.inval_entry)); + out->header.len = sizeof(out->header) + sizeof(out->body.inval_entry) + + namelen; + r = write(fuse_fd, out, out->header.len); + EXPECT_EQ(-1, r); + EXPECT_EQ(ENODEV, errno); + delete out; +} From nobody Sat Nov 22 14:53:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDFTC6nhrz6HFrT for ; Sat, 22 Nov 2025 14:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDFTC4dhzz46mM for ; Sat, 22 Nov 2025 14:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IhouENWbwYpLzxvM6vxyfa3W7Nry1GM8jTOiWg/toTY=; b=DpufsKufLP2nVHf4Gz5vxWz6tppmhsGcLMmAP5pVyoMeNNwepn9WqyPR8VFXwMfLnPu0mr QDwJoHQ4z8mMflrDLl9n1i2jh0S/cAYYlUVqLhdJYwT8xvIxRTgK7mkz7gZwNOrpopjjF3 ippH1bVfbZ6ZICv7fBUE5lYWCsgi6g8hYmqL3ti1f+yCG7FtVsOebpGIeiVt9QwirU9/H/ D7pzhlszoZpBhnX5quZYIOEWnKUJIpXHWAgMISbZZ/2Ln+bt8ZBVOuRPDcZ3ZaJwlrVgdb YqgAGy9ABam0dF3iAVrMRJQMu6iNhEaVF5le6B0MQB88aET2x2Hl824BONPxiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IhouENWbwYpLzxvM6vxyfa3W7Nry1GM8jTOiWg/toTY=; b=ZMnoruQnkj04efyoAvp2rzUGCQTCiK1x42pxSTxrBmzggs+ktaCQtp6VDCPAsIf1laQcvF bDavuhTe+C9NOomJWFsFydL5uFP0R1tMieiiuHCXJHY9F8N3cRBeUSmnt3I+N5IQ4gTySZ 0YkIOCucV5qayhwpas3ykxp5P/h5JFK+SryU2hst02m3A3e6OStH1+x8vueYxiDglDqROa BxyS7gxgASqQZl1nSo98H+BcSToL3HJI/QzW8tfeuZbkehIXWiHsKGuJ2dQ8VEMLLyrZ3Z RsZ3ya/dT8LtkQdfa6e9s2fU3CH6T2rEwX7IcGz/HMgT7rFttkDrp0K8NBleIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763823215; a=rsa-sha256; cv=none; b=SGof0pUaQ1E1v1OtGVNOa9EyBD4q6z9BQFPYDX8M88fZ3xPQ1mAZ9zXQ3g2XENUiOl8PfW gCoo8M1T7ZhmvouiM5lQRG4WYxCsMm86K8BUwWwcPLlitVbbivBSoJ2PeAW96kxKt2KrfP 7u4KHcBO6Mh715X9hdeml4EoVQI7yBB232R4zFF9w8A8FxDg1/cddWYb4ObBp2Rdd8QHCq JHuOxhf5aJmwg0LO6EseQDtNNF5/+bS754QkWJ/s5YfME2LEq2m5SzhIWRzaLNKwyDC0Ma V1mUBfclQebOhObw1/HFLY9hqH2rxQLuW1azDwsFwVnyTDp0dI78ENpFZYHW6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDFTC38LMz122L for ; Sat, 22 Nov 2025 14:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32a17 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:53:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: f6688f9ed5db - stable/14 - fusefs: Fix intermittency in the BadServer.ShortWrite test case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f6688f9ed5db710e0026053f2f6b73051f87bc16 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:53:35 +0000 Message-Id: <6921ce6f.32a17.792a255d@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=f6688f9ed5db710e0026053f2f6b73051f87bc16 commit f6688f9ed5db710e0026053f2f6b73051f87bc16 Author: Alan Somers AuthorDate: 2025-10-25 22:38:30 +0000 Commit: Alan Somers CommitDate: 2025-11-22 14:53:03 +0000 fusefs: Fix intermittency in the BadServer.ShortWrite test case We were using the m_quit bit for two similar but distinct uses: * To instruct the server to quit * To cope with the kernel forcibly unmounting the fs Fix the intermittent test failure by adding a separate bit, m_expect_unmount, to handle cases like the latter. Reported by: Siva Mahadevan Revied by: Siva Mahadevan Differential Revision: https://reviews.freebsd.org/D53357 (cherry picked from commit d86025c1d49c84c4dc8c3635c83c078ad56e5a53) --- tests/sys/fs/fusefs/bad_server.cc | 8 ++++---- tests/sys/fs/fusefs/mockfs.cc | 5 +++-- tests/sys/fs/fusefs/mockfs.hh | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/sys/fs/fusefs/bad_server.cc b/tests/sys/fs/fusefs/bad_server.cc index c3d195735446..825523cac2bb 100644 --- a/tests/sys/fs/fusefs/bad_server.cc +++ b/tests/sys/fs/fusefs/bad_server.cc @@ -64,12 +64,12 @@ TEST_F(BadServer, ShortWrite) out.header.error = 0; out.header.unique = 0; // Asynchronous notification out.expected_errno = EINVAL; - m_mock->write_response(out); /* - * Tell the event loop to quit. The kernel has already disconnected us + * Tell the event loop to quit. The kernel will disconnect us * because of the short write. */ - m_mock->m_quit = true; + m_mock->m_expect_unmount = true; + m_mock->write_response(out); } /* @@ -98,7 +98,7 @@ TEST_F(BadServer, ErrorWithPayload) out.push_back(std::move(out1)); // The kernel may disconnect us for bad behavior, so don't try - // to read any more. + // to read or write any more. m_mock->m_quit = true; })); diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index 4fa802cd7250..74458d7ca4cd 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -434,7 +434,8 @@ MockFS::MockFS(int max_read, int max_readahead, bool allow_other, m_child_pid(-1), m_maxwrite(MIN(max_write, max_max_write)), m_nready(-1), - m_quit(false) + m_quit(false), + m_expect_unmount(false) { struct sigaction sa; struct iovec *iov = NULL; @@ -980,7 +981,7 @@ void MockFS::read_request(mockfs_buf_in &in, ssize_t &res) { } res = read(m_fuse_fd, &in, sizeof(in)); - if (res < 0 && !m_quit) { + if (res < 0 && errno != EBADF && !m_quit && !m_expect_unmount) { m_quit = true; FAIL() << "read: " << strerror(errno); } diff --git a/tests/sys/fs/fusefs/mockfs.hh b/tests/sys/fs/fusefs/mockfs.hh index 4b0628d34dd7..f98a5337c9d1 100644 --- a/tests/sys/fs/fusefs/mockfs.hh +++ b/tests/sys/fs/fusefs/mockfs.hh @@ -360,6 +360,9 @@ class MockFS { /* Tell the daemon to shut down ASAP */ bool m_quit; + /* Tell the daemon that the server might forcibly unmount us */ + bool m_expect_unmount; + /* Create a new mockfs and mount it to a tempdir */ MockFS(int max_read, int max_readahead, bool allow_other, bool default_permissions, bool push_symlinks_in, bool ro, From nobody Sat Nov 22 14:54:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDFVW2y2Pz6HGQZ for ; Sat, 22 Nov 2025 14:54: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDFVW1s4Yz47xQ for ; Sat, 22 Nov 2025 14:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dJcnAwfHX7oLlzQyFMEVPprXGYfGyXISwHk61wL2KVw=; b=akOYYXA+Z1OYPRzYd8eldb2MEQSCbpwss+y9TXrlU0XB8pStFoDXz/J5x8plRu92T5lGmT lphfAvfnhbPfwibIZes7B+f33vaP/pOITbCneoi5Ma76wF2LBcOj4TB2PpGNB22XDuHImC bZD/93ycjsF7kZyeexcVrVLiU3p7JtfHKPS8HTigZGZl5xpqxi+YBrUd/MNx0XegTBcrY0 pcDyQJ6FmLAJRQYGtJv/ZOhBZlZT0zdPFSK9E/YsnaqCjpmq2CFrMzHzrm7i8ffP0uV5Pc wtfiBRj01jrFvA0vGLfOjbXt75EjE2MmTDWrcRSoE+OGGGpk8IhQYh5f0FPEDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dJcnAwfHX7oLlzQyFMEVPprXGYfGyXISwHk61wL2KVw=; b=kUkEpoxEwlITtLzMzufDy5cjwFU54Kp0z2lWMtwXiXK4Ns47zvVfWg12epS3njmvEfyQOM af6hN9aGvMWEGbw+7utqNBFdxmH4gjlUoXlGZo5xplQSFw17BLrcOKFlSIf9T28RDrbe72 Sa/B8/z10gmrOYsc8tJPUIBtU5FCemT28rf8Tz0DlHFPAkMBPM5fRjEDn3jl+r0fEU0i1M 7amCJCfKq72iqKW6xjXVCaBRn66ZQHblGHayenTcF+IHwQuli7qbtzbEEqn5mq3c554Ed/ 5REwsoKXVDz9g7EacesvsGpNjhwnqNJ5KI2u6UGF+irIYfPZjj0c9yCFbcDXcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763823283; a=rsa-sha256; cv=none; b=fxc0reeORxe44yi95Xjj1TAbZfouq+bbL8/NqRpF7WYB1v6bs91eyFTp4DI/R4n/SJxQwm OZp7mwf4I4MvUYM2G/JuSI+f/aKZWSQ+eWAuHod81AXLLv0pQ6VfDAJbscd4TDO5LixD25 iU1X2FG1YRDWfxAv+BMe7nJddUaW9WaQ2HYYE5XlemEtCghILmiNUVcSHrmGwg1NUCnBNX Y26jDjMedw6jDK3fItd+AeWsP718+bBjC31l5eiNytev1L0NntSxqQ10KIDlUE5HuaKN4r bNHGpdSYB6Xa42bWrcbgNzXVvSUlcNNdPi7sby/Y6h7KY+CwTg5DvpS/Yx0tqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDFVW1RJSz12rW for ; Sat, 22 Nov 2025 14:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3196e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:54:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: cd81f86919c1 - stable/14 - find: fix pathnames printed by the SIGINFO handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cd81f86919c146fb9da4425a2a424e1447e3b355 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:54:43 +0000 Message-Id: <6921ceb3.3196e.5b41fa5f@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=cd81f86919c146fb9da4425a2a424e1447e3b355 commit cd81f86919c146fb9da4425a2a424e1447e3b355 Author: Alan Somers AuthorDate: 2025-10-19 15:53:50 +0000 Commit: Alan Somers CommitDate: 2025-11-22 14:54:07 +0000 find: fix pathnames printed by the SIGINFO handler Don't duplicate the last component. PR: 290362 Reported by: John F. Carr Fixes: d06a00963b7 Reviewed by: jilles, Goran Mekić Pull Request: https://github.com/freebsd/freebsd-src/pull/1878 (cherry picked from commit f6d767fe862964f704baf4eb388a30ed8227bb65) --- usr.bin/find/find.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c index 46f0e9b3c38b..1d91256469dc 100644 --- a/usr.bin/find/find.c +++ b/usr.bin/find/find.c @@ -216,7 +216,7 @@ find_execute(PLAN *plan, char *paths[]) } if (showinfo) { - fprintf(stderr, "Scanning: %s/%s\n", entry->fts_path, entry->fts_name); + fprintf(stderr, "Scanning: %s\n", entry->fts_path); fprintf(stderr, "Scanned: %zu\n\n", counter); showinfo = 0; } From nobody Sat Nov 22 14:56:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDFY82kjbz6HGLZ for ; Sat, 22 Nov 2025 14:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDFY80kpmz493y for ; Sat, 22 Nov 2025 14:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsYPIvJEVfjiCfISKMXwDDjaMNbeuJlwa8iI2Z+frgw=; b=oBsTym/dWA2GPZV/6TatSpbY2OfUr+ZbdQA18lhz0sxLaTW+Q+n/2shG4C1DQAnNICOZkH HEWaGBvXLmQZaK94SMTQiuc599vbJJEj3M8pW/WBuhB94F89EfyTYVakCdk/nMqlSWGNl0 Dyk4lhmUlwOI5PM8LjDvRl2Idb3ZqzWt3sLgnDITSZ6STzgR2vNqnq8m+8AtjoKYCsMjsd mO4mGHr3hmjk4k3KLmwROQVVKVvPj5o5Gi0UrQmMRP2oLS0/qzSYcODjlhkORh5P1LKfVL wTG89x0TzILUy/nqY3L1P7sIYmiGGUiJK45nnTPT9ztvmXLPNr1m6ctAMPoGgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsYPIvJEVfjiCfISKMXwDDjaMNbeuJlwa8iI2Z+frgw=; b=UNNZ2fQg7o9LdlNxNy89z40JJ96Y7dZjBxgjBvapaH7mhQnGRCJrDAR3poGZoKztJWUKRq 7AmMBE1miqdEoYaVFWUVIxVC44RKr0MmS4sMpSZi46DX9XZfOPPtW5L4MCFz2W5nHeuRH8 1GOV5u/fn/YzHOw90RAZebpEdPnuhMVJfO5SuBpgjXCJCSysfry+1qDL12aunf4P22UOTK ayC/mlsCIFHHeLKB3Og2B9HF1z/JxdT8vtmYLrl/4wzqXAFZBsuFajweEVkZEFtplo5JFC wAgqn9YR8xgzlqBStE8Tp8UBx+xcJPPWttnTPDDs/Zj7uvc6lpFBeH0uht7erA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763823420; a=rsa-sha256; cv=none; b=AcQnXmNJmTSDYoKxANwtKZ+YPwpqMBqVtCE8kXEoZ+8/Wi5GEWcqa83ZMmVbwKNTjs5/8O Um/5JchnyL1CnygwT4js/4Ux6orKWjylDw+BegsnZmpAfsuy7bIw+zEfJVFDjsUXfzwLvC KqSSJg189QAh1lKqJpNaqKxOZXkmaee/dYXMsKABcpttuSqIB0ekY0DAJbQ0a4IHEbvB10 XIyXoYb3MH9LXm4NwcPL274bCV6mpVnyKBlcfebQxHR+Tz2PJ70piw2cjKdc0ze3NXNHRw xojWRu+eX517xoz0Ij3zPVYEA239tiJ883AI8jfvfG5oDc66yK7IBNUaU7C+IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDFY26fN8z12WR for ; Sat, 22 Nov 2025 14:56:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31aef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:56:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: dbf10fb83839 - stable/14 - tests/sys/netpfil/pf/sctp: make use of required.kmods List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dbf10fb83839c3aa97b878cdc2f8f0d001b3a63d Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:56:54 +0000 Message-Id: <6921cf36.31aef.1e2745a8@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=dbf10fb83839c3aa97b878cdc2f8f0d001b3a63d commit dbf10fb83839c3aa97b878cdc2f8f0d001b3a63d Author: Alan Somers AuthorDate: 2025-10-20 13:52:41 +0000 Commit: Alan Somers CommitDate: 2025-11-22 14:54:57 +0000 tests/sys/netpfil/pf/sctp: make use of required.kmods This greatly speeds up skipping a test that can't be run. Sponsored by: ConnectWise Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D53215 (cherry picked from commit 7648d2ebda22fe21ed385cc7d76813a1a9c17c99) --- tests/sys/netpfil/pf/sctp.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh index 563103827fac..3f033e63e005 100644 --- a/tests/sys/netpfil/pf/sctp.sh +++ b/tests/sys/netpfil/pf/sctp.sh @@ -29,9 +29,6 @@ sctp_init() { pft_init - if ! kldstat -q -m sctp; then - atf_skip "This test requires SCTP" - fi } atf_test_case "basic_v4" "cleanup" @@ -39,6 +36,7 @@ basic_v4_head() { atf_set descr 'Basic SCTP connection over IPv4 passthrough' atf_set require.user root + atf_set require.kmods sctp } basic_v4_body() @@ -112,6 +110,7 @@ basic_v6_head() { atf_set descr 'Basic SCTP connection over IPv6' atf_set require.user root + atf_set require.kmods sctp } basic_v6_body() @@ -186,6 +185,7 @@ reuse_head() { atf_set descr 'Test handling dumb clients that reuse source ports' atf_set require.user root + atf_set require.kmods sctp } reuse_body() @@ -244,6 +244,7 @@ abort_v4_head() { atf_set descr 'Test sending ABORT messages' atf_set require.user root + atf_set require.kmods sctp } abort_v4_body() @@ -302,6 +303,7 @@ abort_v6_head() { atf_set descr 'Test sending ABORT messages over IPv6' atf_set require.user root + atf_set require.kmods sctp } abort_v6_body() @@ -360,6 +362,7 @@ nat_v4_head() { atf_set descr 'Test NAT-ing SCTP over IPv4' atf_set require.user root + atf_set require.kmods sctp } nat_v4_body() @@ -412,6 +415,7 @@ nat_v6_head() { atf_set descr 'Test NAT-ing SCTP over IPv6' atf_set require.user root + atf_set require.kmods sctp } nat_v6_body() @@ -464,6 +468,7 @@ rdr_v4_head() { atf_set descr 'Test rdr SCTP over IPv4' atf_set require.user root + atf_set require.kmods sctp } rdr_v4_body() @@ -531,6 +536,7 @@ pfsync_head() { atf_set descr 'Test pfsync-ing SCTP connections' atf_set require.user root + atf_set require.kmods carp sctp } pfsync_body() @@ -563,10 +569,6 @@ pfsync_body() sctp_init pfsynct_init vnet_init_bridge - if ! kldstat -q -m carp - then - atf_skip "This test requires carp" - fi j="sctp:pfsync" @@ -719,6 +721,7 @@ timeout_head() { atf_set descr 'Test setting and retrieving timeout values' atf_set require.user root + atf_set require.kmods sctp } timeout_body() @@ -750,6 +753,7 @@ related_icmp_head() { atf_set descr 'Verify that ICMP messages related to an SCTP connection are allowed' atf_set require.user root + atf_set require.kmods sctp } related_icmp_body() From nobody Sat Nov 22 15:00:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDFd56xzSz6HGrQ for ; Sat, 22 Nov 2025 15:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDFd56PfZz49Nx for ; Sat, 22 Nov 2025 15:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xxeKPpvT3C6bLxFByXD+TEopTEfFGDjWRabNDMmmjvk=; b=bQuUMCyMIX1X9RY3vfu3gse0oS96eh6DycpYEBueMWmR8gmmo25/7MnBGiBUR2URl15nKj HDiB7a5UhWK53iWkeUCSNVlrq2bWJzm7ONFp/qgR/W7lKA5Ttoh3r0OFtbMAsWZiRzD3yH ihJctbzUi6XZSEkCHm9KQ8fbsVyR8urZyr6zTBi246QquhUZQCbssPtYFXDuT0u1rH49tI 7cAsQjDtW9Mdy/6C6EfO8pZRbUGR22AqfDcnjPmpbduRIHAGBHnubwa57IW6LKkkK2BQEa DexcJNAI86PsV3o1Oojv9fpXwzSLax2YBg6WF3KNun5imaiKVVNODGTi2/RbtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xxeKPpvT3C6bLxFByXD+TEopTEfFGDjWRabNDMmmjvk=; b=c7TBqOOjwmS2Oj3PvyH5jrXCORlnpr58scaD88gsi1CqWlcPtcuUj1CNU2GnyEbAcpGI0M ajzXvcvg7aH61z+xRbE/0X1LmnOoUthOw+kQk+XsyRt1co0Md0g1qO+eirafF5vBKW4OU/ QMRIQqtahEoVGlVgLerz0H/WjLWzDjdFBm5ZzymqD5v1BPutZ5t3e2MvbLBEPpjUxS2fSA EFKuNstIyXxOGAbItOj+7LLFoOj6xkTL+EI0X9ftYGZ+RHw03IAWl1NFVFB52YskxnaNL1 7Fn8lsuSxPk89vUjzduWwVpVW+yZpiVtKslaAnabr83ElTcUOi69dLWenDVNcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763823625; a=rsa-sha256; cv=none; b=T5IkPFYgaLuTyJGY+F+00qbO/TQb4kzBSqGRBrOJe+AGI3bPUJFyttvysVuClXRzXN34x9 DDYVUTZ+Mqqq+K+EhAQ3dD2UJ9i1/4X8b0ct/+xFgCEWOATgJHf6Dxvaqa51rcWE4D1WOV K4LLBDXi2A1BfxIYB1iMwoArOvUKza1X2J8keaYj01oIpZovHwZHN/lYS3k8iAzYgQ3/Pm cGI8RZhBxbf2E4Pb/fZIUvCYELdTqfPZ4BtQmRZBVXL1PYwGWPz2Q8SlAvevjwpBoK3AXZ SHkiMex72yXSFZHhZDRKWrfkLaPV9qDKG6tShe+ZTq/PxWpwM4H4L0DwtueBsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDFd55pxZz12rk for ; Sat, 22 Nov 2025 15:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33221 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 15:00:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 465c30c4f202 - stable/14 - nvme: add support for DIOCGIDENT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 465c30c4f202b02cd9cb12f12d9ea856c84c5203 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 15:00:20 +0000 Message-Id: <6921d004.33221.6c2c3e53@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=465c30c4f202b02cd9cb12f12d9ea856c84c5203 commit 465c30c4f202b02cd9cb12f12d9ea856c84c5203 Author: Alan Somers AuthorDate: 2025-10-16 22:00:14 +0000 Commit: Alan Somers CommitDate: 2025-11-22 14:59:24 +0000 nvme: add support for DIOCGIDENT Add support for the DIOCGIDENT ioctl to both nvme controller device nodes and namespace device nodes. This information was already available via the nda(4) device node. However, mapping /dev/nvmeX to /dev/ndaY device nodes is not straightforward, so it's better to get it directly from the /dev/nvme device node. PR: 290259 Sponsored by: ConnectWise Submitted by: imp (mostly) Pull Request: https://github.com/freebsd/freebsd-src/pull/1875 (cherry picked from commit 6d0001d44490becdd20d627ce663c72a30b9aac3) --- sys/dev/nvme/nvme_ctrlr.c | 24 ++++++++++++++++++++++++ sys/dev/nvme/nvme_ns.c | 5 +++++ sys/dev/nvme/nvme_private.h | 1 + 3 files changed, 30 insertions(+) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index ce203e2869fd..19fd4e70666e 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -1229,6 +1230,24 @@ nvme_ctrlr_poll(struct nvme_controller *ctrlr) nvme_qpair_process_completions(&ctrlr->ioq[i]); } +/* + * Copy the NVME device's serial number to the provided buffer, which must be + * at least DISK_IDENT_SIZE bytes large. + */ +void +nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn) +{ + _Static_assert(NVME_SERIAL_NUMBER_LENGTH < DISK_IDENT_SIZE, + "NVME serial number too big for disk ident"); + + memmove(sn, ctrlr->cdata.sn, NVME_SERIAL_NUMBER_LENGTH); + sn[NVME_SERIAL_NUMBER_LENGTH] = '\0'; + for (int i = 0; sn[i] != '\0'; i++) { + if (sn[i] < 0x20 || sn[i] >= 0x80) + sn[i] = ' '; + } +} + /* * Poll the single-vector interrupt case: num_io_queues will be 1 and * there's only a single vector. While we're polling, we mask further @@ -1367,6 +1386,11 @@ nvme_ctrlr_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, case NVME_GET_MAX_XFER_SIZE: *(uint64_t *)arg = ctrlr->max_xfer_size; break; + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } default: return (ENOTTY); } diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 9eb808f81a48..1e9c5360f15c 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -89,6 +89,11 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, gnsid->nsid = ns->id; break; } + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } case DIOCGMEDIASIZE: *(off_t *)arg = (off_t)nvme_ns_get_size(ns); break; diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 93833672674a..3039dcf40373 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -561,6 +561,7 @@ void nvme_notify_new_controller(struct nvme_controller *ctrlr); void nvme_notify_ns(struct nvme_controller *ctrlr, int nsid); void nvme_ctrlr_shared_handler(void *arg); +void nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn); void nvme_ctrlr_poll(struct nvme_controller *ctrlr); int nvme_ctrlr_suspend(struct nvme_controller *ctrlr); From nobody Sat Nov 22 15:14:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDFxt1fFsz6HJ5L for ; Sat, 22 Nov 2025 15:14:58 +0000 (UTC) (envelope-from gkontos.mail@gmail.com) Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDFxs2Ykfz3Dhh for ; Sat, 22 Nov 2025 15:14:57 +0000 (UTC) (envelope-from gkontos.mail@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b="S/JI9aE3"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of gkontos.mail@gmail.com designates 2a00:1450:4864:20::42e as permitted sender) smtp.mailfrom=gkontos.mail@gmail.com Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-42b2e9ac45aso1755995f8f.0 for ; Sat, 22 Nov 2025 07:14:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763824490; x=1764429290; darn=freebsd.org; h=message-id:in-reply-to:to:references:date:subject:mime-version :content-transfer-encoding:from:from:to:cc:subject:date:message-id :reply-to; bh=cnVcD8AwfoPjxoU5m5CYsEGVzMD9yAlWl++zx7QxUF4=; b=S/JI9aE3HPbacRUhUacXrLnQij8mz25E/sO6VDreJEcstpyBLCg71MdWQ5Ft9AfgQD QZMPLGe8z4Dh9PO3p13FkiqWA7gJMVkmWpuoVBkK+7Zs/HVzd5eUAg3TLFrhtthN1TEI CxcsDovIQut1/epFfwUup/kT0vYzRTUHjHr8ESkITZX9EEf3MZkWiBPf5/dbHWTgHVJw shysjjD8TTeuxh6Bdu7vRHPoa9DTjmVC5Zg/lhD4R3c7zgsgj6IUO8c6ZHzyLBYdU5nt jXBTndtz9iKKm7O5VidoLtpC3Ez5Yh6FjWXccw3c8tv719gFCqiE77WGmg5esF9xW9e7 Brng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763824490; x=1764429290; h=message-id:in-reply-to:to:references:date:subject:mime-version :content-transfer-encoding:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=cnVcD8AwfoPjxoU5m5CYsEGVzMD9yAlWl++zx7QxUF4=; b=ctYjfC0Rg9mppK0rvPBVk6dKwfj7eX7ZDM1CiZkrFTW4s9TTRWPzMM7lmSBy0Z+5qP yevACxMLzBCe/hGAmOBDtUccuGs0aXu+sKcSNtHYlQuv34WzZkE9cUTPXeGaIf+6Z+PA 0dhJwlw5XZxh9KJqalg0QKQA/RJSoNPX1kGTIV/b9FPSnD6rDCHaymCf/QiEaKyINcsT 3NQDNpWwTvfhyKffGwuf1+NhQ9SVXcDIOWGHVQFvhS97PuTZKM0lTe2vfFDY1qKZtQqN sI5F0RCvtOFUa9anqwngMLNlottuTZOEkO4HdyM+t/7BSpsgsKfr5CnlwVHpUJ8Fb6JV 9BfA== X-Forwarded-Encrypted: i=1; AJvYcCW8vmB/E0T7Ewk2VO5FVcWfXeS/lrWbADSrJpP+QPSx80li0PlFFDpfugwIV03f5nQ3KIwz4ipXWQcL0hvmyInQZjKw@freebsd.org X-Gm-Message-State: AOJu0YyvfPE/t/DzSqjqOL4lM9vXCk6U7zVqAWeTqcev20FK6hbipOkR RueniYBBFBJ7kVxyWxDU6HUBFpawnpZLX9pZATbdITtW69glYkjXnWvz X-Gm-Gg: ASbGncvzT/wVyQxxjDqdqANbGiQspL2J8hnisWdTMtRRIUyBikqwoBv3mcLKYd2fGAV TTs27pdQVm4aPmePODsvnT0swHCyOmz7e4he02AZSZT011bmbbWPh243aBiKhffeYRVJpbq+tgj pgxYg7XTKKwxfl8MiXlYIk38fcnfv0xKO30V7R0RqVirJ6e40ua/qvxs8BVEWH90wJJwSis1e8o guZkZJiG0O6ZEqpJs2xp9SyzVpX0aXoigau1VfO3EW7xouzeirtqP70lBn/3SsDIXseK6ivJOcr hRUEw2FtUL4ei6d0teeXf4R6AfSd0dRk2yNVUSJPxf1W/skrPJ4fXpl/ER6LAfJ3Dw0FTDzGLda JK6GC/F3WgGWWPxkq1deC2kyOqN/zn5pk1/7EXqAHHfm+7eKj7haLuV7x1RXjxzjWZQPPFOQaPO B4VD5RynIhsFz/LncWa0Ss9VSDoL62SWM= X-Google-Smtp-Source: AGHT+IHJX2odMOkxqjC9kygJ8geeW4YGATXYE5Q0Vn4m1xBdMtAvAWd76YQYT6Iqm9V/V9OuYWpD9A== X-Received: by 2002:a05:6000:1447:b0:3ec:dd12:54d3 with SMTP id ffacd0b85a97d-42cc1d0c37dmr5866655f8f.35.1763824490087; Sat, 22 Nov 2025 07:14:50 -0800 (PST) Received: from smtpclient.apple ([62.74.10.0]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42cb7f363b0sm17585722f8f.13.2025.11.22.07.14.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Nov 2025 07:14:49 -0800 (PST) From: George Kontostanos Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.200.81.1.6\)) Subject: Re: git: 5a94c2e89f6a - main - lio: use newly exposed RSS hash key API rather than ad-hoc hashing Date: Sat, 22 Nov 2025 17:14:38 +0200 References: <6921c926.2f362.6af0f437@gitrepo.freebsd.org> To: "src-committers@freebsd.org" , "dev-commits-src-main@freebsd.org" , "dev-commits-src-all@freebsd.org" In-Reply-To: <6921c926.2f362.6af0f437@gitrepo.freebsd.org> Message-Id: <66177B99-8140-4233-A4C1-C79EF3BC9541@gmail.com> X-Mailer: Apple Mail (2.3864.200.81.1.6) X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; TO_DN_EQ_ADDR_ALL(0.00)[]; TAGGED_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[gmail.com:+]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::42e:from] X-Rspamd-Queue-Id: 4dDFxs2Ykfz3Dhh unsubscribe > On 22 Nov 2025, at 4:31=E2=80=AFPM, Andrew Gallatin = wrote: >=20 > The branch main has been updated by gallatin: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D5a94c2e89f6a4fbdea49d6c3a51b5fe0= 154d2495 >=20 > commit 5a94c2e89f6a4fbdea49d6c3a51b5fe0154d2495 > Author: Andrew Gallatin > AuthorDate: 2025-11-22 14:29:34 +0000 > Commit: Andrew Gallatin > CommitDate: 2025-11-22 14:29:34 +0000 >=20 > lio: use newly exposed RSS hash key API rather than ad-hoc hashing >=20 > Differential Revision: https://reviews.freebsd.org/D53101 > Reviewed by: zlei > Sponsored by: Netflix > --- > sys/dev/liquidio/lio_main.c | 5 ----- > sys/dev/liquidio/lio_network.h | 2 -- > sys/dev/liquidio/lio_rss.c | 8 ++++---- > sys/dev/liquidio/lio_rss.h | 4 ---- > 4 files changed, 4 insertions(+), 15 deletions(-) >=20 > diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c > index 3c73a6b10eed..7b6eeb460095 100644 > --- a/sys/dev/liquidio/lio_main.c > +++ b/sys/dev/liquidio/lio_main.c > @@ -64,10 +64,8 @@ static int num_queues_per_pf1; > TUNABLE_INT("hw.lio.num_queues_per_pf0", &num_queues_per_pf0); > TUNABLE_INT("hw.lio.num_queues_per_pf1", &num_queues_per_pf1); >=20 > -#ifdef RSS > static int lio_rss =3D 1; > TUNABLE_INT("hw.lio.rss", &lio_rss); > -#endif /* RSS */ >=20 > /* Hardware LRO */ > unsigned int lio_hwlro =3D 0; > @@ -1437,13 +1435,10 @@ lio_setup_nic_devices(struct octeon_device = *octeon_dev) > lio_set_feature(ifp, LIO_CMD_TNL_TX_CSUM_CTL, > LIO_CMD_TXCSUM_ENABLE); >=20 > -#ifdef RSS > if (lio_rss) { > if (lio_send_rss_param(lio)) > goto setup_nic_dev_fail; > } else > -#endif /* RSS */ > - > lio_set_feature(ifp, LIO_CMD_SET_FNV, > LIO_CMD_FNV_ENABLE); >=20 > diff --git a/sys/dev/liquidio/lio_network.h = b/sys/dev/liquidio/lio_network.h > index 856cc8f7ab09..65896bf8cfa9 100644 > --- a/sys/dev/liquidio/lio_network.h > +++ b/sys/dev/liquidio/lio_network.h > @@ -125,9 +125,7 @@ struct lio { > /* VLAN Filtering related */ > eventhandler_tag vlan_attach; > eventhandler_tag vlan_detach; > -#ifdef RSS > struct lio_rss_params_set rss_set; > -#endif /* RSS */ > }; >=20 > #define LIO_MAX_CORES 12 > diff --git a/sys/dev/liquidio/lio_rss.c b/sys/dev/liquidio/lio_rss.c > index df10cbbe3a05..da1e18142e81 100644 > --- a/sys/dev/liquidio/lio_rss.c > +++ b/sys/dev/liquidio/lio_rss.c > @@ -31,8 +31,6 @@ > * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH = DAMAGE. > */ >=20 > -#ifdef RSS > - > #include "lio_bsd.h" > #include "lio_common.h" > #include "lio_droq.h" > @@ -69,7 +67,11 @@ lio_set_rss_info(struct lio *lio) > uint8_t queue_id; >=20 > for (i =3D 0; i < LIO_RSS_TABLE_SZ; i++) { > +#ifdef RSS > queue_id =3D rss_get_indirection_to_bucket(i); > +#else > + queue_id =3D i; > +#endif > queue_id =3D queue_id % oct->num_oqs; > rss_set->fw_itable[i] =3D queue_id; > } > @@ -168,5 +170,3 @@ lio_send_rss_param(struct lio *lio) >=20 > return (0); > } > - > -#endif /* RSS */ > diff --git a/sys/dev/liquidio/lio_rss.h b/sys/dev/liquidio/lio_rss.h > index 8a5020d47f7e..727f08b5fb0d 100644 > --- a/sys/dev/liquidio/lio_rss.h > +++ b/sys/dev/liquidio/lio_rss.h > @@ -34,8 +34,6 @@ > #ifndef __LIO_RSS_H__ > #define __LIO_RSS_H__ >=20 > -#ifdef RSS > - > #include > #include >=20 > @@ -76,8 +74,6 @@ struct lio_rss_params_set { >=20 > }; >=20 > -#endif /* RSS */ > - > #define LIO_RSS_HASH_IPV4 0x100 > #define LIO_RSS_HASH_TCP_IPV4 0x200 > #define LIO_RSS_HASH_IPV6 0x400 >=20 From nobody Sat Nov 22 16:47:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDJ0T5DR3z6HRMQ; Sat, 22 Nov 2025 16:47:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDJ0T3P9Zz3S9J; Sat, 22 Nov 2025 16:47:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763830041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+hraqZxSY4ShQPTDLpytCBnyL0pnK8ngflNETr4WMN4=; b=xGtrqCgNdRCXVGFPlouf4EIOuJxA66GON2KBKdH16hMXxrDS8OuOTuvh0Nog3u3ZnE4xX1 gO49oAGYQ/bhkgC134LGk05iLQd+Rxwbzpuq3Q/1R8B7LYwT5zjLWOqS55BcUQnIrjkRkS 18WMABi/3hYyMsAYM9Rs2SoxCwJ4uPGp42HbQLgIJCLyi01I1Kg5iRwm36IRpHgiKJ6b30 I7+U9Ql39nhGYoa2KqVLofD2DMBuvvdw9d7ZTZILPO428YaGSGw3bD7aaTCL7pbK1AuiU9 Vbqt6eLQR/Qi3XNFc1ilzyIBfxXEmDKGHHOvIMBzEHtrwOj80spafO2UjI9dCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763830041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+hraqZxSY4ShQPTDLpytCBnyL0pnK8ngflNETr4WMN4=; b=GuoI07EeNSDIFTZFE53LX2O4tBJspa/xxvdpEfauGEJ8nzAOalwtbXeb9YPp/2IoFhoMlf z8LGknT38qv575btXlfLxp1+jaRk7OyrIznnjF2e6BeTesCs/Jhuku/Ni3n1NFCWx+7pqD 0L1brL3nLP8dkeNf1JVPsNXSP4QnxND95S8x3q8stTTVGVDesaznNVmqTvefI1Ai4M9cM4 04f9P5YdtIOPVbqZE4/YcKVfQ0y7vBsrFdF64XrizTs4Alf2M6rIN40LZfWx/8oXFEgPAn k073xPKvgDbhx/86XolhFJKFBsUihGsZ+6GqMz/SeU3aeFS9g/sdaZsamNQ1Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763830041; a=rsa-sha256; cv=none; b=XNEEBVK7fdp/saysGJ/ueK7vR1Svqlw5yD8+JxCXZ+5Wza9YM68k6MlKb1brjW57TwaM3D OARo4pZA6brI8T2/uk++hRjIw4kzysk6wddt5ZCoqNfYtdGHcUXti5GV/ha14EsFT0MJOV h0OORauPnAZ1durlPaIJBrTXRJrD55szmhg4Wq+pcjKbuhD5GyIlsYqnJjnp6ojaRsMEPK BwEZk9o83+Dpyd8/I8ING9WmWt2W2CW99LS/yyHhdvRedJmiidd1WEqdFsmDB+UriO90Lq l98BU+ZXDJpinmEunMmdQzQwP34lFOht4IETcsyGAfdWrvPLy8zfEAYgw3pnzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:e499:7ae0:c3e0:81bd] (unknown [IPv6:2601:5c0:4202:5670:e499:7ae0:c3e0:81bd]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dDJ0T1CfxzrZ8; Sat, 22 Nov 2025 16:47:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Sat, 22 Nov 2025 11:47:20 -0500 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: a695ac2ce8bc - main - arm64: Move intr_pic_init_secondary earlier Content-Language: en-US To: Andrew Turner , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <691cb4c1.220bb.22f9ecf6@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <691cb4c1.220bb.22f9ecf6@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/18/25 13:02, Andrew Turner wrote: > The branch main has been updated by andrew: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a695ac2ce8bc8e8b989359002659063f2e056dcf > > commit a695ac2ce8bc8e8b989359002659063f2e056dcf > Author: Andrew Turner > AuthorDate: 2025-11-18 18:00:32 +0000 > Commit: Andrew Turner > CommitDate: 2025-11-18 18:00:32 +0000 > > arm64: Move intr_pic_init_secondary earlier > > This may have been called after intr_irq_shuffle. For most interrupt > controllers this appears to be safe, however for the GICv5 we need to > read a per-CPU ID register before we can assign interrupts to a given > CPU. > > Fix the race by moving intr_pic_init_secondary earlier in the boot, > after devices have been enumerated and before the interrupts are moved > to their assigned CPUs. > > Sponsored by: Arm Ltd > Differential Revision: https://reviews.freebsd.org/D53685 This reliably panics on boot on an Ampere Altra system I have access to. Unfortunately the panic isn't very helpful as multiple CPUs panic at once cluttering the console and there appear to be secondary panics in the console code that obscure whatever the original panic is. A few sample crashes below: pci24: numa-domain 0 on pcib24 cpu0: on acpi0 armv8crypto0: Fa t xal d x0: 0xffff0000: 0 x0FFF Fpaatnailc :d ata abormt:t x_ Asser0ion p->tp_row < t->t_winsize.tp_row failed at /usr/src/sys/teke dttken .cr103 puid = -65536 time = 1 KDB: stack backtrace: db_trace_self() at db_trace_self KDB: enter: panic panic: kdb_backend_permitted: missing cred for 0xffff0000455b21a0 cpuid = -65536 time = 1 ... pcib24: at device 7.0 numa-domain 0 on pci20 pci24: numa-domain 0 on pcib24 cpu0: on acpi0 armv8crypto0: Fatal data abo rxt0:: 0xFfaftf lFaFF x0: 0x0000000096000004 x1: 0xffff0000454c3640 (crypto_dev + 0x43a95f80) x2: 0x0000000096000004 x3: 0x0000000096000504 x4: 0xffff0000454c3590 (crypto_dev + 0x43a95ed0) x5: 0xffff00000088881c (handle_el1h_sync + 0x1c) x6: 0x0000000000000000 x7: 0xffff00000088881c (handle_el1h_sync + 0x1c) x8: 0x00000000f0c1a000 x9: 0x0000000000000620 x10: 0x000000000x0:pa00 x11: 0x000 000000000500 x12: 0x0000000096000004 x13: 0xffff0000454c36e0 (crypto_dev + 0x43a96020) x14: 0xffff0000454c3610 (crypto_dev + 0x43a95f50) x15: 0xffff00000088881c (handle_el1h_sync + 0x1c) x16: 0xffff0000008b59e4 (data_abort + 0x158) x17: 0x00000000804000c9 x18: 0xffff00004553a000 (crypto_dev + 0x43b0c940) x19: 0xffff0000454c3640 (crypto_dev + 0x43a95f80) x20: 0x0000000096000004 x21: 0x0000000096000504 x22: 0x0000000096000004 x23: 0x0000000000000620 x24: 0x00000000f0c1a000 x25: 0x0000000000000000 x26: 0xffff000000000000 x27: 0xffff000000a318d6 (notify.prefix + 0x3e2a5) x28: 0xffff000000a02aa1 (notify.prefix + 0xf470) x29: 0xffff000000b77488 (abort_handlers + 0x0) sp: 0xffff0000454c3570 lr: 0xffff00000088881c (handle_el1h_sync + 0x1c) elr: 0xffff0000008b59e4 (data_abort + 0x158) spsr: 0x00000000804000c9 far: 0x0000000096000504 esr: 0x0000000096000004 panic: data abort with spinlock held (spinlock count 356126888 != 0) cpuid = 0 time = 1 KDB: stack backtrace: db_trace_self() at db_trace_self db_trace_self_wrapper() at db_trace_self_wrapper+0x38 vpanic() at vpanic+0x1d0 panic() at panic+0x48 data_abort() at data_abort+0x3a0 handle_el1h_sync() at handle_el1h_sync+0x18 --- exception, esr 0x96000004 data_abort() at data_abort+0x158 (null)() at -0x4 WARNING: D-cacheline size mismatch 64 != 1024 WARNING: I-cacheline size mismatch 64 != 16384 WARNING: D-cacheline size mismatch 64 != 8192 WARNING: D-cacheline size mismatch 64 != 8 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 4 WARNING: I-cacheline size mismatch 64 != 2048 WARNING: D-cacheline size mismatch 64 != 2048 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 1024 WARNING: I-cacheline size mismatch 64 != 16384 WARNING: D-cacheline size mismatch 64 != 4 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 8192 WARNING: D-cacheline size mismatch 64 != 4 WARNING: I-cacheline size mismatch 64 != 128 WARNING: D-cacheline size mismatch 64 != 2048 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 4 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 512 WARNING: I-cacheline size mismatch 64 != 1024 WARNING: D-cacheline size mismatch 64 != 2048 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 2048 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 8 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 4 WARNING: I-cacheline size mismatch 64 != 2048 WARNING: D-cacheline size mismatch 64 != 4 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 1024 WARNING: I-cacheline size mismatch 64 != 16384 WARNING: D-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 4 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 8192 WARNING: D-cacheline size mismatch 64 != 4 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 2048 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 4 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 4 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 1024 WARNING: I-cacheline size mismatch 64 != 16384 WARNING: D-cacheline size mismatch 64 != 4 WARNING: I-cacheline size mismatch 64 != 4 WARNING: D-cacheline size mismatch 64 != 8192 WARNING: I-cacheline size mismatch 64 != 4 Fatal data abort: x0: 0x0000000096000504 x1: 0xffff0000015e7ef6 ($d + 0x46) x2: 0x00000000000000df x3: 0x0000000000000074 x4: 0x0000000000000000 x5: 0x020f352e0d060319 x6: 0x0000000000000004 x7: 0x656e6f7a5f716b73 x8: 0x0101010101010101 x9: 0x0000000000000003 x10: 0xfffeffff6b5e79f2 x11: 0x0000000000000001 x12: 0x0000000000000000 x13: 0x0000000000000017 x14: 0x0000080080000000 x15: 0xffff000000b73548 (mvfr1_fields + 0x0) x16: 0xffff0000018edd30 (__stop_set_modmetadata_set + 0xf00) x17: 0xffff000000831d3c (uma_zcreate + 0x0) x18: 0xffff0000011bc900 (pcpu0 + 0x0) x19: 0xffff000116200200 x20: 0xffff000000e5b9c8 (initstack + 0x39c8) x21: 0xffff0000015e7ef6 ($d + 0x46) x22: 0xffff0000404cd200 (crypto_dev + 0x3ea9fb40) x23: 0x0000000000000000 x24: 0xffff00004548b000 (crypto_dev + 0x43a5d940) x25: 0xffff0000018b7128 (system_taskq_init_sys_init + 0x0) x26: 0xffff0000010bd478 (mp_ncpus + 0x0) x27: 0x0000000003800000 x28: 0xffff00000103b000 (g_bio_run_down + 0x30) x29: 0xffff000000e5b8b0 (initstack + 0x38b0) sp: 0xffff000000e5b880 lr: 0xffff0000008313e0 (zone_ctor + 0xd8) elr: 0xffff0000008b38f8 (strcmp + 0x98) spsr: 0x0000000000400009 far: 0x0000000096000504 esr: 0x0000000096000004 panic: vm_fault failed: 0xffff0000008b38f8 error 1 cpuid = 0 time = 1 KDB: stack backtrace: db_trace_self() at db_trace_self db_trace_self_wrapper() at db_trace_self_wrapper+0x38 vpanic() at vpanic+0x1d0 panic() at panic+0x48 data_abort() at data_abort+0x28c handle_el1h_sync() at handle_el1h_sync+0x18 --- exception, esr 0x96000004 strcmp() at strcmp+0x98 item_ctor() at item_ctor+0x218 zone_alloc_item() at zone_alloc_item+0x140 uma_zcreate() at uma_zcreate+0xa4 system_taskq_init() at system_taskq_init+0x10c mi_startup() at mi_startup+0x1f4 virtdone() at virtdone+0x74 KDB: enter: panic KDBh rcdntnrc0i^Mtpa1ick0spi Siot ece_ opanic ankc:tmtt_ckanic:cpamppa :p sc p tal cp ix: i a 0:nixpfpfnm0npan2c5a0nippp: (ntc: npteap p nia: mnxap1:i0:0m00anpa00p0p_pon p p2p 0papfn:0n000p0nab: mppppanip_nic:_mtx.loc p nx1: 3p)_ o k_s an: 0ec0ra0dpapmpic ppan::pxpac0 00x_lo0k_nic pax5n pxp0npa0 00x_lo050^Mpinx6p 0xpmffc:0mt0_lb128spnpa (nvnr anapa mp4p0n mt:alxp0pic: m3a_0p04p pap8_ capani0mp0n1c:amt0apppantnr ad0_lp p ni0np anp9:mpac:p0000: nix0pap cp0:pcnpcp pan0c: m00pan an1np0nip0np pa00pp0na0:cp p2: nxtp00tpan00: 0tap xnic pxpp000c00mt0p0o0fpppxc4c m0xi000c: 0p0p0nca sapa: 0x00 ap00i0:0map00^Mpix: anx_lpfficp0ni3:cmd0pp antc:rmnan: :impu_pa 0nic: :a1ac:pa0m0:p0nip: mtx_0a icni:a anfnp0:p00p1bpmp0_lpippamic:pmta_l)ck s19pi0x00npc: m0n0c:ppan nxpa:nicf fpx0000k_np3nicpipa(icapapsnpr:_can_leck+ac:0) tx2:p picpf:00p0pan1c00mtx_lock_spinv rnvnpnpoptxpace4apepa ptxplp3ni^M:pnp2n c:fana0ic:0mtx_0ppaip:nppapreanipsc: 0apanp xc:capxc: mpip0n0n:am0xpppipanicpictpan_parnpbpo trpapptpbpa_scapap ninicp mp24pacic:fn0a00c1 mlxcpanic:pmcx_loci_bp+ 0plo)^Minpp5p nxcf ft00lopa6can0pppanp : o_expcpenfep pvapaocnii:apap c:net9anp px26pa0apap000cp0panpanic nxn7: 0ni0:0p0nic:i0n m0 panic atxfp00ic: m5a_3ock_sppn: itauacad+c:pap38)^Mnpx29::amtpap000appnnap0nicpipanic:tnixcp ni0:a70pa^Mipani p0xfffcp0n0c0 op7nin pplp:n0p:9max_9ocka5pan1 pelp: ox49c2dm9xbcapan:1^Mpspxrp nipa0apan0c0 a0xcla f:i: x4pandc:abca5anic mapini inknicpakaraplpa ctxtinnpac2 mtxpana1icxnan: 0t0 ock_d pax panic= 1t panic= 1t pDn:nipankcb mtxp:cenp : nppb_nraca_spapataaic:npapbnipaci_mexp^Mpicppp_prac _nilf mraploc(_ atn:precnicncc_ mtf_lrpp_icipxni pmtp_ppanic(ppnncppptp_lini +0xn:p iapanpcn ct)_lpapppmppnicn mpanix_pppppappan1p_apnp(p c:nppppppx_nil1 mtxnl+cxpsp^Mnpcnicp papln:el papyncc: acx_ppcpanacdlp_eic:_spnpanip8pap-cpanceapanic estx_loaka0pc0n pipapac: )tananipppp_anacppn92nic: 0t1p picic:ppriic:(mtxtpockpspvnrcn apa_apa ia:ipecp1n papppppppppppppaanic:mmtx_occk_spin: recursed o nnnreecursivemmutex trmlck @ /usrssrc/sys/krrn/sbbr_temmina.c::605 ccpuid = 05 ti^Me i 1 KDB: DB:ck bakkbrace: e: db_tract_sel_() atb_trdb_tracf_self e: db_trace_self_wrapper() at db_trace_self_wrapper+0x38 vpanic() at vpanic+0x1d0 panic() at panic+0x48 vpanic() at vpanic+0x1d0 panic() at panic+0x48 __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x188 termcn_cnputc() at termcn_cnputc+0x2c cnputc() at cnputc+0xa0 kvprintf() at kvprintf+0xa4 _vprintf() at _vprintf+0x78 printf() at printf+0x58 vpanic() at vpanic+0x26c panic() at panic+0x48 __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x188 termcn_cnputNOTICE: DRAM FW version 211207 ... pci24: numa-domain 0 on pcib24 cpu0: on acpi0 armv8crypto0: p a nxip cx:0aF n:a it0caxl:f F panic: stack overflow detected; back trace may be corrupted cpuid = 0 time = 1 KDB: stack backtrace: db_trace_self() at db_trace_self db_trace_self_wrapper() at db_trace_self_wrapper+0x38 vpanic() at vpanic+0x1d0 panic() at panic+0x48 __stack_chk_fail() at __stack_chk_fail+0x14 msgbuf_addst (x0: 0x00000s0b x0dd0xr00004000000000ul x1: 0x0x KDB: enter: panic KDB: KeKK KKKKlKKKnKKK KKKKKpKKaKKKKKcKKpKKaKKKKKKKKKKKKKKKpKKKKKKppKKKKpKKKpKK KKKKKKKKKKKKKKKpKKKKpKKKKKKKpKKKKKKpKKpKpKKpKKKpKpKpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppanic: mtx_lock_spin: eecrrsed on non-recursive mutxx trmlkk @ (null)x//yys/kern/uubrtterminl..c:60 cpuid =-65 tim = 1 KDB: sB:ck aacktaacer e: db_trace_aelf() adb_trdb_trace^Mself e: ds_trace_self_wrapper() at db_trace_self_wrapper+0x38 vpanic() at vpanic+0x1d0 panic() at panic+0x48 __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x188 termcn_cnputc() at termcn_cnputc+0x2c cnputc() at cnputc+0xa0 kvprintf() at kvprintf+0xa4 _vprintf() at _vprintf+0x78 printf() at printf+0x58 vpanic() at vpanic+0x26c panic() at panic+0x48 __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x188 termcn_cnputc() at termcn_cnputc+0x2c cnputc() at cnputc+0xa0 kvprintf() at kvprintf+0xa4 _vprintf() at _vprintf+0x78 printf() at printf+0x58 vpanic() at vpanic+0x26c panic() at panic+0x48 __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x188 termcn_cnputc() at termcn_cnputc+0x2c cnputc() at cnputc+0xa0 kvprintf() at kvprintf+0xa4 _vprintf() at _vprintf+0x78 printf() at printf+0x58 vpanic() at vpanic+0x26c panic() at panic+0x48 __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x188 termcn_cnputc() at termcn_cnputc+0x2c cnputc() at cnputc+0xa0 kvprintf() at kvprintf+0xa4 _vprintf() at _vprintf+0x78 printf() at printf+0x58 vpanic() at vpanic+0x26c panic() at panic+0x48 __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x188 termcn_cnputc() at termcn_cnputc+0x2c cnputc() at cnputc+0xaNOTICE: DRAM FW version 211207 I do see gic0 attached in dmesg before each of the crashes. Hmm, this tries to use spin locks in the gic driver before curthread is set and that's probably not going to work. Indeed, the fix below lets my box boot again: diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index ba673ce9d6ee..5fd5197b6818 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -270,6 +270,10 @@ init_secondary(uint64_t cpu) install_cpu_errata(); enable_cpu_feat(CPU_FEAT_AFTER_DEV); + /* Initialize curthread */ + KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread")); + pcpup->pc_curthread = pcpup->pc_idlethread; + intr_pic_init_secondary(); /* Signal we are done */ @@ -279,9 +283,6 @@ init_secondary(uint64_t cpu) while (!atomic_load_int(&aps_ready)) __asm __volatile("wfe"); - /* Initialize curthread */ - KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread")); - pcpup->pc_curthread = pcpup->pc_idlethread; schedinit_ap(); /* Initialize curpmap to match TTBR0's current setting. */ -- John Baldwin From nobody Sat Nov 22 16:59:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDJGL6Q7Hz6HS5W for ; Sat, 22 Nov 2025 16:59:22 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDJGL1pQmz3V3S for ; Sat, 22 Nov 2025 16:59:22 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-477b5e0323bso21158205e9.0 for ; Sat, 22 Nov 2025 08:59:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763830755; x=1764435555; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=2lI9jp59TxRRVnP6ehN5qukLqbI0FL6PhV4W7z/ekOY=; b=iJOvmN1uXO9NBOp+EtK8FtDsAaOnrh0UnOGY2KnzOCKBzgMssxohUad8j1nKGeGall sRi1xVGmwnnbTA+ijbyfZozR3DWm4D3sK7ZCAvBZWgKsJxlTBpJaE6rugtMmMKALlncQ eE/P9IMyhW16DJ+W78U+4qmlavn4NIZadHk7XQ79cuWKOYuMCGWDy16rF8vNB7go2PkU FHbaxSsoQUCs3o3TEvZibKh4bmZNSCPtp5sH+B9CRAb9I7FuBJpjbi2BPjYXkBn5O4/f 1gqb67U9G7A3v5ZDvVaJ5FvSZPdawCfCkr3fi+YD4W0/7PQQvuNsyuIss3lKgM8AHKOD PFgw== X-Forwarded-Encrypted: i=1; AJvYcCV19UZf/HKtBtBchZYUT4DfO86niaYnJR1bx68qtxO6L+bVUZMaJ6pveWc2ev6eSGzCAqP0UQiQA8IltuISvB6NLmQ9@freebsd.org X-Gm-Message-State: AOJu0Yz8fOQW2Da+vtNY9VeMB2qXJQv/jmwYI4iwW2eTiET6UUgpNR4x StS0JkhBHdGCZZm1E7dA9Ax9hzxO32KYzh8HRqzB+rz0GtL6P7sCQJkJD+Db7so+W2s= X-Gm-Gg: ASbGncstcuPfjklcztYZaCa7xBQXLumLT71/XSuol2RI1kkMLqO0XsWhBne891eQZkJ Neq5DmLSf2NRmlNxD1sYSQGfF0KCWGlm4kq5xc7AJpVOBbYg+cMBkCgcpnXkKzK6hmuuefxFgMV VfqgLtl5ePSL2Qh6Bqj38hisYy+zyh6hqhrrcmK/q0iK7HqM6+opIi113bIAmNGdSQnB7KRTFgs mMaDYvSaCy0AlbIbDz45NX8tiKDH+BhlAbS2ueKK7deMWvhb/VEeHY7W2h3OUSXdAl/9YliphZ1 /LazQ5lHa7a4Fe3jWnomp5NpeqvtBiOcO3WlzO5jYDHCUB/6VfYlWSApwzb7T5zOadT0YNHqZxx 1D23ZYq4KsuIoaFtvJsx12kn5I5J95dzNfycyYR+qn0OvSlX+I8zcsatPQxpEGo868klMYhF2Bs SzfTNgOvgWaihqQ80Zq7L9vwMcJgWyFo9RTFKyBVEh2h73ggP3ePTM1kZP1bC5Rvw= X-Google-Smtp-Source: AGHT+IHVuL+/Guc3QD547JxLex+cld46Tt4Cc9Q9hNd4Wd6a2nNN4mgqiN2a6qNb1R0m9syNksMNHg== X-Received: by 2002:a05:600c:1516:b0:477:14ba:28da with SMTP id 5b1f17b1804b1-477b9ea8f78mr65203465e9.5.1763830755351; Sat, 22 Nov 2025 08:59:15 -0800 (PST) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477a9df8db3sm107120455e9.11.2025.11.22.08.59.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Nov 2025 08:59:14 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.200.81.1.6\)) Subject: Re: git: a695ac2ce8bc - main - arm64: Move intr_pic_init_secondary earlier From: Jessica Clarke In-Reply-To: <691cb4c1.220bb.22f9ecf6@gitrepo.freebsd.org> Date: Sat, 22 Nov 2025 16:59:04 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <6FEF15D6-B2EB-4544-9FC7-49B2273BCEC1@freebsd.org> References: <691cb4c1.220bb.22f9ecf6@gitrepo.freebsd.org> To: Andrew Turner X-Mailer: Apple Mail (2.3864.200.81.1.6) X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.39 / 15.00]; NEURAL_HAM_SHORT(-1.00)[-0.998]; NEURAL_HAM_LONG(-1.00)[-0.997]; NEURAL_HAM_MEDIUM(-1.00)[-0.996]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FREEFALL_USER(0.00)[jrtc27]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_HAS_DN(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.42:from]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.42:from] X-Rspamd-Queue-Id: 4dDJGL1pQmz3V3S On 18 Nov 2025, at 18:02, Andrew Turner wrote: >=20 > The branch main has been updated by andrew: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Da695ac2ce8bc8e8b989359002659063f= 2e056dcf >=20 > commit a695ac2ce8bc8e8b989359002659063f2e056dcf > Author: Andrew Turner > AuthorDate: 2025-11-18 18:00:32 +0000 > Commit: Andrew Turner > CommitDate: 2025-11-18 18:00:32 +0000 >=20 > arm64: Move intr_pic_init_secondary earlier >=20 > This may have been called after intr_irq_shuffle. For most = interrupt > controllers this appears to be safe, however for the GICv5 we need = to > read a per-CPU ID register before we can assign interrupts to a = given > CPU. >=20 > Fix the race by moving intr_pic_init_secondary earlier in the boot, > after devices have been enumerated and before the interrupts are = moved > to their assigned CPUs. I=E2=80=99ve been trying to figure out what race you=E2=80=99re implying = exists, and cannot find anything. My thoughts are as follows: * If an AP isn=E2=80=99t properly online, why would we be looking at it = for IRQ shuffling in the first place? * intr_irq_shuffle is SI_SUB_SMP, SI_ORDER_SECOND, but release_aps is SI_SUB_SMP, SI_ORDER_FIRST * release_aps blocks until all the APs are running, which was already signalled after intr_pic_init_secondary was called Can you please explain in detail what race you believe exists? In the = meantime, given the motivation is unclear and it=E2=80=99s actively breaking = multiple distinct systems, please revert this, or I will do so shortly myself, and if = there is a race that needs fixing then you can re-land an alternative approach that = works. Jessica From nobody Sat Nov 22 17:31:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDK003jXyz6HVYl for ; Sat, 22 Nov 2025 17:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDK000HS2z3YdN for ; Sat, 22 Nov 2025 17:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763832720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mx2Bq3zvLlLDNfaWFVwr6CdLnyGE/tPHqJm1DJQeWNI=; b=IHieKSKkZMEvv21dw4Hy+Lma9eGc+J+kUqoN7D/0cPUvklmhfyJX3GU//UGQtSQfkMw0Sm g7LJ9nKXTuDyS6eVrOwDzSBL71pF5sjbaWPVUsAtcbpfYEQi1C0jRlBiBs/92JuarwL7NL VnTQJmHEq+ScaWd9WMEdOAhyjm3sCSwiXQH87h1fk/d8HVQjkAVDPqxyjZqOv0cj0yEfrH IJtqqOQxHuYt623EC5c5qxp+LIELyMZyIDG0HOG0VQ/UteqmX28qyxdjsZjEEd6alL9lHz iVJyzhywbbKPNbeXaVlSimzwlo4G4kaS6TPglcwzP2FSi4hLbCEWwrbbVKy7gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763832720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mx2Bq3zvLlLDNfaWFVwr6CdLnyGE/tPHqJm1DJQeWNI=; b=kLuWs6SPqGT6XpvbAXRMX+rAd4UUEBsuUqkJRwbYj/cRwp0dlK8KnC7Q3LW46JguYrr+fX WN9A8MJRkH3cs2A7CAr8PXt2KDEBKoWigLNqy5OImIsJcgeEWCCeSMA3dE23OT/cV4kT6n ArfH7A49rsOSLhViadZQbj03uzstQYTRT8gXq44FduHt1/XZCnh1Bg/VKrRlOHQ+Mm1+zU JW3C9wupyIvqhcNxBQbNN4MWJ4BcpXsEpau5T7ZzAbwgJShoPeteVHEnIsW8lKZ06zqj8X G4Yu1kV+loKnaKaFjWmQZnNGzuRTZSPG8Tk3ZLo3U6To6ljIY0J/Mfa4Z56WGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763832720; a=rsa-sha256; cv=none; b=aquuNmqvhHxy6o6r13HFFOnXg3m/CHxKXKHXIF+n8wyv0Pkyiztm02GNrME1Ac/cPXEuvq jVlW2ciB+aj8PkYzvzNCHEZ6ysXZSSY2sQNCxd85yDKG/t8R1Xn3KoUe+53wrC7V+YgrRO UJ8ptEBXXaVL1oQ6wejv/ffHpe6NWVCBcJJQWqckN7hd5//hZClGRJW28JD1TvQLhy66ht +EsnbSUbYYKTypRxCSXAiLnQbwpJA1fNetS6Wy8s0iOMcstU11aeI9X07PjD4C6X3TLDNz vFJ0/m96Jt7vvxfV9lIDJlXwa9Tj7aIz7S3Da9CGo6wDjY704syD+Gdmk/BXfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDJzz6g09z176b for ; Sat, 22 Nov 2025 17:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9fe4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 17:31:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 57d25b633352 - main - nuageinit: Add guards against empty user data List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 57d25b6333523491ac7a3e869bd5d16127203eed Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 17:31:59 +0000 Message-Id: <6921f38f.9fe4.573c4df6@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=57d25b6333523491ac7a3e869bd5d16127203eed commit 57d25b6333523491ac7a3e869bd5d16127203eed Author: Jose Luis Duran AuthorDate: 2025-10-21 13:11:50 +0000 Commit: Jose Luis Duran CommitDate: 2025-11-22 17:23:20 +0000 nuageinit: Add guards against empty user data Add guards against attempting to process a user data file with an empty first line or contents. PR: 290395 Reviewed by: bapt (earlier), dtxdf, markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53239 --- libexec/nuageinit/nuageinit | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 0270da5c515b..a5411c60b410 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -663,8 +663,16 @@ if not f then os.exit(0) end local line = f:read("*l") +if not line or #string.gsub(line, "^%s*(.-)%s*$", "%1") == 0 then + f:close() + os.exit(0) +end if citype ~= "postnet" then local content = f:read("*a") + if not content or #string.gsub(content, "^%s*(.-)%s*$", "%1") == 0 then + f:close() + os.exit(0) + end nuage.mkdir_p(root .. "/var/cache/nuageinit") local tof = assert(io.open(root .. "/var/cache/nuageinit/user_data", "w")) tof:write(line .. "\n" .. content) From nobody Sat Nov 22 17:32:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDK012QdWz6HVK3 for ; Sat, 22 Nov 2025 17:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDK010bM1z3Yfg for ; Sat, 22 Nov 2025 17:32:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763832721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BX1/Cvg79woWcWQYIwiv30+gaquNVfGl2HF4ZDCrEs8=; b=ggpkotX61gtCpz6+oXn76b3SmH9LOx6jwyb1gEbE8iDFKol61vmLgocKeXQr9Qmyj3Gfzs awg+ikmQtQF5ParyVO5vNDWUgkxu9gr11m3W8dGH1oIxLBya1jBeCycrKwLoHjd+NkUCwX X/Kcq6EBx0SVOsmL15h4KLmc9nqIMPqbYs506AwlXh8qDWBim6uHsLSnS/a4hTed8mUsXH Oq5BDZZiSrWIHAvTR/9pdTC2llmVJekxw5IjKlBjWJrD/k5OTWwEcs3k9+ewGyjJwiWONQ Jorfh+TOJPbf06HUwarbBWvW1t2bGDDu0tFPDYsCNaZbr3kLSO721QBqaKZeqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763832721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BX1/Cvg79woWcWQYIwiv30+gaquNVfGl2HF4ZDCrEs8=; b=RBO2vl2QQm4GV+52JN8z46GMm7VLY8tkjOFVCCWPv0u+u9sRqNauDN2q+PPulL149ahQVQ yZWG4lLOtXSNpoIz4J9K9E+q7Prt7qzEUmasL1GsoMVTHa9RAT2heZA7yzJLqNNSlrFcOV 7dl7USvrc39ntLA6ATfYKWupO6s+K8NUxP1jrykXCP3ktG/HajJCrr9WJLHIOXSXMTz0/T RTcufbqJAN402HTSWbNC8fN4JI9NQJp1eqO4TRT5f1m/GuISjguoIiRCXMq+x4aIEddsFi vDdYs3CV6WNNoROuvYSmBa0ZYlNeFAE03btNk3ndyGbaMgzM7ep/qD2tyAdl3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763832721; a=rsa-sha256; cv=none; b=gJu/y6i66JdT7NnH3D3ZbwaXvKYFhqpMUE+nTTl1SnkTkhzLxb4PYOdiHphV3wZcv2jYkW Fg0oyk20+9aFP1GlAvfpLnJc0/ycHJC3ugGt9oeR97KGk2cyyGYzBD52aZiFHyA4IHbyHN Z+WiLKogioiP6PsX9tOzbrf5OZ894QuriZBhJuY3PpK8rCQWnsPPsW8E/muZVFpAjzRYRX 7Rw2jGTS7BCMknjl+xM/oO46o1YeTKLZlF7wmu7OQgmcUZyTP9V7plT9WmnJExKtiJ7SFJ BDQ564Bm2ne9X4G8KX57RFfIU123z5g8B78aAR6gPydaamAp4jjyXfRLcdN8MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDK0100spz16wV for ; Sat, 22 Nov 2025 17:32:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9c01 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 17:32:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 55d98b024f25 - main - beep: Sort usage and man page options List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 55d98b024f25403f60efe04f90a391014b6bc388 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 17:32:00 +0000 Message-Id: <6921f390.9c01.250ed9df@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=55d98b024f25403f60efe04f90a391014b6bc388 commit 55d98b024f25403f60efe04f90a391014b6bc388 Author: Jose Luis Duran AuthorDate: 2025-11-19 15:59:25 +0000 Commit: Jose Luis Duran CommitDate: 2025-11-22 17:28:46 +0000 beep: Sort usage and man page options Sort usage and man page options, mention possible minimum and maximum values, fix punctuation marks, and cleanup the man page. PR: 291092 Reviewed by: pauamma_gundo.com, christos MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53827 --- usr.bin/beep/beep.1 | 55 ++++++++++++++++++++++++++++------------------------- usr.bin/beep/beep.c | 19 +++++++++--------- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/usr.bin/beep/beep.1 b/usr.bin/beep/beep.1 index 732f2ae261cd..a13d220a7882 100644 --- a/usr.bin/beep/beep.1 +++ b/usr.bin/beep/beep.1 @@ -21,53 +21,55 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 4, 2021 -.Dt beep 1 +.Dd November 19, 2025 +.Dt BEEP 1 .Os .Sh NAME .Nm beep .Nd play a beep sound .Sh SYNOPSIS .Nm -.Op Fl F Ar frequency +.Op Fl Bh .Op Fl D Ar duration_ms -.Op Fl r Ar sample_rate_hz +.Op Fl F Ar frequency_hz .Op Fl d Ar oss_device .Op Fl g Ar gain -.Op Fl B -.Op Fl h +.Op Fl r Ar sample_rate_hz .Sh DESCRIPTION The .Nm -utility is used to playback a beep on the soundcard. +utility is used to play a beep on the sound card. .Pp The options are as follows: -.Bl -tag -width "-f device" -.It Fl F -Sets the center frequency of the beep in Hz. -The default is 440 Hz . -.It Fl D -Sets the duration of the beep in milliseconds. -The default is 150 ms . -.It Fl d -Sets the soundcard to use. -The default is /dev/dsp . -.It Fl r -Sets the soundcard samplerate in Hz. -The default is 48000 Hz. -.It Fl g -Sets the waveform gain, between 0 and 100 inclusively. -The default is 75. +.Bl -tag -width "-r sample_rate_hz" .It Fl B Runs the .Nm utility in the background. +.It Fl D Ar duration_ms +Sets the duration of the beep in milliseconds, +between 50\~ms and 2000\~ms inclusively. +The default is 150\~ms. +.It Fl F Ar frequency_hz +Sets the center frequency of the beep in Hz. +The default is 440\~Hz. +.It Fl d Ar oss_device +Sets the OSS device to use. +The default is +.Pa /dev/dsp . +.It Fl g Ar gain +Sets the waveform gain, between 0 and 100 inclusively. +The default is 75. .It Fl h Display summary of options. +.It Fl r Ar sample_rate_hz +Sets the sound card sample rate in Hz, +between 8000\~Hz and 48000\~Hz inclusively. +The default is 48000\~Hz. .El .Sh EXAMPLES -.Pp -Playback default beep sound using /dev/dsp . +Play default beep sound on +.Pa /dev/dsp : .Bl -tag -width Ds -offset indent .It $ beep .El @@ -77,6 +79,7 @@ Playback default beep sound using /dev/dsp . .Sh HISTORY The .Nm -utility first appeared in FreeBSD 14.0. +utility first appeared in +.Fx 14.0 . .Sh AUTHORS .An Hans Petter Selasky Aq Mt hselasky@FreeBSD.org diff --git a/usr.bin/beep/beep.c b/usr.bin/beep/beep.c index 9d274770ad75..d16ad5b699c3 100644 --- a/usr.bin/beep/beep.c +++ b/usr.bin/beep/beep.c @@ -133,20 +133,21 @@ wave_function_16(float phase, float power) static void usage(void) { - fprintf(stderr, "Usage: %s [parameters]\n" - "\t" "-F \n" + fprintf(stderr, "Usage: %s [-Bh] [-D duration_ms] [-F frequency_hz] " + "[-d oss_device] [-g gain] [-r sample_rate_hz]\n" + "\t" "-B Run in background\n" "\t" "-D \n" - "\t" "-r \n" - "\t" "-d \n" + "\t" "-F \n" + "\t" "-d \n" "\t" "-g \n" - "\t" "-B Run in background\n" - "\t" "-h Show usage\n", + "\t" "-h Show usage\n" + "\t" "-r \n", getprogname(), - DEFAULT_HZ, DURATION_MIN, DURATION_MAX, DURATION_DEF, - SAMPLE_RATE_MIN, SAMPLE_RATE_MAX, SAMPLE_RATE_DEF, + DEFAULT_HZ, DEFAULT_DEVICE, - GAIN_MIN, GAIN_MAX, GAIN_DEF); + GAIN_MIN, GAIN_MAX, GAIN_DEF, + SAMPLE_RATE_MIN, SAMPLE_RATE_MAX, SAMPLE_RATE_DEF); exit(1); } From nobody Sat Nov 22 17:31:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDK0442bVz6HVK4 for ; Sat, 22 Nov 2025 17:32:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDK0407jbz3Ynv for ; Sat, 22 Nov 2025 17:32:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763832724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=byoM4/w2B8Ti1Tqj9vUkkJNcNZDsXS2L0RvTx55pBF8=; b=dORgaTbvJEM+xEhqXrzWQ5a6kQgbhawpw0ogbvsM5T976X482FcgITOKGwd7PHPhQAVNrV YC2ApFxIK5XRQq+Wg3nCNiXhXJd3hTzflbI/U3XiVB4aAlQjZeQXxj9PaytSwTFrYow8Ql gD9ZYDx2Kp04i6Z7e4j22ZmG7Ub3RMX58BUZvDA/mEotoEojJ0FNjRqIoR+M0CEypRCdzs P6X4hxfESdy4Oj9uwtlxbIs//yAfHRA0O66tRDKYk0vagS4CJ9OBQW+uA2hfq6glAPjODA 3x1gXmVPjuyNn4TW+wD6UPB8ineYsK7YtyiYMbhL1qXK77xGCGnF3niMxd6cLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763832724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=byoM4/w2B8Ti1Tqj9vUkkJNcNZDsXS2L0RvTx55pBF8=; b=En1bQQ1bAS96rOCPBll2Rd1cs50X0N4J8kAOrOvf7dGBSxc1gqWBx6xyuwxOO/GmMsYBBV 5Bna0ZunTUQ8meMMrHYhQbBUem7JuzoltuZqaRMK+pVYi12riO//LDRcQSttY6mcJhO78+ 5HsuL1uoTnzMCldbwTUqY6/MiO1E+KviyO7prl4aFAN+AosBwI5yoWFQ56VPCAA7qB4T9+ A1OuGzXLfbsdSzIw7K9fp5KEqmvc60vAb7R+fK5KJy9NBgPuQ8KpKjZ83qcPx/c8MzHASO Me9SC0jPK59HjndfMYxclDeRBSoPFpx4D2cgXyYAbyUajiuFVizFNxs/KLvnLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763832724; a=rsa-sha256; cv=none; b=QQTldUC+CKtReOvOrIb39P+wveZBecDSXJU4sbFzj7bUcCovvw+hReCQSJHS34HS+lkxQh 6ZPS3SqdbSZxHhBjOSxr12HA3xyQEuf2uUyVXO7dPehOPY3fuDq4EaIyNXwg9WagMHQP8B KXjFIUvmAgP/mzUoVSQbQEdYMyIANwtZL/YhwUZB9/wW+m7a5SA/no5YCMO8mFQlH1ro3l +m2OUYSo3x+2m7qBCqIEaRFNWNFviKZ5t5yaJGeOAMOPcnwOwo6C7WJhCJjqoINlq5U8YK YnzoTL/HHoKkJCkcs5oyU48/+B0UbrVD+T76UyrAmAUeXt97M9ofUSr+EQh0BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDK036BF0z176h for ; Sat, 22 Nov 2025 17:32:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8b70 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 17:31:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 81af04b08140 - main - nuageinit: Silence luacheck warnings and fix typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 81af04b081402d131c7e34b30c88b7c337271fad Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 17:31:58 +0000 Message-Id: <6921f38e.8b70.171303de@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=81af04b081402d131c7e34b30c88b7c337271fad commit 81af04b081402d131c7e34b30c88b7c337271fad Author: Jose Luis Duran AuthorDate: 2025-10-21 13:28:45 +0000 Commit: Jose Luis Duran CommitDate: 2025-11-22 17:22:23 +0000 nuageinit: Silence luacheck warnings and fix typos No functional change intended. Reviewed by: bapt, dtxdf, kevans MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53238 --- libexec/nuageinit/nuage.lua | 6 ++---- libexec/nuageinit/nuageinit | 24 +++++++++++------------- libexec/nuageinit/tests/addfile.lua | 2 +- libexec/nuageinit/tests/nuageinit.sh | 2 +- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 3eeb2ea0b44c..2d962b540b23 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -69,7 +69,7 @@ local function errmsg(str, prepend) end local function chmod(path, mode) - local mode = tonumber(mode, 8) + mode = tonumber(mode, 8) local _, err, msg = sys_stat.chmod(path, mode) if err then errmsg("chmod(" .. path .. ", " .. mode .. ") failed: " .. msg) @@ -150,8 +150,6 @@ local function splitlines(s) end local function getgroups() - local ret = {} - local root = os.getenv("NUAGE_FAKE_ROOTDIR") local cmd = "pw " if root then @@ -579,7 +577,7 @@ local function settimezone(timezone) root = "/" end - f, _, rc = os.execute("tzsetup -s -C " .. root .. " " .. timezone) + local f, _, rc = os.execute("tzsetup -s -C " .. root .. " " .. timezone) if not f then warnmsg("Impossible to configure time zone ( rc = " .. rc .. " )") diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index dc33f20464dc..0270da5c515b 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -229,10 +229,10 @@ local function nameservers(interface, obj) local resolv_conf = root .. "/etc/resolv.conf" - resolv_conf_attr = lfs.attributes(resolv_conf) + local resolv_conf_attr = lfs.attributes(resolv_conf) if resolv_conf_attr == nil then - resolv_conf_handler = open_resolv_conf() + local resolv_conf_handler = open_resolv_conf() resolv_conf_handler:close() end @@ -295,10 +295,11 @@ local function match_rules(rules) -- with the matching interfaces must be returned. This changes the way we initially -- thought about our implementation, since at first we only needed one interface, -- but cloud-init performs actions on a group of matching interfaces. + local interface local interfaces = {} if rules.macaddress then local ifaces = get_ifaces_by_mac() - local interface = ifaces[rules.macaddress] + interface = ifaces[rules.macaddress] if not interface then nuage.warn("not interface matching by MAC address: " .. rules.macaddress) return @@ -348,11 +349,11 @@ local function write_files(files, defer) end end -local function write_files_not_defered(obj) +local function write_files_not_deferred(obj) write_files(obj.write_files, false) end -local function write_files_defered(obj) +local function write_files_deferred(obj) write_files(obj.write_files, true) end -- Set network configuration from user_data @@ -381,6 +382,7 @@ local function network_config(obj) extra_opts = extra_opts .. " wol" end if v.mtu then + local mtu if type(v.mtu) == "number" then mtu = tostring(v.mtu) else @@ -680,14 +682,14 @@ if line == "#cloud-config" then network_config, ssh_pwauth, runcmd, - write_files_not_defered, + write_files_not_deferred, } local post_network_calls = { packages, users, chpasswd, - write_files_defered, + write_files_deferred, } f = io.open(ni_path .. "/" .. ud) @@ -704,12 +706,8 @@ if line == "#cloud-config" then for i = 1, #calls_table do if citype == "nocloud" and calls_table[i] == network_config then - netobj = parse_network_config() - if netobj == nil then - network_config(obj) - else - network_config(netobj) - end + local netobj = parse_network_config() or obj + network_config(netobj) else calls_table[i](obj) end diff --git a/libexec/nuageinit/tests/addfile.lua b/libexec/nuageinit/tests/addfile.lua index 98d020e557c0..ea98369f1909 100644 --- a/libexec/nuageinit/tests/addfile.lua +++ b/libexec/nuageinit/tests/addfile.lua @@ -35,7 +35,7 @@ if str ~= f.content then n.err("Invalid file content") end --- the file is overwriten +-- the file is overwritten f.content = "test" str = addfile_and_getres(f) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 2b7c5226c97a..851f7110378a 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -890,7 +890,7 @@ EOF atf_check -o inline:"plop" cat file1 atf_check -o inline:"" cat emptyfile atf_check -o inline:"bla\n" cat file_base64 - test -f foo && atf_fail "foo creation should have been defered" + test -f foo && atf_fail "foo creation should have been deferred" atf_check -o match:"^-rwxr-xr-x.*nobody" ls -l file_base64 rm file1 emptyfile file_base64 atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet From nobody Sat Nov 22 17:35:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDK3f71dJz6HW0Q for ; Sat, 22 Nov 2025 17:35: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDK3f6BKfz3cfb for ; Sat, 22 Nov 2025 17:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763832910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BPd3AL5fh/ItocWtopAPiGVxdIMDCMsTOf50QKk/d9U=; b=OgOwzCo2AFwiRy/FFJxwc195W43BvKel+UKNJ25f2mSR0rlHSKPRwYe+R8dN/8NItwXUEU 9DrK7LZDNFeznXXzjFaaj+DBo0gp3IZditnEIDmOB9L81Bp/8Qqi5YAE2gZxEdvrD3p/kZ apVuvaH6FNlt2Aae0HD4OLKfWU/3c2e+bafL79I3EjmIhpUG7jNezuyVONhikIDS6AkP2G xkhPBFCe0YM9ep+jPuMyD8vqa1rwi5e+8BFhbxdTG3uQn8l2ry/fJ2Xa1puppeFsqR52rf xUOsA18Q6Dl9xnJU4frQ8neH0q5ptlqpMvBvRHlJ8Tk0+/mZhDXacdX7eaVd9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763832910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BPd3AL5fh/ItocWtopAPiGVxdIMDCMsTOf50QKk/d9U=; b=A6uX9/3GV7Ubr1NwXuPWNsDLmzB75aOh+YubbZBsJBB1UvZUmfcRpi8kLr/uFm7OWrzthM NgmzFmvohFDPf9F9oNasC2qDgU2Kp+1UC3oPbwWkjBbRwlyJkcXyuThxZCs+G2QW2b7/KR x/oz0yEkbfSI959sAVnCDzDtq+Kf7MIG1byZ02iumkPiylfM1bu+l9nHiox5L5RqQTJNd1 342kINjV+KAKDrTEEyQm2/2TRmMTLFH+rCAQXbYI7o07CRxT8grkKi1NOW7xQpIQCMQ8S8 1BA++9CaT6ySr+JmsKO4rTFqCWN112XHIkHPEjcBSY8Lv9nsmwqEIkI5jyBEJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763832910; a=rsa-sha256; cv=none; b=tawMFI2ThhWE94b1clKtHKjqlrbkkEw81ZwXwT+MFeJvQ+aO8KYh1pO8r09sOeL45OzlAH Gnrcz2b6BZV1c9fcXWEQRWwA1Y5ZMAdBiRAFV5Q1So8P8+eYt1+tdfxBeLGjNmmtf+SJ5e w6DEJVYzaQXV+5gpv+xe6Zi64VtVC1hjOwxdzqU/GJmsZzP+acrmOBf1OfzfufZkDH5qYi p8B+0500g5Ho+luwjKn48Rbuh3xUdyk67H59qFesfaDqQAgD6UBvQK9D1W/b0NNaw5YqhZ st2taHMN824z5CRg+1UQJsKg9t/b+rx+G+6XiThOhdg/76xSfyGgVHRdpohCTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDK3f5k7vz16tC for ; Sat, 22 Nov 2025 17:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 90c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 17:35:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 55de86dac813 - main - dts: Revert its addition for rk356x List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55de86dac813d2f8fbb70dd15b17a5677cb1168f Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 17:35:10 +0000 Message-Id: <6921f44e.90c0.9da8a27@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=55de86dac813d2f8fbb70dd15b17a5677cb1168f commit 55de86dac813d2f8fbb70dd15b17a5677cb1168f Author: Emmanuel Vadot AuthorDate: 2025-11-22 17:32:54 +0000 Commit: Emmanuel Vadot CommitDate: 2025-11-22 17:32:54 +0000 dts: Revert its addition for rk356x Rockchip have two erratas (#3568001 and #3568002) for the GIC on RK356x. Until we have a way to handle them revert the changes that uses ITS instead of GIC for PCIe. --- sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi | 8 ++++---- .../device-tree/src/arm64/rockchip/rk356x-base.dtsi | 14 +------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi b/sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi index e719a3df126c..695cccbdab0f 100644 --- a/sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi +++ b/sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi @@ -152,7 +152,7 @@ compatible = "rockchip,rk3568-pcie"; #address-cells = <3>; #size-cells = <2>; - bus-range = <0x10 0x1f>; + bus-range = <0x0 0xf>; clocks = <&cru ACLK_PCIE30X1_MST>, <&cru ACLK_PCIE30X1_SLV>, <&cru ACLK_PCIE30X1_DBI>, <&cru PCLK_PCIE30X1>, <&cru CLK_PCIE30X1_AUX_NDFT>; @@ -175,7 +175,7 @@ num-ib-windows = <6>; num-ob-windows = <2>; max-link-speed = <3>; - msi-map = <0x1000 &its 0x1000 0x1000>; + msi-map = <0x0 &gic 0x1000 0x1000>; num-lanes = <1>; phys = <&pcie30phy>; phy-names = "pcie-phy"; @@ -205,7 +205,7 @@ compatible = "rockchip,rk3568-pcie"; #address-cells = <3>; #size-cells = <2>; - bus-range = <0x20 0x2f>; + bus-range = <0x0 0xf>; clocks = <&cru ACLK_PCIE30X2_MST>, <&cru ACLK_PCIE30X2_SLV>, <&cru ACLK_PCIE30X2_DBI>, <&cru PCLK_PCIE30X2>, <&cru CLK_PCIE30X2_AUX_NDFT>; @@ -228,7 +228,7 @@ num-ib-windows = <6>; num-ob-windows = <2>; max-link-speed = <3>; - msi-map = <0x2000 &its 0x2000 0x1000>; + msi-map = <0x0 &gic 0x2000 0x1000>; num-lanes = <2>; phys = <&pcie30phy>; phy-names = "pcie-phy"; diff --git a/sys/contrib/device-tree/src/arm64/rockchip/rk356x-base.dtsi b/sys/contrib/device-tree/src/arm64/rockchip/rk356x-base.dtsi index fd2214b6fad4..81e635620301 100644 --- a/sys/contrib/device-tree/src/arm64/rockchip/rk356x-base.dtsi +++ b/sys/contrib/device-tree/src/arm64/rockchip/rk356x-base.dtsi @@ -283,18 +283,6 @@ mbi-alias = <0x0 0xfd410000>; mbi-ranges = <296 24>; msi-controller; - ranges; - #address-cells = <2>; - #size-cells = <2>; - dma-noncoherent; - - its: msi-controller@fd440000 { - compatible = "arm,gic-v3-its"; - reg = <0x0 0xfd440000 0 0x20000>; - dma-noncoherent; - msi-controller; - #msi-cells = <1>; - }; }; usb_host0_ehci: usb@fd800000 { @@ -968,7 +956,7 @@ num-ib-windows = <6>; num-ob-windows = <2>; max-link-speed = <2>; - msi-map = <0x0 &its 0x0 0x1000>; + msi-map = <0x0 &gic 0x0 0x1000>; num-lanes = <1>; phys = <&combphy2 PHY_TYPE_PCIE>; phy-names = "pcie-phy"; From nobody Sat Nov 22 17:54:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDKTt34fWz6HXn9 for ; Sat, 22 Nov 2025 17:54: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDKTt2P2pz3g1p for ; Sat, 22 Nov 2025 17:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763834066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UkJiEE2uBu9bWkoqsxabkQu3ZEIOMQfQd5aFjNCSXdA=; b=XeiJDb7nYLPib84hfO0k/H6FiBNafBUE/VOk+55xkwPSqrKBi+w7OtvhVrj+8GfQqS4zDf 2mh3zf8gv0SPm4GiJJzyr69pmbb4vamdacj0syOlkmdWI5+jAsz4ZJxeSkbj08OKDGwpWS 50X4upQ3izb5A+LcwaBtAS/47Aaj05xY6nLi4V0crpqqQluYHKUXf/4jqLK2vKTCmVFpPf IdVswnpLWqkEav8A57W2QNqJPgD5+7ujpLR7ZNLzrVkbR8KASO6ukWGozRSCXbxJZCaA9X WNZsNgESzwz6Y5zCVL1dtBkFpAVw1vu0bJq6j0JhUl8D0KK6Uwb3IcBTYqw0fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763834066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UkJiEE2uBu9bWkoqsxabkQu3ZEIOMQfQd5aFjNCSXdA=; b=DTBbbM1kvukz6H68i2thC7lpDpNOPH6iAVbA68aeiT4/DlV7Md83eivnkEDbmCGX7lsl3l 6OjnXfHgbpCyEV0fv4b75Zp+kP5DzZXPa3FRxOKRYf8/SJ4DK94CxFKAo0yrfHkJ5sa8Ri k5bXUQs+FyuHx5FRUKl35JHUerAlsywowfsj2fMm79KzCrQYTNXaK+LOCSK8sEWmd20S1i OAL8AFjWG8qhhg9vCJ/Hifg0+cqqeZsHgf/AxDLyGH5Nb12/l/qlaXIRkMmzAAB3Nzwe2V qdyMtDXmoL1KgsuXCg5Cpz8S8DQRDRGxyNmO6FDSGIWXf+d5CC5FswZ/vAqROw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763834066; a=rsa-sha256; cv=none; b=O7BDxyvYNt0fb1KT5RTzjTz9dK1loaGbdp/o0SPp9mlrJ02b/C8MCSG8Q23LtLS0oisH+J tzHfsxFR478p2u1Qj/yjQEHz0x1ZjWX5WPV9gg+ZyhjErXP1vwAeYi1lZLB5V6MtkM2+0S iu7iPFV0K18isFn9h1+u+zBVNxGlIO/9Juk87qelxANYruVTxLaqRWHptA5f+YYK/PZE8t Jcbf1d+ZRU8l56i6O6njpL1TzLAzt4B3dHv4oTUDDlM5rY46A48IIr/nNDqqCZnYZpPQ2g mLC00m+9USulhoNXNJD1ZLQTWzkEoGnReQdb1fFCwqUUEPwlcIIauhK3GphNFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDKTt1xPYz17b8 for ; Sat, 22 Nov 2025 17:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bc8c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 17:54:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 35bff2138b17 - stable/15 - tests/sys/netpfil/pf/sctp: make use of required.kmods List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 35bff2138b173c695b2b5baab9b75e64a7b42758 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 17:54:26 +0000 Message-Id: <6921f8d2.bc8c.226047c9@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=35bff2138b173c695b2b5baab9b75e64a7b42758 commit 35bff2138b173c695b2b5baab9b75e64a7b42758 Author: Alan Somers AuthorDate: 2025-10-20 13:52:41 +0000 Commit: Alan Somers CommitDate: 2025-11-22 16:58:34 +0000 tests/sys/netpfil/pf/sctp: make use of required.kmods This greatly speeds up skipping a test that can't be run. Sponsored by: ConnectWise Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D53215 (cherry picked from commit 7648d2ebda22fe21ed385cc7d76813a1a9c17c99) --- tests/sys/netpfil/pf/sctp.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh index 78055f5a9dd2..47bf40181b1b 100644 --- a/tests/sys/netpfil/pf/sctp.sh +++ b/tests/sys/netpfil/pf/sctp.sh @@ -29,9 +29,6 @@ sctp_init() { pft_init - if ! kldstat -q -m sctp; then - atf_skip "This test requires SCTP" - fi } atf_test_case "basic_v4" "cleanup" @@ -39,6 +36,7 @@ basic_v4_head() { atf_set descr 'Basic SCTP connection over IPv4 passthrough' atf_set require.user root + atf_set require.kmods sctp } basic_v4_body() @@ -112,6 +110,7 @@ basic_v6_head() { atf_set descr 'Basic SCTP connection over IPv6' atf_set require.user root + atf_set require.kmods sctp } basic_v6_body() @@ -186,6 +185,7 @@ reuse_head() { atf_set descr 'Test handling dumb clients that reuse source ports' atf_set require.user root + atf_set require.kmods sctp } reuse_body() @@ -244,6 +244,7 @@ abort_v4_head() { atf_set descr 'Test sending ABORT messages' atf_set require.user root + atf_set require.kmods sctp } abort_v4_body() @@ -302,6 +303,7 @@ abort_v6_head() { atf_set descr 'Test sending ABORT messages over IPv6' atf_set require.user root + atf_set require.kmods sctp } abort_v6_body() @@ -360,6 +362,7 @@ nat_v4_head() { atf_set descr 'Test NAT-ing SCTP over IPv4' atf_set require.user root + atf_set require.kmods sctp } nat_v4_body() @@ -412,6 +415,7 @@ nat_v6_head() { atf_set descr 'Test NAT-ing SCTP over IPv6' atf_set require.user root + atf_set require.kmods sctp } nat_v6_body() @@ -464,6 +468,7 @@ rdr_v4_head() { atf_set descr 'Test rdr SCTP over IPv4' atf_set require.user root + atf_set require.kmods sctp } rdr_v4_body() @@ -531,6 +536,7 @@ pfsync_head() { atf_set descr 'Test pfsync-ing SCTP connections' atf_set require.user root + atf_set require.kmods carp sctp } pfsync_body() @@ -563,10 +569,6 @@ pfsync_body() sctp_init pfsynct_init vnet_init_bridge - if ! kldstat -q -m carp - then - atf_skip "This test requires carp" - fi j="sctp:pfsync" @@ -722,6 +724,7 @@ timeout_head() { atf_set descr 'Test setting and retrieving timeout values' atf_set require.user root + atf_set require.kmods sctp } timeout_body() @@ -753,6 +756,7 @@ related_icmp_head() { atf_set descr 'Verify that ICMP messages related to an SCTP connection are allowed' atf_set require.user root + atf_set require.kmods sctp } related_icmp_body() From nobody Sat Nov 22 17:58:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDKZv6LMDz6HXry for ; Sat, 22 Nov 2025 17:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDKZv2pH6z3gVm for ; Sat, 22 Nov 2025 17:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763834327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WG3iL7CHYlM6vUCQRy9bwPHAErd3A+p00sZ8dBoLslw=; b=GLQsoPwb+8aBSXo9IPnw4UZhsq8lniHmjgv4wAdsVk/fRNS6YwtYlH/fTM/Rikx4lOO/Cm 1jn7gyL4Ns7P7/53GSvVhVG5Ch0GdWpGXb+rewYG/obW5tNCr3abygj27WKVext6vBlJKk VLtaq8e7jVmiY/O4CCJIljgAgpioYwg6jVRKfDgQKZVMRktYskuqjuLI9zi7B08GCar1Ek j/mCuMftXP7VsDk29slu/2gCEfNU4RV198N6rXemhKlnro5/CnmrKQdOkpm/RxniEJyFHS EMJcaTUQIZ0Qf65PYmGj9YZY04FCxGfliyzss7EK8TlpJ1bD9kqFXIJjhUpjJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763834327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WG3iL7CHYlM6vUCQRy9bwPHAErd3A+p00sZ8dBoLslw=; b=WLGo4oE5Nsr/n6/DNXjn+beZrUmusaBx9YQa4LlTwu/DcD4bwsyYB89V3Pz1A5qZ+tjI4n PBCOVM7jxcbpPgPrvk+crkIT/4be74/Hp3pcCrG2lu7p7fulBJfzP/QWyRru8tdUmC+x2L 3entHn6RNV4MACdwzFli6Dk9/8ie3XQEOikBeBTJZxzkW5nbK104kSPimtc+5f0GRVYeR5 FYGzulYD1M2OJbyDKoAo7c/zE1xj1PWCnhVDFzGcu9nBaZ2uo/OOPuI1VOH2VWkOvuH/OO mg5HgyLb/LKiZyCjLSDDIlAhzuPAJqYx0/KG4Ctav/GYGdnXIFxs4Szwk6VeFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763834327; a=rsa-sha256; cv=none; b=w3BQy5yUmofpx05tRMWhq66REG9xDQiU+jO+dPWX4JJBqX+0FCZ9K8+TBl4l9P3VaJc6VR v4Ts+OdW2ccQaZi1Gdnp1w96kjOFmykeNeOAHa96loAlXCULMstjQDm23tkRHR/2W9sEAB IsLgHMuvec16QyOgXhrPVjMtaHVhb8H97oia4NNYk9cWdXNHRfHP9kqbO3GP5arnWZCBHe wUrP5+cqzgbnPmf6lHNcEUSI0EcvR0eMqPJ8bow578ZpxHloA+lt89uWVKTE/AX0w1ejuj MFO6qMtdOjDYx8hc1FC5SNXutnVC8SjJIrNaQbxLs9EULAhWyCzTCpGvqfeelw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDKZv1Zctz17fV for ; Sat, 22 Nov 2025 17:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c111 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 17:58:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 1b5cc3c48cb8 - stable/15 - nvme: add support for DIOCGIDENT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1b5cc3c48cb8ff80f0b6a75981d5f85e87cf7e8e Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 17:58:47 +0000 Message-Id: <6921f9d7.c111.6272f36@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1b5cc3c48cb8ff80f0b6a75981d5f85e87cf7e8e commit 1b5cc3c48cb8ff80f0b6a75981d5f85e87cf7e8e Author: Alan Somers AuthorDate: 2025-10-16 22:00:14 +0000 Commit: Alan Somers CommitDate: 2025-11-22 17:54:42 +0000 nvme: add support for DIOCGIDENT Add support for the DIOCGIDENT ioctl to both nvme controller device nodes and namespace device nodes. This information was already available via the nda(4) device node. However, mapping /dev/nvmeX to /dev/ndaY device nodes is not straightforward, so it's better to get it directly from the /dev/nvme device node. PR: 290259 Sponsored by: ConnectWise Submitted by: imp (mostly) Pull Request: https://github.com/freebsd/freebsd-src/pull/1875 (cherry picked from commit 6d0001d44490becdd20d627ce663c72a30b9aac3) --- sys/dev/nvme/nvme_ctrlr.c | 24 ++++++++++++++++++++++++ sys/dev/nvme/nvme_ns.c | 5 +++++ sys/dev/nvme/nvme_private.h | 1 + 3 files changed, 30 insertions(+) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 63b8643d97d7..12b39ce3b3ac 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -1263,6 +1264,24 @@ nvme_ctrlr_poll(struct nvme_controller *ctrlr) nvme_qpair_process_completions(&ctrlr->ioq[i]); } +/* + * Copy the NVME device's serial number to the provided buffer, which must be + * at least DISK_IDENT_SIZE bytes large. + */ +void +nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn) +{ + _Static_assert(NVME_SERIAL_NUMBER_LENGTH < DISK_IDENT_SIZE, + "NVME serial number too big for disk ident"); + + memmove(sn, ctrlr->cdata.sn, NVME_SERIAL_NUMBER_LENGTH); + sn[NVME_SERIAL_NUMBER_LENGTH] = '\0'; + for (int i = 0; sn[i] != '\0'; i++) { + if (sn[i] < 0x20 || sn[i] >= 0x80) + sn[i] = ' '; + } +} + /* * Poll the single-vector interrupt case: num_io_queues will be 1 and * there's only a single vector. While we're polling, we mask further @@ -1513,6 +1532,11 @@ nvme_ctrlr_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, case NVME_GET_CONTROLLER_DATA: memcpy(arg, &ctrlr->cdata, sizeof(ctrlr->cdata)); break; + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } /* Linux Compatible (see nvme_linux.h) */ case NVME_IOCTL_ID: td->td_retval[0] = 0xfffffffful; diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 21d7965bf7a6..17f6c205752b 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -88,6 +88,11 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, gnsid->nsid = ns->id; break; } + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } case DIOCGMEDIASIZE: *(off_t *)arg = (off_t)nvme_ns_get_size(ns); break; diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index a425a6a5ad62..dd45e1acd0aa 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -565,6 +565,7 @@ void nvme_notify_new_controller(struct nvme_controller *ctrlr); void nvme_notify_ns(struct nvme_controller *ctrlr, int nsid); void nvme_ctrlr_shared_handler(void *arg); +void nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn); void nvme_ctrlr_poll(struct nvme_controller *ctrlr); int nvme_ctrlr_suspend(struct nvme_controller *ctrlr); From nobody Sat Nov 22 18:42:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDLYq52SFz6HblP for ; Sat, 22 Nov 2025 18:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDLYq46wKz3nsF for ; Sat, 22 Nov 2025 18:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763836975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVMHG59SqCKjW8e5GQa7AeqFaRAWi9f4gDuCIveV/dE=; b=pWWoIaVJHYzeJhaY/fa7GmZgqgzXItCvcwfaW2PYoCOefgzr29zksoLxclOhDGTl3DGTq9 6dS4mnLRU7Hh3pDM7EwJ5UYrZgzvcw4nBZxCNq28s8C0lSYpPrKraGTJqgEVt5ee29vjfC EZCG9a8PtBqQZ8/GAOpoULdMM51aGqPHibx0yBVmHlDlCmFEwWYEFz4iaU01TJLloRKThL dxe9Dq3/rrlFS2f0Gv29autkjQa8p4B5hgoRXAEziU9UG3PqeEWn5VGI6Yfemm5pxS93Ci E9ssCpHnQvUhx2S6mh+RUALRCEUA5fu2UE0Ml6C8HM1Z2EIurzx0VNYhlVL8iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763836975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVMHG59SqCKjW8e5GQa7AeqFaRAWi9f4gDuCIveV/dE=; b=eg0Qd3vFC2/BQAmmknXLHZgfgsqqgGjY365rZW5xsTzmvpF8tTzcvMwU33jE/4uO0htqBB m/bxU6aUOWLOiz5J7iE58deIsSvvhtC5HOu5+4b+qAXYVsc9aDtGBjfgiv2gG1Ggu1IgFh 4lqd7QywnDKv5K3X2oU5sfXnYzOyHgQwcMA+JH9bIRFsGAdslAOzDMBaAEsiP93/SNh4SA VmJQYX23pb3eZGOOnRoTkAg/d4BbuuWiAH2+KcERBhbqYBokB6a1XTkBoXmJ80bxw5e+xC hxmVR+Fq8rsF0HqMgbKnUr2sJYht7wbYhzpTnGcAqtuzlirHx5GPM0pO8/D6Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763836975; a=rsa-sha256; cv=none; b=wgbDiyOCV2F6ViFxvHJOJu1kFsAFza8TIELHKcwSV28oV2XIRZPWCPDZdpihJMKnAm+tQF 8Hcnr/fBHBOLecgBO8HwNNNWhiyHkWs042OjWXvMtLA7KM8PRHaWTXjSiUWA9i+NoMXOm/ qOjETOBehuxIqrBbK7sTL0mpiPlQhklbD0xN4m6wfggIs2IgCpfi0jlrBQKYvB1nC+NAvQ rzqCOP8hDRX7s3BMwBQ/3CCJZJKIoLUKMKYPQq5zcUY5xAgR7rO/6qF0XtC3FEdTroMGlo Z//uhQ9kW7GcPkSGCUr5aQv/yNPqY5mImgqRuUlOFh7I2F15YoCn3+4iSo52Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDLYq3ZbCz18t8 for ; Sat, 22 Nov 2025 18:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 219e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 18:42:55 +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: c4843e5805de - stable/15 - cp: Fix copying the root directory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c4843e5805dec10ee552d21f19c8da7707c1fcbc Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 18:42:55 +0000 Message-Id: <6922042f.219e5.6a6171d1@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c4843e5805dec10ee552d21f19c8da7707c1fcbc commit c4843e5805dec10ee552d21f19c8da7707c1fcbc Author: Dag-Erling Smørgrav AuthorDate: 2025-11-22 12:11:59 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-22 18:42:43 +0000 cp: Fix copying the root directory When the source of the copy operation is the root directory, we should neither append it to the destination path on FTS_D nor trim it back off on FTS_DP. PR: 291132 MFC after: 3 days Fixes: 82fc0d09e862 ("cp: Partly restore symlink folllowing.") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53863 (cherry picked from commit fe836c50120daed3e4084f43c27d8d650d36dee8) --- bin/cp/cp.c | 7 ++++++- bin/cp/tests/cp_test.sh | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 38fe65399d06..7ac1e5f6a4c4 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -433,6 +433,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) sep = strchr(to.base, '\0'); sep[0] = '/'; sep[1] = '\0'; + } else if (strcmp(curr->fts_name, "/") == 0) { + /* special case when source is the root directory */ } else { /* entering a directory; append its name to to.path */ len = snprintf(to.end, END(to.path) - to.end, "%s%s", @@ -520,6 +522,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) if (type == DIR_TO_DNE && curr->fts_level == FTS_ROOTLEVEL) { /* this is actually our created root */ + } else if (strcmp(curr->fts_name, "/") == 0) { + /* special case when source is the root directory */ } else { while (to.end > to.path && *to.end != '/') to.end--; @@ -551,7 +555,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) /* Not an error but need to remember it happened. */ if (to.path[0] == '\0') { /* - * This can happen in two cases: + * This can happen in three cases: + * - The source path is the root directory. * - DIR_TO_DNE; we created the directory and * populated root_stat earlier. * - FILE_TO_DIR if a source has a trailing slash; diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index b637f862b7d3..af309ca7ea80 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -747,9 +747,23 @@ dstmode_body() atf_check cmp dir/file dst/file } +atf_test_case root +root_head() +{ + atf_set "descr" "Test copying the root directory" +} +root_body() +{ + atf_check mkdir dst + atf_check -s exit:1 \ + -e inline:"cp: / is a directory (not copied).\n" \ + cp / dst +} + atf_test_case to_root cleanup to_root_head() { + atf_set "descr" "Test copying to the root directory" atf_set "require.user" "unprivileged" } to_root_body() @@ -893,6 +907,7 @@ atf_init_test_cases() atf_add_test_case to_deaddirlink atf_add_test_case to_link_outside atf_add_test_case dstmode + atf_add_test_case root atf_add_test_case to_root atf_add_test_case dirloop atf_add_test_case unrdir From nobody Sat Nov 22 18:47:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDLfz1Y1fz6HN6x for ; Sat, 22 Nov 2025 18:47: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDLfz0QQPz3q08 for ; Sat, 22 Nov 2025 18:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763837243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eS7NowYl0ceGY8S5/wj/Sc3cTeycpYNKXbZ+CwPHq+U=; b=n4QrfL1DCOCcxBPrCI48Sr/3Y4Pn2KITDxz/sdpdmR4oOJWeCR9iV+yKGagxUuf3IcVZMr vPxOxy4CsqCTWP3tQQz2iaTUhNGiK2HEshFdraSuql+PMyVFT4XXfY0ufuDbrNVfS+F/ju XxQUcdUL9CtW1qsgkJB0FVA+mOWRA7P4dSR50EZloIJ/vdl3QPBUrj4fjUWY7X84fYUAdK 7GHZlR+GKWhE4Lot+m3cF8Bh//zkkMLl9TjrZXOBw7jv/fuhYTqFabv74/gw5t9nnDffT1 8O8+A242vgO+Evz05Z+xdKdUeyzenmdODx/wXLmctXhrzgpfE/yTSvz2EfzgqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763837243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eS7NowYl0ceGY8S5/wj/Sc3cTeycpYNKXbZ+CwPHq+U=; b=XlXWMnz9igMHQVxa+KJXSKCtevdZBmtuwpLpiJl6lB6pM8LQ0TVXzYlJYFQvA+ufQuOrnU uzuiMfyGXaKYqpBtSbxs0RDTHvANPAoKcQFxhz4TNY4nZVkjsLGXiNQ9GSR5hdJ8aKq+g0 r8osZ7s2W8xy5xJ99oWKIhXPPElWe+6Q5VTakt9HE8sYq5RrL0HI+GzyHpHAffGiC4hJTo MI9qCM50e0LE+OZsoUnKb0Z/iLf5n+PBtCJfuqlsGGgKnEiof0m9p3xbuPTWJFQXRB0hFG h5EX16yQULNFNARKr3/KFFe1005L3s8CU6QYjOb/Elnmu4tiR+qx64jGU20phA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763837243; a=rsa-sha256; cv=none; b=MRKCATxuwR4+FUiaeJoY8UG4YbVDpy4nSWQ1u80e/Krq+1QA9jRTp8QxZH6XOV9GqNfiSc FDoqMwWl64IhvYPj5wiofmQxDBd4EBHQxrv9WvErQEykDQsnvmMZiqKyLBwGCn9rx95TWG bVptPc9BtTXs77UsdgsT30xIW75ci8OP5nktYjxKQccI5O59NCRseYhlan6yK0LLzXuRQh FK33VKlCmSaOMqsKebkEcCB0cow4QbHFSjTEXHIYKqeDkPd+lC6A/z8SIvqWw2aGVrIOOX BjbhtjF7BGJ0LvU/127aa95MjoYwHHR5gbIF90Kd2N9tRWLIhiPu9FMDbVZTmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDLfy72zqz18Q1 for ; Sat, 22 Nov 2025 18:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2271c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 18:47:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 9128380511de - main - Revert "arm64: Move intr_pic_init_secondary earlier" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9128380511de3db9bd4d62d58c6a6dfcd1094079 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 18:47:22 +0000 Message-Id: <6922053a.2271c.37b703ae@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=9128380511de3db9bd4d62d58c6a6dfcd1094079 commit 9128380511de3db9bd4d62d58c6a6dfcd1094079 Author: Jessica Clarke AuthorDate: 2025-11-22 18:46:04 +0000 Commit: Jessica Clarke CommitDate: 2025-11-22 18:46:04 +0000 Revert "arm64: Move intr_pic_init_secondary earlier" It's not clear what the race described in the commit actually is, nor how it could arise, but this commit is definitely wrong; curthread is no longer set for intr_pic_init_secondary, and gic_v3's pic_init_secondary uses mutex(9) in some places, which requires curthread, so it has led to panics. Revert this change until the original issue this was intended to be fixed can be more thorougly investigated and a better fix made. Reported by: Herbert J. Skuhra , jhb This reverts commit a695ac2ce8bc8e8b989359002659063f2e056dcf. --- sys/arm64/arm64/mp_machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index ba673ce9d6ee..0bdd2ecfd8a7 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -270,8 +270,6 @@ init_secondary(uint64_t cpu) install_cpu_errata(); enable_cpu_feat(CPU_FEAT_AFTER_DEV); - intr_pic_init_secondary(); - /* Signal we are done */ atomic_add_int(&aps_started, 1); @@ -290,6 +288,8 @@ init_secondary(uint64_t cpu) ("pmap0 doesn't match cpu %ld's ttbr0", cpu)); pcpup->pc_curpmap = pmap0; + intr_pic_init_secondary(); + /* Start per-CPU event timers. */ cpu_initclocks_ap(); From nobody Sat Nov 22 19:15:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDMH4292lz6HPqV for ; Sat, 22 Nov 2025 19:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDMH410kPz3tVV for ; Sat, 22 Nov 2025 19:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763838912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HuAuGVohu6iiY5wWR/xMSaoxGKEzHU30BEEahxybxtE=; b=wLA+e55+XJIX+DVrs1h0POhSRwbB0ZcLTPdThNfI3Ag8mgdt2biiUALtLcXJGAVB3Zg7aX wRkeCmZ85IOQ0tFO/L1gUQFTOU6hWMOkhICUtFWybD6ekEdN/cKOEjCsLQnrP6jaR2ymmp /UN2BApEqV+Hm6MqbehOKYaGEfFbWPhjM8cMjRYuoq+m6NFqspGpqhw7sazb6mahMcZv+9 GPpmh/t3OYlm4n78K2CuBxxFJX7ZYoytPZedAB1eC3exnfDz2fLG2a1iZU99tiksoOdCb3 B9mT/LtmfxtoJEVWwj4mJqzSfzA1uF/vc2SMVHtDZcSnMwYrDD2VQoUgcbyeow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763838912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HuAuGVohu6iiY5wWR/xMSaoxGKEzHU30BEEahxybxtE=; b=B42RkqHKKkS1QwglG66mAwJ7hWBmM/KV3DbA4luO675yuJ5suVgEMa/evYV6CjMX1p5tZH C+2fIkxlcrHWyuy1RUAx1tX2kQKWfxSBLH+SfhRlYLzRUEJdhuostYUL6JZlsu9EKPQrCQ vwTbkVeWHuixmfxEk0V3gNRqb/9CK1xWnPCUH1xiUVltxV2zFTEGo1Ysy0kSqRqLq4inTn qaNEX200tTs8VaVmznbBq7MfhyAO0ykCqTz8o0srvTUUiBxjQleYxpka31n9JQdmb6mY9o WiYhdEIDRYTIytyjMhJmGJTV/DWq8OtwA0vQ6z5C+SYgEiKAQie0gxlq5H8P8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763838912; a=rsa-sha256; cv=none; b=xWErUi5/5vCO5hPjY0bSU2FDCvS/MYEf6R/Iz2TQ2p3JfgxLp40HCF+wI0rOVyD248sLB9 bLUmsXpNEj+z2QmbyJb8RTG+18Q8oiKizd44aPkYngH4YRazwtF1izz4Wt+PWYHB2HxDlT NXbG4AiEHNl1PS56fkklPYnzlQahnWcC6FBeOQ456XTBJabTTCEQid3lG3kUEkM9pU6w92 Xa9PPmNfGIHc8WQD13akVYkBTkbyEXwN7o+Fzbds/kCNj1YwULnp9KQgppVL0MwkseythW 3g47drAdQItNC05mlVnDFJVjElhPXBiHRvHIOJlSolrH++sf5uZx13Qe/YCP+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDMH36jV9z19jR for ; Sat, 22 Nov 2025 19:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 243e7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 19:15:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Tetlow Subject: git: 12ec49d8fac2 - main - Add backup pkgbase signing key held by security-officer. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12ec49d8fac2eacd40ad235bf73cc585736ee77a Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 19:15:11 +0000 Message-Id: <69220bbf.243e7.2e62e43a@gitrepo.freebsd.org> The branch main has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=12ec49d8fac2eacd40ad235bf73cc585736ee77a commit 12ec49d8fac2eacd40ad235bf73cc585736ee77a Author: Gordon Tetlow AuthorDate: 2025-11-22 08:35:52 +0000 Commit: Gordon Tetlow CommitDate: 2025-11-22 19:14:25 +0000 Add backup pkgbase signing key held by security-officer. This key was generated by gordon@ (aka security-officer@) on an offline system as a backup key should anything happen to the AWS Key Management Service that is currently in use for signing pkgbase repositories for FreeBSD 15.x. Reviewed by: cperciva With hat: so --- share/keys/pkgbase-15/trusted/Makefile | 3 ++- share/keys/pkgbase-15/trusted/backup-signing-15 | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/share/keys/pkgbase-15/trusted/Makefile b/share/keys/pkgbase-15/trusted/Makefile index e6205999b12f..32db72ae368a 100644 --- a/share/keys/pkgbase-15/trusted/Makefile +++ b/share/keys/pkgbase-15/trusted/Makefile @@ -1,6 +1,7 @@ PACKAGE= pkg-bootstrap -FILES= awskms-15 +FILES= awskms-15 \ + backup-signing-15 FILESDIR= ${SHAREDIR}/keys/pkgbase-15/trusted FILESMODE= 644 diff --git a/share/keys/pkgbase-15/trusted/backup-signing-15 b/share/keys/pkgbase-15/trusted/backup-signing-15 new file mode 100644 index 000000000000..a147d6788cf2 --- /dev/null +++ b/share/keys/pkgbase-15/trusted/backup-signing-15 @@ -0,0 +1,2 @@ +function: "sha256" +fingerprint: "56a77bdcb6c3cf7984729c6138bd5617c24aa0d466b3b604c96205b2c5629f3c" From nobody Sat Nov 22 19:16:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDMJN3q3Hz6HQ7h for ; Sat, 22 Nov 2025 19:16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDMJN3FH0z3trH for ; Sat, 22 Nov 2025 19:16:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763838980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OuWn9Q6qtwrjkw/FCXMldDQjBXmr0Ai/yo/zlKE/SOE=; b=LKWd2sA6KD4Sqq5WT+/guxu6bXc1cBpM/ITicV0puVK5fK/n1ChodCPODLUXn+ORBWzzyd EANBP86GJ4MlqkkETnRYJTlLhO4iPFK1bu912RlqUYjIosdydmTJzhaUrumTfu53NEJUbd 2CnXREG/YvRi19VBbk42ADdXjGxmuuCjAEDDABwE7L7/hqrUQEsl+JIiizYocZ3OV1MOAl 2r3sHqyivg6FPH6ipqNconum52UOV7TZ+zdOWAffmK9L6MZCuAYhy+sATklGUSoK2RgTTT ahO7h17tmCJ2t0Zhjbfae7udfzQ7H0BTQ+u2aaSPR9X0LXzcNG4DGVMpNZRDjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763838980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OuWn9Q6qtwrjkw/FCXMldDQjBXmr0Ai/yo/zlKE/SOE=; b=AwErrY4LQpIhcU+eCh1pKmTV9XbYCbMlIPIkPhqOYe1u3ZkyT3lz1vnJ3b5dFFrFjSWmAk d8vbu5a/yTuVtVyY7QStnztiCNJu6/kNpmdaai18k8Hr1w4VpG8W3WuBYacYQoBPVwkRrl Lm7ktPyvbPjB3wKPkC986J18cNxsC3AD79IdLz1D45uZ1eBwY45p5AY5DA2bzMgZUHNOe6 Ky7LCaZn4JLusHMwhdAaj1c/J0On8CKXGLHxj5Px1eUjx+jZkK+KFBXAlpi8yewnOnfzz0 r/2vDqoQc7p15g+Qx+205lhO0V94pomSg3duP3/ENcMjW0WR8QGd+qGmGsVoKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763838980; a=rsa-sha256; cv=none; b=Qm2+eCx72BLdR1MMh3x4+8QeouxDBVjrxzl0Ltd4ULd/eKLFGocjQWViIwJy7srYyfREB9 bAyRv4VPJPE/IhwTB+slKddramlFcB1fyWiidvZEQ8X+skAOpWGMJUJdmxkez/0zFok59W Zjk4OIYJPLlKSKr6wg9JBIXV0qcTCOd8YGitAohOdf9tYesYA4pPPn5IevPM9SgjbOdLac 4EoV1V/R99uZNeVJSXSudfdYkzCDqpzqDsYR6Jhbi6A2UZ0aq7Ie0K0+hzR7PIV33mGnPg Q2WXIrFeiwjTulHx8suPfff9xd22TtiEmM2V7PSi0NdP+UK33ue8stlJHHmAkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDMJN2nfsz19GF for ; Sat, 22 Nov 2025 19:16:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 258fe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 19:16:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 696b0e2209ee - stable/15 - Add backup pkgbase signing key held by security-officer. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 696b0e2209ee81c5a0b27c327cf66eb3c9cfc584 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 19:16:15 +0000 Message-Id: <69220bff.258fe.51b56df8@gitrepo.freebsd.org> The branch stable/15 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=696b0e2209ee81c5a0b27c327cf66eb3c9cfc584 commit 696b0e2209ee81c5a0b27c327cf66eb3c9cfc584 Author: Gordon Tetlow AuthorDate: 2025-11-22 08:35:52 +0000 Commit: Gordon Tetlow CommitDate: 2025-11-22 19:15:42 +0000 Add backup pkgbase signing key held by security-officer. This key was generated by gordon@ (aka security-officer@) on an offline system as a backup key should anything happen to the AWS Key Management Service that is currently in use for signing pkgbase repositories for FreeBSD 15.x. Reviewed by: cperciva With hat: so (cherry picked from commit 12ec49d8fac2eacd40ad235bf73cc585736ee77a) --- share/keys/pkgbase-15/trusted/Makefile | 3 ++- share/keys/pkgbase-15/trusted/backup-signing-15 | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/share/keys/pkgbase-15/trusted/Makefile b/share/keys/pkgbase-15/trusted/Makefile index e6205999b12f..32db72ae368a 100644 --- a/share/keys/pkgbase-15/trusted/Makefile +++ b/share/keys/pkgbase-15/trusted/Makefile @@ -1,6 +1,7 @@ PACKAGE= pkg-bootstrap -FILES= awskms-15 +FILES= awskms-15 \ + backup-signing-15 FILESDIR= ${SHAREDIR}/keys/pkgbase-15/trusted FILESMODE= 644 diff --git a/share/keys/pkgbase-15/trusted/backup-signing-15 b/share/keys/pkgbase-15/trusted/backup-signing-15 new file mode 100644 index 000000000000..a147d6788cf2 --- /dev/null +++ b/share/keys/pkgbase-15/trusted/backup-signing-15 @@ -0,0 +1,2 @@ +function: "sha256" +fingerprint: "56a77bdcb6c3cf7984729c6138bd5617c24aa0d466b3b604c96205b2c5629f3c" From nobody Sat Nov 22 22:00:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDQyR1bqQz6Hg6N; Sat, 22 Nov 2025 22:01:03 +0000 (UTC) (envelope-from tuexen@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDQyR1M3Fz4LZC; Sat, 22 Nov 2025 22:01:03 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763848863; 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=yUVdeIyt/8omuB5UTipL9gxHFEAuxh4qtvvWIWIiR1s=; b=e7Kx2EEzTSAOfB6s41EZ2KlGBrKPCKhPQNtEsT+czJr8CaAEVCQ+JXC5A5PuuoT5JpZckt wXGyOfdlBRkPYhUkZBb00jrkavERu6eily74B9+EHUV1uDYkctI5UD3GEWDwb80XsX75pV aNnIwXDq5/wBZjm0JCsuecr5rWgGbcrR0hj+kh7nKxmw1zr3gJ8njmMYqCBxzKKdpYR6yi CinnzKoKSnQWPevKcuTuWUTkHHPREh2QGCcq+8DsKZUBoY2xZfPwq3i46tIQ5UDiDM3V0U ibO10G8UTs+6VL8jOiYaplQ+wzpJxbh+i6FfGfm/79elzSyhtVRM14SQ0W9ang== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763848863; 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=yUVdeIyt/8omuB5UTipL9gxHFEAuxh4qtvvWIWIiR1s=; b=DLCD2b/ysuVY+gAm/AyaLAUau8hx+kvQ1yFyUJ4GnwPLISZchdcdA73P1V0d2PVFbs3Bhh KEy9CcNR6BNBxhO+PgNCDiaxw8ShOasbEGqZTjsJUB58DVcKXhm+6Y6NAARAdf68VT68Vk tMPYrXUlpimBw4mhkFtiwDQrqbPEAypqgg62ONWuVtKZTcKJaxlTIR05ZBWyqB2pIWf5UI j4R0s+r9UxEad0pm6KwrpxeJDruPZccGYQXSYLj+N5EI5vI3jmGXo4A0hxvW6t6Riv4SGz 0QyVVSW02Tu8HhR+zOnf+h1Xgmfq0xzCGam+rvtd2m5H6akmeZ3BkpuIqtQfmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763848863; a=rsa-sha256; cv=none; b=K3AQbnu17PVOOaLDQSlb3FkEKrqsVHUI4VuzprRviamddLKtEZKcrKBXPNZNRuL2ulgXpy oVMb3KGave/YR3DftYPd7b1KRxO22+sEP9TrX0+J60MJx+VwwLtzguI5jTZWstWYSjhypO hTxod31YoL+79MTolF0COXphdJvJRKpKdL6aIV0tW9utRFzLCoKOBzIZSlPlDJpPZr584e WlejHuGlWtlPNebEuof8aAtwnZCLSgAbz/UPGX2v5v4co3IfRkqxYTYAKfs1j3bxInP0C1 JE2p3AfvRj9GvOsS03y0xfu57mtEm8LudEiZaHUBlQpCEagrda4YxXXCF1LprA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1101:be00:35d8:c91b:8636:58cb]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: tuexen) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dDQyQ2QTjzyg8; Sat, 22 Nov 2025 22:01:02 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.200.81.1.6\)) Subject: Re: git: a695ac2ce8bc - main - arm64: Move intr_pic_init_secondary earlier From: Michael Tuexen In-Reply-To: Date: Sat, 22 Nov 2025 23:00:59 +0100 Cc: Andrew Turner , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <2C058EE8-72FF-40AB-AC7A-5E5C1A0EEC01@FreeBSD.org> References: <691cb4c1.220bb.22f9ecf6@gitrepo.freebsd.org> To: John Baldwin X-Mailer: Apple Mail (2.3864.200.81.1.6) > On 22. Nov 2025, at 17:47, John Baldwin wrote: >=20 > On 11/18/25 13:02, Andrew Turner wrote: >> The branch main has been updated by andrew: >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Da695ac2ce8bc8e8b989359002659063f= 2e056dcf >> commit a695ac2ce8bc8e8b989359002659063f2e056dcf >> Author: Andrew Turner >> AuthorDate: 2025-11-18 18:00:32 +0000 >> Commit: Andrew Turner >> CommitDate: 2025-11-18 18:00:32 +0000 >> arm64: Move intr_pic_init_secondary earlier >> This may have been called after intr_irq_shuffle. For most = interrupt >> controllers this appears to be safe, however for the GICv5 we = need to >> read a per-CPU ID register before we can assign interrupts to a = given >> CPU. >> Fix the race by moving intr_pic_init_secondary earlier in = the boot, >> after devices have been enumerated and before the interrupts are = moved >> to their assigned CPUs. >> Sponsored by: Arm Ltd >> Differential Revision: https://reviews.freebsd.org/D53685 >=20 > This reliably panics on boot on an Ampere Altra system I have access = to. I think this also affects FreeBSD under VMWare Fusion or VirtualBox in = arm-based Macs. Booting in safe mode always worked. Using QEMU did not result in any = problem.=20 Best regards Michael > Unfortunately the panic isn't very helpful as multiple CPUs panic at = once > cluttering the console and there appear to be secondary panics in the > console code that obscure whatever the original panic is. A few = sample > crashes below: >=20 > pci24: numa-domain 0 on pcib24 > cpu0: on acpi0 > armv8crypto0: > Fa t xal d x0: 0xffff0000: 0 x0FFF Fpaatnailc :d ata = abormt:t > x_ Asser0ion p->tp_row < t->t_winsize.tp_row failed at = /usr/src/sys/teke dttken > .cr103 > puid =3D -65536 > time =3D 1 > KDB: stack backtrace: > db_trace_self() at db_trace_self > KDB: enter: panic > panic: kdb_backend_permitted: missing cred for 0xffff0000455b21a0 > cpuid =3D -65536 > time =3D 1 > ... >=20 > pcib24: at device 7.0 numa-domain 0 on pci20 > pci24: numa-domain 0 on pcib24 > cpu0: on acpi0 > armv8crypto0: > Fatal data abo rxt0:: 0xFfaftf lFaFF x0: 0x0000000096000004 > x1: 0xffff0000454c3640 (crypto_dev + 0x43a95f80) > x2: 0x0000000096000004 > x3: 0x0000000096000504 > x4: 0xffff0000454c3590 (crypto_dev + 0x43a95ed0) > x5: 0xffff00000088881c (handle_el1h_sync + 0x1c) > x6: 0x0000000000000000 > x7: 0xffff00000088881c (handle_el1h_sync + 0x1c) > x8: 0x00000000f0c1a000 > x9: 0x0000000000000620 > x10: 0x000000000x0:pa00 > x11: 0x000 000000000500 > x12: 0x0000000096000004 > x13: 0xffff0000454c36e0 (crypto_dev + 0x43a96020) > x14: 0xffff0000454c3610 (crypto_dev + 0x43a95f50) > x15: 0xffff00000088881c (handle_el1h_sync + 0x1c) > x16: 0xffff0000008b59e4 (data_abort + 0x158) > x17: 0x00000000804000c9 > x18: 0xffff00004553a000 (crypto_dev + 0x43b0c940) > x19: 0xffff0000454c3640 (crypto_dev + 0x43a95f80) > x20: 0x0000000096000004 > x21: 0x0000000096000504 > x22: 0x0000000096000004 > x23: 0x0000000000000620 > x24: 0x00000000f0c1a000 > x25: 0x0000000000000000 > x26: 0xffff000000000000 > x27: 0xffff000000a318d6 (notify.prefix + 0x3e2a5) > x28: 0xffff000000a02aa1 (notify.prefix + 0xf470) > x29: 0xffff000000b77488 (abort_handlers + 0x0) > sp: 0xffff0000454c3570 > lr: 0xffff00000088881c (handle_el1h_sync + 0x1c) > elr: 0xffff0000008b59e4 (data_abort + 0x158) > spsr: 0x00000000804000c9 > far: 0x0000000096000504 > esr: 0x0000000096000004 > panic: data abort with spinlock held (spinlock count 356126888 !=3D 0) > cpuid =3D 0 > time =3D 1 > KDB: stack backtrace: > db_trace_self() at db_trace_self > db_trace_self_wrapper() at db_trace_self_wrapper+0x38 > vpanic() at vpanic+0x1d0 > panic() at panic+0x48 > data_abort() at data_abort+0x3a0 > handle_el1h_sync() at handle_el1h_sync+0x18 > --- exception, esr 0x96000004 > data_abort() at data_abort+0x158 > (null)() at -0x4 > WARNING: D-cacheline size mismatch 64 !=3D 1024 > WARNING: I-cacheline size mismatch 64 !=3D 16384 > WARNING: D-cacheline size mismatch 64 !=3D 8192 > WARNING: D-cacheline size mismatch 64 !=3D 8 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: I-cacheline size mismatch 64 !=3D 2048 > WARNING: D-cacheline size mismatch 64 !=3D 2048 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 1024 > WARNING: I-cacheline size mismatch 64 !=3D 16384 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 8192 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: I-cacheline size mismatch 64 !=3D 128 > WARNING: D-cacheline size mismatch 64 !=3D 2048 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 512 > WARNING: I-cacheline size mismatch 64 !=3D 1024 > WARNING: D-cacheline size mismatch 64 !=3D 2048 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 2048 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 8 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: I-cacheline size mismatch 64 !=3D 2048 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 1024 > WARNING: I-cacheline size mismatch 64 !=3D 16384 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 8192 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 2048 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 1024 > WARNING: I-cacheline size mismatch 64 !=3D 16384 > WARNING: D-cacheline size mismatch 64 !=3D 4 > WARNING: I-cacheline size mismatch 64 !=3D 4 > WARNING: D-cacheline size mismatch 64 !=3D 8192 > WARNING: I-cacheline size mismatch 64 !=3D 4 > Fatal data abort: > x0: 0x0000000096000504 > x1: 0xffff0000015e7ef6 ($d + 0x46) > x2: 0x00000000000000df > x3: 0x0000000000000074 > x4: 0x0000000000000000 > x5: 0x020f352e0d060319 > x6: 0x0000000000000004 > x7: 0x656e6f7a5f716b73 > x8: 0x0101010101010101 > x9: 0x0000000000000003 > x10: 0xfffeffff6b5e79f2 > x11: 0x0000000000000001 > x12: 0x0000000000000000 > x13: 0x0000000000000017 > x14: 0x0000080080000000 > x15: 0xffff000000b73548 (mvfr1_fields + 0x0) > x16: 0xffff0000018edd30 (__stop_set_modmetadata_set + 0xf00) > x17: 0xffff000000831d3c (uma_zcreate + 0x0) > x18: 0xffff0000011bc900 (pcpu0 + 0x0) > x19: 0xffff000116200200 > x20: 0xffff000000e5b9c8 (initstack + 0x39c8) > x21: 0xffff0000015e7ef6 ($d + 0x46) > x22: 0xffff0000404cd200 (crypto_dev + 0x3ea9fb40) > x23: 0x0000000000000000 > x24: 0xffff00004548b000 (crypto_dev + 0x43a5d940) > x25: 0xffff0000018b7128 (system_taskq_init_sys_init + 0x0) > x26: 0xffff0000010bd478 (mp_ncpus + 0x0) > x27: 0x0000000003800000 > x28: 0xffff00000103b000 (g_bio_run_down + 0x30) > x29: 0xffff000000e5b8b0 (initstack + 0x38b0) > sp: 0xffff000000e5b880 > lr: 0xffff0000008313e0 (zone_ctor + 0xd8) > elr: 0xffff0000008b38f8 (strcmp + 0x98) > spsr: 0x0000000000400009 > far: 0x0000000096000504 > esr: 0x0000000096000004 > panic: vm_fault failed: 0xffff0000008b38f8 error 1 > cpuid =3D 0 > time =3D 1 > KDB: stack backtrace: > db_trace_self() at db_trace_self > db_trace_self_wrapper() at db_trace_self_wrapper+0x38 > vpanic() at vpanic+0x1d0 > panic() at panic+0x48 > data_abort() at data_abort+0x28c > handle_el1h_sync() at handle_el1h_sync+0x18 > --- exception, esr 0x96000004 > strcmp() at strcmp+0x98 > item_ctor() at item_ctor+0x218 > zone_alloc_item() at zone_alloc_item+0x140 > uma_zcreate() at uma_zcreate+0xa4 > system_taskq_init() at system_taskq_init+0x10c > mi_startup() at mi_startup+0x1f4 > virtdone() at virtdone+0x74 > KDB: enter: panic > KDBh rcdntnrc0i^Mtpa1ick0spi > Siot ece_ opanic ankc:tmtt_ckanic:cpamppa :p sc p tal cp ix: i = a 0:nixpfpfnm0npan2c5a0nippp: (ntc: npteap p nia: = mnxap1:i0:0m00anpa00p0p_pon > p p2p 0papfn:0n000p0nab: mppppanip_nic:_mtx.loc p nx1: 3p)_ > o k_s an: 0ec0ra0dpapmpic > ppan::pxpac0 00x_lo0k_nic > pax5n pxp0npa0 00x_lo050^Mpinx6p 0xpmffc:0mt0_lb128spnpa (nvnr anapa = mp4p0n > mt:alxp0pic: m3a_0p04p > pap8_ capani0mp0n1c:amt0apppantnr ad0_lp p ni0np > anp9:mpac:p0000: nix0pap > cp0:pcnpcp pan0c: m00pan > an1np0nip0np pa00pp0na0:cp p2: nxtp00tpan00: 0tap > xnic pxpp000c00mt0p0o0fpppxc4c m0xi000c: 0p0p0nca > sapa: 0x00 ap00i0:0map00^Mpix: anx_lpfficp0ni3:cmd0pp antc:rmnan: = :impu_pa 0nic: > :a1ac:pa0m0:p0nip: mtx_0a > icni:a anfnp0:p00p1bpmp0_lpippamic:pmta_l)ck s19pi0x00npc: m0n0c:ppan > nxpa:nicf fpx0000k_np3nicpipa(icapapsnpr:_can_leck+ac:0) > tx2:p picpf:00p0pan1c00mtx_lock_spinv rnvnpnpoptxpace4apepa = ptxplp3ni^M:pnp2n c:fana0ic:0mtx_0ppaip:nppapreanipsc: 0apanp > xc:capxc: mpip0n0n:am0xpppipanicpictpan_parnpbpo trpapptpbpa_scapap = ninicp mp24pacic:fn0a00c1 mlxcpanic:pmcx_loci_bp+ 0plo)^Minpp5p nxcf = ft00lopa6can0pppanp : o_expcpenfep pvapaocnii:apap c:net9anp > px26pa0apap000cp0panpanic > nxn7: 0ni0:0p0nic:i0n m0 > panic atxfp00ic: m5a_3ock_sppn: = itauacad+c:pap38)^Mnpx29::amtpap000appnnap0nicpipanic:tnixcp = ni0:a70pa^Mipani p0xfffcp0n0c0 op7nin > pplp:n0p:9max_9ocka5pan1 > pelp: ox49c2dm9xbcapan:1^Mpspxrp nipa0apan0c0 a0xcla > f:i: x4pandc:abca5anic > mapini inknicpakaraplpa ctxtinnpac2 mtxpana1icxnan: 0t0 > ock_d pax > panic=3D 1t > panic=3D 1t > pDn:nipankcb mtxp:cenp > : nppb_nraca_spapataaic:npapbnipaci_mexp^Mpicppp_prac _nilf mraploc(_ = atn:precnicncc_ mtf_lrpp_icipxni > pmtp_ppanic(ppnncppptp_lini +0xn:p > iapanpcn ct)_lpapppmppnicn mpanix_pppppappan1p_apnp(p c:nppppppx_nil1 = mtxnl+cxpsp^Mnpcnicp papln:el papyncc: = acx_ppcpanacdlp_eic:_spnpanip8pap-cpanceapanic estx_loaka0pc0n > pipapac: )tananipppp_anacppn92nic: 0t1p > picic:ppriic:(mtxtpockpspvnrcn apa_apa > ia:ipecp1n > papppppppppppppaanic:mmtx_occk_spin: recursed o nnnreecursivemmutex = trmlck @ /usrssrc/sys/krrn/sbbr_temmina.c::605 >=20 > ccpuid =3D 05 > ti^Me i 1 > KDB: DB:ck bakkbrace: > e: > db_tract_sel_() atb_trdb_tracf_self > e: db_trace_self_wrapper() at db_trace_self_wrapper+0x38 > vpanic() at vpanic+0x1d0 > panic() at panic+0x48 > vpanic() at vpanic+0x1d0 > panic() at panic+0x48 > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x188 > termcn_cnputc() at termcn_cnputc+0x2c > cnputc() at cnputc+0xa0 > kvprintf() at kvprintf+0xa4 > _vprintf() at _vprintf+0x78 > printf() at printf+0x58 > vpanic() at vpanic+0x26c > panic() at panic+0x48 > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x188 > termcn_cnputNOTICE: DRAM FW version 211207 > ... >=20 >=20 > pci24: numa-domain 0 on pcib24 > cpu0: on acpi0 > armv8crypto0: > p a nxip cx:0aF n:a it0caxl:f F panic: stack overflow = detected; back > trace may be corrupted > cpuid =3D 0 > time =3D 1 > KDB: stack backtrace: > db_trace_self() at db_trace_self > db_trace_self_wrapper() at db_trace_self_wrapper+0x38 > vpanic() at vpanic+0x1d0 > panic() at panic+0x48 > __stack_chk_fail() at __stack_chk_fail+0x14 > msgbuf_addst (x0: 0x00000s0b x0dd0xr00004000000000ul > x1: 0x0x > KDB: enter: panic > KDB: KeKK KKKKlKKKnKKK = KKKKKpKKaKKKKKcKKpKKaKKKKKKKKKKKKKKKpKKKKKKppKKKKpKKKpKK > = KKKKKKKKKKKKKKKpKKKKpKKKKKKKpKKKKKKpKKpKpKKpKKKpKpKppppppppppppppppppppppp= pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp= pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp= pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp= pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp= anic: mtx_lock_spin: eecrrsed on non-recursive mutxx trmlkk @ = (null)x//yys/kern/uubrtterminl..c:60 >=20 >=20 > cpuid =3D-65 > tim > =3D 1 > KDB: sB:ck aacktaacer > e: > db_trace_aelf() adb_trdb_trace^Mself > e: ds_trace_self_wrapper() at db_trace_self_wrapper+0x38 > vpanic() at vpanic+0x1d0 > panic() at panic+0x48 > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x188 > termcn_cnputc() at termcn_cnputc+0x2c > cnputc() at cnputc+0xa0 > kvprintf() at kvprintf+0xa4 > _vprintf() at _vprintf+0x78 > printf() at printf+0x58 > vpanic() at vpanic+0x26c > panic() at panic+0x48 > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x188 > termcn_cnputc() at termcn_cnputc+0x2c > cnputc() at cnputc+0xa0 > kvprintf() at kvprintf+0xa4 > _vprintf() at _vprintf+0x78 > printf() at printf+0x58 > vpanic() at vpanic+0x26c > panic() at panic+0x48 > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x188 > termcn_cnputc() at termcn_cnputc+0x2c > cnputc() at cnputc+0xa0 > kvprintf() at kvprintf+0xa4 > _vprintf() at _vprintf+0x78 > printf() at printf+0x58 > vpanic() at vpanic+0x26c > panic() at panic+0x48 > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x188 > termcn_cnputc() at termcn_cnputc+0x2c > cnputc() at cnputc+0xa0 > kvprintf() at kvprintf+0xa4 > _vprintf() at _vprintf+0x78 > printf() at printf+0x58 > vpanic() at vpanic+0x26c > panic() at panic+0x48 > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x188 > termcn_cnputc() at termcn_cnputc+0x2c > cnputc() at cnputc+0xaNOTICE: DRAM FW version 211207 >=20 > I do see gic0 attached in dmesg before each of the crashes. >=20 > Hmm, this tries to use spin locks in the gic driver before curthread = is > set and that's probably not going to work. >=20 > Indeed, the fix below lets my box boot again: >=20 > diff --git a/sys/arm64/arm64/mp_machdep.c = b/sys/arm64/arm64/mp_machdep.c > index ba673ce9d6ee..5fd5197b6818 100644 > --- a/sys/arm64/arm64/mp_machdep.c > +++ b/sys/arm64/arm64/mp_machdep.c > @@ -270,6 +270,10 @@ init_secondary(uint64_t cpu) > install_cpu_errata(); > enable_cpu_feat(CPU_FEAT_AFTER_DEV); > + /* Initialize curthread */ > + KASSERT(PCPU_GET(idlethread) !=3D NULL, ("no idle thread")); > + pcpup->pc_curthread =3D pcpup->pc_idlethread; > + > intr_pic_init_secondary(); > /* Signal we are done */ > @@ -279,9 +283,6 @@ init_secondary(uint64_t cpu) > while (!atomic_load_int(&aps_ready)) > __asm __volatile("wfe"); > - /* Initialize curthread */ > - KASSERT(PCPU_GET(idlethread) !=3D NULL, ("no idle thread")); > - pcpup->pc_curthread =3D pcpup->pc_idlethread; > schedinit_ap(); > /* Initialize curpmap to match TTBR0's current setting. */ >=20 > --=20 > John Baldwin >=20 >=20 From nobody Sat Nov 22 23:54:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDTTD0vm3z6Hpyn for ; Sat, 22 Nov 2025 23:54: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDTTC3lWKz3Gpm for ; Sat, 22 Nov 2025 23:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763855663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yxm59ObC/Vf8+FX/4xD7LRsSfce2KAM6LxdHPtkj2Gg=; b=NlZ1hdKmr51SibFfazPsjLxI/rsmBneEGIwNeYGXoFv2OWPerJ7RFBi0nTlvY/VTa38nPb Eipw/3zfrY0dq8VXyBqeY/o/r8jsNw18jKXf3EDdQ2bnvxWNbWu96bkJJ8vIaJRs3xHLO0 fFDzxkf942jQeG2IKqFsM34rVHR5RtuFz3So/ujKffnr+SL4dVd84PKevkLamTcVXgsJoT 9rpOeCI0mpBWJl8z1rpja6TDN66L6bkZn6g9WwSt4vSwdbgEwnJWsjI68jLQyFPxVBdE+D pCgszPHAYKady+0aAS1AXFBRpU4Gmidz9QB2dlW07cGee8PeKdxmVKZSpFWA3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763855663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yxm59ObC/Vf8+FX/4xD7LRsSfce2KAM6LxdHPtkj2Gg=; b=M9VionyFFBY3ch2j4XnOMolAVNAxayqYgQ3/+C+cVVGYgKhNDUEJ9TobXFSVcT2POSj4yE xeDRdEhPNy5ZZvUJTMMIN0WWsoth8AlmSFpGnQT4v6qk52Xy4t5gb7oDuyxWwWk/6BuXp3 n6/4W4GsGwM7qxSlN2BkrhcGw4I+ppJTV1IgsFaVwreytz2VaYWFrf9ik9atFJ7akHNjuy d2oBcijx4RTUSNvGmXKiNg9rCU1JuYMxA2bFbKdg3yseEF9FByT9AWq7W4BA9dV0QoS57b HQJFK8bh7hsLXnrAfXBWOaB8NMhBX4LPa/zxs1v0eErqvG4FueuNeCejQieVog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763855663; a=rsa-sha256; cv=none; b=dV2FZrRIJRGgaA+LNm3KyLk5+XrSsQcRwIWI+XyafoU8Ondoi893mCdHZ6XB7DSX1iVQ/1 WdJgu8w4ioG6icKiAf8d9bvzmMcnY7/c+VYSp05hSqPR5i6D+8i3YtqVJVQqgCYXd9qWqF xy8yvT7vSr+H255WS9hEuhSRJEbrDeZLSqMHVogiVWakgE9Aq5ziSKnlvNT4elL94CRFMv tMJEQXzcRieFwKgPu0ceP2hto3L2rwABc10Wng8YhLwmyUIxxAhHpCiSC+343zIb2PusaA SvV4PMRLnsbkNIQZ6HlW7YbzFnDIFhX81bqXYbP3bYQ+DDRWWuyc7MuW0z3tCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDTTC34GGz1Jp1 for ; Sat, 22 Nov 2025 23:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 222a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 23:54:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: a36c71acb6e9 - stable/15 - nfs_commonsubs.c: Get rid of variable used as a constant List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a36c71acb6e960c56516612fbf5e7fc1f269e845 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 23:54:23 +0000 Message-Id: <69224d2f.222a4.19f28453@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=a36c71acb6e960c56516612fbf5e7fc1f269e845 commit a36c71acb6e960c56516612fbf5e7fc1f269e845 Author: Rick Macklem AuthorDate: 2025-10-29 00:28:04 +0000 Commit: Rick Macklem CommitDate: 2025-11-22 23:53:01 +0000 nfs_commonsubs.c: Get rid of variable used as a constant The variable ncl_mbuf_mhlen is set to MHLEN and only used in one place. This patch simply deletes it and replaces it with MHLEN. This patch should not affect semantics. Spotted while fixing cases that could do large NFSM_DISSECT() sizes. (cherry picked from commit 73551cd6eac29a6707c802c7d7fafcb560bf5e2b) --- sys/fs/nfs/nfs_commonsubs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 8e1a26eef354..f580a394a735 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -194,7 +194,6 @@ struct nfsv4_opflag nfsv4_opflag[NFSV42_NOPS] = { { 0, 1, 1, 1, LK_EXCLUSIVE, 1, 1 }, /* Removexattr */ }; -static int ncl_mbuf_mhlen = MHLEN; struct nfsrv_lughash { struct mtx mtx; struct nfsuserhashhead lughead; @@ -770,7 +769,7 @@ nfsm_dissct(struct nfsrv_descript *nd, int siz, int how) nd->nd_dpos += siz; } else if (nd->nd_md->m_next == NULL) { return (retp); - } else if (siz > ncl_mbuf_mhlen) { + } else if (siz > MHLEN) { panic("nfs S too big"); } else { MGET(mp2, how, MT_DATA); From nobody Sun Nov 23 06:14:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDdvq3XKgz6JL78 for ; Sun, 23 Nov 2025 06:14: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDdvq2wvdz3rQC for ; Sun, 23 Nov 2025 06:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763878471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PU3XVioP7HzCYD9IgpibVuSXeBs6ajyXtw9KcEy08r0=; b=wtsN+jpGCPcGUV6nL9Qy/aZYJm64UC1KZWSLmmNH/6HSWGAAu23xI1IieX0whh8MfaSFIC 5B/G3fLVIEv3GXBBd5mGF7EstWtGgDy4e8LyrvQaO6yrdvNmBeWaTLK8LABIJ6hUdJEUu5 zeJm0kPesjXoxGAx/Baf2kPdbJRB4HBklkE06jvXpcHYvzI+24vEEW0taRwl9vW+po4xAs MIYVljFqPGx57Nb4oqCR9bStuCQU9XwwGN3bcxv0sQNvOqdP8RVyR9XIGMDGHVv26U0Vpm /cdx04E20XN8/foaXV7pAz75zB46wjIIEpgtXiv9/tafDpyUC1YK4WC8FxzwfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763878471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PU3XVioP7HzCYD9IgpibVuSXeBs6ajyXtw9KcEy08r0=; b=hxz9uIv7ThggMCchnr+2AaU2UrxZSm40qsmiyRDh9zbbuSzKO2OLCvyraGhuCBRiNpeiqE SnrbFCnLF0g1ZMFE18YC/Q0dIDy5GFrC59kEnWuFNPpDR3TF1Cb0bmY2r1x5Je5rG4Iyxe 4suMdFowav4I/k07P1c245xrA8ORsIr7K8326ujGzOE40Csi0VqUvESdMUWR8ir+5dzbPp 3mWoGrAG+V0bGIih7fyde2zxCi/jIC66o7mYdYGDWjEyme5tD2fiW0VVhWnmUZOjaU2k38 KpRcRw2Tc1DC4qyAxuAd+KxOtbhC8uh78U0zP3XhgSv83xGhzYw3/kelDUENjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763878471; a=rsa-sha256; cv=none; b=uDfLNs266fiSAAUecIHCmvlVE6CK1ipmM5Z0znkCtTWin24OB04voVT5LKNhyhEwvBgJPd F+QgoQ8UdzmjwVSt/hZYUcfX1MSZp2STSOmzaOMGo7tJPKUVFSpUJQZ7I8Ji1AyiMHIPEy hAort08RMa12pydcmJrYRJIrp5JmRcHmDd9CtMCK4LalX4hOuk++4YPk+cXZjq1R5Ib5hB t2iVabh5RQG/EeMFsLEOHDePypW4VAGHGXO5jJ1zTGZVXdJpHWPeseT2+zNBT6lNTqS3Uk 6bBP8YnOfoCqQ2q9RnNHR+LH1V8bd3G0DRDlxFCDZ+1cvd4FZl6BZtuLsRuzKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDdvq2M9Jz2Bt for ; Sun, 23 Nov 2025 06:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ed69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 06:14:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: c8cf5a99f82b - main - release: Ship DVD with only emacs@nox flavour List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8cf5a99f82bc52849960e689442421ad5a6d412 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 06:14:31 +0000 Message-Id: <6922a647.ed69.19d89240@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c8cf5a99f82bc52849960e689442421ad5a6d412 commit c8cf5a99f82bc52849960e689442421ad5a6d412 Author: Colin Percival AuthorDate: 2025-11-23 06:03:03 +0000 Commit: Colin Percival CommitDate: 2025-11-23 06:09:10 +0000 release: Ship DVD with only emacs@nox flavour Contrary to the claim made in a previous commit, removing KDE and adding all of vim and emacs results in an image which does not fit into 4.7 GB; to be specific, it lands at 4.722 GB rather than the claimed 4.689 GB. (This descrepancy resulted from doing test DVD image builds using an out-of-date tree, and became visible when the 15.0-RC3 images were built.) Limit the emacs packages shipped on the DVD to the "nox" flavor; this brings the disk image down to 4.407 GB, aka under the 4.7 GB limit for standard DVDs. Fixes: 6cc6beb4c889 ("release: Remove KDE from dvd1.iso") MFC after: 1 day (for 15.0-RC4) --- release/scripts/pkg-stage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 083b1baa3358..c575f2d32bae 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -15,7 +15,7 @@ export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES=" devel/git@lite -editors/emacs +editors/emacs@nox editors/vim misc/freebsd-doc-all net/mpd5 From nobody Sun Nov 23 06:54:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDfrY3CV6z6JPFD for ; Sun, 23 Nov 2025 06:56:45 +0000 (UTC) (envelope-from bogorodskiy@gmail.com) Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDfrX4gkBz3x1b for ; Sun, 23 Nov 2025 06:56:44 +0000 (UTC) (envelope-from bogorodskiy@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=A8QtKqtf; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of bogorodskiy@gmail.com designates 2a00:1450:4864:20::52c as permitted sender) smtp.mailfrom=bogorodskiy@gmail.com Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-640a0812658so5408204a12.0 for ; Sat, 22 Nov 2025 22:56:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763881001; x=1764485801; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=3xV66PPHb/KGCF5X85WoY91DJ3u/52OEzlUm8snwmS4=; b=A8QtKqtfRvig9cB+Pw1w5JrVaROIyr7NxUndVbPBVHCfx/iIJX1C+gbtesoTbt/6IL a9befneJQNICTQSNkgc3ULowlTBX9S6QIbAYK5RN/8GGcT94C6rPY7nTzKn74M74zvCy zyhVEzANpP6ri9hmm6pKWtVgEfTr3rTYP8M97IlIWYgcQxbvQS53CkKm6XTXcUSDULIS ruhSiIlItw+ov/U/dSZnaI2nocDzIulODTLbX1VER/CzM2RC2gHigqgYfUO3WaUcIsO7 YnYBIuh0UHrh7BNQ0IfsLOaxOIVqN8/g+iYEhjIhdREe1StxrtJB7kytQQEN0nA4+ckE LzFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763881001; x=1764485801; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=3xV66PPHb/KGCF5X85WoY91DJ3u/52OEzlUm8snwmS4=; b=hXtZ+nXUpk08QklbVuDK9SICdVjHIbCPT2awSkfFwqdX4mFMrHASK/Rz1GQLAjaIom 8H0UMv11U4cAZroy5cPcqh3WkpXynpsCt7KzeyiRdax2gCn7TRB8S21wXPwF52xsA7rX 9Mz6kTTIRbBw2aFCC7KNOdLNaL5+IyvKhEMT4MyyaDDX19DYAzVG9ffDdf7Sup4GRUNo MV8+D7CFWsGMtW/4kA6WutyUHyCvuWxlOlfxK8tc8pP8DXDzKmzlmhdP997YIy85RzUT 21rSr4qh6xc4lmBwFhEKW8ZDq9jw42dEFsVyKbPBA53F6w70sAm8j9uZILEPaHhQmfaQ OgWQ== X-Forwarded-Encrypted: i=1; AJvYcCVaMBO00Wbe/RbaTLQvDD5dFCk7kChNFYY2ZApSFkDMxdu6DgYgt0oasMPxYnRxsdeixskXM57x5gpQbmJY8WolBIZ9@freebsd.org X-Gm-Message-State: AOJu0YyoL27AezX9S+PS1xOMN6Ui4X4NkPENcrPxeM+8qSUTPzm9rV08 kC33sImsrn8KhrlVIlAYHyv+1UFaDbW6sTLi3y7BY7QpkeoavdyCwMvE8SWZjlFG X-Gm-Gg: ASbGncsvFe8m+5qOQb/dcqEsglIemR3vUo1FKY1Q9cBJesvVZ5h+mpAycrlpJbRhalu rsxyQ7/SwPBB8UcGIpE7SmJxy2/cINV1iXe7iG0r9lYly3swSNYjw5MDGiL/KUXQJVe0CtwPRQo UU1nAdgZkeYWbXStY2KvEB+JZy4vTaBGcl946lLdaxecf60Phf94Z3wTXve22YvKySO+wUKYsrI /UeUpPe9swPisJt5jCh7lGolCaWR9I6WQhI22p5dsxkt/QkNKbWOrUGnlVQLu5APWPkgjkwqZuY k1rJOvLiInpNldPpfTrASaEm8L2QuDu4uYy5OgTi+BkxW/SxEN4dCIPmcmYLPH02r8rVk2hecAB QFLvh1/q3F9oMroZjzMIoef+1b5GOzl9WPuFKJgrwWtTymSI0/JHYFNDhVibWy5cgjarv1iE6TW Xac0qkjyNLPjzri1aEyHAdRHgJcnJa7fg= X-Google-Smtp-Source: AGHT+IG0NV5RujLIcXZrCSQ8+BGKhqExhdG8qSwk2Obzl+fO/5gG35/uZB0HUZCxZzxJteAhjpzjrw== X-Received: by 2002:a17:906:b7ca:b0:b76:74b6:da78 with SMTP id a640c23a62f3a-b7674b6db1fmr556602766b.35.1763881000757; Sat, 22 Nov 2025 22:56:40 -0800 (PST) Received: from tulp (84-25-144-101.cable.dynamic.v4.ziggo.nl. [84.25.144.101]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b7654fd4f59sm912380466b.36.2025.11.22.22.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Nov 2025 22:56:39 -0800 (PST) Date: Sun, 23 Nov 2025 07:54:47 +0100 From: Roman Bogorodskiy To: Christos Margiolis Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e254ef87a30b - main - sound: Merge chn_intr() with chn_intr_locked() Message-ID: References: <69209005.3652b.58fc1f99@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <69209005.3652b.58fc1f99@gitrepo.freebsd.org> X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.60 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MID_RHS_NOT_FQDN(0.50)[]; FORGED_SENDER(0.30)[novel@freebsd.org,bogorodskiy@gmail.com]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), DKIM not aligned (relaxed),none]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; TO_DN_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[novel@freebsd.org,bogorodskiy@gmail.com]; RCPT_COUNT_THREE(0.00)[4]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::52c:from] X-Rspamd-Queue-Id: 4dDfrX4gkBz3x1b Christos Margiolis wrote: > The branch main has been updated by christos: > > URL: https://cgit.FreeBSD.org/src/commit/?id=e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06 > > commit e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06 > Author: Christos Margiolis > AuthorDate: 2025-11-21 16:14:28 +0000 > Commit: Christos Margiolis > CommitDate: 2025-11-21 16:14:47 +0000 > > sound: Merge chn_intr() with chn_intr_locked() > > There is no scenario where chn_intr() is called with the channel lock > already held. > > No functional change intended. > > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Reviewed by: kib, markj > Differential Revision: https://reviews.freebsd.org/D53854 > --- > sys/dev/sound/pcm/channel.c | 20 ++------------------ > sys/dev/sound/pcm/channel.h | 1 - > 2 files changed, 2 insertions(+), 19 deletions(-) With this change my system panics as soon as I start firefox: panic: _mtx_lock_sleep: recursed on non-recursive mutex dsp2.play.0 @ /usr/src/sys/dev/sound/pcm/channel.c:586 Things work fine again with this commit reverted. Roman From nobody Sun Nov 23 09:44:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZT6B7Qz6Gccd for ; Sun, 23 Nov 2025 09:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDkZT4B1Nz3Fc4 for ; Sun, 23 Nov 2025 09:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n3iu/4DNMR2mJ4wopjJSc0+tgKK+6awly0OA0uK3USM=; b=kmlTDURmyVTVaSxCQsUo80TRPHqluXPOAtJOvQZsLgQiIi1d1v1PM3XXT8w7DzAosd5ZP9 F+Z2mLxnmYrCdOgMo3wec/0iCu8tzz09Ct+7K1ILWVTH6EeznOIKnKwA5/61RjCOOrWarS h7dtS6YTvVRZwrE8767/INjpGCSoSEOSx8Ig6Q/geBY8aT4baiUvxowLFxfh4MSw8ImMRq LmwDe2CeZeEGB/fwqLMY4LwC6bLj/QVCPXNRtPepJDduZV9cwOtYMjCCIgQR1eFYS24Pz7 f+4m+KbnWW5hTWzI/7fGjDNmJGI33fn06JnvHy6k4a2dugHA+ZeFCHdZYHyZ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n3iu/4DNMR2mJ4wopjJSc0+tgKK+6awly0OA0uK3USM=; b=UfZVPw1mIS5oPJK5rohy1OnDNEwyG7ha8UAICcb9r3pNm+e4ES+7tE3hlyGqwsngGM9K+e yovVd22tbcYBH34YwoNl6c1CrpiL5aU/3ZEckqchtk/vzRMtS22k604ZgXqvJokVxck2kE 1T9oSyMFkDm5HL+XWXf4rH8Ju1Mc7ZKXwUW+ooK/HupbKQ4iO0JBYWfAXDb5TsWhbY74rI mc276Je0toyEbDc6S1lqClO/jfUPlYtq1qjmXuM6+mYgt3vVY3/FTbQbcQn/CstfkETD6I MfSS9WjDPafplERR/oOoKjQJNfj+5+koViusDZxQ2SaZat9MQCQsD9kODctwvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763891089; a=rsa-sha256; cv=none; b=rOyv48yuqfHkLPC/bySAK0UKVbJLIVG2ipOTmQCZgpw4vhaYfi/AeXKovN7UM/dyh1i/jj 6JxLSg2US8YtxKqTUFCZwCUROXy26XRpDtGn9DJXAAW42W2xGJAbUx8Oh356LeglkTUckS gCGd2+VjN4BAlInyJvF4wZe/wy2Ur5gmoHIqt2Z//I6ZO/3/ttOWXrUmo8GiS1i4o0mI9Q 4rsR5XzRSMLRo8u1wVwjESsIE/yU3MxhGDgusMsrXrieEUeGc/aEI7w4ym+U2pUbuNbO+J ORVMxoB7Iu2adsMEVUTVDtygT5HXdvx6TWbG7q3N6stiHyLEgIC1da8IWZZRLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZT2mPFz76P for ; Sun, 23 Nov 2025 09:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36588 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 09:44:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 5a566616e662 - stable/15 - sys: move sys/kern/md[45].c to sys/crypto List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 5a566616e66244ea69b8f3d034430ca7ea6fc1c7 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 09:44:49 +0000 Message-Id: <6922d791.36588.753a2557@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=5a566616e66244ea69b8f3d034430ca7ea6fc1c7 commit 5a566616e66244ea69b8f3d034430ca7ea6fc1c7 Author: Robert Clausecker AuthorDate: 2025-10-04 21:40:33 +0000 Commit: Robert Clausecker CommitDate: 2025-11-23 01:12:34 +0000 sys: move sys/kern/md[45].c to sys/crypto Both files are used by kernel and userspace. Move them to sys/crypto where they belong. No functional changes intended. In preparation of D45670. Reviewed by: markj Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D52909 (cherry picked from commit 73a9b273d3d315716304c2cc237fef3141a93f2a) --- lib/libmd/Makefile | 2 +- stand/libsa/Makefile | 3 +-- sys/conf/files | 4 ++-- sys/{kern => crypto}/md4c.c | 0 sys/{kern => crypto}/md5c.c | 0 sys/modules/smbfs/Makefile | 4 ++-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index 547a134fc440..59a519a882af 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -108,7 +108,7 @@ CFLAGS+= -DWEAK_REFS CFLAGS.skein_block.c+= -DSKEIN_LOOP=995 .PATH: ${.CURDIR}/${MACHINE_ARCH} ${SRCTOP}/sys/crypto/sha2 .PATH: ${SRCTOP}/sys/crypto/skein ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH} -.PATH: ${SRCTOP}/sys/kern +.PATH: ${SRCTOP}/sys/crypto USE_ASM_SOURCES?=1 .if defined(BOOTSTRAPPING) || ${MK_MACHDEP_OPTIMIZATIONS} == no diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index f5a1acea843e..c1e03c7a5789 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -189,8 +189,7 @@ SRCS+= g_eli_hmac.c pkcs5v2.c .PATH: ${SYSDIR}/crypto/sha2 SRCS+= sha256c.c sha512c.c -# md5 from the kernel -.PATH: ${SYSDIR}/kern +.PATH: ${SYSDIR}/crypto SRCS+= md5c.c .if ${DO32:U0} == 0 diff --git a/sys/conf/files b/sys/conf/files index da5e22e0669b..297698fd7489 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -681,6 +681,8 @@ crypto/curve25519.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" crypto/des/des_ecb.c optional netsmb crypto/des/des_setkey.c optional netsmb +crypto/md4c.c optional netsmb +crypto/md5c.c standard crypto/openssl/ossl.c optional ossl crypto/openssl/ossl_aes.c optional ossl crypto/openssl/ossl_chacha20.c optional ossl @@ -3900,8 +3902,6 @@ kern/kern_vnodedumper.c standard kern/kern_xxx.c standard kern/link_elf.c standard kern/linker_if.m standard -kern/md4c.c optional netsmb -kern/md5c.c standard kern/p1003_1b.c standard kern/posix4_mib.c standard kern/sched_4bsd.c optional sched_4bsd diff --git a/sys/kern/md4c.c b/sys/crypto/md4c.c similarity index 100% rename from sys/kern/md4c.c rename to sys/crypto/md4c.c diff --git a/sys/kern/md5c.c b/sys/crypto/md5c.c similarity index 100% rename from sys/kern/md5c.c rename to sys/crypto/md5c.c diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile index c796fb0701c5..5ef13757e621 100644 --- a/sys/modules/smbfs/Makefile +++ b/sys/modules/smbfs/Makefile @@ -1,6 +1,6 @@ -.PATH: ${SRCTOP}/sys/crypto/des \ +.PATH: ${SRCTOP}/sys/crypto \ + ${SRCTOP}/sys/crypto/des \ ${SRCTOP}/sys/crypto/des/arch/${MACHINE_CPUARCH} \ - ${SRCTOP}/sys/kern \ ${SRCTOP}/sys/libkern \ ${SRCTOP}/sys/netsmb \ ${SRCTOP}/sys/fs/smbfs From nobody Sun Nov 23 09:44:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZV6KlSz6Gccf for ; Sun, 23 Nov 2025 09:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDkZV3X7Vz3Fp9 for ; Sun, 23 Nov 2025 09:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vFDa1iuSrkMMVOvXcBagXacibDLgu7PMenL2XHHrm9c=; b=VoLgAwOSXW54TMDSBCTsg0sxPoW8aFv0nmqSuanHxVUVJzgL36Lbbf9vB4TnhzkNEZgUjd oiG058rAFJTPjPouw2h3ikxp/B2TS22Ziv8mD6VAdVANPvO4Xi7H9ykL1IZgipMQUHCBrW UkbyKmzaxPAI/OjhrnIejAIhAdYC+b67gwNDc6Nlqd9fac0zdP4iyamsChLLTQczy+Rv3H qae2k7VLdP3EWu5X3qQvkJvBCslA1s/p/Wac0re6gx0C1USp0JgCD5+oL1F2mUXxQ9tRO/ SSQ5KPEYgTBKC0fkFFNtmkuP4zJGjwIYqN1rZzDM66b3rHNt5FnerfhBwAQpZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vFDa1iuSrkMMVOvXcBagXacibDLgu7PMenL2XHHrm9c=; b=kgVtQGF9M1X24DOStxEMkInWEKPuwq6DEVdpV7hahhDB3TqoNjfA/ew/zDxDv6hrzfmAT6 q9Uflv4IXivsgd02YysLlzK5qYwRBR45FvdhzsB3pdMKSL+1YhvXcxW4cBhyxt4x8q5lLL FfpUY6uS1P49V0Sk3l3EJ9PMmyR4+pfbTTY29uP1mT4no0SwVKmgUUYUq2lQmLkMw3hSE8 yKt8JDh5aI1lKHxPGjA8deBBDVPAfCLCnJFinHrFrhoMTYNXq7sb5lLdn0us2WEeZJhfXw B2hURhp9Jp5eBFMwrOx1El2p8zTUQ443kx94lzrYDU2GT3WLqYeR9LMXafOfJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763891090; a=rsa-sha256; cv=none; b=nSS6zap0NYZlxqkrJN12huXjEF7SQO2hhwBWgU+uaGEMYAAgmY9r0I0+n9nA+/oJLDhZWM 2YScVogUFB+tm7l8Jn5Wgcyd3G0Ko6d800oXSghORupUWrw3rJ4XlZ7uaoHqz/VM/Ju8gt z1sEndPYxQDRgn/HS7zPmW7TH1hIfkODdFBwQp2mCbFCpveA5SvzkvOsbEWxne+B6/SSuH JKVDp7x3mlwHibIHojuMCH4xHAuQe5gXRK8YIr4JPg5M21dE67A8uL+cu9wUdjEEgbNE7f M8YhAEx8UbMFlog3KdYFFd+f35D5cj4keGPXrdTlk2i7rOMR2JYEV0OgGYBlBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZV34fcz76Q for ; Sun, 23 Nov 2025 09:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35a06 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 09:44:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: f0b9cf9dd798 - stable/15 - sys/crypto: import md5c.c C rewrite List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: f0b9cf9dd7984e391adf20c18d561eb404b3ddc2 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 09:44:50 +0000 Message-Id: <6922d792.35a06.201b9356@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=f0b9cf9dd7984e391adf20c18d561eb404b3ddc2 commit f0b9cf9dd7984e391adf20c18d561eb404b3ddc2 Author: Robert Clausecker AuthorDate: 2025-10-04 21:59:56 +0000 Commit: Robert Clausecker CommitDate: 2025-11-23 01:12:35 +0000 sys/crypto: import md5c.c C rewrite The reimplementation is a bit cleaner than the original code, although it is also slightly slower. This shouldn't matter too much as we will have asm code for the major platforms. The code is unrolled when built in the kernel or user space, but not when in libsa, as to reduce the code size. Differential Revision: https://reviews.freebsd.org/D45670 Reviewed by: jrtc27, imp Approved by: markj (mentor) MFC after: 1 month (cherry picked from commit 90fa789cfab54294d4c3a0ac74e01747ce074386) --- stand/libsa/Makefile | 1 + sys/crypto/md5c.c | 542 ++++++++++++++++++++++++--------------------------- 2 files changed, 260 insertions(+), 283 deletions(-) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index c1e03c7a5789..470c03032f61 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -191,6 +191,7 @@ SRCS+= sha256c.c sha512c.c .PATH: ${SYSDIR}/crypto SRCS+= md5c.c +CFLAGS.md5c.c+= -DSTANDALONE_SMALL .if ${DO32:U0} == 0 MAN=libsa.3 diff --git a/sys/crypto/md5c.c b/sys/crypto/md5c.c index 0922d0f8cc61..f9ffb602afdb 100644 --- a/sys/crypto/md5c.c +++ b/sys/crypto/md5c.c @@ -1,331 +1,307 @@ /*- - * SPDX-License-Identifier: RSA-MD + * Copyright (c) 2024, 2025 Robert Clausecker * - * MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm - * - * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - * rights reserved. - * - * License to copy and use this software is granted provided that it - * is identified as the "RSA Data Security, Inc. MD5 Message-Digest - * Algorithm" in all material mentioning or referencing this software - * or this function. - * - * License is also granted to make and use derivative works provided - * that such works are identified as "derived from the RSA Data - * Security, Inc. MD5 Message-Digest Algorithm" in all material - * mentioning or referencing the derived work. - * - * RSA Data Security, Inc. makes no representations concerning either - * the merchantability of this software or the suitability of this - * software for any particular purpose. It is provided "as is" - * without express or implied warranty of any kind. - * - * These notices must be retained in any copies of any part of this - * documentation and/or software. - * - * This code is the same as the code published by RSA Inc. It has been - * edited for clarity and style only. + * SPDX-License-Identifier: BSD-2-Clause */ +#include #include +#include #ifdef _KERNEL +#include +#include #include +#define assert(expr) MPASS(expr) #else +#include +#include #include -#endif - -#include -#include -#include - -static void MD5Transform(uint32_t [4], const unsigned char [64]); - -#if (BYTE_ORDER == LITTLE_ENDIAN) -#define Encode memcpy -#define Decode memcpy -#else - -/* - * Encodes input (uint32_t) into output (unsigned char). Assumes len is - * a multiple of 4. - */ - -static void -Encode (unsigned char *output, uint32_t *input, unsigned int len) -{ - unsigned int i; - uint32_t ip; - - for (i = 0; i < len / 4; i++) { - ip = input[i]; - *output++ = ip; - *output++ = ip >> 8; - *output++ = ip >> 16; - *output++ = ip >> 24; - } -} - -/* - * Decodes input (unsigned char) into output (uint32_t). Assumes len is - * a multiple of 4. - */ +#include +#endif /* defined(_KERNEL) */ -static void -Decode (uint32_t *output, const unsigned char *input, unsigned int len) -{ - unsigned int i; - - for (i = 0; i < len; i += 4) { - *output++ = input[i] | (input[i+1] << 8) | (input[i+2] << 16) | - (input[i+3] << 24); - } -} +#define md5block _libmd_md5block +#ifdef MD5_ASM +extern void md5block(MD5_CTX *, const void *, size_t); +#else +static void md5block(MD5_CTX *, const void *, size_t); #endif -static unsigned char PADDING[64] = { - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -/* F, G, H and I are basic MD5 functions. */ -#define F(x, y, z) (((x) & (y)) | ((~x) & (z))) -#define G(x, y, z) (((x) & (z)) | ((y) & (~z))) -#define H(x, y, z) ((x) ^ (y) ^ (z)) -#define I(x, y, z) ((y) ^ ((x) | (~z))) - -/* ROTATE_LEFT rotates x left n bits. */ -#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) - -/* - * FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. - * Rotation is separate from addition to prevent recomputation. - */ -#define FF(a, b, c, d, x, s, ac) { \ - (a) += F ((b), (c), (d)) + (x) + (uint32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define GG(a, b, c, d, x, s, ac) { \ - (a) += G ((b), (c), (d)) + (x) + (uint32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define HH(a, b, c, d, x, s, ac) { \ - (a) += H ((b), (c), (d)) + (x) + (uint32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define II(a, b, c, d, x, s, ac) { \ - (a) += I ((b), (c), (d)) + (x) + (uint32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } - -/* MD5 initialization. Begins an MD5 operation, writing a new context. */ +/* don't unroll in bootloader */ +#ifdef STANDALONE_SMALL +#define UNROLL +#else +#define UNROLL _Pragma("unroll") +#endif void -MD5Init(MD5_CTX *context) +MD5Init(MD5_CTX *ctx) { + ctx->state[0] = 0x67452301; + ctx->state[1] = 0xefcdab89; + ctx->state[2] = 0x98badcfe; + ctx->state[3] = 0x10325476; - context->count[0] = context->count[1] = 0; - - /* Load magic initialization constants. */ - context->state[0] = 0x67452301; - context->state[1] = 0xefcdab89; - context->state[2] = 0x98badcfe; - context->state[3] = 0x10325476; + ctx->count[0] = 0; + ctx->count[1] = 0; } -/* - * MD5 block update operation. Continues an MD5 message-digest - * operation, processing another message block, and updating the - * context. - */ - void -MD5Update(MD5_CTX *context, const void *in, unsigned int inputLen) +MD5Update(MD5_CTX *ctx, const void *data, unsigned int len) { - unsigned int i, index, partLen; - const unsigned char *input = in; + uint64_t nn; + const char *p = data; + unsigned num; - /* Compute number of bytes mod 64 */ - index = (unsigned int)((context->count[0] >> 3) & 0x3F); + num = ctx->count[0] % MD5_BLOCK_LENGTH; + nn = (uint64_t)ctx->count[0] | (uint64_t)ctx->count[1] << 32; + nn += len; + ctx->count[0] = (uint32_t)nn; + ctx->count[1] = (uint32_t)(nn >> 32); - /* Update number of bits */ - if ((context->count[0] += ((uint32_t)inputLen << 3)) - < ((uint32_t)inputLen << 3)) - context->count[1]++; - context->count[1] += ((uint32_t)inputLen >> 29); + if (num > 0) { + unsigned int n = MD5_BLOCK_LENGTH - num; - partLen = 64 - index; + if (n > len) + n = len; - /* Transform as many times as possible. */ - if (inputLen >= partLen) { - memcpy((void *)&context->buffer[index], (const void *)input, - partLen); - MD5Transform (context->state, context->buffer); + memcpy((char *)ctx->buffer + num, p, n); + num += n; + if (num == MD5_BLOCK_LENGTH) + md5block(ctx, (void *)ctx->buffer, MD5_BLOCK_LENGTH); - for (i = partLen; i + 63 < inputLen; i += 64) - MD5Transform (context->state, &input[i]); + p += n; + len -= n; + } - index = 0; + if (len >= MD5_BLOCK_LENGTH) { + unsigned n = len & ~(unsigned)(MD5_BLOCK_LENGTH - 1); + + md5block(ctx, p, n); + p += n; + len -= n; } - else - i = 0; - /* Buffer remaining input */ - memcpy ((void *)&context->buffer[index], (const void *)&input[i], - inputLen-i); + if (len > 0) + memcpy((void *)ctx->buffer, p, len); } -/* - * MD5 padding. Adds padding followed by original length. - */ - static void -MD5Pad(MD5_CTX *context) +MD5Pad(MD5_CTX *ctx) { - unsigned char bits[8]; - unsigned int index, padLen; - - /* Save number of bits */ - Encode (bits, context->count, 8); - - /* Pad out to 56 mod 64. */ - index = (unsigned int)((context->count[0] >> 3) & 0x3f); - padLen = (index < 56) ? (56 - index) : (120 - index); - MD5Update (context, PADDING, padLen); - - /* Append length (before padding) */ - MD5Update (context, bits, 8); + uint64_t len; + unsigned t; + unsigned char tmp[MD5_BLOCK_LENGTH + sizeof(uint64_t)] = {0x80, 0}; + + len = (uint64_t)ctx->count[0] | (uint64_t)ctx->count[1] << 32; + t = 64 + 56 - ctx->count[0] % 64; + if (t > 64) + t -= 64; + + /* length in bits */ + len <<= 3; + le64enc(tmp + t, len); + MD5Update(ctx, tmp, t + 8); + assert(ctx->count[0] % MD5_BLOCK_LENGTH == 0); } -/* - * MD5 finalization. Ends an MD5 message-digest operation, writing the - * the message digest and zeroizing the context. - */ - void -MD5Final(unsigned char digest[static MD5_DIGEST_LENGTH], MD5_CTX *context) +MD5Final(unsigned char md[16], MD5_CTX *ctx) { - /* Do padding. */ - MD5Pad (context); + MD5Pad(ctx); - /* Store state in digest */ - Encode (digest, context->state, MD5_DIGEST_LENGTH); + le32enc(md + 0, ctx->state[0]); + le32enc(md + 4, ctx->state[1]); + le32enc(md + 8, ctx->state[2]); + le32enc(md + 12, ctx->state[3]); - /* Zeroize sensitive information. */ - explicit_bzero (context, sizeof (*context)); + explicit_bzero(ctx, sizeof(ctx)); } -/* MD5 basic transformation. Transforms state based on block. */ +#ifndef MD5_ASM +static const uint32_t K[64] = { + 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, + 0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501, + 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, + 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821, + 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa, + 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8, + 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed, + 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a, + 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c, + 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, + 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05, + 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665, + 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, + 0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1, + 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, + 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391, +}; + +static inline uint32_t +rol32(uint32_t a, int b) +{ + return (a << b | a >> (32 - b)); +} static void -MD5Transform(uint32_t state[4], const unsigned char block[64]) +md5block(MD5_CTX *ctx, const void *data, size_t len) { - uint32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16]; - - Decode (x, block, 64); - - /* Round 1 */ -#define S11 7 -#define S12 12 -#define S13 17 -#define S14 22 - FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */ - FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */ - FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */ - FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */ - FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */ - FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */ - FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */ - FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */ - FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */ - FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */ - FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */ - FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */ - FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */ - FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */ - FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */ - FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */ - - /* Round 2 */ -#define S21 5 -#define S22 9 -#define S23 14 -#define S24 20 - GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */ - GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */ - GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */ - GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */ - GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */ - GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */ - GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */ - GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */ - GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */ - GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */ - GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */ - GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */ - GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */ - GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */ - GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */ - GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */ - - /* Round 3 */ -#define S31 4 -#define S32 11 -#define S33 16 -#define S34 23 - HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */ - HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */ - HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */ - HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */ - HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */ - HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */ - HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */ - HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */ - HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */ - HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */ - HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */ - HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */ - HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */ - HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */ - HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */ - HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */ - - /* Round 4 */ -#define S41 6 -#define S42 10 -#define S43 15 -#define S44 21 - II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */ - II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */ - II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */ - II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */ - II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */ - II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */ - II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */ - II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */ - II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */ - II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */ - II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */ - II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */ - II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */ - II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */ - II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */ - II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */ - - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - - /* Zeroize sensitive information. */ - memset ((void *)x, 0, sizeof (x)); + uint32_t m[16], a0, b0, c0, d0; + const char *p = data; + + a0 = ctx->state[0]; + b0 = ctx->state[1]; + c0 = ctx->state[2]; + d0 = ctx->state[3]; + + while (len >= MD5_BLOCK_LENGTH) { + size_t i; + uint32_t a = a0, b = b0, c = c0, d = d0, f, tmp; + + UNROLL + for (i = 0; i < 16; i++) + m[i] = le32dec(p + 4*i); + + UNROLL + for (i = 0; i < 16; i += 4) { + f = d ^ (b & (c ^ d)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i] + m[i], 7); + a = tmp; + + f = d ^ (b & (c ^ d)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 1] + m[i + 1], 12); + a = tmp; + + f = d ^ (b & (c ^ d)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 2] + m[i + 2], 17); + a = tmp; + + f = d ^ (b & (c ^ d)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 3] + m[i + 3], 22); + a = tmp; + } + + UNROLL + for (; i < 32; i += 4) { + f = c ^ (d & (b ^ c)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i] + m[(5*i + 1) % 16], 5); + a = tmp; + + f = c ^ (d & (b ^ c)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 1] + m[(5*i + 6) % 16], 9); + a = tmp; + + f = c ^ (d & (b ^ c)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 2] + m[(5*i + 11) % 16], 14); + a = tmp; + + f = c ^ (d & (b ^ c)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 3] + m[5*i % 16], 20); + a = tmp; + } + + UNROLL + for (; i < 48; i += 4) { + f = b ^ c ^ d; + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i] + m[(3*i + 5) % 16], 4); + a = tmp; + + f = b ^ c ^ d; + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 1] + m[(3*i + 8) % 16], 11); + a = tmp; + + f = b ^ c ^ d; + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 2] + m[(3*i + 11) % 16], 16); + a = tmp; + + f = b ^ c ^ d; + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 3] + m[(3*i + 14) % 16], 23); + a = tmp; + } + + UNROLL + for (; i < 64; i += 4) { + f = c ^ (b | ~d); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i] + m[7*i % 16], 6); + a = tmp; + + f = c ^ (b | ~d); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 1] + m[(7*i + 7) % 16], 10); + a = tmp; + + f = c ^ (b | ~d); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 2] + m[(7*i + 14) % 16], 15); + a = tmp; + + f = c ^ (b | ~d); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 3] + m[(7*i + 5) % 16], 21); + a = tmp; + } + + a0 += a; + b0 += b; + c0 += c; + d0 += d; + + p += MD5_BLOCK_LENGTH; + len -= MD5_BLOCK_LENGTH; + } + + ctx->state[0] = a0; + ctx->state[1] = b0; + ctx->state[2] = c0; + ctx->state[3] = d0; } +#endif /* !defined(MD5_ASM) */ #ifdef WEAK_REFS /* When building libmd, provide weak references. Note: this is not From nobody Sun Nov 23 09:44:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZW61QVz6Gcpk for ; Sun, 23 Nov 2025 09:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDkZW4jJbz3G9q for ; Sun, 23 Nov 2025 09:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hz46Ey6bG1pe7RfoAdldb5fgX6FQjiHfRLRkdMPeyuM=; b=xchvFt2DarOeJ9dQRlvgmsQpGUqB4pHCg4EBx7tMYp3BAlxAGiS/ob1lLr0VfYeup8I9aA m0Yt8qYOtY4lB/KafZdQM5ftb/QuPaiiN2L0zr7lZQrk/peqb+zoBOFZM+334ZJ9XzJe0y SZTnfObZYeOM57NkINJsPB2T2PL8LvvapWrcxgUhAQwjU+4cSLMjgAWQcCvhaVf1dtocmR nuGxvF4FLUAM2eqa/mUfcQLg92qu77OSNhE5cvmT2VI5DtvEiZrOu6XCDaF5Qq3ykKQHwB 99+1oYggabu7VlHSZx9DiV2iduFIFP4vV2UuBW++XWp88vF/m7FL2Ads+B9zhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hz46Ey6bG1pe7RfoAdldb5fgX6FQjiHfRLRkdMPeyuM=; b=sUhwsx2NrLDbwlwTiERYXkx7PFIV3IcReSl+Sxa9r1cbM0DZ5ZUd58OF8Jl4FEbRvN8uRe k0y/EXMAVjcvEK7cUiYTet0UA/xtUe0vOs7Nj5IdcwGDal9Pi7dZNbxSscjH4oh8fcFFjt Y9IjuNLshIp4wV2rA6GvC79J2EHxden4E6d7ZrZS8CwU/r8bJ7reg/pjjXjmOzhkqhiAYp 0p9phIbYiF9qRYu5cdEeodn2b6OT/sPRxKJaqMjmHkY7XJ2UmT9a0EPhkmFuixfqpH4x6p 1JekPEIUUS8QFR5Bj02FRH3HJdypLRxxwb22O7BrfRTP0bzZ6iP8b5J7Os78dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763891091; a=rsa-sha256; cv=none; b=iles/Mx1GtDnwsRkPhhcTBPOOTjwgTp5SXcB/BRWj6D0SVXE7jmdyyuOvUjQxjEynbFCsP 3PxfQXvu0k4lSBJVhxlMF8zayls0LnVp8rnmlJvF9QoFrRQA3HCdhgu2AFXTbSvwTK/N5R vg2+H2MvDygKsKiyXJXQY00GGVCEfpaCJghvdGpQS3xgx3jywGv1H1/P1/RAfELEw6wyeW 6EASBFhT3zberpUUATVWGsSvcrALMlMzGWfj8MY3S1GIMkolUWt/jC/HD+Lm6whHfCw5c/ rMNExQ2Odmi6keNIhmaSsQCMUVMLP0wBg92qT232luA3pNI2cWjk5agRlzBb9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZW3s7sz73K for ; Sun, 23 Nov 2025 09:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 360b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 09:44:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 28a0f0c845d1 - stable/15 - lib/libmd: import md5 amd64 kernels List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 28a0f0c845d1d54e0f785d101828d53a5938e3ec Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 09:44:51 +0000 Message-Id: <6922d793.360b6.586ea0e9@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=28a0f0c845d1d54e0f785d101828d53a5938e3ec commit 28a0f0c845d1d54e0f785d101828d53a5938e3ec Author: Robert Clausecker AuthorDate: 2025-10-10 17:40:49 +0000 Commit: Robert Clausecker CommitDate: 2025-11-23 01:12:35 +0000 lib/libmd: import md5 amd64 kernels Differential Revision: https://reviews.freebsd.org/D45670 Reviewed by: imp Approved by: markj (mentor) MFC after: 1 month (cherry picked from commit d92e987421001c365216b039f8c3303939c195f7) --- lib/libmd/Makefile | 7 + lib/libmd/amd64/md5block.S | 363 ++++++++++++++++++++++++++++++++++++++++++ lib/libmd/amd64/md5dispatch.c | 41 +++++ 3 files changed, 411 insertions(+) diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index 59a519a882af..c4ab767c8b2f 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -117,6 +117,13 @@ USE_ASM_SOURCES:=0 .endif .if ${USE_ASM_SOURCES} != 0 +.if exists(${MACHINE_ARCH}/md5block.S) +SRCS+= md5block.S +CFLAGS+= -DMD5_ASM +.if exists(${MACHINE_ARCH}/md5dispatch.c) +SRCS+= md5dispatch.c +.endif +.endif .if exists(${MACHINE_ARCH}/sha1block.S) SRCS+= sha1block.S CFLAGS+= -DSHA1_ASM diff --git a/lib/libmd/amd64/md5block.S b/lib/libmd/amd64/md5block.S new file mode 100644 index 000000000000..0dd594dd5dc2 --- /dev/null +++ b/lib/libmd/amd64/md5block.S @@ -0,0 +1,363 @@ +/*- + * Copyright (c) 2024, 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +/* apply the round keys to the four round functions */ +.macro allrounds rfn0, rfn1, rfn2, rfn3 + \rfn0 0, 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee + \rfn0 4, 0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501 + \rfn0 8, 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be + \rfn0 12, 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821 + + \rfn1 16, 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa + \rfn1 20, 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8 + \rfn1 24, 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed + \rfn1 28, 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a + + \rfn2 32, 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c + \rfn2 36, 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70 + \rfn2 40, 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05 + \rfn2 44, 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665 + + \rfn3 48, 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039 + \rfn3 52, 0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1 + \rfn3 56, 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1 + \rfn3 60, 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391 +.endm + + // md5block(MD5_CTX, buf, len) +ENTRY(_libmd_md5block_baseline) +.macro round a, b, c, d, f, k, m, s + \f %ebp, \b, \c, \d + add $\k, \a // a + k[i] + add ((\m)%16*4)(%rsi), \a // a + k[i] + m[g] + add %ebp, \a // a + k[i] + m[g] + f + rol $\s, \a + add \b, \a +.endm + + // f = b ? c : d +.macro f0 f, b, c, d + mov \c, \f + xor \d, \f + and \b, \f + xor \d, \f +.endm + + // f = d ? b : c +.macro f1 f, b, c, d + mov \c, \f + xor \b, \f + and \d, \f + xor \c, \f +.endm + + // f = b ^ c ^ d +.macro f2 f, b, c, d + mov \c, \f + xor \d, \f + xor \b, \f +.endm + + // f = c ^ (b | ~d) +.macro f3 f, b, c, d + mov $-1, \f + xor \d, \f + or \b, \f + xor \c, \f +.endm + + // do 4 rounds +.macro rounds f, p, q, s0, s1, s2, s3, k0, k1, k2, k3 + round %eax, %ebx, %ecx, %edx, \f, \k0, \p*0+\q, \s0 + round %edx, %eax, %ebx, %ecx, \f, \k1, \p*1+\q, \s1 + round %ecx, %edx, %eax, %ebx, \f, \k2, \p*2+\q, \s2 + round %ebx, %ecx, %edx, %eax, \f, \k3, \p*3+\q, \s3 +.endm + + // do 4 rounds with f0, f1, f2, f3 +.macro rounds0 i, k0, k1, k2, k3 + rounds f0, 1, \i, 7, 12, 17, 22, \k0, \k1, \k2, \k3 +.endm + +.macro rounds1 i, k0, k1, k2, k3 + rounds f1, 5, 5*\i+1, 5, 9, 14, 20, \k0, \k1, \k2, \k3 +.endm + +.macro rounds2 i, k0, k1, k2, k3 + rounds f2, 3, 3*\i+5, 4, 11, 16, 23, \k0, \k1, \k2, \k3 +.endm + +.macro rounds3 i, k0, k1, k2, k3 + rounds f3, 7, 7*\i, 6, 10, 15, 21, \k0, \k1, \k2, \k3 +.endm + + push %rbx + push %rbp + push %r12 + + and $~63, %rdx // length in blocks + lea (%rsi, %rdx, 1), %r12 // end pointer + + mov (%rdi), %eax // a + mov 4(%rdi), %ebx // b + mov 8(%rdi), %ecx // c + mov 12(%rdi), %edx // d + + cmp %rsi, %r12 // any data to process? + je .Lend + + .balign 16 +.Lloop: mov %eax, %r8d + mov %ebx, %r9d + mov %ecx, %r10d + mov %edx, %r11d + + allrounds rounds0, rounds1, rounds2, rounds3 + + add %r8d, %eax + add %r9d, %ebx + add %r10d, %ecx + add %r11d, %edx + + add $64, %rsi + cmp %rsi, %r12 + jne .Lloop + + mov %eax, (%rdi) + mov %ebx, 4(%rdi) + mov %ecx, 8(%rdi) + mov %edx, 12(%rdi) + +.Lend: pop %r12 + pop %rbp + pop %rbx + ret +END(_libmd_md5block_baseline) + + /* + * An implementation leveraging the ANDN instruction + * from BMI1 to shorten some dependency chains. + */ +ENTRY(_libmd_md5block_bmi1) + // special-cased round 1 + // f1 = d ? b : c = (d & b) + (~d & c) +.macro round1 a, b, c, d, k, m, s + andn \c, \d, %edi // ~d & c + add $\k, \a // a + k[i] + mov \d, %ebp + add ((\m)%16*4)(%rsi), \a // a + k[i] + m[g] + and \b, %ebp // d & b + add %edi, \a // a + k[i] + m[g] + (~d & c) + add %ebp, \a // a + k[i] + m[g] + (~d & c) + (d & b) + rol $\s, \a + add \b, \a +.endm + + // special-cased round 3 + // f3 = c ^ (b | ~d) = ~(c ^ ~b & d) = -1 - (c ^ ~b & d) +.macro round3 a, b, c, d, k, m, s + andn \d, \b, %ebp + add $\k - 1, \a // a + k[i] - 1 + add ((\m)%16*4)(%rsi), \a // a + k[i] + m[g] + xor \c, %ebp + sub %ebp, \a // a + k[i] + m[g] + f + rol $\s, \a + add \b, \a +.endm + + .purgem rounds1 +.macro rounds1 i, k0, k1, k2, k3 + round1 %eax, %ebx, %ecx, %edx, \k0, 5*\i+ 1, 5 + round1 %edx, %eax, %ebx, %ecx, \k1, 5*\i+ 6, 9 + round1 %ecx, %edx, %eax, %ebx, \k2, 5*\i+11, 14 + round1 %ebx, %ecx, %edx, %eax, \k3, 5*\i+16, 20 +.endm + + .purgem rounds3 +.macro rounds3 i, k0, k1, k2, k3 + round3 %eax, %ebx, %ecx, %edx, \k0, 7*\i+ 0, 6 + round3 %edx, %eax, %ebx, %ecx, \k1, 7*\i+ 7, 10 + round3 %ecx, %edx, %eax, %ebx, \k2, 7*\i+14, 15 + round3 %ebx, %ecx, %edx, %eax, \k3, 7*\i+21, 21 +.endm + + push %rbx + push %rbp + push %r12 + + and $~63, %rdx // length in blocks + lea (%rsi, %rdx, 1), %r12 // end pointer + + mov (%rdi), %eax // a + mov 4(%rdi), %ebx // b + mov 8(%rdi), %ecx // c + mov 12(%rdi), %edx // d + + cmp %rsi, %r12 // any data to process? + je 0f + + push %rdi + + .balign 16 +1: mov %eax, %r8d + mov %ebx, %r9d + mov %ecx, %r10d + mov %edx, %r11d + + allrounds rounds0, rounds1, rounds2, rounds3 + + add %r8d, %eax + add %r9d, %ebx + add %r10d, %ecx + add %r11d, %edx + + add $64, %rsi + cmp %rsi, %r12 + jne 1b + + pop %rdi + mov %eax, (%rdi) + mov %ebx, 4(%rdi) + mov %ecx, 8(%rdi) + mov %edx, 12(%rdi) + +0: pop %r12 + pop %rbp + pop %rbx + ret +END(_libmd_md5block_bmi1) + +#ifndef _KERNEL + /* + * An implementation leveraging AVX-512 for its VPTERNLOGD + * instruction. We're using only XMM registers here, + * avoiding costly thermal licensing. + */ +ENTRY(_libmd_md5block_avx512) +.macro vround a, b, c, d, f, i, m, mi, s + vmovdqa \b, %xmm4 + vpternlogd $\f, \d, \c, %xmm4 + vpaddd 4*(\i)(%rax){1to4}, \m, %xmm5 // m[g] + k[i] +.if \mi != 0 + vpshufd $0x55 * \mi, %xmm5, %xmm5 // broadcast to each dword +.endif + vpaddd %xmm5, \a, \a // a + k[i] + m[g] + vpaddd %xmm4, \a, \a // a + k[i] + m[g] + f + vprold $\s, \a, \a + vpaddd \b, \a, \a +.endm + +.macro vrounds f, i, m0, i0, m1, i1, m2, i2, m3, i3, s0, s1, s2, s3 + vround %xmm0, %xmm1, %xmm2, %xmm3, \f, \i+0, \m0, \i0, \s0 + vround %xmm3, %xmm0, %xmm1, %xmm2, \f, \i+1, \m1, \i1, \s1 + vround %xmm2, %xmm3, %xmm0, %xmm1, \f, \i+2, \m2, \i2, \s2 + vround %xmm1, %xmm2, %xmm3, %xmm0, \f, \i+3, \m3, \i3, \s3 +.endm + +/* + * d c b f0 f1 f2 f3 + * 0 0 0 0 0 0 1 + * 1 0 0 1 0 1 0 + * 0 1 0 0 1 1 0 + * 1 1 0 1 0 0 1 + * 0 0 1 0 0 1 1 + * 1 0 1 0 1 0 1 + * 0 1 1 1 1 0 0 + * 1 1 1 1 1 1 0 + */ + +.macro vrounds0 i, m + vrounds 0xca, \i, \m, 0, \m, 1, \m, 2, \m, 3, 7, 12, 17, 22 +.endm + +.macro vrounds1 i, m0, i0, m1, i1, m2, i2, m3, i3 + vrounds 0xe4, \i, \m0, \i0, \m1, \i1, \m2, \i2, \m3, \i3, 5, 9, 14, 20 +.endm + +.macro vrounds2 i, m0, i0, m1, i1, m2, i2, m3, i3 + vrounds 0x96, \i, \m0, \i0, \m1, \i1, \m2, \i2, \m3, \i3, 4, 11, 16, 23 +.endm + +.macro vrounds3 i, m0, i0, m1, i1, m2, i2, m3, i3 + vrounds 0x39, \i, \m0, \i0, \m1, \i1, \m2, \i2, \m3, \i3, 6, 10, 15, 21 +.endm + + and $~63, %rdx // length in blocks + add %rsi, %rdx // end pointer + + vmovd (%rdi), %xmm0 // a + vmovd 4(%rdi), %xmm1 // b + vmovd 8(%rdi), %xmm2 // c + vmovd 12(%rdi), %xmm3 // d + + lea keys(%rip), %rax + + cmp %rsi, %rdx // any data to process? + je 0f + + .balign 16 +1: vmovdqu 0*4(%rsi), %xmm8 // message words + vmovdqu 4*4(%rsi), %xmm9 + vmovdqu 8*4(%rsi), %xmm10 + vmovdqu 12*4(%rsi), %xmm11 + + vmovdqa %xmm0, %xmm12 // stash old state variables + vmovdqa %xmm1, %xmm13 + vmovdqa %xmm2, %xmm14 + vmovdqa %xmm3, %xmm15 + + vrounds0 0, %xmm8 + vrounds0 4, %xmm9 + vrounds0 8, %xmm10 + vrounds0 12, %xmm11 + + vrounds1 16, %xmm8, 1, %xmm9, 2, %xmm10, 3, %xmm8, 0 + vrounds1 20, %xmm9, 1, %xmm10, 2, %xmm11, 3, %xmm9, 0 + vrounds1 24, %xmm10, 1, %xmm11, 2, %xmm8, 3, %xmm10, 0 + vrounds1 28, %xmm11, 1, %xmm8, 2, %xmm9, 3, %xmm11, 0 + + vrounds2 32, %xmm9, 1, %xmm10, 0, %xmm10, 3, %xmm11, 2 + vrounds2 36, %xmm8, 1, %xmm9, 0, %xmm9, 3, %xmm10, 2 + vrounds2 40, %xmm11, 1, %xmm8, 0, %xmm8, 3, %xmm9, 2 + vrounds2 44 %xmm10, 1, %xmm11, 0, %xmm11, 3, %xmm8, 2 + + vrounds3 48, %xmm8, 0, %xmm9, 3, %xmm11, 2, %xmm9, 1 + vrounds3 52, %xmm11, 0, %xmm8, 3, %xmm10, 2, %xmm8, 1 + vrounds3 56, %xmm10, 0, %xmm11, 3, %xmm9, 2, %xmm11, 1 + vrounds3 60, %xmm9, 0, %xmm10, 3, %xmm8, 2, %xmm10, 1 + + vpaddd %xmm12, %xmm0, %xmm0 + vpaddd %xmm13, %xmm1, %xmm1 + vpaddd %xmm14, %xmm2, %xmm2 + vpaddd %xmm15, %xmm3, %xmm3 + + add $64, %rsi + cmp %rsi, %rdx + jne 1b + + vmovd %xmm0, (%rdi) + vmovd %xmm1, 4(%rdi) + vmovd %xmm2, 8(%rdi) + vmovd %xmm3, 12(%rdi) + +0: ret +END(_libmd_md5block_avx512) + + // round keys, for use in md5block_avx512 + .section .rodata + .balign 16 + +.macro putkeys i, a, b, c, d + .4byte \a, \b, \c, \d +.endm + +keys: allrounds putkeys, putkeys, putkeys, putkeys + .size keys, .-keys +#endif /* !defined(_KERNEL) */ + + .section .note.GNU-stack,"",%progbits diff --git a/lib/libmd/amd64/md5dispatch.c b/lib/libmd/amd64/md5dispatch.c new file mode 100644 index 000000000000..dd2131c5a57c --- /dev/null +++ b/lib/libmd/amd64/md5dispatch.c @@ -0,0 +1,41 @@ +/*- + * Copyright (c) 2024 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +#include +#include +#include +#include +#include + +extern void _libmd_md5block_baseline(MD5_CTX *, const void *, size_t); +extern void _libmd_md5block_bmi1(MD5_CTX *, const void *, size_t); +extern void _libmd_md5block_avx512(MD5_CTX *, const void *, size_t); + +DEFINE_UIFUNC(, void, _libmd_md5block, (MD5_CTX *, const void *, size_t)) +{ + if ((cpu_stdext_feature & (CPUID_STDEXT_AVX512F | CPUID_STDEXT_AVX512VL)) + == (CPUID_STDEXT_AVX512F | CPUID_STDEXT_AVX512VL)) { + u_int regs[4]; + char cpu_vendor[12]; + + do_cpuid(0, regs); + ((u_int *)&cpu_vendor)[0] = regs[1]; + ((u_int *)&cpu_vendor)[1] = regs[3]; + ((u_int *)&cpu_vendor)[2] = regs[2]; + + /* the AVX-512 kernel performs poorly on AMD */ + if (memcmp(cpu_vendor, AMD_VENDOR_ID, sizeof(cpu_vendor)) != 0) + return (_libmd_md5block_avx512); + } + + if (cpu_stdext_feature & CPUID_STDEXT_BMI1) + return (_libmd_md5block_bmi1); + else + return (_libmd_md5block_baseline); +} From nobody Sun Nov 23 09:44:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZY0Zcsz6Gd6l for ; Sun, 23 Nov 2025 09:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDkZX4m4Wz3GMf for ; Sun, 23 Nov 2025 09:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w9a2KhFfcoQbD9z5m/Q9gJ9DuEmAYH5bEZvX+JCuJwk=; b=n035KxOMErT7tLen5qC0nzgSsB62w9OCVc+lH2yvlouCqUnR5cN9U/ESgsRizlxWm62pAW 1PavwdCvAxe58qNW78pNfZimx2iH01QGXKyjBlksueMElShoy2TLT+18j13hEW09ovM2H/ VkcJtradeH6SqKp2hL59O0FnJNNYbbl/hVRB3woZP4gj4g8UF+a5t/rZZv1aTWzmkWhRRn IspEr3xbnXLWSmubltZjJ4Qi8VojRMmmJ1i7lG21YplmlS5UXxs4VEddNYr8Kdahn19t9k hN+ABQPXEZi66CMQossK4Eq3c7YVL0aXS3YM/h3Bzgc6fAT92wa4UJ61IVwHRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w9a2KhFfcoQbD9z5m/Q9gJ9DuEmAYH5bEZvX+JCuJwk=; b=VQ1+BpSdPzKhJMgde5o1Uu4zs9Jv44JOgOZwnUzEWxRfm7DECod9qPGXTh7kOMxoSqY4Ca ri6IDT+6BGc46s9755fb2pLoamajgqpgg/Tuo3cWo/XIa/Y7EXY3abOJ+Y6zP4xlAKoCo8 pshaKqeqNv+e5Fy5FA5oyon2QjUTcVKA/RPQg8qVqN49UFFoIA+cKk+4MHcOzYcCiFIxo/ JQzTX5PXoON4HRjnQgbRiVpUT7huNIW5CDAcrEUlY0lOY6SMdDoJXSZNiZtrij1NeZRNER w+p17bAsmut8OfJTx+iGYiRZSN4JaY7C9TGCkR6Ks0VO0oUXVbzZxgRPPDYAhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763891092; a=rsa-sha256; cv=none; b=EzXeh23u1YDRl9kmBFOzEy5MPDPDalSU1pBjCl0FcYonAN90R5wxT+I/IEcsxm0ma2QWaZ 6vL8C1s+RIFAeKBEltYbvZrfkKNiig2GVPK5NVE7EWwNk3GsOtYff0+GJMIjLawRQijfnc Aumu6wBaSsRETNhJP3JZpeOVBDf+WKlnwRprCuMNZ42TLqpCF+TXnkPfKyv1iXAMZrWBr+ NaIBakbe1XE1meh/r2zL3mQtKBF7xY/KUoNJ2GZmFiSmr3dXcEvARTkH3vRZIwqwlKGabT OhyWjFeo0hm1Dzf9DmWKUzbS0+Kyq//6d3twDUZZFVvsxkDjnlzVufEzlqE4Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZX4Kjmz7jM for ; Sun, 23 Nov 2025 09:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34ccf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 09:44:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: f7874faf3c39 - stable/15 - lib/libmd: import aarch64 md5 SIMD implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: f7874faf3c39ad0015a28e5877d2fac23beaeba5 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 09:44:52 +0000 Message-Id: <6922d794.34ccf.28a24a2c@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=f7874faf3c39ad0015a28e5877d2fac23beaeba5 commit f7874faf3c39ad0015a28e5877d2fac23beaeba5 Author: Robert Clausecker AuthorDate: 2025-10-10 17:45:45 +0000 Commit: Robert Clausecker CommitDate: 2025-11-23 01:12:35 +0000 lib/libmd: import aarch64 md5 SIMD implementation Reviewed by: andrew, imp Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D45670 MFC after: 1 month (cherry picked from commit c1135b2b54bf46709120d98c90ff4d28a77b896c) --- lib/libmd/aarch64/md5block.S | 206 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/lib/libmd/aarch64/md5block.S b/lib/libmd/aarch64/md5block.S new file mode 100644 index 000000000000..b928c8dd795a --- /dev/null +++ b/lib/libmd/aarch64/md5block.S @@ -0,0 +1,206 @@ +/*- + * Copyright (c) 2024 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +# optimal instruction sequence for k = \key + \m +.macro addkm key, m +.if 0x100000000 - \key > 0x00ffffff + movz k, #\key & 0xffff + movk k, #\key >> 16, lsl #16 + add k, k, \m +.elseif 0x100000000 - \key > 0x0000ffff + sub k, \m, #(0x100000000 - \key) & 0xfff000 + sub k, k, #(0x100000000 - \key) & 0xfff +.else + movz k, #0x100000000 - \key + sub k, \m, k +.endif +.endm + +.macro round a, b, c, d, f, key, m, s + \f f, \b, \c, \d + addkm \key, \m // k[i] + m[g] + add \a, \a, k // k[i] + m[g] + a + add \a, \a, f // k[i] + m[g] + a + f + ror \a, \a, #32-\s + add \a, \a, \b +.endm + + /* f = b ? c : d */ +.macro f0 f, b, c, d + eor \f, \c, \d + and \f, \f, \b + eor \f, \f, \d +.endm + + /* + * special cased round 1 function + * f1 = d ? b : c = (d & b) + (~d & c) + */ +.macro round1 a, b, c, d, key, m, s + bic tmp, \c, \d // ~d & c + addkm \key, \m // k[i] + m[g] + add \a, \a, k // k[i] + m[g] + a + and f, \b, \d // d & b + add \a, \a, tmp // k[i] + m[g] + a + (~d & c) + add \a, \a, f // k[i] + m[g] + a + (~d & c) + (d & b) + ror \a, \a, #32-\s + add \a, \a, \b +.endm + + /* f = b ^ c ^ d */ +.macro f2 f, b, c, d + eor \f, \c, \d + eor \f, \f, \b +.endm + + /* f = c ^ (b | ~d) */ +.macro f3 f, b, c, d + orn \f, \b, \d + eor \f, \f, \c +.endm + + /* do 4 rounds */ +.macro rounds f, m0, m1, m2, m3, s0, s1, s2, s3, k0, k1, k2, k3 + round a, b, c, d, \f, \k0, \m0, \s0 + round d, a, b, c, \f, \k1, \m1, \s1 + round c, d, a, b, \f, \k2, \m2, \s2 + round b, c, d, a, \f, \k3, \m3, \s3 +.endm + + /* do 4 rounds with f0, f1, f2, f3 */ +.macro rounds0 m0, m1, m2, m3, k0, k1, k2, k3 + rounds f0, \m0, \m1, \m2, \m3, 7, 12, 17, 22, \k0, \k1, \k2, \k3 +.endm + +.macro rounds1 m0, m1, m2, m3, k0, k1, k2, k3 + round1 a, b, c, d, \k0, \m0, 5 + round1 d, a, b, c, \k1, \m1, 9 + round1 c, d, a, b, \k2, \m2, 14 + round1 b, c, d, a, \k3, \m3, 20 +.endm + +.macro rounds2 m0, m1, m2, m3, k0, k1, k2, k3 + rounds f2, \m0, \m1, \m2, \m3, 4, 11, 16, 23, \k0, \k1, \k2, \k3 +.endm + +.macro rounds3 m0, m1, m2, m3, k0, k1, k2, k3 + rounds f3, \m0, \m1, \m2, \m3, 6, 10, 15, 21, \k0, \k1, \k2, \k3 +.endm + + /* md5block(MD5_CTX, buf, len) */ +ENTRY(_libmd_md5block) +ctx .req x0 +buf .req x1 +len .req x2 +end .req x2 // aliases len +a .req w3 +b .req w4 +c .req w5 +d .req w6 +f .req w7 +tmp .req w8 +k .req w9 +m0 .req w10 +m1 .req w11 +m2 .req w12 +m3 .req w13 +m4 .req w14 +m5 .req w15 +m6 .req w16 +m7 .req w17 + // x18 is the platform register +m8 .req w19 +m9 .req w20 +m10 .req w21 +m11 .req w22 +m12 .req w23 +m13 .req w24 +m14 .req w25 +m15 .req w26 + +a_ .req m0 +b_ .req m7 +c_ .req m14 +d_ .req m5 + + stp x19, x20, [sp, #-0x40]! + stp x21, x22, [sp, #0x10] + stp x23, x24, [sp, #0x20] + stp x25, x26, [sp, #0x30] + + bics len, len, #63 // length in blocks + add end, buf, len // end pointer + + beq .Lend // was len == 0 after BICS? + + ldp a, b, [ctx, #0] + ldp c, d, [ctx, #8] + + /* first eight rounds interleaved with data loads */ +.Lloop: ldp m0, m1, [buf, #0] + round a, b, c, d, f0, 0xd76aa478, m0, 7 + ldp m2, m3, [buf, #8] + round d, a, b, c, f0, 0xe8c7b756, m1, 12 + ldp m4, m5, [buf, #16] + round c, d, a, b, f0, 0x242070db, m2, 17 + ldp m6, m7, [buf, #24] + round b, c, d, a, f0, 0xc1bdceee, m3, 22 + + ldp m8, m9, [buf, #32] + round a, b, c, d, f0, 0xf57c0faf, m4, 7 + ldp m10, m11, [buf, #40] + round d, a, b, c, f0, 0x4787c62a, m5, 12 + ldp m12, m13, [buf, #48] + round c, d, a, b, f0, 0xa8304613, m6, 17 + ldp m14, m15, [buf, #56] + round b, c, d, a, f0, 0xfd469501, m7, 22 + + /* remaining rounds use the roundsX macros */ + rounds0 m8, m9, m10, m11, 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be + rounds0 m12, m13, m14, m15, 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821 + + rounds1 m1, m6, m11, m0, 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa + rounds1 m5, m10, m15, m4, 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8 + rounds1 m9, m14, m3, m8, 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed + rounds1 m13, m2, m7, m12, 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a + + rounds2 m5, m8, m11, m14, 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c + rounds2 m1, m4, m7, m10, 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70 + rounds2 m13, m0, m3, m6, 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05 + rounds2 m9, m12, m15, m2, 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665 + + rounds3 m0, m7, m14, m5, 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039 + rounds3 m12, m3, m10, m1, 0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1 + rounds3 m8, m15, m6, m13, 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1 + rounds3 m4, m11, m2, m9, 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391 + + ldp a_, b_, [ctx, #0] + ldp c_, d_, [ctx, #8] + add a, a, a_ + add b, b, b_ + add c, c, c_ + add d, d, d_ + stp a, b, [ctx, #0] + stp c, d, [ctx, #8] + + add buf, buf, #64 + cmp buf, end + bne .Lloop + +.Lend: ldp x25, x26, [sp, #0x30] + ldp x23, x24, [sp, #0x20] + ldp x21, x22, [sp, #0x10] + ldp x19, x20, [sp], #0x40 + + ret +END(_libmd_md5block) + +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) + + .section .note.GNU-stack,"",%progbits From nobody Sun Nov 23 13:09:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDq7000KZz6Gx5L; Sun, 23 Nov 2025 13:09:47 +0000 (UTC) (envelope-from christos@freebsd.org) Received: from margiolis.net (mail.margiolis.net [95.179.159.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDq6z245wz3fK8; Sun, 23 Nov 2025 13:09:47 +0000 (UTC) (envelope-from christos@freebsd.org) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=default; bh=aZpEDqKMszp9 01un3MmB95AMa1nLz31UOyihx+8RgtI=; h=in-reply-to:references:to:from: subject:cc:date; d=margiolis.net; b=HKMFBExzZU0wzP5fiGteBddlxrsSndCdN3 EJzCWPt7lbrKVBJsQ7leM3bYTHarKHiYGhkLfahmxaF7O3XNQHqdhgU36aLZqJzR+eyK2l obwyrmW0OWgLBWdTx0YistqXwhHoGCEW6jvZQeahp7viLdO6yxH3CtinrfUdmef9vZo= Received: from localhost (public-gprs561811.centertel.pl [37.225.57.212]) by margiolis.net (OpenSMTPD) with ESMTPSA id ba6c7ed7 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 23 Nov 2025 06:09:38 -0700 (MST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Nov 2025 14:09:37 +0100 Message-Id: Cc: , , Subject: Re: git: e254ef87a30b - main - sound: Merge chn_intr() with chn_intr_locked() From: "Christos Margiolis" To: "Roman Bogorodskiy" X-Mailer: aerc 0.21.0 References: <69209005.3652b.58fc1f99@gitrepo.freebsd.org> In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dDq6z245wz3fK8 On Sun Nov 23, 2025 at 7:54 AM CET, Roman Bogorodskiy wrote: > Christos Margiolis wrote: > >> The branch main has been updated by christos: >>=20 >> URL: https://cgit.FreeBSD.org/src/commit/?id=3De254ef87a30bfcaabc6e4d8e0= ecf05f6949a4f06 >>=20 >> commit e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06 >> Author: Christos Margiolis >> AuthorDate: 2025-11-21 16:14:28 +0000 >> Commit: Christos Margiolis >> CommitDate: 2025-11-21 16:14:47 +0000 >>=20 >> sound: Merge chn_intr() with chn_intr_locked() >> =20 >> There is no scenario where chn_intr() is called with the channel loc= k >> already held. >> =20 >> No functional change intended. >> =20 >> Sponsored by: The FreeBSD Foundation >> MFC after: 1 week >> Reviewed by: kib, markj >> Differential Revision: https://reviews.freebsd.org/D53854 >> --- >> sys/dev/sound/pcm/channel.c | 20 ++------------------ >> sys/dev/sound/pcm/channel.h | 1 - >> 2 files changed, 2 insertions(+), 19 deletions(-) > > With this change my system panics as soon as I start firefox: > > panic: _mtx_lock_sleep: recursed on non-recursive mutex dsp2.play.0 @ /us= r/src/sys/dev/sound/pcm/channel.c:586 > > Things work fine again with this commit reverted. > > Roman Which driver are you using for your sound card? Christos From nobody Sun Nov 23 13:26:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDqTr3jDVz6GxnD for ; Sun, 23 Nov 2025 13:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDqTr1VNcz3gy1 for ; Sun, 23 Nov 2025 13:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763904368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iS2Qhrytg4OrZNz4NUBvrav+LlxTtTpfekDHOt14EY0=; b=VdlHIEEIJ/MH4PMgHA2L41W5ew5uH+v3q1Wo2b4sReduUhZvlVjIOl58Cfdkt6Roxaschj v11z8jP4W4qbmy2nm4DEI/K/sMfolcM8+dx/aJRIIOpvkNa0IUv7XO/UtZ5Ql5f/wCzoup kEmtgMuekVFizIgMa7eGWOHCMj7yrw7RJK/9BkOjA3rwVlQ1oTzk12SEEENrb89bandrk7 kDFzEUuh2DTTwB5lsh23c8awNfAci1unRjLXDfjuNbQAVSWiW6/imugA3YQkRuCukmUwZp DbISFvQpc1hEd0IBj5l4RKS8bAjxT7YCQWfjO9J1utvvf4ljxEgNWuiF/Uplrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763904368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iS2Qhrytg4OrZNz4NUBvrav+LlxTtTpfekDHOt14EY0=; b=fqx60wYK7In1DbFOVIINKWvQf3o2Atf8C+fuP2JGp6lAH/PVYqCuROnJ08h+pVC48/QL4+ CH0RUNzwN2QWyOMGEmsOozWeh51v8mqKDnA1i/BBGbklvWa34IdL2+0yMhWwjIQ8lXSV47 gp8TR/K8vTDyd9Ng6cEBc1TdPtSTv1q/W+q4PMAszZciEw7qeBdZWj61Wmry1tLC5QVxEn vKpqhJ2R2ST4G0+kh5cnLTu1P4rSjV4YccCXf7/QoB4txZ0lDfCmyeuEQ56GMogYxAxctD MFp0NPRQjY+2af25NSNuWsQWfCSnlWwOR9W40C3GlwBTG30wiOvzXgkUBjcZiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763904368; a=rsa-sha256; cv=none; b=wjKChCPKF7LwudAhVGr5I4IujLQN7ni5TGS0zkhMlV3EfYe/IFe7E8ANH+vtvHUSpwPr6t U+63hKlO77MFWcsHxbzK01P0SGo4IMzlId4xAyI1/yWDBKtweFuJc0axpc567TUNm3iCah /fm4lSMLrHl55tx2k++QCjfJ1iLZTomK8ft5+AUzqpZI9hMKG+J+9jc4GbS+4q1KYP1rvr JjFWcDCMdEkYchZFDV70aP4649XAMBCl0fQCUccEA74F/pBBsPP8pj7FmO0SN526A0fss/ M2ha9HoNCFyrdopEdpki0dyLQsy3DYZDIHyr/PTW04p69Lo4zTJm7TVnqZcJAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDqTr0BtfzVXG for ; Sun, 23 Nov 2025 13:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24c46 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 13:26:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: d5335bdee715 - stable/15 - nfs_clvfsops.c: Allow long directory mount paths List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d5335bdee7157af3897d0a49834c3493e0d03681 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 13:26:07 +0000 Message-Id: <69230b6f.24c46.3f158e2c@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=d5335bdee7157af3897d0a49834c3493e0d03681 commit d5335bdee7157af3897d0a49834c3493e0d03681 Author: Rick Macklem AuthorDate: 2025-10-29 21:41:12 +0000 Commit: Rick Macklem CommitDate: 2025-11-23 13:24:13 +0000 nfs_clvfsops.c: Allow long directory mount paths Without this patch, the NFS client code for mounts has an arbitrary 100 character limit for the directory path being mounted on the server. Someone reported this quite a while ago, but I cannot find the email or bugzilla PR. This patch fixes the problem by increasing the directory path length limit to MNAMELEN, allocated via malloc() to avoid using too much stack. (cherry picked from commit 8d5a88ac95b23b0a8c4943be0aef1f93e3902bfb) --- sys/fs/nfsclient/nfs_clvfsops.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index 5ea7eab07632..212c88f28930 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -927,7 +927,7 @@ nfs_mount(struct mount *mp) struct vnode *vp; struct thread *td; char *hst; - u_char nfh[NFSX_FHMAX], krbname[100], dirpath[100], srvkrbname[100]; + u_char nfh[NFSX_FHMAX], krbname[100], *dirpath, srvkrbname[100]; char *cp, *opt, *name, *secname, *tlscertname; int nametimeo = NFS_DEFAULT_NAMETIMEO; int negnametimeo = NFS_DEFAULT_NEGNAMETIMEO; @@ -943,6 +943,7 @@ nfs_mount(struct mount *mp) newflag = 0; tlscertname = NULL; hst = malloc(MNAMELEN, M_TEMP, M_WAITOK); + dirpath = malloc(MNAMELEN, M_TEMP, M_WAITOK); if (vfs_filteropt(mp->mnt_optnew, nfs_opts)) { error = EINVAL; goto out; @@ -1329,7 +1330,7 @@ nfs_mount(struct mount *mp) goto out; } else if (nfs_mount_parse_from(mp->mnt_optnew, &args.hostname, (struct sockaddr_in **)&nam, dirpath, - sizeof(dirpath), &dirlen) == 0) { + MNAMELEN, &dirlen) == 0) { has_nfs_from_opt = 1; bcopy(args.hostname, hst, MNAMELEN); hst[MNAMELEN - 1] = '\0'; @@ -1387,7 +1388,7 @@ nfs_mount(struct mount *mp) if (has_nfs_from_opt == 0) { if (vfs_getopt(mp->mnt_optnew, "dirpath", (void **)&name, NULL) == 0) - strlcpy(dirpath, name, sizeof (dirpath)); + strlcpy(dirpath, name, MNAMELEN); else dirpath[0] = '\0'; dirlen = strlen(dirpath); @@ -1472,6 +1473,7 @@ out: MNT_IUNLOCK(mp); } free(hst, M_TEMP); + free(dirpath, M_TEMP); return (error); } From nobody Sun Nov 23 13:34:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDqjd4Dhpz6H08c for ; Sun, 23 Nov 2025 13:36:21 +0000 (UTC) (envelope-from bogorodskiy@gmail.com) Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDqjc5bnPz3jjB for ; Sun, 23 Nov 2025 13:36:20 +0000 (UTC) (envelope-from bogorodskiy@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-640b06fa959so5846775a12.3 for ; Sun, 23 Nov 2025 05:36:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763904973; x=1764509773; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=JB2h3snj0+UWCmW/VEm2ezui77m9O4KsiVCAuji6+GQ=; b=kk+hhjP6dVl1aY1clwtZaWA1fqVR1W4kunERaLXxa9dQ+vOaNqh0gyenxYydFEkOdS IigxmIok8V6sBlNpLD6AVgzGTIeu/oSEEl/EoboVq+25KmYpEna9TYdBC7l5jeyVVY7W qyo7ZHVqbYyzJ6RBR1k9vm1C0vSll8JOzHhjsN080T7YFPAs+FHSPYgxb+TfQOR5YFfo UNreceD/ehUJ3/9OP0woT2AwtK8fdgI85Py7KPewL0cSRPtPgO19bLtsuJQj+ZAc0zuQ /1QCoL9gWBdxBOlP9BM74dmxmPXNw4v+eh3MZe9OU7sv3T4jXYAFmheweXY0ZwfUP7gT 3Kvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763904973; x=1764509773; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=JB2h3snj0+UWCmW/VEm2ezui77m9O4KsiVCAuji6+GQ=; b=aamNdWpIjslkmRVcQgXN4hjkXzAbDcaC/ZPymg8NjY09TLtofS5KHpnRFKh8YIJ4d8 f4yRro94T4QQOWDB3tYPl2pq68tgaGsuipk9FpLmC2XR9pKzgXnfJZnv0lB2nHCQqHqc rmyUI+4qBvaVRQ7OdBKBPgsEY+pOR+TaZSqGW1i87rqrxlzp/N6nAqXlrv0PbaW8jH3l L1RkKx2NyAtkT1yJfz0GJVoh1La7xi5PKKxyLBzQN3EsmWkgTdzTjfAJJDS134BbX1g2 Z0RSd2MdI2gPOKPQMn7aAvghVxqKsA18j4dhG8p8jQpwBgxE4FNd8p4sN7CI/z4JpWYK fiOQ== X-Forwarded-Encrypted: i=1; AJvYcCXEBfhcNTe0iBL2hVeZubLKf4gywJZdyyNb+Sg7CG5SZ/6uURFCCEsLW+M+DU+fmOIk0E8QjdAGLDAaUqTXGP1x1GTp@freebsd.org X-Gm-Message-State: AOJu0YxXR46awy2tDEb6ClplyNymIoCKpKP9dsNTv4qyCFccV5RyIFMT Ic9wyU6Xhs3jEt7wZaa5Rz/lez2zN9ViecZBRpPj+/ruGHtHxsqOVh7A X-Gm-Gg: ASbGncuMt8n4Q6sIOw9HV4fqEmzVpEyvlMBWysBlTTZI2qahc96yzqvb2alyOadd0+W nz3zVZTlZBUZ2LXsLbLhVZCAswLHWvX33rJpBCytOtsvQC5Lnxl0aBzqAIoXwGyWBRmoBFeyUHS VBK7Cf8nVl1NTsWWUHZ0lxxIlio8ruM4+nAj/sHfm+eHuXXojeGIiTamgDpyTeYhm9vXQeqM4cr xAoJP8LYS10uJGyhKBR48DbMEXim7jCnsPFUKr6fM/4YqH1l9L8oL4ln7pZBBwGUXay6z/9TrQp oY/xw0aoVmlGerfjs1tOQchkIQlbdmgq2AyClzIivHW3xQOCKvso3j0jqzPAjiSsMGn9EALXlyn xLCRJBMSQ+E8wyUmhE8x43wsiBIEQdPEX+a4swzIaZ7h8iAXUwJQAm0/XG8JUBX56RzBrwLcoF9 jQAyfPgHSPDAB2DGzj5i1cY5jNIQOOUIM= X-Google-Smtp-Source: AGHT+IH0+4Cd555Ow/0Bs/LVzus1Dv+A4ol/RGn1Fmq7LDQf9i+zMUJvH/0QrW54NMb9kGrp1x5YOw== X-Received: by 2002:a17:907:3e1a:b0:b73:8b7f:8c48 with SMTP id a640c23a62f3a-b76716955b4mr781990966b.37.1763904973063; Sun, 23 Nov 2025 05:36:13 -0800 (PST) Received: from tulp (84-25-144-101.cable.dynamic.v4.ziggo.nl. [84.25.144.101]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b7655050d05sm992571666b.70.2025.11.23.05.36.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Nov 2025 05:36:12 -0800 (PST) Date: Sun, 23 Nov 2025 14:34:19 +0100 From: Roman Bogorodskiy To: Christos Margiolis Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e254ef87a30b - main - sound: Merge chn_intr() with chn_intr_locked() Message-ID: References: <69209005.3652b.58fc1f99@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dDqjc5bnPz3jjB Christos Margiolis wrote: > On Sun Nov 23, 2025 at 7:54 AM CET, Roman Bogorodskiy wrote: > > Christos Margiolis wrote: > > > >> The branch main has been updated by christos: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/?id=e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06 > >> > >> commit e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06 > >> Author: Christos Margiolis > >> AuthorDate: 2025-11-21 16:14:28 +0000 > >> Commit: Christos Margiolis > >> CommitDate: 2025-11-21 16:14:47 +0000 > >> > >> sound: Merge chn_intr() with chn_intr_locked() > >> > >> There is no scenario where chn_intr() is called with the channel lock > >> already held. > >> > >> No functional change intended. > >> > >> Sponsored by: The FreeBSD Foundation > >> MFC after: 1 week > >> Reviewed by: kib, markj > >> Differential Revision: https://reviews.freebsd.org/D53854 > >> --- > >> sys/dev/sound/pcm/channel.c | 20 ++------------------ > >> sys/dev/sound/pcm/channel.h | 1 - > >> 2 files changed, 2 insertions(+), 19 deletions(-) > > > > With this change my system panics as soon as I start firefox: > > > > panic: _mtx_lock_sleep: recursed on non-recursive mutex dsp2.play.0 @ /usr/src/sys/dev/sound/pcm/channel.c:586 > > > > Things work fine again with this commit reverted. > > > > Roman > > Which driver are you using for your sound card? > > Christos I'm using snd_uaudio(4). If that's important, I have other pcm devices as well: $ cat /dev/sndstat Installed devices: pcm0: (play/rec) pcm1: (play/rec) pcm2: (play/rec) default No devices installed from userspace. $ dmesg |grep pcm pcm2 on uaudio0 pcm0: at nid 20 and 24 on hdaa0 pcm1: at nid 27 and 26 on hdaa0 pcm2 on uaudio0 $ Roman From nobody Sun Nov 23 13:50:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDr2C16Wnz6H1Cy for ; Sun, 23 Nov 2025 13:50: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDr2C0BRFz3lhx for ; Sun, 23 Nov 2025 13:50:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763905843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iEY2MpQputJqp5fEfPgcRtWIPAHip6QJHm0/1JdtT4Q=; b=y4taoklx45jJ/G+w+uYlGlBAtoyyFre2qTzJIttwLK93bx9Xsawg1qyo62lLROtmB2ISRW UPVL94Bqg6kC5waEzyrzJdckIJzYIcox/xI9tSlr31T9QEtvTQVRcVi+Eupm6JThajBZQf zLnKtNBC2CQ229wRQ+/qufVD7ofoV67NDASkhVvKWynr7gkQFcEr9BX68FjZE7/fekvaHx Qqex8JY49hCVmg/1w7LRzYKKku0JP9LqoH353uuRhtgkahi9PCROpEExU2ocTDAsgdXjOl Zrm+kWSvodjSy2NnZW3MuOCmQaJ5SxcZlrHZCQFIjgiJK528r23X+JTy/CjknQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763905843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iEY2MpQputJqp5fEfPgcRtWIPAHip6QJHm0/1JdtT4Q=; b=yPJDkOL/nnNbPhBfd1PcTI/uMOI7Vffe0xW07TSc8LBCEZROtIIcB/kWArEO1u5IXUv5J8 GhozJad+F0vrXhnmO9DxDXg0bRohMOzcj++xV8YlyMsI3UfI0G7E1Vde6E490rSkS0TtRi u8xwVBAsjjWM6cGWvDvgHs31NF0n3GBQ5Znyd56rC0tIsPxjxFZOQaaYUHq9D/5o9E939j sQMRIX/PuNlE0ESqejj95Pkavg9frtINtn7oktIK0OM7eB8R8UgQiKUQ0SLrcXbLchNo1q /SCVKGv6cW4wtCrN1/Vjq87xgX9TwYv9ogNeiECIdc20aI9hi5pPe0Wex3oZ6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763905843; a=rsa-sha256; cv=none; b=kBDYbolCSqqXl5xTigsnyoLiqls1KljntH0f0EQo4azHmWKI/ye0nyYcprhzmd4YD4SvvS EWa99GH3GOZC+saOO18uIDgM0VmhkKqKl/2neOVQnVKgjB49vWGdCAX0waNXBhBoi9AIwR SFAK+gfwpgKFWTAknmnzsKUbGlqtqFJjXf7hraUzqyUE00tYzkhUoT3kUAw129okUVXn69 y5/vrjRxtbIlQmPeGS9buUhwUqfoAmIjkXw4QiZZ7XKHPMpAFqH+AcBVHT/B0pTfM0z7e1 /SAV9uzbfywBJQxw9dLdgXHDWffAiiP3HE+nhoDvUXayrEQiQesKDhL2SabluA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDr2B6ncHzVZv for ; Sun, 23 Nov 2025 13:50:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26330 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 13:50:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 5cc34a83e1cc - main - Revert "sound: Merge chn_intr() with chn_intr_locked()" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5cc34a83e1cc812871fd02a15b7d9f75342faaa0 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 13:50:42 +0000 Message-Id: <69231132.26330.30d762ab@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5cc34a83e1cc812871fd02a15b7d9f75342faaa0 commit 5cc34a83e1cc812871fd02a15b7d9f75342faaa0 Author: Christos Margiolis AuthorDate: 2025-11-23 13:48:51 +0000 Commit: Christos Margiolis CommitDate: 2025-11-23 13:48:51 +0000 Revert "sound: Merge chn_intr() with chn_intr_locked()" It turns out that snd_uaudio(4) uses sound(4)'s channel lock for its USB transfer callbacks. I will try to address this at some point, because this is layering violation, but for now we need to revert the commit, as it causes a lock recursion panic with USB audio devices. This reverts commit e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06. --- sys/dev/sound/pcm/channel.c | 20 ++++++++++++++++++-- sys/dev/sound/pcm/channel.h | 1 + 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 011dc1427c2e..7c3f0e3dc9f0 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -581,14 +581,30 @@ chn_read(struct pcm_channel *c, struct uio *buf) } void -chn_intr(struct pcm_channel *c) +chn_intr_locked(struct pcm_channel *c) { - CHN_LOCK(c); + + CHN_LOCKASSERT(c); + c->interrupts++; + if (c->direction == PCMDIR_PLAY) chn_wrintr(c); else chn_rdintr(c); +} + +void +chn_intr(struct pcm_channel *c) +{ + + if (CHN_LOCKOWNED(c)) { + chn_intr_locked(c); + return; + } + + CHN_LOCK(c); + chn_intr_locked(c); CHN_UNLOCK(c); } diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 6415f5c88984..0b17c4a130a7 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -298,6 +298,7 @@ int chn_oss_setorder(struct pcm_channel *, unsigned long long *); int chn_oss_getmask(struct pcm_channel *, uint32_t *); void chn_resetbuf(struct pcm_channel *c); +void chn_intr_locked(struct pcm_channel *c); void chn_intr(struct pcm_channel *c); int chn_abort(struct pcm_channel *c); From nobody Sun Nov 23 13:50:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDr2M6gVYz6H160; Sun, 23 Nov 2025 13:50:51 +0000 (UTC) (envelope-from christos@freebsd.org) Received: from margiolis.net (mail.margiolis.net [95.179.159.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDr2L5vPmz3m5T; Sun, 23 Nov 2025 13:50:50 +0000 (UTC) (envelope-from christos@freebsd.org) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=default; bh=P6NLkOu+9ckw AHtm4sTgjqZuEW8f5svBVGJw9xJZ08I=; h=in-reply-to:references:from: subject:cc:to:date; d=margiolis.net; b=He+KgbRKVLdkdjHg2iqli9AxH8JcMba rayFu5m7cjl/3j0lNwYfkvok/1Ist0VL3gIkO+4KRvYbcSiJJjZQIt7tt/amEQFt6XpfY6 LGGs2Lf0Yl99kmFDRplrh0+9gsmLx3ATYdyUxcfqtcz3q1H46e3hNX6I9rL4GpI6O6jeOU = Received: from localhost (public-gprs561811.centertel.pl [37.225.57.212]) by margiolis.net (OpenSMTPD) with ESMTPSA id 7d62ac68 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 23 Nov 2025 06:50:48 -0700 (MST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Nov 2025 14:50:47 +0100 Message-Id: To: "Roman Bogorodskiy" Cc: , , Subject: Re: git: e254ef87a30b - main - sound: Merge chn_intr() with chn_intr_locked() From: "Christos Margiolis" X-Mailer: aerc 0.21.0 References: <69209005.3652b.58fc1f99@gitrepo.freebsd.org> In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dDr2L5vPmz3m5T On Sun Nov 23, 2025 at 2:34 PM CET, Roman Bogorodskiy wrote: > Christos Margiolis wrote: > >> On Sun Nov 23, 2025 at 7:54 AM CET, Roman Bogorodskiy wrote: >> > Christos Margiolis wrote: >> > >> >> The branch main has been updated by christos: >> >>=20 >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3De254ef87a30bfcaabc6e4d= 8e0ecf05f6949a4f06 >> >>=20 >> >> commit e254ef87a30bfcaabc6e4d8e0ecf05f6949a4f06 >> >> Author: Christos Margiolis >> >> AuthorDate: 2025-11-21 16:14:28 +0000 >> >> Commit: Christos Margiolis >> >> CommitDate: 2025-11-21 16:14:47 +0000 >> >>=20 >> >> sound: Merge chn_intr() with chn_intr_locked() >> >> =20 >> >> There is no scenario where chn_intr() is called with the channel = lock >> >> already held. >> >> =20 >> >> No functional change intended. >> >> =20 >> >> Sponsored by: The FreeBSD Foundation >> >> MFC after: 1 week >> >> Reviewed by: kib, markj >> >> Differential Revision: https://reviews.freebsd.org/D53854 >> >> --- >> >> sys/dev/sound/pcm/channel.c | 20 ++------------------ >> >> sys/dev/sound/pcm/channel.h | 1 - >> >> 2 files changed, 2 insertions(+), 19 deletions(-) >> > >> > With this change my system panics as soon as I start firefox: >> > >> > panic: _mtx_lock_sleep: recursed on non-recursive mutex dsp2.play.0 @ = /usr/src/sys/dev/sound/pcm/channel.c:586 >> > >> > Things work fine again with this commit reverted. >> > >> > Roman >>=20 >> Which driver are you using for your sound card? >>=20 >> Christos > > I'm using snd_uaudio(4). If that's important, I have other pcm devices > as well: > > $ cat /dev/sndstat=20 > Installed devices: > pcm0: (play/rec) > pcm1: (play/rec) > pcm2: (play/rec) default > No devices installed from userspace. > $ dmesg |grep pcm > pcm2 on uaudio0 > pcm0: at nid 20 and 24 on hdaa0 > pcm1: at nid 27 and 26 on hdaa0 > pcm2 on uaudio0 > $=20 > > Roman Oh, right. I just saw snd_uaudio(4) uses the channel lock (the one your panic says we recursed in), to lock the usb transfer callback, which at some point calls chn_intr(). I actually do not like that snd_uaudio(4) uses sound(4)'s locks to do USB stuff. I just reverted the commit, and will look into solving this afterwards. Christos From nobody Sun Nov 23 16:39:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmT3Nslz6HGft for ; Sun, 23 Nov 2025 16:39: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDvmT0kKpz45D0 for ; Sun, 23 Nov 2025 16:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915945; 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=yYp1OpcQqXavYyHPxXKknNSKpGgUS5qhDrfZGyTxsZM=; b=at34YP7xLWWYidca6LfOiPF339LljMI/niunnzJ5ecdPPXnwVYdbHl1JhlvtlcHT/yNs2v djmdY/u5/4Xglro5/IlvDLr8iChSWVADNN8xM5PBAz4dQZmRm+qPA3RSPeChTCUNzX798g KqsrhQmmgbcyz3AxbFxtGrbZZG0AJcEh1zTZ7IRsLFcxNXKfIcQ1x0hhWFjkrfwVJ/bNj5 LowB4kbwEp0YZTEDqibPv/qoytrTFUwtXWhCWutSb3E/90KuUqarBdMC6+44C4/i2L64kU w6V6zzsUWKQLm5MRhxvmdNYrwHZ5moY1DW7vK8bsolgM2jRqfnGh85guQg52pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915945; 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=yYp1OpcQqXavYyHPxXKknNSKpGgUS5qhDrfZGyTxsZM=; b=EkFNrBaiY5ZehWj7lyUO52qsIwmXnP6Qn8A2hl7h5bpawi6+FcQButdlMZEGIKpcR8wQsO juIMZiHjD7xS5hyNl03OVAxaRXJfDSlqImTatPIGoACXMSjKcuT+gJUi+Ay7Fge45/RShn 3XReJUy68ueg5St/I/Ntjq3mIQXSwx0yaLfAp1Xd4mxqGMNWhZ9CYzquqK6PZRT423Eajo Kz52WJj2eUu7rcPlNVuANtJzvRVEItX6Cu9Jogb+cebM1rXwQ+Ln/8YfxfyCY+rtOvulH1 PUfn7VW6cpKyMIOVNAV8f/IhWdbpxSC9umTEvxjUO9wgWMCVBcKjuisOpxTxfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915945; a=rsa-sha256; cv=none; b=oE3UUinfAYCWETllzBIuuRu9UjP309zdyI5DcnJCUcjG2tFFy1A2O9lR+opHzC37xMfVWN vb1CeRWGsuq7wptqEuZdUuiTi0mg5vcpvZFgUs9Uyv2w+fUdFrpv+NkQSxoQkeovmHh9b0 Z7n+unEADV6ufEXsLsPRK/kKTZyIH/59JcSLENoHWpk8+1RhaLnFP68oICsXJorf3Er2dv 4Sy7pbJMwmJlnRIhXS5mp8F9+X5xtxVn772EkT+EqV40CW7K7xa3lRtEApwplYbDukIYbA Z0zRFK/G6OU7ozoLBggaT6SyO0M+z60CoJVFIAz20uKU66z0WhKZjHTb58tocQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmS6txHzcXP for ; Sun, 23 Nov 2025 16:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 379b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: a14c4d0708f5 - releng/15.0 - dmesg.8: Index kern.msgbuf_show_timestamp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: a14c4d0708f5a749dc9342a2efbac28fd419c0e2 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:04 +0000 Message-Id: <692338a8.379b6.5747f123@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a14c4d0708f5a749dc9342a2efbac28fd419c0e2 commit a14c4d0708f5a749dc9342a2efbac28fd419c0e2 Author: Alexander Ziaee AuthorDate: 2025-11-21 15:59:28 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:28 +0000 dmesg.8: Index kern.msgbuf_show_timestamp This is the only place this important debugging tunable is documented. Mark it up with the Va macro according to style.mdoc(5) so that people can find it via `apropos Va=kern.msg`, the standard syntax to search the FreeBSD manual for sysctls and tunables. Approved by: re (cperciva) Fixes: 6910fee62e77 (dmesg: Document kern.msgbuf_show_timestamp) (cherry picked from commit e13664f6a44b4970ea5e8378b8e1a4879fa5d5a0) (cherry picked from commit 1c0668c5b33d32724c6596b42bc08d22c63c0ee0) --- sbin/dmesg/dmesg.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8 index 0dca0ff5da89..f9b9fce82ffc 100644 --- a/sbin/dmesg/dmesg.8 +++ b/sbin/dmesg/dmesg.8 @@ -73,7 +73,7 @@ The following variables control how the kernel timestamps entries in the message buffer: The default value is shown next to each variable. .Bl -tag -width indent -.It kern.msgbuf_show_timestamp : No 0 +.It Va kern.msgbuf_show_timestamp : No 0 If set to 0, no timestamps are added. If set to 1, then a 1-second granularity timestamp will be added to most lines in the message buffer. From nobody Sun Nov 23 16:39:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmV1bdLz6HGM6 for ; Sun, 23 Nov 2025 16:39:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDvmT75lXz459S for ; Sun, 23 Nov 2025 16:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915946; 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=u0ERWxUTVIuhtxdyIH+gQ/LmjAGOEHNGTaRjipGfdIo=; b=Ws1+HD4Xg6NM0mdyH8pFJ9+Vof7zyk1CagZ07DxzIIMvHNeRhrkG7k/vZ3pkdpe8WzpTrU /wwgs6x7CNq3J3V/7CY/VBR9GRcqiKkQCi6OZlyydFEzUTVI/TJGzchBFyvvBxvU9sVULy 5gD1AkRClH7KflXTToTIFFsQ4M7xbOYjs5aPBBimdzM8cGPlihJlGaCw1QEL4ZW87y1v/B P8r0kDa8RB0L+o98P4uVJmekw4+KCuMTtR+9RgAwWQftCH1DA4pn4ZzAWnSlf/YyeHrHU9 6fJ7yzvKHfMYS1AAnh7oY8W44TBYWtkIwx6dby/ft3Mw+DBnQzTIUy+NC/hapg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915946; 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=u0ERWxUTVIuhtxdyIH+gQ/LmjAGOEHNGTaRjipGfdIo=; b=hYiNHpLCMqQGL3S5UVp2W59GgF94YtDxtAG9fVfrihWUps2GpA6UF/ANe+neeA9dmJgFIs e3Bc0pZmxc4u3MLP6PHRau4PNVbRBqZ5OJ/Wh7EVVQ9l0yti19iRqsRRVBXTWF16I+sI98 JYqumFZD2lvC5aynV3SN0hijJTNRpaZOfRGJ3uEGX1WxihfefH5b3lf7/P0BBBgfhD+cWW 7XkRvAfGo2VpwdaFpT+A/kqY/Wzwj71+6/xzUDJA5YEcww6B+2u1on8c1dJY09ZI6+r4MX ZGiZ2/12Y31J0tCqfRMuv/KzlfCMtJcY8ByiSE9Jhs75rliOjHuF8Jdw2mQSQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915946; a=rsa-sha256; cv=none; b=pG5stgxN8Atix+TAWuKKESKcl50l9YTtEBcCOgn5Dxy6LkjI5GI0I3TKd5e3upjtpjlxeR Zm+GdqZXvwdzl9x5zCWs5vTboFF422MFfskVvtqGIyJweqr+RUpaNi3VWhvImDzkClmqlj /HFNurypl1RJO2q6UxAwlRmb1hQ+laIM1yEiVqFJ5rQMAYsWotbnPDdAYWQ/sS9ZKR5UBl eTZE99PoxbfFUrC/QhGoCfsY6MhKozAzcH89lqDjWzAh6mxyiSTuMvNNsTpRUU2RUBG4Ja 9+PBUdD86zwYdhHhIekrUHXxlf0pJf6UxdIenwwVLXdZ6hsX+FWKps7bswDnJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmT6bsnzd19 for ; Sun, 23 Nov 2025 16:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3709c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: 56f49dd3a046 - releng/15.0 - vt.4: Document increasing scrollback size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 56f49dd3a0465767a54ecee91ba0deb4c7557656 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:05 +0000 Message-Id: <692338a9.3709c.b2b7cf8@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=56f49dd3a0465767a54ecee91ba0deb4c7557656 commit 56f49dd3a0465767a54ecee91ba0deb4c7557656 Author: Alexander Ziaee AuthorDate: 2025-11-21 17:40:56 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:34 +0000 vt.4: Document increasing scrollback size Approved by: re (cperciva) MFC: immediately as 2 llms say this is impossible Reviewed by: adrian, emaste Differential Revision: https://reviews.freebsd.org/D53860 (cherry picked from commit a8740ba860bfc35879f886b80b30327d0d3b16bd) (cherry picked from commit 2da71ee296add6c39e26e8b103dd24a12e8ce320) --- share/man/man4/vt.4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 21d69bf9d495..6176c8c3093e 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 7, 2024 +.Dd November 21, 2025 .Dt VT 4 .Os .Sh NAME @@ -352,6 +352,12 @@ Notification that the console bell has rung. .It Li hz Ta Tone that was requested in Hz. .El .Sh EXAMPLES +To increase the scrollback buffer size to 22500 lines, +add the following line to +.Pa /etc/rc.conf : +.Pp +.Dl allscreens_flags="-h 22500" +.Pp This example changes the default color of normal text to green on a black background, or black on a green background when reversed. Note that white space cannot be used inside the attribute string @@ -414,6 +420,7 @@ at boot: .Xr getty 8 , .Xr kldload 8 , .Xr moused 8 , +.Xr vidcontrol 8 , .Xr vtfontcvt 8 .Sh HISTORY The From nobody Sun Nov 23 16:39:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmW4V62z6HGJL for ; Sun, 23 Nov 2025 16:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDvmW1MXjz45dM for ; Sun, 23 Nov 2025 16:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915947; 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=eg2dv1gqt1J90zQ31QeK3UlVYeJ+a8i6XtagWp0NPoM=; b=ZQp4SbHFiTlYdgrR0/crcQpwvesgKYKBEv5yv5o3M+l0HQLQNoRaLTZuoo5SarPztsYzCA +HUCMiZ6f6d+JLyQrEPryW8kohOi1w2GLYzoSFHKejjUQp9nbwgSREOdweaZMEv+kMgQZb F/j7dOXQhkRlkgei9y1DJKE/8osZn/fOj3CNX1qCbG8uh5Rw6PyUZgV9/cSAyMw0xdeF1f CYq412NyxCL2kr7q1TyODm42NrDvdTpDqCwA7vTirNHmFgEG2cxqV6OcpnWSYHbKONChEo DvUZEpE+JNCnDvpbo79Tg/v6lnaMGKJFeInI1DYUZeuyUK1Y0ywrGe36pgDplg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915947; 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=eg2dv1gqt1J90zQ31QeK3UlVYeJ+a8i6XtagWp0NPoM=; b=cZnQb4LLouiK9LJQ+7PwithomFJvU+MSrzsCb+9kysuGzNXmRT/9Nr7qsg9LmDo5AvJV7W jGBKb3S/6t3zXxCtV9/9EcN8CifIGTSPqZ/jxsOYGHFgN//b16909Wb6Ih6F9+DjI7jJiB n2HInpfEReZYgpPh2BCwfd/fAKO5inke5fI0zQ/RJVkG30SaOfyvw3B1NMebeW7Ui0kKDd 7CpNVAVD2QFCXwNGYyB4/o5+AtBhM6kGrbJSddwAheARGV3erfZd2+zbglV5viFJWgHUIn L2DPY6kpWVR9Jbp2zbWqmYxkWRLT8Ur4AUtqrdoPNhnjMAi8/ixZQMcJplcQ3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915947; a=rsa-sha256; cv=none; b=AbbxsYMaxMjPNs/n0QNQjJYiRJlNRK6KQFou0VipFtr50DnvS4W8szkfsACLW+O58OITHS G5Zl1BdKWyebdaF8wdPPtdy3odzN8qiR22LU0LLP7sFz6Ebm/oaGTxXRLwkql02+Rp/ZMi n71FPkhKJWJCQlnJP+08Bs9HAp9+zT7IHaAw571hPF4vbTBKduLrLunGIV1ju4fKLcqjB5 ovkH52HuU2XGXPaBi+JPAuYkRCt4zLXIZn0PiYsovYXgBWvQCGWSE3t+9ueGsz+BV21NQR gj9upMAKh4FtC+fZ92dR3uNy2mVFTdIm+RBZG4rt4dRJAoptM/xiLBNFmCQf6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmW0Gfrzcxd for ; Sun, 23 Nov 2025 16:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 375e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: f7fd040e3ba9 - releng/15.0 - freebsd-tips: Add a shell function for laptops List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f7fd040e3ba995a84b6fb63b97dc7dd6606602b9 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:07 +0000 Message-Id: <692338ab.375e9.25a151fd@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f7fd040e3ba995a84b6fb63b97dc7dd6606602b9 commit f7fd040e3ba995a84b6fb63b97dc7dd6606602b9 Author: Alexander Ziaee AuthorDate: 2025-11-14 14:40:44 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:38 +0000 freebsd-tips: Add a shell function for laptops Approved by: re (cperciva) MFC after: 3 days Reviewed by: pauamma_gundo.com Differential Revision: https://reviews.freebsd.org/D53748 (cherry picked from commit 42d9ae4945f281d12f3ef96cdbd7356e067f8b18) (cherry picked from commit f0bb9d28eb3cb29b6e8f2ecd7de4e743dfbebc98) --- usr.bin/fortune/datfiles/freebsd-tips | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips index 6a2b59ff5fa7..379f772fea88 100644 --- a/usr.bin/fortune/datfiles/freebsd-tips +++ b/usr.bin/fortune/datfiles/freebsd-tips @@ -860,3 +860,11 @@ When netstat reports every 8 seconds, it tells traffic in bits per second: $ netstat -I bge0 8 % +Using vt(4) on a laptop? Try this sh(1) function. It provides an "h" +command that prints the last 22 commands executed, the time, remaining +battery life, and current working directory: + +h() { fc -l -22; printf "%s\n" "`date +%H:%M` -- `apm -l`% -- `pwd`"; } + + -- Alexander Ziaee +% From nobody Sun Nov 23 16:39:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmZ13g0z6HGGC for ; Sun, 23 Nov 2025 16:39: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDvmY1dxjz45dk for ; Sun, 23 Nov 2025 16:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915949; 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=gkRbuS7VkTQL6Cut7HZSbAE/FkLKTcOUUsr8Enew5nU=; b=qnkd8p42GAPfuRiwCeEuaCJNJv7Rm73ysIdApLv+NxRDCf3L6z1mwd0NBj83h5vKCkyWpb QuPuydmS9xZKtVm0g8Znv79mXcWxdtD9pdfe+kjiZCvkm5eFSY5Ya3mH5ggq/9yVQru5vl GZR9FGE2aCRhbszq14BMw9xk8wZPOj03mr2M5VUK9u99PjZxFF++J4jsyNisE2wIShVujC i/XXl9NKTKYXWRcTaCenf0wDKEaugVvpFB150yWc48M9WVSskuXKUqvPvmhY+rNnuYmAnw kkBW60OEK4huC7f+2YRnRfaq+/VrXCh6sixcmM2pHcIOsiUuJOSeNCgPuz0HXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915949; 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=gkRbuS7VkTQL6Cut7HZSbAE/FkLKTcOUUsr8Enew5nU=; b=F65vk4DpkFkKd+gDwp+79J47wm8N8oQhjOUaEhdG63Fdw80lbF/bUpPHnL8Ex55AbhaxQK 9xez0n0iRpTtLS/LzfO5LKt3n4/2PjWlC1OtlzxQe4vA3yIvBnDfnczKmkvEd4oqsQWmjn Y9YbRTpT6wfojAu7vy2nawg2S/c0kuMOOAN3W6yESkhG7KlNDszSiktFUpTQuRIDXzLPep YTEMdMJNVT1BWSHmraCYYVQFAxGgBVy2rbMArwph2hMDUBEk+BMvFTgZE83UpzUTMlHNf4 dMbRSI2QBRLZ9AJWnvun2o/rkJo+OlnAO2+13Ll8bUqPSp+t5txenyjneiiBEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915949; a=rsa-sha256; cv=none; b=D/pgKNKIzXiGPHq6F1PORHYESSoTvVEabUFAkZucMLuMJQTEu6OGm0YIj46tpSneev63p/ YB84/8u1BEEGSVx7XxQlaT3FNzYwY2fkoxc5tj38gqG37w2NZ6+pDTMipEbwWETKRh3wPA +1MrmCvU5qxQV9gk4W8LisLs7JF+8LlGzNev6cnWO6gcceW/Kso1ZDFYPYNv1RkDFgijB6 BefGO/4Q/HtuuvKNuXvdKg8UfRoThoeMFNdgmN3em31bf7H+vs7Q9iAufCUQzFOB+o3B4w h0JjJna715t0kCoW1JKifo4ZAdquWcMGcFtDxiR6YhJgW2K6bXYAWlk3oR9r6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmY167Xzcjr for ; Sun, 23 Nov 2025 16:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37387 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: d84de55c1501 - releng/15.0 - loader.8: Document module commands List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: d84de55c15016640a03d0ff43898addd5b9323d8 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:09 +0000 Message-Id: <692338ad.37387.6f1e8414@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d84de55c15016640a03d0ff43898addd5b9323d8 commit d84de55c15016640a03d0ff43898addd5b9323d8 Author: Alexander Ziaee AuthorDate: 2025-11-14 14:59:09 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:45 +0000 loader.8: Document module commands Begin documenting module loader commands in loader(8), where the reader would look for them. Segregate them by their availability in individual loader implementations, like build(7) targets. These details were graciously donated by kevans. Approved by: re (cperciva) MFC after: 3 days Reviewed by: kevans Co-authored-by: Kyle Evans Differential Revision: https://reviews.freebsd.org/D50727 (cherry picked from commit 6fb0d67819f730e8def56e139f780eff3c0cab0f) (cherry picked from commit 513b9db1a829b4efba91c86f280ba97b26c82c1f) --- stand/man/loader.8 | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/stand/man/loader.8 b/stand/man/loader.8 index 234eabd571e0..484e0a7b300c 100644 --- a/stand/man/loader.8 +++ b/stand/man/loader.8 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 29, 2021 +.Dd November 14, 2025 .Dt LOADER 8 .Os .Sh NAME @@ -89,6 +89,52 @@ The commands common to all interpreters are described in the .Xr loader_simp 8 .Dq BUILTIN COMMANDS section. +.Pp +The following commands are only available in +.Xr loader_lua 8 +and +.Xr loader_4th 8 : +.Pp +.Bl -tag -width indent -compact +.\" sort the following entries according to the second field +.It Ic boot-conf +Load the +.Nm +config and commence the autoboot sequence. +.Pp +.It Ic read-conf Ar file +Load the specified configuration file. +.Pp +.It Ic reload-conf +Revert any previously applied settings, and reload the configuration. +Set comands that were executed at the command line to override variables +previously +.Cm set +by +.Xr loader.conf 5 +configuration will also be reverted, +along with any module options that were toggled. +.Pp +.It Ic enable-module Ar kmod-name +.It Ic disable-module Ar kmod-name +.It Ic toggle-module Ar kmod-name +Enable, disable, or toggle loading of the kernel module named +.Dq Ar kmod-name . +.Pp +.It Ic show-module-options +Describe all modules the +.Nm +is aware of, and show if they are enabled or not. +.El +.Pp +The following command is only available in +.Xr loader_lua 8 : +.Pp +.Bl -tag -width indent -compact +.It Ic disable-device Ar device +Set a newbus hint to disable the +.Ar device . +.El .Ss BUILTIN ENVIRONMENT VARIABLES The environment variables common to all interpreters are described in the .Xr loader_simp 8 From nobody Sun Nov 23 16:39:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmY3h4Jz6HGg3 for ; Sun, 23 Nov 2025 16:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDvmX390wz45DM for ; Sun, 23 Nov 2025 16:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915948; 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=Lc+F8ml+JfOMnNrp2g5mvTo1BVNu64srzcMj2F/ZaLs=; b=MIMLPBLZzDaemWGQNRuy1Y/2nCWSGLjS9Cim1Vi1HYwmL59dLtl9nQeSKUW9kckvptf+NR fjxGpaIexQazWopRfyPSD9am/DvcBHndEDOWley0aUC/jIR6KkL9zNRnxxfuIWof3M0luq OD8JRuOtVfZyRtstlnOeMNPRwKrROII1qaXo5m4NL8wK38Lxd+/V/0ugUx4zzXzWfxN3eL YwWHX0Vlzs3k+hxzLHyhfAQ6qwUoVEysLKcsr2rGpV6G4iJtMn4ylyLNobxRDuhi69Hc3D wbGw4qvsfXT7NEuLBIIk/qku+OLD6cUduKtJbde2Xs+sEg3AEdBVTXT0fnDYnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915948; 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=Lc+F8ml+JfOMnNrp2g5mvTo1BVNu64srzcMj2F/ZaLs=; b=IGW9lmIAqR+3LJWsVfDLkSex5CN6AwqUcyX++6Gr3rWWyQdniz94yc0OtgUa8jpv98MaPG qAQYGIII0vw76M6cBdFkAeISAH6fVjCYzCOgqtgLLmxE89axQAjNa1ZuG6YMH7fW5Nrj55 yQM34fMQKNw55tOKLUTggAKejXARdMg+RGypjr3EBS5OLVI2cpJFTi5xUN1odJmQ5/ewyu 2rkEYdBUuqy+X3tQBKnWQfkEnla7C2+hdWYxWmJpz5Gx1k1KQ7BKw8tDn/00BOrsCci9uo DQXndcstk+MxS9T2dLYUMa6tMZCAby7UebiuiK/OEHoVphiNYfWt97NyS7yyww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915948; a=rsa-sha256; cv=none; b=S4mJ3QRfjjjfjak2lQNibLA0P9665IIaaiF4Yqju7CZHv0YVy0Ouzi9siYHeovdSAVKhv6 xc9Zvzrt7Jv+Anjb6KpQK+JKLM9Vg9mZIQfyJR+wDylrGf7BUmonVI2ZHT+jsKcliHRZUp SdDNBcxhT67MZXUPHRPTRonhJ6ecd9uy5hW5IbyhbX3OonfmhIUGPps/+0RfjKxseJnIC9 w87Gq38/29SA9+79djcj3gioVOMKridmaTQ/nnbf+2s15CE7JkxbdoxAO8ETBUADyOBRun 8OuStbvSrZ1SY1QX5qBAAUr6nSMqyqms5peav5Q745DUc0aW0/48KdccmI53yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmX0cD1zcjp for ; Sun, 23 Nov 2025 16:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36247 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: bba78121411a - releng/15.0 - loader manuals: Clarify console and boot_serial List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: bba78121411a6ffe04e30960f8e8072a60d788cf Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:08 +0000 Message-Id: <692338ac.36247.10ed00c2@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bba78121411a6ffe04e30960f8e8072a60d788cf commit bba78121411a6ffe04e30960f8e8072a60d788cf Author: Alexander Ziaee AuthorDate: 2025-11-14 14:41:57 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:41 +0000 loader manuals: Clarify console and boot_serial console=comconsole is for the loader and boot_serial is for the kernel. I think we should centralize documentation on the loader settings in one manual, such a loader.8. The current proliferation is not obvious where to find the documentation. To the user, these are all set in loader.conf or at the loader prompt. Approved by: re (cperciva) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53695 (cherry picked from commit 09ffaa4e07d749c83cc1db13829505f21b025f29) (cherry picked from commit 3035855815c2fdbe27b65b9ec0374f4583ceb3f5) --- stand/defaults/loader.conf.5 | 3 +++ stand/man/loader_simp.8 | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index b1661e8c1101..8c43bb62a135 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -343,6 +343,9 @@ selects the video console which prevents any input and hides all output replacing it with .Dq spinning character (useful for embedded products and such). +This setting is for the +.Xr loader 8 +only and does not set the kernel output. .It Va screen.font Set font size for framebuffer mode. The default font size is selected based on screen resolution. diff --git a/stand/man/loader_simp.8 b/stand/man/loader_simp.8 index 683ca8b2da5d..52cb598fdd89 100644 --- a/stand/man/loader_simp.8 +++ b/stand/man/loader_simp.8 @@ -358,8 +358,8 @@ in .Xr kenv 1 , not for any particular value. .It Va boot_serial -Force the use of a serial console even when an internal console -is present. +Force the use of a serial console for the kernel +even when an internal console is present. .It Va boot_single Prevents the kernel from initiating a multi-user startup; instead, a single-user mode will be entered when the kernel has finished From nobody Sun Nov 23 16:39:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmZ61pmz6HGg7 for ; Sun, 23 Nov 2025 16:39: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDvmZ2cj3z45VC for ; Sun, 23 Nov 2025 16:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915950; 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=fr5zcHLSVWt5pazdDLpn01ENu/syFBcsUhX1TmNdCrc=; b=sP9cHiD/PCX828A5JHLYITtSCswgCkXc51AlT2zOHqnkdQuzVSUpbu/lG9gxGi6groyozn YqTGrSHfZLc20cDNuVzeLSApEZcINk6f9aLGYmKblcBCTtQLQjT4p4pR13A426SPdyW7BT PZhqqNqJJDTXZ2ZlLhkYir93JQfxR4fOuCUizqdBurIzBUo9XLzizyH5JW6WXfKfHJw0Xf z8eFC4nktT5U6yqOQeRA1N6KFVWg3iVX6AvV21fmtrEdgnyf7mpZrgijqeam04Uh1YrUZt yL2ZqS46UErtOiNiTzkYkSwXiGgNqrOOmq9r8CSVK5QxwS3I98YHnM37P6IZEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915950; 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=fr5zcHLSVWt5pazdDLpn01ENu/syFBcsUhX1TmNdCrc=; b=NVE1as0xHRKpZvRUuV5XjWYXWCXFlqIl1OQ/FvWXH01lT09cHH+t0i7AfPXB3/WikqR3iV ywxXyB+0gVYcKs6jx9lT6fdPCrH9ixw6yBLgu23u/ac41cVXDKdzgYpeTSMfiC6dVw1pGr fdB1MRSb2meZjc/03wY4LOHxt5N+vTtSfPn76WsDtG52auCDSIoaQzL0v+NjmltyE4SqHl 4tgrGYYTr9SUh4hOw8AY/2pnxgvDTZAGdJDGjo3rg65StwKmLtuA6VfKwH39GBNFgSSZX3 rFSz/ZPBZlFKAJayBcEhppNyRmB2Ybx8OqW97c2B6cEGRBe3hJI1zfXAtXRAEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915950; a=rsa-sha256; cv=none; b=NVIv9q6NW11+suvQnWJbxNlOvYxA3zThIT3Lyqsh72+amiqZPC5UHMxJdmmRWVXg52nV4G NmqJgkAaFfiB901x7M45LOy9KKl8YkC6b+PJDNq/uWCinXaZ+fFNTASV+SQsF8gMC3gtz4 Plv2Fy8mPIpHlq+JM1SjG7V+OXBNnkW5DmzkZJUatadBBnTeN6JGzmV3TBmtAtPHMJjQUL DnrYAWhLblIWI7s57xX8E9D5/1FMBS2KDwYiPvZUAvrmXC6QN0XG8FLb40N8sYvtGgnYFA /bVpYk7fESvWSvewcjXB+KMz7/4pP/NtNzljowpIRWhhS5hMWcTFrvkz/xNHDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmZ1mfhzcpv for ; Sun, 23 Nov 2025 16:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36fa8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: 54808d50412a - releng/15.0 - cp: Fix copying the root directory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 54808d50412aee31692f0041b4f78ddaf43bac8f Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:10 +0000 Message-Id: <692338ae.36fa8.2b5de0db@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=54808d50412aee31692f0041b4f78ddaf43bac8f commit 54808d50412aee31692f0041b4f78ddaf43bac8f Author: Dag-Erling Smørgrav AuthorDate: 2025-11-22 12:11:59 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:48 +0000 cp: Fix copying the root directory When the source of the copy operation is the root directory, we should neither append it to the destination path on FTS_D nor trim it back off on FTS_DP. Approved by: re (cperciva) PR: 291132 MFC after: 3 days Fixes: 82fc0d09e862 ("cp: Partly restore symlink folllowing.") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53863 (cherry picked from commit fe836c50120daed3e4084f43c27d8d650d36dee8) (cherry picked from commit c4843e5805dec10ee552d21f19c8da7707c1fcbc) --- bin/cp/cp.c | 7 ++++++- bin/cp/tests/cp_test.sh | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 38fe65399d06..7ac1e5f6a4c4 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -433,6 +433,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) sep = strchr(to.base, '\0'); sep[0] = '/'; sep[1] = '\0'; + } else if (strcmp(curr->fts_name, "/") == 0) { + /* special case when source is the root directory */ } else { /* entering a directory; append its name to to.path */ len = snprintf(to.end, END(to.path) - to.end, "%s%s", @@ -520,6 +522,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) if (type == DIR_TO_DNE && curr->fts_level == FTS_ROOTLEVEL) { /* this is actually our created root */ + } else if (strcmp(curr->fts_name, "/") == 0) { + /* special case when source is the root directory */ } else { while (to.end > to.path && *to.end != '/') to.end--; @@ -551,7 +555,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) /* Not an error but need to remember it happened. */ if (to.path[0] == '\0') { /* - * This can happen in two cases: + * This can happen in three cases: + * - The source path is the root directory. * - DIR_TO_DNE; we created the directory and * populated root_stat earlier. * - FILE_TO_DIR if a source has a trailing slash; diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index b637f862b7d3..af309ca7ea80 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -747,9 +747,23 @@ dstmode_body() atf_check cmp dir/file dst/file } +atf_test_case root +root_head() +{ + atf_set "descr" "Test copying the root directory" +} +root_body() +{ + atf_check mkdir dst + atf_check -s exit:1 \ + -e inline:"cp: / is a directory (not copied).\n" \ + cp / dst +} + atf_test_case to_root cleanup to_root_head() { + atf_set "descr" "Test copying to the root directory" atf_set "require.user" "unprivileged" } to_root_body() @@ -893,6 +907,7 @@ atf_init_test_cases() atf_add_test_case to_deaddirlink atf_add_test_case to_link_outside atf_add_test_case dstmode + atf_add_test_case root atf_add_test_case to_root atf_add_test_case dirloop atf_add_test_case unrdir From nobody Sun Nov 23 16:39:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmb51Mjz6HGnv for ; Sun, 23 Nov 2025 16:39: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDvmb2mqDz45fP for ; Sun, 23 Nov 2025 16:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915951; 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=ILe3QuaYo6T33g0CrA7cxQ0xe+m60m8wgyLq0iTYc0Q=; b=LkN+8QU1gd71qKUIg7H7sJjo69LdVHrzxDUI2KeE3SOhbxQOPV7e3ekJOHsN/jAYL9/69K 3CjShvCXimZcR4j39A0gxafqiO67mxVyC9U/G/GNWt819LO94ec5cDMvhE+Dg8vxcEJDDA +tjOt228Uog5RZRXQSR+BXgrkyLSUo3AC2PMr+8Y/9OgyPHPo/X954zfbNyVlJkp/NpAHv 3P63XgZQidZSQRVcDkKM9qhbYEQKqhFj5W9XGHYQY0W522rbIK8V3e9AKDzpkP7QaOKeGY 6qwepeVDQRTVKAiePMrqoBncYn5h5Ky/C1OYdgZLC3tFY4tbUAea1CsBsZjqcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915951; 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=ILe3QuaYo6T33g0CrA7cxQ0xe+m60m8wgyLq0iTYc0Q=; b=R6xjHffrxeQ88fkF9/Qj9axH3OJt3NvXZeHYoK5r1OlKqN7aqapPADbcsWzsBsb+I8nUrY g/r7T7FQ+NSjjxEZg+9yEDZ3yTLtTd/lGZft6ogf3MU08RcbDeAoZoCerxRiLLll8/cYhh d5cRXOTeJDMdbqNmESakRZ0zrMArYblpKWGJijhRXa1GZcmZN1EuZHxiwVlYOyDQ08gGGp XeN2zU1AQ5LniVB/3SpqHtZnOWD7Dt9zZDgnxJdBtsKRmvBDnscvPeJPQgSlPA2t1fvMHm 7TA/icvRjRNZZqUjHRmVNfOLoQ8OxoEuQ1PFVtSeLz2d1BDcp96L0Xwh75Lhhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915951; a=rsa-sha256; cv=none; b=TxsfAKU0aeoVz/riuST3UXROsAXAuou3lJ8U53ukDp7IM6NwoN2Ofv3kZB7MW6dNNHa2FP TdvS9n+bMW6SRanoVF5+NatReMw83yuitG+dK9g224iOLwpW1xRt4JXMHGE9HnSMb8J4uq ZMsJBZE6il9kifSms06fUsqITkAVFBx6xsuQycqIETXG5kaJOCuDYTcVPjrhtdXhLs5B37 g436FZXdfsk0xKmcMpRvjyVPcGOxLW/oHqcVDPn3SUZKb3y/Tj32IqB0ek1LwZORe+43a/ 1afS7eFr1otmWQjTXwOhZYxjR+HFYsz6T78Egtz4jNkmTUq8a+JQ7WEQZfDKCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmb2JLvzcvb for ; Sun, 23 Nov 2025 16:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3624c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gordon Tetlow From: Colin Percival Subject: git: fb9252e66734 - releng/15.0 - Add backup pkgbase signing key held by security-officer. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: fb9252e66734de75f5098e296c455d498d2aaced Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:11 +0000 Message-Id: <692338af.3624c.2a241b85@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fb9252e66734de75f5098e296c455d498d2aaced commit fb9252e66734de75f5098e296c455d498d2aaced Author: Gordon Tetlow AuthorDate: 2025-11-22 08:35:52 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:52 +0000 Add backup pkgbase signing key held by security-officer. This key was generated by gordon@ (aka security-officer@) on an offline system as a backup key should anything happen to the AWS Key Management Service that is currently in use for signing pkgbase repositories for FreeBSD 15.x. Approved by: re (cperciva) Reviewed by: cperciva With hat: so (cherry picked from commit 12ec49d8fac2eacd40ad235bf73cc585736ee77a) (cherry picked from commit 696b0e2209ee81c5a0b27c327cf66eb3c9cfc584) --- share/keys/pkgbase-15/trusted/Makefile | 3 ++- share/keys/pkgbase-15/trusted/backup-signing-15 | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/share/keys/pkgbase-15/trusted/Makefile b/share/keys/pkgbase-15/trusted/Makefile index e6205999b12f..32db72ae368a 100644 --- a/share/keys/pkgbase-15/trusted/Makefile +++ b/share/keys/pkgbase-15/trusted/Makefile @@ -1,6 +1,7 @@ PACKAGE= pkg-bootstrap -FILES= awskms-15 +FILES= awskms-15 \ + backup-signing-15 FILESDIR= ${SHAREDIR}/keys/pkgbase-15/trusted FILESMODE= 644 diff --git a/share/keys/pkgbase-15/trusted/backup-signing-15 b/share/keys/pkgbase-15/trusted/backup-signing-15 new file mode 100644 index 000000000000..a147d6788cf2 --- /dev/null +++ b/share/keys/pkgbase-15/trusted/backup-signing-15 @@ -0,0 +1,2 @@ +function: "sha256" +fingerprint: "56a77bdcb6c3cf7984729c6138bd5617c24aa0d466b3b604c96205b2c5629f3c" From nobody Sun Nov 23 17:50:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDxLk1LjTz6HNcN for ; Sun, 23 Nov 2025 17:50: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDxLk0jwxz3J13 for ; Sun, 23 Nov 2025 17:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763920222; 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=eANX/OukS8R6BxmjJPma+nCre+EE7XXsjj3UQZ0GuN8=; b=mtaIZP8BS4dU6jiERymgY6FgOs43X96RXjPphTLxq7BYgeaz3W31wLdXRcmwUmVUanAiJW IaVFNPWIaJv8zbrXFq5JCBT1u3IKCTFk1zjnyk//OG+4WPlwfEUnTAAcaS7T6o9qXulRg7 qVgpOVUAom/srlJ1FSyFbQ9WUUSobjkyQIHHQuR4JgYUfSfe/sAkiTYPDydQR4EnVjD6eP I/g3aHuNlwEXOHaf2y/rmIv5ujWlVCWp+4FHbhjgCIpdeqXhYoiWb0zZHGGGoriX3yk6t2 0FnfqupvDwrUUE91bRD2V8L7yIha7GorW87TFTmsurEmS+zlDd5Ofkl+hFdZVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763920222; 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=eANX/OukS8R6BxmjJPma+nCre+EE7XXsjj3UQZ0GuN8=; b=m5GQpTe95Yp2k63ciGKHsVExqRvIXC3JCNVvVjS6xDerzPlCGf9NZfysiclfsY6RdyCZlN 22jGby8IeecHTcw/MlxXE9wH4v7I0KIVR0LCov1q11huLfBArz3/wScFAAWfZiij7EqwTs 6ImzUuqWUntNeeXC+BptNmweZvHeHVzyUooZnKAyug0Rp+GAk4my+neGefTM2iO8V+YLb1 N9HuhOftex+rubt1/cXhbXm6HQOVcbOJt+7effvoy2WOlLO6NyMTXaYtnCZeF7sD02oY6X eJIWB5P/azkaQ53s9i5Kl3VSXbkAfsQOqkFqPvmqUQZAV4mXFpIQqmrRNknyhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763920222; a=rsa-sha256; cv=none; b=d/QqRcKL5+pJBNY4QIospf2tCYBP5qj3ZuKu8uquYo7E8EiQz6YqZW08kufmGB919hiPu9 ZksKdqHCSLwdxuAQCiINK5cCbeCe5buZi2elkooViIzQGZX/E1tE/4/3zZCmzvibanxU/W /uVKKAk7FILTu9UcVsQ7ykNFRDIqnL7lKoMzP1QDR1dAEJcGRt94hig83JDsoYEkoGDDMJ qEgmFvYWTtrfNra7+URM4qVXmFapMuZlYQL8BwEISHG0oDesvKmaMojT5FPf6EVVNfRWmw 1VLptxdZBSkjoaxIpvYikHD2Tzu2AsIIZ6QQtNNvqvf0oJfWWFjh3h/mz2oQmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDxLk0KgSzfk3 for ; Sun, 23 Nov 2025 17:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e0f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 17:50:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: ShengYi Hung From: Ed Maste Subject: git: fa1c56b3affa - main - lldb: Fix Architecture parsing by reading the ELF header. (#162811) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa1c56b3affaab7be6ece43070b36da2e75787cb Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 17:50:21 +0000 Message-Id: <6923495d.e0f0.40fefec9@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fa1c56b3affaab7be6ece43070b36da2e75787cb commit fa1c56b3affaab7be6ece43070b36da2e75787cb Author: ShengYi Hung AuthorDate: 2025-11-21 18:28:25 +0000 Commit: Ed Maste CommitDate: 2025-11-23 17:49:51 +0000 lldb: Fix Architecture parsing by reading the ELF header. (#162811) Currently, LLDB in FreeBSD host sets the Process Architecture used by lldbserver as Default one. Which cause problem when trying to debug a 32bit binary on amd64 platform since the lldb itself will found mismatch architecture with lldbserver's return. Notice that this patch is only a partial fix for the debugging problem. We are still unable to debug x86 on x86_64 so that we don't provide testcase in this patch. PR: 289945 Obtained from: llvm-project 394e7ded8b6bcff1382468b407ca620a2837f41b --- .../llvm-project/lldb/source/Host/freebsd/Host.cpp | 41 +++++++++++++++------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/contrib/llvm-project/lldb/source/Host/freebsd/Host.cpp b/contrib/llvm-project/lldb/source/Host/freebsd/Host.cpp index 110e803b3354..0778eb320dcf 100644 --- a/contrib/llvm-project/lldb/source/Host/freebsd/Host.cpp +++ b/contrib/llvm-project/lldb/source/Host/freebsd/Host.cpp @@ -14,12 +14,13 @@ #include #include -#include - #include #include #include +#include "llvm/Object/ELF.h" + +#include "lldb/Host/FileSystem.h" #include "lldb/Host/Host.h" #include "lldb/Host/HostInfo.h" #include "lldb/Utility/DataBufferHeap.h" @@ -101,17 +102,33 @@ GetFreeBSDProcessArgs(const ProcessInstanceInfoMatch *match_info_ptr, proc_args.AppendArgument(llvm::StringRef(cstr)); } - return true; -} - -static bool GetFreeBSDProcessCPUType(ProcessInstanceInfo &process_info) { - if (process_info.ProcessIDIsValid()) { - process_info.GetArchitecture() = - HostInfo::GetArchitecture(HostInfo::eArchKindDefault); + auto buffer_sp = FileSystem::Instance().CreateDataBuffer(pathname, 0x20, 0); + if (!buffer_sp) { + process_info.Clear(); return true; } - process_info.GetArchitecture().Clear(); - return false; + uint8_t exe_class = + llvm::object::getElfArchType( + {reinterpret_cast(buffer_sp->GetBytes()), + size_t(buffer_sp->GetByteSize())}) + .first; + + switch (exe_class) { + case llvm::ELF::ELFCLASS32: + process_info.SetArchitecture( + HostInfo::GetArchitecture(HostInfo::eArchKind32)); + break; + case llvm::ELF::ELFCLASS64: + process_info.SetArchitecture( + HostInfo::GetArchitecture(HostInfo::eArchKind64)); + break; + case llvm::ELF::ELFCLASSNONE: + process_info.SetArchitecture( + HostInfo::GetArchitecture(HostInfo::eArchKindDefault)); + break; + } + + return true; } static bool GetFreeBSDProcessUserAndGroup(ProcessInstanceInfo &process_info) { @@ -218,7 +235,6 @@ uint32_t Host::FindProcessesImpl(const ProcessInstanceInfoMatch &match_info, // Make sure our info matches before we go fetch the name and cpu type if (match_info_noname.Matches(process_info) && GetFreeBSDProcessArgs(&match_info, process_info)) { - GetFreeBSDProcessCPUType(process_info); if (match_info.Matches(process_info)) process_infos.push_back(process_info); } @@ -232,7 +248,6 @@ bool Host::GetProcessInfo(lldb::pid_t pid, ProcessInstanceInfo &process_info) { if (GetFreeBSDProcessArgs(NULL, process_info)) { // should use libprocstat instead of going right into sysctl? - GetFreeBSDProcessCPUType(process_info); GetFreeBSDProcessUserAndGroup(process_info); return true; } From nobody Sun Nov 23 17:50:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDxLl3GKfz6HNMB for ; Sun, 23 Nov 2025 17:50: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDxLl188Pz3Hy1 for ; Sun, 23 Nov 2025 17:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763920223; 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=wNYeCcAUJueVneFPD744XDK5P+0H6a9gIEsrCmIN9ek=; b=uayqEa4Lyp1CxA1PK1uRgqhs4wYOR+ZjiUTNv//IpFFSge7U9aZ6QPqrsop3pow0bux9JC 7ig8FKovExRtFdkdiyVh8KOKiwNnOVGb254wtFL8EsleunXjEF1I8dXh0hei2jNDEXE/ur 9M2ttCdglvByz5nWB8SXskhYKv+a1k1/AWQQBW6g6NF3n7DJOEORW250xpOL4FmFiYbZtg +N0pYntrAB+IjG98ABD6wHbhQ14Fd5dwtB8NRYoWSmMTH70BUqns5XvuMQn6xsMOT8Hhi+ bHYttb3ZR09Ku2BRaBCrA1Q7aHvH5lcdAc4HowsrxaysP9LPT9MExsPHqZOTsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763920223; 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=wNYeCcAUJueVneFPD744XDK5P+0H6a9gIEsrCmIN9ek=; b=uUGLwVpZRnjRsm40Bfr7rrrxTesl8WN60mFwU+jB/MeqE1edU0TtKH/4EtZrYFwZVdz123 4UONX67KXFlilMUgeHVf5WtTLkrnH2h3OC5oOMm7JvcNv7ocepWhkoBOSp+S778Er6FUdx JK/yOyyGFNSNbqFPUkYsg7VBibBVxkDpgcJxFR5WlT9iZvtz7w35MHJQa93LpcF8LLmRyX 6MHj1X5DHURnJQQ6kPBBvhOw5UlFMZZQ+9fqMccVUspQS9Uv/fbpZ/7zoan2iCBxVb/waA 0kZ8ScQMCAkgMtU6LHxfGQsZNBAst11AN3gOzAbg5jsknCPX+N/2Y/Pra3pmKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763920223; a=rsa-sha256; cv=none; b=gSD8fvOLTPueSRPeLD9d+QsslU0Qax0uGt53NcJ8vdJ6QMi6O9cSPZS3ob2RmwFJmQ18A7 71glltEBCdc2zjCxt2G2SYX9FN0U2eM+TqqcWb0rxJH4GYujEqRRw1oCpr/Wt8L13lFsXg 5vjCynoPW5iUJR2qP0Z7QFR6mV2DsDMcwDjJEuyN+5EoVy7oD8j407QQsSnvCCbQmLoLeC c+cQ6gbETovHE0dbqpdy3Pdq1P21WLMzrwdixEh10BQAfr7xFeFqLifL5MuLQOSBVcezUQ iVfTKmq7UHhbodT9/6TdYFSUoAfbxhfH7bBj9SEAkIkYDFq887+7bgrVY9DSUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDxLl0hDTzfSR for ; Sun, 23 Nov 2025 17:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e463 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 17:50:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: ShengYi Hung From: Ed Maste Subject: git: 1d1a2e6932d6 - main - lldb: Fix empty register set when trying to get size of register List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d1a2e6932d682c40ab878bf83cbbde02d8d0af1 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 17:50:23 +0000 Message-Id: <6923495f.e463.2e27d4e5@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1d1a2e6932d682c40ab878bf83cbbde02d8d0af1 commit 1d1a2e6932d682c40ab878bf83cbbde02d8d0af1 Author: ShengYi Hung AuthorDate: 2025-11-21 18:30:25 +0000 Commit: Ed Maste CommitDate: 2025-11-23 17:49:51 +0000 lldb: Fix empty register set when trying to get size of register The register set information is stored as a singleton in GetRegisterInfo_i386. However, other functions later access this information assuming it is stored in GetSharedRegisterInfoVector. To resolve this inconsistency, we remove the original construction logic and instead initialize the singleton using llvm::call_once within the appropriate function (GetSharedRegisterInfoVector_i386). PR: 289945 Obtained from: llvm-project 41859c27842eeda1ef6ff18f3b2fb269388c0857 --- .../Utility/RegisterContextFreeBSD_x86_64.cpp | 44 ++++++++++------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/contrib/llvm-project/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.cpp b/contrib/llvm-project/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.cpp index e0f3971c6e27..c361b2abb726 100644 --- a/contrib/llvm-project/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.cpp +++ b/contrib/llvm-project/lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.cpp @@ -9,6 +9,7 @@ #include "RegisterContextFreeBSD_x86_64.h" #include "RegisterContextFreeBSD_i386.h" #include "RegisterContextPOSIX_x86.h" +#include "llvm/Support/Threading.h" #include using namespace lldb_private; @@ -69,40 +70,34 @@ struct UserArea { #include "RegisterInfos_x86_64.h" #undef DECLARE_REGISTER_INFOS_X86_64_STRUCT -static std::vector &GetSharedRegisterInfoVector() { - static std::vector register_infos; - return register_infos; -} - -static const RegisterInfo * -GetRegisterInfo_i386(const lldb_private::ArchSpec &arch) { - static std::vector g_register_infos( - GetSharedRegisterInfoVector()); - - // Allocate RegisterInfo only once - if (g_register_infos.empty()) { - // Copy the register information from base class - std::unique_ptr reg_interface( - new RegisterContextFreeBSD_i386(arch)); - const RegisterInfo *base_info = reg_interface->GetRegisterInfo(); - g_register_infos.insert(g_register_infos.end(), &base_info[0], - &base_info[k_num_registers_i386]); +static std::vector & +GetSharedRegisterInfoVector_i386(const lldb_private::ArchSpec &arch) { + static std::vector g_register_infos; + static llvm::once_flag g_initialized; + llvm::call_once(g_initialized, [&]() { + if (g_register_infos.empty()) { + // Copy the register information from base class + std::unique_ptr reg_interface( + new RegisterContextFreeBSD_i386(arch)); + const RegisterInfo *base_info = reg_interface->GetRegisterInfo(); + g_register_infos.insert(g_register_infos.end(), &base_info[0], + &base_info[k_num_registers_i386]); // Include RegisterInfos_x86_64 to update the g_register_infos structure // with x86_64 offsets. #define UPDATE_REGISTER_INFOS_I386_STRUCT_WITH_X86_64_OFFSETS #include "RegisterInfos_x86_64.h" #undef UPDATE_REGISTER_INFOS_I386_STRUCT_WITH_X86_64_OFFSETS - } - - return &g_register_infos[0]; + } + }); + return g_register_infos; } static const RegisterInfo * PrivateGetRegisterInfoPtr(const lldb_private::ArchSpec &target_arch) { switch (target_arch.GetMachine()) { case llvm::Triple::x86: - return GetRegisterInfo_i386(target_arch); + return &GetSharedRegisterInfoVector_i386(target_arch)[0]; case llvm::Triple::x86_64: return g_register_infos_x86_64; default: @@ -116,9 +111,10 @@ PrivateGetRegisterCount(const lldb_private::ArchSpec &target_arch) { switch (target_arch.GetMachine()) { case llvm::Triple::x86: // This vector should have already been filled. - assert(!GetSharedRegisterInfoVector().empty() && + assert(!GetSharedRegisterInfoVector_i386(target_arch).empty() && "i386 register info vector not filled."); - return static_cast(GetSharedRegisterInfoVector().size()); + return static_cast( + GetSharedRegisterInfoVector_i386(target_arch).size()); case llvm::Triple::x86_64: return static_cast(sizeof(g_register_infos_x86_64) / sizeof(g_register_infos_x86_64[0])); From nobody Sun Nov 23 17:53:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDxQm6wCyz6HNn3 for ; Sun, 23 Nov 2025 17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDxQm6GGYz3Kxb for ; Sun, 23 Nov 2025 17: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=1763920432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OSZRlpVCuaTs7lf6ouycBVQXlWRRSrK6JjRX9StSM9Q=; b=HETVVVpQift96xfE2Aj808jkuamaP5AaQqnvMnBUnE21C25yL/S1adbCY0g8S1EjlFo4HR P/SPI3Gj1vU0dDBelO4BlMIOOg9n5RLQ4e5cVVqoqJl3GFKSR5uxWVNcXPzaMsOadUS3Bj H2+6uqLiIhfQyd1A9NUBOp5rI/atoRlW2O+OxSd7Db3iLMVnCRY0EfhcJcIUX97JJrgfA4 zPLoMFXxrmzVMctPzWK8ik2oSX0BUqBcYqtbT8aC4hpCN7N5LgT+lr5oxVKMGOF6ufwAN+ 5WJ+LNHbz7EGrXAb6xRSlhjhx8WoveJG6kFrqtf+2GkHwWQuFhIVygE3jmlDig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763920432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OSZRlpVCuaTs7lf6ouycBVQXlWRRSrK6JjRX9StSM9Q=; b=ecpj8Q/8leI3zH/ZqIbnLEzdKEdloBv4uTbxhdPrzQGMeSQtMMEPDAS9wMqMIv0Z9KcqZl FPmEECmvq1hRrDpjdJhpJ5HWYNmksHRzoCNIVwwxONSaYktOSd1tXqZgw/toNvYmEcRZ2y 8hq9NF+VuKAQV/KnDKmAj2n8YRS7c5vTcgXmo53prfIX93JOAyhB+212EhfNvlRpmI6VwI RNtfC+DHEiFkACMw09JrQXpQJ/14gIOZoLgqOfM5mEZKZ6B1skO0yMYALtLd/ddJDKL+yt DT7V+Jcj5+j6y8qlVP9G++lz5f/1OCZLzaKmucMe2bQ3EFbYL8nYIQOS/UPOmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763920432; a=rsa-sha256; cv=none; b=bO9bj59dyPhYdDHzXFVmsQmFiyLkRpcDSMj5LTE3TBpMcuwx71Dq9TZ7nVz+M3JfUuSrvx 47Yg+FakVtzEBKMgYrtH4EkGwfC9fuNIc7lcoICoDkcuFvTWYP9YsMgf8VB9KQMIkiM8c/ SS7E57FQBlCfuNhjHMtCZ+OaegGuCGAugnahQt+drtb8llSZlmNeuFEtwxGH6Z9M3fboGQ jEKg1bdNo+lrmsIeTNShVrifCJWeJ6h98Bj7ZDLpjr1r0D/PojAR//MghWec26FPow7H9a jGrkJu4xxFR/Jjwq6KQoiugXcqgoYKzHZkTAaTUxN3hAmjU4VXtVP39zC6Qyww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDxQm5nmtzfw3 for ; Sun, 23 Nov 2025 17:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f50f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 17:53:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 11c5b906fcac - stable/15 - mgb.4, muge.4: Use standard HARDWARE introduction List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 11c5b906fcac36e1b8749e9ef2f65ed8ad9812f9 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 17:53:52 +0000 Message-Id: <69234a30.f50f.a913f54@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=11c5b906fcac36e1b8749e9ef2f65ed8ad9812f9 commit 11c5b906fcac36e1b8749e9ef2f65ed8ad9812f9 Author: Ed Maste AuthorDate: 2025-11-20 16:41:38 +0000 Commit: Ed Maste CommitDate: 2025-11-23 17:53:40 +0000 mgb.4, muge.4: Use standard HARDWARE introduction Release notes are generated using this text. I used "interfaces" not "adapters" in these pages as the listed devices are the controller ICs, not end-user projects. Reviewed by: ziaee Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53846 (cherry picked from commit a4aa7df767e0df49ca3294d2b578be25812364d8) --- share/man/man4/mgb.4 | 2 +- share/man/man4/muge.4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/mgb.4 b/share/man/man4/mgb.4 index cf0f7aaa688d..0d26951d1b1e 100644 --- a/share/man/man4/mgb.4 +++ b/share/man/man4/mgb.4 @@ -49,7 +49,7 @@ For more information on configuring this device, see .Sh HARDWARE The .Nm -driver supports: +driver supports Microchip PCIe Gigabit Ethernet interfaces, including: .Pp .Bl -bullet -compact .It diff --git a/share/man/man4/muge.4 b/share/man/man4/muge.4 index 598106bf1855..2a1b0f600955 100644 --- a/share/man/man4/muge.4 +++ b/share/man/man4/muge.4 @@ -44,7 +44,7 @@ For more information on configuring this device, see .Sh HARDWARE The .Nm -driver supports: +driver supports Microchip USB Gigabit Ethernet interfaces, including: .Pp .Bl -bullet -compact .It From nobody Sun Nov 23 18:10:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDxnq2Fptz6HQ18 for ; Sun, 23 Nov 2025 18:10: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDxnq1WB3z3MZX for ; Sun, 23 Nov 2025 18:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763921423; 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=PSi/ICUq0ctu/nEPIsIO47P4ijzPkMMykbCn1pEGqOo=; b=pNDv3X+mUUANWnYD33TSUDXNoqHnIKjFVcXDMfagbejJ3mN5QZrIwm3CzyCYB8fQc9TW/i uNARF2ve19K6KDj4Nzjei6SE7AMBCMEo3MPReK97giqSA+K54yd/pysJm6y6/AEUBMr3VF ooCKpYpZEa99/LHUWnDAQ6djeBzUxHUjXo1Af3dGo9GtZBm1LBKAAkwq1mBmjdHuANbhl6 OTAw76kSc4JDacp0A5BJ8eS1qNGTlnuY3W08MpZBHLdnVQco03G90FGWHDlFveI7giWViv Qn6wogM/XEtzceXnzCjzTgldvqAOwq9mVJ9T/sMSI6EYU39CIyAwUulp/JnHcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763921423; 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=PSi/ICUq0ctu/nEPIsIO47P4ijzPkMMykbCn1pEGqOo=; b=ugykwdpwIu7qxAzpIahckIs4hDXbuWpMNqKFGMxTZNO1vDpZ1O5eVHtD2HoGBpBXDmuSxN 9cMefjtNsA+UNNZ7k1dnrY1eFj7Q0poWQtdlOjOT9Fzx31cOYHq7PB0OxpWC6DtZm4U7AN zQgfzNcfKQrsvOJOjdHNsQEBjIGluPcFvfIflmQzwGM4HrE65YhgifLFAUGpjLWaCZN/Zt ysYaDBqLcCYxFQqJAMjxwZHp/tXRZYTYJcdGGJSB5p1DYCPGzm2sTvH9zI2UOiKIG6E1mN WChmi1GmvsaRZNO/S460GAri/dx4qzjvg5c5fHhcjJidofVqZ/W9LL/ltx6G9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763921423; a=rsa-sha256; cv=none; b=PlkEXDqVZA4dk8qSRrc+p3QsNWodQ7E/0vXVfVaHiB+tUxXlReZff0h00tHTp7Ss9F6to4 X87MgenEN11M5I1OB7YUCwIpBfXezzvPMLFT1wjQMZhGslrBY0d14uaHrx4udOJe5JpK+7 PDyF0InvTaLvnRPU+0fpsEN8NNYFmlS7pSf+z6Yt2hnG95W6oYpXYVn4GREu4yq12SX+PN 8S6g89Jc+VMgT1n/Z13U21tHDyUrBAYn8z3NlvulwCRCbQ3TeYMH2kYMRkJYxZb5lZ5oln 0dSs62I+X8pWQOKMyM7IJ75gCfFjk8kB4avJ7U6NXA7p1WML81u/tEXPpRG3Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDxnq0YsVzg0S for ; Sun, 23 Nov 2025 18:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fc7d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 18:10:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jose Luis Duran From: Ed Maste Subject: git: d06b14106a37 - stable/14 - mtree: Add missing flua/freebsd/sys entry List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d06b14106a376ab1658ea7917ba32c43e377ba2a Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 18:10:22 +0000 Message-Id: <69234e0e.fc7d.780fad32@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d06b14106a376ab1658ea7917ba32c43e377ba2a commit d06b14106a376ab1658ea7917ba32c43e377ba2a Author: Jose Luis Duran AuthorDate: 2025-02-05 19:52:03 +0000 Commit: Ed Maste CommitDate: 2025-11-23 18:09:15 +0000 mtree: Add missing flua/freebsd/sys entry Reviewed by: imp Approved by: emaste (mentor) Fixes: de1d7d7b87cf ("flua: add freebsd module implementing kldload/kldunload") Differential Revision: https://reviews.freebsd.org/D48838 (cherry picked from commit c587e4c7e4c28354634b4e13f30743ccdd3fbf91) --- etc/mtree/BSD.debug.dist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist index 435da9d14d43..a75edff4f865 100644 --- a/etc/mtree/BSD.debug.dist +++ b/etc/mtree/BSD.debug.dist @@ -38,6 +38,10 @@ engines-3 .. flua + freebsd + sys + .. + .. .. i18n .. From nobody Sun Nov 23 18:40:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDySC4zW4z6HSN7 for ; Sun, 23 Nov 2025 18:40: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDySC2K23z3QNj for ; Sun, 23 Nov 2025 18:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763923211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HVZmFYSAXGN7wYGJKf9g0Z6HpjHApoByLHT6Ba4LlU8=; b=JGUUIJzE8V4jAVPtDGCT7kHwX7pwHDeD5mlkgpouKMvnP5uV3vxemHEa5fOOgdOKuulctC MgB3CfABcif5+IMqA9iq+0Z0RrPq4QcxQr07b5O5JXjNe6TXbwsfK6qxv4Tcf10L+qRrRT 1wn7uYR8uVA8KIZJiMAOIPrxrE2KBxtCL1MtqcwYaTGaH9L1rv67bmNwbrsxYEECOQLm8H kANdc8hbMHn5jc7/Ld/hLtqgWuE8kRYeP1Yb7tnAxTJeUIbBxU6JFzMVFKz1r+T1U5+lLc 43Uk7vU5ZvjH2ZUvgi0Gvk+s1XDo8Jv0it04L171TC+CLMmVyNlVJ5e9CzLcKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763923211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HVZmFYSAXGN7wYGJKf9g0Z6HpjHApoByLHT6Ba4LlU8=; b=DvVmp1p9x5pNpnzm6ytTnG7E2UWFnp/3dSyowEAOKMB/mLqjOw6YNHId7AiKenuhVEV2iS 58z4xev6DY4AoPD4x+f9hBzSs+/I0RUmatsCYCpJw1W3q0zFIS3iN4DtASin4Egb5kn7LK W3oqs4FeyHi1PHG5Vt64rBmX6LKi4acCelCbHTn+W53yBk94Y/BYqHg2gHYBNEzkcPcgDI 4/+3IQouml2u/Q2jxmyVFZq7tVPvG30ZvtLHDFQ8WmVdJasMDpLvhxQxBoE/INfFvZclza HLwGnVM9jAi7SzYZh5BECLKCeFgaZQdLL+Lh976e2x7eoKJGbZNWK4AWypQW7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763923211; a=rsa-sha256; cv=none; b=cimkCb0qVK5YxKbIW2elk6yhKCHQa9SBGVp0qnOe7pXV56+q38CZ3MskbKSiJL8T7KDxHC he+zKtdhTzHt0sl+Ljc5NpoZad6qm2YooLO7vXqhJ/SKUrNdXot7r+u+1xzlfTyrnFY4+8 Xa072s8o8kUoWdtQe5zp71c1Ot/hW5B6flmnDvrfxTIM/liRbU/FPdH5h70+2qbvLX8YZu Np8NevAehjDyLzE+G+Kas0chENVqf2j5d3tLXCLSH1Y5TV/30OPywB1fEsrUrjM7blK+yM 2Pnw0Cygh6X3LbdPAyOOp8REDjkQ2+jjG45Pp7X4IsnvpN/AJLThGvi2OYCn9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDySC0cyPzgsF for ; Sun, 23 Nov 2025 18:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2519a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 18:40:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 3289bace53f3 - main - Reapply "Merge commit e24f90190c77 from llvm git (by Brad Smith):" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3289bace53f31545976fec310b41fa784de75e64 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 18:40:10 +0000 Message-Id: <6923550a.2519a.b8a7de4@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3289bace53f31545976fec310b41fa784de75e64 commit 3289bace53f31545976fec310b41fa784de75e64 Author: Dimitry Andric AuthorDate: 2025-11-23 15:52:46 +0000 Commit: Dimitry Andric CommitDate: 2025-11-23 18:40:00 +0000 Reapply "Merge commit e24f90190c77 from llvm git (by Brad Smith):" [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) The compiler_rt helper functions have been built since 12.4, 13.1, 14 and anything newer. This reverts commit bd27bd1f51d049538cc7a0053be9d99110a53ae1. Only some people (including the release manager, unfortunately) ran into build issues with the previous iteration of this commit, because they were bootstrapping the compiler, either via the WITHOUT_SYSTEM_COMPILER src.conf(5) setting, or because the build system determined that their base system compiler was out of date. The bootstrapped compiler would then enable outline atomics and compile libgcc_s with these, but because libgcc_s is linked with -nodefaultlibs, it could not find the helper routines in libcompiler_rt.a. In contrast, people who did not bootstrap the compiler never saw any issues, because libgcc_s was built using their 'old' base system compiler, and so libgcc_s would not contain any calls to those helper routines. Fix this by ensuring that libgcc_s is linked against libcompiler_rt.a explicitly, similar to some other binaries and libraries that are built with -nodefaultlibs. Also, bump FREEBSD_CC_VERSION to ensure that everybody gets the updated compiler with outline atomics enabled. (This should have been done in the first iteration of this commit, because the error would have shown up right away then.) MFC after: 3 days --- contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h | 5 +++++ lib/clang/freebsd_cc_version.h | 2 +- lib/libgcc_s/Makefile | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h index 7ab63905ed4f..7d090ba682b3 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h @@ -78,6 +78,11 @@ public: void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; + bool IsAArch64OutlineAtomicsDefault( + const llvm::opt::ArgList &Args) const override { + return true; + } + UnwindTableLevel getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const override; bool isPIEDefault(const llvm::opt::ArgList &Args) const override; diff --git a/lib/clang/freebsd_cc_version.h b/lib/clang/freebsd_cc_version.h index b493dc96db5e..cf525916fe29 100644 --- a/lib/clang/freebsd_cc_version.h +++ b/lib/clang/freebsd_cc_version.h @@ -1 +1 @@ -#define FREEBSD_CC_VERSION 1600000 +#define FREEBSD_CC_VERSION 1600001 diff --git a/lib/libgcc_s/Makefile b/lib/libgcc_s/Makefile index 992fc930ee9f..7e3911043843 100644 --- a/lib/libgcc_s/Makefile +++ b/lib/libgcc_s/Makefile @@ -11,7 +11,9 @@ MK_SSP= no WARNS?= 2 LDFLAGS+= -nodefaultlibs +LDFLAGS+= -Wl,-Bsymbolic LIBADD+= c +LIBADD+= compiler_rt VERSION_DEF= ${.CURDIR}/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map From nobody Sun Nov 23 20:25:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dF0nt4zwrz6HMVR for ; Sun, 23 Nov 2025 20:25:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dF0nt4N4xz3c4T for ; Sun, 23 Nov 2025 20:25:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763929538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BtPgAUaJOTlNS1hshmDdVWh6tnmCcN6PqXbAvRxfito=; b=dDc/NaH8T1JjXRweYUrsI1GvahYYMHNedBVVIs7Nwl61ajlxZeHwh5p2lBTss617TVVi6O /eHYps3pxKG40hfHnGMQETmAiQ3gGJrd9BD5hmmXloQEn3pe3QLp6r9B4JQjbhgsgrJi5e xCLscyfrc/EwhMOvOWpVw9kdIPQIUR6GgK1c2U6UVyDPWi3zeX1Xp7u2jbLBHsmIzt9aVA vFjmO8wp0kdnpeSB4gR2xNgfjLkwNKYaKOJo6RJfDLP0+T48KenGA9z33NYC4PepDkuRVv NUbRfoENdgJ6uHOFSw2bbsxP7gl4V9jdKgT7lpmO0phy2KiGClMsU2Hy1nxeng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763929538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BtPgAUaJOTlNS1hshmDdVWh6tnmCcN6PqXbAvRxfito=; b=h5G68cklZlmu4cDI04v88Zz/r09X+aoMkBXl3CqerXMwyxXzjO4y5PPomxl2xD3dxHViIp MsGIthYpArA/MGna266+skum6S3wOGNV8CgMxa9Xyf+nxVZHiTXh3qFBZzP0CzRHesSNpR ey+6yKSe2hjJ3ZcQV46aZyYAs9Sl5nLvSDX7ro+bJnSUTfFz4Atyn+rcHN9PCSwKCmmfTm P2H4/6DceouDpLiKw0jSFasJYYZ915bMoYVwm/GTBmJxP00sGShu0oZ2nSi+mXdjcaR04Z tkoA1Fp+pc8rmcOiai44xchfDmSagYqp8viex97Mrhq1S90fvW6zP42FEHzi7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763929538; a=rsa-sha256; cv=none; b=iRHi5Fr3EXmncwsCKDtz/o0Jfms7fpB3nnO4wfQkZbkyZbK1Izb00FObDBp+dLoDW9+nNJ 8crgEMd0Skob0dZmX2/+pBM2uGx66Lcxw+tOdgcXjL+Ib2ucyW0l5DIYgTe5ukzyAnb6QX yDErw+Ztm8crd2APDOBcGmeLmxxrn/iMxrKPTmymC/QmW10nnLNgMW7AxtbWrNbkpsxoYg gShAgqG1O61Rd9QkctTEUGpU78s0miroY3StjUFqTMDcwqdq/eZarw+b33iSHMipdYXJ5A 19IJONEKWPQ2+j2cHnzHaQsK5tNI4edeVhue5wwzhoUXRWGXdTVAts7KJSFdGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dF0nt3knbzjs3 for ; Sun, 23 Nov 2025 20:25:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f38c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 20:25:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 52159dd73fe7 - stable/15 - pathconf.2: Document the new _PC_CASE_INSENSITIVE name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 52159dd73fe7a189450d9df36061c760b3632a7c Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 20:25:38 +0000 Message-Id: <69236dc2.2f38c.3e66c29b@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=52159dd73fe7a189450d9df36061c760b3632a7c commit 52159dd73fe7a189450d9df36061c760b3632a7c Author: Rick Macklem AuthorDate: 2025-11-01 22:20:40 +0000 Commit: Rick Macklem CommitDate: 2025-11-23 20:24:10 +0000 pathconf.2: Document the new _PC_CASE_INSENSITIVE name Commit d6864221d8 added support for the _PC_CASE_INSENSITIVE name for pathconf, to indicate if case insensitive lookups are configured. This patch documents this new name and also updates the description for _PC_HAS_HIDDENSYSTEM to also include UF_ARCHIVE. This is a content change. (cherry picked from commit b473bb274cef37d45940cad4624b5d3b7fc96e01) --- lib/libsys/pathconf.2 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libsys/pathconf.2 b/lib/libsys/pathconf.2 index 5a983a3a13e2..5348128be706 100644 --- a/lib/libsys/pathconf.2 +++ b/lib/libsys/pathconf.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 6, 2025 +.Dd October 31, 2025 .Dt PATHCONF 2 .Os .Sh NAME @@ -180,7 +180,8 @@ Return 1 if named attributes are enabled for the file system, otherwise 0. .It Li _PC_HAS_NAMEDATTR Return 1 if one or more named attributes exist for the file, otherwise 0. .It Li _PC_HAS_HIDDENSYSTEM -Return 1 if both +Return 1 if all of the +.Dv UF_ARCHIVE , .Dv UF_HIDDEN and .Dv UF_SYSTEM @@ -192,6 +193,9 @@ Returns the block size required for block cloning via .Xr copy_file_range 2 for a file system if block cloning is supported, otherwise 0. +.It Li _PC_CASE_INSENSITIVE +Return 1 if the file system performs case insensitive lookups, +otherwise 0. .El .Sh RETURN VALUES If the call to From nobody Sun Nov 23 20:28:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dF0s912SRz6HMSG for ; Sun, 23 Nov 2025 20: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dF0s85z2bz3c5v for ; Sun, 23 Nov 2025 20: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=1763929708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FE5DBxvQPW5Ih7zkDLBs2CszJ1klOviaA8qqXyPmiCs=; b=ej+Pgr6U9jOliZPz57haGchTznR87x8GsHDpr5PZNsYu3R7DeoiBLlqCv2skmkui17bMXY 36/Hriwo5uAr6dzg5N9pd5APoOurBv7uqL0GkjcKPR68iQk9Nc7lvUSTN3A3Eq/i6kFIAw GoqHYT2IYNLd7MOAyPMhIeMq3Y8fpcbcjECR5J+058NUOnzFIv+Zd45R/GVH7odBe0kfq2 YSymjS0S9uLTU1Br3FdcirT39l2f4Zd4f5nbPUO0dUTVVsq2Wxyf9YZ6OYb7hgG6rcEAio iHG9a23MiCYJ331NKkUm8+yQrWblaxTtnnsqMbc6ilx913fZ/DA7Nb79NoYhkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763929708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FE5DBxvQPW5Ih7zkDLBs2CszJ1klOviaA8qqXyPmiCs=; b=ZdLTYiBxGDt9oUN1jfb0xvL/Q/m1nXd8GiQhrSczenONBlLsOUwh+kmiv/Snly5Ou1p9Q6 4reo98xnLg6N+MUUwxky9ABGQrUSUFMUj4C7jU8nPym+rYT1QngYBknGM5R5k5n2ahxdb/ KKtHmwuXHRYTItCKR7joHccV9Z6PZSgS0IdAbeYo+VxZLUZPe+r/pAv7Q8dGXQXK20Lbfk YPFJwCy4Qor742b+3jl4xl3chhSehVdGOMJKNqeYi2iEQCqCXRSH5/sem3QpWVkDUCAPH5 5sb5+eoSKdRDa4IVdI7R+aYrMb50Is8xSVX2zj/xSg7F0FUCiy25M1d2yWp9oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763929708; a=rsa-sha256; cv=none; b=LDjzqc71fQz/0SosOAay/rvA/7HadifqycCslX1a06saLwCFuaFHfmPTNkgWRU4ABqt3pe +/jiKbJl7vyYxJm8yy4IHDxDdj5Mw4wDsIWwDnDOwDlzUJKjD/9DyuFcUTNudoUvvRtiNy 0V3d71ueQTw9CE8/Elidn/L1upl6G+Zr4J5Yu3fKZ1SfoJdmhdCSdsMozZKKsgoNEjzOtP ZtsGZFH27/ZEl74Fo78NoCKf2BTypmdVSsqLbG7MePw+MpXVr6y2zem3ss1N1dkgtjVWjR m51QPSOc9rk/jj2DhvFanTGwVdDauBRkb0k1KHCQA/xKfHW2FyCY+J3H/+bB1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dF0s84fCqzkcf for ; Sun, 23 Nov 2025 20:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f390 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 20:28:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: f27afc476551 - stable/15 - nfs: Add support for the new _PC_CASE_INSENSITIVE name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f27afc476551c62a09b02b9b9de5103a3094fc88 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 20:28:28 +0000 Message-Id: <69236e6c.2f390.78931747@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f27afc476551c62a09b02b9b9de5103a3094fc88 commit f27afc476551c62a09b02b9b9de5103a3094fc88 Author: Rick Macklem AuthorDate: 2025-11-02 21:38:45 +0000 Commit: Rick Macklem CommitDate: 2025-11-23 20:25:38 +0000 nfs: Add support for the new _PC_CASE_INSENSITIVE name Commit d6864221d8 added support for the _PC_CASE_INSENSITIVE name for pathconf, to indicate if case insensitive lookups are configured. This patch adds support for it for both NFSv4 and NFSv3. It also adds a fsidp argument to nfsv4_fillattr() which will be used in future commit(s) related to NFSv4.n directory delegations. (cherry picked from commit e5aa60d0695803c83dc0af08c057b82c463da3f2) --- sys/fs/nfs/nfs_commonsubs.c | 31 ++++++++++++++++++++++--------- sys/fs/nfs/nfs_var.h | 4 ++-- sys/fs/nfsclient/nfs_clrpcops.c | 2 +- sys/fs/nfsclient/nfs_clstate.c | 3 ++- sys/fs/nfsclient/nfs_clvnops.c | 8 ++++++-- sys/fs/nfsserver/nfs_nfsdport.c | 18 ++++++++++++------ sys/fs/nfsserver/nfs_nfsdserv.c | 9 +++++++-- 7 files changed, 52 insertions(+), 23 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index f580a394a735..707ad5749ab2 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -658,7 +658,7 @@ nfscl_fillsattr(struct nfsrv_descript *nd, struct vattr *vap, NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMECREATE); (void) nfsv4_fillattr(nd, vp->v_mount, vp, NULL, vap, NULL, 0, &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL, - false, false, false, 0); + false, false, false, 0, NULL, false); break; } } @@ -1706,11 +1706,18 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, attrsum += NFSX_UNSIGNED; break; case NFSATTRBIT_CASEINSENSITIVE: - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); if (compare) { if (!(*retcmpp)) { - if (*tl != newnfs_false) - *retcmpp = NFSERR_NOTSAME; + if (vp == NULL || VOP_PATHCONF(vp, + _PC_CASE_INSENSITIVE, + &has_pathconf) != 0) + has_pathconf = 0; + if ((has_pathconf != 0 && + *tl != newnfs_true) || + (has_pathconf == 0 && + *tl != newnfs_false)) + *retcmpp = NFSERR_NOTSAME; } } else if (pc != NULL) { pc->pc_caseinsensitive = @@ -2690,7 +2697,8 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, nfsattrbit_t *attrbitp, struct ucred *cred, NFSPROC_T *p, int isdgram, int reterr, int supports_nfsv4acls, int at_root, uint64_t mounted_on_fileno, struct statfs *pnfssf, bool xattrsupp, bool has_hiddensystem, - bool has_namedattr, uint32_t clone_blksize) + bool has_namedattr, uint32_t clone_blksize, fsid_t *fsidp, + bool has_caseinsensitive) { int bitpos, retnum = 0; u_int32_t *tl; @@ -2865,10 +2873,12 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, break; case NFSATTRBIT_FSID: NFSM_BUILD(tl, u_int32_t *, NFSX_V4FSID); + if (fsidp == NULL) + fsidp = &mp->mnt_stat.f_fsid; *tl++ = 0; - *tl++ = txdr_unsigned(mp->mnt_stat.f_fsid.val[0]); + *tl++ = txdr_unsigned(fsidp->val[0]); *tl++ = 0; - *tl = txdr_unsigned(mp->mnt_stat.f_fsid.val[1]); + *tl = txdr_unsigned(fsidp->val[1]); retnum += NFSX_V4FSID; break; case NFSATTRBIT_UNIQUEHANDLES: @@ -2914,8 +2924,11 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, retnum += NFSX_UNSIGNED; break; case NFSATTRBIT_CASEINSENSITIVE: - NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); - *tl = newnfs_false; + NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); + if (has_caseinsensitive) + *tl = newnfs_true; + else + *tl = newnfs_false; retnum += NFSX_UNSIGNED; break; case NFSATTRBIT_CASEPRESERVING: diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 16a76c060e78..7db3952ecf5c 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -398,7 +398,7 @@ void nfsrv_wcc(struct nfsrv_descript *, int, struct nfsvattr *, int, int nfsv4_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, NFSACL_T *, struct vattr *, fhandle_t *, int, nfsattrbit_t *, struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t, struct statfs *, bool, bool, - bool, uint32_t); + bool, uint32_t, fsid_t *, bool); void nfsrv_fillattr(struct nfsrv_descript *, struct nfsvattr *); struct mbuf *nfsrv_adj(struct mbuf *, int, int); void nfsrv_postopattr(struct nfsrv_descript *, int, struct nfsvattr *); @@ -740,7 +740,7 @@ int nfsvno_updfilerev(vnode_t, struct nfsvattr *, struct nfsrv_descript *, int nfsvno_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, struct nfsvattr *, fhandle_t *, int, nfsattrbit_t *, struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t, bool, bool, - bool, uint32_t); + bool, uint32_t, bool); int nfsrv_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, nfsattrbit_t *, NFSACL_T *, NFSPROC_T *); int nfsv4_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, nfsattrbit_t *, diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 9ee1fb7d72d8..8cbfaa7a8996 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -5452,7 +5452,7 @@ nfsrpc_setaclrpc(vnode_t vp, struct ucred *cred, NFSPROC_T *p, NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ACL); (void) nfsv4_fillattr(nd, vp->v_mount, vp, aclp, NULL, NULL, 0, &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL, false, false, - false, 0); + false, 0, NULL, false); error = nfscl_request(nd, vp, p, cred); if (error) return (error); diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index aa9d01fc4632..712d49c7160c 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -3701,7 +3701,8 @@ nfscl_docb(struct nfsrv_descript *nd, NFSPROC_T *p) if (!error) (void) nfsv4_fillattr(nd, NULL, NULL, NULL, &va, NULL, 0, &rattrbits, NULL, p, 0, 0, 0, 0, - (uint64_t)0, NULL, false, false, false, 0); + (uint64_t)0, NULL, false, false, false, 0, + NULL, false); break; case NFSV4OP_CBRECALL: NFSCL_DEBUG(4, "cbrecall\n"); diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 5ce764fcedea..714c37de271f 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -4677,12 +4677,13 @@ nfs_pathconf(struct vop_pathconf_args *ap) clone_blksize = 0; if ((NFS_ISV34(vp) && (ap->a_name == _PC_LINK_MAX || ap->a_name == _PC_NAME_MAX || ap->a_name == _PC_CHOWN_RESTRICTED || - ap->a_name == _PC_NO_TRUNC)) || + ap->a_name == _PC_NO_TRUNC || + ap->a_name == _PC_CASE_INSENSITIVE)) || (NFS_ISV4(vp) && (ap->a_name == _PC_ACL_NFS4 || ap->a_name == _PC_HAS_NAMEDATTR || ap->a_name == _PC_CLONE_BLKSIZE))) { /* - * Since only the above 4 a_names are returned by the NFSv3 + * Since only the above 5 a_names are returned by the NFSv3 * Pathconf RPC, there is no point in doing it for others. * For NFSv4, the Pathconf RPC (actually a Getattr Op.) can * be used for _PC_ACL_NFS4, _PC_HAS_NAMEDATTR and @@ -4849,6 +4850,9 @@ nfs_pathconf(struct vop_pathconf_args *ap) case _PC_CLONE_BLKSIZE: *ap->a_retval = clone_blksize; break; + case _PC_CASE_INSENSITIVE: + *ap->a_retval = pc.pc_caseinsensitive; + break; default: error = vop_stdpathconf(ap); diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index ff28b089da5d..c05e0d67f0d6 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -2114,7 +2114,7 @@ nfsvno_fillattr(struct nfsrv_descript *nd, struct mount *mp, struct vnode *vp, struct ucred *cred, struct thread *p, int isdgram, int reterr, int supports_nfsv4acls, int at_root, uint64_t mounted_on_fileno, bool xattrsupp, bool has_hiddensystem, bool has_namedattr, - uint32_t clone_blksize) + uint32_t clone_blksize, bool has_caseinsensitive) { struct statfs *sf; int error; @@ -2135,7 +2135,7 @@ nfsvno_fillattr(struct nfsrv_descript *nd, struct mount *mp, struct vnode *vp, error = nfsv4_fillattr(nd, mp, vp, NULL, &nvap->na_vattr, fhp, rderror, attrbitp, cred, p, isdgram, reterr, supports_nfsv4acls, at_root, mounted_on_fileno, sf, xattrsupp, has_hiddensystem, has_namedattr, - clone_blksize); + clone_blksize, NULL, has_caseinsensitive); free(sf, M_TEMP); NFSEXITCODE2(0, nd); return (error); @@ -2468,7 +2468,7 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram, int bextpg0, bextpg1, bextpgsiz0, bextpgsiz1; size_t atsiz; long pathval; - bool has_hiddensystem, has_namedattr, xattrsupp; + bool has_caseinsensitive, has_hiddensystem, has_namedattr, xattrsupp; if (nd->nd_repstat) { nfsrv_postopattr(nd, getret, &at); @@ -2949,6 +2949,7 @@ ateof: xattrsupp = false; has_hiddensystem = false; has_namedattr = false; + has_caseinsensitive = false; clone_blksize = 0; if (nvp != NULL) { supports_nfsv4acls = @@ -2978,6 +2979,11 @@ ateof: &pathval) != 0) pathval = 0; clone_blksize = pathval; + if (VOP_PATHCONF(nvp, + _PC_CASE_INSENSITIVE, + &pathval) != 0) + pathval = 0; + has_caseinsensitive = pathval > 0; NFSVOPUNLOCK(nvp); } else supports_nfsv4acls = 0; @@ -2999,7 +3005,7 @@ ateof: supports_nfsv4acls, at_root, mounted_on_fileno, xattrsupp, has_hiddensystem, has_namedattr, - clone_blksize); + clone_blksize, has_caseinsensitive); } else { dirlen += nfsvno_fillattr(nd, new_mp, nvp, nvap, &nfh, r, &attrbits, @@ -3007,7 +3013,7 @@ ateof: supports_nfsv4acls, at_root, mounted_on_fileno, xattrsupp, has_hiddensystem, has_namedattr, - clone_blksize); + clone_blksize, has_caseinsensitive); } if (nvp != NULL) vrele(nvp); @@ -6405,7 +6411,7 @@ nfsrv_setacldsdorpc(fhandle_t *fhp, struct ucred *cred, NFSPROC_T *p, * the same type (VREG). */ nfsv4_fillattr(nd, NULL, vp, aclp, NULL, NULL, 0, &attrbits, NULL, - NULL, 0, 0, 0, 0, 0, NULL, false, false, false, 0); + NULL, 0, 0, 0, 0, 0, NULL, false, false, false, 0, NULL, false); error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, NULL, p, cred, NFS_PROG, NFS_VER4, NULL, 1, NULL, NULL); if (error != 0) { diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 217675173add..71b32082a91e 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -252,7 +252,7 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, struct thread *p = curthread; size_t atsiz; long pathval; - bool has_hiddensystem, has_namedattr, xattrsupp; + bool has_caseinsensitive, has_hiddensystem, has_namedattr, xattrsupp; uint32_t clone_blksize; if (nd->nd_repstat) @@ -336,6 +336,10 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, &pathval) != 0) pathval = 0; clone_blksize = pathval; + if (VOP_PATHCONF(vp, _PC_CASE_INSENSITIVE, + &pathval) != 0) + pathval = 0; + has_caseinsensitive = pathval > 0; mp = vp->v_mount; if (nfsrv_enable_crossmntpt != 0 && vp->v_type == VDIR && @@ -371,7 +375,8 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, isdgram, 1, supports_nfsv4acls, at_root, mounted_on_fileno, xattrsupp, has_hiddensystem, - has_namedattr, clone_blksize); + has_namedattr, clone_blksize, + has_caseinsensitive); vfs_unbusy(mp); } vrele(vp); From nobody Sun Nov 23 20:36:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dF12D2spDz6HNNX for ; Sun, 23 Nov 2025 20:36: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dF12D17sRz3d3w for ; Sun, 23 Nov 2025 20:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763930180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wy3RqSP0VUqxRaswChhFX9J/RiBIxTAijEGJlwS9SOY=; b=vsEzxTaZXoJ713uDu+MS79vfPY1emw/1LObsPPhc1EXzFFOVLQ/KMPN12eY0Xv1sn+l9C+ zv76NgSWq/eesC4U7FEQOBcOtxKP5NwGHO6htTv18G2jMgVXYng6osPAlcZaTmQjD8ecXW x5HcjV1ToHRO218sQG6ScVB1382Le5w/6r5ssKqbHhSjWYu2oSSqjF8Jm5GVfStD4ructF nrER7LvHwS9sHSOWGmqOJQBdlnQDeamD0uCEROeVzYCfjN9eZw+kgxbtXkH5q5RyTxrgRG WkhPFRu6ux/At9PIKYgNK9L1eWFXBPpihxfHWqkPE7TOhdtug97soLH/41QkYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763930180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wy3RqSP0VUqxRaswChhFX9J/RiBIxTAijEGJlwS9SOY=; b=eu3jaoPn+/m6KXNL9tgn95g06r0KO0B4ptomgndtENGTxSjru9FAFA2z3vA0TMHvU6ueW9 UDqUWr1isH4cz6Ky9DJ+98EepLBneppD27i0wn/2MXuKY+bMoDdQnAH8RnDgzXgrURWVnM 5Tq3prQDzxiqQI/dtBXaYfuoaGkZl1qFp1dsPMV4DSuVrialiWlhjAgfLGVppAz3EZu/MO j9nNrU0F/f8uvZO/GFsGnnjZbOuw8Bj2bmmYIEGT5mGib095UXB0jnDKG9GKqFEydRajiA w7JC0Ax5dAoirvu69Ef53KkNdf8GL0VJG1LgPmlvW2+66ESxBD/YQ7MFkhX/YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763930180; a=rsa-sha256; cv=none; b=oz7jQYOT0PSq9mPveXuIlNYL5e7tM/EgrZ9hvsJofBzborzphxaT7WYtiT6HrN52mEJPWr tEDTHPDWhgFsDyY7MtgGTMKctExC1pgxWBSegWbS6dxw9sNvAHwklID1f+Pqqgi0FTO1qp EqzTBBDj2jWQjNMurw8dKrQdYoaRlrA6EXbiBMTcCsPWbIKJGMqgEOql/OZVfQCmGcVAyf cw3XDo4lpCYYKlxv/mAGgs0K5UJg85NdYe3VIv+01m8+gCsERSAFuktkeR46p2MK1hiOxc qsl9yfCQgive+R4bj8oWgo83ZCGKNVQzSPfTgWvKreKPEZAM8DmURdLMvBXp1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dF12D0Vb9zkrY for ; Sun, 23 Nov 2025 20:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f7f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 20:36:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 33d15245f9be - stable/15 - param.h: Bump __FreeBSD_version to 1500502 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 33d15245f9be27336035c41fcf7c78ab50f3e6cc Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 20:36:20 +0000 Message-Id: <69237044.2f7f0.508dc090@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=33d15245f9be27336035c41fcf7c78ab50f3e6cc commit 33d15245f9be27336035c41fcf7c78ab50f3e6cc Author: Rick Macklem AuthorDate: 2025-11-23 20:30:48 +0000 Commit: Rick Macklem CommitDate: 2025-11-23 20:33:33 +0000 param.h: Bump __FreeBSD_version to 1500502 Commit f27afc476551 changes the internal KAPI between the NFS modules. As such, all must be recompiled from sources. Bump __FreeBSD_version to 1500502 for this. --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index a4cdc76e0fb2..cb75e316c39e 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -74,7 +74,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500501 +#define __FreeBSD_version 1500502 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sun Nov 23 20:41:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dF18X57G5z6HNjm for ; Sun, 23 Nov 2025 20:41: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dF18X2kh1z3dLW for ; Sun, 23 Nov 2025 20:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763930508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B53eRWGjdMQXAqrO5s/+21akcpPhcV/GYjvT8h1OIYY=; b=iWMUY+8rQ2LMjY184rjJwhVU4IVsLhYlz2GinN9TKWUEJgbuBzcLPGSkCwPPCv6EFukMWf vOZjUq1HE9J8HCK1RJEgRdBuQmvpaeOPsYKbVW1MkN/iJ3A3a0aYidNzLXhAH9dl7ULgei XTqJDasX3mrq+K7HH5kBX1vMM8kePPWGKf304HGjCTl2AAG6yew4xq855Fi7nWUlbclk7D 7VJG+5Rt1l9BKsUoM6gqjzhCo1c3F1OXrTSw3qMmJ0gehw9BkM6RGzaaWc1fxFEQESoz+M wgLFTD5esnOWVepgFs1wR0IfS6ktC0ufrKJTVS6XOHItOlS1C8rBlSolyiix3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763930508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B53eRWGjdMQXAqrO5s/+21akcpPhcV/GYjvT8h1OIYY=; b=LpkzuqbWVDB+KVfhLAoQ7izRbvRmI61jh1o3EJK3PnzvmK2gF0W6R+1POMAB5W1DQ2LaQ6 CZ5gExGpje0piUrmzsYthQKPoGw4EYHgJ0Xz670NrMjDLT/gXWhEBK5FT+Z8hLDxf5/9mR QscGQwoeTmlFvrJPJ+f9IGvU2eTIs4+q8aj7R7G46h3IGDww5S696DqQqkH0Vg8+Hscnrn YN9Q6NIOU5PLDDkpW0FQnXhygAmnW4ZxRMWXQnOzYtlWFTwkFsCbho3Dl+muRUmKQn5LcM bZ086tZSJOGk69/7ALa2nlV7fhpk8xUev1VxEpnVbW8favw/O5QqDDOENkPk/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763930508; a=rsa-sha256; cv=none; b=vXQ8a+5Al3WRlNuN8gALS9FrkjXN5SmyboDJacjJ3q2chkHa3Wu493rtApk64/MkRrFYf+ U2Y+ccw0sgC7m510nrOCJd9i9qTU05GPopDCPQoBoOVCGwMEYICYKiZs+a374hwSl+7lWJ wuM+uy1M388l2q03wfVXAFQ4FLj4BY6B6x2povFDInrYwbOdHcjvOEk1oDxQk/a1PrDdxz 98ULwrdw1oZa7aMc91G7B0+Hjm+feebxzjCX+o4jh/HMOvhUX99JBSzfSusArCATlHlq0W RTlVs3UQ7kylGaY5XMKwP5Wal2SnkNT69cRVQ3jcUmRjBkop7ZUWQR55mCK9Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dF18X2Kg0zkMR for ; Sun, 23 Nov 2025 20:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2fc69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 20:41:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: bac4d3fd6cf8 - stable/15 - UPDATING: Add an entry for f27afc476551 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bac4d3fd6cf8ffd18781c216bc267671803f211c Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 20:41:48 +0000 Message-Id: <6923718c.2fc69.1e102337@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=bac4d3fd6cf8ffd18781c216bc267671803f211c commit bac4d3fd6cf8ffd18781c216bc267671803f211c Author: Rick Macklem AuthorDate: 2025-11-23 20:39:46 +0000 Commit: Rick Macklem CommitDate: 2025-11-23 20:39:46 +0000 UPDATING: Add an entry for f27afc476551 --- UPDATING | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UPDATING b/UPDATING index 2287ff9d8d22..ae28504cdfd3 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,10 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20251123: + Commit f27afc476551 changed the internal KAPI between the NFS + modules. As such. all must be recompiled from sources. + 20251115: The FreeBSD-base repository is now defined in /etc/pkg/FreeBSD.conf, disabled by default. In -CURRENT and -STABLE this points at nightly From nobody Sun Nov 23 21:02:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dF1bz1j4kz6HQPs for ; Sun, 23 Nov 2025 21:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dF1bz0bM9z3lcQ for ; Sun, 23 Nov 2025 21:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763931727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bjMwYbE3ni3Jpeg93LR/ThR8N0dK/ovZAOCAErN1hdo=; b=unR7uKjKcy8+8w9uRaGxDrhpBZCl4sBcGZVaQjTL4DZuyywCUvhGzB1g0eUxsmG+Ri+E7O Dw/BCo3FG7XrLMBc/0jZ0yYrFp6y1rr200lQWdBAv6W80jG50Mn2t9ZgCCNvmznsLztO4N 40nDMHxF3TeQc6HwjXbTuEKaNNFwfDmDghVE8Ragp0OkOk5v1J3sjjimPKpplpdeCMFVuo KO7DE+qvrOLF0yCSCCf+emIIpBNJLYpcA4FXCcZEGOM+gmRW2DnbtGHg/wSWyYxAzz5fhV NWQAREbfjaxgpHutB31TyKhLAeOYcfW7Egb2QtFiv0Bv+wGwQRZTTw/Hyun6Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763931727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bjMwYbE3ni3Jpeg93LR/ThR8N0dK/ovZAOCAErN1hdo=; b=MrOHCQ+EE9IO6G90YyfYqz62gEeXtvuNLmMpzzX8SqqFjsYgGN8s6unfqDVbUDsgpCQ+lb PlZHNOIsDcj0HwlzrwlzDUbjdbC/tgrgj4o4buYbeWNY1xLLmite2WH3vhfWTQL80AHrWU CEguKLn9cAxuTRi/QgqWDJfhk5TklIGb1HYDkXZ3u6ObV2nK8jMMd8ttg2XrPyOM6GHFv6 BZJx3Qg6BsjB53CRt/FB2WtMugtoT+EPkKpw9OME2IvHR5u13MreaOH+JMDFYNl5OXIzov KXHQ17GLI9eKGjFIpGvG0rRVXqohagIZD/m1vbmhxjEraf5adM0TZGuQfXLVqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763931727; a=rsa-sha256; cv=none; b=APsyUbnBRpz4ZD3WKxdQ31mk7OlFUkDB1a1/i6PclU0pC53p8bFCxfdeOIGDMwpFk9pnAQ ugdb2kyxQCoHRq0qij+Xpd1uytbU3MnO9X9hEu1ptK1/jhBB3hK5ChElJdMRdLu6g1/RVF aUtz19A72xYtJUnbkYWq1IC/KlpTao1AvO8OPXnFXS0rdOcPyQC4fsfnY2lSXQuuZdLA+G S0qCwcxZpKG9ip7dwVBKILhz0VRqGg9RUpDx3/xroIlkx9VIroAoh24G2Tmigjp8tFvABU Jt5prchDFXkFQL9CL6PToH2n6gGM4JTdp2vjFPOstp2X1gi5cqAn8pdwa/RhyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dF1bz04m2zlSs for ; Sun, 23 Nov 2025 21:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 325b5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 21:02:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b409b786b8a4 - stable/14 - freebsd-update: Add some diagnositic information for a failure case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b409b786b8a42b05f006dfe7c0ac70923d5fbc70 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 21:02:07 +0000 Message-Id: <6923764f.325b5.21616ba5@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b409b786b8a42b05f006dfe7c0ac70923d5fbc70 commit b409b786b8a42b05f006dfe7c0ac70923d5fbc70 Author: Ed Maste AuthorDate: 2025-08-28 16:04:06 +0000 Commit: Ed Maste CommitDate: 2025-11-23 21:01:48 +0000 freebsd-update: Add some diagnositic information for a failure case Users report freebsd-update failing with "The update metadata index is correctly signed, but failed an integrity check." Add a hint at which of the cases is failing to help track down the issue. PR: 264205 Reviewed by: dch Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52222 (cherry picked from commit af4ba95daf75cf1b1624dd57038cfaa3ed2753e7) (cherry picked from commit d653eca0ef889a8e3fa1e370d2b3ce7b031441a2) --- usr.sbin/freebsd-update/freebsd-update.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index a9bda574713c..cf5f6373a75c 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1349,7 +1349,7 @@ fetch_metadata_index () { fetch_metadata_bogus () { echo echo "The update metadata$1 is correctly signed, but" - echo "failed an integrity check." + echo "failed an integrity check ($2)." echo "Cowardly refusing to proceed any further." return 1 } @@ -1360,7 +1360,7 @@ fetch_metadata_index_merge () { for METAFILE in $@; do if [ `grep -E "^${METAFILE}\|" ${TINDEXHASH} | wc -l` \ -ne 1 ]; then - fetch_metadata_bogus " index" + fetch_metadata_bogus " index" "${METAFILE} count not 1" return 1 fi @@ -1383,7 +1383,7 @@ fetch_metadata_index_merge () { # specifically grepped out of ${TINDEXHASH}. fetch_metadata_index_sanity () { if grep -qvE '^[0-9A-Z.-]+\|[0-9a-f]{64}$' tINDEX.new; then - fetch_metadata_bogus " index" + fetch_metadata_bogus " index" "unexpected entry in tINDEX.new" return 1 fi } @@ -1400,7 +1400,7 @@ fetch_metadata_sanity () { # Check that the first four fields make sense. if gunzip -c < files/$1.gz | grep -qvE "^[a-z]+\|[0-9a-z-]+\|${P}+\|[fdL-]\|"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid initial fields" return 1 fi @@ -1411,28 +1411,28 @@ fetch_metadata_sanity () { # Sanity check entries with type 'f' if grep -E '^f' sanitycheck.tmp | grep -qvE "^f\|${M}\|${H}\|${P}*\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type f entry" return 1 fi # Sanity check entries with type 'd' if grep -E '^d' sanitycheck.tmp | grep -qvE "^d\|${M}\|\|\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type d entry" return 1 fi # Sanity check entries with type 'L' if grep -E '^L' sanitycheck.tmp | grep -qvE "^L\|${M}\|${P}*\|\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type L entry" return 1 fi # Sanity check entries with type '-' if grep -E '^-' sanitycheck.tmp | grep -qvE "^-\|\|\|\|\|\|"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type - entry" return 1 fi