From nobody Mon Nov 17 00:18:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8wwS0pjrz6GYd2 for ; Mon, 17 Nov 2025 05:17:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) (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 4d8wwR4125z3LRL 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-x432.google.com with SMTP id d2e1a72fcca58-7b8d99ad095so3035370b3a.0 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=1763356625; x=1763961425; 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=REntx71QBuuTbZWhoJ0l3rFjy3IB8r/olXkN6KbdPxn5/7eQZZNyWsQ7cCe8peJ6bh Kn5ktcV20XhXKCjNB6X/otThDJR1Mpdo55md0oJtaaWynP1dHDe5Twfo7Evj2xW+D4nD 18MHqF503hCeRMO/W0UgMCxEUWrPpf74LscB4S2bv89q6OPXVw7FIXudrCDWD8ra+add lR3nw/4501nHJW2obPvlhdVJGqIQ8VoaFKZCyg98lxqp1fLmNmbifSUuZPrKwLfGiEMV QhlcU7kA4Ryt0qgqVjbJ2O9k16bZJiPn8in5jVNR4lrQLDVfnOUft0UF9Al+Cib5qoO8 FXuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763356625; x=1763961425; 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=jpon4dOTCvOSn0d7VrWxwmDOsSlPf+QOC3O6jmekvje+yrSZFNRsOppTH3YSSj9iAL dNuU+xzzj7UiobmQmP2Mv1yuXKKcL/maaasWcvzdP1BwKvNnQkFfFoW4gPZ7Mrvl1uhJ SjsYToexpUB61dHk7fOI13/oHVGXjNZwzdW+viVD6W8xZHRxIVNVDHU5rPuosAK9SBV1 WZ7bLZp6xQr70ALo+Tf+LABuNXK+EEwjOLG8Q+tp/35qEPStEahrF1/FyCFpIwI1W39E /BspY4KTZiiXeJgs5GcIfvlLXZX2t1Jf7R6IFlz9zUdHnmsEQlkdZ1W4/zYkozRGiSGv xnMg== X-Forwarded-Encrypted: i=1; AJvYcCX/E6zKIn65WxT4ZVzbrbsD1pG6EKoWdQEd9+GrJkbf4bME9CrCeJMGseXsHNr93vqWwLTMeMlgE/ugU3IHYw/rI3NPGQ==@freebsd.org X-Gm-Message-State: AOJu0YxH/Kbusi2sRputr4LyLrxBqwvEEML0AcUPBpmrlPIUNJHabdn8 U1dFnmNjK/kQCq/4pz3f+oVzp9l1RC2Njscngw4RvmS9Vf2IKHcJy0GWOdnY5VoEaPCfIOKKDop XAmuF/W6F7kVH3pQdcBQNBGGE3ZkqvVhLS+J72D9gMg== X-Gm-Gg: ASbGncuUTRXPk6SMtJcIVwf2I6iwtmHXgxzRN9c4hzGgy5Rn00t6Sx4TNj8SuAZf/jo MXznvay2WsSM/5snBzGHe4vnjA/DojJzgCUrA+dL4Wsmgd6f5sCs9rV/YZBqCjH8geVXZIlancC iSDThqYrkFFsj8GL283q0A4YiTEYlmmsW5ZzAU/wv0RZ4nswx565UkqltLvO/kkemwetFtluKqa jmRhJG+DS+eAVqnlupJXdiW0VBOl0mheyNPr62PHpOh4pbZanPPua8+7keYP41J5efcdiA= 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 4d8wwR4125z3LRL --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8xzy5xJcz6GdSk for ; Mon, 17 Nov 2025 06:05:18 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) (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 4d8xzy1Jwxz3SBk for ; Mon, 17 Nov 2025 06:05:18 +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=sgEVDdUq; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::102d) smtp.mailfrom=wlosh@bsdimp.com Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-3436d6bdce8so4759629a91.3 for ; Sun, 16 Nov 2025 22:05:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1763359516; x=1763964316; 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=sgEVDdUqwqBmdevzSn/lXPvk67iJHvom2KQFdWKGMe2YC3CWeb3Dfet5RXZr39P8WQ bnMc8DLsO9gKztloCZIFJp4+EkDnbiDtR/ptJ835//Q++a59PiRxPLyZXw7WdFe0xmNI u7hpDskxzVPkWJbsIRyGkBvTktVNucFWdnaDDz9JdhdNG+Lit+ckDn297HSyPLSqv28n pccEbBelGFw0aYMP5zvy7N3vmt95bnWdkd3GQthramrQu9JN6HtRegju15brpav0OPKh eY3tkFTvlcEL5sh252Ya5BKqApD9jdyAgA8z5RSRjtq8J9keRo215IE8IoZ65KzRhtEM cnwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763359516; x=1763964316; 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=YXq+bmFbn0NDoch9GDAyBuMf6MJ3AgZcEAl29rHL8Th/JtTqdg4SInqnpAoqzv645Y IvS2c4FSkC1cAdpJwwmSqs6u/dP8Nil8uzfaMKMV1Ip3XFXtlQ3l8xSRvD1fReV+Ix3N ttLHw/OdldbWNpJ7iUbKofGAWhg0KpuEHDQAa38LU+EcBPVU/SjhArbgbmfjRnbaYSpQ p3cJ9SN+ah+lz6HedUJeqKqmqGiH5ov+yVnxWcSC5CNk7/rTVRTkESBul5ncG1Wf57Am IQqUVRJU035zzmIk/nXQViJvgng4+gVlMOVA+DZQepZ73NdUe5hP1XSr5TveVNKKJyLr PA4A== X-Forwarded-Encrypted: i=1; AJvYcCVqoVQ/DKNUwRpU4pytvQob1eyy+Sgt0ika5R/9cAcjTbh+hQDWD5oYiMORwgzld3wo7cEpHASwaaAdSzKKyXgLtayn6A==@freebsd.org X-Gm-Message-State: AOJu0Yzz81S+avOgvxBNzqDHpbwpMX3kAFt2pAgaJkX8wBnEkBUcNk/t M3ApVLg9ht9Gk0dYIExZM+imqXSqSHsmaLJkAsDMQMmf6vnho4h+jhLRTgityujaK5kOhAI37GA De4gc4NfB6PK/sdkA8twUSXjVjZPAdUADPxGHJtRP7thzKpckIvsR7BoFQw== X-Gm-Gg: ASbGnct0+GKllfaWuKIK6F2wHrWoN1sOhHdgZVipPGAG04ZHdz6tko9+q83FCnKu+VP 9zk7pRCz79r5xEUzXadesmCI8D3pXxGsF1BBgjD/jGBeAPRmPgZcZuNiCGZIdO74UmoKGsVOkZ/ 4toyO576N4HBpzaaqcFUwn0+mqqY+F+YbpUJEUvxs/oLXtI3c381zacaIcNfYHCZPw7w+HuYAvs unLUUZ2iLEvE5JGZOv7CHJeApmHy2iIWtKsNFw1NvUtf4582JbKxs3aetwtqBvseUWSOQs= 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:~]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::102d:from]; DMARC_NA(0.00)[bsdimp.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; R_SPF_NA(0.00)[no SPF record]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20230601.gappssmtp.com:+] X-Rspamd-Queue-Id: 4d8xzy1Jwxz3SBk --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 15:14:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 17:00:26 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9FkL21MJz6GfmD for ; Mon, 17 Nov 2025 17:54:34 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (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 4d9FkK0xGxz3m05 for ; Mon, 17 Nov 2025 17:54:33 +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::62e as permitted sender) smtp.mailfrom=garga.bsd@gmail.com Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-29844c68068so45257865ad.2 for ; Mon, 17 Nov 2025 09:54:33 -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=wM7MFXA+y3YJ+CJ7oCCAwoj+5PSQEHZ3aqzDUivOhnUag8cClewyy0bjj3Opg8mXM0 /fqV7UFvkGzC9jJwDgg6aXBfMFJhIgkwFSHqdP5JPGK8Hp3Pw775Stcag7lbVpFdipyn Bm3O72NeqnuGX3NPe/BPSMR3AJ66VoB1SWfl8dCwNuG14JhRMsqvpaMc/Rt7+ZEBiMl9 B4TLpMLsbw8LBrIjAPwTPSUwvxR8MhAeJiw+wgH5eyCgInK3OiVpP/Pf0MYcnWKl4Qp8 aQtQmJ+FbPh86Xl6Qg1yqUqXLzQfzpn+6wYTvRi3QJxI/i/bvGSEQvh4KTyCYLc+qNMD Sqvw== X-Forwarded-Encrypted: i=1; AJvYcCXeZju8kzRME8g7pp5WUBXRmHJZZ8IVyqDFzEeW2ajeAgrlKGgnUS9IXng/CJAnbLE9q2/MScVREwL9JR3t1zCAseRcNQ==@freebsd.org X-Gm-Message-State: AOJu0YwP5k8ew1dYnDnqQjYLgsvErzep5Wxh4Aq6jCyugH4Uxmj0ht0V h0J6p8ck6LfchPT2nFfaoUJZJETcM9f9+O1QzqwOBp8lb2pPrPJNxpwp X-Gm-Gg: ASbGncuqkkRdd/VgPC1lUAtslzXnecwOKqPFNZ/oCa49P260YJ/AeXZutYeI1NaT7WE anwSAwDMu4Kthq0iadYPTtQJuG77XMFQgqgO4jbcdbzYyH+QukZFErlatchLbaIe7MhbH9BGNA7 3z5Z3Ks1/ze/SL2rSsxsZ7tyRNNOsL6LT2rKHxoizQvInMT4wzMCa2t5NPqaiHPSJi6nuq9voHX yPvmuM7JTMkCBVU0bGdAoTLCdOpE4gsYraPoFbJiZOK6m3LUUkyk90uOMqNdVvER6caL6KFh3gA i+OSxLKqpUsORIklUmT7Yio2tC/41CB0SoUYLLxALc0siahh33MpZIOEnP2yqiYfWQu2inAzZQa 4Yx+WEDznkpRXyOO+fu5T5vdpizA7uQX+8W93QW0UCraEaCPpnnt8BzUMFeuKekYv4xV8bpqcnq TZ2oTqsX8Ha+nO3KFQOpwIKvRqcMia7FuMcsmtBYC96KRSma4xtMy2Lq6zfPEcHY+cZVFSLw== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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.01 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.91)[-0.907]; 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]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), DKIM not aligned (relaxed),none]; TAGGED_FROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::62e:from]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[garga@FreeBSD.org,gargabsd@gmail.com]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_FIVE(0.00)[5] X-Rspamd-Queue-Id: 4d9FkK0xGxz3m05 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9H7Z4qYDz6GlWT for ; Mon, 17 Nov 2025 18:58:02 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-oa1-x32.google.com (mail-oa1-x32.google.com [IPv6:2001:4860:4864:20::32]) (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 4d9H7Z18Qyz42KJ 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-x32.google.com with SMTP id 586e51a60fabf-3eae4e590a4so761288fac.1 for ; Mon, 17 Nov 2025 10:58:02 -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=v5DwTvoFVLw8i9OgFIKf3Uk9ZnizqS6muNDQNQy4HYk4ntrkn7+C7N9fXC8exjc1aM aoTMY5t335eB8zh8gQDlXRGndvf3qjtVhYaLGA8Cpx5TVd4Kg72HQytIg1gKjNMUKXr3 dZGGGqoPDkruWfn8GEOqPT/1V/BG31h8Xr71qoMEJ41Cc5+bBYDNETciCrSzwIU8ZxU7 tiv0kY6qJLS70ivUlP1LwN2/n7Lv0VVh06z5773hgaGtv9O4n+Vy+zFUFR+tg7TPatvU db3qgAwSRBiocE2G0jW5nqiB+V35pHhBvo4nNvzyGyT/5bkbQx+LZ7QIktWrcSX3bU9a KhyA== X-Forwarded-Encrypted: i=1; AJvYcCUeSmkAr93Iqs7TYklsoA8LtEth5TZgP442kzIsFL/Znf0LmpFfJyYQByUmmnRyawAzf3nm30KgLDogpd2MBlg2c463Nw==@freebsd.org X-Gm-Message-State: AOJu0YzsqLvuXPrzk/MnJ0JSHh5uri84R+BXb5yFf+UHGQ6OpmcFBAmF 3Bk6TFaVrL6+o059Hc6ON8uGRoAstFNGiiqrD4g6HnIkcSNxaGHJBGt1 X-Gm-Gg: ASbGncs3nyqR7Je637WJqlHyo7R+gQbh9oM6Xay81t/zCXupnj4QGdKc541i8G5y80q DEHLqaev+psG63dtYLzSn0qlWXgQFe4DjUc4X4ZBY7fdSc1w+RRzHGPN9MtAEan+9G4xNgGhC7L kJos7y3RtgErlHpLzRjAz+tb16BN9i7AzbW7+GEblcfk2rCRbZNN4X3xVUHCZDAchtbM3okiaQi RgSdrLeeFuSaU4u5ce2mQnyGXgJlsIY69M0io8amUHe3JtApCAgORAfhA4Dv2JkDW1+9lY8Xwto GZQ/KtOU24O/T9LDWo7H6V0oTFUVsYwEjBpUvwdrJ3Yp6ycLWSPeCieT2dTL34TD0dL9mnJw5F5 w3mpUAQB6qaBOiJOskLSF/IAhgupgQPrV0XQl7USUww1vZNSlSmSDJhIfKxb0sh9GA1WIppw3oi AY47YRipPEJPSNJOzWzVY+H6pL6oQJWgima1CLyDkR6YhvSvS4y2kI0ZYdwnZ8VhRWWyzwgA== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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)[]; ASN(0.00)[asn:15169, ipnet:2001:4860:4864::/48, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4d9H7Z18Qyz42KJ 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 21:17:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 Tue Nov 18 00:19:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 02:18:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 04:45:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9h024SVSz6GsDP for ; Tue, 18 Nov 2025 10: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 4d9h02346gz3SPM for ; Tue, 18 Nov 2025 10: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=1763462274; 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=lHMKoGqPAlurrJiaYH4spyvS+C8le8NVzyTWo1ZUpmOYxG6RkcIvURapd46gnFSGCDN7Pc MRGYD0osZwIS7WYE/uHOaesuMxpBcFF/uexL5LRlgyAjpBb4pCxSCrZu/pf9iDGaCRg7Lp mXJMzMwRqN+OxD8nFor+GVqIIK9D4V2DdWnnqAfk6u85y9sTGTfnhLMBcQDr+s6PPkw0Xj nUd0NlpMXS2eKlMgXfz0FF5TldeHiEIEbllgl2XJv7iKApbRxj7aNfGoJdmL7fLXUZcPx0 3HrXm9CVHTsVZ8yMcaqOOTAUSMfFsLKVZpeLidT48QXyuWllUdqpkDKLL/4/mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763462274; 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=H6erDtuFeE47xDjR6wwtdimaLDHeM3LElbzYW546pAZXIdh+vjY46ZQv0u4RVAVeh8mhSJ 3H6y07pHAsS3Jn6WeGEDE6+JlaENpVb492QRckqLPA0AZ9opx5kEHOb81v7/N9djSZsyWj vFsX05Kn5ecW5OQV8WNSwWMcgPUeX+w+qm1QtyYibQBvXFVO+p33mHjWG1KbvMb0Oe9Lkf J4I1bELPpU4sIqQjY9yLwa5VX12B6zQewXz2n/st7GQG429HZr3dlmmTmoa0Ee2Gq9ZL3L h712jsI2rwPvMyvoeWAOovcpbq5xKQaQo6vIyO8nEmQQOsysA23avP4UYqW9nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763462274; a=rsa-sha256; cv=none; b=AVch3wDg+eHf23MYeIeFWE5ifI/ZmrVZty94altA63vVaeRATpweutTN0ofOsoxI9IqASM qfLKx25kSi+5PlfN+mkiToAypJGpAUA27/O4t6CI2nAqBbHMxhZJ9GS3DywPXD2o8e+EIN LKNA09YkwQ/gaosmjCIZXnMCtOwPzspZI/j+sHcm+I//IcfN3SXiH+avkcY9dPRhf0sV4h hjQd3u7+rXotpAqtWOnyqaq14zNTI5i1SCtUtCi6qVIaloUVMjEqa4tYEbsuDxNOIBSSeP jo21whJsa6gfEIuxxLUoj+Pqlq0u3DsQFZVFpNxCAImT1/n/BvHMgg2A7B6aRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9h022Xk8zr6R for ; Tue, 18 Nov 2025 10:37:54 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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 13:44:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9m7t6r3kz6H9RF 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 4d9m7t49qdz3qrG 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 4d9m7t3J7czx6k 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:52:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:19:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9pDn0nBRz6HJCQ 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 4d9pDm71g5z47gP 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 4d9pDm5zr6z10Tk 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qh75wTPz6HP4w 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 4d9qh754Hvz4J6H 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 4d9qh74cHVz12Bs 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qh91Sj5z6HNnl 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 4d9qh85nHTz4JBP 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 4d9qh85Hvvz11Qx 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhB04Lbz6HNnm 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 4d9qh963mXz4JDk 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 4d9qh95cnnz128m 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhC1fxhz6HNYB 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 4d9qhB6Tqkz4JY8 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 4d9qhB643fz11R0 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhD3lXFz6HP57 for ; Tue, 18 Nov 2025 16:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9qhD0L9hz4JbT for ; Tue, 18 Nov 2025 16: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=1763483084; h=from:from:reply-to:subject:subject: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=S7X3M8g6y76AaePU+WxbSbTTjNYIttiUSBvyWqBaCUoQH+thq/E0YzmXsCePT+h9QaT6iA BGdMbQLCWzbGvYNokeSLaNTSMn3QZmHrauxLFJrAnrPVjZjpzM2aUNUj7ZIs+EHcPZbV/D w/H6uYIzbDYq7CdRQYqcDg79APuXjauE4DZN4+9M6hwGaTgBm8v6ex2G0WrYXRF1kofTRJ O+gOz5uPYMUqP1p65uaW9vDlZWigEbUIjLRUP0TtIV2YLy4xJUffFkHrX1MJvP9guR/hQ1 eclu0gLx5CboCCSErl7DY/wnyzfTUXKjdBB587LQw1p4T7kX2ctBE/a/8d9ZcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483084; h=from:from:reply-to:subject:subject: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=aG5cZAVFGe/4m/oUd+/Uvw3AY8/QsC9A6eXLM/f1TxWXp9xJjUpCtkrjDf21t9c5unpaGn 4GUDU2hyfOs4VcSrHHPtq6bKm9JfjAe7eq8A7SZ38d0O2W9a+X9XS6XW0U9BRWLIMvq2Tt JRAQYr1pBfITbwmXR7G12jq+w1gtB9ddvyFr3Lj3dPHIEHhI4jNctv1CKh8PtrFjl4wKPz pBwOyMy3SKh3eKBZI40qwZZV9mv4oiqveffPwDOAQ1m2ydxoCPIMcV0A0XpdCZrqyqTiGy uVZKSMWnotXKtJf1mhSuj7MhgSZk3+1G9PiBnvfoaFs3JZ9mtF6iZJflOmqBRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763483084; a=rsa-sha256; cv=none; b=u2DSLSLH69IciQ7cAJaBQmKKKkh4wadJMRxwHbk1iwCvrDUIPWAUnpG7gRxen6tQxbRPTU 2Kd/Zs/8ny6mKQSxFHcYy/xgKI+6EWtzfNFVoaKSepK/BBFyjzYvwtg7Q22EXWDq3kdL/p /nNUj1S6RfZpUGmhg1T7Ob2uaCWlvT9TzWwztH8eKsYwQ0+U1yd8H500QB9IRjg8T/cO3u 2wVaXfTGeveI0PjOAgBnM6y2YbFMuAAy48RFNaWaM47n8diXhl/PW+4Ce5Jk5Lo9Z4hP0P 4YHvJ38vzgq4+bH9ZY5T1M+yLwz/Z6MlljY0GhEqs49+PiNKKpFDVLmY/b/6wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhC6pYLz11pN 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 16:24:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhF3RlRz6HNvk 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 4d9qhF1HvRz4J8m 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 4d9qhF0SjZz121v 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhG4hNHz6HP3V 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 4d9qhG20kWz4JWr 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 4d9qhG1JXXz12Ms 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhH4z1Lz6HNnw 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 4d9qhH2c6Yz4JX6 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 4d9qhH27phz11sm 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 18:02:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ss61s7qz6HWXl for ; Tue, 18 Nov 2025 18:02: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 4d9ss55wfXz3Hsd for ; Tue, 18 Nov 2025 18:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488953; h=from:from:reply-to:subject:subject: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=S/2TwacrX3r/w8Udh1kwp/lI87rfDL/kgnB8Gu4Tzhg15JPfP3jK2mQkGoEFXXC+FIRWFD a2sRPxEsfQa0/RgvDBijjXqp+TEhuaqlimgippREDrQcXJLbVv93BnO9c7wHPnvUH33d6O BwzqP58D0GQT3moPLh9khg34UkPFSY66AeqaMbT82YYE4IORqr/lz7yF6PRgNRA6WvuXJM T7BqEWsFGi9Gugjh+FbguiHMnClubPpd6nsvYtQE/X+sjEIftymAOkbBvB4TLEO+C+9fws SOZ54/fELMy70HL06khGSMrS8FIEH7xexNYhJ3vf7l188jUA3k4FcTgEdcu8XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488953; h=from:from:reply-to:subject:subject: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=qfdffQEQu9G3WrciFrBxYCPCtKijve50P84gEx7vx9BNO9e8BgX4IIvuVA9Dz1AALbOD3Y aTXwrra5zvIitDTk7zmO6R4yVsZKbZzchkJ6aJe3RmIxQ0A2lEfg9S6EhqAdFKFOA7y38+ ZcD8F4+UNkn5VP+F/DmPRwBDGpjSaEgDhv1PxnxwrY0DpxB5lH4XX54TL4Tlorw1wFy7IM MyyA83LqHmGisy3CUA4UI8rgx+yh1lDc4bUUnXKx1qq70scSbUzDYwb3KptIrgpPyCi1Dz uoNQXOj76H0Uei9M3GE3kqINcayxJg5Qx5CDuYej4TiCc/vQD8UQuz9HP1b9TA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763488953; a=rsa-sha256; cv=none; b=NihEzEUOeFL9SGfyC2abDTPH09rR1q6PixsAlxNUkK22OOPQzBdIvqGMQJHs1IiZ1HqOlT G4rXEL/biJs6qsewJqhQuzo1P7Sn/hVgw/QVNQaiw+vYZtCqjMfUz9xGrHZ78ZataTxIzN N6/H64tL9La2GUjy+1lmv5HJOwaQOQkr69Z0bqSRadjo+2/NpgWkz7sOOS9SURNphYotot 0N6H3/6PDVLdP0Qji8X1f2Pxy0NM/OUaLZEQ0ULoCb2p7zMFSczMzpw/j0uprMCAaC0BQw E1GZLbheUjSGO6jspFCO4KAblU+7eu5HLKFraWV54ZQCXw27dDIO//0mK3RQ2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9ss55VDgz14r1 for ; Tue, 18 Nov 2025 18:02:33 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ss715Lvz6HWZv 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 4d9ss66lpkz3HWG 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 4d9ss66GWxz14r2 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ss83GNFz6HWcj 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 4d9ss80P0Xz3HQb 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 4d9ss770rLz14r3 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssB30vvz6HWnK 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 4d9ssB1Q4mz3HgT 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 4d9ssB11Wvz14TS 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssC4Q4xz6HWq5 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 4d9ssC1y1kz3Hnr 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 4d9ssC1VsKz14Bd 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssD3ygNz6HWqB 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 4d9ssD2hBXz3J2S 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 4d9ssD2D4Dz14q3 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssG0dGfz6HWsX 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 4d9ssF2zXYz3HpL 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 4d9ssF2XqYz14TV 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssG2x7Rz6HWct 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 4d9ssG0jtXz3HpT 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=Pxkum9abNf43BMqFoL249vi3/pMi+xs+XB5eXl80pxA=; b=T4wiABNH/0HGlBYewQrrMQUzw/yTOVdjOTNjr/yxcYvMMeMZ5ES5Z+QzHq9MBxy1fJtQgW zONVtHgiKm0azVvN7qb4R4J4tsS3BNnlSkej4naXupb+heGFUGqw64VBM9YUpz4ZE6YuIE 8ZrM+7kWFkEr5LjkRREMaUebPaDFoMRpw2lebnS+ln1TWGUTqxYfLPz9PriugN9XOwB+Bw KkjlyKt7ebABDQnYtvvNeNUBoT6uYcMOXw6xossisxdpqA7+i64Qd/o9ra5e+K7SvUBA2p UQF7GPKciyUJGZvqbq4YZVLNCZuDn1RfI51actcSg1MXUAhKDubJ9J6GvTUJgg== 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=Pxkum9abNf43BMqFoL249vi3/pMi+xs+XB5eXl80pxA=; b=BxRJB29AYXords4GvM5PHnnbryhz5KXxxGQT2e/q7GnjeHbzs3VFqkyoP99T1XjUyZVtAS 1MlLpla00hU2EqSbgNAlVPQ9XX7Dek6KGMw7kSgbGYTliq2Q6gkb8rafyU2RWO6W7/QBML ZB17gLCNIsUMfsEK0YuPdfKrZ+RJwn5h2FPKz8rClaTIQU5jAZpl4kcWR64CV1sUlCkNcX nXqd6Qm+DoEhdl9cXRvkqhrPpf7ky4QiwqIZQ9ooQC/CvSo2lltutla/s2RQhPIRmFQURx 1p2arwvJZriDREG191yCV17NLtwVMRvQf8z59Ru/lKEoituf7SYw7/opwiOl6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763488962; a=rsa-sha256; cv=none; b=DYybMUnKCixxDcK5eYTYWFuLhKyKD8rBuQqd0RDDc1RCgda2g/JAuiCtf57llxS1SkMISY W83SQ0MRnxYo4791othPJFCbHRGh4icsBPqdqAGbMGIWiP9eztaywvnmqBkg7lcrFWwBA7 sCl8QvEYrfNvaLe0LEtsKJvmwmO5l1Oxx4f2nneZOVDu29cODSbSToe8JBimpBq7SuXbRM 08Ln6I+vj49F2LKFMcniLcTneBo8bJpuaQh76c04g2mi2an+YBJNJQRZBv/6D8udBqVY2k beNMAPUCfOPR3yn73j8bIKm170eS8KRpSDJPfbSr1HHqnWVmbtFfkk6FIW1Lrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9ss90FJYz14Dc 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9ssG4n0Tz6HWtf 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 4d9ssG3cKYz3Hrc 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 4d9ssG31sSz14TW 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9v2J6SRhz6Hb85 for ; Tue, 18 Nov 2025 18:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9v2J5sllz3VMc 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 4d9v2J5PX0z15xk 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9vhd2RFSz6GPmC 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 4d9vhc6cjjz3ZMg 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=1763493921; h=from:from:reply-to:subject:subject: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=lR0xWrfPXWs9VX5fdU8yKzFK5sOBn2ibh3oiYehfPiqHKoqro+9XE5GEmMFFfcsIEGqrFi uDlW7MRqyDL/riR542Rlee2A58DBYR09m/tKMQ1HLdpyBB/cNw6MK4zJwAvHh60MGhE7YA ZK46Z4cJ+El2udAwaiqeM/XEeWogv69hPKX8Bw7wSGyxwouJAVgueBOoBkWaR87pKbuGSl V36zQ/Uoev8jfx7iRWwLXHSP7tFchDLgVX9fdZJho/cx1WF2jvGrRIlzxaA9WFw3JWpTR+ IQwzhRvlt3wGCc7Qn3UTd89hfSsTlKl5O5qmVVu5nNB3nA1qKf/KSxhMWtVojQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763493921; h=from:from:reply-to:subject:subject: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=HU1iblaUWo3D+NiZNPfkDHEdDKE2vrR5qXEjtWabPo4uVVKXtPBb9LdqDJ25pusZsm9GGq fbKOcp0AOC70kEdwQrL8xKzs99dLvwl2RgetknYn5MIsUQ1o60IHDck/ev1nd7dYxpHvl9 4qsLyJ3K8PfZbJtJCA8XUGpKJiY2zwz7etsWt01SebMe19zkOewPmEQpbdOSUx6enXFC4i QxP8X+u2T4S0fD/oafb8V3q6SnAMld+wILWZM+jg8+zlBAzSoKoF6NLpjBfuKRRgjb1WvS tF/bzawxIalx/J4fT6OLpLMPegR+MwKIJE1SgxmfgF313NNDBeAcveGuntX2JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763493921; a=rsa-sha256; cv=none; b=QGwTKZ/qY1dyDrVnbXoILZCBunnjI6QVbb2jwKnyMcYI79x8jSiPXtFiTLVTukTN2R0qmL NULgd5NW8CRiKXS/5UaonEfDhRH6YmeTMKKIiDe+lvNTzzJuGXmWQZiu50M26n06Z3wGu5 z2p0siEI29/wzZBjKMVWiHznpkEdpS8evr3zCG/p7t33pkrLS8jP04ghHH6rr1AJ4F8ByO 7jAMMF4sayip9VnZtk8kn2KD1Z6fU+VapbROANGSHCd4DbVm6ity9vBAHp7A16JoTAl+4L OAm3zBN9ZRbg3U6nKbtCKSbiJYNUVga9TZCbOiwurV1SneLPc3/O+jLIADDnjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9vhc68ldz16f0 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvP62s2z6GY8s 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 4d9xvP5Hqrz3lYs 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 4d9xvP4Zlkz196v 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvQ6xhXz6GY29 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 4d9xvQ5ZM8z3lc1 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 4d9xvQ5B4Pz19W3 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvS36qyz6GYSK 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 4d9xvR6X7Wz3lJF 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 4d9xvR5y48z198D 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvV3STbz6GYSM 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 4d9xvV1fzXz3lfw 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 4d9xvV0L54z193P 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvT4M4Gz6GYSL 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 4d9xvT0ZWrz3ll8 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 4d9xvS6kFFz18ls 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9xvW665Wz6GYGK 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 4d9xvW1cVsz3llk 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 4d9xvW156Gz19W7 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 Wed Nov 19 01:12:26 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB3P61X7Bz6Gwwc 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 4dB3P60jvtz3J2W 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 4dB3P60GPNz3WC 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB53j4TTwz6H47h 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 4dB53j2MGJz3T3W 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 4dB53j1hddz5vJ 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB53l0Q3Qz6H3xR 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 4dB53k2qYGz3Spy 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 4dB53k2NWxz5hT 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB53m0LgQz6H49x 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 4dB53l3pJSz3SwG 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 4dB53l3CmYz5vL 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 02:27:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB53n3j6Wz6H43j for ; Wed, 19 Nov 2025 02:27: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 4dB53n1flMz3T8Z for ; Wed, 19 Nov 2025 02:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763519253; h=from:from:reply-to:subject:subject: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=n7vNTvajCaGLHFyihW4Edsh1JaNrYaiQYl/SWNd3MoldpSu+C9mx9MHwlz8ciaeRBmYCif e9CxJlCvwJ0TV25/qwqN7ZHbNn4wCj5eu0M3ufov/cu3eYwIF01p07y+2rGjE/qBb4EfV6 TirfxrkYjqHitLbysWExVMKJzd+0oivShrdC6yZjFDx32ULegujjDAdBWMIvzXpJeYEaPI eju6/VurpQKrY6WnWsfoLzaU5azzKDa3kZchK0qBCGFVv0YXIxQgh8KNVJJGe/+aVXpxDs VJoFGpXGn6QaCF9Z21+CvO2tqQhT7RqeGEnPNbQqe68U4bZgRqsFwMixmD2efQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763519253; h=from:from:reply-to:subject:subject: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=GisRH0+4/PJ9mMxeScDjp4M0mxwUPgYGfdUC/7d9dezxqMN4UcAF2+s6hgt2gKNH+Tns9+ nI+U/xXxEefURPr/ei7t6TUMXsRMS9CgJ+1ASqRlu//MB+RY6QT/2ciuD/dEzVEBrYRB7L RjMP32GNVfSXlNgDbul+0jwZSys2ReEO7fMN0TXPTuV00l0ZXfKIM1o7XCD+mAK1Ze5QoS jyb5+Ylhg7h6a43vwvurP0qFuAnIwUUd/RiOJVS4b8BDjvnJOPXIOyoHjXWNA36R/e7C+E BWnuPdmzTlBlqxmF/URgoHcvsXAjA9xNYUGru6rBFxhO4EGwR62Z3VP++VHX4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763519253; a=rsa-sha256; cv=none; b=EQUxHdKp7TrCUfgnIJqfsGb9CwJFzyUgy6hRziMAYRj3PZXbhf4h4b3xBywK5J3S4GGAKS CZbdCg5VAazz54UIjwjd4IEKQJ//4qDfCcnHzDuCAVUpXCN4yFyYIFRzE8one1sTPN+E6u yGuaGjgDWhqXbHB5QigYgcMNaMhoxSRNE6b8avHlTb+f/idBZMaz7e+DBXlmsQkA3JHelh elgsYU4rRde4bp5vNqF0wcXJ5L0fnKo2w3hmhLoapDm6aWdCUkT+ZEeS4CVA3y3Znf4F0J b2Ch6CzEqsS4O1Ff2jiKYZLJe6lQ2UQjqYZnO8GwWEgTvW4lAKMleHvYVWavPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB53n1C7Mz5wn for ; Wed, 19 Nov 2025 02:27:33 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 04:40:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB8155jqsz6HFk7 for ; Wed, 19 Nov 2025 04:40: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 4dB8154y6Jz3l8m for ; Wed, 19 Nov 2025 04:40:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763527225; h=from:from:reply-to:subject:subject: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=m7B7NBkYkKGmfnB2q2sdLfq+zXXq4QolNeLDevEkupiemZFtC9gsGL5Dbydw3txeIzWuLx QGahIDqIf/dNwTnRNLKZcsVYM43er6VwtCKbPUGnZpb6xO+RBCbJLjUKyitDM/9hUCrkBq 29WPzlGtwQBVgvzu2iNDE+BekA2HZNQ47WGN+9saK0g3fHFBs0jKI9cmp67yJtgsQlAu2I 0eP0yZ2l7qMWnyoXwj9qRUis9z3LnEwR+1Ja/QW8egugczf72WnXaSaz6u8EwZkunT94V/ lY8FcwviUoKcNks3priaIfUbP0TR/tW48M4qDqy5tshb3fKREsH4Kk5IBW/4yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763527225; h=from:from:reply-to:subject:subject: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=iq4kZ7AbG/ub1dvBdTBq3Tns1HOQg8vHHVDSI9sPogZWIaLK9QtYdW7xahAztF74N8Pl7/ /so2jnFQeS+esM5OQUzSn0+aptHRpp+LcfxXniEK5BzqGLKjxaZlRTbePEcd6ISDHrN+m8 yEe7x+u/w2pMiU1GgffXo/SZ7o/nVD1vwnzMGMfxgQYVISFO6AQ6ORagCI7X1yjNV0A2LK vOInCVfRmTdsgkb2wab1VVmxKpzrAp1nN5Xi0YQuMy8kAGlueUzkFbknvNED904PYINxGW 4ZJOPwI0CVhD22Kw6PJ08/kd7kv9ABihQywVj0mkD3PETKzrGvJZ+2JNUcoozw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763527225; a=rsa-sha256; cv=none; b=GITQzK2C4/ty+DdXyKgD9pamAySXGuo/q4b7kkv6zFSSBRv7v+BJELz023EefFJO/G0laI N3yMRyHlEu1jNuyQv7uQOtg7hI4oVfJt5QerW87ilo9aylP/3ObcuBudLN3LcLDyDFwGpa 2XH3hk0txGKPfWGJE9P2sV66VWStjSL0SSiTg7A0/jVFGGUMvbPIFcgEPBh/JYumN5LG/Z notHQKvkROQ1zKzO7DzxMkvq7SFwxPKaTTeFKaqK5dzT5Rq4M0g8K1tTEgCDMefVQNFOk2 r5KMtWIQE8XOB1xGJcXNWdmfZG4oR4D4iLIRBh5n62n4y5PCwBF7/9gXjK4ceg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB8154WLmz8ZF for ; Wed, 19 Nov 2025 04:40:25 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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 10:49:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJCQ492Kz6HVv9 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 4dBJCQ1k8qz3MZt 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 4dBJCQ113czdFw 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 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 4dBNJJ4hKCz3tJp 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 4dBNJJ4GmpzjmP 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBNRH0jQ0z6HlQW 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 4dBNRG6sdwz3vR0 for ; Wed, 19 Nov 2025 14:00:26 +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 4dBNRG6P96zjmV 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBNp70zkCz6Hmc1 for ; Wed, 19 Nov 2025 14:16: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 4dBNp659Ftz3wyN 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 4dBNp63ym4zkP2 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBNqR1sTgz6HmNw for ; Wed, 19 Nov 2025 14:17: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 4dBNqQ6SwVz3y35 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 4dBNqQ4yFdzkZF 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBNvh30Ytz6HmsF 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 4dBNvh24Vtz40G9 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 4dBNvh1dxqzkvG 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBNxm6JS5z6Hn0g 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 4dBNxm5fkZz41Pw 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 4dBNxm592gzl4B 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBP2F2JGNz6HmyT 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 4dBP2F1KBtz41fZ 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 4dBP2F0sRLzl4D 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBP2G3nqlz6HnDY 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 4dBP2G2JLXz41lN 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 4dBP2G1f0TzkdF 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBP5f0P26z6HnQr 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 4dBP5d4yb4z42X7 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 4dBP5d3nBYzktg 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBP5f5l43z6HnNy 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 4dBP5f49pXz42KH 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 4dBP5f3nBlzktj 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBP711twdz6HnN2 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 4dBP711NSkz43Yb 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 4dBP710gZXzl8v 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:50:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBSCm5jJlz6HyDN 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 4dBSCm4vdRz3Jf2 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 4dBSCm4T17zpnb 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBSCp1D0Qz6HyB0 for ; Wed, 19 Nov 2025 16:50: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 4dBSCn6L6kz3Jf4 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 4dBSCn5Jkxzpnd 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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 19:56:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBXL95p5rz6JBJ2 for ; Wed, 19 Nov 2025 19:56:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) (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 4dBXL93sHBz3nZs for ; Wed, 19 Nov 2025 19:56:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-343dfb673a8so54738a91.0 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=hlxswzlCQtlqJvDA3+Z/dAeuPu/zMnL40T3m5RI0MLSqxXV7KkfY9tuNZDVepFJ/Uz jD/1GuAaUDmH+v0LdhYfolldyQQtrhk5By2ZBeBilhprhLjAl0z1TGS9ssgrXRLvQDoC j+hmIBeYuDOCKHAN++vciTfu/szQWt4QmJu3QfU1jccdrMNfY00z5cJFevfn9L1wvIdz 6vO7WlSCBIEsxEGnABUYLhsweWX+pbFCvOmsMOmt594D6FL1RFh6A8jdVdEfoF6cxfBK Nw6ZQ+8A+XltETJrXB70cfSZ1jI7I8qrn0HAu+sAWAZ9RoBYgQnJxh2xZUt+OOgO3dqg vu6A== X-Forwarded-Encrypted: i=1; AJvYcCX1A78jxNLBLxVnhlQtel2FsEyIJV+dkeKYpJyg7uEYRyFreQAAw6ZhaguZJq0nvNDjyeNBdptiQcqMcSpu4QqLVozyjg==@freebsd.org X-Gm-Message-State: AOJu0YxHtmSJizac1zUV6GOI8hdPXwt3YdpSlL9RXWwkrx0Bt2egvn2E H5zf9NbqxDsSKjCbNbD3wJpZAu67a9UdsgPLCqBpNxmV35GBuJMmavYBCzDZ1oOPvC64wdiFiNp tm09vA25+RO4IaGqKbR3h+1wi38lmjX2b9CoQn7YFow== X-Gm-Gg: ASbGncsApIiLXUXCRfJIjtGD5X1aeIrv37mLP2IDO4utPYjaCJfjlW5xfxO5R4qgUPJ xih1Xpea5q+zCVyCWAwidsxC+7TJ35sDrWhG6an09rgamnBO5MFMre3K0sa5r+8XucZtgycfo0u ZrIhd3m2sSsSz15XvXvOhP6+926E+L/o9dufONJq49jBt21Lffg/ZQXFYsxP6c75Bjlt+HPsNl1 zqT2gMs7TZ28Og6nRPNeCTNt13S2AkvQYmDQzZUbYbcSN70CjKpMKCNqe3Q8UzxlclIYCTYD7iz G7x57SSxKJFCzP0y6Ww+ITyf2A== 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 4dBXL93sHBz3nZs --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBXYr2f97z6JBwv 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 4dBXYr11YHz3qDY 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 4dBXYr0LW0zvVX 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBY7Q5z6Wz6JDY1 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 4dBY7Q3Kmsz3vpY 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 4dBY7Q2fc8zvfd 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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 22:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBbd83LC0z3P78 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 4dBbd81Y3Mz1080 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBfyt2Wngz6GbKh 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 4dBfyt1bVPz3dT9 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 4dBfyt0hL3z1469 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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 14:37:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC1D22BtYz6HTPG 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 4dC1D20T4Tz3Gtd 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 4dC1D16QdwzW9h 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC2Dn0TXhz6HXX0 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 4dC2Dm6wdGz3PKF 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 4dC2Dm6QpQzXbq 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC2GN2bYNz6HXQh 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 4dC2GN0GlWz3Pjm 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 4dC2GM6v99zXYn 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 16:52:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC4CK3bFQz6Hdqv 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 4dC4CK0R4Mz3YRh 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 4dC4CJ6cFMzbKY 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC4ZM07mjz6HgBv 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 4dC4ZL6SJVz3d3w 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=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=wHryzoy1HGlUrGkelJ7MtGQjlKWLK86iv4gxKKpqT5YVK+L7N4OATdNzgMdZYYbmuNTys3 SumK7L2XP2vTW91yyV4psatyPezo/AfjA3ZZnOyI2y6t2W4YuKY+eYouWhL4ZqvMS2LUhC X3+lbePCdc/gDSn1i9I5PQujGZbIeK7WId39S063gMvkpN1Qd4s9v4Zavlc8yZBlN7nGbI RM8jRpcnUKgkHP6LGPcHYhrv9pOUHRgYHcuT58WStmucmIMAQRMDAaBwDIWH+/u7VES4z0 Wz8wGXgikFgFYBpUg4S0OhMRIlN0bVWL+2hVxNbytPJN8abQxUACFzqvdA5T1A== 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=1763658538; a=rsa-sha256; cv=none; b=yd0/eQYmoF5wnkFvi02RUZWC7Fo/0LqgCM3plDpEy1ZJ/v+2ACfud/t1LlWJcbNMQhyZEc eZOFztBa9ymmJ3aOpXXicYGSv5MmiU9Nc3ILFG3ESQAAvFn+C0DD+feP/VFG7vFRfDkOi6 2+OCpmI5R3d8Bvr+3354ECDfTy85TBS8pwI6z1JAp1+5bfeo/EQGPO9u7iq+Zsngt9iXcK 4yYuMJ2sgOkcD0mWctI78UcL2b8+FaMiTCu1l9AYnMzIaUgRk3biZTcFhXJyGAybpupEAR dd9uHESlMRE4K7GegCsk7QNcgDWi6dUr9gIwYAg2RyBATrxwq/HR8hwK3hxQoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dC4ZL5WW3zbn8 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 03:13:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCKzy0g9mz6GP0Q 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 4dCKzx6qVqz3S3f 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 4dCKzx6Jg8zv6R 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCQK72Gsyz6GfYR 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 4dCQK703lHz3mWV for ; Fri, 21 Nov 2025 06:28:43 +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 4dCQK65wklz11Ql 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCQgM5Yt8z6Ggjk 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 4dCQgM4lcYz3pc6 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 4dCQgM3hq2z11wn 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCQgN66zbz6Gh3W 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 4dCQgN4Q6Nz3pfd 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 4dCQgN3zpCz11ht 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCRG11f3kz6Gjp6 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 4dCRG10zzkz3rmW 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 4dCRG10Rk2z12gD 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCSNw0rpKz6Gn96 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 4dCSNv6rZ1z3wcw 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 4dCSNv69dFz13tx 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:51:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCTTP2M32z6GrKB for ; Fri, 21 Nov 2025 08:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCTTP1Xtmz43Td for ; Fri, 21 Nov 2025 08:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763715065; h=from:from:reply-to:subject:subject: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=lQUksDLxeYRUze9VBmuSeQXulPpn9SftAcFwD7Ur/9f5fenxT8fYyNgKHJBgrVTl85wNK+ nk2NcoyFxznMLrXg6EJjkn24ohbBYf3TFBQWyqdj3KKzlTP4rtOOGAydl8wVpwfWdiTvDZ NvEl6cHSLtJ1XWZgKNRlmYfqnN7B5EQgfYgTQudU+cPXzFmG2+ljdDZExuROnlCHBijvtG ha41pvgzv62kDZPt2sduvylZjodJ3scRktc7huWugcoifQhkX8JIgurIjgMbeiQ+MBe7Y/ tU1h987oKOvXnXhZSz85ElCGFjj/X1f8beskPxAVX0y3rbV0Z59eVy+oaqHf4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763715065; h=from:from:reply-to:subject:subject: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=acoqK6pmf9R3H/YEhmejDrQTwweYsVfaeIsbFA9Rz99luxwkbPI39rl+uBcydOVDR6H+Jo bxzmai2taWEivc7YwAldelr+4G+JnjCB+IrxwS6zpYauvexIFg05O0hYbFXat2dYW+OmTz hL2+Yei3B9u79CcOGQFHs5HeZ2G2uq/v7+wvFbO6xJBZJ4Tx4FP5cFkNQOVlp0x3rwwIIf japGGL39LYfSbgNAyGBk4h9XN0qEiIDTF/EqiGwZJQ7GxR6kSwo7/uoyA8YB0de6edIBxf fXeQX73s8dlv6wpuqqH03QSchbDuxQsQjQCqa7BG6ILSzwTFO7PXU4jiFLBLww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763715065; a=rsa-sha256; cv=none; b=ES8xszUjOs44dxQI6fruIC6J6OtSV1flqUZuXnRgfw4jy+y/VLgw6Pcy/7/tk3so+iqJhg zfVhAr0VOMfC05PAjk0CTH08wlcmy5lPdz1ot/Mi1DZ3gRwLDwuWW29IaATQWblPmlQSrp CLD85fJAP6lbrCbxq0YA3Tldxjmubig8XTRW1/2MX2c6Tf9qsIdjPM8Ws6SJpYZLeTe6cS kWtNxrhLMTxLgfylQE7Dt+kFdhx5yDdayAh7Yc1iNLhEzK8sMjLlJ4ojJq8GC7HlSbqK7b 5vXhf5u0zm3LtOoZ1OKiV/Xq1ANgORlrjdZD60JLDQBfouQAfgWB1w+9mDWeQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCTTP1544z1509 for ; Fri, 21 Nov 2025 08:51:05 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 08:51:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCTTQ3q5qz6Gqr9 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 4dCTTQ2Pb4z43c8 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 4dCTTQ1Qj5z150C 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCTTR4s1fz6GrRs 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 4dCTTR2D0Mz43Rq 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 4dCTTR1mcTz14v3 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 09:10:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCTwH4WpHz6GshJ 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 4dCTwH3qV2z46vq 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 4dCTwH3DFPz153x 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCTzp67SWz6Gswv 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 4dCTzp5JKwz47DW 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 4dCTzp4p6Mz15DD 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCV1D179Qz6Gsxm 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 4dCV1C6841z47xp 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 4dCV1C5jHrz15DF 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCYzN05kvz6H6h1 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 4dCYzM6N2yz3PXy 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=1763727231; h=from:from:reply-to:subject:subject: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=bzjI5eZvXSHjiGmVGBAj6vzGohcAEPjZf7Gb0FZkLztC27baqn9iLmfhEgvsT1ibvzNak3 hTl3GC9IFXtyx1RPapUhy0ZL3+x+V6kU5cs5H9UNOv8YSeZwovkxPs6LLPwDBrHgA6qi4w zf1Ip/0EzNkD2NDPrXQeK/XaYuql+HR1nhw4M60UJNy7ab/G4kiYuFLoeoDTLTB1uILw+k 6gf5wA6b8hzp3HBmD+VaMWVpigfFCfyLzCrFYd4cxF5Mm+wbMB6oL8MT9ET6CjJ3YfC2oD Yt/g4Z5jtEIX0Z4VZHQtoX0TO0/4nFplyllfGXuFd6/rhfYtOUhN1q+lzvnEHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763727231; h=from:from:reply-to:subject:subject: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=VqqlqskNH0QVgQPilzCJUk1hOI9hJSYCr/ubenkpAldIxlPC15bxUeXW1BXuIdAE3Uvnyx 6atcEo36im54uSkA8W0adauDUCW7xW10tEUFareTWRAeW52My/GNxRltUlBiTHMLNWeEGE DJpfGxJuGxw68dSe6CvZJdyjnbnOvGJmyU7DZraW8QF4ktIabcAac5Pf17YxyfpHc8he8z R7kUgzbV5G4V/I+2FyqSZWw0IvFEBEjOx8Vy+92VCIITcHT5Eo7uQpSDk1PrvLCje75uYD PuvN5kOZBdD3gBjzRFQm9myz7Y5walw+mWGsf1D8hxHXePb65DlS1Sq8ynaizw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763727231; a=rsa-sha256; cv=none; b=nzKo62PPgq6vlNcsuPWZZBglo9pzUAfzf7Iy1msJdgLO/0IFJKT9LqsrWWRrC1QK3VHd0+ K2ldVME2kPBFF0IgbqmpNbJx1pb1W5vhp2Oq7vsW6JNtQFy2VCumR/wXC1EcoDXn+kzgBe Hned189ym9xTOQh32cn5hVZxKs2AJMmLXw/m+a6hmoSnefllTL+m3ge+YN5gsw5ew2Hq/C KaVWxBMFVKW5pU6a3WwhRAIAUVggg93DuzCct+uVwvT8xzODgy5AcXLmPbr33qJvqVYLX4 7EFXKuY6F+YFqpOwS+SXbmRXZcegQp9ZrNoxfBrq9Jl5982+DtssRQQ70sCj6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCYzM5wC0z1B93 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCYzP251Mz6H6dW 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 4dCYzN71shz3PK7 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 4dCYzN6brcz1BFr 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCblq1vq4z6HCVw 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 4dCblq171tz3XY3 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 4dCblq0gRvzHJ 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 15:03:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCdkY1wJTz6HKJK 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 4dCdkY0vyMz3ldR 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 4dCdkY0TyXz2f8 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCdkZ4fLkz6HKZ9 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 4dCdkZ1nR4z3m0Z 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 4dCdkZ1Jdhz2bH 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:39:48 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCfY108Lbz6HMyw 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 4dCfY05jwGz3sxT 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 4dCfY04thpz2yK 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCg7z1N8hz6HP5j 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 4dCg7z0fF5z3w0y 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 4dCg7z0F2Jz3W4 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:14:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKZ6WKfz6HQHQ 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 4dCgKZ5N7nz3xwm 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 4dCgKZ4XZhz3H3 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKb6WsPz6HQ80 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 4dCgKb5lhyz3xjc 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 4dCgKb5Hl0z4Dw 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKd3HTdz6HQBX 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 4dCgKc6bd4z3xtj 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=1763741701; h=from:from:reply-to:subject:subject: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=Q6QG65Vc92BoPyOMIK2vjP++la/hhl10cOy8xZgL2QLaDby0BUKluhOs/Ko6NejL0zVUJF 3fPbldrC5jjBJG5UvfYFfBKec4n7cHjxdE5hJjCKSQxCoLEXJgsktGMRR442mls5qHcv1w 1AnrfyHsoLJI+sicNtHq9hhdYIjooi+bD+3AlW+Cw+3BYnuaMyMbNcyc6u1CO9AbyjgEu+ cyeei2++VrLiOpaHVt6OgI8GsSN35ckAxQlvNavTl5PIUgIVllVYRA4iYymZ56Zl6585wI EWjzgwrId+9pSt4Ebj1yy4wWqRr4lr6fF5y6upobpl4foBGkGCDEyCwYNpF34A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741701; h=from:from:reply-to:subject:subject: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=VtOEGd/ztHawSq4ZoU4JiFSNhPhDFo4oKTFUa/pqRPQfjNvCfECkTyb63zYhrMQCLM2Jse IDRP7WZYc6vZMEsu04khrYyce5ciZE5pz4mHOjYx9T9K3Kpga/Oo6NWc+R0EG4Uh6MJI17 PbC+USEDhuyrwC0aPbBmAMc7rUXo7VigOW33q0zYxiAt/76FMqTx+oUXmnVCYrB4ihMfmY TCYH5Q/xO8QWXaGaQTzmrL3rptclqQeBfXaDiiVkVbpVlGx6Of3uYRWI20nlRt2kwU+1dg qBHCiXhBT2UsRGME9OwjEuck0F3b7dWZh7DvwcN3Oxv/Bkt5qnirGpbFrfZPTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741701; a=rsa-sha256; cv=none; b=SfXpWWqjvWrzaRIxrx2+eTd9Wtn/aWMgdjSrvyttY7lr2Mzt1znNgsShZWeLuAqkYEXgMg QLe3rMcFgeunc2bZaDLaOpQxVr1iyrOD0s9o2MWOyJ5hkGsFJcub8Mrf99dddQnN2kVJF5 yT15ADTczxx9UyKurSt7uZRXS2Rd8xqs3zuZr9+Yz4ukZ5ZClKcxeFoSVy995SyGSbqw/V ch/iJdHhLqnw7+oZ8gp0mHRsimddBriLrZ1JiSmYmBnC/SikELSzds9Ce/gv8kjYtLN2ZW LI2dqHriEmSwW34VzG8O3qm3mf5PyYQC/Pas4Du2jPUTsW1hCsDDJG4O+Zu6mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKc66YWz3j6 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKf4H71z6HQFb 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 4dCgKf1C1qz3xpX 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 4dCgKd6xRHz3m1 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKg6cTNz6HQFj for ; Fri, 21 Nov 2025 16:15: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 4dCgKg1tpYz3xvF 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 4dCgKg10T5z4QG 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 17:41:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCjFz1pM4z6HWYw 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 4dCjFz16Q3z3JJp 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 4dCjFz0Vcwz6Vn 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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 20:45:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCnKm5PF7z6HkXR for ; Fri, 21 Nov 2025 20:45:32 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) (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 4dCnKm1sX0z3s7y for ; Fri, 21 Nov 2025 20:45:32 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-94822ad1baeso84633139f.2 for ; Fri, 21 Nov 2025 12:45:32 -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=kizl8TuoP2sZNj7vh8NZO1es+xbDupu6QWsDctEabt3PWEKR3WR78U1kF9pdFeMqSB 4v5DaVv8/ZlH91svXqBvJtula5EoQbAAJOE++bLi59SzYN3EYPWs515zKBzfdx8wAuan KjTfZ5pQDkgbua6WdvvHd16dacTmVT+oglGOQS1vjDH5LPoxcfpnhscN87FOxcrkNzzr TlGynkUYLNufCsJ8/xF1OCGyPJbIzmsFYZzAsJpvSerKYFugFEs4sMksYtsgR8MIxj7K 1YwZLhBJ5XhQau3DYt57YKo88c2hKwcpMvZgkCyHovgfu2QRDhQ2jUYGEJ/x0hMeZKai uSnw== X-Forwarded-Encrypted: i=1; AJvYcCWp/+sjhKtyof3XxPt0mzpwZIkk7xmkN/GnrmzdaRUyyjkYEzWjOJdgtTClpUaJ2+ztKwMpawV9aKRPfE3PqUK3/xO0GA==@freebsd.org X-Gm-Message-State: AOJu0YwM1iDkA0KCj+PTx9dDHDkQD5aXtbDzr7M4igAAIoXduzVptbbi +NntRCpBKPyYMThTwAlPo8TzQRQxF3lqMSs/lukQnsUAQfmeKL9RuVBD7QtNhAl5mE8= X-Gm-Gg: ASbGncvWl1D+roAd56Jlkejyyayty8XLdBeL4DmZQeeuVdbuE4vculj4sxu9jK04KjM OPs7WEjSziHPqU4xxV3nNyOpmXh9csSFsycCLw31l1/vFc9fOQRjDopMJvUp3HywgqyPgfmv7YZ e85amJyAm8oM5H1V/1jl+n5K7lv2M262NovhV7RyXAUzltnY9huY8wweKeU46vCrOuAzvqXAF91 RJGQQu0Prt+Kw4HkmMWaOWJQKbiaoIVkpNh73Kf/E+JqKGx0NVjq28m3Rm5/Jw7HmAjYTPoh1eq LCr6OrourLtHh43/BEMLyhFsqTlChPiVzZgCOPSb2hKKzYkV1zvMk5AHzV132CVjBkU6/qH/0Z2 Rof67oVvAnT6VSCQE4/3xup0zfPzWdelW6OyIoYIkwbfIvIvBspfw0biK/9t/GNl13G2r 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dCnKm1sX0z3s7y --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCnLj2kcSz6HkqS for ; Fri, 21 Nov 2025 20:46:21 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) (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 4dCnLh4fWyz3sgH for ; Fri, 21 Nov 2025 20:46:20 +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::d2e as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-949031532f9so103500239f.0 for ; Fri, 21 Nov 2025 12:46:20 -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=EeIvaUwpH3aI8H67u4T6h8BcPYoMD8SMQ8A8xjB5U3Ed8qvmxT/c4F7T2QKtUBDyK8 mlpexaVk2KuCKKu/ygRvqzuEfxusGkZHPY1mmMdVe+44NwCmBG888Mq08omLtGVHy8li NQ2HzjI3V+5DPeYvbHS6WN9jpFtGBxoMwy0N5k5CAFz7FqgnOpAwug7GSNXeFjBBcxLU RcuK2mRte9Uof57EJ+cIvU824vz6fc0HcyHVvbCKRGMjDLz6PPJlmLjwV2wIVKRNZScZ LdLE7ErTa0iGcdta2mbFe6TmA9tEp//uNib47LV7dJ5FAGnb9EsSx/iKS6tbNddLJ+bv yNhA== X-Forwarded-Encrypted: i=1; AJvYcCWhN/3IFPpOJCLla0BR5j5cTC1SsSyVEd1K9fUSaGIXnYtkW5ZYktBpk/5kZ0mXpZ/i/Bh4JHpCh3MoHL4bZ2wvtyokYg==@freebsd.org X-Gm-Message-State: AOJu0YyG2xBhXY7LVhWn2kulAGqnvhiwOTNvTtfyvXrDEvt++/OSykHC Y5zuJQBpmGOqvhD+sCVZh8Vk0iVU4bq3mugQ61hqJZ2nLt3tQUXqLKE6QzOh6xuoWARxfRoC7ZT d8bSLDyA= X-Gm-Gg: ASbGncvn+EIFR24ri5A2PvP7tR8q3OOShimRSwgUw8RcuWtvHe1DB/P8C2VDgbJcljX p1tH8poPO4/3bLrIsGlHzEr7dtx5rXdm+KbgcIge9KpJT/PNVWDEU21QKDK66rWBkqSLgA0kgyP rZWPdqnXdfJzibHvcwU6d3spUsnL5/sx2FqeYU4+YBS9UXuc1c/rtzyfrXp6ENvktReMTCc/aKO J1Czc3cXcGR0/Z8jvw85p450n0PCx1fptucLaKjFfyINkqZfFbjwvWC8iGpLATx5bvrXBNRP22y FBIEOXq/2ugpT3WLu4RRFiNjaDUJpg25PxjyWxsMpRriqVogmzMWYin9mMCYYdRj3tKXM3FCpiu oGK9Jnp9M73TuTrj24TJZ31N7Atn1OylNTYVphzX2NadnBItdggorINM1XHADghp/qDql 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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]; MID_RHS_NOT_FQDN(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[hardenedbsd.org,none]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MISSING_XM_UA(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; TO_DN_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::d2e:from]; FROM_HAS_DN(0.00)[]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[hardenedbsd.org:+] X-Rspamd-Queue-Id: 4dCnLh4fWyz3sgH --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:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCqz64jF1z6HtRx for ; Fri, 21 Nov 2025 22: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 4dCqz6411Yz46Hf for ; Fri, 21 Nov 2025 22: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=1763765074; h=from:from:reply-to:subject:subject: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+koJZ+qu6kCiuo4PMMTndCfZ9zCcuPuD3DR+HWwJ4E=; b=Y0Ua8KEsVQ6VXi1ostTvbuKH5GTetJCJ7tu7+Q8xx7W3nsFS8nsxH9LqRdTZZhDqkM1ySB eM/WcvuOK8Fqc/cB44StkSjRoesb23XyimnIltuu7dLwu1UIg9OnFLuW5QXRUUUQnxgBWf OC5rKbIhJA/dtyIh6u1ljlOOIQffR/akQChp8pSN8KIkHeMj8SrIZCZ9rl5o5R8yQBaaHV w21izXwB2ywqWNZEOQdmjblSRwI2J97UVGkZQ7bWHyzno+MlWkGczOQCzMgEApgmv3OZK7 DyLgwluN6Vl9fhVVUoDanJq0lWA3/4XIY5JHSt12C2DzqD3wjqv9Hl+FGjXttg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763765074; h=from:from:reply-to:subject:subject: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+koJZ+qu6kCiuo4PMMTndCfZ9zCcuPuD3DR+HWwJ4E=; b=CtUaabfnNgppY8i2wVB4TUpaRbQWo+BBkGy9MkaGosTQ1ljvLnNix7xFD8AywU+0JQhgrR w1HuJDnXJ9TuxxTLga6yy7YtwBU3bcE0ILn3WKboH30RcAy4LD+1MgDJ0KmdbQmXEJmMqA qWHxuelakGX993sURcprnyd6Qnua3tqydSQpz2uReIulwN/aBZQ1oDgdAloTq3f/L6XyUK CQsWLdqC11hGgHlxQ22977Q6BxA3kGzHOalc8D+NkhsM3RQqsUGIxIh3EFpz/PVPCsNwNB DqIsCnExkHtgxxtCEdYk9YQDkQAxQmjPomvfLtJm/CHhpN0o2/yrlBfXHYO3cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763765074; a=rsa-sha256; cv=none; b=LB9yFv/9TyFUDu2fa+t40MzXZM1gGI9Pwi19wDx7xMx5Q6kA7lmWVDcKuQmhv5nQFN6pgx vkXyCbgy/6IifkpKJ9bEgqIIgLIGNakU1vVLz7mo/t6NddHqTcSe7nIAvw0iFI1X1YlIIV 3MXG0gPQmR+h0MUvvqenx9ZTcKaeqNXzJNnzRA0TUs8y1sfsm4J/3ruJ2ghV8DQY/xWZCI AveO5ZcUwAAFg4XhT6waXiuD7SSV04/lPGiV/Hw6eZ9hhw9HFnY5sfGSoMfolCWcM09rXJ 4tJVSZZ7lQzRnVH0MtorbkOpoLzTajwHphbC73490FEovPpQbBHXTZua0l7ExA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCqz63TTwzXgX for ; Fri, 21 Nov 2025 22:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f8f6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 22:44:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 1ea3eda3d016 - main - tests/net: add some bpf(4) tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ea3eda3d016e62434eb9cc3576faa911fd88034 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 22:44:34 +0000 Message-Id: <6920eb52.3f8f6.7c358087@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1ea3eda3d016e62434eb9cc3576faa911fd88034 commit 1ea3eda3d016e62434eb9cc3576faa911fd88034 Author: Gleb Smirnoff AuthorDate: 2025-11-21 22:43:47 +0000 Commit: Gleb Smirnoff CommitDate: 2025-11-21 22:43:47 +0000 tests/net: add some bpf(4) tests A test helper program pcap-test allows to capture, inject and compare. Build a simple test case on top of it. More test cases can be easily constructed. --- tests/sys/net/bpf/Makefile | 4 +- tests/sys/net/bpf/bpf.sh | 61 +++++++++- tests/sys/net/bpf/pcap-test.c | 268 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 330 insertions(+), 3 deletions(-) diff --git a/tests/sys/net/bpf/Makefile b/tests/sys/net/bpf/Makefile index 9c8a25b15d16..641d1aaef676 100644 --- a/tests/sys/net/bpf/Makefile +++ b/tests/sys/net/bpf/Makefile @@ -7,8 +7,10 @@ BINDIR= ${TESTSDIR} LIBADD+= nv -PROGS= bpf_multi_read +PROGS= bpf_multi_read pcap-test LIBADD.bpf_multi_read+= pcap +CFLAGS.pcap-test.c+= -Wno-cast-align +LIBADD.pcap-test+= pcap ATF_TESTS_SH= bpf diff --git a/tests/sys/net/bpf/bpf.sh b/tests/sys/net/bpf/bpf.sh index 2830c4862de9..f2d647b61de0 100644 --- a/tests/sys/net/bpf/bpf.sh +++ b/tests/sys/net/bpf/bpf.sh @@ -32,7 +32,6 @@ multi_read_head() atf_set descr 'Test multiple readers on /dev/bpf' atf_set require.user root } - multi_read_body() { vnet_init @@ -55,13 +54,71 @@ multi_read_body() # Now let this run for 10 seconds sleep 10 } - multi_read_cleanup() { vnet_cleanup } +atf_test_case "inject" "cleanup" +inject_head() +{ + atf_set descr 'Catch packets, re-inject and check' + atf_set require.user root +} +inject_body() +{ + vnet_init + + epair=$(vnet_mkepair) + ifconfig ${epair}a inet 192.0.2.1/24 up + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b inet 192.0.2.2/24 up + + in=$(pwd)/$(mktemp in.pcap.XXXXXXXXXX) + in2=$(pwd)/$(mktemp in2.pcap.XXXXXXXXXX) + out=$(pwd)/$(mktemp out.pcap.XXXXXXXXXX) + + # write dump on jail side, with "in" direction + jexec alcatraz $(atf_get_srcdir)/pcap-test \ + capture epair0b $in 3 in > out & pid=$! + while ! jexec alcatraz netstat -B | grep -q epair0b.*pcap-test; do + sleep 0.01; + done + atf_check -s exit:0 -o ignore ping -c 3 -i 0.1 192.0.2.2 + atf_check -s exit:0 sh -c "wait $pid; exit $?" + atf_check -s exit:0 -o empty cat out + + # inject dump on host side, recording on both sides + jexec alcatraz $(atf_get_srcdir)/pcap-test \ + capture epair0b $in2 3 in > jout & jpid=$! + while ! jexec alcatraz netstat -B | grep -q epair0b.*pcap-test; do + sleep 0.01; + done + $(atf_get_srcdir)/pcap-test \ + capture epair0a $out 3 out > hout & hpid=$! + while ! netstat -B | grep -q epair0a.*pcap-test; do + sleep 0.01; + done + atf_check -s exit:0 -o empty -e empty $(atf_get_srcdir)/pcap-test \ + inject epair0a $in 3 + atf_check -s exit:0 sh -c "wait $jpid; exit $?" + atf_check -s exit:0 -o empty cat jout + atf_check -s exit:0 sh -c "wait $hpid; exit $?" + atf_check -s exit:0 -o empty cat hout + + # all 3 dumps should be equal + atf_check -s exit:0 -o empty -e empty $(atf_get_srcdir)/pcap-test \ + compare $in $out + atf_check -s exit:0 -o empty -e empty $(atf_get_srcdir)/pcap-test \ + compare $in $in2 +} +inject_cleanup() +{ + vnet_cleanup +} + atf_init_test_cases() { atf_add_test_case "multi_read" + atf_add_test_case "inject" } diff --git a/tests/sys/net/bpf/pcap-test.c b/tests/sys/net/bpf/pcap-test.c new file mode 100644 index 000000000000..9d01548f7aae --- /dev/null +++ b/tests/sys/net/bpf/pcap-test.c @@ -0,0 +1,268 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Gleb Smirnoff + * + * 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 + +static int +strtolerr(const char *s) +{ + int rv; + + if ((rv = (int)strtol(s, NULL, 10)) < 1) + errx(1, "bad count %s", s); + return (rv); +} + +static pcap_direction_t +strtodir(const char *s) +{ + static const struct dirstr { + const char *str; + pcap_direction_t dir; + } dirs[] = { + { "in", PCAP_D_IN }, + { "out", PCAP_D_OUT }, + { "both", PCAP_D_INOUT }, + { "inout", PCAP_D_INOUT }, + }; + + for (u_int i = 0; i < nitems(dirs); i++) + if (strcasecmp(s, dirs[i].str) == 0) + return (dirs[i].dir); + errx(1, "bad directions %s", s); +} + +static char errbuf[PCAP_ERRBUF_SIZE]; + +static pcap_t * +pcap_open(const char *name, pcap_direction_t dir) +{ + pcap_t *p; + + if ((p = pcap_create(name, errbuf)) == NULL) + errx(1, "pcap_create: %s", errbuf); + if (pcap_set_timeout(p, 10) != 0) + errx(1, "pcap_set_timeout: %s", pcap_geterr(p)); + if (pcap_activate(p) != 0) + errx(1, "pcap_activate: %s", errbuf); + if (pcap_setdirection(p, dir) != 0) + errx(1, "pcap_setdirection: %s", pcap_geterr(p)); + return (p); +} + +#if 0 +/* + * Deal with the FreeBSD writer only optimization hack in bpf(4). + * Needed only when net.bpf.optimize_writers=1. + */ +static pcap_t * +pcap_rwopen(const char *name, pcap_direction_t dir) +{ + pcap_t *p; + struct bpf_program fp; + + p = pcap_open(name, dir); + if (pcap_compile(p, &fp, "", 0, PCAP_NETMASK_UNKNOWN) != 0) + errx(1, "pcap_compile: %s", pcap_geterr(p)); + if (pcap_setfilter(p, &fp) != 0) + errx(1, "pcap_setfilter: %s", pcap_geterr(p)); + pcap_freecode(&fp); + return (p); +} +#endif + +static void +list(int argc __unused, char *argv[] __unused) +{ + pcap_if_t *all, *p; + + if (pcap_findalldevs(&all, errbuf) != 0) + errx(1, "pcap_findalldevs: %s", errbuf); + for (p = all; p != NULL; p = p->next) + printf("%s ", p->name); + printf("\n"); + pcap_freealldevs(all); +} + +/* args: tap file count direction */ +static void +capture(int argc __unused, char *argv[]) +{ + pcap_t *p; + pcap_dumper_t *d; + pcap_direction_t dir; + int cnt; + + cnt = strtolerr(argv[2]); + dir = strtodir(argv[3]); + p = pcap_open(argv[0], dir); + + if ((d = pcap_dump_open(p, argv[1])) == NULL) + errx(1, "pcap_dump_open: %s", pcap_geterr(p)); + + if (pcap_loop(p, cnt, pcap_dump, (u_char *)d) != 0) + errx(1, "pcap_loop: %s", pcap_geterr(p)); + pcap_dump_close(d); +} + +static void +inject_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *bytes) +{ + pcap_t *p = (pcap_t *)user; + + if (h->caplen != h->len) + errx(1, "incomplete packet %u of %u", h->caplen, h->len); + + if (pcap_inject(p, bytes, h->caplen) != (int)h->caplen) + errx(1, "pcap_inject: %s", errbuf); +} + +/* args: tap file count */ +static void +inject(int argc __unused, char *argv[]) +{ + pcap_t *p, *d; + int cnt; + + cnt = strtolerr(argv[2]); + p = pcap_open(argv[0], PCAP_D_INOUT); + + if ((d = pcap_open_offline(argv[1], errbuf)) == NULL) + errx(1, "pcap_open_offline: %s", errbuf); + if (pcap_loop(d, cnt, inject_packet, (u_char *)p) != 0) + errx(1, "pcap_loop: %s", pcap_geterr(p)); + pcap_close(p); + pcap_close(d); +} + +struct packet { + STAILQ_ENTRY(packet) next; + const void *data; + u_int caplen; + u_int len; +}; +STAILQ_HEAD(plist, packet); + +static void +store_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *bytes) +{ + struct plist *list = (struct plist *)user; + struct packet *p; + + p = malloc(sizeof(*p)); + p->data = bytes; + p->caplen = h->caplen; + p->len = h->len; + STAILQ_INSERT_TAIL(list, p, next); +} + +/* args: file1 file2 */ +static void +compare(int argc __unused, char *argv[]) +{ + pcap_t *f1, *f2; + struct plist + list1 = STAILQ_HEAD_INITIALIZER(list1), + list2 = STAILQ_HEAD_INITIALIZER(list2); + struct packet *p1, *p2; + u_int cnt; + + if ((f1 = pcap_open_offline(argv[0], errbuf)) == NULL) + errx(1, "pcap_open_offline: %s", errbuf); + if (pcap_loop(f1, 0, store_packet, (u_char *)&list1) != 0) + errx(1, "pcap_loop: %s", pcap_geterr(f1)); + if ((f2 = pcap_open_offline(argv[1], errbuf)) == NULL) + errx(1, "pcap_open_offline: %s", errbuf); + if (pcap_loop(f2, 0, store_packet, (u_char *)&list2) != 0) + errx(1, "pcap_loop: %s", pcap_geterr(f2)); + + for (p1 = STAILQ_FIRST(&list1), p2 = STAILQ_FIRST(&list2), cnt = 1; + p1 != NULL && p2 != NULL; + p1 = STAILQ_NEXT(p1, next), p2 = STAILQ_NEXT(p2, next), cnt++) { + if (p1->len != p2->len) + errx(1, "packet #%u length %u != %u", + cnt, p1->len, p2->len); + if (p1->caplen != p2->caplen) + errx(1, "packet #%u capture length %u != %u", + cnt, p1->caplen, p2->caplen); + if (memcmp(p1->data, p2->data, p1->caplen) != 0) + errx(1, "packet #%u payload different", cnt); + } + if (p1 != NULL || p2 != NULL) + errx(1, "packet count different"); + + pcap_close(f1); + pcap_close(f2); +} + +static const struct cmd { + const char *cmd; + void (*func)(int, char **); + u_int argc; +} cmds[] = { + { .cmd = "list", .func = list, .argc = 0 }, + { .cmd = "inject", .func = inject, .argc = 3 }, + { .cmd = "capture", .func = capture,.argc = 4 }, + { .cmd = "compare", .func = compare,.argc = 2 }, +}; + +int +main(int argc, char *argv[]) +{ + + if (argc < 2) { + fprintf(stderr, "Usage: %s ", argv[0]); + for (u_int i = 0; i < nitems(cmds); i++) + fprintf(stderr, "%s%s", cmds[i].cmd, + i != nitems(cmds) - 1 ? "|" : "\n"); + exit(1); + } + + for (u_int i = 0; i < nitems(cmds); i++) + if (strcasecmp(argv[1], cmds[i].cmd) == 0) { + argc -= 2; + argv += 2; + if (argc < (int)cmds[i].argc) + errx(1, "%s takes %u args", + cmds[i].cmd, cmds[i].argc); + cmds[i].func(argc, argv); + return (0); + } + + warnx("Unknown command %s\n", argv[1]); + return (1); +} From nobody Fri Nov 21 22:44:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCqz76czcz6HtQ0 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 4dCqz74fSVz46My 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 4dCqz74FZ8zXmH 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCqz91hXXz6HtVQ 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 4dCqz904Bxz45vk 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=tWVkSy2pzLQpRjEnHJifiy9YHxjf78Bs8p6mVSzC63g=; b=osLQ44L069oq+qWPGGQ+UVASIMu6KLHyIVU7cuyclfmyminz/9bz1CjUFRXO5A66U/NRVy TOKLVP4bfr6rGpUJ8x0Hv7tNl7ruYWPBS+aPpY319HKlxQFIMrpWJYtXbt0uvF0ZWELET0 gwOmB3WYEbSpdk31GminGJTuo32koco6zw8dERIbQDY5UMEm84oQXNz06m78pV6pxtmNVF 5jXJ3EI1MhKj97WCOg4ZhtzkDiQUjhV9sIyzJ12D9/xjb+icdeRKf7xRqlSXvDZ0fyuOBd HynuTxlX2O6acpk1DA1TrTX7Fb/fWyUCXG7dB7Pi8phej684tQQnn7i+R9zy3g== 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=tWVkSy2pzLQpRjEnHJifiy9YHxjf78Bs8p6mVSzC63g=; b=EXd8EtW0Qza/zc/ee+gQmYxNGfH5PxOISw0+4fUxBbemwV3wc1jGiT0rVwt5MRRM7dz01n epMo3pfvIS3KIU0aFXqV6cE3x2+cndosTAAaVAmammLRzV8ashtF3Yjj4bmENDoibxV9W6 PsiQeKrsKDHQ+q9fOQZrSgMGcCboq7oGBknwEBDTxCR8oDU1qZ206X1vMWXpH8eCx9mhMd 6a5be1FXS/5eM4B/cShTMoojHkbHysKH8X1p6r89uGJUfYWpq6bYxqNdP9rkIG9bN+VZgT ELn4jGyd5ww1WHmwEP4loeQ63yB0UpCnAcCpHoYG+mDT7zMy1dbVf0YzvZyS3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763765077; a=rsa-sha256; cv=none; b=cV6LY9UY/ZVIWAMv34T1fPuyUDiwZiDjQElfLdamOCcWxjtNiXJ7FDYW0bAXhslnW6llJE 4OAxefgafCxPqzcUt7K1C8eCYnhYWn01s8gRfSHYLDbwyjyPm+8niS2BmOGZbWNIofYq9Q tbsUkRONy0oWTJNXk59hI8kvAUbpvxF20Fz8yMrywEXdQipfya7t1NyEKAIA4UeBiuLTbo mpJ7zGcuaATd9KvC9biofOxrzoIbG0SttXzO4W0K5sQZ4r9f1b5qKD7LfMK9b8NlYt5cYB a+gF20lff8sFyEwDrEZuZ+6P2l/4/2+inpYTJnVTS4xf+zRXtywo2iXoCGd5qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCqz854HwzXmJ 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCqzB1mCwz6Ht5s 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 4dCqz96McNz46NC 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 4dCqz95q7SzXV4 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCqzC2Wrrz6HtBs 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 4dCqzB6tjrz46Kt 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 4dCqzB6DcMzWq1 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCr8M607Zz6Htyn 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 4dCr8M4kfxz49Rk 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 4dCr8M4HJvzXcM 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCsWY5M7gz6Hyn9 for ; Fri, 21 Nov 2025 23:54:17 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 4dCsWY3NwDz4HxB 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-x131.google.com with SMTP id e9e14a558f8ab-43321629a25so10610335ab.3 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=p/V1EmXA9MpyOppennB2FxfgUad1gEb58W2dEus1flfyU383vD8UIymhK9KwlGfOk5 qNOnAHc0NBv/yzyD4gZDzVvR7VjvFRr8HMImbUo9ezj1DWJvPyF+tdatVGEbU1fUBtWR PwVPJeGMv0IJubRZ1l9YxuHK4sht9AADx2YNbB4rb4vex2oLR8bfAIdid6lxPlsfTWft pJiZUWAdrQzjjUB2Nu718NWyEmx94HVDj3yhomnHK1mZEo2VD8QLbrixwmRBTy5IyIPq 9WOy1hnYVBydJWOBsETBoCxkNtW0keIoKVT1TXQC5AWXpSLbo/HhO1mBthEfL4IoiHah 3f1w== X-Forwarded-Encrypted: i=1; AJvYcCUtskVEJmy4hpiUlPZdZGxLM58MKT2Srq2uT6k6YTP/D2n/WJZXphqDUwzWD62qChvyg4ZW1Ik/gzyD3fbm88hXugIuoQ==@freebsd.org X-Gm-Message-State: AOJu0YyVsfyyHvbm+HNxFArtOgnIpDyhy7L32EU5D1ohu3blGhl7NE3u zrQVYoabWgFANde6jxkjnDmJdm7NWqd2aioT9KB2lCyvhfFI3EP0yS9eZnlgOS4qW7s= X-Gm-Gg: ASbGncs2svP5wWBSc6vwTVEcLif6u9dquyE3CA+pG6KoiWDFSkY82/AzwpClB0ndTVq UcQDIBZhvMrVABgxElU2fRsqKCRI8lm1yxhR7bObG5gR7DeDkOUSYLzZZzDcH5WSe1ozkbJMkzQ oG/Y9Wt0CqDQnjES3WBcEW1zNBFi8Jwv+GsmoNHBGHQ9O1+eBk7iw0MViXIk5ijpbHIB2V+SADI t0BxdL3tJcWEsJCC8ZTM287KmFZJf2GUXFHTik+LjswZhPrxX8UYkD0Fk0lCkcm4qHitaEPyTnT eqjpjKaPc4OLmracJt1pr7q8l+qDNb0lNNlIChjrYiCmYgCLrE/PoAdwgfOLJVnxrmh8nG+LwKJ 1wGwpZ9PaqzOK33sk3kYKoZ4MVFdG9/ixqAWpHfsDJFeakQzcPnGW+bcIfmWKrdydTWk+HwrN0R nVpns= 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 4dCsWY3NwDz4HxB --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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCsq45GKXz6J0Qn 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 4dCsq44gzYz4KnJ 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 4dCsq43dKtzbJs 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:22:24 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD6755hPXz6Gkc0 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 4dD6743Syvz49LW 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 4dD67433BDzsNc 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD67608NYz6GkBW 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 4dD6754HJZz49FT 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 4dD6753tMmzsF0 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:20:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8kn0G2Cz6GvfB 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 4dD8km758rz3P5t for ; Sat, 22 Nov 2025 11:20:00 +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 4dD8km6MXXzvlN 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:26:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8tF3T6hz6GwWy 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 4dD8tF3B6tz3QWp 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 4dD8tF1y19zwTV 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:28:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8wZ2ScNz6GwZ4 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 4dD8wZ1BwSz3Rh5 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 4dD8wZ0kP5zwmZ 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8xD4BsYz6GwZC 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 4dD8xD3dxqz3SG0 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 4dD8xD30djzwmc 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD8y81LD9z6GwjD 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 4dD8y80grCz3T7r 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 4dD8y80FD5zwYZ 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD9v20G78z6H0mS 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 4dD9v16m09z3bSb 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=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=b7MD0qM5JVWZsOLq3vYifYjDwyA6RlivnjQf8/ls/fp+0n9Nx+XQVjaHIM4qHcTf9ScsIR 282Xi5i1JxEDp0iP0DjgJvRZxBYPeh8IxepN75nkJWSS9m+wVrr3i37m1y0QA6y3GJP5GP iXs6PvDLPwaFSAGiHyiv+tdikIy7joDWlNKCV/4ThWn6XdrC7IrA9ELBOfsl6nCHTAw+Is SoMzdcTJn1yXA2SPlcOuStW10PYYshpWXMRNTrayVJhqGpr6Br6FNgrKDCZ/DXjeSKBDQm jIJ+jJrDbm1U8GX9NluVmdfxgY8IoC4rCT5TKoMjkuVxbOvK3hn3Oe30M6MeHQ== 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=1763813534; a=rsa-sha256; cv=none; b=q/PyAr+WX7blmV17kDfqslZIaOjecbbq/YYHjgK1eGTPLtnjC+RbnjRAEZDX5ElGL3SfiT oDc7oIVNz409wFusiTnRf5QSaGLkaHa7qlQG4XUd5yiAv4NdECjW/GDLmU5LSJhPZtqOsS AeM0/LUA9rr1QGILqB3x/MjkJDJ5i5ASGg05MA1y1myOaOQkivpxWjXN7nh9csMxnYk6aN i0J3SoyH+L2JcwV3iFOBUbncD8jCoHHN4Sf8I4EIbH8WzLhIsY2ZBX/9VnbgnFOZnMwEST rd/r6ECP+OJvI9Q/Ua/JwYfqFXupnoU9xtSZt2zaHDFSqbArpetYJ6zNLK6VDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD9v168lTzxmP 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDCBS74mDz6H64F 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 4dDCBS4Khyz3qJ2 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 4dDCBS3jmRzyPv 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDyz40Wrz6HDRr for ; Sat, 22 Nov 2025 14:30: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 4dDDyz3Wxgz40lK for ; Sat, 22 Nov 2025 14:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821851; h=from:from:reply-to:subject:subject: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=qGFUs5cuzcYBQtoVCvbfVcDQXlxVZFqaaoc1vSK0dQXTOy9uDV4WDqwhoiI/V6Q1gZshl2 ZjTOFr7mIBTA0kJcetBvletFCxKbRfH7AvAbGp3xve/YWczDPFI+VXC+0mA99xv4G4Fwbx IVRlZp/5FzlXbUrwmh9u5AI+H72WrNogZpXoawd2RmuqE0YGsMrVIbjIL9aC6ihAqcSKeB xtvju8tHWBM6+ALgawnsU3mf0Sy9BxT8V/62pqh5fzSyo5X9vCh2brUJnO0QgKzbf+ygbR bmNBC7jTT9UxKgO4fyG4tB0KL0Q6Fc5taFCMxm8uDjip6zruhtTS7kG/0vCKew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821851; h=from:from:reply-to:subject:subject: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=WQDbI6EGUXyQLY99p5HeU/RYHRmb17xuzF7sTDn1w+GXMTtgXVz84p44ePqkvTTFIOP/7J N4VR8cgEI9d/5PneKnPBSoJKeYl7o8r1kg/N44C5DEG9HGOBse5C9pZg5tzKPW4SjSziu0 SUmxvCD0FwlVMHO39KOQdvWF3cPS4i41WFhg5AoofTfN+yYVltjdl7nfiS4NWFDVM8fxJR hmxyprtcd+xOfsFUtQnPbMptv1bs0+oFO2bYqn0D/2KLlwcyKgUsfwuv6RKyLlCMVPpDxB RkmgXtZ/DC/K544ad4cA+lDUMZ1IXjH37mfM61xgGNM7BpKfodqwOGbd86OpjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821851; a=rsa-sha256; cv=none; b=x9wP0TxjRlPbpjI+rY1mn1CGvX1nxU6dhMiH3qfQAkz7MYqiWV6PI2uIIBRV7NgnvC6ksv WXlXNarpkx4huW7dvszq7PfR8sx5y3D/xW1IYaEFS6v+wc5Tv0blNn76TOivwx00OnKSDz s1Fu3GUywizdQ+quelEOsLAJgvUElSBDUHD4J96iOQIkQa7CG+1BMJhCk0afGjn4KZST96 6iKxkFHba7nxf9k6ghL4sXm9tlTnR1dXOoLKtWLUg9j68JoAIsiP+c8WsNkG+TVUFydb0E rs4lwhMVU0sk2q+ZvMu9rcDzznO0R2gEZyUHF1uwnuhnh2k/DVABHoU0P8HYCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDyz36TJz11ss for ; Sat, 22 Nov 2025 14:30:51 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz05Pgtz6HDPX 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 4dDDz04P60z40VP 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 4dDDz03yJPz12FC 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz16nbtz6HDGc for ; Sat, 22 Nov 2025 14:30: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 4dDDz14lK1z40VX 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 4dDDz14KbXz12Hv 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz30WwGz6HDBC 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 4dDDz25rXGz40lb 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=1763821854; h=from:from:reply-to:subject:subject: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=rt9Dm+dmNtWYafThy7aa6gP+tBo32o+ZI24agoWzGSFMFYLghaklTA/OIG6iRnanKKSsFQ R9XQznjHMuu72wKzJhOAjts55dLpmbZyoEh+cIjKWvkvpJyKlnkLyA4rshXyXlgp0JGsh4 lZnJt9FJaM1gg8XXFmziX8IWOHTScp4tycqJmPtctNSAyNiLlFyZ0o2C1uonlkFI4A6y5I kBPB0VM3Hjs6DE1R1UBXEC2k5/tZPoVnCXXjaTbcvjiPwv4uU6CfUzTiAz9YvBEXzsaMO/ 2Q1LpHZR7Ea3ptEHvbArlRLidoA8xbF0wK84Zygwe3LHEwCRmIUzfz4drVBpmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821854; h=from:from:reply-to:subject:subject: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=E3/BNwZs4dfV5Q1VP8+yBKlXikAdAyFkeRWwaJTBNUTzD1911Z/ig2KyHVAlR6GHlvM836 IMJhpJaY9Pkw4CmN5nuIuFuLaQArDKCE48ARsB2n83yb28PQJaEv3GLGxn/iUNmzMiseem TzMh2dhth0930zx/mO4FBDQAUsv621BBQ5XhX9gWlTUjzaqy0nTT3GFf75RA3nfOKQyEqd l2qXxHHZmungv6PL/1CIRBBj8feAh+gkbIE8G2LEwF/VsU+h5EhskXjtUWCv0sw/T4WhdY dF6aLB8NhJdGHMzJcq/3PqAZFCzmtgPWAubqGKvxKWYNwUiGq90sKSLYGyqgSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821854; a=rsa-sha256; cv=none; b=t00Sok2AH2ErrXIQYl/UtuxDCjZLE+4p+on4Y41njrei7YvrRvQrJVxpRKYzNoGpZ9fStX OuhCbsfTyD+buv65OVkO/ybGqSgmHUlyRtlmXg6vvPoXd7S8oOshL6jqTq1PLOGDNAekDW 50fdyRwg9bqEwK41yzUXot9srvXir03/BjRPzvos6MUS/9BYurYvgYWu88A5qFH6yw+x0Q tcfoa0yoZ+hO9uLhzY8/A/4aIJFbvMLaszMZeOXSHVPneCyIKkF3re9XbOmH8A5C8ohkYu 61GO/S43EktuhKJjQ1iNvVu3GKQKzmiUtXovD2MMaH6yUW/42agBmWSh2x5hRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz258npz12Hw 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz425lBz6HDGd 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 4dDDz36SSqz40lm 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 4dDDz35zt9z12CN 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:56 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz54b4nz6HDSB 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 4dDDz50Fhhz40m5 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 4dDDz46my7z12Tc 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz75LZgz6HDV3 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 4dDDz71WWXz40kG 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 4dDDz714JZz128V 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:30:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz6322fz6HDMC 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 4dDDz616cDz40xj 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 4dDDz60FHKz12NH 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:31:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz83wlKz6HDBR 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 4dDDz82N4sz40kY 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 4dDDz81vQBz11sx 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDz96Mlwz6HDKR 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 4dDDz93Ngcz40sS 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 4dDDz92k3pz12Td 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDzC2Xgrz6HDjN for ; Sat, 22 Nov 2025 14:31: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 4dDDzB4fvkz40r7 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 4dDDzB3Ynfz11t0 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDzD0NLHz6HDSc 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 4dDDzC4j0hz40st 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 4dDDzC40J0z11t1 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:04 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDzF1Wy6z6HDMT 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 4dDDzD5HCgz4169 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 4dDDzD4qpyz12Th 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:31:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDDzG4XK4z6HDkm 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 4dDDzF6Mkxz414F 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 4dDDzF5fC3z12J0 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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 15:14:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDFxs5Bqqz6HJ5K for ; Sat, 22 Nov 2025 15:14:57 +0000 (UTC) (envelope-from gkontos.mail@gmail.com) Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) (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 4dDFxr5wrbz3DNN for ; Sat, 22 Nov 2025 15:14:56 +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::433 as permitted sender) smtp.mailfrom=gkontos.mail@gmail.com Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-42b3c965df5so1521871f8f.1 for ; Sat, 22 Nov 2025 07:14:56 -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=PDUpHYMfUYdOgRyZiL69TjswA6T48bLdl6WeLo4e7UuVplx1Yto6CLmUUPd7IQsPVm 5sycBjqdws4YdoSd+g3VM7VGPR85m4EdCtXdexyPSxIsmTw3WTBWr1flkbMa8t8C2u0c ImdflwG2aYif0RzXbgKP6WxQGyb/iroaZaQGjXevj9iHLAa6GyUG6lJlG6yg+pm2gpnu VUEvB5EyegTuti9sRFKS27m8uFAOp0aI9CZ+iHQs8eFRFdzPRxvfrOdOXRLCG+xXTQQB gPGtnr1iiwwMz1QvrgJEViDb5FlmTgyQ8lqlXlKp0labqQeIKqiyN+0IT7GZ+hVdxYSQ xlzA== X-Forwarded-Encrypted: i=1; AJvYcCWzLG+0m5U6Z2SZkUuSo5HvxkK+GpfbrQSbUWyEBYNTXzGE6s3HOW199wY9mZx2iIW400XPSQcSzDgAUsFPGq6ZJgveKg==@freebsd.org X-Gm-Message-State: AOJu0YxsZxHwJx1bbFXcg9sUN2w7n2EU08LH9snC2kDWsMjnYSB1Ii6v f/g8ZhxQY12SREg+8Fw2oPk5RtAjoIDLQkAwd0q8gdGo5VcM/B9igiOXI6XTiw== X-Gm-Gg: ASbGncuXrWto0mKQCDIUxPILagoln2cnGnFGTu+/WqVFHQn1Qs/hsco0P0ppgd9rS7o /9FF3ifsngzFj4JZ0uCQrYLZdis8ahXdR7XmKFDYRYb6DKhi+3cGQUxD1igY9kwjXzKSotU2h/b V8mHklow8wzs6210Hhwg96bzVUfRd0Aw/4fvQWfASVfXEUAd9ruc6+TZVhKQDNCoAx4WcO1Qmd3 9Z0yzar7dY0XVx/ycPXStjugiLT+Sl0BLP0I9NwAeTwQpwS9g/bbUPROao7HnHQhe24dAY/q0EM ACP8DpDT78CZ8TdEIe4VFcFoRso2HIQ3OVWqV3Lr5+nGhLP5uTGTcl33qSMBA57Hw/N7T4/lSan Os3vfDgJkj5XKkFHyIb3jJbXMtmJ4k0atRgsx/P03o2Ka5Dl6fSvndsXrz/Z4bqDTRCl8xegrXb Poh0SS/Hug/p0XCZE40AWqlPM7RA2GOiY= 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; 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]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::433:from]; 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-main@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Rspamd-Queue-Id: 4dDFxr5wrbz3DNN 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDJGM6LzLz6HSJp for ; Sat, 22 Nov 2025 16:59:23 +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 4dDJGL4BmQz3V3X for ; Sat, 22 Nov 2025 16:59:17 +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-47774d3536dso23392995e9.0 for ; Sat, 22 Nov 2025 08:59:17 -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=RBPojpRoym/+lblf/3xaDpcc1dS7sLL7eGxgjX8m19zDfYvEVulPG0y+HYRHwe5gzG SPI8GT4tg2/ki+i3dJJzGf5c8igGRyk+KltXjtCROYSJ7/P/FTKd5+i8xYUiINzEUf5B QP9jb1QJy89mfIUYYuGQamNOY1DUjMvTz1g3kxqMzrJAb8ckWhHO2U0DeTOENiDwvWTX Fd+wn6r1foAkODfCs31W+z1MdXwgMP3wYRRRVEa/fupEpk4+53fK7EPBaG1E0aCB2lZE gUMVW5rQvuPg8OHQnY2bFMELCNjRMOsKeqH6S9z9V14Xkc0hvDtFbUEDZc1Lxb2xU2TQ Ityw== X-Forwarded-Encrypted: i=1; AJvYcCW7gp13D0q8VcSG2Hm1rBhtxAjDF11Ewh0INwqCUeSvj73FhTOYdx67D1WvTgjUZ/1WZ8YIzaDFJUqThSxC1OOclTR3lg==@freebsd.org X-Gm-Message-State: AOJu0YzJp5z1EsSImC3VYrQTlJvsXCX2vahW2gGRBtGu59ovPPMsATQI LS1kMt8xG0l9WKnMtz/f1jm55SorJ1aAjigRZrB+k5TZP6oqmkUvxHEjqYzJoyYNgic= X-Gm-Gg: ASbGncuIHqf6Aq0FL8gja7K7dtOJGZNbu6J4niBPdNye2dG5gQDhfMQFfhEII4RuMxY mp4yp0dlPvpwLFU87eIhR4U4TQcShnw+77L8/DRfGrrMlXQupxQxtxf/yV2DaOJKwox09gWoK/A Gbl4vGkJ8+F6x5/EfSJE4xbABPl5wFdYGO1M8P6kmbLH0wfzrqx1ZzPO+0c2wvnnCiGHB873p7k eBseX9PGG+UanjXploSiVh0f7F8WeX+kgIWzjhqSP3oGFl5ZeIsjiS3XVs5cqyTFVADdw6fyYPU 0poWhIBJryGSFgxclQCw2xsn+6HqFoJnmi+ZWmvVDfUuZpK0hviG+WcGoZ3SkxfT9lEN8Ymflv1 Z+5guKB7wRP73PW2MxWEJVDWj8I3jmmL+YsoUzifgvWPV3mmWro5eiGGMCJbDKi8N2rmQQTNYvU EyA2T+NfjZU3jA9exXDlMzKl11l1ajMO/FtuylMOsQupqvI/5lhWMz/N1Pj97a8rA= 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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.40 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_LONG(-1.00)[-0.998]; NEURAL_HAM_SHORT(-1.00)[-0.998]; 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-main@freebsd.org]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@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: 4dDJGL4BmQz3V3X 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:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDJzz0crmz6HVWM for ; Sat, 22 Nov 2025 17:31: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 4dDJzy6dGrz3YS0 for ; Sat, 22 Nov 2025 17:31:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763832719; h=from:from:reply-to:subject:subject: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=tMEIQ3H+bcv5TS6Ej9jL1MMXiHBVOJq/lVvFHGJwlT8C9WCkHnJaGpDqmCJrGSEJFcJ8Z/ 6MLo7LBuYncHTMtLAixxJAzKGxahRrqRInFtCyjRAJ1WTjZ1KYDaKrGDM7Pieb1heXldZn A6P3Ttu5mf7bv5ytWdhBWIFryN00RhvWJOUzKGh8Z3OOHOpUGxkBkhxss6Vd5YjXdo1TII 4gAEpqXzXm87BmdCvuJ8+EAwD2/1TdQvfSzPS/3RGrzM0SN4/ILwxLkd3jfmtuYTgMCJOb FadZCJbgTI2BK7aHYjv9RjP5CQXcn32VhJDEDaGKI7WuD5LEuGi88zeNmgNfMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763832719; h=from:from:reply-to:subject:subject: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=Cdll08Xa6BZp1mqNEKGJX099jHUvVkEh0dCyEYJzObk0JpoTAvTQiJcEsgCV8cQ6CuDa55 735SzYJtHmYjJzjQDoKl9JADYzRl8EqlSh5GXHhgVTPZmNU3fSO0B7U+T9m7crynBSr622 R6eH95kwV2UCkqOinQySnV1hDCbKoMpZop2nNwa8CzuyJZ9B62i6wimE+ByDPW+Vb6BM6g 2DXaTdSqt2Q46Pk1pntx/PJm2BZqVl35CXrN7gc8Q2uX9QTJor+8gW08JjekUjDnBvmnjE Ei9To5q+zNr0nKh6sNoifk8T02gUH2uCBsW9zjzdhv6rYl/MpAju7j9yj3iEaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763832719; a=rsa-sha256; cv=none; b=QOtC7Q7UeXZAXFaqMi1aW1SPw4mRAtWQ8TlslzUrvEV0LRKhSBU6bJ32QQtLAe/1dBnaxo WbyYAO80JLKBpb76wmA54R/cCI5EGf3hE86IELos4kvAUNlFjHDzU6FfCwD7X6ixYwkVYd Q5nSjN+SMRujGjEuDKMC2148GkjzsoqeHUkWyddKOuxF8uWXigsRbNym+e2dlv6/K2g0/K JWrPmdFVQZG26jsH1ylyoLJisibw0RKckxOMzz6+qcJ+lHbQXSkfjTLh+ociasKpoOz2yU XRE1/QnpNVamEFhEt349wXVC2NEFjrQWECw/8GZ8qOTgRXDkbywx+nQKKX4FQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDJzy6BgGz16t5 for ; Sat, 22 Nov 2025 17:31:58 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:31:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDK002blPz6HVNj 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 4dDK000HHqz3YPF 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 4dDJzz6hWkz16wT 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDK012Drbz6HVNk 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 4dDK010btVz3YPJ 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 4dDK0101Nyz16hr 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:35:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDK3f71pPz6HVc9 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 4dDK3f67Zzz3cfZ 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 4dDK3f5k8qz175B 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 18:47:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDLg423Cgz6HN9V for ; Sat, 22 Nov 2025 18:47: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 4dDLg40g3Bz3qJf for ; Sat, 22 Nov 2025 18:47:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763837248; h=from:from:reply-to:subject:subject: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=bj3HUAAogeHxwM5a7VBvqZNQ9Z4D+E6Rke7R1/U1AhLeheoUG/dpWs5nYnaMT77ibhVEaZ ps7mU3mizHEshn0nYSjYM/6JlGAb2O60AJ/04LHmLqpOtJEYJT7yu8ptXyMWK+QSjRabCD OmLzCefe51UDoCY9JDJigg/Uf7pThbkMjiDzzS4KeQZEIw8nLkOjVEmt1HlkHF4+/eNbgP 6vLzGpLzmZkb/VVhk6RE8E+1TirM0oBigI2iKPQzH1BrQV0e5AD43SYd4BDFa6Io7W+ABo t6KgJpC+ncdOpbcUT+GGc4ke3FNdNKUQ3orR5BuTjIsqKFI9rwxmjEeBkgN5zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763837248; h=from:from:reply-to:subject:subject: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=uuVhkeV0DgL5fyOQ6jhQMeOCa4E3PubXJEDEyXv76r7d6hpYM8+y5G5C3hWFykfZwZlXPk I1a90IlVE/ZhB66a9vvddPe2ii9d9hcsX3wZy/PWvphAKZDvMXX5By9Z/jjNUxmocSQl0F JZMN4LaJetsBW1f5Fp3usDpAFKtTn2PoUWQ14ryV5vZoS6vSOpmszdLNp4jiUsjXXNmwhU cwcAj61LJq8QjRQ5I2ajXgHZUvvBv9duRCzwMgLEmn86OLGAl8EckYPClrX5Lq0NArTKhz cLzY9WyKcEMqHPBvdbSVxjA52s0hS74VpA6lkoCYNedtfKqtHD3doc0sRk0eLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763837248; a=rsa-sha256; cv=none; b=N9xN9mYf4/YHwgm26BuZgu+CvI0itnnzgMaf3y2uXeRgJUJ21x+NjK9QFXB/1K27BLz/MT LWeMGsr0BbZzb5YY9jBBlsCLSA6PLjBvaIPatxP0fwM2KGa8EIdvDEkVMHiCZODVvkrPTf j1C0DeroYeD/vHkTONA4ZIf3NFpR/BhWMAmBkGGIaKup9CNkqSi+kP9DkuZSmZIPkF9Pkb Ld8Ra13gnjfm6WyS/V0HCzzLSFPPWfjbMIA5lgeKeE4VSwO9xuNuv5++EUQM+5wuurLAek FWpsk78TLEahPpoh6pGANAaotlxmvc0/dR0+XnM0VSBjydKHX8UyOZ10SWB6/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDLg374wnz18tC for ; Sat, 22 Nov 2025 18:47:27 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDMH91TNSz6HQZd for ; Sat, 22 Nov 2025 19:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDMH90cDTz3tYR for ; Sat, 22 Nov 2025 19:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763838917; h=from:from:reply-to:subject:subject: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=KOXMM4yr431SueELuNnI+XLd9CVxkUbV82d+lZOdz9GAnn0Jssap+uVjwB5kxiKnLLE2Rt 7n6dkjkYyiPkXOW3VMczLVcspkuzhaSBJHLxkrG4LoWXqBJsO52DhtpAUUufuX+OBAxOvq YM5j25+28PFnf1+4EbhspBQELI4PSdjtHVmpLVMhjMC2sLrubdmxFXZrqd9y29tus2c2l1 TxqnjXQCHuvtgJ900G/VMJW6t45mCaphTuX3HTMq1MWAYS6ymdXGcP1qj7LHUklf9/9NiQ LVDyn7rR/WnT6Vf/ptxs6wkhoyRkavMOKVf7i//1fpR4k7mrofwjid2cGNRTVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763838917; h=from:from:reply-to:subject:subject: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=jVHL1LVV+hIBZdopgCsEtPk6is07hPwJM60VZynzqgu5SSDVmK++5uhCD6pe6DJik5/XWr QwN5KDYfOFbqYEGmCx1N/muLa+fELEHfcYgozRy3uvBSGMyCNK+k8HF0bopAMhFkcIBI/T fIz/F7I7Av+MuOMtqqiBCikwxBxkvBGYmiN+YdzYrDHFl9wWcOHmL9vxdq1XYAIerWigoc a2K7fsF1KBHubA4n74hBZ6sykvQAyvqQMB7xa5k8BuSUqnJ3ZqdTFc4K9Ywrx2YD5cUw32 w5Qlua5hFqZkk7G02H13PSsb+pdJIatCFBa3xeGlnMytvPiqtdOusj1E7AXXcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763838917; a=rsa-sha256; cv=none; b=V9a21cfmOALFLTA7n1nXeb3DMdiiDG1k210P+fqZQluzPvhU79TW9EcoSmya+6rNz2vqbG 9Y5S1MquJOm2Z5Y/E8RJvtnObCVc/AsllZaVVBmm8+5OH3KHgq0VkftlOEivYrnqoNPtH4 nXKj9kQ2a8UvDzYju/y6xaQ1D0puliOlpm1hf57FRyftxueOyCTpbNfhyI+hDAyMmOjW8H rB6ot5tfoK0yAmi9dIt8gfhMelS9CBRFIKgNJe/hMxdYbl267bplU3eC5B/KI29Sc0zgDE az1Mib0sSjhEG+R5ALlIkVmXn1KDh6Q7+vgo9dMyLuH+XD7bJrnlZ8MZ2DsOTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDMH901vGz19GD for ; Sat, 22 Nov 2025 19:15:17 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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 22:00:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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 Sun Nov 23 06:14:31 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDdvw3Cdlz6JL9f for ; Sun, 23 Nov 2025 06:14: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 4dDdvw2kRwz3rtX for ; Sun, 23 Nov 2025 06:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763878476; h=from:from:reply-to:subject:subject: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=dl1TANc4vgQHwMcOkPaNEwjs6xxL9QAoRdCib2WlRbx1ctNMEXZBosBA7BD5E+U2TSgMYQ Z1FI9waAKyXFNZCQUCEjVW1Gfl7mggclws+ABh5qSzMDsX4yhVSse0Xqc5aXrGN5s2diRW VZYhhhCf+GIgSoFuWkvUSumludr058i3e4jFha0hPVRTxVJCaOZU4z65x5DedqdLpmSgMN Q8B0sfYXT0rmIMqEyc7Qs7QjW0gB/bY8BMxiisAUGm3rO/AlUiZb3XiuP/lba7+jiyIgEc LxWw6Atvil5skL4Z7oz9LQOx5j0ZYpTDi7cRx/OCHWsx4SQkweQDSDff7Zj6Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763878476; h=from:from:reply-to:subject:subject: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=RKlznNPosDUMDe/rWtvwtTZ6BDwdteNinCU1l0JrRMeGpi2DL5teREG7Vvm+HsQUFGWuQP owCxdP2PzJLtInGfRE29/YbANDQDMAf9Osd1clacDm07x4FOB4d42aD8rkC7n2JXXXtdxX moxZzA9PCbBJ+gJCY1aBxKFwK79/MKfanntsKjVp+qPEQJZqrTiXZMbXaFxysAlbuQGked 0TPzpHBEol3rzsyHUG2jH5Ur2jRnTsA2xzFbdON184po74t133Zzmx45mRr2IZKBfKv8Ui kdlv6enl4AhgS6EcLWfkbUEZPfTUPvF4zimxtVZ+FiiqtqbS3iLlmkYvihOviA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763878476; a=rsa-sha256; cv=none; b=spr+vvZl49wyJZo+KiTYMsaduwm8eRxZhJ5u5r5fnUp6PbUFV5DhJlfmzuyNvy1/TGLn+R pVENRkyI4IQ1uOzgMAV16ngWopnvfT9TwxjCZvnM6Dq1MbLYLHbPcxMB38bQv7Y6nqbjaG HyclaovaBgvShVZPv3MPOQ8A0TTGgrRw+KEQroUJpV5H9deZW3UGphZy5s92FYy7wvDa7m 0KAYAqFOT/8904IXbpGOP8qyJM52OEied/0jO0KcgBtxjLaDjQJUoKFNG38oQKsUKFbMaZ ef7a0Blx6jj6gQa0ERgqyHyluypUi3c5X5ll1g6ukWKAGok+V9DLy8uMGXX4zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDdvw2Kbpz2Bv for ; Sun, 23 Nov 2025 06:14:36 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDfrd2N1Sz6JPLP for ; Sun, 23 Nov 2025 06:56:49 +0000 (UTC) (envelope-from bogorodskiy@gmail.com) Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) (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 4dDfrb3hXTz3x1f for ; Sun, 23 Nov 2025 06:56:47 +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::630 as permitted sender) smtp.mailfrom=bogorodskiy@gmail.com Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-b737c6c13e1so51778766b.3 for ; Sat, 22 Nov 2025 22:56:47 -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=B6YEqbeQZ41zRlYBKThQdu00jpsTvRa5uQViD2/PBmhBNDljTWT9TA2DCOxSOqzxZx SYF7m1xrXMq16swQQxZwdiS+TEAaedEgkaqCT8R8c+mIPUYXxKCDYbcjUwRqU2Kvv/I5 tsB1jt3DJGejnwWKInstIdajdhJAIhJWUrLHBJWYmNF85neqyI1hTp2Eawyc/LbHYJfL lOP1zZXwNMTTevPw548X1eKUBYrslthl1Oihp+mctwUfUy8AJDQMjWhZHEjBWjdNQwi6 aTSYWKwavMqIhx30tWqeYr8kRbKKnc8t+UnWqNee1IOijLdAfGzVsVuLKGdU7xVViyBO OZKQ== X-Forwarded-Encrypted: i=1; AJvYcCVTO//ItQ3P/IdIb33wXhzHwEpqRE2B4j6zAqGwSXpeXWC+FwkGy1+BI6fgqsuOtblR9BbXRWR0PmfXMwFO1uI6mKXiRg==@freebsd.org X-Gm-Message-State: AOJu0Yy372gg/9/JmJQG/IqaCW7NhF3j9hhUFI8hGO98F4+LTQxRENlB JQ4Bo4O9WxmbYnczBcVa10UNCNaC+DYlg821ngkW3yPmmIZrp94DEC5G X-Gm-Gg: ASbGncvOdfqra3OXzqsQ7zhBHD0yuutLsTdLmplNoKg5hmWsDsI1rXhPKFA8jIXmLUo Ro2tAOQw+egtGoF6JjTWRHTP10+kxOUINqx+rs7ESlYBjV9R+SUc+mOO9lDOvjKWwO/twDT6Qdr S6BG61+5LJRbimV1nNR+ZhurJlitcT1m8FsqinPNwgwZyKhxKCBg45VwB6thTev6xOBYlbePgWD VrzI/DRQ60THE1mGV5NpE4zwwd4YjYeUt6fxfyH6rdDW2Pq71G8DGsFqOruny1meYq0aRfMtK3P Hsip1UtOaR/oF7EfOr/K0HhnxA9Ie0c/Fg1u/jgqut6/zkDGI+CH6kItUqtn7vWSFkxzy9xkFfI QbLh586WoAyQbISlsBc+IEuT1pH0iqreILZlx4r75XAbMWPIpUX4FrAaYOpckiQwspLE5A7BeTg 8s5ZR7RWHYug8xRo+cdA3cGp43RU15I9k= 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), DKIM not aligned (relaxed),none]; MIME_GOOD(-0.10)[text/plain]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; 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-main@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::630:from] X-Rspamd-Queue-Id: 4dDfrb3hXTz3x1f 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 13:09:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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:34:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDqjd4HPsz6GywX for ; Sun, 23 Nov 2025 13:36:21 +0000 (UTC) (envelope-from bogorodskiy@gmail.com) Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) (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 4dDqjc5pHSz3jZF for ; Sun, 23 Nov 2025 13:36:20 +0000 (UTC) (envelope-from bogorodskiy@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-b736cd741c1so596168866b.0 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=uRbiFsVd5HjkS9P/1/T+aHPwxZ0QVlBkY7zRzvqbzqNMnvi0c+AsPKZ5HFiDgvtToz TfnIsaCmGdfOacR/ME7nJoFIIjkTWTu7jCb8eVZpDT2wOokzWk5HiUTHPLsd/Cc9ynCn VlKSfglkj6nhoM0erbZbYCbIpxnACm4ndPPewcZ9xMuNTMJI61BH/ye8deBjnbPdc6Q3 zCGHX9PgQKFQjVK8HbMb3Nnwf19tP0dOyoPXiwKYrkgZY+wYGXwxzQ9xdrsgoTEszIg0 BassW7Qa+nvrKu6G47/VwzkSlFJB2k4i0P/xpEra4TQyRgiwuqP51pd1wOQPAfyAvqKq dEIA== X-Forwarded-Encrypted: i=1; AJvYcCWaviIP0SUlQyATbBCWVVS1K4hNBMJe/RUDyGe+L9UIAoH0iVk9psVNSTTedoCenX/tMWU9fG1W9kKm81USDhUmmh1huQ==@freebsd.org X-Gm-Message-State: AOJu0YwULBsdUwH1d4kxcBqJBkIhyfsvjIGzfH4LNFFYT8DWmSAD5YlD DbaFwEfY19Go0SNCWrmFDD1FfE5raxDrpMzsx4mHbCo/EFeXWT+I37w0 X-Gm-Gg: ASbGncsSHxOkQMtqa5D2DsZ7cNEGR6RBQ2cSG+bAyaPA5Y2gG02NWXYrAJtHaZuSCcU zhFbG5wDsJb04RpM8uwsaeVY1dT+midQSZzb1rb4G8f7Su+cpVzfjU94RRcsRvJCD7y1trGEBXA QVpeGY7ITeZVSYOSY0QPgHV0wDap+cOvCwW4kwO0fmyqJyLEQNZX9UHmXJy6FLJ3gK5mIWCMlMr PtSETvNUj1dkZF9i2M56oj6aKw398kNAHRMgDUegkueI/NQZFUIitXc6Oq//8RmNG3LAqIcozQy 4AR+2HXroyUOVjrjZeJd4mE5Oq6YekFUDsJpgNLm6BpWGuuJXMQQ1TGRlPJuK4bPRryRC2eAewL u7WyFiqAWIDyn0zgRS4Yeq+yR2WRwx+oFegSWDEkdjLbntB7nv8wFThZs883L+YR5i5h1Uj1iR4 dx8QMIYFOl8uYWLSnwx1QLXU8yuScRdWM= 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-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: 4dDqjc5pHSz3jZF 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDr2C169lz6H15Z 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 4dDr2C0DF3z3lhy 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 4dDr2B6phpzVYk 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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 17:50:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDxLk1LXtz6HNjM 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 4dDxLk0jFjz3J5N 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 4dDxLj71kMzfGW for ; Sun, 23 Nov 2025 17:50:21 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDxLl37cQz6HNjQ 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 4dDxLl1jXvz3J7G 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 4dDxLl0jyVzfCT 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 18:40:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDySC4z67z6HST4 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 4dDySC2GpMz3QG2 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 4dDySC0fZ0zgX7 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 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 22:01:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dF2x83D9zz6HVgv for ; Sun, 23 Nov 2025 22:02:04 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic310-22.consmr.mail.gq1.yahoo.com (sonic310-22.consmr.mail.gq1.yahoo.com [98.137.69.148]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4dF2x56j4Tz3rW9 for ; Sun, 23 Nov 2025 22:02:01 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b="pB/PUS50"; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.69.148 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1763935317; bh=jsMGsVVlKX3t0qEbsBFpZxKvgvAvzQLQYJWAwxouu58=; h=From:Subject:Date:References:To:In-Reply-To:From:Subject:Reply-To; b=pB/PUS500T//hsjkf3HWtxX6wL2NjI1g8rELlZ/RjOAbTdR2mjBD7NddCBrbSWL/GCJ7bN7sCCBWW4jdCYY3b5qHalc2FpZriiWvHElIRU5uF6AVAoiUYxkpqixvXPNyAyifU6Fke0x3zAhgLTgdAIIPjVW8boOa2aGK9qZ7/0wKWtYWeHCwpWQN+dhNQvrwdsXS3pgEs6EzOaRHpKv8x6ksxtio4W62/STFMF7nFDP1ICdTcC8F+qZeNzzOYI5XN66/fTHUj8EoXoLh7AY8MER78g+EB3citA79Sr7R5ikj10fv1VsWzw1YvakqccGj6j2ypGk0HHvlAyn02+0hUA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1763935317; bh=gUKhFD0cHQJY6azW96zwu7V/MU5w1n3t5RoNHWFfOK0=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=oDXQCf3tCmr2SEfDDA3tXM815xA3op7at3OxO+d30G8XnA+BwfFPflrBlw7Nx20YOe3DXCrMwudbc+Ti2JLtYTUZNa/JyyEb0YCWLQ9S4WSfFEhJhzswTJbbpY9MRReoJOAnTpvx0aUhKOtMm3uWuE0AJwyeTVpxKORLtse0RtpUNIeU1+6dZ/rLD/vGUJKh8NiGealI9pb07KK07NHWwXVnj7OmrOeQRsGgkdADEjtNoGTXQlvA3XpdIUf/lLP6Qj/+otTVQqraDSxd7oROXTrzqyki9rFPG4hsfDMhUdqqfEEAYsIJ8p2Qfdi2/RqOvtOqSerXp+EHrgRnrWEXOQ== X-YMail-OSG: MQWcUucVM1m2OdOLVBa4r017Qt_C4qxbuGlYajxwSHDK0kV53D5uS_noIzhAPPf 8sTCtKo33oHGbOy5rodiZLWnFOL4a60r2NHOlwnUl4vmUikObtB9A3DXyoZPUb_NRRMQK0mZx_4Z xNqttqofVmuRH7kvuztC_0Y52mN06kGBTRyZBthJku3un_MFomcX.ZQLpyhHiBe0EkabDeHrJmW9 WNm7_grdkIK6LeMdGGtJxOmwCaaWxk1mYAYB1uFQbX50TjlseAmncPXDiyQ9dYc1L9mQdRrNeT9O fbvFAekbJ5taY9NTptQ15RavEk4tuN6XE8SGbOxBFg1Y0MIAqogWL8RTzW3A.5BsqHpr0ZGvLF_k Swdt2JjXC1Eck9rD7P_HtxCKneJ8uG5PjsMpz.DyPQDxH0NrNlGr1PDlvd5NsmyT1BT6nZvZZ3VB wrXXZKv3hrdRc8mTJl3ba9T1OhbJ1jKSRrQ10A6T2wPsFpOxoS_QCkzpzqkqpKErH2k.mReetc9o J8lmHiuCuc0NqzpDGLPQY8pMpjFQPnZ5xsPHEMVNKxSDaBMO9RnSclyucgEQMPKI_ZIWq2vu0.aC KeaodMfp_WX6hcmRvDjqvn3iroRPCnUr0yaCChLQ1SqXEvmhsRWNxmfK3SODXZ__amSr7UWRfmQe J4GNzU40yJusy6_aHqlIK5_ykgoMqNTRi2Qu9nnpHkXKKEs8oqVdPZprd40AKi6Cu4Dwfo5efYJa CTxb46piJGC.hEXSuKlsHuecBUGPx0s5T1VmoF6c8ZzBos1u1kYtpY8ZdRTj7sAGhJ.P_q2d.g_g 3d913dUjnAiefkAihcxLh4PekJ70ApMp3IK59Of79wUhj.NQo.8bVlWXEXHkuaWXU.rUEW4iy6zc VriEqBEiTgrvAx4RP.CVwAIeUNozaqNuPs3dmjW5mh_Y_2FBbb2tVlqoLrQR4Oo6KmjocFwN.S4j 4vCDbE5ictgypPveBGV9YiClhGKgJGONl4dXr7rUNwmDtzjp4G0YdCm4MquXVKeGueALGEnCZuex k8or29jo4KmfQAgxJ1wMjp6QaT18v_ExCE.346wWMEi_uTBngTK1ssBVRTGYEMwO61mfilVMEzZ7 G4IcBGmTh8Y1QyaTd_EkGr5Lbj.YY85BiTjVUjWHwW9QY_aHuwVaEb_Gzkn7yLjUXCbece4ri1Ns Eh6hnzPg3EjH59eFpbnaMqhM6O57F.S6RbTT4Dv2DqsDMR8Xu2ERKJrizsRGdiJyI4i1__ANKq9o xpSdH7HH7PV._eYaxlfUbT5sDmIVV_.JWrgWiEfYxv2hysaYHgTORT.BUrGIjHb2pRBURA6mH2QP eIuuhbMK4UF.QO3Bt1x0FB_A73SQwz_IqL2hVh4xq_rgYpLVoGlcaJr8ctNLo2n5OUyJO_P5InhJ MocEt8iO8hrJQRg57bTe1MO_3tLrPV62EJ90kbyFS2q53AttMizaB.sINejvj3pgG.LHrQOaQ0BV xwESVhXmH7DKx9g66mq.h7WB_hH6NGDVKzIHGPG0Unm7q2.qwWSdgqwtznm2eFcZ9473LYEwKMFc NSmoUrWnIA9ytu8yy11.LQQsdWoac8fr2JTSSRvsAGnv7bwnrUa82sI3OJwwe1iohU94qudOiycm U5CYMuGDeP.fkIRidC9coA56Mz3Z0R3S6KK_zMQur7ItLRAkEgISfvMYySOBReV_K8VYD.TKf7DF _o1DBboexH90HLCZGrODBvBZ0NRS773SvFyMp6y0RiZhDDk4PnRVGB0b4DVNB3Cpm8znyVWfJB2y 8Bp1gDKc54ifR9mwsS9sHn1MAjPz5BMNQ1hqopI3nmBNVUN7YWtpLQDIQONmemGYeqoBzCvb92T5 XrmBaS3NzjsBoB6pa_BOvekz7mlBFahEZPRuju899pXQfHqXUJONlWoK_CndrBoiqJznBH_vREkn dKO15hiM23E6l.lKOo_fn2vIX9n.GfUodpHdh7CXigshAEvHav2ohRC8BUU8.Nw2IRuMRIqzR29e 5MvsA4257k2QT3GCnnRl5NBamNs.GDVYlFYXyATkZxaox_L2jQsA9QR5Y1rU_ilmjZiQAuqcjJ6B r8Cl5MeseHN4oDAT5CD42bFsWEq_6pm_zXtJEkZsEb.w6vRd47S6wLMk1AmLEL28Bb2.tTraqAYJ 9FhQg_AyMq0U9LFQvLGKvws3aWyibV9oXtilgITzKhn877NuYnq7K5e8Hpiu4nxyXwwAnJjW3t0s QV7OCqJ31nzDTvKBY3YcFs56qZvH6PumCpeJtZ45_etffZGHrtp_015euW7JSzQ.cwVLvsPqxx6P LXjg- X-Sonic-MF: X-Sonic-ID: c6eaf4f7-8abc-42bc-915f-9848f69638b9 Received: from sonic.gate.mail.ne1.yahoo.com by sonic310.consmr.mail.gq1.yahoo.com with HTTP; Sun, 23 Nov 2025 22:01:57 +0000 Received: by hermes--production-gq1-fdb64d996-bbzfg (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 25ec2f2441ec8082d92e92c5473effc6; Sun, 23 Nov 2025 22:01:53 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 3289bace53f3 - main - Reapply "Merge commit e24f90190c77 from llvm git (by Brad Smith):" [right dev-commit-* list this time] Date: Sun, 23 Nov 2025 14:01:42 -0800 References: <69E754EB-D459-4859-8D6C-599F2A64F792@yahoo.com> To: Dimitry Andric , dev-commits-src-main In-Reply-To: <69E754EB-D459-4859-8D6C-599F2A64F792@yahoo.com> Message-Id: <134D259A-CF99-4D2B-ADDF-4A21F06967DD@yahoo.com> X-Mailer: Apple Mail (2.3826.700.81) X-Spamd-Bar: --- X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_SHORT(-1.00)[-0.999]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_FROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.148:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.148:from] X-Rspamd-Queue-Id: 4dF2x56j4Tz3rW9 [Just sending to the correct dev-commits-* list this time.] On Nov 23, 2025, at 12:29, Mark Millard wrote: Dimitry Andric wrote on Date: Sun, 23 Nov 2025 18:40:10 UTC : > The branch main has been updated by dim: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D3289bace53f31545976fec310b41fa78= 4de75e64 >=20 > commit 3289bace53f31545976fec310b41fa784de75e64 > Author: Dimitry Andric > AuthorDate: 2025-11-23 15:52:46 +0000 > Commit: Dimitry Andric > CommitDate: 2025-11-23 18:40:00 +0000 >=20 > Reapply "Merge commit e24f90190c77 from llvm git (by Brad Smith):" >=20 > [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) >=20 > The compiler_rt helper functions have been built since 12.4, 13.1, 14 > and anything newer. >=20 > This reverts commit bd27bd1f51d049538cc7a0053be9d99110a53ae1. >=20 > 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. >=20 > 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. >=20 > 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. >=20 > 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. >=20 > 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.) . . . FYI, in sys/conf/kern.mk : .if ${MACHINE_CPUARCH} =3D=3D "aarch64" . . . # TODO: support outline atomics CFLAGS +=3D -mno-outline-atomics INLINE_LIMIT?=3D 8000 .endif It may be fine but it seems to be the only such use of -mno-outline-atomics the source tree: # grep -r '\-mno-outline-atomics\>' /usr/src/ /usr/src/sys/conf/kern.mk:CFLAGS +=3D -mno-outline-atomics =3D=3D=3D Mark Millard marklmi at yahoo.com